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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "18.2.0-beta.2",
+  "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.2",
-    "@nx/js": "18.2.0-beta.2",
-    "@nrwl/webpack": "18.2.0-beta.2"
+    "@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

@@ -28,12 +28,14 @@ function normalizeOptions(options) {
         if (configurationName) {
             Object.assign(buildTargetOptions, targetConfig.configurations?.[configurationName]);
         }
-        Object.assign(combinedPluginAndMaybeExecutorOptions, buildTargetOptions, options // plugin options take precedence
-        );
+        Object.assign(combinedPluginAndMaybeExecutorOptions, options, 
+        // executor options take precedence (especially for overriding with CLI args)
+        buildTargetOptions);
     }
     else {
-        Object.assign(combinedPluginAndMaybeExecutorOptions, originalTargetOptions, options // plugin options take precedence
-        );
+        Object.assign(combinedPluginAndMaybeExecutorOptions, options, 
+        // executor options take precedence (especially for overriding with CLI args)
+        originalTargetOptions);
     }
     const sourceRoot = projectNode.data.sourceRoot ?? projectNode.data.root;
     if (!options.main) {
@@ -74,7 +76,7 @@ function normalizeOptions(options) {
     };
 }
 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);
@@ -101,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);
             }