@angular-devkit/build-angular 17.1.0-next.1 → 17.1.0-next.3

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/index.d.ts

@@ -8,6 +8,7 @@
 export * from './default-progress';
 export * from './delete-output-dir';
 export * from './run-module-as-observable-fork';
+export * from './load-proxy-config';
 export * from './normalize-file-replacements';
 export * from './normalize-asset-patterns';
 export * from './normalize-source-maps';

package/src/utils/index.js

@@ -24,6 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./default-progress"), exports);
 __exportStar(require("./delete-output-dir"), exports);
 __exportStar(require("./run-module-as-observable-fork"), exports);
+__exportStar(require("./load-proxy-config"), exports);
 __exportStar(require("./normalize-file-replacements"), exports);
 __exportStar(require("./normalize-asset-patterns"), exports);
 __exportStar(require("./normalize-source-maps"), exports);

package/src/{builders/dev-server → utils}/load-proxy-config.js

@@ -37,8 +37,8 @@ const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const picomatch_1 = require("picomatch");
-const error_1 = require("../../utils/error");
-const load_esm_1 = require("../../utils/load-esm");
+const error_1 = require("./error");
+const load_esm_1 = require("./load-esm");
 async function loadProxyConfiguration(root, proxyConfig, normalize = false) {
     if (!proxyConfig) {
         return undefined;

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/tools/esbuild/normalize-path.d.ts

@@ -1,8 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * 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
- */
-export declare function normalizePath(path: string): string;

package/src/tools/esbuild/normalize-path.js

@@ -1,22 +0,0 @@
-"use strict";
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * 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
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizePath = void 0;
-const node_os_1 = require("node:os");
-const node_path_1 = require("node:path");
-const USING_WINDOWS = (0, node_os_1.platform)() === 'win32';
-function normalizePath(path) {
-    if (USING_WINDOWS) {
-        return (0, node_path_1.normalize)(path).toLowerCase();
-    }
-    else {
-        return (0, node_path_1.normalize)(path);
-    }
-}
-exports.normalizePath = normalizePath;