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

package/package.json

@@ -1,37 +1,36 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "17.1.0-next.1",
+  "version": "17.1.0-next.2",
   "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": "0.1701.0-next.1",
-    "@angular-devkit/build-webpack": "0.1701.0-next.1",
-    "@angular-devkit/core": "17.1.0-next.1",
-    "@babel/core": "7.23.5",
-    "@babel/generator": "7.23.5",
+    "@angular-devkit/architect": "0.1701.0-next.2",
+    "@angular-devkit/build-webpack": "0.1701.0-next.2",
+    "@angular-devkit/core": "17.1.0-next.2",
+    "@babel/core": "7.23.6",
+    "@babel/generator": "7.23.6",
     "@babel/helper-annotate-as-pure": "7.22.5",
     "@babel/helper-split-export-declaration": "7.22.6",
     "@babel/plugin-transform-async-generator-functions": "7.23.4",
     "@babel/plugin-transform-async-to-generator": "7.23.3",
-    "@babel/plugin-transform-runtime": "7.23.4",
-    "@babel/preset-env": "7.23.5",
-    "@babel/runtime": "7.23.5",
+    "@babel/plugin-transform-runtime": "7.23.6",
+    "@babel/preset-env": "7.23.6",
+    "@babel/runtime": "7.23.6",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "17.1.0-next.1",
+    "@ngtools/webpack": "17.1.0-next.2",
     "@vitejs/plugin-basic-ssl": "1.0.2",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.16",
     "babel-loader": "9.1.3",
     "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.21.5",
-    "chokidar": "3.5.3",
     "copy-webpack-plugin": "11.0.0",
     "critters": "0.0.20",
     "css-loader": "6.8.1",
-    "esbuild-wasm": "0.19.8",
+    "esbuild-wasm": "0.19.9",
     "fast-glob": "3.3.2",
     "https-proxy-agent": "7.0.2",
     "http-proxy-middleware": "2.0.6",
@@ -49,7 +48,7 @@
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "3.0.1",
-    "piscina": "4.2.0",
+    "piscina": "4.2.1",
     "postcss": "8.4.32",
     "postcss-loader": "7.3.3",
     "resolve-url-loader": "5.0.0",
@@ -59,12 +58,13 @@
     "semver": "7.5.4",
     "source-map-loader": "4.0.1",
     "source-map-support": "0.5.21",
-    "terser": "5.25.0",
+    "terser": "5.26.0",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.6.2",
     "undici": "6.0.1",
-    "vite": "5.0.6",
+    "vite": "5.0.7",
+    "watchpack": "2.4.0",
     "webpack": "5.89.0",
     "webpack-dev-middleware": "6.1.1",
     "webpack-dev-server": "4.15.1",
@@ -72,7 +72,7 @@
     "webpack-subresource-integrity": "5.1.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.19.8"
+    "esbuild": "0.19.9"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^17.0.0 || ^17.1.0-next.0",

package/src/builders/application/build-action.js

@@ -34,6 +34,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runEsBuildBuildAction = void 0;
+const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const sass_language_1 = require("../../tools/esbuild/stylesheets/sass-language");
 const utils_1 = require("../../tools/esbuild/utils");
