@nx/webpack 18.1.0-beta.0 → 18.1.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "18.1.0-beta.0",
+  "version": "18.1.0-beta.10",
   "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.1.0-beta.0",
-    "@nx/js": "18.1.0-beta.0",
-    "@nrwl/webpack": "18.1.0-beta.0"
+    "@nx/devkit": "18.1.0-beta.10",
+    "@nx/js": "18.1.0-beta.10",
+    "@nrwl/webpack": "18.1.0-beta.10"
   },
   "publishConfig": {
     "access": "public"

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

@@ -21,7 +21,7 @@ function normalizeOptions(options, root, projectRoot, sourceRoot) {
             : options.optimization,
     };
     if (options.assets) {
-        normalizedOptions.assets = (0, normalize_options_1.normalizeAssets)(options.assets, root, sourceRoot);
+        normalizedOptions.assets = (0, normalize_options_1.normalizeAssets)(options.assets, root, sourceRoot, projectRoot);
     }
     return normalizedOptions;
 }

package/src/generators/configuration/configuration.js

@@ -12,7 +12,10 @@ function configurationGenerator(tree, options) {
 exports.configurationGenerator = configurationGenerator;
 async function configurationGeneratorInternal(tree, options) {
     const tasks = [];
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    options.addPlugin ??= addPluginDefault;
     const initTask = await (0, init_1.webpackInitGenerator)(tree, {
         ...options,
         skipFormat: true,

package/src/generators/init/init.js

@@ -10,7 +10,10 @@ function webpackInitGenerator(tree, schema) {
 }
 exports.webpackInitGenerator = webpackInitGenerator;
 async function webpackInitGeneratorInternal(tree, schema) {
-    schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
         addPlugin(tree);
     }

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): AssetGlobPattern[];
+export declare function normalizeAssets(assets: any[], root: string, sourceRoot: string, projectRoot: string): AssetGlobPattern[];
 export declare function normalizeFileReplacements(root: string, fileReplacements: FileReplacement[]): FileReplacement[];

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

@@ -40,7 +40,7 @@ function normalizeOptions(options) {
     return {
         ...options,
         assets: options.assets
-            ? normalizeAssets(options.assets, devkit_1.workspaceRoot, sourceRoot)
+            ? normalizeAssets(options.assets, devkit_1.workspaceRoot, sourceRoot, projectNode.data.root)
             : [],
         baseHref: options.baseHref ?? '/',
         commonChunk: options.commonChunk ?? true,
@@ -71,7 +71,7 @@ function normalizeOptions(options) {
     };
 }
 exports.normalizeOptions = normalizeOptions;
-function normalizeAssets(assets, root, sourceRoot) {
+function normalizeAssets(assets, root, sourceRoot, projectRoot) {
     return assets.map((asset) => {
         if (typeof asset === 'string') {
             const assetPath = (0, devkit_1.normalizePath)(asset);
@@ -97,7 +97,11 @@ function normalizeAssets(assets, root, sourceRoot) {
                 throw new Error('An asset cannot be written to a location outside of the output path.');
             }
             const assetPath = (0, devkit_1.normalizePath)(asset.input);
-            const resolvedAssetPath = (0, path_1.resolve)(root, assetPath);
+            let resolvedAssetPath = (0, path_1.resolve)(root, assetPath);
+            if (asset.input.startsWith('.')) {
+                const resolvedProjectRoot = (0, path_1.resolve)(root, projectRoot);
+                resolvedAssetPath = (0, path_1.resolve)(resolvedProjectRoot, assetPath);
+            }
             return {
                 ...asset,
                 input: resolvedAssetPath,

package/src/utils/webpack/plugins/postcss-cli-resources.js

@@ -122,7 +122,7 @@ function PostcssCliResources(options) {
             const resourceCache = new Map();
             return Promise.all(urlDeclarations.map(async (decl) => {
                 const value = decl.value;
-                const urlRegex = /url(?:\(\s*['"]?)(.*?)(?:['"]?\s*\))/g;
+                const urlRegex = /url(?:\(\s*(['"]?))(.*?)(?:\1\s*\))/g;
                 const segments = [];
                 let match;
                 let lastIndex = 0;
@@ -131,7 +131,7 @@ function PostcssCliResources(options) {
                 const inputFile = decl.source && decl.source.input.file;
                 const context = (inputFile && path.dirname(inputFile)) || loader.context;
                 while ((match = urlRegex.exec(value))) {
-                    const originalUrl = match[1];
+                    const originalUrl = match[2];
                     let processedUrl;
                     try {
                         processedUrl = await process(originalUrl, context, resourceCache);

package/src/utils/with-nx.js

@@ -19,7 +19,7 @@ function withNx(pluginOptions = {}) {
             assets: options.assets
                 ? options.assets
                 : pluginOptions.assets
-                    ? (0, normalize_options_1.normalizeAssets)(pluginOptions.assets, options.root, options.sourceRoot)
+                    ? (0, normalize_options_1.normalizeAssets)(pluginOptions.assets, options.root, options.sourceRoot, options.projectRoot)
                     : [],
             root: context.root,
             projectName: context.projectName,