@nx/webpack 23.0.0-beta.17 → 23.0.0-beta.19

package/index.d.ts

@@ -1,6 +1,5 @@
 import { configurationGenerator } from './src/generators/configuration/configuration';
 import { NxAppWebpackPlugin } from './src/plugins/nx-webpack-plugin/nx-app-webpack-plugin';
-import { NxTsconfigPathsWebpackPlugin as _NxTsconfigPathsWebpackPlugin } from './src/plugins/nx-typescript-webpack-plugin/nx-tsconfig-paths-webpack-plugin';
 import { useLegacyNxPlugin } from './src/plugins/use-legacy-nx-plugin/use-legacy-nx-plugin';
 export declare function convertConfigToWebpackPluginGenerator(...args: Parameters<typeof import('./src/generators/convert-config-to-webpack-plugin/convert-config-to-webpack-plugin').convertConfigToWebpackPluginGenerator>): any;
 export { configurationGenerator, useLegacyNxPlugin };
@@ -8,8 +7,6 @@ export { configurationGenerator, useLegacyNxPlugin };
 export declare const webpackProjectGenerator: typeof configurationGenerator;
 /** @deprecated Use NxAppWebpackPlugin from `@nx/webpack/app-plugin` instead, which can improve graph creation by 150-200ms per file. */
 export declare const NxWebpackPlugin: typeof NxAppWebpackPlugin;
-/** @deprecated Use NxTsconfigPathsWebpackPlugin from `@nx/webpack/tsconfig-paths-plugin` instead. */
-export declare const NxTsconfigPathsWebpackPlugin: typeof _NxTsconfigPathsWebpackPlugin;
 export * from './src/utils/create-copy-plugin';
 export * from './src/utils/config';
 export { webpackInitGenerator } from './src/generators/init/init';

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/webpack/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,EAAE,4BAA4B,IAAI,6BAA6B,EAAE,MAAM,6EAA6E,CAAC;AAC5J,OAAO,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAC;AAM5F,wBAAgB,qCAAqC,CACnD,GAAG,IAAI,EAAE,UAAU,CACjB,cAAc,oFAAoF,EAAE,qCAAqC,CAC1I,OAKF;AAED,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,CAAC;AAGrD,wDAAwD;AACxD,eAAO,MAAM,uBAAuB,+BAAyB,CAAC;AAE9D,wIAAwI;AACxI,eAAO,MAAM,eAAe,2BAAqB,CAAC;AAClD,qGAAqG;AACrG,eAAO,MAAM,4BAA4B,sCAAgC,CAAC;AAE1E,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+CAA+C,CAAC;AAC9D,YAAY,EACV,sBAAsB,EACtB,gCAAgC,EAChC,gBAAgB,EAChB,eAAe,GAChB,MAAM,gCAAgC,CAAC;AACxC,cAAc,sCAAsC,CAAC;AACrD,cAAc,wCAAwC,CAAC;AACvD,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uCAAuC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/webpack/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAC;AAM5F,wBAAgB,qCAAqC,CACnD,GAAG,IAAI,EAAE,UAAU,CACjB,cAAc,oFAAoF,EAAE,qCAAqC,CAC1I,OAKF;AAED,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,CAAC;AAGrD,wDAAwD;AACxD,eAAO,MAAM,uBAAuB,+BAAyB,CAAC;AAE9D,wIAAwI;AACxI,eAAO,MAAM,eAAe,2BAAqB,CAAC;AAElD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+CAA+C,CAAC;AAC9D,YAAY,EACV,sBAAsB,EACtB,gCAAgC,EAChC,gBAAgB,EAChB,eAAe,GAChB,MAAM,gCAAgC,CAAC;AACxC,cAAc,sCAAsC,CAAC;AACrD,cAAc,wCAAwC,CAAC;AACvD,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uCAAuC,CAAC"}

package/index.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.webpackInitGenerator = exports.NxTsconfigPathsWebpackPlugin = exports.NxWebpackPlugin = exports.webpackProjectGenerator = exports.useLegacyNxPlugin = exports.configurationGenerator = void 0;
+exports.webpackInitGenerator = exports.NxWebpackPlugin = exports.webpackProjectGenerator = exports.useLegacyNxPlugin = exports.configurationGenerator = void 0;
 exports.convertConfigToWebpackPluginGenerator = convertConfigToWebpackPluginGenerator;
 const tslib_1 = require("tslib");
 const configuration_1 = require("./src/generators/configuration/configuration");
 Object.defineProperty(exports, "configurationGenerator", { enumerable: true, get: function () { return configuration_1.configurationGenerator; } });
 const nx_app_webpack_plugin_1 = require("./src/plugins/nx-webpack-plugin/nx-app-webpack-plugin");
