@nx/webpack 18.2.0-beta.1 → 18.2.0-beta.3

package/package.json

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

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

@@ -21,7 +21,8 @@ function normalizeOptions(options, root, projectRoot, sourceRoot) {
             : options.optimization,
     };
     if (options.assets) {
-        normalizedOptions.assets = (0, normalize_options_1.normalizeAssets)(options.assets, root, sourceRoot, projectRoot);
+        normalizedOptions.assets = (0, normalize_options_1.normalizeAssets)(options.assets, root, sourceRoot, projectRoot, false // executor assets are relative to workspace root for consistency
+        );
     }
     return normalizedOptions;
 }

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

@@ -1,4 +1,4 @@
 import { AssetGlobPattern, FileReplacement, NormalizedNxWebpackPluginOptions, NxWebpackPluginOptions } from '../nx-webpack-plugin-options';
 export declare function normalizeOptions(options: NxWebpackPluginOptions): NormalizedNxWebpackPluginOptions;
-export declare function normalizeAssets(assets: any[], root: string, sourceRoot: string, projectRoot: string): AssetGlobPattern[];
+export declare function normalizeAssets(assets: any[], root: string, sourceRoot: string, projectRoot: string, resolveRelativePathsToProjectRoot?: boolean): AssetGlobPattern[];
 export declare function normalizeFileReplacements(root: string, fileReplacements: FileReplacement[]): FileReplacement[];

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

