@nx/webpack 19.5.3 → 19.5.4

package/package.json

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

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

@@ -271,6 +271,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     }
     config.output = {
         ...config.output,
+        assetModuleFilename: '[name].[contenthash:20][ext]',
         crossOriginLoading: options.subresourceIntegrity
             ? 'anonymous'
             : false,
@@ -338,9 +339,6 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                         maxSize: 10_000, // 10 kB
                     },
                 },
-                generator: {
-                    filename: `[name]${hashFormat.file}[ext]`,
-                },
             },
             // SVG: same as image but we need to separate it so it can be swapped for SVGR in the React plugin.
             {
@@ -351,17 +349,11 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                         maxSize: 10_000, // 10 kB
                     },
                 },
-                generator: {
-                    filename: `[name]${hashFormat.file}[ext]`,
-                },
             },
             // Fonts: Emit separate file and export the URL.
             {
                 test: /\.(eot|otf|ttf|woff|woff2)$/,
                 type: 'asset/resource',
-                generator: {
-                    filename: `[name]${hashFormat.file}[ext]`,
-                },
             },
             ...rules,
         ],

package/src/utils/config.js

@@ -62,5 +62,6 @@ function ensureNxWebpackExecutionContext(ctx) {
         cwd: process.cwd(),
         root: devkit_1.workspaceRoot,
         isVerbose: process.env['NX_VERBOSE_LOGGING'] === 'true',
+        projectGraph,
     };
 }

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

@@ -52,7 +52,12 @@ function shareWorkspaceLibraries(workspaceLibs, tsConfigPath = process.env.NX_TS
     }
     const webpack = require('webpack');
     return {
-        getAliases: () => pathMappings.reduce((aliases, library) => ({ ...aliases, [library.name]: library.path }), {}),
+        getAliases: () => pathMappings.reduce((aliases, library) => ({
+            ...aliases,
+            // If the library path ends in a wildcard, remove it as webpack can't handle this in resolve.alias
+            // e.g. path/to/my/lib/* -> path/to/my/lib
+            [library.name]: library.path.replace(/\/\*$/, ''),
+        }), {}),
         getLibraries: (projectRoot, eager) => {
             let pkgJson = null;
             if (projectRoot &&
@@ -97,7 +102,17 @@ function shareWorkspaceLibraries(workspaceLibs, tsConfigPath = process.env.NX_TS
             for (const library of pathMappings) {
                 const libFolder = (0, path_1.normalize)((0, path_1.dirname)(library.path));
                 if (!from.startsWith(libFolder) && to.startsWith(libFolder)) {
-                    req.request = library.name;
+                    const newReq = library.name.endsWith('/*')
+                        ? /**
+                           * req usually is in the form of "../../../path/to/file"
+                           * library.path is usually in the form of "/Users/username/path/to/Workspace/path/to/library"
+                           *
+                           * When a wildcard is used in the TS path mappings, we want to get everything after the import to
+                           * re-route the request correctly inline with the webpack resolve.alias
+                           */
+                            (0, path_1.join)(library.name, req.request.split(library.path.replace(devkit_1.workspaceRoot, '').replace('/*', ''))[1])
+                        : library.name;
+                    req.request = newReq;
                 }
             }
         }),