-const nx_tsconfig_paths_webpack_plugin_1 = require("./src/plugins/nx-typescript-webpack-plugin/nx-tsconfig-paths-webpack-plugin");
 const use_legacy_nx_plugin_1 = require("./src/plugins/use-legacy-nx-plugin/use-legacy-nx-plugin");
 Object.defineProperty(exports, "useLegacyNxPlugin", { enumerable: true, get: function () { return use_legacy_nx_plugin_1.useLegacyNxPlugin; } });
 // Lazy-loaded to avoid requiring typescript before it's installed.
@@ -21,8 +20,6 @@ function convertConfigToWebpackPluginGenerator(...args) {
 exports.webpackProjectGenerator = configuration_1.configurationGenerator;
 /** @deprecated Use NxAppWebpackPlugin from `@nx/webpack/app-plugin` instead, which can improve graph creation by 150-200ms per file. */
 exports.NxWebpackPlugin = nx_app_webpack_plugin_1.NxAppWebpackPlugin;
-/** @deprecated Use NxTsconfigPathsWebpackPlugin from `@nx/webpack/tsconfig-paths-plugin` instead. */
-exports.NxTsconfigPathsWebpackPlugin = nx_tsconfig_paths_webpack_plugin_1.NxTsconfigPathsWebpackPlugin;
 tslib_1.__exportStar(require("./src/utils/create-copy-plugin"), exports);
 tslib_1.__exportStar(require("./src/utils/config"), exports);
 var init_1 = require("./src/generators/init/init");

package/migrations.json

@@ -11,6 +11,12 @@
       "version": "22.0.0-beta.0",
       "description": "Remove deprecated deleteOutputPath and sassImplementation options from @nx/webpack:webpack",
       "implementation": "./src/migrations/update-22-0-0/remove-deprecated-options"
+    },
+    "update-23-0-0-remove-nx-tsconfig-paths-webpack-plugin-import": {
+      "cli": "nx",
+      "version": "23.0.0-beta.10",
+      "description": "Rewrites imports of NxTsconfigPathsWebpackPlugin from '@nx/webpack' to the sub-path '@nx/webpack/tsconfig-paths-plugin'.",
+      "factory": "./src/migrations/update-23-0-0/remove-nx-tsconfig-paths-webpack-plugin-import"
     }
   },
   "packageJsonUpdates": {

package/package.json

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

package/src/migrations/update-23-0-0/remove-nx-tsconfig-paths-webpack-plugin-import.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export default function removeNxTsconfigPathsWebpackPluginImport(tree: Tree): Promise<void>;
+//# sourceMappingURL=remove-nx-tsconfig-paths-webpack-plugin-import.d.ts.map

package/src/migrations/update-23-0-0/remove-nx-tsconfig-paths-webpack-plugin-import.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-nx-tsconfig-paths-webpack-plugin-import.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/migrations/update-23-0-0/remove-nx-tsconfig-paths-webpack-plugin-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAwB,MAAM,YAAY,CAAC;AA8BrE,wBAA8B,wCAAwC,CACpE,IAAI,EAAE,IAAI,iBAwHX"}

package/src/migrations/update-23-0-0/remove-nx-tsconfig-paths-webpack-plugin-import.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = removeNxTsconfigPathsWebpackPluginImport;
+const devkit_1 = require("@nx/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const DEPRECATED_SYMBOL = 'NxTsconfigPathsWebpackPlugin';
+const DEPRECATED_PACKAGE = '@nx/webpack';
+const NEW_PACKAGE = '@nx/webpack/tsconfig-paths-plugin';
+// ES module import: import { NxTsconfigPathsWebpackPlugin[, ...] } from '@nx/webpack'
+const ES_IMPORT_SELECTOR = `ImportDeclaration:has(StringLiteral[value=${DEPRECATED_PACKAGE}]):has(ImportClause ImportSpecifier > Identifier[name=${DEPRECATED_SYMBOL}])`;
+const IMPORT_SPECIFIERS_SELECTOR = `ImportClause ImportSpecifier`;
+const TARGET_IMPORT_SPECIFIER_SELECTOR = `ImportClause ImportSpecifier > Identifier[name=${DEPRECATED_SYMBOL}]`;
+const ES_MODULE_PATH_SELECTOR = `StringLiteral[value=${DEPRECATED_PACKAGE}]`;
+// CJS require: const { NxTsconfigPathsWebpackPlugin[, ...] } = require('@nx/webpack')
+const CJS_REQUIRE_STMT_SELECTOR = `VariableStatement:has(ObjectBindingPattern > BindingElement > Identifier[name=${DEPRECATED_SYMBOL}]):has(CallExpression:has(Identifier[name=require]) > StringLiteral[value=${DEPRECATED_PACKAGE}])`;
+const CJS_BINDING_ELEMENTS_SELECTOR = `ObjectBindingPattern > BindingElement`;
+const CJS_TARGET_BINDING_SELECTOR = `ObjectBindingPattern > BindingElement > Identifier[name=${DEPRECATED_SYMBOL}]`;
+const CJS_REQUIRE_PATH_SELECTOR = `CallExpression:has(Identifier[name=require]) > StringLiteral[value=${DEPRECATED_PACKAGE}]`;
+// Walk past whitespace from `fromIndex` to find a trailing comma. Returns the
+// position AFTER the comma if found, otherwise the original index. Handles
+// the `Foo , withReact` shape where the user wrote whitespace before the
+// comma — `node.getEnd()` stops at the identifier and the comma sits one
+// character past the whitespace.
+function endAfterTrailingComma(text, fromIndex) {
+    let i = fromIndex;
+    while (i < text.length && /\s/.test(text.charAt(i)))
+        i++;
+    return text.charAt(i) === ',' ? i + 1 : fromIndex;
+}
+async function removeNxTsconfigPathsWebpackPluginImport(tree) {
+    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+        if (!filePath.endsWith('.ts') &&
+            !filePath.endsWith('.tsx') &&
+            !filePath.endsWith('.js') &&
+            !filePath.endsWith('.jsx') &&
+            !filePath.endsWith('.cjs') &&
+            !filePath.endsWith('.mjs')) {
+            return;
+        }
+        let contents = tree.read(filePath, 'utf-8');
+        if (!contents)
+            return;
+        // Quick check: must contain the deprecated symbol and the deprecated package path
+        if (!contents.includes(DEPRECATED_SYMBOL) ||
+            (!contents.includes(`'${DEPRECATED_PACKAGE}'`) &&
+                !contents.includes(`"${DEPRECATED_PACKAGE}"`))) {
+            return;
+        }
+        let changed = false;
+        // Re-parse on every iteration so multiple matches in the same file work
+        // correctly. The multi-specifier branch prepends a new declaration which
+        // shifts every offset; collected AST positions go stale after one rewrite,
+        // so process one match at a time.
+        let didRewrite = true;
+        while (didRewrite) {
+            didRewrite = false;
+            const sourceFile = (0, tsquery_1.ast)(contents);
+            const importNode = (0, tsquery_1.query)(sourceFile, ES_IMPORT_SELECTOR)[0];
+            if (importNode) {
+                const specifiers = (0, tsquery_1.query)(importNode, IMPORT_SPECIFIERS_SELECTOR);
+                const targetIdentifier = (0, tsquery_1.query)(importNode, TARGET_IMPORT_SPECIFIER_SELECTOR)[0];
+                if (targetIdentifier) {
+                    // Walk to the ImportSpecifier to cover `Foo` and `Foo as Bar`.
+                    const targetSpec = targetIdentifier.parent;
+                    if (specifiers.length === 1) {
+                        const modulePathNode = (0, tsquery_1.query)(importNode, ES_MODULE_PATH_SELECTOR)[0];
+                        if (modulePathNode) {
+                            contents =
+                                contents.slice(0, modulePathNode.getStart()) +
+                                    `'${NEW_PACKAGE}'` +
+                                    contents.slice(modulePathNode.getEnd());
+                            changed = true;
+                            didRewrite = true;
+                            continue;
+                        }
+                    }
+                    else {
+                        // Extract target spec verbatim (preserves alias)
+                        const end = endAfterTrailingComma(contents, targetSpec.getEnd());
+                        contents =
+                            `import { ${targetSpec.getText()} } from '${NEW_PACKAGE}';\n` +
+                                contents.slice(0, targetSpec.getStart()) +
+                                contents.slice(end);
+                        changed = true;
+                        didRewrite = true;
+                        continue;
+                    }
+                }
+            }
+            const stmtNode = (0, tsquery_1.query)(sourceFile, CJS_REQUIRE_STMT_SELECTOR)[0];
+            if (stmtNode) {
+                const bindingElements = (0, tsquery_1.query)(stmtNode, CJS_BINDING_ELEMENTS_SELECTOR);
+                const targetIdentifier = (0, tsquery_1.query)(stmtNode, CJS_TARGET_BINDING_SELECTOR)[0];
+                if (targetIdentifier) {
+                    // Walk to the BindingElement to cover `Foo` and `Foo: Bar`.
+                    const targetBinding = targetIdentifier.parent;
+                    if (bindingElements.length === 1) {
+                        const requirePathNode = (0, tsquery_1.query)(stmtNode, CJS_REQUIRE_PATH_SELECTOR)[0];
+                        if (requirePathNode) {
+                            contents =
+                                contents.slice(0, requirePathNode.getStart()) +
+                                    `'${NEW_PACKAGE}'` +
+                                    contents.slice(requirePathNode.getEnd());
+                            changed = true;
+                            didRewrite = true;
+                            continue;
+                        }
+                    }
+                    else {
+                        // Extract target binding verbatim (preserves alias)
+                        const end = endAfterTrailingComma(contents, targetBinding.getEnd());
+                        contents =
+                            `const { ${targetBinding.getText()} } = require('${NEW_PACKAGE}');\n` +
+                                contents.slice(0, targetBinding.getStart()) +
+                                contents.slice(end);
+                        changed = true;
+                        didRewrite = true;
+                        continue;
+                    }
+                }
+            }
+        }
+        if (changed) {
+            tree.write(filePath, contents);
+        }
+    });
+    await (0, devkit_1.formatFiles)(tree);
+}

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":"AAKA,OAAO,EACL,kBAAkB,EAIlB,aAAa,EAOd,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;AAID;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,oBAAoB,CAkC3D,CAAC;AAEF,eAAO,MAAM,aAAa,qCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/webpack/src/plugins/plugin.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,kBAAkB,EAKlB,aAAa,EAOd,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;AAID;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,oBAAoB,CAgE3D,CAAC;AAEF,eAAO,MAAM,aAAa,qCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -31,7 +31,27 @@ exports.createNodes = [
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup, pmc, lockFileName), configFilePaths, normalizedOptions, context);
+            const { entries, preErrors } = await filterWebpackConfigs(configFilePaths, context);
+            const projectHashes = await (0, internal_1.calculateHashesForCreateNodes)(entries.map((e) => e.projectRoot), normalizedOptions, 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);
+            }
+            catch (e) {
+                if (e instanceof devkit_1.AggregateCreateNodesError) {
+                    results = e.partialResults ?? [];
+                    nodeErrors = e.errors;
+                }
+                else {
+                    throw e;
+                }
+            }
+            const allErrors = [...preErrors, ...nodeErrors];
+            if (allErrors.length > 0) {
+                throw new devkit_1.AggregateCreateNodesError(allErrors, results);
+            }
+            return results;
         }
         finally {
             targetsCache.writeToDisk();
@@ -39,15 +59,8 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc, lockFileName) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc, hash) {
     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));
-    if (!siblingFiles.includes('package.json') &&
-        !siblingFiles.includes('project.json')) {
-        return {};
-    }
-    const hash = await (0, internal_1.calculateHashForCreateNodes)(projectRoot, options, context, [lockFileName]);
     if (!targetsCache.has(hash)) {
         targetsCache.set(hash, await createWebpackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc));
     }
@@ -209,6 +222,28 @@ function normalizeOutputPath(outputPath, projectRoot) {
         }
     }
 }
+async function filterWebpackConfigs(configFiles, context) {
+    const preErrors = [];
+    const candidates = await Promise.all(configFiles.map(async (configFile) => {
+        try {
+            const projectRoot = (0, path_1.dirname)(configFile);
+            const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
+            if (!siblingFiles.includes('package.json') &&
+                !siblingFiles.includes('project.json')) {
+                return null;
+            }
+            return { configFile, projectRoot };
+        }
+        catch (e) {
+            preErrors.push([configFile, e]);
+            return null;
+        }
+    }));
+    return {
+        entries: candidates.filter((c) => c !== null),
+        preErrors,
+    };
+}
 function normalizeOptions(options) {
     return {
         buildTargetName: options?.buildTargetName ?? 'build',