@nx/webpack 19.2.0-alpha.2 → 19.2.0-beta.0

package/package.json

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

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

@@ -6,7 +6,6 @@ const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const path_1 = require("path");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const run_webpack_1 = require("./lib/run-webpack");
 const fs_1 = require("../../utils/fs");
 const resolve_user_defined_webpack_config_1 = require("../../utils/webpack/resolve-user-defined-webpack-config");
@@ -83,11 +82,6 @@ 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) {
         (0, fs_1.deleteOutputDir)(context.root, options.outputPath);

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

@@ -1,8 +1,8 @@
-import { Compiler } from 'webpack';
+import { Compiler, type Configuration, type WebpackOptionsNormalized } from 'webpack';
+import { NormalizedNxAppWebpackPluginOptions } from '../nx-webpack-plugin/nx-app-webpack-plugin-options';
 export declare class NxTsconfigPathsWebpackPlugin {
     private options;
-    constructor(options: {
-        tsConfig: string;
-    });
+    constructor(options: NormalizedNxAppWebpackPluginOptions);
     apply(compiler: Compiler): void;
+    handleBuildLibsFromSource(config: Partial<WebpackOptionsNormalized | Configuration>, options: any): void;
 }

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

@@ -4,6 +4,8 @@ exports.NxTsconfigPathsWebpackPlugin = void 0;
 const path = 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 webpack_nx_build_coordination_plugin_1 = require("../webpack-nx-build-coordination-plugin");
 class NxTsconfigPathsWebpackPlugin {
     constructor(options) {
         this.options = options;
@@ -11,6 +13,8 @@ class NxTsconfigPathsWebpackPlugin {
             throw new Error(`Missing "tsConfig" option. Set this option in your Nx webpack plugin.`);
     }
     apply(compiler) {
+        // If we are not building libs from source, we need to remap paths so tsconfig may be updated.
+        this.handleBuildLibsFromSource(compiler.options, this.options);
         const extensions = new Set([
             ...['.ts', '.tsx', '.mjs', '.js', '.jsx'],
             ...(compiler.options?.resolve?.extensions ?? []),
@@ -27,5 +31,20 @@ class NxTsconfigPathsWebpackPlugin {
             mainFields: ['module', 'main'],
         }));
     }
+    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);
+            if (options.targetName === 'serve') {
+                const buildableDependencies = dependencies
+                    .filter((dependency) => dependency.node.type === 'lib')
+                    .map((dependency) => dependency.node.name)
+                    .join(',');
+                const buildCommand = `nx run-many --target=build --projects=${buildableDependencies}`;
+                config.plugins.push(new webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin(buildCommand));
+            }
+        }
+    }
 }
 exports.NxTsconfigPathsWebpackPlugin = NxTsconfigPathsWebpackPlugin;

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

@@ -168,9 +168,7 @@ function applyNxIndependentConfig(options, config) {
 }
 function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
     const tsConfig = options.tsConfig ?? (0, js_1.getRootTsConfigPath)();
-    const plugins = [
-        new nx_tsconfig_paths_webpack_plugin_1.NxTsconfigPathsWebpackPlugin({ tsConfig }),
-    ];
+    const plugins = [];
     const executorContext = {
         projectName: options.projectName,
         targetName: options.targetName,
@@ -178,6 +176,7 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
         configurationName: options.configurationName,
         root: options.root,
     };
+    plugins.push(new nx_tsconfig_paths_webpack_plugin_1.NxTsconfigPathsWebpackPlugin({ ...options, tsConfig }));
     if (!options?.skipTypeChecking) {
         const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
         plugins.push(new ForkTsCheckerWebpackPlugin({

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

@@ -56,6 +56,7 @@ function normalizeOptions(options) {
             ? normalizeAssets(combinedPluginAndMaybeExecutorOptions.assets, devkit_1.workspaceRoot, sourceRoot, projectNode.data.root)
             : [],
         baseHref: combinedPluginAndMaybeExecutorOptions.baseHref ?? '/',
+        buildLibsFromSource: combinedPluginAndMaybeExecutorOptions.buildLibsFromSource ?? true,
         commonChunk: combinedPluginAndMaybeExecutorOptions.commonChunk ?? true,
         compiler: combinedPluginAndMaybeExecutorOptions.compiler ?? 'babel',
         configurationName,

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

@@ -58,6 +58,10 @@ export interface NxAppWebpackPluginOptions {
      * Set <base href> for the resulting index.html.
      */
     baseHref?: string;
+    /**
+     * Build the libraries from source. Default is `true`.
+     */
+    buildLibsFromSource?: boolean;
     commonChunk?: boolean;
     /**
      * The compiler to use. Default is `babel` and requires a `.babelrc` file.