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

fix(webpack): support webworker (#17136) (#17137)

Browse Source 
Co-authored-by: Max Sagan - Yieldbroker <max.sagan@yieldbroker.com>
This commit is contained in:
MaximSagan 2023-06-01 00:03:27 +10:00 committed by GitHub
parent 21f642a6f9
commit 825190674c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@
"type": "string", "type": "string",
"alias": "platform", "alias": "platform",
"description": "Target platform for the build, same as the Webpack target option.", "description": "Target platform for the build, same as the Webpack target option.",
"enum": ["node", "web"], "enum": ["node", "web", "webworker"],
"default": "web" "default": "web"
}, },
"deleteOutputPath": { "deleteOutputPath": {

2
docs/generated/packages/webpack/generators/webpack-project.json
View File

@ -36,7 +36,7 @@
"target": { "target": {
"type": "string", "type": "string",
"description": "Target platform for the build, same as the Webpack config option.", "description": "Target platform for the build, same as the Webpack config option.",
"enum": ["node", "web"], "enum": ["node", "web", "webworker"],
"default": "web" "default": "web"
}, },
"skipFormat": { "skipFormat": {

6
packages/webpack/src/executors/webpack/lib/get-webpack-config.ts
View File

@ -20,8 +20,8 @@ export function getWebpackConfig(
): Configuration { ): Configuration {
const config: Configuration = {}; const config: Configuration = {};
const configure = const configure =
options.target === 'node' options.target === 'web'
? withNx() ? composePluginsSync(withNx(), withWeb())
: composePluginsSync(withNx(), withWeb()); : withNx();
return configure(config, { options, context }); return configure(config, { options, context });
} }

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

@ -61,7 +61,7 @@ export interface WebpackExecutorOptions {
runtimeChunk?: boolean; runtimeChunk?: boolean;
sourceMap?: boolean | 'hidden'; sourceMap?: boolean | 'hidden';
statsJson?: boolean; statsJson?: boolean;
target?: 'node' | 'web'; target?: 'node' | 'web' | 'webworker';
transformers?: TransformerEntry[]; transformers?: TransformerEntry[];
tsConfig: string; tsConfig: string;
vendorChunk?: boolean; vendorChunk?: boolean;

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

@ -40,7 +40,7 @@
"type": "string", "type": "string",
"alias": "platform", "alias": "platform",
"description": "Target platform for the build, same as the Webpack target option.", "description": "Target platform for the build, same as the Webpack target option.",
"enum": ["node", "web"], "enum": ["node", "web", "webworker"],
"default": "web" "default": "web"
}, },
"deleteOutputPath": { "deleteOutputPath": {

2
packages/webpack/src/generators/webpack-project/schema.d.ts vendored
View File

@ -7,7 +7,7 @@ export interface WebpackProjectGeneratorSchema {
skipFormat?: boolean; skipFormat?: boolean;
skipPackageJson?: boolean; skipPackageJson?: boolean;
skipValidation?: boolean; skipValidation?: boolean;
target?: 'node' | 'web'; target?: 'node' | 'web' | 'webworker';
webpackConfig?: string; webpackConfig?: string;
babelConfig?: string; babelConfig?: string;
} }

2
packages/webpack/src/generators/webpack-project/schema.json
View File

@ -36,7 +36,7 @@
"target": { "target": {
"type": "string", "type": "string",
"description": "Target platform for the build, same as the Webpack config option.", "description": "Target platform for the build, same as the Webpack config option.",
"enum": ["node", "web"], "enum": ["node", "web", "webworker"],
"default": "web" "default": "web"
}, },
"skipFormat": { "skipFormat": {

10
packages/webpack/src/generators/webpack-project/webpack-project.ts
View File

@ -75,14 +75,14 @@ function addBuildTarget(tree: Tree, options: WebpackProjectGeneratorSchema) {
buildOptions.babelUpwardRootMode = true; buildOptions.babelUpwardRootMode = true;
} }
if (options.target === 'node') { if (options.target === 'web') {
tree.write( tree.write(
joinPathFragments(project.root, 'webpack.config.js'), joinPathFragments(project.root, 'webpack.config.js'),
` `
const { composePlugins, withNx } = require('@nx/webpack'); const { composePlugins, withNx, withWeb } = require('@nx/webpack');
// Nx plugins for webpack. // Nx plugins for webpack.
module.exports = composePlugins(withNx(), (config) => { module.exports = composePlugins(withNx(), withWeb(), (config) => {
// Update the webpack config as needed here. // Update the webpack config as needed here.
// e.g. \`config.plugins.push(new MyPlugin())\` // e.g. \`config.plugins.push(new MyPlugin())\`
return config; return config;
@ -93,10 +93,10 @@ module.exports = composePlugins(withNx(), (config) => {
tree.write( tree.write(
joinPathFragments(project.root, 'webpack.config.js'), joinPathFragments(project.root, 'webpack.config.js'),
` `
const { composePlugins, withNx, withWeb } = require('@nx/webpack'); const { composePlugins, withNx } = require('@nx/webpack');
// Nx plugins for webpack. // Nx plugins for webpack.
module.exports = composePlugins(withNx(), withWeb(), (config) => { module.exports = composePlugins(withNx(), (config) => {
// Update the webpack config as needed here. // Update the webpack config as needed here.
// e.g. \`config.plugins.push(new MyPlugin())\` // e.g. \`config.plugins.push(new MyPlugin())\`
return config; return config;