@nx/webpack 16.8.0-beta.4 → 16.8.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "16.8.0-beta.4",
+  "version": "16.8.0-beta.5",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -30,9 +30,9 @@
   },
   "dependencies": {
     "@babel/core": "^7.22.9",
-    "@nrwl/webpack": "16.8.0-beta.4",
-    "@nx/devkit": "16.8.0-beta.4",
-    "@nx/js": "16.8.0-beta.4",
+    "@nrwl/webpack": "16.8.0-beta.5",
+    "@nx/devkit": "16.8.0-beta.5",
+    "@nx/js": "16.8.0-beta.5",
     "autoprefixer": "^10.4.9",
     "babel-loader": "^9.1.2",
     "browserslist": "^4.21.4",
@@ -70,5 +70,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
+  "gitHead": "ad2d1e8a55b2d1b358bb5e7483343d9757ff2c53"
 }

package/src/executors/dev-server/dev-server.impl.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.devServerExecutor = void 0;
-const tslib_1 = require("tslib");
 const webpack = require("webpack");
 const devkit_1 = require("@nx/devkit");
 const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
@@ -12,43 +11,39 @@ const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const run_webpack_1 = require("../../utils/run-webpack");
 const custom_webpack_1 = require("../../utils/webpack/custom-webpack");
 const normalize_options_1 = require("../webpack/lib/normalize-options");
-function devServerExecutor(serveOptions, context) {
-    var _a;
-    var _b;
-    return tslib_1.__asyncGenerator(this, arguments, function* devServerExecutor_1() {
-        // Default to dev mode so builds are faster and HMR mode works better.
-        (_a = (_b = process.env).NODE_ENV) !== null && _a !== void 0 ? _a : (_b.NODE_ENV = 'development');
-        const { root: projectRoot, sourceRoot } = context.projectsConfigurations.projects[context.projectName];
-        const buildOptions = (0, normalize_options_1.normalizeOptions)(getBuildOptions(serveOptions, context), context.root, projectRoot, sourceRoot);
-        if (!buildOptions.index) {
-            throw new Error(`Cannot run dev-server without "index" option. Check the build options for ${context.projectName}.`);
-        }
-        if (!buildOptions.buildLibsFromSource) {
-            const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, 'build', // should be generalized
-            context.configurationName);
-            buildOptions.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)(buildOptions.tsConfig, context.root, target.data.root, dependencies);
-        }
-        let config = (0, get_dev_server_config_1.getDevServerConfig)(context, buildOptions, serveOptions);
-        if (buildOptions.webpackConfig) {
-            let customWebpack = (0, custom_webpack_1.resolveCustomWebpackConfig)(buildOptions.webpackConfig, buildOptions.tsConfig);
-            if (typeof customWebpack.then === 'function') {
-                customWebpack = yield tslib_1.__await(customWebpack);
-            }
-            config = yield tslib_1.__await(customWebpack(config, {
-                options: buildOptions,
-                context,
-                configuration: serveOptions.buildTarget.split(':')[2],
-            }));
+async function* devServerExecutor(serveOptions, context) {
+    // Default to dev mode so builds are faster and HMR mode works better.
+    process.env.NODE_ENV ??= 'development';
+    const { root: projectRoot, sourceRoot } = context.projectsConfigurations.projects[context.projectName];
+    const buildOptions = (0, normalize_options_1.normalizeOptions)(getBuildOptions(serveOptions, context), context.root, projectRoot, sourceRoot);
+    if (!buildOptions.index) {
+        throw new Error(`Cannot run dev-server without "index" option. Check the build options for ${context.projectName}.`);
+    }
+    if (!buildOptions.buildLibsFromSource) {
+        const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, 'build', // should be generalized
+        context.configurationName);
+        buildOptions.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)(buildOptions.tsConfig, context.root, target.data.root, dependencies);
+    }
+    let config = (0, get_dev_server_config_1.getDevServerConfig)(context, buildOptions, serveOptions);
+    if (buildOptions.webpackConfig) {
+        let customWebpack = (0, custom_webpack_1.resolveCustomWebpackConfig)(buildOptions.webpackConfig, buildOptions.tsConfig);
+        if (typeof customWebpack.then === 'function') {
+            customWebpack = await customWebpack;
         }
-        return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, rxjs_for_await_1.eachValueFrom)((0, run_webpack_1.runWebpackDevServer)(config, webpack, WebpackDevServer).pipe((0, operators_1.tap)(({ stats }) => {
-            console.info(stats.toString(config.stats));
-        }), (0, operators_1.map)(({ baseUrl, stats }) => {
-            return {
-                baseUrl,
-                success: !stats.hasErrors(),
-            };
-        })))))));
-    });
+        config = await customWebpack(config, {
+            options: buildOptions,
+            context,
+            configuration: serveOptions.buildTarget.split(':')[2],
+        });
+    }
+    return yield* (0, rxjs_for_await_1.eachValueFrom)((0, run_webpack_1.runWebpackDevServer)(config, webpack, WebpackDevServer).pipe((0, operators_1.tap)(({ stats }) => {
+        console.info(stats.toString(config.stats));
+    }), (0, operators_1.map)(({ baseUrl, stats }) => {
+        return {
+            baseUrl,
+            success: !stats.hasErrors(),
+        };
+    })));
 }
 exports.devServerExecutor = devServerExecutor;
 function getBuildOptions(options, context) {
@@ -63,6 +58,9 @@ function getBuildOptions(options, context) {
         overrides.baseHref = options.baseHref;
     }
     const buildOptions = (0, devkit_1.readTargetOptions)(target, context);
-    return Object.assign(Object.assign({}, buildOptions), overrides);
+    return {
+        ...buildOptions,
+        ...overrides,
+    };
 }
 exports.default = devServerExecutor;

