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

package/src/utils/webpack/plugins/postcss-cli-resources.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostcssCliResources = void 0;
-const tslib_1 = require("tslib");
 const loader_utils_1 = require("loader-utils");
 const path = require("path");
 const url = require("node:url");
@@ -16,21 +15,19 @@ function wrapUrl(url) {
     }
     return `url(${wrappedUrl})`;
 }
-function resolve(file, base, resolver) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            return yield resolver(`./${file}`, base);
-        }
-        catch (_a) {
-            return resolver(file, base);
-        }
-    });
+async function resolve(file, base, resolver) {
+    try {
+        return await resolver(`./${file}`, base);
+    }
+    catch {
+        return resolver(file, base);
+    }
 }
 module.exports.postcss = true;
 function PostcssCliResources(options) {
     const { deployUrl = '', baseHref = '', resourcesOutputPath = '', rebaseRootRelative = false, filename, loader, } = options;
     const dedupeSlashes = (url) => url.replace(/\/\/+/g, '/');
-    const process = (inputUrl, context, resourceCache) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+    const process = async (inputUrl, context, resourceCache) => {
         // If root-relative, absolute or protocol relative url, leave as is
         if (/^((?:\w+:)?\/\/|data:|chrome:|#)/.test(inputUrl)) {
             return inputUrl;
@@ -80,7 +77,7 @@ function PostcssCliResources(options) {
                 resolve(result);
             });
         });
-        const result = yield resolve(pathname, context, resolver);
+        const result = await resolve(pathname, context, resolver);
         return new Promise((resolve, reject) => {
             loader.fs.readFile(result, (err, content) => {
                 if (err) {
@@ -105,7 +102,7 @@ function PostcssCliResources(options) {
                 resolve(outputUrl);
             });
         });
-    });
+    };
     return {
         postcssPlugin: 'postcss-cli-resources',
         Once(root) {
@@ -123,7 +120,7 @@ function PostcssCliResources(options) {
                 return;
             }
             const resourceCache = new Map();
-            return Promise.all(urlDeclarations.map((decl) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return Promise.all(urlDeclarations.map(async (decl) => {
                 const value = decl.value;
                 const urlRegex = /url\(\s*(?:"([^"]+)"|'([^']+)'|(.+?))\s*\)/g;
                 const segments = [];
@@ -138,7 +135,7 @@ function PostcssCliResources(options) {
                     const originalUrl = match[1] || match[2] || match[3];
                     let processedUrl;
                     try {
-                        processedUrl = yield process(originalUrl, context, resourceCache);
+                        processedUrl = await process(originalUrl, context, resourceCache);
                     }
                     catch (err) {
                         loader.emitError(decl.error(err.message, { word: originalUrl }));
@@ -162,7 +159,7 @@ function PostcssCliResources(options) {
                 if (modified) {
                     decl.value = segments.join('');
                 }
-            })));
+            }));
         },
     };
 }

package/src/utils/webpack/plugins/scripts-webpack-plugin.js

