@angular-devkit/build-angular 17.1.0-next.0 → 17.1.0-next.2

package/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();

package/src/utils/check-port.js

@@ -6,43 +6,26 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkPort = void 0;
-const net = __importStar(require("net"));
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_net_1 = require("node:net");
 const load_esm_1 = require("./load-esm");
 const tty_1 = require("./tty");
 function createInUseError(port) {
     return new Error(`Port ${port} is already in use. Use '--port' to specify a different port.`);
 }
 async function checkPort(port, host) {
-    if (port === 0) {
-        return 0;
-    }
+    // Disabled due to Vite not handling port 0 and instead always using the default value (5173)
+    // TODO: Enable this again once Vite is fixed
+    // if (port === 0) {
+    //   return 0;
+    // }
     return new Promise((resolve, reject) => {
-        const server = net.createServer();
+        const server = (0, node_net_1.createServer)();
         server
             .once('error', (err) => {
             if (err.code !== 'EADDRINUSE') {
@@ -60,11 +43,14 @@ async function checkPort(port, host) {
                 message: `Port ${port} is already in use.\nWould you like to use a different port?`,
                 default: true,
             }))
-                .then((answers) => (answers.useDifferent ? resolve(0) : reject(createInUseError(port))), () => reject(createInUseError(port)));
+                .then((answers) => answers.useDifferent ? resolve(checkPort(0, host)) : reject(createInUseError(port)), () => reject(createInUseError(port)));
         })
             .once('listening', () => {
+            // Get the actual address from the listening server instance
+            const address = server.address();
+            (0, node_assert_1.default)(address && typeof address !== 'string', 'Port check server address should always be an object.');
             server.close();
-            resolve(port);
+            resolve(address.port);
         })
             .listen(port, host);
     });

package/src/utils/delete-output-dir.d.ts

@@ -8,4 +8,4 @@
 /**
  * Delete an output directory, but error out if it's the root of the project.
  */
-export declare function deleteOutputDir(root: string, outputPath: string): Promise<void>;
+export declare function deleteOutputDir(root: string, outputPath: string, emptyOnlyDirectories?: string[]): Promise<void>;

package/src/utils/delete-output-dir.js

@@ -13,11 +13,14 @@ const node_path_1 = require("node:path");
 /**
  * Delete an output directory, but error out if it's the root of the project.
  */