package/src/executors/dev-server/lib/get-dev-server-config.js

@@ -39,8 +39,7 @@ function getDevServerPartial(root, options, buildOptions) {
             htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
         },
         onListening(server) {
-            var _a;
-            const isHttps = server.options.https || ((_a = server.options.server) === null || _a === void 0 ? void 0 : _a.type) === 'https';
+            const isHttps = server.options.https || server.options.server?.type === 'https';
             devkit_1.logger.info(`NX Web Development Server is listening at ${isHttps ? 'https' : 'http'}://${server.options.host}:${server.options.port}${(0, serve_path_1.buildServePath)(buildOptions)}`);
         },
         open: options.open,

package/src/executors/ssr-dev-server/ssr-dev-server.impl.js

@@ -1,53 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ssrDevServerExecutor = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const chalk = require("chalk");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const wait_until_server_is_listening_1 = require("./lib/wait-until-server-is-listening");
-function ssrDevServerExecutor(options, context) {
-    var _a, _b;
-    return tslib_1.__asyncGenerator(this, arguments, function* ssrDevServerExecutor_1() {
-        var _c, e_1, _d, _e;
-        const browserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, context.projectGraph);
-        const serverTarget = (0, devkit_1.parseTargetString)(options.serverTarget, context.projectGraph);
-        const browserOptions = (0, devkit_1.readTargetOptions)(browserTarget, context);
-        const serverOptions = (0, devkit_1.readTargetOptions)(serverTarget, context);
-        const runBrowser = yield tslib_1.__await((0, devkit_1.runExecutor)(browserTarget, Object.assign(Object.assign({}, browserOptions), options.browserTargetOptions), context));
-        const runServer = yield tslib_1.__await((0, devkit_1.runExecutor)(serverTarget, Object.assign(Object.assign({}, serverOptions), options.serverTargetOptions), context));
-        let browserBuilt = false;
-        let nodeStarted = false;
-        const combined = (0, async_iterable_1.combineAsyncIterables)(runBrowser, runServer);
-        process.env['port'] = `${options.port}`;
-        try {
-            for (var _f = true, combined_1 = tslib_1.__asyncValues(combined), combined_1_1; combined_1_1 = yield tslib_1.__await(combined_1.next()), _c = combined_1_1.done, !_c; _f = true) {
-                _e = combined_1_1.value;
-                _f = false;
-                const output = _e;
-                if (!output.success)
-                    throw new Error('Could not build application');
-                if (((_a = output.options) === null || _a === void 0 ? void 0 : _a.target) === 'node') {
-                    nodeStarted = true;
-                }
-                else if (((_b = output.options) === null || _b === void 0 ? void 0 : _b.target) === 'web') {
-                    browserBuilt = true;
-                }
-                if (nodeStarted && browserBuilt) {
-                    yield tslib_1.__await((0, wait_until_server_is_listening_1.waitUntilServerIsListening)(options.port));
-                    console.log(`[ ${chalk.green('ready')} ] on http://localhost:${options.port}`);
-                    yield yield tslib_1.__await(Object.assign(Object.assign({}, output), { baseUrl: `http://localhost:${options.port}` }));
-                }
-            }
+async function* ssrDevServerExecutor(options, context) {
+    const browserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, context.projectGraph);
+    const serverTarget = (0, devkit_1.parseTargetString)(options.serverTarget, context.projectGraph);
+    const browserOptions = (0, devkit_1.readTargetOptions)(browserTarget, context);
+    const serverOptions = (0, devkit_1.readTargetOptions)(serverTarget, context);
+    const runBrowser = await (0, devkit_1.runExecutor)(browserTarget, { ...browserOptions, ...options.browserTargetOptions }, context);
+    const runServer = await (0, devkit_1.runExecutor)(serverTarget, { ...serverOptions, ...options.serverTargetOptions }, context);
+    let browserBuilt = false;
+    let nodeStarted = false;
+    const combined = (0, async_iterable_1.combineAsyncIterables)(runBrowser, runServer);
+    process.env['port'] = `${options.port}`;
+    for await (const output of combined) {
+        if (!output.success)
+            throw new Error('Could not build application');
+        if (output.options?.target === 'node') {
+            nodeStarted = true;
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (!_f && !_c && (_d = combined_1.return)) yield tslib_1.__await(_d.call(combined_1));
-            }
-            finally { if (e_1) throw e_1.error; }
+        else if (output.options?.target === 'web') {
+            browserBuilt = true;
         }
-    });
+        if (nodeStarted && browserBuilt) {
+            await (0, wait_until_server_is_listening_1.waitUntilServerIsListening)(options.port);
+            console.log(`[ ${chalk.green('ready')} ] on http://localhost:${options.port}`);
+            yield {
+                ...output,
+                baseUrl: `http://localhost:${options.port}`,
+            };
+        }
+    }
 }
 exports.ssrDevServerExecutor = ssrDevServerExecutor;
 exports.default = ssrDevServerExecutor;