@@ -42,7 +43,7 @@ const environment_options_1 = require("../../utils/environment-options");
 async function* runEsBuildBuildAction(action, options) {
     const { writeToFileSystemFilter, writeToFileSystem = true, watch, poll, logger, deleteOutputPath, cacheOptions, outputPath, verbose, projectRoot, workspaceRoot, progress, preserveSymlinks, } = options;
     if (deleteOutputPath && writeToFileSystem) {
-        await (0, delete_output_dir_1.deleteOutputDir)(workspaceRoot, outputPath);
+        await (0, delete_output_dir_1.deleteOutputDir)(workspaceRoot, outputPath, ['browser', 'server']);
     }
     const withProgress = progress ? utils_1.withSpinner : utils_1.withNoProgress;
     // Initial build
@@ -62,21 +63,25 @@ async function* runEsBuildBuildAction(action, options) {
         if (progress) {
             logger.info('Watch mode enabled. Watching for file changes...');
         }
+        const ignored = [
+            // Ignore the output and cache paths to avoid infinite rebuild cycles
+            outputPath,
+            cacheOptions.basePath,
+            `${workspaceRoot.replace(/\\/g, '/')}/**/.*/**`,
+        ];
+        if (!preserveSymlinks) {
+            // Ignore all node modules directories to avoid excessive file watchers.
+            // Package changes are handled below by watching manifest and lock files.
+            // NOTE: this is not enable when preserveSymlinks is true as this would break `npm link` usages.
+            ignored.push('**/node_modules/**');
+        }
         // Setup a watcher
         const { createWatcher } = await Promise.resolve().then(() => __importStar(require('../../tools/esbuild/watcher')));
         watcher = createWatcher({
             polling: typeof poll === 'number',
             interval: poll,
             followSymlinks: preserveSymlinks,
-            ignored: [
-                // Ignore the output and cache paths to avoid infinite rebuild cycles
-                outputPath,
-                cacheOptions.basePath,
-                // Ignore all node modules directories to avoid excessive file watchers.
-                // Package changes are handled below by watching manifest and lock files.
-                '**/node_modules/**',
-                `${workspaceRoot.replace(/\\/g, '/')}/**/.*/**`,
-            ],
+            ignored,
         });
         // Setup abort support
         options.signal?.addEventListener('abort', () => void watcher?.close());
@@ -97,7 +102,9 @@ async function* runEsBuildBuildAction(action, options) {
             '.pnp.cjs',
             '.pnp.data.json',
         ];
-        watcher.add(packageWatchFiles.map((file) => node_path_1.default.join(workspaceRoot, file)));
+        watcher.add(packageWatchFiles
+            .map((file) => node_path_1.default.join(workspaceRoot, file))
+            .filter((file) => (0, node_fs_1.existsSync)(file)));
         // Watch locations provided by the initial build result
         watcher.add(result.watchFiles);
     }

package/src/builders/browser-esbuild/builder-status-warnings.js

@@ -30,9 +30,7 @@ function logBuilderStatusWarnings(options, { logger }) {
         if (typeof value === 'object' && Object.keys(value).length === 0) {
             continue;
         }
-        if (unsupportedOption === 'vendorChunk' ||
-            unsupportedOption === 'resourcesOutputPath' ||
-            unsupportedOption === 'deployUrl') {
+        if (unsupportedOption === 'vendorChunk' || unsupportedOption === 'resourcesOutputPath') {
             logger.warn(`The '${unsupportedOption}' option is not used by this builder and will be ignored.`);
             continue;
         }

package/src/builders/dev-server/builder.js

@@ -65,6 +65,11 @@ function execute(options, context, transforms = {}, extensions) {
             if (transforms?.logging || transforms?.webpackConfiguration) {
                 throw new Error('The `application` and `browser-esbuild` builders do not support Webpack transforms.');
             }
+            if (normalizedOptions.forceEsbuild &&
+                builderName === '@angular-devkit/build-angular:browser') {
+                // The compatibility builder should be used if esbuild is force enabled with the official Webpack-based builder.
+                builderName = '@angular-devkit/build-angular:browser-esbuild';
+            }
             return (0, rxjs_1.defer)(() => Promise.resolve().then(() => __importStar(require('./vite-server')))).pipe((0, rxjs_1.switchMap)(({ serveWithVite }) => serveWithVite(normalizedOptions, builderName, context, transforms, extensions)));
         }
         if (extensions?.buildPlugins?.length) {

package/src/builders/dev-server/vite-server.js

@@ -74,8 +74,11 @@ async function* serveWithVite(serverOptions, builderName, context, transformers,
     }
     // Set all packages as external to support Vite's prebundle caching
     browserOptions.externalPackages = serverOptions.cacheOptions.enabled;
-    if (serverOptions.servePath === undefined && browserOptions.baseHref !== undefined) {
-        serverOptions.servePath = browserOptions.baseHref;
+    const baseHref = browserOptions.baseHref;
+    if (serverOptions.servePath === undefined && baseHref !== undefined) {
+        // Remove trailing slash
+        serverOptions.servePath =
+            baseHref[baseHref.length - 1] === '/' ? baseHref.slice(0, -1) : baseHref;
     }
     // The development server currently only supports a single locale when localizing.
     // This matches the behavior of the Webpack-based development server but could be expanded in the future.
@@ -179,7 +182,7 @@ async function* serveWithVite(serverOptions, builderName, context, transformers,
         if (server) {
             // Update fs allow list to include any new assets from the build option.
             server.config.server.fs.allow = [
-                ...new Set(...server.config.server.fs.allow, ...assetFiles.values()),
+                ...new Set([...server.config.server.fs.allow, ...assetFiles.values()]),
             ];
             handleUpdate(normalizePath, generatedFiles, server, serverOptions, context.logger);
         }
@@ -350,7 +353,7 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
         css: {
             devSourcemap: true,
         },
-        // Vite will normalize the `base` option by adding a leading and trailing forward slash.
+        // Vite will normalize the `base` option by adding a leading slash.
         base: serverOptions.servePath,
         resolve: {
             mainFields: ['es2020', 'browser', 'module', 'main'],
@@ -476,6 +479,10 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
                         // Rewrite all build assets to a vite raw fs URL
                         const assetSourcePath = assets.get(pathname);
                         if (assetSourcePath !== undefined) {
+                            // Workaround to disable Vite transformer middleware.
+                            // See: https://github.com/vitejs/vite/blob/746a1daab0395f98f0afbdee8f364cb6cf2f3b3f/packages/vite/src/node/server/middlewares/transform.ts#L201 and
+                            // https://github.com/vitejs/vite/blob/746a1daab0395f98f0afbdee8f364cb6cf2f3b3f/packages/vite/src/node/server/transformRequest.ts#L204-L206
+                            req.headers.accept = 'text/html';
                             // The encoding needs to match what happens in the vite static middleware.
                             // ref: https://github.com/vitejs/vite/blob/d4f13bd81468961c8c926438e815ab6b1c82735e/packages/vite/src/node/server/middlewares/static.ts#L163
                             req.url = `${server.config.base}@fs/${encodeURI(assetSourcePath)}`;

package/src/builders/karma/index.js

@@ -90,9 +90,12 @@ function execute(options, context, transforms = {}) {
             : getBuiltInKarmaConfig(context.workspaceRoot, projectName);
         karmaOptions.singleRun = singleRun;
         // Convert browsers from a string to an array
-        if (options.browsers) {
+        if (typeof options.browsers === 'string' && options.browsers) {
             karmaOptions.browsers = options.browsers.split(',');
         }
+        else if (options.browsers === false) {
+            karmaOptions.browsers = [];
+        }
         if (options.reporters) {
             // Split along commas to make it more natural, and remove empty strings.
             const reporters = options.reporters

package/src/builders/karma/schema.d.ts

@@ -7,9 +7,9 @@ export interface Schema {
      */
     assets?: AssetPattern[];
     /**
-     * Override which browsers tests are run against.
+     * Override which browsers tests are run against. Set to `false` to not use any browser.
      */
-    browsers?: string;
+    browsers?: Browsers;
     /**
      * Output a code coverage report.
      */
@@ -117,6 +117,10 @@ export interface AssetPatternClass {
      */
     output: string;
 }
+/**
+ * Override which browsers tests are run against. Set to `false` to not use any browser.
+ */
+export type Browsers = boolean | string;
 export interface FileReplacement {
     replace?: string;
     replaceWith?: string;

package/src/builders/karma/schema.json

@@ -199,8 +199,18 @@
       "description": "Do not use the real path when resolving modules. If unset then will default to `true` if NodeJS option --preserve-symlinks is set."
     },
     "browsers": {
-      "type": "string",
-      "description": "Override which browsers tests are run against."
+      "description": "Override which browsers tests are run against. Set to `false` to not use any browser.",
+      "oneOf": [
+        {
+          "type": "string",
+          "description": "A comma seperate list of browsers to run tests against."
+        },
+        {
+          "const": false,
+          "type": "boolean",
+          "description": "Does use run tests against a browser."
+        }
+      ]
     },
     "codeCoverage": {
       "type": "boolean",

package/src/tools/esbuild/angular/angular-host.js

@@ -28,6 +28,12 @@ exports.ensureSourceFileVersions = ensureSourceFileVersions;
 function createAngularCompilerHost(compilerOptions, hostOptions) {
     // Create TypeScript compiler host
     const host = typescript_1.default.createIncrementalCompilerHost(compilerOptions);
+    // Set the parsing mode to the same as TS 5.3 default for tsc. This provides a parse
+    // performance improvement by skipping non-type related JSDoc parsing.
+    // NOTE: The check for this enum can be removed when TS 5.3 support is the minimum.
+    if (typescript_1.default.JSDocParsingMode) {
+        host.jsDocParsingMode = typescript_1.default.JSDocParsingMode.ParseForTypeErrors;
+    }
     // The AOT compiler currently requires this hook to allow for a transformResource hook.
     // Once the AOT compiler allows only a transformResource hook, this can be reevaluated.
     host.readResource = async function (filename) {

package/src/tools/esbuild/angular/compiler-plugin.js

@@ -308,7 +308,7 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
             }));
             // Setup bundling of component templates and stylesheets when in JIT mode
             if (pluginOptions.jit) {
-                (0, jit_plugin_callbacks_1.setupJitPluginCallbacks)(build, stylesheetBundler, additionalResults, styleOptions.inlineStyleLanguage);
+                (0, jit_plugin_callbacks_1.setupJitPluginCallbacks)(build, stylesheetBundler, additionalResults, styleOptions.inlineStyleLanguage, pluginOptions.loadResultCache);
             }
             build.onEnd((result) => {
                 // Ensure other compilations are unblocked if the main compilation throws during start

package/src/tools/esbuild/angular/component-stylesheets.js

@@ -79,7 +79,7 @@ class ComponentStylesheetBundler {
                                 namespace,
                             };
                         });
-                        build.onLoad({ filter: /^css;/, namespace }, async () => {
+                        build.onLoad({ filter: /^css;/, namespace }, () => {
                             return {
                                 contents: data,
                                 loader: 'css',

package/src/tools/esbuild/angular/jit-plugin-callbacks.d.ts

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import type { Metafile, OutputFile, PluginBuild } from 'esbuild';
+import { LoadResultCache } from '../load-result-cache';
 import { ComponentStylesheetBundler } from './component-stylesheets';
 /**
  * Sets up esbuild resolve and load callbacks to support Angular JIT mode processing
@@ -19,4 +20,4 @@ import { ComponentStylesheetBundler } from './component-stylesheets';
 export declare function setupJitPluginCallbacks(build: PluginBuild, stylesheetBundler: ComponentStylesheetBundler, additionalResultFiles: Map<string, {
     outputFiles?: OutputFile[];
     metafile?: Metafile;
-}>, inlineStyleLanguage: string): void;
+}>, inlineStyleLanguage: string, loadCache?: LoadResultCache): void;

package/src/tools/esbuild/angular/jit-plugin-callbacks.js

@@ -6,13 +6,11 @@
  * 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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupJitPluginCallbacks = void 0;
 const promises_1 = require("node:fs/promises");
-const node_path_1 = __importDefault(require("node:path"));
+const node_path_1 = require("node:path");
+const load_result_cache_1 = require("../load-result-cache");
 const uri_1 = require("./uri");
 /**
  * Loads/extracts the contents from a load callback Angular JIT entry.
@@ -27,7 +25,7 @@ const uri_1 = require("./uri");
  */
 async function loadEntry(entry, root, skipRead) {
     if (entry.startsWith('file:')) {
-        const specifier = node_path_1.default.join(root, entry.slice(5));
+        const specifier = (0, node_path_1.join)(root, entry.slice(5));
         return {
             path: specifier,
             contents: skipRead ? undefined : await (0, promises_1.readFile)(specifier, 'utf-8'),
@@ -36,7 +34,7 @@ async function loadEntry(entry, root, skipRead) {
     else if (entry.startsWith('inline:')) {
         const [importer, data] = entry.slice(7).split(';', 2);
         return {
-            path: node_path_1.default.join(root, importer),
+            path: (0, node_path_1.join)(root, importer),
             contents: Buffer.from(data, 'base64').toString(),
         };
     }
@@ -53,7 +51,7 @@ async function loadEntry(entry, root, skipRead) {
  * @param styleOptions The options to use when bundling stylesheets.
  * @param additionalResultFiles A Map where stylesheet resources will be added.
  */
-function setupJitPluginCallbacks(build, stylesheetBundler, additionalResultFiles, inlineStyleLanguage) {
+function setupJitPluginCallbacks(build, stylesheetBundler, additionalResultFiles, inlineStyleLanguage, loadCache) {
     const root = build.initialOptions.absWorkingDir ?? '';
     // Add a resolve callback to capture and parse any JIT URIs that were added by the
     // JIT resource TypeScript transformer.
@@ -68,13 +66,13 @@ function setupJitPluginCallbacks(build, stylesheetBundler, additionalResultFiles
             return {
                 // Use a relative path to prevent fully resolved paths in the metafile (JSON stats file).
                 // This is only necessary for custom namespaces. esbuild will handle the file namespace.
-                path: 'file:' + node_path_1.default.relative(root, node_path_1.default.join(node_path_1.default.dirname(args.importer), specifier)),
+                path: 'file:' + (0, node_path_1.relative)(root, (0, node_path_1.join)((0, node_path_1.dirname)(args.importer), specifier)),
                 namespace,
             };
         }
         else {
             // Inline data may need the importer to resolve imports/references within the content
-            const importer = node_path_1.default.relative(root, args.importer);
+            const importer = (0, node_path_1.relative)(root, args.importer);
             return {
                 path: `inline:${importer};${specifier}`,
                 namespace,
@@ -82,7 +80,7 @@ function setupJitPluginCallbacks(build, stylesheetBundler, additionalResultFiles
         }
     });
     // Add a load callback to handle Component stylesheets (both inline and external)
-    build.onLoad({ filter: /./, namespace: uri_1.JIT_STYLE_NAMESPACE }, async (args) => {
+    build.onLoad({ filter: /./, namespace: uri_1.JIT_STYLE_NAMESPACE }, (0, load_result_cache_1.createCachedLoad)(loadCache, async (args) => {
         // skipRead is used here because the stylesheet bundling will read a file stylesheet
         // directly either via a preprocessor or esbuild itself.
         const entry = await loadEntry(args.path, root, true /* skipRead */);
@@ -94,24 +92,26 @@ function setupJitPluginCallbacks(build, stylesheetBundler, additionalResultFiles
         else {
             stylesheetResult = await stylesheetBundler.bundleInline(entry.contents, entry.path, inlineStyleLanguage);
         }
-        const { contents, resourceFiles, errors, warnings, metafile } = stylesheetResult;
+        const { contents, resourceFiles, errors, warnings, metafile, referencedFiles } = stylesheetResult;
         additionalResultFiles.set(entry.path, { outputFiles: resourceFiles, metafile });
         return {
             errors,
             warnings,
             contents,
             loader: 'text',
+            watchFiles: referencedFiles && [...referencedFiles],
         };
-    });
+    }));
     // Add a load callback to handle Component templates
     // NOTE: While this callback supports both inline and external templates, the transformer
     // currently only supports generating URIs for external templates.
-    build.onLoad({ filter: /./, namespace: uri_1.JIT_TEMPLATE_NAMESPACE }, async (args) => {
-        const { contents } = await loadEntry(args.path, root);
+    build.onLoad({ filter: /./, namespace: uri_1.JIT_TEMPLATE_NAMESPACE }, (0, load_result_cache_1.createCachedLoad)(loadCache, async (args) => {
+        const { contents, path } = await loadEntry(args.path, root);
         return {
             contents,
             loader: 'text',
+            watchFiles: [path],
         };
-    });
+    }));
 }
 exports.setupJitPluginCallbacks = setupJitPluginCallbacks;

package/src/tools/esbuild/angular/source-file-cache.js

@@ -52,7 +52,6 @@ class SourceFileCache extends Map {
         }
         for (let file of files) {
             file = path.normalize(file);
-            this.typeScriptFileCache.delete(file);
             this.loadResultCache.invalidate(file);
             // Normalize separators to allow matching TypeScript Host paths
             if (USING_WINDOWS) {

package/src/tools/esbuild/compiler-plugin-options.js

@@ -9,7 +9,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompilerPluginOptions = void 0;
 function createCompilerPluginOptions(options, target, sourceFileCache) {
-    const { workspaceRoot, optimizationOptions, sourcemapOptions, tsconfig, outputNames, fileReplacements, externalDependencies, preserveSymlinks, stylePreprocessorOptions, advancedOptimizations, inlineStyleLanguage, jit, tailwindConfiguration, } = options;
+    const { workspaceRoot, optimizationOptions, sourcemapOptions, tsconfig, outputNames, fileReplacements, externalDependencies, preserveSymlinks, stylePreprocessorOptions, advancedOptimizations, inlineStyleLanguage, jit, cacheOptions, tailwindConfiguration, publicPath, } = options;
     return {
         // JS/TS options
         pluginOptions: {
@@ -26,6 +26,7 @@ function createCompilerPluginOptions(options, target, sourceFileCache) {
         // Component stylesheet options
         styleOptions: {
             workspaceRoot,
+            inlineFonts: !!optimizationOptions.fonts.inline,
             optimization: !!optimizationOptions.styles.minify,
             sourcemap: 
             // Hidden component stylesheet sourcemaps are inaccessible which is effectively
@@ -39,7 +40,8 @@ function createCompilerPluginOptions(options, target, sourceFileCache) {
             inlineStyleLanguage,
             preserveSymlinks,
             tailwindConfiguration,
-            publicPath: options.publicPath,
+            cacheOptions,
+            publicPath,
         },
     };
 }

package/src/tools/esbuild/global-styles.js

@@ -15,7 +15,7 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const bundle_options_1 = require("./stylesheets/bundle-options");
 const virtual_module_plugin_1 = require("./virtual-module-plugin");
 function createGlobalStylesBundleOptions(options, target, initial) {
-    const { workspaceRoot, optimizationOptions, sourcemapOptions, outputNames, globalStyles, preserveSymlinks, externalDependencies, stylePreprocessorOptions, tailwindConfiguration, } = options;
+    const { workspaceRoot, optimizationOptions, sourcemapOptions, outputNames, globalStyles, preserveSymlinks, externalDependencies, stylePreprocessorOptions, tailwindConfiguration, cacheOptions, publicPath, } = options;
     const namespace = 'angular:styles/global';
     const entryPoints = {};
     let found = false;
@@ -33,6 +33,7 @@ function createGlobalStylesBundleOptions(options, target, initial) {
         const buildOptions = (0, bundle_options_1.createStylesheetBundleOptions)({
             workspaceRoot,
             optimization: !!optimizationOptions.styles.minify,
+            inlineFonts: !!optimizationOptions.fonts.inline,
             sourcemap: !!sourcemapOptions.styles,
             preserveSymlinks,
             target,
@@ -45,7 +46,8 @@ function createGlobalStylesBundleOptions(options, target, initial) {
                 },
             includePaths: stylePreprocessorOptions?.includePaths,
             tailwindConfiguration,
-            publicPath: options.publicPath,
+            cacheOptions,
+            publicPath,
         }, loadCache);
         // Keep special CSS comments `/*! comment */` in place when `removeSpecialComments` is disabled.
         // These comments are special for a number of CSS tools such as Critters and PurgeCSS.

package/src/tools/esbuild/stylesheets/bundle-options.d.ts

@@ -6,10 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import type { BuildOptions } from 'esbuild';
+import { NormalizedCachedOptions } from '../../../utils/normalize-cache';
 import { LoadResultCache } from '../load-result-cache';
 export interface BundleStylesheetOptions {
     workspaceRoot: string;
     optimization: boolean;
+    inlineFonts: boolean;
     preserveSymlinks?: boolean;
     sourcemap: boolean | 'external' | 'inline';
     outputNames: {
@@ -24,6 +26,7 @@ export interface BundleStylesheetOptions {
         package: string;
     };
     publicPath?: string;
+    cacheOptions: NormalizedCachedOptions;
 }
 export declare function createStylesheetBundleOptions(options: BundleStylesheetOptions, cache?: LoadResultCache, inlineComponentData?: Record<string, string>): BuildOptions & {
     plugins: NonNullable<BuildOptions['plugins']>;

package/src/tools/esbuild/stylesheets/bundle-options.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStylesheetBundleOptions = void 0;
 const node_path_1 = __importDefault(require("node:path"));
+const css_inline_fonts_plugin_1 = require("./css-inline-fonts-plugin");
 const css_language_1 = require("./css-language");
 const css_resource_plugin_1 = require("./css-resource-plugin");
 const less_language_1 = require("./less-language");
@@ -26,6 +27,15 @@ function createStylesheetBundleOptions(options, cache, inlineComponentData) {
         inlineComponentData,
         tailwindConfiguration: options.tailwindConfiguration,
     }, cache);
+    const plugins = [
+        pluginFactory.create(sass_language_1.SassStylesheetLanguage),
+        pluginFactory.create(less_language_1.LessStylesheetLanguage),
+        pluginFactory.create(css_language_1.CssStylesheetLanguage),
+        (0, css_resource_plugin_1.createCssResourcePlugin)(cache),
+    ];
+    if (options.inlineFonts) {
+        plugins.push((0, css_inline_fonts_plugin_1.createCssInlineFontsPlugin)({ cache, cacheOptions: options.cacheOptions }));
+    }
     return {
         absWorkingDir: options.workspaceRoot,
         bundle: true,
@@ -44,12 +54,7 @@ function createStylesheetBundleOptions(options, cache, inlineComponentData) {
         publicPath: options.publicPath,
         conditions: ['style', 'sass', 'less'],
         mainFields: ['style', 'sass'],
-        plugins: [
-            pluginFactory.create(sass_language_1.SassStylesheetLanguage),
-            pluginFactory.create(less_language_1.LessStylesheetLanguage),
-            pluginFactory.create(css_language_1.CssStylesheetLanguage),
-            (0, css_resource_plugin_1.createCssResourcePlugin)(cache),
-        ],
+        plugins,
     };
 }
 exports.createStylesheetBundleOptions = createStylesheetBundleOptions;

package/src/tools/esbuild/stylesheets/css-inline-fonts-plugin.d.ts

@@ -0,0 +1,25 @@
+/**
+ * @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
+ */
+import type { Plugin } from 'esbuild';
+import { NormalizedCachedOptions } from '../../../utils/normalize-cache';
+import { LoadResultCache } from '../load-result-cache';
+/**
+ * Options for the createCssInlineFontsPlugin
+ * @see createCssInlineFontsPlugin
+ */
+export interface CssInlineFontsPluginOptions {
+    /** Disk cache normalized options */
+    cacheOptions?: NormalizedCachedOptions;
+    /** Load results cache. */
+    cache?: LoadResultCache;
+}
+/**
+ * Creates an esbuild {@link Plugin} that inlines fonts imported via import-rule.
+ * within the build configuration.
+ */
+export declare function createCssInlineFontsPlugin({ cache, cacheOptions, }: CssInlineFontsPluginOptions): Plugin;

package/src/tools/esbuild/stylesheets/css-inline-fonts-plugin.js

@@ -0,0 +1,57 @@
+"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.createCssInlineFontsPlugin = void 0;
+const inline_fonts_1 = require("../../../utils/index-file/inline-fonts");
+const load_result_cache_1 = require("../load-result-cache");
+/**
+ * Creates an esbuild {@link Plugin} that inlines fonts imported via import-rule.
+ * within the build configuration.
+ */
+function createCssInlineFontsPlugin({ cache, cacheOptions, }) {
+    return {
+        name: 'angular-css-inline-fonts-plugin',
+        setup(build) {
+            const inlineFontsProcessor = new inline_fonts_1.InlineFontsProcessor({ cache: cacheOptions, minify: false });
+            build.onResolve({ filter: /fonts\.googleapis\.com|use\.typekit\.net/ }, (args) => {
+                // Only attempt to resolve import-rule tokens which only exist inside CSS.
+                if (args.kind !== 'import-rule') {
+                    return null;
+                }
+                if (!inlineFontsProcessor.canInlineRequest(args.path)) {
+                    return null;
+                }
+                return {
+                    path: args.path,
+                    namespace: 'css-inline-fonts',
+                };
+            });
+            build.onLoad({ filter: /./, namespace: 'css-inline-fonts' }, (0, load_result_cache_1.createCachedLoad)(cache, async (args) => {
+                try {
+                    return {
+                        contents: await inlineFontsProcessor.processURL(args.path),
+                        loader: 'css',
+                    };
+                }
+                catch (error) {
+                    return {
+                        loader: 'css',
+                        errors: [
+                            {
+                                text: `Failed to inline external stylesheet '${args.path}'.`,
+                                detail: error,
+                            },
+                        ],
+                    };
+                }
+            }));
+        },
+    };
+}
+exports.createCssInlineFontsPlugin = createCssInlineFontsPlugin;

package/src/tools/esbuild/watcher.js

@@ -6,10 +6,12 @@
  * 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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createWatcher = exports.ChangedFiles = void 0;
-const chokidar_1 = require("chokidar");
-const node_path_1 = require("node:path");
+const watchpack_1 = __importDefault(require("watchpack"));
 class ChangedFiles {
     added = new Set();
     modified = new Set();
@@ -28,87 +30,40 @@ class ChangedFiles {
 }
 exports.ChangedFiles = ChangedFiles;
 function createWatcher(options) {
-    const watcher = new chokidar_1.FSWatcher({
-        usePolling: options?.polling,
-        interval: options?.interval,
+    const watcher = new watchpack_1.default({
+        poll: options?.polling ? options?.interval ?? true : false,
         ignored: options?.ignored,
         followSymlinks: options?.followSymlinks,
-        disableGlobbing: true,
-        ignoreInitial: true,
+        aggregateTimeout: 250,
     });
+    const watchedFiles = new Set();
     const nextQueue = [];
-    let currentChanges;
-    let nextWaitTimeout;
-    /**
-     * We group the current events in a map as on Windows with certain IDE a file contents change can trigger multiple events.
-     *
-     * Example:
-     * rename | 'C:/../src/app/app.component.css'
-     * rename | 'C:/../src/app/app.component.css'
-     * change | 'C:/../src/app/app.component.css'
-     *
-     */
-    let currentEvents;
-    /**
-     * Using `watcher.on('all')` does not capture some of events fired when using Visual studio and this does not happen all the time,
-     * but only after a file has been changed 3 or more times.
-     *
-     * Also, some IDEs such as Visual Studio (not VS Code) will fire a rename event instead of unlink when a file is renamed or changed.
-     *
-     * Example:
-     * ```
-     * watcher.on('raw')
-     * Change 1
-     * rename | 'C:/../src/app/app.component.css'
-     * rename | 'C:/../src/app/app.component.css'
-     * change | 'C:/../src/app/app.component.css'
-     *
-     * Change 2
-     * rename | 'C:/../src/app/app.component.css'
-     * rename | 'C:/../src/app/app.component.css'
-     * change | 'C:/../src/app/app.component.css'
-     *
-     * Change 3
-     * rename | 'C:/../src/app/app.component.css'
-     * rename | 'C:/../src/app/app.component.css'
-     * change | 'C:/../src/app/app.component.css'
-     *
-     * watcher.on('all')
-     * Change 1
-     * change | 'C:\\..\\src\\app\\app.component.css'
-     *
-     * Change 2
-     * unlink | 'C:\\..\\src\\app\\app.component.css'
-     *
-     * Change 3
-     * ... (Nothing)
-     * ```
-     */
-    watcher
-        .on('raw', (event, path, { watchedPath }) => {
-        if (watchedPath && !(0, node_path_1.extname)(watchedPath)) {
-            // Ignore directories, file changes in directories will be fired seperatly.
-            return;
+    let currentChangedFiles;
+    watcher.on('aggregated', (changes, removals) => {
+        const changedFiles = currentChangedFiles ?? new ChangedFiles();
+        for (const file of changes) {
+            changedFiles.modified.add(file);
         }
-        switch (event) {
-            case 'rename':
-            case 'change':
-                // When polling is enabled `watchedPath` can be undefined.
-                // `path` is always normalized unlike `watchedPath`.
-                const changedPath = watchedPath ? (0, node_path_1.normalize)(watchedPath) : path;
-                handleFileChange(event, changedPath);
-                break;
+        for (const file of removals) {
+            changedFiles.removed.add(file);
         }
-    })
-        .on('all', handleFileChange);
+        const next = nextQueue.shift();
+        if (next) {
+            currentChangedFiles = undefined;
+            next(changedFiles);
+        }
+        else {
+            currentChangedFiles = changedFiles;
+        }
+    });
     return {
         [Symbol.asyncIterator]() {
             return this;
         },
         async next() {
-            if (currentChanges && nextQueue.length === 0) {
-                const result = { value: currentChanges };
-                currentChanges = undefined;
+            if (currentChangedFiles && nextQueue.length === 0) {
+                const result = { value: currentChangedFiles };
+                currentChangedFiles = undefined;
                 return result;
             }
             return new Promise((resolve) => {
@@ -116,17 +71,40 @@ function createWatcher(options) {
             });
         },
         add(paths) {
-            watcher.add(paths);
+            const previousSize = watchedFiles.size;
+            if (typeof paths === 'string') {
+                watchedFiles.add(paths);
+            }
+            else {
+                for (const file of paths) {
+                    watchedFiles.add(file);
+                }
+            }
+            if (previousSize !== watchedFiles.size) {
+                watcher.watch({
+                    files: watchedFiles,
+                });
+            }
         },
         remove(paths) {
-            watcher.unwatch(paths);
+            const previousSize = watchedFiles.size;
+            if (typeof paths === 'string') {
+                watchedFiles.delete(paths);
+            }
+            else {
+                for (const file of paths) {
+                    watchedFiles.delete(file);
+                }
+            }
+            if (previousSize !== watchedFiles.size) {
+                watcher.watch({
+                    files: watchedFiles,
+                });
+            }
         },
         async close() {
             try {
-                await watcher.close();
-                if (nextWaitTimeout) {
-                    clearTimeout(nextWaitTimeout);
-                }
+                watcher.close();
             }
             finally {
                 let next;
@@ -136,48 +114,5 @@ function createWatcher(options) {
             }
         },
     };
-    function handleFileChange(event, path) {
-        switch (event) {
-            case 'add':
-            case 'change':
-            // When using Visual Studio the rename event is fired before a change event when the contents of the file changed
-            // or instead of `unlink` when the file has been renamed.
-            case 'unlink':
-            case 'rename':
-                currentEvents ??= new Map();
-                currentEvents.set(path, event);
-                break;
-            default:
-                return;
-        }
-        // Wait 250ms from next change to better capture groups of file save operations.
-        if (!nextWaitTimeout) {
-            nextWaitTimeout = setTimeout(() => {
-                nextWaitTimeout = undefined;
-                const next = nextQueue.shift();
-                if (next && currentEvents) {
-                    const events = currentEvents;
-                    currentEvents = undefined;
-                    const currentChanges = new ChangedFiles();
-                    for (const [path, event] of events) {
-                        switch (event) {
-                            case 'add':
-                                currentChanges.added.add(path);
-                                break;
-                            case 'change':
-                                currentChanges.modified.add(path);
-                                break;
-                            case 'unlink':
-                            case 'rename':
-                                currentChanges.removed.add(path);
-                                break;
-                        }
-                    }
-                    next(currentChanges);
-                }
-            }, 250);
-            nextWaitTimeout?.unref();
-        }
-    }
 }
 exports.createWatcher = createWatcher;

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/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;