@nx/webpack 22.7.0-pr.35019.f500fd7 → 22.7.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "22.7.0-pr.35019.f500fd7",
+  "version": "22.7.0-rc.0",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -16,7 +16,8 @@
     "Front-end"
   ],
   "main": "./index.js",
-  "typings": "./index.d.ts",
+  "type": "commonjs",
+  "types": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {
@@ -49,7 +50,7 @@
     "parse5": "4.0.0",
     "postcss": "^8.4.38",
     "postcss-import": "~14.1.0",
-    "postcss-loader": "^6.1.1",
+    "postcss-loader": "^8.2.1",
     "rxjs": "^7.8.0",
     "sass": "^1.85.0",
     "sass-embedded": "^1.83.4",
@@ -64,15 +65,13 @@
     "webpack-dev-server": "^5.2.1",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "22.7.0-pr.35019.f500fd7",
-    "@nx/js": "22.7.0-pr.35019.f500fd7"
+    "@nx/devkit": "22.7.0-rc.0",
+    "@nx/js": "22.7.0-rc.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-pr.35019.f500fd7"
+    "nx": "22.7.0-rc.0"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "types": "./index.d.ts",
-  "type": "commonjs"
+  }
 }

package/src/plugins/nx-typescript-webpack-plugin/nx-tsconfig-paths-webpack-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nx-tsconfig-paths-webpack-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/plugins/nx-typescript-webpack-plugin/nx-tsconfig-paths-webpack-plugin.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,KAAK,aAAa,EAClB,KAAK,wBAAwB,EAC9B,MAAM,SAAS,CAAC;AAOjB,OAAO,EAAE,mCAAmC,EAAE,MAAM,oDAAoD,CAAC;AAGzG,qBAAa,4BAA4B;IAC3B,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,mCAAmC;IAOhE,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAuB/B,yBAAyB,CACvB,MAAM,EAAE,OAAO,CAAC,wBAAwB,GAAG,aAAa,CAAC,EACzD,OAAO,EAAE,mCAAmC,GAC3C,IAAI;CAoCR"}
+{"version":3,"file":"nx-tsconfig-paths-webpack-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/plugins/nx-typescript-webpack-plugin/nx-tsconfig-paths-webpack-plugin.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,KAAK,aAAa,EAClB,KAAK,wBAAwB,EAC9B,MAAM,SAAS,CAAC;AAQjB,OAAO,EAAE,mCAAmC,EAAE,MAAM,oDAAoD,CAAC;AAGzG,qBAAa,4BAA4B;IAC3B,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,mCAAmC;IAOhE,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAyB/B,yBAAyB,CACvB,MAAM,EAAE,OAAO,CAAC,wBAAwB,GAAG,aAAa,CAAC,EACzD,OAAO,EAAE,mCAAmC,GAC3C,IAAI;CAoCR"}

package/src/plugins/nx-typescript-webpack-plugin/nx-tsconfig-paths-webpack-plugin.js

@@ -6,6 +6,7 @@ const path = tslib_1.__importStar(require("path"));
 const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
 const devkit_1 = require("@nx/devkit");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const ts_config_1 = require("@nx/js/src/utils/typescript/ts-config");
 const webpack_nx_build_coordination_plugin_1 = require("../webpack-nx-build-coordination-plugin");
 class NxTsconfigPathsWebpackPlugin {
     constructor(options) {
@@ -24,10 +25,12 @@ class NxTsconfigPathsWebpackPlugin {
             ...compiler.options.resolve,
             plugins: compiler.options.resolve?.plugins ?? [],
         };
+        const configFile = !path.isAbsolute(this.options.tsConfig)
+            ? path.join(devkit_1.workspaceRoot, this.options.tsConfig)
+            : this.options.tsConfig;
         compiler.options.resolve.plugins.push(new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({
-            configFile: !path.isAbsolute(this.options.tsConfig)
-                ? path.join(devkit_1.workspaceRoot, this.options.tsConfig)
-                : this.options.tsConfig,
+            configFile,
+            baseUrl: (0, ts_config_1.resolvePathsBaseUrl)(configFile),
             extensions: Array.from(extensions),
             mainFields: ['module', 'main'],
         }));

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);
             }
         }
     }

package/project.json

@@ -1,52 +0,0 @@
-{
-    "name": "webpack",
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "sourceRoot": "packages/webpack",
-    "projectType": "library",
-    "targets": {
-        "build": {
-            "outputs": ["{workspaceRoot}/dist/packages/webpack/README.md"],
-            "command": "node ./scripts/copy-readme.js webpack"
-        },
-        "legacy-post-build": {
-            "executor": "@nx/workspace-plugin:legacy-post-build",
-            "options": {
-                "tsConfig": "./tsconfig.lib.json",
-                "assets": [
-                    {
-                        "input": "packages/webpack",
-                        "glob": "**/files/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/webpack",
-                        "glob": "**/files/**/.gitkeep",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/webpack",
-                        "glob": "**/*.json",
-                        "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/webpack",
-                        "glob": "**/*.js",
-                        "ignore": ["**/jest.config.js"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/webpack",
-                        "glob": "**/*.d.ts",
-                        "output": "/"
-                    },
-                    {
-                        "input": "",
-                        "glob": "LICENSE",
-                        "output": "/"
-                    }
-                ]
-            }
-        }
-    }
-}