package/src/executors/webpack/lib/normalize-options.js

@@ -5,15 +5,27 @@ const path_1 = require("path");
 const fs_1 = require("fs");
 const devkit_1 = require("@nx/devkit");
 function normalizeOptions(options, root, projectRoot, sourceRoot) {
-    var _a, _b;
-    return Object.assign(Object.assign({}, options), { root,
+    return {
+        ...options,
+        root,
         projectRoot,
-        sourceRoot, target: (_a = options.target) !== null && _a !== void 0 ? _a : 'web', main: (0, path_1.resolve)(root, options.main), outputPath: (0, path_1.resolve)(root, options.outputPath), outputFileName: (_b = options.outputFileName) !== null && _b !== void 0 ? _b : 'main.js', tsConfig: (0, path_1.resolve)(root, options.tsConfig), fileReplacements: normalizeFileReplacements(root, options.fileReplacements), assets: normalizeAssets(options.assets, root, sourceRoot), webpackConfig: normalizePluginPath(options.webpackConfig, root), optimization: typeof options.optimization !== 'object'
+        sourceRoot,
+        target: options.target ?? 'web',
+        main: (0, path_1.resolve)(root, options.main),
+        outputPath: (0, path_1.resolve)(root, options.outputPath),
+        outputFileName: options.outputFileName ?? 'main.js',
+        tsConfig: (0, path_1.resolve)(root, options.tsConfig),
+        fileReplacements: normalizeFileReplacements(root, options.fileReplacements),
+        assets: normalizeAssets(options.assets, root, sourceRoot),
+        webpackConfig: normalizePluginPath(options.webpackConfig, root),
+        optimization: typeof options.optimization !== 'object'
             ? {
                 scripts: options.optimization,
                 styles: options.optimization,
             }
-            : options.optimization, polyfills: options.polyfills ? (0, path_1.resolve)(root, options.polyfills) : undefined });
+            : options.optimization,
+        polyfills: options.polyfills ? (0, path_1.resolve)(root, options.polyfills) : undefined,
+    };
 }
 exports.normalizeOptions = normalizeOptions;
 function normalizeFileReplacements(root, fileReplacements) {
@@ -29,7 +41,7 @@ function normalizePluginPath(pluginPath, root) {
     try {
         return require.resolve(pluginPath);
     }
-    catch (_a) {
+    catch {
         return (0, path_1.resolve)(root, pluginPath);
     }
 }
@@ -61,9 +73,12 @@ function normalizeAssets(assets, root, sourceRoot) {
             }
             const assetPath = (0, devkit_1.normalizePath)(asset.input);
             const resolvedAssetPath = (0, path_1.resolve)(root, assetPath);
-            return Object.assign(Object.assign({}, asset), { input: resolvedAssetPath, 
+            return {
+                ...asset,
+                input: resolvedAssetPath,
                 // Now we remove starting slash to make Webpack place it from the output root.
-                output: asset.output.replace(/^\//, '') });
+                output: asset.output.replace(/^\//, ''),
+            };
         }
     });
 }

package/src/executors/webpack/lib/run-webpack.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runWebpack = void 0;
-const tslib_1 = require("tslib");
 const webpack = require("webpack");
 const rxjs_1 = require("rxjs");
 // TODO(jack): move to dev-server executor
@@ -9,7 +8,7 @@ function runWebpack(config) {
     return new rxjs_1.Observable((subscriber) => {
         // Passing `watch` option here will result in a warning due to missing callback.
         // We manually call `.watch` or `.run` later so this option isn't needed here.
-        const { watch } = config, normalizedConfig = tslib_1.__rest(config, ["watch"]);
+        const { watch, ...normalizedConfig } = config;
         const webpackCompiler = webpack(normalizedConfig);
         const callback = (err, stats) => {
             if (err) {

package/src/executors/webpack/webpack.impl.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpackExecutor = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
 const rxjs_1 = require("rxjs");
@@ -13,97 +12,92 @@ const run_webpack_1 = require("./lib/run-webpack");
 const fs_1 = require("../../utils/fs");
 const custom_webpack_1 = require("../../utils/webpack/custom-webpack");
 const normalize_options_1 = require("./lib/normalize-options");
-function getWebpackConfigs(options, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (options.isolatedConfig && !options.webpackConfig) {
-            throw new Error(`Using "isolatedConfig" without a "webpackConfig" is not supported.`);
+async function getWebpackConfigs(options, context) {
+    if (options.isolatedConfig && !options.webpackConfig) {
+        throw new Error(`Using "isolatedConfig" without a "webpackConfig" is not supported.`);
+    }
+    let customWebpack = null;
+    if (options.webpackConfig) {
+        customWebpack = (0, custom_webpack_1.resolveCustomWebpackConfig)(options.webpackConfig, options.tsConfig);
+        if (typeof customWebpack.then === 'function') {
+            customWebpack = await customWebpack;
         }
-        let customWebpack = null;
-        if (options.webpackConfig) {
-            customWebpack = (0, custom_webpack_1.resolveCustomWebpackConfig)(options.webpackConfig, options.tsConfig);
-            if (typeof customWebpack.then === 'function') {
-                customWebpack = yield customWebpack;
-            }
-        }
-        const config = options.isolatedConfig
-            ? {}
-            : (0, get_webpack_config_1.getWebpackConfig)(context, options);
-        if (customWebpack) {
-            return yield customWebpack(config, {
-                options,
-                context,
-                configuration: context.configurationName, // backwards compat
-            });
-        }
-        else {
-            // If the user has no webpackConfig specified then we always have to apply
-            return config;
-        }
-    });
+    }
+    const config = options.isolatedConfig
+        ? {}
+        : (0, get_webpack_config_1.getWebpackConfig)(context, options);
+    if (customWebpack) {
+        return await customWebpack(config, {
+            options,
+            context,
+            configuration: context.configurationName, // backwards compat
+        });
+    }
+    else {
+        // If the user has no webpackConfig specified then we always have to apply
+        return config;
+    }
 }
-function webpackExecutor(_options, context) {
-    var _a;
-    return tslib_1.__asyncGenerator(this, arguments, function* webpackExecutor_1() {
-        const metadata = context.projectsConfigurations.projects[context.projectName];
-        const sourceRoot = metadata.sourceRoot;
-        const options = (0, normalize_options_1.normalizeOptions)(_options, context.root, metadata.root, sourceRoot);
-        const isScriptOptimizeOn = typeof options.optimization === 'boolean'
-            ? options.optimization
-            : options.optimization && options.optimization.scripts
-                ? options.optimization.scripts
-                : false;
-        (_a = process.env).NODE_ENV || (_a.NODE_ENV = isScriptOptimizeOn
-            ? 'production'
-            : 'development');
-        if (options.compiler === 'swc') {
-            try {
-                require.resolve('swc-loader');
-                require.resolve('@swc/core');
-            }
-            catch (_b) {
-                devkit_1.logger.error(`Missing SWC dependencies: @swc/core, swc-loader. Make sure you install them first.`);
-                return yield tslib_1.__await({
-                    success: false,
-                    outfile: (0, path_1.resolve)(context.root, options.outputPath, options.outputFileName),
-                    options,
-                });
-            }
-        }
-        if (!options.buildLibsFromSource && context.targetName) {
-            const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
-            options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, metadata.root, dependencies);
-        }
-        // Delete output path before bundling
-        if (options.deleteOutputPath) {
-            (0, fs_1.deleteOutputDir)(context.root, options.outputPath);
+async function* webpackExecutor(_options, context) {
+    const metadata = context.projectsConfigurations.projects[context.projectName];
+    const sourceRoot = metadata.sourceRoot;
+    const options = (0, normalize_options_1.normalizeOptions)(_options, context.root, metadata.root, sourceRoot);
+    const isScriptOptimizeOn = typeof options.optimization === 'boolean'
+        ? options.optimization
+        : options.optimization && options.optimization.scripts
+            ? options.optimization.scripts
+            : false;
+    process.env.NODE_ENV ||= isScriptOptimizeOn
+        ? 'production'
+        : 'development';
+    if (options.compiler === 'swc') {
+        try {
+            require.resolve('swc-loader');
+            require.resolve('@swc/core');
         }
-        if (options.generatePackageJson && metadata.projectType !== 'application') {
-            devkit_1.logger.warn((0, devkit_1.stripIndents) `The project ${context.projectName} is using the 'generatePackageJson' option which is deprecated for library projects. It should only be used for applications.
-        For libraries, configure the project to use the '@nx/dependency-checks' ESLint rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks).`);
-        }
-        const configs = yield tslib_1.__await(getWebpackConfigs(options, context));
-        return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, rxjs_for_await_1.eachValueFrom)((0, rxjs_1.of)(configs).pipe((0, operators_1.mergeMap)((config) => (Array.isArray(config) ? (0, rxjs_1.from)(config) : (0, rxjs_1.of)(config))), 
-        // Run build sequentially and bail when first one fails.
-        (0, operators_1.mergeScan)((acc, config) => {
-            if (!acc.hasErrors()) {
-                return (0, run_webpack_1.runWebpack)(config).pipe((0, operators_1.tap)((stats) => {
-                    console.info(stats.toString(config.stats));
-                }));
-            }
-            else {
-                return (0, rxjs_1.of)();
-            }
-        }, { hasErrors: () => false }, 1), 
-        // Collect build results as an array.
-        (0, operators_1.bufferCount)(Array.isArray(configs) ? configs.length : 1), (0, operators_1.switchMap)((results) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const success = results.every((result) => Boolean(result) && !result.hasErrors());
+        catch {
+            devkit_1.logger.error(`Missing SWC dependencies: @swc/core, swc-loader. Make sure you install them first.`);
             return {
-                success,
+                success: false,
                 outfile: (0, path_1.resolve)(context.root, options.outputPath, options.outputFileName),
                 options,
             };
-        }))))))));
-    });
+        }
+    }
+    if (!options.buildLibsFromSource && context.targetName) {
+        const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
+        options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, metadata.root, dependencies);
+    }
+    // Delete output path before bundling
+    if (options.deleteOutputPath) {
+        (0, fs_1.deleteOutputDir)(context.root, options.outputPath);
+    }
+    if (options.generatePackageJson && metadata.projectType !== 'application') {
+        devkit_1.logger.warn((0, devkit_1.stripIndents) `The project ${context.projectName} is using the 'generatePackageJson' option which is deprecated for library projects. It should only be used for applications.
+        For libraries, configure the project to use the '@nx/dependency-checks' ESLint rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks).`);
+    }
+    const configs = await getWebpackConfigs(options, context);
+    return yield* (0, rxjs_for_await_1.eachValueFrom)((0, rxjs_1.of)(configs).pipe((0, operators_1.mergeMap)((config) => (Array.isArray(config) ? (0, rxjs_1.from)(config) : (0, rxjs_1.of)(config))), 
+    // Run build sequentially and bail when first one fails.
+    (0, operators_1.mergeScan)((acc, config) => {
+        if (!acc.hasErrors()) {
+            return (0, run_webpack_1.runWebpack)(config).pipe((0, operators_1.tap)((stats) => {
+                console.info(stats.toString(config.stats));
+            }));
+        }
+        else {
+            return (0, rxjs_1.of)();
+        }
+    }, { hasErrors: () => false }, 1), 
+    // Collect build results as an array.
+    (0, operators_1.bufferCount)(Array.isArray(configs) ? configs.length : 1), (0, operators_1.switchMap)(async (results) => {
+        const success = results.every((result) => Boolean(result) && !result.hasErrors());
+        return {
+            success,
+            outfile: (0, path_1.resolve)(context.root, options.outputPath, options.outputFileName),
+            options,
+        };
+    })));
 }
 exports.webpackExecutor = webpackExecutor;
 exports.default = webpackExecutor;

