@nx/webpack 22.6.4 → 22.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "22.6.4",
+  "version": "22.6.5",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -64,11 +64,11 @@
     "webpack-dev-server": "^5.2.1",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "22.6.4",
-    "@nx/js": "22.6.4"
+    "@nx/devkit": "22.6.5",
+    "@nx/js": "22.6.5"
   },
   "devDependencies": {
-    "nx": "22.6.4"
+    "nx": "22.6.5"
   },
   "publishConfig": {
     "access": "public"

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/webpack/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAIlB,aAAa,EAQd,MAAM,YAAY,CAAC;AAepB,MAAM,WAAW,oBAAoB;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAeD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,oBAAoB,CA6B3D,CAAC;AAEF,eAAO,MAAM,aAAa,qCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/webpack/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAIlB,aAAa,EASd,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,oBAAoB;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAeD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,oBAAoB,CAiC3D,CAAC;AAEF,eAAO,MAAM,aAAa,qCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -13,7 +13,6 @@ 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");
 const util_1 = require("@nx/js/src/plugins/typescript/util");
-const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
@@ -36,8 +35,9 @@ exports.createNodes = [
         const targetsCache = readTargetsCache(cachePath);
         const normalizedOptions = normalizeOptions(options);
         const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup), configFilePaths, normalizedOptions, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup, pmc), configFilePaths, normalizedOptions, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);
@@ -45,7 +45,7 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc) {
     const projectRoot = (0, path_1.dirname)(configFilePath);
     // Do not create a project if package.json and project.json isn't there.
     const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
@@ -54,7 +54,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         return {};
     }
     const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-    targetsCache[hash] ??= await createWebpackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup);
+    targetsCache[hash] ??= await createWebpackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc);
     const { targets, metadata } = targetsCache[hash];
     return {
         projects: {
@@ -66,7 +66,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         },
     };
 }
-async function createWebpackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup) {
+async function createWebpackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc) {
     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)(), true);
     const webpackOptions = await (0, read_webpack_options_1.readWebpackOptions)(webpackConfig);
@@ -203,10 +203,10 @@ function normalizeOutputPath(outputPath, projectRoot) {
         }
         else {
             if (outputPath.startsWith('..')) {
-                return (0, path_1.join)('{workspaceRoot}', (0, path_1.join)(projectRoot, outputPath));
+                return (0, devkit_1.joinPathFragments)('{workspaceRoot}', projectRoot, outputPath);
             }
             else {
-                return (0, path_1.join)('{projectRoot}', outputPath);
+                return (0, devkit_1.joinPathFragments)('{projectRoot}', outputPath);
             }
         }
     }