@angular/build 18.0.2 → 18.1.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "18.0.2",
+  "version": "18.1.0-next.0",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,36 +23,36 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1800.2",
-    "@babel/core": "7.24.5",
-    "@babel/helper-annotate-as-pure": "7.22.5",
-    "@babel/helper-split-export-declaration": "7.24.5",
+    "@angular-devkit/architect": "0.1801.0-next.0",
+    "@babel/core": "7.24.6",
+    "@babel/helper-annotate-as-pure": "7.24.6",
+    "@babel/helper-split-export-declaration": "7.24.6",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "browserslist": "^4.23.0",
     "critters": "0.0.22",
-    "esbuild": "0.21.3",
+    "esbuild": "0.21.4",
     "fast-glob": "3.3.2",
     "https-proxy-agent": "7.0.4",
     "inquirer": "9.2.22",
-    "lmdb": "3.0.8",
+    "lmdb": "3.0.11",
     "magic-string": "0.30.10",
     "mrmime": "2.0.0",
     "ora": "5.4.1",
     "picomatch": "4.0.2",
-    "piscina": "4.5.0",
+    "piscina": "4.5.1",
     "parse5-html-rewriting-stream": "7.0.0",
     "sass": "1.77.2",
     "semver": "7.6.2",
-    "undici": "6.18.0",
-    "vite": "5.2.11",
+    "undici": "6.18.1",
+    "vite": "5.2.12",
     "watchpack": "2.4.1"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^18.0.0",
-    "@angular/localize": "^18.0.0",
-    "@angular/platform-server": "^18.0.0",
-    "@angular/service-worker": "^18.0.0",
+    "@angular/compiler-cli": "^18.0.0 || ^18.1.0-next.0",
+    "@angular/localize": "^18.0.0 || ^18.1.0-next.0",
+    "@angular/platform-server": "^18.0.0 || ^18.1.0-next.0",
+    "@angular/service-worker": "^18.0.0 || ^18.1.0-next.0",
     "less": "^4.2.0",
     "postcss": "^8.4.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",

package/src/tools/sass/lexer.js

@@ -45,9 +45,20 @@ function* findUrls(contents) {
     };
     // Based on https://www.w3.org/TR/css-syntax-3/#consume-ident-like-token
     while ((pos = contents.indexOf('url(', pos)) !== -1) {
+        width = 1;
+        // Ensure whitespace, comma, or colon before `url(`
+        if (pos > 0) {
+            pos -= 2;
+            next();
+            if (!isWhitespace(current) && current !== 0x0027 && current !== 0x003a) {
+                // Skip - not a url token
+                pos += 3;
+                continue;
+            }
+            pos += 1;
+        }
         // Set to position of the (
         pos += 3;
-        width = 1;
         // Consume all leading whitespace
         while (isWhitespace(next())) {
             /* empty */

package/src/tools/sass/rebasing-importer.js

@@ -17,25 +17,6 @@ const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const error_1 = require("../../utils/error");
 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
@@ -84,13 +65,13 @@ class UrlRebasingImporter {
             }
             // Sass variable usage either starts with a `$` or contains a namespace and a `.$`
             const valueNormalized = value[0] === '$' || /^\w+\.\$/.test(value) ? `#{${value}}` : value;
-            const rebasedPath = (0, node_path_1.relative)(this.entryDirectory, stylesheetDirectory) + '||file:' + valueNormalized;
+            const rebasedPath = (0, node_path_1.relative)(this.entryDirectory, stylesheetDirectory);
             // Normalize path separators and escape characters
             // https://developer.mozilla.org/en-US/docs/Web/CSS/url#syntax
-            const rebasedUrl = ensureRelative(rebasedPath.replace(/\\/g, '/').replace(/[()\s'"]/g, '\\$&'));
+            const rebasedUrl = rebasedPath.replace(/\\/g, '/').replace(/[()\s'"]/g, '\\$&');
             updatedContents ??= new magic_string_1.default(contents);
             // Always quote the URL to avoid potential downstream parsing problems
-            updatedContents.update(start, end, `"${rebasedUrl}"`);
+            updatedContents.update(start, end, `"${rebasedUrl}||file:${valueNormalized}"`);
         }
         if (updatedContents) {
             contents = updatedContents.toString();

package/src/utils/normalize-cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = void 0;
 const node_path_1 = require("node:path");
 /** Version placeholder is replaced during the build process with actual package version */
-const VERSION = '18.0.2';
+const VERSION = '18.1.0-next.0';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&