package/src/generators/configuration/configuration.js

@@ -1,45 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compat = exports.configurationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
-function configurationGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const task = yield (0, init_1.webpackInitGenerator)(tree, Object.assign(Object.assign({}, options), { skipFormat: true }));
-        checkForTargetConflicts(tree, options);
-        addBuildTarget(tree, options);
-        if (options.devServer) {
-            addServeTarget(tree, options);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return task;
+async function configurationGenerator(tree, options) {
+    const task = await (0, init_1.webpackInitGenerator)(tree, {
+        ...options,
+        skipFormat: true,
     });
+    checkForTargetConflicts(tree, options);
+    addBuildTarget(tree, options);
+    if (options.devServer) {
+        addServeTarget(tree, options);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return task;
 }
 exports.configurationGenerator = configurationGenerator;
 function checkForTargetConflicts(tree, options) {
-    var _a, _b;
     if (options.skipValidation)
         return;
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    if ((_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) {
+    if (project.targets?.build) {
         throw new Error(`Project "${project.name}" already has a build target. Pass --skipValidation to ignore this error.`);
     }
-    if (options.devServer && ((_b = project.targets) === null || _b === void 0 ? void 0 : _b.serve)) {
+    if (options.devServer && project.targets?.serve) {
         throw new Error(`Project "${project.name}" already has a serve target. Pass --skipValidation to ignore this error.`);
     }
 }
 function addBuildTarget(tree, options) {
-    var _a, _b, _c;
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const buildOptions = {
         target: options.target,
         outputPath: (0, devkit_1.joinPathFragments)('dist', project.root),
-        compiler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'swc',
-        main: (_b = options.main) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(project.root, 'src/main.ts'),
-        tsConfig: (_c = options.tsConfig) !== null && _c !== void 0 ? _c : (0, devkit_1.joinPathFragments)(project.root, 'tsconfig.app.json'),
+        compiler: options.compiler ?? 'swc',
+        main: options.main ?? (0, devkit_1.joinPathFragments)(project.root, 'src/main.ts'),
+        tsConfig: options.tsConfig ?? (0, devkit_1.joinPathFragments)(project.root, 'tsconfig.app.json'),
         webpackConfig: (0, devkit_1.joinPathFragments)(project.root, 'webpack.config.js'),
     };
     if (options.webpackConfig) {
@@ -78,7 +76,11 @@ module.exports = composePlugins(withNx(), (config) => {
 });
 `);
     }
-    (0, devkit_1.updateProjectConfiguration)(tree, options.project, Object.assign(Object.assign({}, project), { targets: Object.assign(Object.assign({}, project.targets), { build: {
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, {
+        ...project,
+        targets: {
+            ...project.targets,
+            build: {
                 executor: '@nx/webpack:webpack',
                 outputs: ['{options.outputPath}'],
                 defaultConfiguration: 'production',
@@ -93,11 +95,17 @@ module.exports = composePlugins(withNx(), (config) => {
                         vendorChunk: false,
                     },
                 },
-            } }) }));
+            },
+        },
+    });
 }
 function addServeTarget(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    (0, devkit_1.updateProjectConfiguration)(tree, options.project, Object.assign(Object.assign({}, project), { targets: Object.assign(Object.assign({}, project.targets), { serve: {
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, {
+        ...project,
+        targets: {
+            ...project.targets,
+            serve: {
                 executor: '@nx/webpack:dev-server',
                 options: {
                     buildTarget: `${options.project}:build`,
@@ -107,7 +115,9 @@ function addServeTarget(tree, options) {
                         buildTarget: `${options.project}:build:production`,
                     },
                 },
-            } }) }));
+            },
+        },
+    });
 }
 exports.default = configurationGenerator;
 exports.compat = (0, devkit_1.convertNxGenerator)(configurationGenerator);