@nx/webpack 23.0.0-beta.5 → 23.0.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "23.0.0-beta.5",
+  "version": "23.0.0-beta.6",
   "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.5",
-    "@nx/js": "23.0.0-beta.5"
+    "@nx/devkit": "23.0.0-beta.6",
+    "@nx/js": "23.0.0-beta.6"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.5"
+    "nx": "23.0.0-beta.6"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/dev-server/dev-server.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/executors/dev-server/dev-server.impl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAGhB,MAAM,YAAY,CAAC;AAepB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAuB,iBAAiB,CACtC,YAAY,EAAE,mBAAmB,EACjC,OAAO,EAAE,eAAe;;;aAoGzB;AA0BD,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"dev-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/executors/dev-server/dev-server.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAGhB,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAuB,iBAAiB,CACtC,YAAY,EAAE,mBAAmB,EACjC,OAAO,EAAE,eAAe;;;aAoGzB;AA0BD,eAAe,iBAAiB,CAAC"}

package/src/executors/dev-server/dev-server.impl.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.devServerExecutor = devServerExecutor;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const webpack_1 = tslib_1.__importDefault(require("webpack"));
 const devkit_1 = require("@nx/devkit");
-const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
 const operators_1 = require("rxjs/operators");
 const webpack_dev_server_1 = tslib_1.__importDefault(require("webpack-dev-server"));
 const get_dev_server_config_1 = require("./lib/get-dev-server-config");
@@ -61,7 +61,7 @@ async function* devServerExecutor(serveOptions, context) {
             config.devServer ??= devServer;
         }
     }
