@nx/webpack 23.1.0 → 23.1.2

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

@@ -89,6 +89,11 @@ async function* webpackExecutor(_options, context) {
     // Run build sequentially and bail when first one fails.
     (0, operators_1.mergeScan)((acc, config) => {
         if (!acc.hasErrors()) {
+            // Propagate watch mode from executor options to webpack config.
+            // Without this, NxAppWebpackPlugin-based configs run in single-run
+            // mode even when the executor is invoked with watch: true, causing
+            // @nx/js:node to restart the process after every build.
+            config.watch = options.watch ?? config.watch;
             return (0, run_webpack_1.runWebpack)(config).pipe((0, operators_1.tap)((stats) => {
                 console.info(stats.toString(config.stats));
             }));

package/dist/src/generators/convert-to-inferred/convert-to-inferred.d.ts

@@ -1,5 +1,4 @@
-import { type Tree } from '@nx/devkit';
-import { logger as devkitLogger } from 'nx/src/devkit-exports';
+import { type Tree, logger as devkitLogger } from '@nx/devkit';
 interface Schema {
     project?: string;
     skipFormat?: boolean;

package/dist/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -8,7 +8,6 @@ const tsquery_1 = require("@phenomnomnominal/tsquery");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 const utils_1 = require("./utils");
-const devkit_exports_1 = require("nx/src/devkit-exports");
 async function convertToInferred(tree, options) {
     (0, versions_1.assertSupportedWebpackVersion)(tree);
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
@@ -90,12 +89,12 @@ function createCollectingLogger() {
         loggedMessages.forEach((messages, method) => {
             messages.forEach((message) => {
                 if (!filter || filter(message)) {
-                    devkit_exports_1.logger[method](message);
+                    devkit_1.logger[method](message);
                 }
             });
         });
     };
-    return new Proxy({ ...devkit_exports_1.logger, loggedMessages, flushLogs }, {
+    return new Proxy({ ...devkit_1.logger, loggedMessages, flushLogs }, {
         get(target, property) {
             const originalMethod = target[property];
             if (typeof originalMethod === 'function') {

package/dist/src/plugins/nx-webpack-plugin/lib/apply-base-config.js

@@ -150,6 +150,10 @@ function applyNxIndependentConfig(options, config) {
                 })
                 : new TerserPlugin({
                     minify: TerserPlugin.swcMinify,
+                    // terser-webpack-plugin 5.6+ forwards `extractComments` into swc's
+                    // minify options, which rejects it as an unknown field. Disable it
+                    // like the babel branch does above.
+                    extractComments: false,
                     // `terserOptions` options will be passed to `swc`
                     terserOptions: {
                         module: true,

package/dist/src/plugins/nx-webpack-plugin/lib/stylesheet-loaders.d.ts

@@ -13,6 +13,8 @@ export declare function getCommonLoadersForCssModules(options: NormalizedNxAppWe
         modules: {
             mode: string;
             getLocalIdent: typeof getCSSModuleLocalIdent;
+            namedExport: boolean;
+            exportLocalsConvention: string;
         };
         importLoaders: number;
         implementation?: undefined;

package/dist/src/plugins/nx-webpack-plugin/lib/stylesheet-loaders.js

@@ -25,6 +25,11 @@ function getCommonLoadersForCssModules(options, includePaths) {
                 modules: {
                     mode: 'local',
                     getLocalIdent: get_css_module_local_ident_1.getCSSModuleLocalIdent,
+                    // css-loader 7 defaults namedExport to true, and to camel-case-only
+                    // locals when it is off. Generated components import the default
+                    // export and reference class names as authored, so pin both.
+                    namedExport: false,
+                    exportLocalsConvention: 'asIs',
                 },
                 importLoaders: 1,
             },

package/dist/src/plugins/nx-webpack-plugin/lib/utils.js

@@ -16,12 +16,24 @@ function resolveConditionalExport(target) {
     if (typeof target === 'string') {
         return target;
     }
+    // Fallback arrays: take the first non-empty target. Node resolves them in
+    // order on disk; for the allowlist any valid target marks the subpath.
+    if (Array.isArray(target)) {
+        for (const candidate of target) {
+            const resolved = resolveConditionalExport(candidate);
+            if (resolved) {
+                return resolved;
+            }
+        }
+        return null;
+    }
     if (typeof target === 'object' && target !== null) {
         // Priority order for conditions
         const conditions = ['development', 'import', 'require', 'default'];
         for (const condition of conditions) {
-            if (target[condition] && typeof target[condition] === 'string') {
-                return target[condition];
+            const resolved = resolveConditionalExport(target[condition]);
+            if (resolved) {
+                return resolved;
             }
         }
     }

package/dist/src/plugins/plugin.js

@@ -6,8 +6,6 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const internal_2 = require("@nx/js/internal");
 const fs_1 = require("fs");
-const file_hasher_1 = require("nx/src/hasher/file-hasher");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
 const path_1 = require("path");
 const read_webpack_options_1 = require("../utils/webpack/read-webpack-options");
 const resolve_user_defined_webpack_config_1 = require("../utils/webpack/resolve-user-defined-webpack-config");
@@ -22,8 +20,8 @@ const webpackConfigGlob = '**/webpack.config.{js,ts,mjs,cjs}';
 exports.createNodes = [
     webpackConfigGlob,
     async (configFilePaths, options, context) => {
-        const optionsHash = (0, file_hasher_1.hashObject)(options);
-        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `webpack-${optionsHash}.hash`);
+        const optionsHash = (0, internal_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(internal_1.workspaceDataDirectory, `webpack-${optionsHash}.hash`);
         const targetsCache = new internal_1.PluginCache(cachePath);
         const normalizedOptions = normalizeOptions(options);
         const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();

package/dist/src/plugins/use-legacy-nx-plugin/use-legacy-nx-plugin.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLegacyNxPlugin = useLegacyNxPlugin;
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("../nx-webpack-plugin/lib/normalize-options");
-const configuration_1 = require("nx/src/config/configuration");
+const internal_1 = require("@nx/devkit/internal");
 /**
  * This function is used to wrap the legacy plugin function to be used with the `composePlugins` function.
  * Initially the webpack config would be passed to the legacy plugin function and the options would be passed as a second argument.
@@ -44,7 +44,7 @@ async function useLegacyNxPlugin(fn, executorOptions) {
         root: devkit_1.workspaceRoot,
         projectGraph,
         projectsConfigurations: (0, devkit_1.readProjectsConfigurationFromProjectGraph)(projectGraph),
-        nxJsonConfiguration: (0, configuration_1.readNxJson)(devkit_1.workspaceRoot),
+        nxJsonConfiguration: (0, internal_1.readNxJsonFromDisk)(devkit_1.workspaceRoot),
         target: project.data.targets[targetName],
         targetName: targetName,
         projectName: projectName,

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

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebpackNxBuildCoordinationPlugin = void 0;
 const child_process_1 = require("child_process");
-const client_1 = require("nx/src/daemon/client/client");
-const watch_1 = require("nx/src/command-line/watch/watch");
-const output_1 = require("nx/src/utils/output");
+const internal_1 = require("@nx/devkit/internal");
+const devkit_1 = require("@nx/devkit");
 class WebpackNxBuildCoordinationPlugin {
     constructor(buildCmd, skipInitialBuildOrOptions) {
         this.buildCmd = buildCmd;
@@ -17,11 +16,11 @@ class WebpackNxBuildCoordinationPlugin {
             this.buildChangedProjects();
         }
         if (!options?.skipWatchingDeps) {
-            if ((0, client_1.isDaemonEnabled)()) {
+            if ((0, devkit_1.isDaemonEnabled)()) {
                 this.startWatchingBuildableLibs();
             }
             else {
-                output_1.output.warn({
+                devkit_1.output.warn({
                     title: 'Nx Daemon is not enabled. Buildable libs will not be rebuilt on file changes.',
                 });
             }
@@ -70,8 +69,8 @@ class WebpackNxBuildCoordinationPlugin {
         }
     }
     createFileWatcher() {
-        const runner = new watch_1.BatchFunctionRunner(() => this.buildChangedProjects());
-        return client_1.daemonClient.registerFileWatcher({
+        const runner = new internal_1.BatchFunctionRunner(() => this.buildChangedProjects());
+        return internal_1.daemonClient.registerFileWatcher({
             watchProjects: 'all',
         }, (err, { changedProjects, changedFiles }) => {
             if (err === 'reconnecting') {
@@ -83,13 +82,13 @@ class WebpackNxBuildCoordinationPlugin {
                 return;
             }
             else if (err === 'closed') {
-                output_1.output.error({
+                devkit_1.output.error({
                     title: 'Failed to reconnect to daemon after multiple attempts',
                 });
                 process.exit(1);
             }
             else if (err) {
-                output_1.output.error({
+                devkit_1.output.error({
                     title: `Watch error: ${err?.message ?? 'Unknown'}`,
                 });
             }

package/dist/src/utils/config.js

@@ -6,8 +6,8 @@ exports.composePlugins = composePlugins;
 exports.composePluginsSync = composePluginsSync;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/js/internal");
-const configuration_1 = require("nx/src/config/configuration");
 const deprecation_1 = require("./deprecation");
+const internal_2 = require("@nx/devkit/internal");
 exports.nxWebpackComposablePlugin = 'nxWebpackComposablePlugin';
 function isNxWebpackComposablePlugin(a) {
     return a?.[exports.nxWebpackComposablePlugin] === true;
@@ -78,7 +78,7 @@ function ensureNxWebpackExecutionContext(ctx) {
         targetName,
         configurationName,
         projectsConfigurations: (0, devkit_1.readProjectsConfigurationFromProjectGraph)(projectGraph),
-        nxJsonConfiguration: (0, configuration_1.readNxJson)(devkit_1.workspaceRoot),
+        nxJsonConfiguration: (0, internal_2.readNxJsonFromDisk)(devkit_1.workspaceRoot),
         cwd: process.cwd(),
         root: devkit_1.workspaceRoot,
         isVerbose: process.env['NX_VERBOSE_LOGGING'] === 'true',

package/dist/src/utils/fs.js

@@ -6,7 +6,7 @@ exports.deleteOutputDir = deleteOutputDir;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const fs_1 = require("fs");
-const fileutils_1 = require("nx/src/utils/fileutils");
+const internal_1 = require("@nx/devkit/internal");
 function findUp(names, from, stopOnNodeModules = false) {
     if (!Array.isArray(names)) {
         names = [names];
@@ -35,7 +35,7 @@ function findAllNodeModules(from, root) {
     let current = from;
     while (current && current !== root) {
         const potential = path.join(current, 'node_modules');
-        if ((0, fileutils_1.directoryExists)(potential)) {
+        if ((0, internal_1.directoryExists)(potential)) {
             nodeModules.push(potential);
         }
         const next = path.dirname(current);

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

@@ -4,7 +4,6 @@ exports.PostcssCliResources = PostcssCliResources;
 const tslib_1 = require("tslib");
 const loader_utils_1 = require("loader-utils");
 const path = tslib_1.__importStar(require("path"));
-const url_1 = require("url");
 function wrapUrl(url) {
     let wrappedUrl;
     const hasSingleQuotes = url.indexOf("'") >= 0;
@@ -80,14 +79,19 @@ function PostcssCliResources(options) {
         // Separate URL query/hash from the file path before resolving
         const [, filePath, urlSuffix] = inputUrl.match(/^([^?#]*)(.*)$/);
         const resolvedPath = path.resolve(context, filePath.replace(/\\/g, '/'));
-        const { pathname } = (0, url_1.pathToFileURL)(resolvedPath);
+        // Resolve a relative filesystem path, not a file:// URL pathname: on Windows the
+        // pathname is `/C:/...` (spaces as %20), which the resolver cannot find. Relative
+        // (not absolute) lets `resolve()`'s `./`-prefixed lookup succeed on the first try.
+        const resolveRequest = path
+            .relative(context, resolvedPath)
+            .replace(/\\/g, '/');
         let hash = '';
         let search = '';
         if (urlSuffix) {
             ({ hash, search } = new URL(`file:///dummy${urlSuffix}`));
         }
         const resolver = (file, base) => new Promise((resolve, reject) => {
-            loader.resolve(base, decodeURI(file), (err, result) => {
+            loader.resolve(base, file, (err, result) => {
                 if (err) {
                     reject(err);
                     return;
@@ -95,7 +99,7 @@ function PostcssCliResources(options) {
                 resolve(result);
             });
         });
-        const result = await resolve(pathname, context, resolver);
+        const result = await resolve(resolveRequest, context, resolver);
         return new Promise((resolve, reject) => {
             loader.fs.readFile(result, (err, content) => {
                 if (err) {

package/dist/src/utils/webpack/read-webpack-options.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readWebpackOptions = readWebpackOptions;
 const devkit_1 = require("@nx/devkit");
 const config_1 = require("../config");
-const devkit_internals_1 = require("nx/src/devkit-internals");
+const internal_1 = require("@nx/devkit/internal");
 /**
  * Reads the webpack options from a give webpack configuration. The configuration can be:
  * 1. A standard config object
@@ -34,7 +34,7 @@ async function readWebpackOptions(webpackConfig) {
                     isVerbose: false,
                     projectsConfigurations: null,
                     projectGraph: null,
-                    nxJsonConfiguration: (0, devkit_internals_1.readNxJsonFromDisk)(devkit_1.workspaceRoot),
+                    nxJsonConfiguration: (0, internal_1.readNxJsonFromDisk)(devkit_1.workspaceRoot),
                 },
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "23.1.0",
+  "version": "23.1.2",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -86,7 +86,7 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.23.2",
+    "@babel/core": "^7.29.6",
     "@phenomnomnominal/tsquery": "~6.2.0",
     "ajv": "^8.0.0",
     "autoprefixer": "^10.4.9",
@@ -94,10 +94,10 @@
     "browserslist": "^4.26.0",
     "picocolors": "^1.1.0",
     "copy-webpack-plugin": "^14.0.0",
-    "css-loader": "^6.4.0",
+    "css-loader": "^7.1.4",
     "css-minimizer-webpack-plugin": "^8.0.0",
     "fork-ts-checker-webpack-plugin": "9.1.0",
-    "less": ">=4.1.3 <4.6.0",
+    "less": ">=4.1.3 <4.9.0",
     "less-loader": "^12.2.0",
     "license-webpack-plugin": "^4.0.2",
     "loader-utils": "^2.0.3",
@@ -118,8 +118,8 @@
     "tslib": "^2.3.0",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "23.1.0",
-    "@nx/js": "23.1.0"
+    "@nx/js": "23.1.2",
+    "@nx/devkit": "23.1.2"
   },
   "peerDependencies": {
     "webpack": "^5.0.0",
@@ -138,7 +138,7 @@
     }
   },
   "devDependencies": {
-    "nx": "23.1.0"
+    "nx": "23.1.2"
   },
   "publishConfig": {
     "access": "public"