-async function deleteOutputDir(root, outputPath) {
+async function deleteOutputDir(root, outputPath, emptyOnlyDirectories) {
     const resolvedOutputPath = (0, node_path_1.resolve)(root, outputPath);
     if (resolvedOutputPath === root) {
         throw new Error('Output path MUST not be project root directory!');
     }
+    const directoriesToEmpty = emptyOnlyDirectories
+        ? new Set(emptyOnlyDirectories.map((directory) => (0, node_path_1.join)(resolvedOutputPath, directory)))
+        : undefined;
     // Avoid removing the actual directory to avoid errors in cases where the output
     // directory is mounted or symlinked. Instead the contents are removed.
     let entries;
@@ -31,7 +34,13 @@ async function deleteOutputDir(root, outputPath) {
         throw error;
     }
     for (const entry of entries) {
-        await (0, promises_1.rm)((0, node_path_1.join)(resolvedOutputPath, entry), { force: true, recursive: true, maxRetries: 3 });
+        const fullEntry = (0, node_path_1.join)(resolvedOutputPath, entry);
+        // Leave requested directories. This allows symlinks to continue to function.
+        if (directoriesToEmpty?.has(fullEntry)) {
+            await deleteOutputDir(resolvedOutputPath, fullEntry);
+            continue;
+        }
+        await (0, promises_1.rm)(fullEntry, { force: true, recursive: true, maxRetries: 3 });
     }
 }
 exports.deleteOutputDir = deleteOutputDir;

package/src/utils/index-file/inline-fonts.d.ts

@@ -5,6 +5,10 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+/// <reference types="node" />
+/// <reference types="@types/node/url" />
+/// <reference types="@types/node/ts4.8/url" />
+import { URL } from 'node:url';
 import { NormalizedCachedOptions } from '../normalize-cache';
 export interface InlineFontsOptions {
     minify?: boolean;
@@ -16,7 +20,8 @@ export declare class InlineFontsProcessor {
     constructor(options: InlineFontsOptions);
     process(content: string): Promise<string>;
     private getResponse;
-    private processHref;
+    processURL(url: string | URL): Promise<string | undefined>;
+    canInlineRequest(url: string): boolean;
     private getFontProviderDetails;
     private createNormalizedUrl;
 }

package/src/utils/index-file/inline-fonts.js

@@ -114,7 +114,7 @@ class InlineFontsProcessor {
             if (!url) {
                 continue;
             }
-            const content = await this.processHref(url);
+            const content = await this.processURL(url);
             if (content === undefined) {
                 continue;
             }
@@ -195,7 +195,16 @@ class InlineFontsProcessor {
                 .get(url, {
                 agent,
                 headers: {
-                    'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.121 Safari/537.36',
+                    /**
+                     * Always use a Windows UA. This is because Google fonts will including hinting in fonts for Windows.
+                     * Hinting is a technique used with Windows files to improve appearance however
+                     * results in 20-50% larger file sizes.
+                     *
+                     * @see http://google3/java/com/google/fonts/css/OpenSansWebFontsCssBuilder.java?l=22
+                     * @see https://fonts.google.com/knowledge/glossary/hinting (short)
+                     * @see https://glyphsapp.com/learn/hinting-manual-truetype-hinting (deep dive)
+                     */
+                    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
                 },
             }, (res) => {
                 if (res.statusCode !== 200) {
@@ -216,12 +225,16 @@ class InlineFontsProcessor {
         }
         return data;
     }
-    async processHref(url) {
-        const provider = this.getFontProviderDetails(url);
+    async processURL(url) {
+        const normalizedURL = url instanceof node_url_1.URL ? url : this.createNormalizedUrl(url);
+        if (!normalizedURL) {
+            return;
+        }
+        const provider = this.getFontProviderDetails(normalizedURL);
         if (!provider) {
             return undefined;
         }
-        let cssContent = await this.getResponse(url);
+        let cssContent = await this.getResponse(normalizedURL);
         if (this.options.minify) {
             cssContent = cssContent
                 // Comments.
@@ -233,21 +246,24 @@ class InlineFontsProcessor {
         }
         return cssContent;
     }
+    canInlineRequest(url) {
+        const normalizedUrl = this.createNormalizedUrl(url);
+        return normalizedUrl ? !!this.getFontProviderDetails(normalizedUrl) : false;
+    }
     getFontProviderDetails(url) {
         return SUPPORTED_PROVIDERS[url.hostname];
     }
     createNormalizedUrl(value) {
         // Need to convert '//' to 'https://' because the URL parser will fail with '//'.
-        const normalizedHref = value.startsWith('//') ? `https:${value}` : value;
-        if (!normalizedHref.startsWith('http')) {
-            // Non valid URL.
-            // Example: relative path styles.css.
-            return undefined;
+        const url = new node_url_1.URL(value.startsWith('//') ? `https:${value}` : value, 'resolve://');
+        switch (url.protocol) {
+            case 'http:':
+            case 'https:':
+                url.protocol = 'https:';
+                return url;
+            default:
+                return undefined;
         }
-        const url = new node_url_1.URL(normalizedHref);
-        // Force HTTPS protocol
-        url.protocol = 'https:';
-        return url;
     }
 }
 exports.InlineFontsProcessor = InlineFontsProcessor;

package/src/utils/server-rendering/esm-in-memory-loader/node-18-utils.js

@@ -11,19 +11,20 @@ exports.getESMLoaderArgs = exports.callInitializeIfNeeded = void 0;
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const node_worker_threads_1 = require("node:worker_threads");
-let IS_NODE_18;
-function isNode18() {
-    return (IS_NODE_18 ??= process.versions.node.startsWith('18.'));
+const semver_1 = require("semver");
+let SUPPORTS_IMPORT_FLAG;
+function supportsImportFlag() {
+    return (SUPPORTS_IMPORT_FLAG ??= (0, semver_1.satisfies)(process.versions.node, '>= 18.19'));
 }
 /** Call the initialize hook when running on Node.js 18 */
 function callInitializeIfNeeded(initialize) {
-    if (isNode18()) {
+    if (!supportsImportFlag()) {
         initialize(node_worker_threads_1.workerData);
     }
 }
 exports.callInitializeIfNeeded = callInitializeIfNeeded;
 function getESMLoaderArgs() {
-    if (isNode18()) {
+    if (!supportsImportFlag()) {
         return [
             '--no-warnings', // Suppress `ExperimentalWarning: Custom ESM Loaders is an experimental feature...`.
             '--loader',

package/src/utils/server-rendering/esm-in-memory-loader/register-hooks.js

@@ -7,9 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-// TODO: remove the below once @types/node are version 20.x.x
-// @ts-expect-error "node:module"' has no exported member 'register'.ts(2305)
 const node_module_1 = require("node:module");
 const node_url_1 = require("node:url");
 const node_worker_threads_1 = require("node:worker_threads");
-(0, node_module_1.register)('./loader-hooks.js', (0, node_url_1.pathToFileURL)(__filename), { data: node_worker_threads_1.workerData });
+(0, node_module_1.register)('./loader-hooks.js', { parentURL: (0, node_url_1.pathToFileURL)(__filename), data: node_worker_threads_1.workerData });

package/src/utils/spinner.js

@@ -21,7 +21,7 @@ class Spinner {
     #isTTY = (0, tty_1.isTTY)();
     constructor(text) {
         this.spinner = (0, ora_1.default)({
-            text,
+            text: text === undefined ? undefined : text + '\n',
             // The below 2 options are needed because otherwise CTRL+C will be delayed
             // when the underlying process is sync.
             hideCursor: false,