@nx/webpack 23.0.0-beta.12 → 23.0.0-beta.13

package/package.json

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

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

@@ -8,7 +8,7 @@ const devkit_1 = require("@nx/devkit");
 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");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_2 = require("@nx/js/internal");
 const run_webpack_1 = require("../../utils/run-webpack");
 const resolve_user_defined_webpack_config_1 = require("../../utils/webpack/resolve-user-defined-webpack-config");
 const deprecation_1 = require("../../utils/deprecation");
@@ -28,9 +28,9 @@ async function* devServerExecutor(serveOptions, context) {
         if (!buildOptions.tsConfig) {
             throw new Error(`Cannot find "tsConfig" to remap paths for. Set this option in project.json.`);
         }
-        const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, 'build', // should be generalized
+        const { target, dependencies } = (0, internal_2.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, 'build', // should be generalized
         context.configurationName);
-        buildOptions.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)(buildOptions.tsConfig, context.root, target.data.root, dependencies);
+        buildOptions.tsConfig = (0, internal_2.createTmpTsConfig)(buildOptions.tsConfig, context.root, target.data.root, dependencies);
         process.env.NX_TSCONFIG_PATH = buildOptions.tsConfig;
     }
     let config;

package/src/executors/webpack/lib/normalize-options.js

@@ -4,11 +4,11 @@ exports.normalizeOptions = normalizeOptions;
 exports.normalizePluginPath = normalizePluginPath;
 const path_1 = require("path");
 const normalize_options_1 = require("../../../plugins/nx-webpack-plugin/lib/normalize-options");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 function normalizeOptions(options, root, projectRoot, sourceRoot) {
     const normalizedOptions = {
         ...options,
-        useTsconfigPaths: !(0, ts_solution_setup_1.isUsingTsSolutionSetup)(),
+        useTsconfigPaths: !(0, internal_1.isUsingTsSolutionSetup)(),
         root,
         projectRoot,
         sourceRoot,

package/src/executors/webpack/schema.d.ts

@@ -1,4 +1,4 @@
-import { AssetGlob } from '@nx/js/src/utils/assets/assets';
+import { AssetGlob } from '@nx/js/internal';
 
 export interface AssetGlobPattern {
   glob: string;

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

@@ -4,7 +4,7 @@ exports.webpackExecutor = webpackExecutor;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
@@ -51,7 +51,7 @@ async function* webpackExecutor(_options, context) {
     // Default to production build.
     process.env['NODE_ENV'] ||= 'production';
     const metadata = context.projectsConfigurations.projects[context.projectName];
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(metadata);
+    const sourceRoot = (0, internal_2.getProjectSourceRoot)(metadata);
     const options = (0, normalize_options_1.normalizeOptions)(_options, context.root, metadata.root, sourceRoot);
     const isScriptOptimizeOn = typeof options.optimization === 'boolean'
         ? options.optimization

package/src/generators/configuration/configuration.js

@@ -7,7 +7,7 @@ const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
 const has_plugin_1 = require("../../utils/has-plugin");
 const deprecation_1 = require("../../utils/deprecation");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 function configurationGenerator(tree, options) {
     return configurationGeneratorInternal(tree, { addPlugin: false, ...options });
@@ -131,7 +131,7 @@ module.exports = composePlugins(withNx(), (config) => {
 }
 function addBuildTarget(tree, options) {
     (0, internal_1.addBuildTargetDefaults)(tree, '@nx/webpack:webpack', 'build', [
-        ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
+        internal_2.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
     ]);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const buildOptions = {

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

@@ -5,8 +5,8 @@ const tslib_1 = require("tslib");
 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 internal_1 = require("@nx/js/internal");
+const js_1 = require("@nx/js");
 const webpack_nx_build_coordination_plugin_1 = require("../webpack-nx-build-coordination-plugin");
 class NxTsconfigPathsWebpackPlugin {
     constructor(options) {
@@ -30,7 +30,7 @@ class NxTsconfigPathsWebpackPlugin {
             : this.options.tsConfig;
         compiler.options.resolve.plugins.push(new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({
             configFile,
-            baseUrl: (0, ts_config_1.resolvePathsBaseUrl)(configFile),
+            baseUrl: (0, js_1.resolvePathsBaseUrl)(configFile),
             extensions: Array.from(extensions),
             mainFields: ['module', 'main'],
         }));
@@ -38,8 +38,8 @@ class NxTsconfigPathsWebpackPlugin {
     handleBuildLibsFromSource(config, options) {
         if (!options.buildLibsFromSource && options.targetName) {
             const remappedTarget = options.targetName === 'serve' ? 'build' : options.targetName;
-            const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(undefined, options.projectGraph, options.root, options.projectName, remappedTarget, options.configurationName);
-            options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, options.root, target.data.root, dependencies);
+            const { target, dependencies } = (0, internal_1.calculateProjectBuildableDependencies)(undefined, options.projectGraph, options.root, options.projectName, remappedTarget, options.configurationName);
+            options.tsConfig = (0, internal_1.createTmpTsConfig)(options.tsConfig, options.root, target.data.root, dependencies);
             if (options.targetName === 'serve') {
                 const buildableDependencies = dependencies
                     .filter((dependency) => dependency.node.type === 'lib')

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

@@ -15,7 +15,7 @@ const get_terser_ecma_version_1 = require("./get-terser-ecma-version");
 const compiler_loaders_1 = require("./compiler-loaders");
 const TerserPlugin = require("terser-webpack-plugin");
 const nodeExternals = require("webpack-node-externals");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const utils_1 = require("./utils");
 const IGNORED_WEBPACK_WARNINGS = [
     /The comment file/i,
@@ -208,7 +208,7 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
         configurationName: options.configurationName,
         root: options.root,
     };
-    const isUsingTsSolution = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+    const isUsingTsSolution = (0, internal_1.isUsingTsSolutionSetup)();
     options.useTsconfigPaths ??= !isUsingTsSolution;
     // If the project is using ts solutions setup, the paths are not in tsconfig and we should not use the plugin's paths.
     if (options.useTsconfigPaths) {

package/src/plugins/nx-webpack-plugin/lib/normalize-options.js

@@ -4,7 +4,7 @@ exports.normalizeOptions = normalizeOptions;
 exports.normalizeAssets = normalizeAssets;
 exports.normalizeFileReplacements = normalizeFileReplacements;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
 function normalizeOptions(options) {
@@ -49,7 +49,7 @@ function normalizeOptions(options) {
         // executor options take precedence (especially for overriding with CLI args)
         originalTargetOptions);
     }
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectNode.data);
     if (!combinedPluginAndMaybeExecutorOptions.main) {
         throw new Error(`Missing "main" option for the entry file. Set this option in your Nx webpack plugin.`);
     }

package/src/plugins/nx-webpack-plugin/nx-app-webpack-plugin-options.d.ts

@@ -1,5 +1,5 @@
 import { ProjectGraph } from '@nx/devkit';
-import { AssetGlob } from '@nx/js/src/utils/assets/assets';
+import { AssetGlob } from '@nx/js/internal';
 export interface AssetGlobPattern {
     glob: string;
     input: string;

package/src/plugins/nx-webpack-plugin/nx-app-webpack-plugin-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nx-app-webpack-plugin-options.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/plugins/nx-webpack-plugin/nx-app-webpack-plugin-options.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nx-app-webpack-plugin-options.d.ts","sourceRoot":"","sources":["../../../../../../packages/webpack/src/plugins/nx-webpack-plugin/nx-app-webpack-plugin-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,iBAAiB,CAAC;AAE1D,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,yBAAyB;IACxC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC/C;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,CAAC;IACnC;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAC1B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,GAAG,KAAK,CAAC;IACnC;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,iBAAiB,CAAC;IACvD;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;IACjD;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAC;IACrC;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,GAAG,mBAAmB,CAAC;IAC7C;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC/C;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC;IAC9C;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC7B;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,wBAAwB,CAAC,EAAE;QACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACnC,CAAC;IACF;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC9C;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B;;OAEG;IACH,YAAY,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAClC;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,QAAQ,GAAG,YAAY,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACxE;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,mCACf,SAAQ,yBAAyB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,gBAAgB,EAAE,CAAC;CAC5B"}

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;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"}
+{"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"}

package/src/plugins/plugin.js

@@ -4,14 +4,13 @@ exports.createNodesV2 = exports.createNodes = exports.createDependencies = void
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const fs_1 = require("fs");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 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");
 /**
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
  */
@@ -27,7 +26,7 @@ exports.createNodes = [
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `webpack-${optionsHash}.hash`);
         const targetsCache = new internal_1.PluginCache(cachePath);
         const normalizedOptions = normalizeOptions(options);
-        const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
@@ -86,7 +85,7 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
                 {
                     externalDependencies: ['webpack-cli'],
                 },
-                ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
+                internal_2.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
             ]
             : [
                 'default',
@@ -94,7 +93,7 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
                 {
                     externalDependencies: ['webpack-cli'],
                 },
-                ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
+                internal_2.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
             ],
         outputs,
         metadata: {
@@ -179,7 +178,7 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
             '@nx/js:typescript-sync',
         ];
     }
-    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
+    (0, internal_2.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return { targets, metadata: {} };
 }
 function normalizeOutputPath(outputPath, projectRoot) {

package/src/utils/config.js

@@ -5,7 +5,7 @@ exports.isNxWebpackComposablePlugin = isNxWebpackComposablePlugin;
 exports.composePlugins = composePlugins;
 exports.composePluginsSync = composePluginsSync;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const configuration_1 = require("nx/src/config/configuration");
 exports.nxWebpackComposablePlugin = 'nxWebpackComposablePlugin';
 function isNxWebpackComposablePlugin(a) {
@@ -50,7 +50,7 @@ function ensureNxWebpackExecutionContext(ctx) {
     ctx.options ??= {
         root: devkit_1.workspaceRoot,
         projectRoot: projectNode.data.root,
-        sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data),
+        sourceRoot: (0, internal_1.getProjectSourceRoot)(projectNode.data),
         // These aren't actually needed since NxWebpackPlugin and withNx both support them being undefined.
         assets: undefined,
         outputPath: undefined,

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,8DA8BzB"}
+{"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;AAMnD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,8DA6BzB"}

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

@@ -6,9 +6,10 @@ 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;
-    if (nxJson.targetDefaults?.['serve'] &&
-        nxJson.targetDefaults?.['serve'].options?.port) {
-        e2ePort = nxJson.targetDefaults?.['serve'].options?.port;
+    const servePort = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)
+        ?.options?.port;
+    if (servePort) {
+        e2ePort = servePort;
     }
     return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/webpack/plugin',

package/src/utils/ensure-dependencies.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureDependencies = ensureDependencies;
 const devkit_1 = require("@nx/devkit");
-const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
+const internal_1 = require("@nx/js/internal");
 const versions_1 = require("./versions");
 function ensureDependencies(tree, options) {
     const tasks = [];
     const devDependencies = {};
     if (options.compiler === 'swc') {
         devDependencies['swc-loader'] = versions_1.swcLoaderVersion;
-        const addSwcTask = (0, add_swc_dependencies_1.addSwcDependencies)(tree);
+        const addSwcTask = (0, internal_1.addSwcDependencies)(tree);
         tasks.push(addSwcTask);
     }
     if (options.compiler === 'tsc') {

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveUserDefinedWebpackConfig = resolveUserDefinedWebpackConfig;
 const internal_1 = require("@nx/devkit/internal");
-const internal_2 = require("@nx/js/src/internal");
+const internal_2 = require("@nx/js/internal");
 function resolveUserDefinedWebpackConfig(path, tsConfig, 
 /** Skip require cache and return latest content */
 reload = false) {