@nx/webpack 23.2.0-beta.1 → 23.2.0-beta.11

package/README.md

@@ -7,9 +7,9 @@
 
 <div style="text-align: center;">
 
-[![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
+[![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)](<>)
 [![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
-[![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
+[![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)](<>)
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Join us on the Official Nx Discord Server](https://img.shields.io/discord/1143497901675401286?label=discord)](https://go.nx.dev/community)
 [![Nx Sandboxing](https://staging.nx.app/workspaces/62d013ea0852fe0a2df74438/sandbox-badge.svg)](https://nx.dev/docs/features/ci-features/sandboxing)

package/dist/src/executors/webpack/schema.d.ts

@@ -93,8 +93,7 @@ export interface WebpackExecutorOptions {
   rebaseRootRelative?: boolean;
 }
 
-export interface NormalizedWebpackExecutorOptions
-  extends WebpackExecutorOptions {
+export interface NormalizedWebpackExecutorOptions extends WebpackExecutorOptions {
   outputFileName: string;
   assets: AssetGlobPattern[];
   root: string;

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/generate-package-json-plugin.js

@@ -55,16 +55,13 @@ class GeneratePackageJsonPlugin {
                     ...packageJson.dependencies,
                     ...runtimeDependencies,
                 };
-                compilation.emitAsset('package.json', new sources.RawSource((0, devkit_1.serializeJson)(packageJson)));
                 const packageManager = (0, devkit_1.detectPackageManager)(this.options.root);
-                if (packageManager === 'bun') {
-                    compilation
-                        .getLogger('GeneratePackageJsonPlugin')
-                        .warn('Bun lockfile generation is not supported. Only package.json will be generated.');
-                }
-                else {
-                    compilation.emitAsset((0, js_1.getLockFileName)(packageManager), new sources.RawSource((0, js_1.createLockFile)(packageJson, this.options.projectGraph, packageManager)));
-                }
+                (0, js_1.generatePrunedDeployOutput)(packageJson, this.options.projectGraph, this.options.projectGraph.nodes[this.options.projectName].data.root, {
+                    emit: (assetPath, content) => compilation.emitAsset(assetPath, new sources.RawSource(content)),
+                    packageManager,
+                    workspaceRoot: this.options.root,
+                });
+                compilation.emitAsset('package.json', new sources.RawSource((0, devkit_1.serializeJson)(packageJson)));
             });
         });
     }

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

@@ -24,6 +24,23 @@ const extensionAlias = {
 };
 const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
 const mainFields = ['module', 'main'];
+/**
+ * `withNx` builds a raw config that webpack validates, and only the boolean is
+ * schema-valid before 5.110. `NxAppWebpackPlugin` instead mutates options that
+ * are already normalized, which 5.110 fills by setting `.javascript` on
+ * `minimize`, so a boolean throws there.
+ */
+function setMinimizeValue(optimization, shouldMinify, configIsNormalized) {
+    if (!shouldMinify) {
+        optimization.minimize = false;
+        return;
+    }
+    if (configIsNormalized) {
+        optimization.minimize = {};
+        return;
+    }
+    optimization.minimize = true;
+}
 function applyBaseConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     // Defaults that was applied from executor schema previously.
     options.compiler ??= 'babel';
@@ -31,13 +48,13 @@ function applyBaseConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     options.fileReplacements ??= [];
     options.memoryLimit ??= 2048;
     options.transformers ??= [];
-    applyNxIndependentConfig(options, config);
+    applyNxIndependentConfig(options, config, !!useNormalizedEntry);
     // Some of the options only work during actual tasks, not when reading the webpack config during CreateNodes.
     if (global.NX_GRAPH_CREATION)
         return;
     applyNxDependentConfig(options, config, { useNormalizedEntry });
 }
-function applyNxIndependentConfig(options, config) {
+function applyNxIndependentConfig(options, config, configIsNormalized) {
     const TerserPlugin = require('terser-webpack-plugin');
     const hashFormat = (0, hash_format_1.getOutputHashFormat)(options.outputHashing);
     config.context = path.join(options.root, options.projectRoot);
@@ -126,12 +143,12 @@ function applyNxIndependentConfig(options, config) {
         (x) => IGNORED_WEBPACK_WARNINGS.some((r) => typeof x === 'string' ? r.test(x) : r.test(x.message)),
         ...(config.ignoreWarnings ?? []),
     ];
+    const shouldMinify = typeof options.optimization === 'object'
+        ? !!options.optimization.scripts
+        : !!options.optimization;
     config.optimization = {
         ...config.optimization,
         sideEffects: true,
-        minimize: typeof options.optimization === 'object'
-            ? !!options.optimization.scripts
-            : !!options.optimization,
         minimizer: [
             options.compiler !== 'swc'
                 ? new TerserPlugin({
@@ -164,6 +181,7 @@ function applyNxIndependentConfig(options, config) {
         runtimeChunk: false,
         concatenateModules: true,
     };
+    setMinimizeValue(config.optimization, shouldMinify, configIsNormalized);
     config.stats = {
         hash: true,
         timings: false,

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/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,21 +20,22 @@ 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)();
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
+        const includePnpmMajorRuntimeInput = (0, internal_2.shouldIncludePnpmMajorRuntimeInput)(packageManager, context.workspaceRoot);
         try {
             const { entries, preErrors } = await filterWebpackConfigs(configFilePaths, context);
-            const projectHashes = await (0, internal_1.calculateHashesForCreateNodes)(entries.map((e) => e.projectRoot), normalizedOptions, context, entries.map(() => [lockFileName]));
+            const projectHashes = await (0, internal_1.calculateHashesForCreateNodes)(entries.map((e) => e.projectRoot), { ...normalizedOptions, includePnpmMajorRuntimeInput }, context, entries.map(() => [lockFileName]));
             let results = [];
             let nodeErrors = [];
             try {
-                results = await (0, devkit_1.createNodesFromFiles)((configFile, opts, ctx, idx) => createNodesInternal(configFile, opts, ctx, targetsCache, isTsSolutionSetup, pmc, projectHashes[idx]), entries.map((e) => e.configFile), normalizedOptions, context);
+                results = await (0, devkit_1.createNodesFromFiles)((configFile, opts, ctx, idx) => createNodesInternal(configFile, opts, ctx, targetsCache, isTsSolutionSetup, packageManager, pmc, includePnpmMajorRuntimeInput, projectHashes[idx]), entries.map((e) => e.configFile), normalizedOptions, context);
             }
             catch (e) {
                 if (e instanceof devkit_1.AggregateCreateNodesError) {
@@ -59,10 +58,10 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc, hash) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, packageManager, pmc, includePnpmMajorRuntimeInput, hash) {
     const projectRoot = (0, path_1.dirname)(configFilePath);
     if (!targetsCache.has(hash)) {
-        targetsCache.set(hash, await createWebpackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc));
+        targetsCache.set(hash, await createWebpackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup, packageManager, pmc, includePnpmMajorRuntimeInput));
     }
     const { targets, metadata } = targetsCache.get(hash);
     return {
@@ -75,7 +74,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         },
     };
 }
-async function createWebpackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc) {
+async function createWebpackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup, packageManager, pmc, includePnpmMajorRuntimeInput) {
     const namedInputs = (0, internal_1.getNamedInputs)(projectRoot, context);
     const webpackConfig = (0, resolve_user_defined_webpack_config_1.resolveUserDefinedWebpackConfig)((0, path_1.join)(context.workspaceRoot, configFilePath), (0, js_1.getRootTsConfigPath)(), true);
     const webpackOptions = await (0, read_webpack_options_1.readWebpackOptions)(webpackConfig);
@@ -91,23 +90,21 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
         options: { cwd: projectRoot, env: { NODE_ENV: 'production' } },
         cache: true,
         dependsOn: [`^${options.buildTargetName}`],
-        inputs: 'production' in namedInputs
-            ? [
-                'production',
-                '^production',
-                {
-                    externalDependencies: ['webpack-cli'],
-                },
-                internal_2.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
-            ]
-            : [
-                'default',
-                '^default',
-                {
-                    externalDependencies: ['webpack-cli'],
-                },
-                internal_2.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
-            ],
+        inputs: [
+            ...('production' in namedInputs
+                ? ['production', '^production']
+                : ['default', '^default']),
+            {
+                externalDependencies: ['webpack-cli'],
+            },
+            internal_2.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
+            // The build can emit a pruned pnpm deploy output (NxAppWebpackPlugin
+            // with generatePackageJson), whose install settings come from these
+            // otherwise-unhashed root sources.
+            ...(packageManager === 'pnpm'
+                ? (0, internal_2.pnpmInstallSettingsInputsForInferredTarget)(includePnpmMajorRuntimeInput)
+                : []),
+        ],
         outputs,
         metadata: {
             technologies: ['webpack'],

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/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.2.0-beta.1",
+  "version": "23.2.0-beta.11",
   "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.2.0-beta.1",
-    "@nx/js": "23.2.0-beta.1"
+    "@nx/devkit": "23.2.0-beta.11",
+    "@nx/js": "23.2.0-beta.11"
   },
   "peerDependencies": {
     "webpack": "^5.0.0",
@@ -138,7 +138,7 @@
     }
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.1"
+    "nx": "23.2.0-beta.11"
   },
   "publishConfig": {
     "access": "public"