miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

feat(webpack): add isolatedConfig option to skip automatically applying Nx plugins (#14618)

Browse Source
This commit is contained in:
Jack Hsu 2023-01-26 10:32:34 -05:00 committed by GitHub
parent a61cbb5319
commit cd92d102d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/generated/packages/webpack/executors/webpack.json
View File

@ -331,6 +331,11 @@
"description": "Generates a 'stats.json' file which can be analyzed using tools such as: 'webpack-bundle-analyzer' or `<https://webpack.github.io/analyse>`.",
"default": false
},
"isolatedConfig": {
"type": "boolean",
"description": "Do not apply Nx webpack plugins automatically. Plugins need to be applied in the project's webpack.config.js file (e.g. withNx, withReact, etc.).",
"default": false
},
"extractLicenses": {
"type": "boolean",
"description": "Extract all licenses in a separate file, in the case of production builds only.",

15
e2e/web/src/web.test.ts
View File

@ -170,9 +170,10 @@ describe('Web Components Applications', () => {
updateFile(
`apps/${appName}/webpack.config.js`,
`
module.exports = (config, context) => {
const { composePlugins, withNx, withWeb } = require('@nrwl/webpack');
module.exports = composePlugins(withNx(), withWeb(), (config, context) => {
return config;
};
});
`
);
runCLI(`build ${appName} --outputHashing none`);
@ -184,9 +185,10 @@ describe('Web Components Applications', () => {
updateFile(
`apps/${appName}/webpack.config.js`,
`
module.exports = async (config, context) => {
const { composePlugins, withNx, withWeb } = require('@nrwl/webpack');
module.exports = composePlugins(withNx(), withWeb(), async (config, context) => {
return config;
};
});
`
);
runCLI(`build ${appName} --outputHashing none`);
@ -198,9 +200,10 @@ describe('Web Components Applications', () => {
updateFile(
`apps/${appName}/webpack.config.js`,
`
module.exports = Promise.resolve((config, context) => {
const { composePlugins, withNx, withWeb } = require('@nrwl/webpack');
module.exports = composePlugins(withNx(), withWeb(), Promise.resolve((config, context) => {
return config;
});
}));
`
);
runCLI(`build ${appName} --outputHashing none`);

1
packages/node/src/generators/application/application.spec.ts
View File

@ -55,6 +55,7 @@ describe('app', () => {
outputPath: 'dist/my-node-app',
main: 'my-node-app/src/main.ts',
tsConfig: 'my-node-app/tsconfig.app.json',
isolatedConfig: true,
webpackConfig: 'my-node-app/webpack.config.js',
assets: ['my-node-app/src/assets'],
},

1
packages/node/src/generators/application/application.ts
View File

@ -66,6 +66,7 @@ function getWebpackBuildConfig(
),
tsConfig: joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'),
assets: [joinPathFragments(project.sourceRoot, 'assets')],
isolatedConfig: true,
webpackConfig: joinPathFragments(
options.appProjectRoot,
'webpack.config.js'

13
packages/react/plugins/with-react.ts
View File

@ -1,18 +1,13 @@
import type { Configuration } from 'webpack';
import { NormalizedWebpackExecutorOptions } from '@nrwl/webpack';
import { ExecutorContext } from 'nx/src/config/misc-interfaces';
const processed = new Set();
export function withReact() {
return function configure(
config: Configuration,
_ctx?: {
options: NormalizedWebpackExecutorOptions;
context: ExecutorContext;
}
): Configuration {
return function configure(config: Configuration, _ctx?: any): Configuration {
const { withWeb } = require('@nrwl/webpack');
if (processed.has(config)) return config;
config = withWeb()(config, _ctx);
config.module.rules.push({
test: /\.svg$/,

1
packages/react/src/generators/application/application.spec.ts
View File

@ -315,6 +315,7 @@ describe('app', () => {
scripts: [],
styles: ['apps/my-app/src/styles.css'],
tsConfig: 'apps/my-app/tsconfig.app.json',
isolatedConfig: true,
webpackConfig: 'apps/my-app/webpack.config.js',
});
expect(targetConfig.build.configurations.production).toEqual({

1
packages/react/src/generators/application/lib/add-project.ts
View File

@ -67,6 +67,7 @@ function createBuildTarget(options: NormalizedSchema): TargetConfiguration {
),
],
scripts: [],
isolatedConfig: true,
webpackConfig: joinPathFragments(
options.appProjectRoot,
'webpack.config.js'

1
packages/react/src/generators/setup-ssr/setup-ssr.ts
View File

@ -107,6 +107,7 @@ export async function setupSsrGenerator(tree: Tree, options: Schema) {
compiler: 'babel',
externalDependencies: 'all',
outputHashing: 'none',
isolatedConfig: true,
webpackConfig: joinPathFragments(projectRoot, 'webpack.config.js'),
},
configurations: {

1
packages/web/src/generators/application/application.ts
View File

@ -82,6 +82,7 @@ async function setupBundler(tree: Tree, options: NormalizedSchema) {
tsConfig,
compiler: options.compiler ?? 'babel',
devServer: true,
isolatedConfig: true,
webpackConfig: joinPathFragments(
options.appProjectRoot,
'webpack.config.js'

1
packages/webpack/src/executors/webpack/schema.d.ts vendored
View File

@ -54,6 +54,7 @@ export interface WebpackExecutorOptions {
generateIndexHtml?: boolean;
generatePackageJson?: boolean;
index?: string;
isolatedConfig?: boolean;
main: string;
memoryLimit?: number;
namedChunks?: boolean;

5
packages/webpack/src/executors/webpack/schema.json
View File

@ -252,6 +252,11 @@
"description": "Generates a 'stats.json' file which can be analyzed using tools such as: 'webpack-bundle-analyzer' or `<https://webpack.github.io/analyse>`.",
"default": false
},
"isolatedConfig": {
"type": "boolean",
"description": "Do not apply Nx webpack plugins automatically. Plugins need to be applied in the project's webpack.config.js file (e.g. withNx, withReact, etc.).",
"default": false
},
"extractLicenses": {
"type": "boolean",
"description": "Extract all licenses in a separate file, in the case of production builds only.",

32
packages/webpack/src/executors/webpack/webpack.impl.ts
View File

@ -27,15 +27,11 @@ async function getWebpackConfigs(
options: NormalizedWebpackExecutorOptions,
context: ExecutorContext
): Promise<Configuration> {
const metadata = context.projectsConfigurations.projects[context.projectName];
const projectRoot = metadata.root;
const isScriptOptimizeOn =
typeof options.optimization === 'boolean'
? options.optimization
: options.optimization && options.optimization.scripts
? options.optimization.scripts
: false;
if (options.isolatedConfig && !options.webpackConfig) {
throw new Error(
`Using "isolatedConfig" without a "webpackConfig" is not supported.`
);
}
let customWebpack = null;
if (options.webpackConfig) {
@ -49,15 +45,21 @@ async function getWebpackConfigs(
}
}
const config = getWebpackConfig(context, options);
const config = options.isolatedConfig
? {}
: getWebpackConfig(context, options);
if (customWebpack) {
return await customWebpack(config, {
options,
context,
configuration: context.configurationName, // backwards compat
});
return await customWebpack(
{},
{
options,
context,
configuration: context.configurationName, // backwards compat
}
);
} else {
// If the user has no webpackConfig specified then we always have to apply
return config;
}
}