@@ -5,7 +5,7 @@ const path_1 = require("path");
 const fs_1 = require("fs");
 const devkit_1 = require("@nx/devkit");
 function normalizeOptions(options) {
-    const combinedOptions = {};
+    const combinedPluginAndMaybeExecutorOptions = {};
     const isProd = process.env.NODE_ENV === 'production';
     const projectName = process.env.NX_TASK_TARGET_PROJECT;
     const targetName = process.env.NX_TASK_TARGET_TARGET;
@@ -14,6 +14,7 @@ function normalizeOptions(options) {
     const projectGraph = (0, devkit_1.readCachedProjectGraph)();
     const projectNode = projectGraph.nodes[projectName];
     const targetConfig = projectNode.data.targets[targetName];
+    normalizeRelativePaths(projectNode.data.root, options);
     // Merge options from `@nx/webpack:webpack` into plugin options.
     // Options from `@nx/webpack:webpack` take precedence.
     const originalTargetOptions = targetConfig.options;
@@ -27,51 +28,55 @@ function normalizeOptions(options) {
         if (configurationName) {
             Object.assign(buildTargetOptions, targetConfig.configurations?.[configurationName]);
         }
-        Object.assign(combinedOptions, buildTargetOptions);
+        Object.assign(combinedPluginAndMaybeExecutorOptions, options, 
+        // executor options take precedence (especially for overriding with CLI args)
+        buildTargetOptions);
     }
     else {
-        Object.assign(combinedOptions, originalTargetOptions, options);
+        Object.assign(combinedPluginAndMaybeExecutorOptions, options, 
+        // executor options take precedence (especially for overriding with CLI args)
+        originalTargetOptions);
     }
-    normalizeRelativePaths(projectNode.data.root, options);
     const sourceRoot = projectNode.data.sourceRoot ?? projectNode.data.root;
     if (!options.main) {
         throw new Error(`Missing "main" option for the entry file. Set this option in your Nx webpack plugin.`);
     }
     return {
-        ...options,
-        assets: options.assets
-            ? normalizeAssets(options.assets, devkit_1.workspaceRoot, sourceRoot, projectNode.data.root)
+        ...combinedPluginAndMaybeExecutorOptions,
+        assets: combinedPluginAndMaybeExecutorOptions.assets
+            ? normalizeAssets(combinedPluginAndMaybeExecutorOptions.assets, devkit_1.workspaceRoot, sourceRoot, projectNode.data.root)
             : [],
-        baseHref: options.baseHref ?? '/',
-        commonChunk: options.commonChunk ?? true,
-        compiler: options.compiler ?? 'babel',
+        baseHref: combinedPluginAndMaybeExecutorOptions.baseHref ?? '/',
+        commonChunk: combinedPluginAndMaybeExecutorOptions.commonChunk ?? true,
+        compiler: combinedPluginAndMaybeExecutorOptions.compiler ?? 'babel',
         configurationName,
-        deleteOutputPath: options.deleteOutputPath ?? true,
-        extractCss: options.extractCss ?? true,
-        fileReplacements: normalizeFileReplacements(devkit_1.workspaceRoot, options.fileReplacements),
-        generateIndexHtml: options.generateIndexHtml ?? true,
-        main: options.main,
-        namedChunks: options.namedChunks ?? !isProd,
-        optimization: options.optimization ?? isProd,
-        outputFileName: options.outputFileName ?? 'main.js',
-        outputHashing: options.outputHashing ?? (isProd ? 'all' : 'none'),
-        outputPath: options.outputPath,
+        deleteOutputPath: combinedPluginAndMaybeExecutorOptions.deleteOutputPath ?? true,
+        extractCss: combinedPluginAndMaybeExecutorOptions.extractCss ?? true,
+        fileReplacements: normalizeFileReplacements(devkit_1.workspaceRoot, combinedPluginAndMaybeExecutorOptions.fileReplacements),
+        generateIndexHtml: combinedPluginAndMaybeExecutorOptions.generateIndexHtml ?? true,
+        main: combinedPluginAndMaybeExecutorOptions.main,
+        namedChunks: combinedPluginAndMaybeExecutorOptions.namedChunks ?? !isProd,
+        optimization: combinedPluginAndMaybeExecutorOptions.optimization ?? isProd,
+        outputFileName: combinedPluginAndMaybeExecutorOptions.outputFileName ?? 'main.js',
+        outputHashing: combinedPluginAndMaybeExecutorOptions.outputHashing ??
+            (isProd ? 'all' : 'none'),
+        outputPath: combinedPluginAndMaybeExecutorOptions.outputPath,
         projectGraph,
         projectName,
         projectRoot: projectNode.data.root,
         root: devkit_1.workspaceRoot,
-        runtimeChunk: options.runtimeChunk ?? true,
-        scripts: options.scripts ?? [],
-        sourceMap: options.sourceMap ?? !isProd,
+        runtimeChunk: combinedPluginAndMaybeExecutorOptions.runtimeChunk ?? true,
+        scripts: combinedPluginAndMaybeExecutorOptions.scripts ?? [],
+        sourceMap: combinedPluginAndMaybeExecutorOptions.sourceMap ?? !isProd,
         sourceRoot,
-        styles: options.styles ?? [],
-        target: options.target,
+        styles: combinedPluginAndMaybeExecutorOptions.styles ?? [],
+        target: combinedPluginAndMaybeExecutorOptions.target,
         targetName,
-        vendorChunk: options.vendorChunk ?? !isProd,
+        vendorChunk: combinedPluginAndMaybeExecutorOptions.vendorChunk ?? !isProd,
     };
 }
 exports.normalizeOptions = normalizeOptions;
-function normalizeAssets(assets, root, sourceRoot, projectRoot) {
+function normalizeAssets(assets, root, sourceRoot, projectRoot, resolveRelativePathsToProjectRoot = true) {
     return assets.map((asset) => {
         if (typeof asset === 'string') {
             const assetPath = (0, devkit_1.normalizePath)(asset);
@@ -98,7 +103,7 @@ function normalizeAssets(assets, root, sourceRoot, projectRoot) {
             }
             const assetPath = (0, devkit_1.normalizePath)(asset.input);
             let resolvedAssetPath = (0, path_1.resolve)(root, assetPath);
-            if (asset.input.startsWith('.')) {
+            if (resolveRelativePathsToProjectRoot && asset.input.startsWith('.')) {
                 const resolvedProjectRoot = (0, path_1.resolve)(root, projectRoot);
                 resolvedAssetPath = (0, path_1.resolve)(resolvedProjectRoot, assetPath);
             }

package/src/plugins/plugin.js

@@ -101,6 +101,7 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
         executor: '@nx/web:file-server',
         options: {
             buildTarget: options.buildTargetName,
+            spa: true,
         },
     };
     return targets;