f9e982c fix(@angular-devkit/build-angular): check namespaced Sass variables when rebasing URLs

Author: Angular Builds

package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "17.0.5+sha-7df4b06",
+  "version": "17.0.5+sha-f9e982c",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.1",
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#7df4b06",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#7df4b06",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#7df4b06",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#f9e982c",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#f9e982c",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#f9e982c",
     "@babel/core": "7.23.2",
     "@babel/generator": "7.23.0",
     "@babel/helper-annotate-as-pure": "7.22.5",
@@ -20,7 +20,7 @@
     "@babel/preset-env": "7.23.2",
     "@babel/runtime": "7.23.2",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#7df4b06",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#f9e982c",
     "@vitejs/plugin-basic-ssl": "1.0.1",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.16",

src/tools/sass/rebasing-importer.js

@@ -16,6 +16,25 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const lexer_1 = require("./lexer");
+/**
+ * Ensures that a bare specifier URL path that is intended to be treated as
+ * a relative path has a leading `./` or `../` prefix.
+ *
+ * @param url A bare specifier URL path that should be considered relative.
+ * @returns
+ */
+function ensureRelative(url) {
+    // Empty
+    if (!url) {
+        return url;
+    }
+    // Already relative
+    if (url[0] === '.' && (url[1] === '/' || (url[1] === '.' && url[2] === '/'))) {
+        return url;
+    }
+    // Needs prefix
+    return './' + url;
+}
 /**
  * A Sass Importer base class that provides the load logic to rebase all `url()` functions
  * within a stylesheet. The rebasing will ensure that the URLs in the output of the Sass compiler
@@ -46,8 +65,13 @@ class UrlRebasingImporter {
         // Rebase any URLs that are found
         let updatedContents;
         for (const { start, end, value } of (0, lexer_1.findUrls)(contents)) {
-            // Skip if value is empty, a Sass variable, or Webpack-specific prefix
-            if (value.length === 0 || value[0] === '$' || value[0] === '~' || value[0] === '^') {
+            // Skip if value is empty or Webpack-specific prefix
+            if (value.length === 0 || value[0] === '~' || value[0] === '^') {
+                continue;
+            }
+            // Skip if value is a Sass variable.
+            // Sass variable usage either starts with a `$` or contains a namespace and a `.$`
+            if (value[0] === '$' || /^\w+\.\$/.test(value)) {
                 continue;
             }
             // Skip if root-relative, absolute or protocol relative url
@@ -57,9 +81,10 @@ class UrlRebasingImporter {
             const rebasedPath = (0, node_path_1.relative)(this.entryDirectory, (0, node_path_1.join)(stylesheetDirectory, value));
             // Normalize path separators and escape characters
             // https://developer.mozilla.org/en-US/docs/Web/CSS/url#syntax
-            const rebasedUrl = './' + rebasedPath.replace(/\\/g, '/').replace(/[()\s'"]/g, '\\$&');
+            const rebasedUrl = ensureRelative(rebasedPath.replace(/\\/g, '/').replace(/[()\s'"]/g, '\\$&'));
             updatedContents ??= new magic_string_1.default(contents);
-            updatedContents.update(start, end, rebasedUrl);
+            // Always quote the URL to avoid potential downstream parsing problems
+            updatedContents.update(start, end, `"${rebasedUrl}"`);
         }
         if (updatedContents) {
             contents = updatedContents.toString();

uniqueId

@@ -1 +1 @@
-Mon Dec 04 2023 16:44:44 GMT+0000 (Coordinated Universal Time)
+Tue Dec 05 2023 15:10:46 GMT+0000 (Coordinated Universal Time)