-    return yield* (0, rxjs_for_await_1.eachValueFrom)((0, run_webpack_1.runWebpackDevServer)(config, webpack_1.default, webpack_dev_server_1.default).pipe((0, operators_1.tap)(({ stats }) => {
+    return yield* (0, internal_1.eachValueFrom)((0, run_webpack_1.runWebpackDevServer)(config, webpack_1.default, webpack_dev_server_1.default).pipe((0, operators_1.tap)(({ stats }) => {
         console.info(stats.toString(config.stats));
     }), (0, operators_1.map)(({ baseUrl, stats }) => {
         return {

package/src/executors/ssr-dev-server/ssr-dev-server.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-dev-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAGjE,wBAAuB,oBAAoB,CACzC,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,eAAe;;aA0Bb,OAAO;aAEP,aAAa;kBA6BzB;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"ssr-dev-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/executors/ssr-dev-server/ssr-dev-server.impl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAGjE,wBAAuB,oBAAoB,CACzC,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,eAAe;;aA0Bb,OAAO;aAEP,aAAa;kBA6BzB;AAED,eAAe,oBAAoB,CAAC"}

package/src/executors/ssr-dev-server/ssr-dev-server.impl.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ssrDevServerExecutor = ssrDevServerExecutor;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const pc = tslib_1.__importStar(require("picocolors"));
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const wait_until_server_is_listening_1 = require("./lib/wait-until-server-is-listening");
 async function* ssrDevServerExecutor(options, context) {
     const browserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, context.projectGraph);
@@ -15,7 +15,7 @@ async function* ssrDevServerExecutor(options, context) {
     const runServer = await (0, devkit_1.runExecutor)(serverTarget, { ...serverOptions, ...options.serverTargetOptions }, context);
     let browserBuilt = false;
     let nodeStarted = false;
-    const combined = (0, async_iterable_1.combineAsyncIterables)(runBrowser, runServer);
+    const combined = (0, internal_1.combineAsyncIterables)(runBrowser, runServer);
     for await (const output of combined) {
         if (!output.success)
             throw new Error('Could not build application');

package/src/executors/webpack/webpack.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/executors/webpack/webpack.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AAkBpB,OAAO,KAAK,EAEV,sBAAsB,EACvB,MAAM,UAAU,CAAC;AA6ClB,MAAM,MAAM,oBAAoB,GAC5B;IACE,OAAO,EAAE,KAAK,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,sBAAsB,CAAC;CAClC,GACD;IACE,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,sBAAsB,CAAC;CAClC,CAAC;AAEN,wBAAuB,eAAe,CACpC,QAAQ,EAAE,sBAAsB,EAChC,OAAO,EAAE,eAAe,GACvB,cAAc,CAAC,oBAAoB,EAAE,oBAAoB,EAAE,SAAS,CAAC,CA6FvE;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"webpack.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/executors/webpack/webpack.impl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AAiBpB,OAAO,KAAK,EAEV,sBAAsB,EACvB,MAAM,UAAU,CAAC;AA6ClB,MAAM,MAAM,oBAAoB,GAC5B;IACE,OAAO,EAAE,KAAK,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,sBAAsB,CAAC;CAClC,GACD;IACE,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,sBAAsB,CAAC;CAClC,CAAC;AAEN,wBAAuB,eAAe,CACpC,QAAQ,EAAE,sBAAsB,EAChC,OAAO,EAAE,eAAe,GACvB,cAAc,CAAC,oBAAoB,EAAE,oBAAoB,EAAE,SAAS,CAAC,CA6FvE;AAED,eAAe,eAAe,CAAC"}

package/src/executors/webpack/webpack.impl.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpackExecutor = webpackExecutor;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
 const js_1 = require("@nx/js");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
@@ -83,7 +83,7 @@ async function* webpackExecutor(_options, context) {
         For libraries, configure the project to use the '@nx/dependency-checks' ESLint rule instead (https://nx.dev/nx-api/eslint-plugin/documents/dependency-checks).`);
     }
     const configs = await getWebpackConfigs(options, context);
-    return yield* (0, rxjs_for_await_1.eachValueFrom)((0, rxjs_1.of)(configs).pipe((0, operators_1.mergeMap)((config) => (Array.isArray(config) ? (0, rxjs_1.from)(config) : (0, rxjs_1.of)(config))), 
+    return yield* (0, internal_1.eachValueFrom)((0, rxjs_1.of)(configs).pipe((0, operators_1.mergeMap)((config) => (Array.isArray(config) ? (0, rxjs_1.from)(config) : (0, rxjs_1.of)(config))), 
     // Run build sequentially and bail when first one fails.
     (0, operators_1.mergeScan)((acc, config) => {
         if (!acc.hasErrors()) {

package/src/generators/configuration/configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAOxD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,8BAGtC;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,8BAoCtC;AA6LD,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAMxD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,8BAGtC;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,8BAoCtC;AA6LD,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGenerator = configurationGenerator;
 exports.configurationGeneratorInternal = configurationGeneratorInternal;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
 const has_plugin_1 = require("../../utils/has-plugin");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 function configurationGenerator(tree, options) {
@@ -128,7 +128,7 @@ module.exports = composePlugins(withNx(), (config) => {
     }
 }
 function addBuildTarget(tree, options) {
-    (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, '@nx/webpack:webpack', 'build', [
+    (0, internal_1.addBuildTargetDefaults)(tree, '@nx/webpack:webpack', 'build', [
         ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
     ]);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);

package/src/generators/convert-config-to-webpack-plugin/convert-config-to-webpack-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-config-to-webpack-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/generators/convert-config-to-webpack-plugin/convert-config-to-webpack-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAIL,MAAM,YAAY,CAAC;AAQpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAWD,wBAAsB,qCAAqC,CACzD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,iBAwGhB;AAED,eAAe,qCAAqC,CAAC"}
+{"version":3,"file":"convert-config-to-webpack-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/generators/convert-config-to-webpack-plugin/convert-config-to-webpack-plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,IAAI,EAIL,MAAM,YAAY,CAAC;AAOpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAWD,wBAAsB,qCAAqC,CACzD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,iBAwGhB;AAED,eAAe,qCAAqC,CAAC"}

package/src/generators/convert-config-to-webpack-plugin/convert-config-to-webpack-plugin.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertConfigToWebpackPluginGenerator = convertConfigToWebpackPluginGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const extract_webpack_options_1 = require("./lib/extract-webpack-options");
 const normalize_path_options_1 = require("./lib/normalize-path-options");
 const path_1 = require("path");
@@ -18,7 +18,7 @@ const preprocessText = (text) => {
 async function convertConfigToWebpackPluginGenerator(tree, options) {
     let migrated = 0;
     const projects = (0, devkit_1.getProjects)(tree);
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/webpack:webpack', (currentTargetOptions, projectName, targetName, configurationName) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/webpack:webpack', (currentTargetOptions, projectName, targetName, configurationName) => {
         if (options.project && projectName !== options.project) {
             return;
         }

package/src/generators/convert-to-inferred/convert-to-inferred.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAepB,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE/D,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mDAyElE;AA6CD,wBAAgB,sBAAsB,IAAI,OAAO,YAAY,GAAG;IAC9D,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACtC,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,KAAK,IAAI,CAAC;CAC5D,CAkCA"}
+{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAKA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE/D,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mDAyElE;AA6CD,wBAAgB,sBAAsB,IAAI,OAAO,YAAY,GAAG;IAC9D,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACtC,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,KAAK,IAAI,CAAC;CAC5D,CAkCA"}

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToInferred = convertToInferred;
 exports.createCollectingLogger = createCollectingLogger;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const aggregate_log_util_1 = require("@nx/devkit/src/generators/plugin-migrations/aggregate-log-util");
-const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
@@ -13,12 +12,12 @@ const devkit_exports_1 = require("nx/src/devkit-exports");
 async function convertToInferred(tree, options) {
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const migrationContext = {
-        logger: new aggregate_log_util_1.AggregatedLog(),
+        logger: new internal_1.AggregatedLog(),
         projectGraph,
         workspaceRoot: tree.root,
     };
     const logger = createCollectingLogger();
-    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/webpack/plugin', plugin_1.createNodesV2, {
+    const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/webpack/plugin', plugin_1.createNodesV2, {
         buildTargetName: 'build',
         previewTargetName: 'preview',
         serveStaticTargetName: 'serve-static',
@@ -47,7 +46,7 @@ async function convertToInferred(tree, options) {
         }
         else {
             logger.flushLogs();
-            throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
+            throw new internal_1.NoTargetsToMigrateError();
         }
     }
     else {

package/src/generators/convert-to-inferred/utils/build-post-target-transformer.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildPostTargetTransformerFactory = buildPostTargetTransformerFactory;
 const tslib_1 = require("tslib");
-const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
+const internal_1 = require("@nx/devkit/internal");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const ts = tslib_1.__importStar(require("typescript"));
 const ast_1 = require("./ast");
@@ -16,7 +16,7 @@ function buildPostTargetTransformerFactory(migrationContext) {
         const { pluginOptions, webpackConfigPath } = processOptions(target, context);
         updateWebpackConfig(tree, webpackConfigPath, pluginOptions);
         if (target.outputs) {
-            (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTarget, {
+            (0, internal_1.processTargetOutputs)(target, [], inferredTarget, {
                 projectName: projectDetails.projectName,
                 projectRoot: projectDetails.root,
             });
@@ -51,29 +51,29 @@ function extractPluginOptions(options, context, configName) {
     const pluginOptions = {};
     for (const [key, value] of Object.entries(options)) {
         if (pathOptions.has(key)) {
-            pluginOptions[key] = (0, plugin_migration_utils_1.toProjectRelativePath)(value, context.projectRoot);
+            pluginOptions[key] = (0, internal_1.toProjectRelativePath)(value, context.projectRoot);
             delete options[key];
         }
         else if (assetsOptions.has(key)) {
             pluginOptions[key] = value.map((asset) => {
                 if (typeof asset === 'string') {
-                    return (0, plugin_migration_utils_1.toProjectRelativePath)(asset, context.projectRoot);
+                    return (0, internal_1.toProjectRelativePath)(asset, context.projectRoot);
                 }
-                asset.input = (0, plugin_migration_utils_1.toProjectRelativePath)(asset.input, context.projectRoot);
+                asset.input = (0, internal_1.toProjectRelativePath)(asset.input, context.projectRoot);
                 return asset;
             });
             delete options[key];
         }
         else if (key === 'fileReplacements') {
             pluginOptions.fileReplacements = value.map((replacement) => ({
-                replace: (0, plugin_migration_utils_1.toProjectRelativePath)(replacement.replace, context.projectRoot),
-                with: (0, plugin_migration_utils_1.toProjectRelativePath)(replacement.with, context.projectRoot),
+                replace: (0, internal_1.toProjectRelativePath)(replacement.replace, context.projectRoot),
+                with: (0, internal_1.toProjectRelativePath)(replacement.with, context.projectRoot),
             }));
             delete options.fileReplacements;
         }
         else if (key === 'additionalEntryPoints') {
             pluginOptions.additionalEntryPoints = value.map((entryPoint) => {
-                entryPoint.entryPath = (0, plugin_migration_utils_1.toProjectRelativePath)(entryPoint.entryPath, context.projectRoot);
+                entryPoint.entryPath = (0, internal_1.toProjectRelativePath)(entryPoint.entryPath, context.projectRoot);
                 return entryPoint;
             });
             delete options.additionalEntryPoints;

package/src/generators/convert-to-inferred/utils/serve-post-target-transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/webpack/src/generators/convert-to-inferred/utils/serve-post-target-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,mBAAmB,EACxB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAYpB,OAAO,KAAK,EAAE,gBAAgB,EAAsB,MAAM,SAAS,CAAC;AAEpE,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,gBAAgB,IAGhC,QAAQ,mBAAmB,EAC3B,MAAM,IAAI,EACV,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,gBAAgB,mBAAmB,KAClC,OAAO,CAAC,mBAAmB,CAAC,CAwBhC"}
+{"version":3,"file":"serve-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/webpack/src/generators/convert-to-inferred/utils/serve-post-target-transformer.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,KAAK,mBAAmB,EACxB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,gBAAgB,EAAsB,MAAM,SAAS,CAAC;AAEpE,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,gBAAgB,IAGhC,QAAQ,mBAAmB,EAC3B,MAAM,IAAI,EACV,gBAAgB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,gBAAgB,mBAAmB,KAClC,OAAO,CAAC,mBAAmB,CAAC,CAwBhC"}

package/src/generators/convert-to-inferred/utils/serve-post-target-transformer.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.servePostTargetTransformerFactory = servePostTargetTransformerFactory;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const path_1 = require("path");
 const ts = tslib_1.__importStar(require("typescript"));
@@ -19,7 +19,7 @@ function servePostTargetTransformerFactory(migrationContext) {
         const { devServerOptions, webpackConfigPath } = await processOptions(tree, target, context);
         updateWebpackConfig(tree, webpackConfigPath, devServerOptions, context);
         if (target.outputs) {
-            (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTarget, {
+            (0, internal_1.processTargetOutputs)(target, [], inferredTarget, {
                 projectName: projectDetails.projectName,
                 projectRoot: projectDetails.root,
             });
@@ -87,8 +87,8 @@ function extractDevServerOptions(options, context) {
                     devServerOptions.server = { type: 'https' };
                     if (options.sslCert && options.sslKey) {
                         devServerOptions.server.options = {};
-                        devServerOptions.server.options.cert = (0, plugin_migration_utils_1.toProjectRelativePath)(options.sslCert, context.projectRoot);
-                        devServerOptions.server.options.key = (0, plugin_migration_utils_1.toProjectRelativePath)(options.sslKey, context.projectRoot);
+                        devServerOptions.server.options.cert = (0, internal_1.toProjectRelativePath)(options.sslCert, context.projectRoot);
+                        devServerOptions.server.options.key = (0, internal_1.toProjectRelativePath)(options.sslKey, context.projectRoot);
                     }
                     else if (options.sslCert) {
                         context.logger.addLog({

package/src/generators/convert-to-inferred/utils/types.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectGraph } from '@nx/devkit';
-import type { AggregatedLog } from '@nx/devkit/src/generators/plugin-migrations/aggregate-log-util';
+import type { AggregatedLog } from '@nx/devkit/internal';
 export type MigrationContext = {
     logger: AggregatedLog;
     projectGraph: ProjectGraph;

package/src/generators/convert-to-inferred/utils/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../packages/webpack/src/generators/convert-to-inferred/utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gEAAgE,CAAC;AAEpG,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,aAAa,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,GAAG;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../packages/webpack/src/generators/convert-to-inferred/utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,aAAa,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,GAAG;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}

package/src/generators/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAE9D;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAkF5E;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAE9D;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAkF5E;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/init/init.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpackInitGenerator = webpackInitGenerator;
 exports.webpackInitGeneratorInternal = webpackInitGeneratorInternal;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 function webpackInitGenerator(tree, schema) {
@@ -15,7 +15,7 @@ async function webpackInitGeneratorInternal(tree, schema) {
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/webpack/plugin', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/webpack/plugin', plugin_1.createNodesV2, {
             buildTargetName: [
                 'build',
                 'webpack:build',

package/src/migrations/update-21-0-0/remove-isolated-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-isolated-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/migrations/update-21-0-0/remove-isolated-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,IAAI,EAEL,MAAM,YAAY,CAAC;AAIpB,yBAA+B,IAAI,EAAE,IAAI,iBAkDxC"}
+{"version":3,"file":"remove-isolated-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/migrations/update-21-0-0/remove-isolated-config.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,IAAI,EAEL,MAAM,YAAY,CAAC;AAGpB,yBAA+B,IAAI,EAAE,IAAI,iBAkDxC"}

package/src/migrations/update-21-0-0/remove-isolated-config.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 async function default_1(tree) {
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/webpack:webpack', (options, projectName, targetName, configurationName) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/webpack:webpack', (options, projectName, targetName, configurationName) => {
         // Only handle webpack config for default configuration
         if (configurationName)
             return;

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,EASd,MAAM,YAAY,CAAC;AAgBpB,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;AAqBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,oBAAoB,CAiC3D,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,EACL,kBAAkB,EAIlB,aAAa,EAOd,MAAM,YAAY,CAAC;AAcpB,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"}

package/src/plugins/plugin.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const js_1 = require("@nx/js");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const fs_1 = require("fs");
@@ -13,19 +12,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");
-function readTargetsCache(cachePath) {
-    try {
-        return process.env.NX_CACHE_PROJECT_GRAPH !== 'false'
-            ? (0, devkit_1.readJsonFile)(cachePath)
-            : {};
-    }
-    catch {
-        return {};
-    }
-}
-function writeTargetsToCache(cachePath, results) {
-    (0, devkit_1.writeJsonFile)(cachePath, results);
-}
 /**
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
  */
@@ -39,20 +25,22 @@ exports.createNodes = [
     async (configFilePaths, options, context) => {
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `webpack-${optionsHash}.hash`);
-        const targetsCache = readTargetsCache(cachePath);
+        const targetsCache = new internal_1.PluginCache(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));
+        const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
+        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), configFilePaths, normalizedOptions, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache, isTsSolutionSetup, pmc, lockFileName), configFilePaths, normalizedOptions, context);
         }
         finally {
-            writeTargetsToCache(cachePath, targetsCache);
+            targetsCache.writeToDisk();
         }
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc) {
+async function createNodesInternal(configFilePath, options, context, targetsCache, isTsSolutionSetup, pmc, lockFileName) {
     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));
@@ -60,9 +48,11 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         !siblingFiles.includes('project.json')) {
         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, pmc);
-    const { targets, metadata } = targetsCache[hash];
+    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));
+    }
+    const { targets, metadata } = targetsCache.get(hash);
     return {
         projects: {
             [projectRoot]: {
@@ -74,7 +64,7 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
     };
 }
 async function createWebpackTargets(configFilePath, projectRoot, options, context, isTsSolutionSetup, pmc) {
-    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    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);
     const outputs = [];

package/src/utils/e2e-web-server-info-utils.d.ts

@@ -1,3 +1,3 @@
 import { type Tree } from '@nx/devkit';
-export declare function getWebpackE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number): Promise<import("@nx/devkit/src/generators/e2e-web-server-info-utils").E2EWebServerDetails>;
+export declare function getWebpackE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number): Promise<import("@nx/devkit/internal").E2EWebServerDetails>;
 //# sourceMappingURL=e2e-web-server-info-utils.d.ts.map

package/src/utils/e2e-web-server-info-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/webpack/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAGnD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,8FA8BzB"}
+{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/webpack/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAGnD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,8DA8BzB"}

package/src/utils/e2e-web-server-info-utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWebpackE2EWebServerInfo = getWebpackE2EWebServerInfo;
 const devkit_1 = require("@nx/devkit");
-const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
+const internal_1 = require("@nx/devkit/internal");
 async function getWebpackE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = e2ePortOverride ?? 4200;
@@ -10,7 +10,7 @@ async function getWebpackE2EWebServerInfo(tree, projectName, configFilePath, isP
         nxJson.targetDefaults?.['serve'].options?.port) {
         e2ePort = nxJson.targetDefaults?.['serve'].options?.port;
     }
-    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+    return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/webpack/plugin',
         serveTargetName: 'serveTargetName',
         serveStaticTargetName: 'serveStaticTargetName',

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveUserDefinedWebpackConfig = resolveUserDefinedWebpackConfig;
-const internal_1 = require("@nx/js/src/internal");
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
+const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/js/src/internal");
 function resolveUserDefinedWebpackConfig(path, tsConfig, 
 /** Skip require cache and return latest content */
 reload = false) {
@@ -10,7 +10,7 @@ reload = false) {
         // Clear cache if the path is in the cache
         if (require.cache[path]) {
             // Clear all entries because config may import other modules
-            (0, config_utils_1.clearRequireCache)();
+            (0, internal_1.clearRequireCache)();
         }
     }
     // Don't transpile non-TS files. This prevents workspaces libs from being registered via tsconfig-paths.
@@ -18,7 +18,7 @@ reload = false) {
     if (!/\.(ts|mts|cts)$/.test(path)) {
         return require(path);
     }
-    const cleanupTranspiler = (0, internal_1.registerTsProject)(tsConfig);
+    const cleanupTranspiler = (0, internal_2.registerTsProject)(tsConfig);
     const maybeCustomWebpackConfig = require(path);
     cleanupTranspiler();
     // If the user provides a configuration in TS file