@nx/webpack 21.2.2 → 21.2.3

package/package.json

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

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

@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpackExecutor = webpackExecutor;
 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");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const path_1 = require("path");
-const run_webpack_1 = require("./lib/run-webpack");
+const config_1 = require("../../utils/config");
 const fs_1 = require("../../utils/fs");
 const resolve_user_defined_webpack_config_1 = require("../../utils/webpack/resolve-user-defined-webpack-config");
 const normalize_options_1 = require("./lib/normalize-options");
-const config_1 = require("../../utils/config");
-const js_1 = require("@nx/js");
+const run_webpack_1 = require("./lib/run-webpack");
 async function getWebpackConfigs(options, context) {
     let userDefinedWebpackConfig = null;
     if (options.webpackConfig) {
@@ -49,7 +50,7 @@ async function* webpackExecutor(_options, context) {
     // Default to production build.
     process.env['NODE_ENV'] ||= 'production';
     const metadata = context.projectsConfigurations.projects[context.projectName];
-    const sourceRoot = metadata.sourceRoot;
+    const sourceRoot = (0, ts_solution_setup_1.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/plugins/nx-webpack-plugin/lib/normalize-options.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 exports.normalizeAssets = normalizeAssets;
 exports.normalizeFileReplacements = normalizeFileReplacements;
-const path_1 = require("path");
-const fs_1 = require("fs");
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const fs_1 = require("fs");
+const path_1 = require("path");
 function normalizeOptions(options) {
     const combinedPluginAndMaybeExecutorOptions = {};
     const isProd = process.env.NODE_ENV === 'production';
@@ -48,10 +49,7 @@ function normalizeOptions(options) {
         // executor options take precedence (especially for overriding with CLI args)
         originalTargetOptions);
     }
-    const sourceRoot = projectNode.data.sourceRoot ??
-        ((0, fs_1.existsSync)((0, path_1.join)(devkit_1.workspaceRoot, projectNode.data.root, 'src'))
-            ? (0, path_1.join)(projectNode.data.root, 'src')
-            : projectNode.data.root);
+    const sourceRoot = (0, ts_solution_setup_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/utils/config.js

@@ -5,6 +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 configuration_1 = require("nx/src/config/configuration");
 exports.nxWebpackComposablePlugin = 'nxWebpackComposablePlugin';
 function isNxWebpackComposablePlugin(a) {
@@ -49,7 +50,7 @@ function ensureNxWebpackExecutionContext(ctx) {
     ctx.options ??= {
         root: devkit_1.workspaceRoot,
         projectRoot: projectNode.data.root,
-        sourceRoot: projectNode.data.sourceRoot ?? projectNode.data.root,
+        sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data),
         // These aren't actually needed since NxWebpackPlugin and withNx both support them being undefined.
         assets: undefined,
         outputPath: undefined,