@@ -21,13 +21,12 @@ class ScriptsWebpackPlugin {
         this.options = options;
     }
     shouldSkip(compilation, scripts) {
-        var _a;
         if (this._lastBuildTime == undefined) {
             this._lastBuildTime = Date.now();
             return false;
         }
         for (let i = 0; i < scripts.length; i++) {
-            const scriptTime = (_a = compilation.fileTimestamps) === null || _a === void 0 ? void 0 : _a.get(scripts[i]);
+            const scriptTime = compilation.fileTimestamps?.get(scripts[i]);
             if (!scriptTime || scriptTime > this._lastBuildTime) {
                 this._lastBuildTime = Date.now();
                 return false;

package/src/utils/with-nx.js

@@ -57,11 +57,10 @@ const processed = new Set();
  */
 function withNx(pluginOptions) {
     return function configure(config, { options, context, }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         if (processed.has(config))
             return config;
         const plugins = [];
-        if (!(pluginOptions === null || pluginOptions === void 0 ? void 0 : pluginOptions.skipTypeChecking)) {
+        if (!pluginOptions?.skipTypeChecking) {
             plugins.push(new ForkTsCheckerWebpackPlugin({
                 typescript: {
                     configFile: options.tsConfig,
@@ -131,9 +130,14 @@ function withNx(pluginOptions) {
         const chunkFilename = options.outputHashing
             ? `[name]${hashFormat.chunk}.js`
             : '[name].js';
-        const updated = Object.assign(Object.assign({}, config), { context: context
+        const updated = {
+            ...config,
+            context: context
                 ? path.join(context.root, options.projectRoot)
-                : undefined, target: options.target, node: false, mode: 
+                : undefined,
+            target: options.target,
+            node: false,
+            mode: 
             // When the target is Node avoid any optimizations, such as replacing `process.env.NODE_ENV` with build time value.
             options.target === 'node'
                 ? 'none'
@@ -148,27 +152,55 @@ function withNx(pluginOptions) {
                     process.env.NODE_ENV === 'development' ||
                         process.env.NODE_ENV === 'production'
                         ? process.env.NODE_ENV
-                        : 'none', devtool: options.sourceMap === 'hidden'
+                        : 'none',
+            devtool: options.sourceMap === 'hidden'
                 ? 'hidden-source-map'
                 : options.sourceMap
                     ? 'source-map'
-                    : false, entry, output: Object.assign(Object.assign({}, config.output), { libraryTarget: options.target === 'node' ? 'commonjs' : undefined, path: options.outputPath, filename,
-                chunkFilename, hashFunction: 'xxhash64', 
+                    : false,
+            entry,
+            output: {
+                ...config.output,
+                libraryTarget: options.target === 'node' ? 'commonjs' : undefined,
+                path: options.outputPath,
+                filename,
+                chunkFilename,
+                hashFunction: 'xxhash64',
                 // Disabled for performance
-                pathinfo: false, 
+                pathinfo: false,
                 // Use CJS for Node since it has the widest support.
-                scriptType: options.target === 'node' ? undefined : 'module' }), watch: options.watch, watchOptions: {
+                scriptType: options.target === 'node' ? undefined : 'module',
+            },
+            watch: options.watch,
+            watchOptions: {
                 poll: options.poll,
-            }, profile: options.statsJson, resolve: Object.assign(Object.assign({}, config.resolve), { extensions: [...extensions, ...((_b = (_a = config === null || config === void 0 ? void 0 : config.resolve) === null || _a === void 0 ? void 0 : _a.extensions) !== null && _b !== void 0 ? _b : [])], alias: options.fileReplacements.reduce((aliases, replacement) => (Object.assign(Object.assign({}, aliases), { [replacement.replace]: replacement.with })), {}), plugins: [
-                    ...((_d = (_c = config.resolve) === null || _c === void 0 ? void 0 : _c.plugins) !== null && _d !== void 0 ? _d : []),
+            },
+            profile: options.statsJson,
+            resolve: {
+                ...config.resolve,
+                extensions: [...extensions, ...(config?.resolve?.extensions ?? [])],
+                alias: options.fileReplacements.reduce((aliases, replacement) => ({
+                    ...aliases,
+                    [replacement.replace]: replacement.with,
+                }), {}),
+                plugins: [
+                    ...(config.resolve?.plugins ?? []),
                     new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({
                         configFile: options.tsConfig,
-                        extensions: [...extensions, ...((_f = (_e = config === null || config === void 0 ? void 0 : config.resolve) === null || _e === void 0 ? void 0 : _e.extensions) !== null && _f !== void 0 ? _f : [])],
+                        extensions: [...extensions, ...(config?.resolve?.extensions ?? [])],
                         mainFields,
                     }),
-                ], mainFields }), externals, optimization: Object.assign(Object.assign({}, config.optimization), { sideEffects: true, minimize: typeof options.optimization === 'object'
+                ],
+                mainFields,
+            },
+            externals,
+            optimization: {
+                ...config.optimization,
+                sideEffects: true,
+                minimize: typeof options.optimization === 'object'
                     ? !!options.optimization.scripts
-                    : !!options.optimization, minimizer: [
+                    : !!options.optimization,
+                minimizer: [
                     options.compiler !== 'swc'
                         ? new TerserPlugin({
                             parallel: true,
@@ -191,12 +223,24 @@ function withNx(pluginOptions) {
                                 mangle: false,
                             },
                         }),
-                ], runtimeChunk: false, concatenateModules: true }), performance: Object.assign(Object.assign({}, config.performance), { hints: false }), experiments: Object.assign(Object.assign({}, config.experiments), { cacheUnaffected: true }), ignoreWarnings: [
+                ],
+                runtimeChunk: false,
+                concatenateModules: true,
+            },
+            performance: {
+                ...config.performance,
+                hints: false,
+            },
+            experiments: { ...config.experiments, cacheUnaffected: true },
+            ignoreWarnings: [
                 (x) => IGNORED_WEBPACK_WARNINGS.some((r) => typeof x === 'string' ? r.test(x) : r.test(x.message)),
-            ], module: Object.assign(Object.assign({}, config.module), { 
+            ],
+            module: {
+                ...config.module,
                 // Enabled for performance
-                unsafeCache: true, rules: [
-                    ...((_h = (_g = config === null || config === void 0 ? void 0 : config.module) === null || _g === void 0 ? void 0 : _g.rules) !== null && _h !== void 0 ? _h : []),
+                unsafeCache: true,
+                rules: [
+                    ...(config?.module?.rules ?? []),
                     options.sourceMap && {
                         test: /\.js$/,
                         enforce: 'pre',
@@ -220,7 +264,10 @@ function withNx(pluginOptions) {
                         type: 'javascript/auto',
                     },
                     createLoaderFromCompiler(options),
-                ].filter((r) => !!r) }), plugins: ((_j = config.plugins) !== null && _j !== void 0 ? _j : []).concat(plugins), stats: {
+                ].filter((r) => !!r),
+            },
+            plugins: (config.plugins ?? []).concat(plugins),
+            stats: {
                 hash: true,
                 timings: false,
                 cached: false,
@@ -239,14 +286,14 @@ function withNx(pluginOptions) {
                 errorDetails: !!options.verbose,
                 moduleTrace: !!options.verbose,
                 usedExports: !!options.verbose,
-            } });
+            },
+        };
         processed.add(updated);
         return updated;
     };
 }
 exports.withNx = withNx;
 function createLoaderFromCompiler(options) {
-    var _a;
     switch (options.compiler) {
         case 'swc':
             return {
@@ -299,7 +346,7 @@ function createLoaderFromCompiler(options) {
                     emitDecoratorMetadata: tsConfig.options.emitDecoratorMetadata,
                     isModern: true,
                     isTest: process.env.NX_CYPRESS_COMPONENT_TEST === 'true',
-                    envName: (_a = process.env.BABEL_ENV) !== null && _a !== void 0 ? _a : process.env.NODE_ENV,
+                    envName: process.env.BABEL_ENV ?? process.env.NODE_ENV,
                     cacheDirectory: true,
                     cacheCompression: false,
                 },

package/src/utils/with-web.js

@@ -24,10 +24,12 @@ const processed = new Set();
  */
 function withWeb(pluginOptions = {}) {
     return function configure(config, { options: executorOptions, context }) {
-        var _a, _b, _c;
         if (processed.has(config))
             return config;
-        const mergedOptions = Object.assign(Object.assign({}, executorOptions), pluginOptions);
+        const mergedOptions = {
+            ...executorOptions,
+            ...pluginOptions,
+        };
         const plugins = [];
         const stylesOptimization = typeof mergedOptions.optimization === 'object'
             ? mergedOptions.optimization.styles
@@ -66,7 +68,7 @@ function withWeb(pluginOptions = {}) {
         // Determine hashing format.
         const hashFormat = (0, hash_format_1.getOutputHashFormat)(mergedOptions.outputHashing);
         const includePaths = [];
-        if (((_b = (_a = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.stylePreprocessorOptions) === null || _a === void 0 ? void 0 : _a.includePaths) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+        if (mergedOptions?.stylePreprocessorOptions?.includePaths?.length > 0) {
             mergedOptions.stylePreprocessorOptions.includePaths.forEach((includePath) => includePaths.push(path.resolve(mergedOptions.root, includePath)));
         }
         let lessPathOptions = {};
@@ -180,7 +182,10 @@ function withWeb(pluginOptions = {}) {
                         loader: require.resolve('less-loader'),
                         options: {
                             sourceMap: !!mergedOptions.sourceMap,
-                            lessOptions: Object.assign({ javascriptEnabled: true }, lessPathOptions),
+                            lessOptions: {
+                                javascriptEnabled: true,
+                                ...lessPathOptions,
+                            },
                         },
                     },
                 ],
@@ -237,7 +242,10 @@ function withWeb(pluginOptions = {}) {
                         loader: require.resolve('less-loader'),
                         options: {
                             sourceMap: !!mergedOptions.sourceMap,
-                            lessOptions: Object.assign({ javascriptEnabled: true }, lessPathOptions),
+                            lessOptions: {
+                                javascriptEnabled: true,
+                                ...lessPathOptions,
+                            },
                         },
                     },
                 ],
@@ -270,9 +278,12 @@ function withWeb(pluginOptions = {}) {
         new MiniCssExtractPlugin({
             filename: `[name]${hashFormat.extract}.css`,
         }));
-        config.output = Object.assign(Object.assign({}, config.output), { crossOriginLoading: mergedOptions.subresourceIntegrity
+        config.output = {
+            ...config.output,
+            crossOriginLoading: mergedOptions.subresourceIntegrity
                 ? 'anonymous'
-                : false });
+                : false,
+        };
         // In case users customize their webpack config with unsupported entry.
         if (typeof config.entry === 'function')
             throw new Error('Entry function is not supported. Use an object.');
@@ -280,8 +291,14 @@ function withWeb(pluginOptions = {}) {
             throw new Error('Entry string is not supported. Use an object.');
         if (Array.isArray(config.entry))
             throw new Error('Entry array is not supported. Use an object.');
-        config.entry = Object.assign(Object.assign({}, config.entry), entry);
-        config.optimization = Object.assign(Object.assign({}, config.optimization), { minimizer: [...config.optimization.minimizer, ...minimizer], emitOnErrors: false, moduleIds: 'deterministic', runtimeChunk: mergedOptions.runtimeChunk ? 'single' : false, splitChunks: {
+        config.entry = { ...config.entry, ...entry };
+        config.optimization = {
+            ...config.optimization,
+            minimizer: [...config.optimization.minimizer, ...minimizer],
+            emitOnErrors: false,
+            moduleIds: 'deterministic',
+            runtimeChunk: mergedOptions.runtimeChunk ? 'single' : false,
+            splitChunks: {
                 maxAsyncRequests: Infinity,
                 cacheGroups: {
                     default: !!mergedOptions.commonChunk && {
@@ -304,11 +321,14 @@ function withWeb(pluginOptions = {}) {
                         test: /[\\/]node_modules[\\/]/,
                     },
                 },
-            } });
+            },
+        };
         config.plugins.push(...plugins);
         config.resolve.mainFields = ['browser', 'module', 'main'];
-        config.module = Object.assign(Object.assign({}, config.module), { rules: [
-                ...((_c = config.module.rules) !== null && _c !== void 0 ? _c : []),
+        config.module = {
+            ...config.module,
+            rules: [
+                ...(config.module.rules ?? []),
                 // Images: Inline small images, and emit a separate file otherwise.
                 {
                     test: /\.(avif|bmp|gif|ico|jpe?g|png|webp)$/,
@@ -344,7 +364,8 @@ function withWeb(pluginOptions = {}) {
                     },
                 },
                 ...rules,
-            ] });
+            ],
+        };
         processed.add(config);
         return config;
     };