@nx/webpack 17.2.0-beta.9 → 17.2.0-canary.20231207-b8d24e6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "17.2.0-beta.9",
+  "version": "17.2.0-canary.20231207-b8d24e6",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -62,9 +62,9 @@
     "webpack-dev-server": "^4.9.3",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "17.2.0-beta.9",
-    "@nx/js": "17.2.0-beta.9",
-    "@nrwl/webpack": "17.2.0-beta.9"
+    "@nx/devkit": "17.2.0-canary.20231207-b8d24e6",
+    "@nx/js": "17.2.0-canary.20231207-b8d24e6",
+    "@nrwl/webpack": "17.2.0-canary.20231207-b8d24e6"
   },
   "publishConfig": {
     "access": "public"

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

@@ -69,6 +69,10 @@ function applyNxIndependentConfig(options, config) {
                 : false;
     config.output = {
         ...config.output,
+        libraryTarget: (config.output?.libraryTarget ??
+            options.target === 'node')
+            ? 'commonjs'
+            : undefined,
         path: config.output?.path ??
             (options.outputPath
                 ? path.join(options.root, options.outputPath)

package/src/plugins/plugin.d.ts

@@ -2,7 +2,7 @@ import { CreateDependencies, CreateNodes } from '@nx/devkit';
 export interface WebpackPluginOptions {
     buildTargetName?: string;
     serveTargetName?: string;
-    staticServeTargetName?: string;
+    serveStaticTargetName?: string;
     previewTargetName?: string;
 }
 export declare const createDependencies: CreateDependencies;

package/src/plugins/plugin.js

@@ -4,7 +4,6 @@ exports.createNodes = exports.createDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
-const project_configuration_utils_1 = require("nx/src/project-graph/utils/project-configuration-utils");
 const fs_1 = require("fs");
 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");
@@ -31,7 +30,7 @@ exports.createNodes = [
         options ??= {};
         options.buildTargetName ??= 'build';
         options.serveTargetName ??= 'serve';
-        options.staticServeTargetName ??= 'static-serve';
+        options.serveStaticTargetName ??= 'serve-static';
         options.previewTargetName ??= 'preview';
         const projectRoot = (0, path_1.dirname)(configFilePath);
         // Do not create a project if package.json and project.json isn't there.
@@ -58,7 +57,7 @@ exports.createNodes = [
 ];
 async function createWebpackTargets(configFilePath, projectRoot, options, context) {
     const namedInputs = (0, get_named_inputs_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)());
+    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);
     const outputPath = normalizeOutputPath(webpackOptions.output?.path) ??
         '{workspaceRoot}/dist/{projectRoot}';
@@ -66,35 +65,26 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
     const configBasename = (0, path_1.basename)(configFilePath);
     targets[options.buildTargetName] = {
         command: `webpack -c ${configBasename} --node-env=production`,
-        options: {
-            cwd: projectRoot,
-        },
+        options: { cwd: projectRoot },
+        cache: true,
+        dependsOn: [`^${options.buildTargetName}`],
+        inputs: 'production' in namedInputs
+            ? [
+                'default',
+                '^production',
+                {
+                    externalDependencies: ['webpack-cli'],
+                },
+            ]
+            : [
+                'default',
+                '^default',
+                {
+                    externalDependencies: ['webpack-cli'],
+                },
+            ],
+        outputs: [outputPath],
     };
-    const buildTargetDefaults = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(options.buildTargetName, context.nxJsonConfiguration.targetDefaults);
-    if (buildTargetDefaults?.cache === undefined) {
-        targets[options.buildTargetName].cache = true;
-    }
-    if (buildTargetDefaults?.inputs === undefined) {
-        targets[options.buildTargetName].inputs =
-            'production' in namedInputs
-                ? [
-                    'default',
-                    '^production',
-                    {
-                        externalDependencies: ['webpack-cli'],
-                    },
-                ]
-                : [
-                    'default',
-                    '^default',
-                    {
-                        externalDependencies: ['webpack-cli'],
-                    },
-                ];
-    }
-    if (buildTargetDefaults?.outputs === undefined) {
-        targets[options.buildTargetName].outputs = [outputPath];
-    }
     targets[options.serveTargetName] = {
         command: `webpack serve -c ${configBasename} --node-env=development`,
         options: {
@@ -107,10 +97,10 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
             cwd: projectRoot,
         },
     };
-    targets[options.staticServeTargetName] = {
+    targets[options.serveStaticTargetName] = {
         executor: '@nx/web:file-server',
         options: {
-            buildTarget: `${projectRoot}:${options.buildTargetName}`,
+            buildTarget: options.buildTargetName,
         },
     };
     return targets;

package/src/utils/webpack/resolve-user-defined-webpack-config.d.ts

@@ -1 +1,3 @@
-export declare function resolveUserDefinedWebpackConfig(path: string, tsConfig: string): any;
+export declare function resolveUserDefinedWebpackConfig(path: string, tsConfig: string, 
+/** Skip require cache and return latest content */
+reload?: boolean): any;

package/src/utils/webpack/resolve-user-defined-webpack-config.js

@@ -2,7 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveUserDefinedWebpackConfig = void 0;
 const internal_1 = require("@nx/js/src/internal");
-function resolveUserDefinedWebpackConfig(path, tsConfig) {
+function resolveUserDefinedWebpackConfig(path, tsConfig, 
+/** Skip require cache and return latest content */
+reload = false) {
+    if (reload) {
+        // Clear cache if the path is in the cache
+        if (require.cache[path]) {
+            // Clear all entries because config may import other modules
+            for (const k of Object.keys(require.cache)) {
+                delete require.cache[k];
+            }
+        }
+    }
     // Don't transpile non-TS files. This prevents workspaces libs from being registered via tsconfig-paths.
     // There's an issue here with Nx workspace where loading plugins from source (via tsconfig-paths) can lead to errors.
     if (!/\.(ts|mts|cts)$/.test(path)) {