@nx/webpack 23.2.0-pr.36527.2252709 → 23.2.0-pr.36866.449f6f3

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

@@ -82,6 +82,7 @@ export interface WebpackExecutorOptions {
   crossOrigin?: 'none' | 'anonymous' | 'use-credentials';
   deployUrl?: string;
   extractCss?: boolean;
+  cssModuleHashFunction?: string;
   generateIndexHtml?: boolean;
   index?: string;
   postcssConfig?: string;
@@ -93,8 +94,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/executors/webpack/schema.json

@@ -265,6 +265,10 @@
       "type": "boolean",
       "description": "Extract CSS into a `.css` file."
     },
+    "cssModuleHashFunction": {
+      "type": "string",
+      "description": "Hash algorithm used to generate CSS module class names. Defaults to `md5`, which FIPS-restricted OpenSSL rejects. Changing it renames generated class names."
+    },
     "subresourceIntegrity": {
       "type": "boolean",
       "description": "Enables the use of subresource integrity validation."

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

@@ -1,4 +1,3 @@
-import { getCSSModuleLocalIdent } from '../../../utils/get-css-module-local-ident';
 import { NormalizedNxAppWebpackPluginOptions } from '../nx-app-webpack-plugin-options';
 interface PostcssOptions {
     (loader: any): any;
@@ -12,7 +11,7 @@ export declare function getCommonLoadersForCssModules(options: NormalizedNxAppWe
     options: {
         modules: {
             mode: string;
-            getLocalIdent: typeof getCSSModuleLocalIdent;
+            getLocalIdent: (ctx: any, localIdentName: any, localName: any, loaderOptions: any) => any;
             namedExport: boolean;
             exportLocalsConvention: string;
         };

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

@@ -24,7 +24,7 @@ function getCommonLoadersForCssModules(options, includePaths) {
             options: {
                 modules: {
                     mode: 'local',
-                    getLocalIdent: get_css_module_local_ident_1.getCSSModuleLocalIdent,
+                    getLocalIdent: (ctx, localIdentName, localName, loaderOptions) => (0, get_css_module_local_ident_1.getCSSModuleLocalIdent)(ctx, localIdentName, localName, loaderOptions, options.cssModuleHashFunction),
                     // 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.

package/dist/src/plugins/nx-webpack-plugin/nx-app-webpack-plugin-options.d.ts

@@ -74,6 +74,11 @@ export interface NxAppWebpackPluginOptions {
      * Set `crossorigin` attribute on the `script` and `link` tags.
      */
     crossOrigin?: 'none' | 'anonymous' | 'use-credentials';
+    /**
+     * Hash algorithm used to generate CSS module class names. Defaults to `md5`,
+     * which FIPS-restricted OpenSSL rejects. Changing it renames generated class names.
+     */
+    cssModuleHashFunction?: string;
     /**
      * The deploy path for the application. e.g. `/my-app/`
      */

package/dist/src/plugins/plugin.js

@@ -28,13 +28,14 @@ exports.createNodes = [
         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) {
@@ -57,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 {
@@ -73,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);
@@ -87,25 +88,28 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
     targets[options.buildTargetName] = {
         command: `webpack-cli build`,
         options: { cwd: projectRoot, env: { NODE_ENV: 'production' } },
+        configurations: {
+            development: {
+                env: { NODE_ENV: 'development' },
+            },
+        },
         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/utils/e2e-web-server-info-utils.js

@@ -8,7 +8,10 @@ async function getWebpackE2EWebServerInfo(tree, projectName, configFilePath, isP
     let e2ePort = e2ePortOverride ?? 4200;
     const servePort = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)
         ?.options?.port;
-    if (servePort) {
+    // targetDefaults is a workspace-wide fallback, so it fills in only when the caller
+    // did not ask for a port. Letting it win over an explicit request would point e2e at
+    // a different port than the serve target the generator just wrote.
+    if (servePort && e2ePortOverride == null) {
         e2ePort = servePort;
     }
     return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
@@ -22,5 +25,6 @@ async function getWebpackE2EWebServerInfo(tree, projectName, configFilePath, isP
         defaultE2EWebServerAddress: `http://localhost:${e2ePort}`,
         defaultE2ECiBaseUrl: `http://localhost:${e2ePort}`,
         defaultE2EPort: e2ePort,
+        e2EPortIsExplicit: e2ePortOverride != null,
     }, isPluginBeingAdded);
 }

package/dist/src/utils/get-css-module-local-ident.d.ts

@@ -1 +1 @@
-export declare function getCSSModuleLocalIdent(ctx: any, localIdentName: any, localName: any, options: any): any;
+export declare function getCSSModuleLocalIdent(ctx: any, localIdentName: any, localName: any, options: any, hashFunction?: string): any;

package/dist/src/utils/get-css-module-local-ident.js

@@ -3,13 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCSSModuleLocalIdent = getCSSModuleLocalIdent;
 const path_1 = require("path");
 const loader_utils_1 = require("loader-utils");
-function getCSSModuleLocalIdent(ctx, localIdentName, localName, options) {
+function getCSSModuleLocalIdent(ctx, localIdentName, localName, options, hashFunction) {
     // Use the filename or folder name, based on some uses the index.js / index.module.(css|scss|sass) project style
     const fileNameOrFolder = ctx.resourcePath.match(/index\.module\.(css|scss|sass)$/)
         ? '[folder]'
         : '[name]';
     // Create a hash based on a the file location and class name. Will be unique across a project, and close to globally unique.
-    const hash = (0, loader_utils_1.getHashDigest)(path_1.posix.relative(ctx.rootContext, ctx.resourcePath) + localName, 'md5', 'base64', 5);
+    const hash = (0, loader_utils_1.getHashDigest)(path_1.posix.relative(ctx.rootContext, ctx.resourcePath) + localName, 
+    // md5 is unavailable under FIPS-restricted OpenSSL (nx#36829). Env var stays
+    // undocumented on purpose - `cssModuleHashFunction` is the documented option.
+    hashFunction || process.env.NX_CSS_MODULE_HASH_FUNCTION || 'md5', 'base64', 5);
     // Use loaderUtils to find the file or folder name
     const className = (0, loader_utils_1.interpolateName)(ctx, `${fileNameOrFolder}_${localName}__${hash}`, options);
     // Remove the .module that appears in every classname when based on the file and replace all "." with "_".

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "23.2.0-pr.36527.2252709",
+  "version": "23.2.0-pr.36866.449f6f3",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -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-pr.36527.2252709",
-    "@nx/js": "23.2.0-pr.36527.2252709"
+    "@nx/devkit": "23.2.0-pr.36866.449f6f3",
+    "@nx/js": "23.2.0-pr.36866.449f6f3"
   },
   "peerDependencies": {
     "webpack": "^5.0.0",
@@ -138,7 +138,7 @@
     }
   },
   "devDependencies": {
-    "nx": "23.2.0-pr.36527.2252709"
+    "nx": "23.2.0-pr.36866.449f6f3"
   },
   "publishConfig": {
     "access": "public"