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

package/src/generators/init/init.js

@@ -1,38 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpackInitSchematic = exports.webpackInitGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
 const versions_1 = require("../../utils/versions");
-function webpackInitGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const devDependencies = {
-            '@nx/webpack': versions_1.nxVersion,
-        };
-        if (schema.compiler === 'swc') {
-            devDependencies['swc-loader'] = versions_1.swcLoaderVersion;
-            const addSwcTask = (0, add_swc_dependencies_1.addSwcDependencies)(tree);
-            tasks.push(addSwcTask);
-        }
-        if (schema.compiler === 'tsc') {
-            devDependencies['tslib'] = versions_1.tsLibVersion;
-        }
-        if (schema.uiFramework === 'react') {
-            devDependencies['@pmmmwh/react-refresh-webpack-plugin'] =
-                versions_1.reactRefreshWebpackPluginVersion;
-            devDependencies['@svgr/webpack'] = versions_1.svgrWebpackVersion;
-            devDependencies['react-refresh'] = versions_1.reactRefreshVersion;
-            devDependencies['url-loader'] = versions_1.urlLoaderVersion;
-        }
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        const baseInstalTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
-        tasks.push(baseInstalTask);
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+async function webpackInitGenerator(tree, schema) {
+    const tasks = [];
+    const devDependencies = {
+        '@nx/webpack': versions_1.nxVersion,
+    };
+    if (schema.compiler === 'swc') {
+        devDependencies['swc-loader'] = versions_1.swcLoaderVersion;
+        const addSwcTask = (0, add_swc_dependencies_1.addSwcDependencies)(tree);
+        tasks.push(addSwcTask);
+    }
+    if (schema.compiler === 'tsc') {
+        devDependencies['tslib'] = versions_1.tsLibVersion;
+    }
+    if (schema.uiFramework === 'react') {
+        devDependencies['@pmmmwh/react-refresh-webpack-plugin'] =
+            versions_1.reactRefreshWebpackPluginVersion;
+        devDependencies['@svgr/webpack'] = versions_1.svgrWebpackVersion;
+        devDependencies['react-refresh'] = versions_1.reactRefreshVersion;
+        devDependencies['url-loader'] = versions_1.urlLoaderVersion;
+    }
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    const baseInstalTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
+    tasks.push(baseInstalTask);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.webpackInitGenerator = webpackInitGenerator;
 exports.default = webpackInitGenerator;

package/src/migrations/update-15-0-0/add-babel-inputs.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const add_babel_inputs_1 = require("@nx/js/src/utils/add-babel-inputs");
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, add_babel_inputs_1.addBabelInputs)(tree);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function default_1(tree) {
+    (0, add_babel_inputs_1.addBabelInputs)(tree);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;

package/src/migrations/update-15-4-5/remove-es2015-polyfills-option.js

@@ -1,24 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        projects.forEach((p) => {
-            let shouldUpdate = false;
-            Object.entries(p.targets).forEach(([name, config]) => {
-                var _a, _b, _c, _d, _e, _f;
-                if (((_b = (_a = p.targets) === null || _a === void 0 ? void 0 : _a[name]) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/webpack:webpack' &&
-                    ((_d = (_c = p.targets) === null || _c === void 0 ? void 0 : _c[name]) === null || _d === void 0 ? void 0 : _d.options.es2015Polyfills)) {
-                    (_f = (_e = p.targets) === null || _e === void 0 ? void 0 : _e[name]) === null || _f === void 0 ? true : delete _f.options.es2015Polyfills;
-                    shouldUpdate = true;
-                }
-            });
-            if (shouldUpdate) {
-                (0, devkit_1.updateProjectConfiguration)(tree, p.name, p);
+async function default_1(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    projects.forEach((p) => {
+        let shouldUpdate = false;
+        Object.entries(p.targets).forEach(([name, config]) => {
+            if (p.targets?.[name]?.executor === '@nrwl/webpack:webpack' &&
+                p.targets?.[name]?.options.es2015Polyfills) {
+                delete p.targets?.[name]?.options.es2015Polyfills;
+                shouldUpdate = true;
             }
         });
+        if (shouldUpdate) {
+            (0, devkit_1.updateProjectConfiguration)(tree, p.name, p);
+        }
     });
 }
 exports.default = default_1;

package/src/migrations/update-15-6-3/webpack-config-setup.js

@@ -1,49 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const path_1 = require("path");
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // Since projects can have multiple configurations, we need to know if the default options
-        // need to be migrated or not. If so then the subsequent configurations with `webpackConfig` also need to be.
-        const defaultOptionsUpdated = new Set();
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/webpack:webpack', (options, projectName, targetName, configurationName) => {
-            var _a;
-            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            const defaultOptions = projectConfiguration.targets[targetName].options;
-            const defaultWasUpdated = defaultOptionsUpdated.has(projectName);
-            // If default was not updated (for different configurations), we don't do anything
-            // If isolatedConfig is set, we don't need to do anything
-            // If project is React, we don't need to do anything
-            if (!defaultWasUpdated &&
-                ((defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.isolatedConfig) ||
-                    ((_a = defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.main) === null || _a === void 0 ? void 0 : _a.match(/main\.(t|j)sx$/)) ||
-                    (defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.webpackConfig) === '@nrwl/react/plugins/webpack')) {
-                return;
+async function default_1(tree) {
+    // Since projects can have multiple configurations, we need to know if the default options
+    // need to be migrated or not. If so then the subsequent configurations with `webpackConfig` also need to be.
+    const defaultOptionsUpdated = new Set();
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/webpack:webpack', (options, projectName, targetName, configurationName) => {
+        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        const defaultOptions = projectConfiguration.targets[targetName].options;
+        const defaultWasUpdated = defaultOptionsUpdated.has(projectName);
+        // If default was not updated (for different configurations), we don't do anything
+        // If isolatedConfig is set, we don't need to do anything
+        // If project is React, we don't need to do anything
+        if (!defaultWasUpdated &&
+            (defaultOptions?.isolatedConfig ||
+                defaultOptions?.main?.match(/main\.(t|j)sx$/) ||
+                defaultOptions?.webpackConfig === '@nrwl/react/plugins/webpack')) {
+            return;
+        }
+        defaultOptionsUpdated.add(projectName);
+        // If this is not the base options (e.g. for development, production, or something custom),
+        // then skip it unless it specifically configures a webpackConfig file
+        if (configurationName && !options?.webpackConfig) {
+            return;
+        }
+        // If webpackConfig is set, update it with the new options
+        // If webpackConfig is not set, we need to create a new
+        // webpack.config.js file and set the path to it in the
+        // executor options
+        if (options?.webpackConfig) {
+            let oldName = options.webpackConfig;
+            if (options.webpackConfig.endsWith('.js')) {
+                oldName = options.webpackConfig.replace('.js', '.old.js');
             }
-            defaultOptionsUpdated.add(projectName);
-            // If this is not the base options (e.g. for development, production, or something custom),
-            // then skip it unless it specifically configures a webpackConfig file
-            if (configurationName && !(options === null || options === void 0 ? void 0 : options.webpackConfig)) {
-                return;
+            if (options.webpackConfig.endsWith('.ts')) {
+                oldName = options.webpackConfig.replace('.ts', '.old.ts');
             }
-            // If webpackConfig is set, update it with the new options
-            // If webpackConfig is not set, we need to create a new
-            // webpack.config.js file and set the path to it in the
-            // executor options
-            if (options === null || options === void 0 ? void 0 : options.webpackConfig) {
-                let oldName = options.webpackConfig;
-                if (options.webpackConfig.endsWith('.js')) {
-                    oldName = options.webpackConfig.replace('.js', '.old.js');
-                }
-                if (options.webpackConfig.endsWith('.ts')) {
-                    oldName = options.webpackConfig.replace('.ts', '.old.ts');
-                }
-                renameFile(tree, options.webpackConfig, oldName);
-                const justTheFileName = (0, path_1.basename)(oldName);
-                tree.write(options.webpackConfig, `
+            renameFile(tree, options.webpackConfig, oldName);
+            const justTheFileName = (0, path_1.basename)(oldName);
+            tree.write(options.webpackConfig, `
         const { composePlugins, withNx } = require('@nrwl/webpack');
 
         // Nx plugins for webpack.
@@ -51,30 +48,30 @@ function default_1(tree) {
           // Note: This was added by an Nx migration.
           // You should consider inlining the logic into this file.
           // For more information on webpack config and Nx see:
-          // https://nx.dev/packages/webpack/documents/webpack-config-setup
+          // https://nx.dev/recipes/webpack/webpack-config-setup
           return require('./${justTheFileName}')(config, context);
         });
         `);
-                options.isolatedConfig = true;
-                projectConfiguration.targets[targetName][configurationName !== null && configurationName !== void 0 ? configurationName : 'options'] = options;
-                (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
-                devkit_1.logger.info(`
+            options.isolatedConfig = true;
+            projectConfiguration.targets[targetName][configurationName ?? 'options'] = options;
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
+            devkit_1.logger.info(`
           ${options.webpackConfig} has been renamed to ${oldName} and a new ${options.webpackConfig} 
           has been created for your project ${projectName}. 
           You should consider inlining the logic from ${oldName} into ${options.webpackConfig}.
           You can read our guide on how to do this here: 
           
-          https://nx.dev/packages/webpack/documents/webpack-config-setup
+          https://nx.dev/recipes/webpack/webpack-config-setup
           `);
+        }
+        else {
+            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+            if (!options) {
+                options = {};
             }
-            else {
-                const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-                if (!options) {
-                    options = {};
-                }
-                options.webpackConfig = `${projectConfiguration.root}/webpack.config.js`;
-                options.isolatedConfig = true;
-                tree.write(options.webpackConfig, `
+            options.webpackConfig = `${projectConfiguration.root}/webpack.config.js`;
+            options.isolatedConfig = true;
+            tree.write(options.webpackConfig, `
         const { composePlugins, withNx } = require('@nrwl/webpack');
       
         // Nx plugins for webpack.
@@ -82,16 +79,15 @@ function default_1(tree) {
           // Update the webpack config as needed here.
           // e.g. config.plugins.push(new MyPlugin())
           // For more information on webpack config and Nx see:
-          // https://nx.dev/packages/webpack/documents/webpack-config-setup
+          // https://nx.dev/recipes/webpack/webpack-config-setup
           return config;
         });
         `);
-                projectConfiguration.targets[targetName].options = options;
-                (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
-            }
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+            projectConfiguration.targets[targetName].options = options;
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
+        }
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;
 function renameFile(tree, from, to) {

package/src/migrations/update-15-7-2/add-babelUpwardRootMode-flag.js

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/webpack:webpack', (options, projectName, targetName, _configurationName) => {
-            if (options.babelUpwardRootMode !== undefined) {
-                return;
-            }
-            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            projectConfiguration.targets[targetName].options.babelUpwardRootMode =
-                true;
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+async function default_1(tree) {
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/webpack:webpack', (options, projectName, targetName, _configurationName) => {
+        if (options.babelUpwardRootMode !== undefined) {
+            return;
+        }
+        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        projectConfiguration.targets[targetName].options.babelUpwardRootMode =
+            true;
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-function replacePackage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/webpack', '@nx/webpack');
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/webpack', '@nx/webpack');
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = replacePackage;

package/src/plugins/generate-package-json-plugin.js

@@ -18,7 +18,6 @@ class GeneratePackageJsonPlugin {
                 name: pluginName,
                 stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL,
             }, () => {
-                var _a;
                 const helperDependencies = (0, js_2.getHelperDependenciesFromProjectGraph)(this.context.root, this.context.projectName, this.projectGraph);
                 const importHelpers = !!(0, js_2.readTsConfig)(this.options.tsConfig).options
                     .importHelpers;
@@ -37,9 +36,10 @@ class GeneratePackageJsonPlugin {
                     isProduction: true,
                     helperDependencies: helperDependencies.map((dep) => dep.target),
                 });
-                packageJson.main = (_a = packageJson.main) !== null && _a !== void 0 ? _a : this.options.outputFileName;
+                packageJson.main = packageJson.main ?? this.options.outputFileName;
                 compilation.emitAsset('package.json', new webpack_1.sources.RawSource((0, devkit_1.serializeJson)(packageJson)));
-                compilation.emitAsset((0, js_2.getLockFileName)(), new webpack_1.sources.RawSource((0, js_1.createLockFile)(packageJson)));
+                const packageManager = (0, devkit_1.detectPackageManager)(this.context.root);
+                compilation.emitAsset((0, js_2.getLockFileName)(packageManager), new webpack_1.sources.RawSource((0, js_1.createLockFile)(packageJson, this.projectGraph, packageManager)));
             });
         });
     }

package/src/plugins/webpack-nx-build-coordination-plugin.d.ts

@@ -2,8 +2,10 @@ import type { Compiler } from 'webpack';
 export declare class WebpackNxBuildCoordinationPlugin {
     private readonly buildCmd;
     private currentlyRunning;
+    private buildCmdProcess;
     constructor(buildCmd: string, skipInitialBuild?: boolean);
     apply(compiler: Compiler): void;
-    startWatchingBuildableLibs(): void;
+    startWatchingBuildableLibs(): Promise<void>;
     buildChangedProjects(): Promise<void>;
+    private createFileWatcher;
 }

package/src/plugins/webpack-nx-build-coordination-plugin.js

@@ -1,50 +1,81 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebpackNxBuildCoordinationPlugin = void 0;
-const tslib_1 = require("tslib");
-const chokidar_1 = require("chokidar");
 const child_process_1 = require("child_process");
-const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
-const ignore_1 = require("ignore");
-const fs_1 = require("fs");
+const client_1 = require("nx/src/daemon/client/client");
+const watch_1 = require("nx/src/command-line/watch");
+const output_1 = require("nx/src/utils/output");
 class WebpackNxBuildCoordinationPlugin {
     constructor(buildCmd, skipInitialBuild) {
         this.buildCmd = buildCmd;
         this.currentlyRunning = 'none';
+        this.buildCmdProcess = null;
         if (!skipInitialBuild) {
             this.buildChangedProjects();
         }
         this.startWatchingBuildableLibs();
     }
     apply(compiler) {
-        compiler.hooks.beforeCompile.tapPromise('IncrementalDevServerPlugin', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        compiler.hooks.beforeCompile.tapPromise('IncrementalDevServerPlugin', async () => {
             while (this.currentlyRunning === 'nx-build') {
-                yield sleep(50);
+                await sleep(50);
             }
             this.currentlyRunning = 'webpack-build';
-        }));
-        compiler.hooks.done.tapPromise('IncrementalDevServerPlugin', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        });
+        compiler.hooks.done.tapPromise('IncrementalDevServerPlugin', async () => {
             this.currentlyRunning = 'none';
-        }));
+        });
     }
-    startWatchingBuildableLibs() {
-        createFileWatcher(process.cwd(), () => {
-            this.buildChangedProjects();
+    async startWatchingBuildableLibs() {
+        const unregisterFileWatcher = await this.createFileWatcher();
+        process.on('exit', () => {
+            unregisterFileWatcher();
         });
     }
-    buildChangedProjects() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            while (this.currentlyRunning === 'webpack-build') {
-                yield sleep(50);
+    async buildChangedProjects() {
+        while (this.currentlyRunning === 'webpack-build') {
+            await sleep(50);
+        }
+        this.currentlyRunning = 'nx-build';
+        try {
+            return await new Promise((res) => {
+                this.buildCmdProcess = (0, child_process_1.exec)(this.buildCmd);
+                this.buildCmdProcess.stdout.pipe(process.stdout);
+                this.buildCmdProcess.stderr.pipe(process.stderr);
+                this.buildCmdProcess.on('exit', () => {
+                    res();
+                });
+                this.buildCmdProcess.on('error', () => {
+                    res();
+                });
+            });
+        }
+        finally {
+            this.currentlyRunning = 'none';
+            this.buildCmdProcess = null;
+        }
+    }
+    createFileWatcher() {
+        const runner = new watch_1.BatchFunctionRunner(() => this.buildChangedProjects());
+        return client_1.daemonClient.registerFileWatcher({
+            watchProjects: 'all',
+        }, (err, { changedProjects, changedFiles }) => {
+            if (err === 'closed') {
+                output_1.output.error({
+                    title: 'Watch connection closed',
+                    bodyLines: [
+                        'The daemon has closed the connection to this watch process.',
+                        'Please restart your watch command.',
+                    ],
+                });
+                process.exit(1);
             }
-            this.currentlyRunning = 'nx-build';
-            try {
-                (0, child_process_1.execSync)(this.buildCmd, { stdio: [0, 1, 2] });
-                // eslint-disable-next-line no-empty
+            if (this.buildCmdProcess) {
+                this.buildCmdProcess.kill(2);
+                this.buildCmdProcess = null;
             }
-            catch (e) { }
-            this.currentlyRunning = 'none';
+            // Queue a build
+            runner.enqueue(changedProjects, changedFiles);
         });
     }
 }
@@ -52,32 +83,3 @@ exports.WebpackNxBuildCoordinationPlugin = WebpackNxBuildCoordinationPlugin;
 function sleep(time) {
     return new Promise((resolve) => setTimeout(resolve, time));
 }
-function getIgnoredGlobs(root) {
-    const ig = (0, ignore_1.default)();
-    try {
-        ig.add((0, fs_1.readFileSync)(`${root}/.gitignore`, 'utf-8'));
-    }
-    catch (_a) { }
-    try {
-        ig.add((0, fs_1.readFileSync)(`${root}/.nxignore`, 'utf-8'));
-    }
-    catch (_b) { }
-    return ig;
-}
-function createFileWatcher(root, changeHandler) {
-    const ignoredGlobs = getIgnoredGlobs(root);
-    const layout = (0, devkit_1.workspaceLayout)();
-    const watcher = (0, chokidar_1.watch)([
-        (0, devkit_2.joinPathFragments)(layout.appsDir, '**'),
-        (0, devkit_2.joinPathFragments)(layout.libsDir, '**'),
-    ], {
-        cwd: root,
-        ignoreInitial: true,
-    });
-    watcher.on('all', (_event, path) => {
-        if (ignoredGlobs.ignores(path))
-            return;
-        changeHandler();
-    });
-    return { close: () => watcher.close() };
-}

package/src/utils/config.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.composePluginsSync = exports.composePlugins = exports.getBaseWebpackPartial = void 0;
-const tslib_1 = require("tslib");
 const with_nx_1 = require("./with-nx");
 const with_web_1 = require("./with-web");
 /** @deprecated use withNx and withWeb plugins directly */
@@ -12,14 +11,12 @@ function getBaseWebpackPartial(options, context) {
 }
 exports.getBaseWebpackPartial = getBaseWebpackPartial;
 function composePlugins(...plugins) {
-    return function combined(config, ctx) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            for (const plugin of plugins) {
-                const fn = yield plugin;
-                config = yield fn(config, ctx);
-            }
-            return config;
-        });
+    return async function combined(config, ctx) {
+        for (const plugin of plugins) {
+            const fn = await plugin;
+            config = await fn(config, ctx);
+        }
+        return config;
     };
 }
 exports.composePlugins = composePlugins;

package/src/utils/create-copy-plugin.js

@@ -5,7 +5,6 @@ const CopyWebpackPlugin = require("copy-webpack-plugin");
 function createCopyPlugin(assets) {
     return new CopyWebpackPlugin({
         patterns: assets.map((asset) => {
-            var _a;
             return {
                 context: asset.input,
                 // Now we remove starting slash to make Webpack place it from the output root.
@@ -16,7 +15,7 @@ function createCopyPlugin(assets) {
                         '.gitkeep',
                         '**/.DS_Store',
                         '**/Thumbs.db',
-                        ...((_a = asset.ignore) !== null && _a !== void 0 ? _a : []),
+                        ...(asset.ignore ?? []),
                     ],
                     dot: true,
                 },

package/src/utils/web-babel-loader.js

@@ -1,18 +1,6 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 module.exports = require('babel-loader').custom(() => {
     return {
-        customOptions(_a) {
-            var { isTest, isModern, emitDecoratorMetadata } = _a, loader = __rest(_a, ["isTest", "isModern", "emitDecoratorMetadata"]);
+        customOptions({ isTest, isModern, emitDecoratorMetadata, ...loader }) {
             return {
                 custom: { isTest, isModern, emitDecoratorMetadata },
                 loader,

package/src/utils/webpack/normalize-entry.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeExtraEntryPoints = void 0;
-const tslib_1 = require("tslib");
 function normalizeExtraEntryPoints(extraEntryPoints, defaultBundleName) {
     return extraEntryPoints.map((entry) => {
         let normalizedEntry;
@@ -13,7 +12,7 @@ function normalizeExtraEntryPoints(extraEntryPoints, defaultBundleName) {
             };
         }
         else {
-            const { inject = true } = entry, newEntry = tslib_1.__rest(entry, ["inject"]);
+            const { inject = true, ...newEntry } = entry;
             let bundleName;
             if (entry.bundleName) {
                 bundleName = entry.bundleName;
@@ -21,7 +20,7 @@ function normalizeExtraEntryPoints(extraEntryPoints, defaultBundleName) {
             else {
                 bundleName = defaultBundleName;
             }
-            normalizedEntry = Object.assign(Object.assign({}, newEntry), { bundleName });
+            normalizedEntry = { ...newEntry, bundleName };
         }
         return normalizedEntry;
     });