@nx/webpack 17.2.5 → 17.3.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "v17.2.5",
+  "version": "17.3.0-beta.1",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -62,9 +62,9 @@
     "webpack-dev-server": "^4.9.3",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "v17.2.5",
-    "@nx/js": "v17.2.5",
-    "@nrwl/webpack": "v17.2.5"
+    "@nx/devkit": "17.3.0-beta.1",
+    "@nx/js": "17.3.0-beta.1",
+    "@nrwl/webpack": "17.3.0-beta.1"
   },
   "publishConfig": {
     "access": "public"

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

@@ -18,6 +18,8 @@ async function* devServerExecutor(serveOptions, context) {
     process.env.NODE_ENV ??= 'development';
     const { root: projectRoot, sourceRoot } = context.projectsConfigurations.projects[context.projectName];
     const buildOptions = (0, normalize_options_1.normalizeOptions)(getBuildOptions(serveOptions, context), context.root, projectRoot, sourceRoot);
+    process.env.NX_BUILD_LIBS_FROM_SOURCE = `${buildOptions.buildLibsFromSource}`;
+    process.env.NX_BUILD_TARGET = serveOptions.buildTarget;
     // TODO(jack): Figure out a way to port this into NxWebpackPlugin
     if (!buildOptions.buildLibsFromSource) {
         if (!buildOptions.tsConfig) {
@@ -26,6 +28,7 @@ async function* devServerExecutor(serveOptions, context) {
         const { target, dependencies } = (0, buildable_libs_utils_1.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);
+        process.env.NX_TSCONFIG_PATH = buildOptions.tsConfig;
     }
     let config;
     const devServer = (0, get_dev_server_config_1.getDevServerOptions)(context.root, serveOptions, buildOptions);

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

@@ -64,6 +64,12 @@ async function* webpackExecutor(_options, context) {
     process.env.NODE_ENV ||= isScriptOptimizeOn
         ? 'production'
         : 'development';
+    process.env.NX_BUILD_LIBS_FROM_SOURCE = `${options.buildLibsFromSource}`;
+    process.env.NX_BUILD_TARGET = (0, devkit_1.targetToTargetString)({
+        project: context.projectName,
+        target: context.targetName,
+        configuration: context.configurationName,
+    });
     if (options.compiler === 'swc') {
         try {
             require.resolve('swc-loader');
@@ -80,6 +86,7 @@ async function* webpackExecutor(_options, context) {
     if (!options.buildLibsFromSource && context.targetName) {
         const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
         options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, metadata.root, dependencies);
+        process.env.NX_TSCONFIG_PATH = options.tsConfig;
     }
     // Delete output path before bundling
     if (options.deleteOutputPath && options.outputPath) {

package/src/utils/module-federation/dependencies.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDependentPackagesForProject = void 0;
 const typescript_1 = require("./typescript");
+const devkit_1 = require("@nx/devkit");
 function getDependentPackagesForProject(projectGraph, name) {
     const { npmPackages, workspaceLibraries } = collectDependencies(projectGraph, name);
     return {
@@ -34,11 +35,22 @@ function collectDependencies(projectGraph, name, dependencies = {
     return dependencies;
 }
 function getLibraryImportPath(library, projectGraph) {
+    let buildLibsFromSource = true;
+    if (process.env.NX_BUILD_LIBS_FROM_SOURCE) {
+        buildLibsFromSource = process.env.NX_BUILD_LIBS_FROM_SOURCE === 'true';
+    }
+    const libraryNode = projectGraph.nodes[library];
+    let sourceRoots = [libraryNode.data.sourceRoot];
+    if (!buildLibsFromSource && process.env.NX_BUILD_TARGET) {
+        const buildTarget = (0, devkit_1.parseTargetString)(process.env.NX_BUILD_TARGET, projectGraph);
+        sourceRoots = (0, devkit_1.getOutputsForTargetAndConfiguration)(buildTarget, {}, libraryNode);
+    }
     const tsConfigPathMappings = (0, typescript_1.readTsPathMappings)();
-    const sourceRoot = projectGraph.nodes[library].data.sourceRoot;
     for (const [key, value] of Object.entries(tsConfigPathMappings)) {
-        if (value.find((path) => path.startsWith(sourceRoot))) {
-            return key;
+        for (const src of sourceRoots) {
+            if (value.find((path) => path.startsWith(src))) {
+                return key;
+            }
         }
     }
     return undefined;