@nx/webpack 17.3.1 → 17.3.2

package/package.json

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

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

@@ -4,18 +4,23 @@ exports.getRootTsConfigPath = exports.readTsConfig = exports.readTsPathMappings
 const fs_1 = require("fs");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
-let tsConfig;
-let tsPathMappings;
+let tsConfig = new Map();
+let tsPathMappings = new Map();
 function readTsPathMappings(tsConfigPath = process.env.NX_TSCONFIG_PATH ?? getRootTsConfigPath()) {
-    if (tsPathMappings) {
-        return tsPathMappings;
+    if (tsPathMappings.has(tsConfigPath)) {
+        return tsPathMappings.get(tsConfigPath);
     }
-    tsConfig ??= readTsConfiguration(tsConfigPath);
-    tsPathMappings = {};
-    Object.entries(tsConfig.options?.paths ?? {}).forEach(([alias, paths]) => {
-        tsPathMappings[alias] = paths.map((path) => path.replace(/^\.\//, ''));
+    if (!tsConfig.has(tsConfigPath)) {
+        tsConfig.set(tsConfigPath, readTsConfiguration(tsConfigPath));
+    }
+    tsPathMappings.set(tsConfigPath, {});
+    Object.entries(tsConfig.get(tsConfigPath).options?.paths ?? {}).forEach(([alias, paths]) => {
+        tsPathMappings.set(tsConfigPath, {
+            ...tsPathMappings.get(tsConfigPath),
+            [alias]: paths.map((path) => path.replace(/^\.\//, '')),
+        });
     });
-    return tsPathMappings;
+    return tsPathMappings.get(tsConfigPath);
 }
 exports.readTsPathMappings = readTsPathMappings;
 function readTsConfiguration(tsConfigPath) {

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*['"]?)(.*?)(?:['"]?\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] || match[2] || match[3];
+                    const originalUrl = match[1];
                     let processedUrl;
                     try {
                         processedUrl = await process(originalUrl, context, resourceCache);