@angular-devkit/build-angular 17.3.2 → 18.0.0-next.1

package/src/tools/esbuild/utils.d.ts

@@ -5,7 +5,7 @@
  * 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 { logging } from '@angular-devkit/core';
+import { BuilderContext } from '@angular-devkit/architect';
 import { BuildOptions, Metafile, OutputFile } from 'esbuild';
 import { NormalizedApplicationBuildOptions, NormalizedOutputOptions } from '../../builders/application/options';
 import { BudgetCalculatorResult } from '../../utils/bundle-calculator';
@@ -38,4 +38,4 @@ export declare function transformSupportedBrowsersToTargets(supportedBrowsers: s
  */
 export declare function getSupportedNodeTargets(): string[];
 export declare function createJsonBuildManifest(result: ExecutionResult, normalizedOptions: NormalizedApplicationBuildOptions): Promise<string>;
-export declare function logMessages(logger: logging.LoggerApi, executionResult: ExecutionResult, color?: boolean, jsonLogs?: boolean): Promise<void>;
+export declare function logMessages(logger: BuilderContext['logger'], executionResult: ExecutionResult, color?: boolean, jsonLogs?: boolean): Promise<void>;

package/src/tools/esbuild/utils.js

@@ -331,7 +331,7 @@ function transformSupportedBrowsersToTargets(supportedBrowsers) {
     return transformed;
 }
 exports.transformSupportedBrowsersToTargets = transformSupportedBrowsersToTargets;
-const SUPPORTED_NODE_VERSIONS = '^18.13.0 || >=20.9.0';
+const SUPPORTED_NODE_VERSIONS = '^18.19.1 || >=20.11.1';
 /**
  * Transform supported Node.js versions to esbuild target.
  * @see https://esbuild.github.io/api/#target

package/src/tools/vite/angular-memory-plugin.js

@@ -232,13 +232,11 @@ exports.createAngularMemoryPlugin = createAngularMemoryPlugin;
  */
 async function loadViteClientCode(file) {
     const originalContents = await (0, promises_1.readFile)(file, 'utf-8');
-    const firstUpdate = originalContents.replace('You can also disable this overlay by setting', '');
-    (0, node_assert_1.default)(originalContents !== firstUpdate, 'Failed to update Vite client error overlay text. (1)');
-    const secondUpdate = firstUpdate.replace(
-    // eslint-disable-next-line max-len
-    '<code part="config-option-name">server.hmr.overlay</code> to <code part="config-option-value">false</code> in <code part="config-file-name">${hmrConfigName}.</code>', '');
-    (0, node_assert_1.default)(firstUpdate !== secondUpdate, 'Failed to update Vite client error overlay text. (2)');
-    return secondUpdate;
+    const updatedContents = originalContents.replace(`h('br'), 'You can also disable this overlay by setting ', ` +
+        `h('code', { part: 'config-option-name' }, 'server.hmr.overlay'), '` +
+        ` to ', h('code', { part: 'config-option-value' }, 'false'), ' in ', h('code', { part: 'config-file-name' }, hmrConfigName), '.'`, '');
+    (0, node_assert_1.default)(originalContents !== updatedContents, 'Failed to update Vite client error overlay text.');
+    return updatedContents;
 }
 function pathnameWithoutBasePath(url, basePath) {
     const parsedUrl = new URL(url, 'http://localhost');

package/src/tools/webpack/configs/dev-server.js

@@ -162,12 +162,13 @@ async function addProxyConfig(root, proxyConfig) {
     if (!(0, fs_1.existsSync)(proxyPath)) {
         throw new Error(`Proxy configuration file ${proxyPath} does not exist.`);
     }
+    let proxyConfiguration;
     switch ((0, path_1.extname)(proxyPath)) {
         case '.json': {
             const content = await fs_1.promises.readFile(proxyPath, 'utf-8');
             const { parse, printParseErrorCode } = await Promise.resolve().then(() => __importStar(require('jsonc-parser')));
             const parseErrors = [];
-            const proxyConfiguration = parse(content, parseErrors, { allowTrailingComma: true });
+            proxyConfiguration = parse(content, parseErrors, { allowTrailingComma: true });
             if (parseErrors.length > 0) {
                 let errorMessage = `Proxy configuration file ${proxyPath} contains parse errors:`;
                 for (const parseError of parseErrors) {
@@ -176,32 +177,35 @@ async function addProxyConfig(root, proxyConfig) {
                 }
                 throw new Error(errorMessage);
             }
-            return proxyConfiguration;
+            break;
         }
         case '.mjs':
             // Load the ESM configuration file using the TypeScript dynamic import workaround.
             // Once TypeScript provides support for keeping the dynamic import this workaround can be
             // changed to a direct dynamic import.
-            return (await (0, load_esm_1.loadEsmModule)((0, url_1.pathToFileURL)(proxyPath))).default;
+            proxyConfiguration = (await (0, load_esm_1.loadEsmModule)((0, url_1.pathToFileURL)(proxyPath))).default;
+            break;
         case '.cjs':
-            return require(proxyPath);
+            proxyConfiguration = require(proxyPath);
+            break;
         default:
             // The file could be either CommonJS or ESM.
             // CommonJS is tried first then ESM if loading fails.
             try {
-                return require(proxyPath);
+                proxyConfiguration = require(proxyPath);
             }
             catch (e) {
                 (0, error_1.assertIsError)(e);
-                if (e.code === 'ERR_REQUIRE_ESM') {
-                    // Load the ESM configuration file using the TypeScript dynamic import workaround.
-                    // Once TypeScript provides support for keeping the dynamic import this workaround can be
-                    // changed to a direct dynamic import.
-                    return (await (0, load_esm_1.loadEsmModule)((0, url_1.pathToFileURL)(proxyPath))).default;
+                if (e.code !== 'ERR_REQUIRE_ESM') {
+                    throw e;
                 }
-                throw e;
+                // Load the ESM configuration file using the TypeScript dynamic import workaround.
+                // Once TypeScript provides support for keeping the dynamic import this workaround can be
+                // changed to a direct dynamic import.
+                proxyConfiguration = (await (0, load_esm_1.loadEsmModule)((0, url_1.pathToFileURL)(proxyPath))).default;
             }
     }
+    return normalizeProxyConfiguration(proxyConfiguration);
 }
 /**
  * Calculates the line and column for an error offset in the content of a JSON file.
@@ -301,3 +305,8 @@ function getPublicHostOptions(options, webSocketPath) {
     }
     return `auto://${publicHost || '0.0.0.0:0'}${webSocketPath}`;
 }
+function normalizeProxyConfiguration(proxy) {
+    return Array.isArray(proxy)
+        ? proxy
+        : Object.entries(proxy).map(([context, value]) => ({ context: [context], ...value }));
+}

package/src/tools/webpack/configs/styles.js

@@ -37,10 +37,8 @@ exports.getStylesConfig = void 0;
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 const path = __importStar(require("node:path"));
 const node_url_1 = require("node:url");
-const environment_options_1 = require("../../../utils/environment-options");
 const tailwind_1 = require("../../../utils/tailwind");
 const sass_service_1 = require("../../sass/sass-service");
-const sass_service_legacy_1 = require("../../sass/sass-service-legacy");
 const plugins_1 = require("../plugins");
 const css_optimizer_plugin_1 = require("../plugins/css-optimizer-plugin");
 const styles_webpack_plugin_1 = require("../plugins/styles-webpack-plugin");
@@ -68,9 +66,7 @@ async function getStylesConfig(wco) {
             extraPlugins.push(new plugins_1.RemoveHashPlugin({ chunkNames: noInjectNames, hashFormat }));
         }
     }
-    const sassImplementation = environment_options_1.useLegacySass
-        ? new sass_service_legacy_1.SassLegacyWorkerImplementation()
-        : new sass_service_1.SassWorkerImplementation();
+    const sassImplementation = new sass_service_1.SassWorkerImplementation();
     extraPlugins.push({
         apply(compiler) {
             compiler.hooks.shutdown.tap('sass-worker', () => {
@@ -284,54 +280,27 @@ async function getStylesConfig(wco) {
 }
 exports.getStylesConfig = getStylesConfig;
 function getSassLoaderOptions(root, implementation, includePaths, indentedSyntax, verbose, preserveSymlinks) {
-    return implementation instanceof sass_service_1.SassWorkerImplementation
-        ? {
-            sourceMap: true,
-            api: 'modern',
-            implementation,
-            // Webpack importer is only implemented in the legacy API and we have our own custom Webpack importer.
-            // See: https://github.com/webpack-contrib/sass-loader/blob/997f3eb41d86dd00d5fa49c395a1aeb41573108c/src/utils.js#L642-L651
-            webpackImporter: false,
-            sassOptions: (loaderContext) => ({
-                importers: [getSassResolutionImporter(loaderContext, root, preserveSymlinks)],
-                loadPaths: includePaths,
-                // Use expanded as otherwise sass will remove comments that are needed for autoprefixer
-                // Ex: /* autoprefixer grid: autoplace */
-                // See: https://github.com/webpack-contrib/sass-loader/blob/45ad0be17264ceada5f0b4fb87e9357abe85c4ff/src/getSassOptions.js#L68-L70
-                style: 'expanded',
-                // Silences compiler warnings from 3rd party stylesheets
-                quietDeps: !verbose,
-                verbose,
-                syntax: indentedSyntax ? 'indented' : 'scss',
-                sourceMapIncludeSources: true,
-            }),
-        }
-        : {
-            sourceMap: true,
-            api: 'legacy',
-            implementation,
-            sassOptions: {
-                importer: (url, from) => {
-                    if (url.charAt(0) === '~') {
-                        throw new Error(`'${from}' imports '${url}' with a tilde. Usage of '~' in imports is no longer supported.`);
-                    }
-                    return null;
-                },
-                // Prevent use of `fibers` package as it no longer works in newer Node.js versions
-                fiber: false,
-                indentedSyntax,
-                // bootstrap-sass requires a minimum precision of 8
-                precision: 8,
-                includePaths,
-                // Use expanded as otherwise sass will remove comments that are needed for autoprefixer
-                // Ex: /* autoprefixer grid: autoplace */
-                // See: https://github.com/webpack-contrib/sass-loader/blob/45ad0be17264ceada5f0b4fb87e9357abe85c4ff/src/getSassOptions.js#L68-L70
-                outputStyle: 'expanded',
-                // Silences compiler warnings from 3rd party stylesheets
-                quietDeps: !verbose,
-                verbose,
-            },
-        };
+    return {
+        sourceMap: true,
+        api: 'modern',
+        implementation,
+        // Webpack importer is only implemented in the legacy API and we have our own custom Webpack importer.
+        // See: https://github.com/webpack-contrib/sass-loader/blob/997f3eb41d86dd00d5fa49c395a1aeb41573108c/src/utils.js#L642-L651
+        webpackImporter: false,
+        sassOptions: (loaderContext) => ({
+            importers: [getSassResolutionImporter(loaderContext, root, preserveSymlinks)],
+            loadPaths: includePaths,
+            // Use expanded as otherwise sass will remove comments that are needed for autoprefixer
+            // Ex: /* autoprefixer grid: autoplace */
+            // See: https://github.com/webpack-contrib/sass-loader/blob/45ad0be17264ceada5f0b4fb87e9357abe85c4ff/src/getSassOptions.js#L68-L70
+            style: 'expanded',
+            // Silences compiler warnings from 3rd party stylesheets
+            quietDeps: !verbose,
+            verbose,
+            syntax: indentedSyntax ? 'indented' : 'scss',
+            sourceMapIncludeSources: true,
+        }),
+    };
 }
 function getSassResolutionImporter(loaderContext, root, preserveSymlinks) {
     const commonResolverOptions = {

package/src/tools/webpack/plugins/builder-watch-plugin.js

@@ -51,7 +51,7 @@ class BuilderWatchFileSystem {
                 const directoryChanges = new Set();
                 const missingChanges = new Set();
                 for (const event of events) {
-                    this.inputFileSystem.purge?.(event.path);
+                    this.inputFileSystem?.purge?.(event.path);
                     if (event.type === 'deleted') {
                         timeInfo.delete(event.path);
                         removals.add(event.path);
@@ -70,7 +70,7 @@ class BuilderWatchFileSystem {
                     }
                 }
                 const timeInfoMap = new Map(timeInfo);
-                callback(undefined, timeInfoMap, timeInfoMap, new Set([...fileChanges, ...directoryChanges, ...missingChanges]), removals);
+                callback(null, timeInfoMap, timeInfoMap, new Set([...fileChanges, ...directoryChanges, ...missingChanges]), removals);
             });
         });
         return {

package/src/tools/webpack/plugins/styles-webpack-plugin.js

@@ -34,7 +34,7 @@ class StylesWebpackPlugin {
             preferRelative: true,
             useSyncFileSystemCalls: true,
             symlinks: !preserveSymlinks,
-            fileSystem: compiler.inputFileSystem,
+            fileSystem: compiler.inputFileSystem ?? undefined,
         });
         const webpackOptions = compiler.options;
         compiler.hooks.environment.tap(PLUGIN_NAME, () => {

package/src/tools/webpack/utils/helpers.js

@@ -206,7 +206,7 @@ function assetPatterns(root, assets) {
     return assets.map((asset, index) => {
         // Resolve input paths relative to workspace root and add slash at the end.
         // eslint-disable-next-line prefer-const
-        let { input, output, ignore = [], glob } = asset;
+        let { input, output = '', ignore = [], glob } = asset;
         input = path.resolve(root, input).replace(/\\/g, '/');
         input = input.endsWith('/') ? input : input + '/';
         output = output.endsWith('/') ? output : output + '/';

package/src/utils/environment-options.d.ts

@@ -10,7 +10,6 @@ export declare const shouldBeautify: boolean;
 export declare const allowMinify: boolean;
 export declare const maxWorkers: number;
 export declare const useParallelTs: boolean;
-export declare const useLegacySass: boolean;
 export declare const debugPerformance: boolean;
 export declare const shouldWatchRoot: boolean;
 export declare const useTypeChecking: boolean;

package/src/utils/environment-options.js

@@ -7,8 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useJSONBuildLogs = exports.useTypeChecking = exports.shouldWatchRoot = exports.debugPerformance = exports.useLegacySass = exports.useParallelTs = exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
-const color_1 = require("./color");
+exports.useJSONBuildLogs = exports.useTypeChecking = exports.shouldWatchRoot = exports.debugPerformance = exports.useParallelTs = exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
 function isDisabled(variable) {
     return variable === '0' || variable.toLowerCase() === 'false';
 }
@@ -70,15 +69,6 @@ const maxWorkersVariable = process.env['NG_BUILD_MAX_WORKERS'];
 exports.maxWorkers = isPresent(maxWorkersVariable) ? +maxWorkersVariable : 4;
 const parallelTsVariable = process.env['NG_BUILD_PARALLEL_TS'];
 exports.useParallelTs = !isPresent(parallelTsVariable) || !isDisabled(parallelTsVariable);
-const legacySassVariable = process.env['NG_BUILD_LEGACY_SASS'];
-exports.useLegacySass = (() => {
-    if (!isPresent(legacySassVariable)) {
-        return false;
-    }
-    // eslint-disable-next-line no-console
-    console.warn(color_1.colors.yellow(`Warning: 'NG_BUILD_LEGACY_SASS' environment variable support will be removed in version 16.`));
-    return isEnabled(legacySassVariable);
-})();
 const debugPerfVariable = process.env['NG_BUILD_DEBUG_PERF'];
 exports.debugPerformance = isPresent(debugPerfVariable) && isEnabled(debugPerfVariable);
 const watchRootVariable = process.env['NG_BUILD_WATCH_ROOT'];

package/src/utils/i18n-options.d.ts

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { BuilderContext } from '@angular-devkit/architect';
-import { json } from '@angular-devkit/core';
 import { Schema as BrowserBuilderSchema, I18NTranslation } from '../builders/browser/schema';
 import { Schema as ServerBuilderSchema } from '../builders/server/schema';
 import { TranslationLoader } from './load-translations';
@@ -28,7 +27,9 @@ export interface I18nOptions {
     readonly shouldInline: boolean;
     hasDefinedSourceLocale?: boolean;
 }
-export declare function createI18nOptions(metadata: json.JsonObject, inline?: boolean | string[]): I18nOptions;
+export declare function createI18nOptions(projectMetadata: {
+    i18n?: unknown;
+}, inline?: boolean | string[]): I18nOptions;
 export declare function configureI18nBuild<T extends BrowserBuilderSchema | ServerBuilderSchema>(context: BuilderContext, options: T): Promise<{
     buildOptions: T;
     i18n: I18nOptions;

package/src/utils/i18n-options.js

@@ -11,11 +11,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadTranslations = exports.configureI18nBuild = exports.createI18nOptions = void 0;
-const core_1 = require("@angular-devkit/core");
-const fs_1 = __importDefault(require("fs"));
-const module_1 = __importDefault(require("module"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_module_1 = require("node:module");
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
 const schema_1 = require("../builders/browser/schema");
 const read_tsconfig_1 = require("../utils/read-tsconfig");
 const load_translations_1 = require("./load-translations");
@@ -39,11 +38,19 @@ function normalizeTranslationFileOption(option, locale, expectObjectInError) {
     }
     throw new Error(errorMessage);
 }
-function createI18nOptions(metadata, inline) {
-    if (metadata.i18n !== undefined && !core_1.json.isJsonObject(metadata.i18n)) {
-        throw new Error('Project i18n field is malformed. Expected an object.');
+function ensureObject(value, name) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        throw new Error(`Project ${name} field is malformed. Expected an object.`);
     }
-    metadata = metadata.i18n || {};
+}
+function ensureString(value, name) {
+    if (typeof value !== 'string') {
+        throw new Error(`Project ${name} field is malformed. Expected a string.`);
+    }
+}
+function createI18nOptions(projectMetadata, inline) {
+    const { i18n: metadata = {} } = projectMetadata;
+    ensureObject(metadata, 'i18n');
     const i18n = {
         inlineLocales: new Set(),
         // en-US is the default locale added to Angular applications (https://angular.io/guide/i18n#i18n-pipes)
@@ -55,21 +62,21 @@ function createI18nOptions(metadata, inline) {
     };
     let rawSourceLocale;
     let rawSourceLocaleBaseHref;
-    if (core_1.json.isJsonObject(metadata.sourceLocale)) {
-        rawSourceLocale = metadata.sourceLocale.code;
-        if (metadata.sourceLocale.baseHref !== undefined &&
-            typeof metadata.sourceLocale.baseHref !== 'string') {
-            throw new Error('Project i18n sourceLocale baseHref field is malformed. Expected a string.');
-        }
-        rawSourceLocaleBaseHref = metadata.sourceLocale.baseHref;
-    }
-    else {
+    if (typeof metadata.sourceLocale === 'string') {
         rawSourceLocale = metadata.sourceLocale;
     }
-    if (rawSourceLocale !== undefined) {
-        if (typeof rawSourceLocale !== 'string') {
-            throw new Error('Project i18n sourceLocale field is malformed. Expected a string.');
+    else if (metadata.sourceLocale !== undefined) {
+        ensureObject(metadata.sourceLocale, 'i18n sourceLocale');
+        if (metadata.sourceLocale.code !== undefined) {
+            ensureString(metadata.sourceLocale.code, 'i18n sourceLocale code');
+            rawSourceLocale = metadata.sourceLocale.code;
+        }
+        if (metadata.sourceLocale.baseHref !== undefined) {
+            ensureString(metadata.sourceLocale.baseHref, 'i18n sourceLocale baseHref');
+            rawSourceLocaleBaseHref = metadata.sourceLocale.baseHref;
         }
+    }
+    if (rawSourceLocale !== undefined) {
         i18n.sourceLocale = rawSourceLocale;
         i18n.hasDefinedSourceLocale = true;
     }
@@ -77,16 +84,15 @@ function createI18nOptions(metadata, inline) {
         files: [],
         baseHref: rawSourceLocaleBaseHref,
     };
-    if (metadata.locales !== undefined && !core_1.json.isJsonObject(metadata.locales)) {
-        throw new Error('Project i18n locales field is malformed. Expected an object.');
-    }
-    else if (metadata.locales) {
+    if (metadata.locales !== undefined) {
+        ensureObject(metadata.locales, 'i18n locales');
         for (const [locale, options] of Object.entries(metadata.locales)) {
             let translationFiles;
             let baseHref;
-            if (core_1.json.isJsonObject(options)) {
+            if (options && typeof options === 'object' && 'translation' in options) {
                 translationFiles = normalizeTranslationFileOption(options.translation, locale, false);
-                if (typeof options.baseHref === 'string') {
+                if ('baseHref' in options) {
+                    ensureString(options.baseHref, `i18n locales ${locale} baseHref`);
                     baseHref = options.baseHref;
                 }
             }
@@ -129,10 +135,10 @@ async function configureI18nBuild(context, options) {
     if (!i18n.shouldInline && !i18n.hasDefinedSourceLocale) {
         return { buildOptions, i18n };
     }
-    const projectRoot = path_1.default.join(context.workspaceRoot, metadata.root || '');
+    const projectRoot = node_path_1.default.join(context.workspaceRoot, metadata.root || '');
     // The trailing slash is required to signal that the path is a directory and not a file.
-    const projectRequire = module_1.default.createRequire(projectRoot + '/');
-    const localeResolver = (locale) => projectRequire.resolve(path_1.default.join(LOCALE_DATA_BASE_MODULE, locale));
+    const projectRequire = (0, node_module_1.createRequire)(projectRoot + '/');
+    const localeResolver = (locale) => projectRequire.resolve(node_path_1.default.join(LOCALE_DATA_BASE_MODULE, locale));
     // Load locale data and translations (if present)
     let loader;
     const usedFormats = new Set();
@@ -177,11 +183,11 @@ async function configureI18nBuild(context, options) {
     if (i18n.shouldInline) {
         // TODO: we should likely save these in the .angular directory in the next major version.
         // We'd need to do a migration to add the temp directory to gitignore.
-        const tempPath = fs_1.default.mkdtempSync(path_1.default.join(fs_1.default.realpathSync(os_1.default.tmpdir()), 'angular-cli-i18n-'));
+        const tempPath = node_fs_1.default.mkdtempSync(node_path_1.default.join(node_fs_1.default.realpathSync(node_os_1.default.tmpdir()), 'angular-cli-i18n-'));
         buildOptions.outputPath = tempPath;
         process.on('exit', () => {
             try {
-                fs_1.default.rmSync(tempPath, { force: true, recursive: true, maxRetries: 3 });
+                node_fs_1.default.rmSync(tempPath, { force: true, recursive: true, maxRetries: 3 });
             }
             catch { }
         });
@@ -203,7 +209,7 @@ function findLocaleDataPath(locale, resolver) {
 function loadTranslations(locale, desc, workspaceRoot, loader, logger, usedFormats, duplicateTranslation) {
     let translations = undefined;
     for (const file of desc.files) {
-        const loadResult = loader(path_1.default.join(workspaceRoot, file.path));
+        const loadResult = loader(node_path_1.default.join(workspaceRoot, file.path));
         for (const diagnostics of loadResult.diagnostics.messages) {
             if (diagnostics.type === 'error') {
                 logger.error(`Error parsing translation file '${file.path}': ${diagnostics.message}`);

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

@@ -5,10 +5,6 @@
  * 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;

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

@@ -36,8 +36,6 @@ const node_crypto_1 = require("node:crypto");
 const promises_1 = require("node:fs/promises");
 const https = __importStar(require("node:https"));
 const node_path_1 = require("node:path");
-const node_url_1 = require("node:url");
-const package_version_1 = require("../package-version");
 const html_rewriting_stream_1 = require("./html-rewriting-stream");
 const SUPPORTED_PROVIDERS = {
     'fonts.googleapis.com': {
@@ -161,7 +159,7 @@ class InlineFontsProcessor {
     async getResponse(url) {
         let cacheFile;
         if (this.cachePath) {
-            const key = (0, node_crypto_1.createHash)(CONTENT_HASH_ALGORITHM).update(`${package_version_1.VERSION}|${url}`).digest('hex');
+            const key = (0, node_crypto_1.createHash)(CONTENT_HASH_ALGORITHM).update(`${url}`).digest('hex');
             cacheFile = (0, node_path_1.join)(this.cachePath, key);
         }
         if (cacheFile) {
@@ -226,7 +224,7 @@ class InlineFontsProcessor {
         return data;
     }
     async processURL(url) {
-        const normalizedURL = url instanceof node_url_1.URL ? url : this.createNormalizedUrl(url);
+        const normalizedURL = url instanceof URL ? url : this.createNormalizedUrl(url);
         if (!normalizedURL) {
             return;
         }
@@ -255,7 +253,7 @@ class InlineFontsProcessor {
     }
     createNormalizedUrl(value) {
         // Need to convert '//' to 'https://' because the URL parser will fail with '//'.
-        const url = new node_url_1.URL(value.startsWith('//') ? `https:${value}` : value, 'resolve://');
+        const url = new URL(value.startsWith('//') ? `https:${value}` : value, 'resolve://');
         switch (url.protocol) {
             case 'http:':
             case 'https:':

package/src/utils/normalize-asset-patterns.d.ts

@@ -5,9 +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
  */
-import { BaseException } from '@angular-devkit/core';
 import { AssetPattern, AssetPatternClass } from '../builders/browser/schema';
-export declare class MissingAssetSourceRootException extends BaseException {
+export declare class MissingAssetSourceRootException extends Error {
     constructor(path: string);
 }
-export declare function normalizeAssetPatterns(assetPatterns: AssetPattern[], workspaceRoot: string, projectRoot: string, projectSourceRoot: string | undefined): AssetPatternClass[];
+export declare function normalizeAssetPatterns(assetPatterns: AssetPattern[], workspaceRoot: string, projectRoot: string, projectSourceRoot: string | undefined): (AssetPatternClass & {
+    output: string;
+})[];

package/src/utils/normalize-asset-patterns.js

@@ -29,12 +29,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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.normalizeAssetPatterns = exports.MissingAssetSourceRootException = void 0;
-const core_1 = require("@angular-devkit/core");
 const fs_1 = require("fs");
+const node_assert_1 = __importDefault(require("node:assert"));
 const path = __importStar(require("path"));
-class MissingAssetSourceRootException extends core_1.BaseException {
+class MissingAssetSourceRootException extends Error {
     constructor(path) {
         super(`The ${path} asset path must start with the project source root.`);
     }
@@ -81,8 +84,9 @@ function normalizeAssetPatterns(assetPatterns, workspaceRoot, projectRoot, proje
             assetPattern = { glob, input, output };
         }
         else {
-            assetPattern.output = path.join('.', assetPattern.output);
+            assetPattern.output = path.join('.', assetPattern.output ?? '');
         }
+        (0, node_assert_1.default)(assetPattern.output !== undefined);
         if (assetPattern.output.startsWith('..')) {
             throw new Error('An asset cannot be written to a location outside of the output path.');
         }

package/src/utils/normalize-cache.d.ts

@@ -5,7 +5,6 @@
  * 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 { json } from '@angular-devkit/core';
 export interface NormalizedCachedOptions {
     /** Whether disk cache is enabled. */
     enabled: boolean;
@@ -14,4 +13,4 @@ export interface NormalizedCachedOptions {
     /** Disk cache base path. Example: `/.angular/cache`. */
     basePath: string;
 }
-export declare function normalizeCacheOptions(metadata: json.JsonObject, worspaceRoot: string): NormalizedCachedOptions;
+export declare function normalizeCacheOptions(projectMetadata: unknown, worspaceRoot: string): NormalizedCachedOptions;

package/src/utils/normalize-cache.js

@@ -8,13 +8,19 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = void 0;
-const core_1 = require("@angular-devkit/core");
-const path_1 = require("path");
-const package_version_1 = require("./package-version");
-function normalizeCacheOptions(metadata, worspaceRoot) {
-    const cacheMetadata = core_1.json.isJsonObject(metadata.cli) && core_1.json.isJsonObject(metadata.cli.cache)
-        ? metadata.cli.cache
-        : {};
+const node_path_1 = require("node:path");
+/** Version placeholder is replaced during the build process with actual package version */
+const VERSION = '18.0.0-next.1';
+function hasCacheMetadata(value) {
+    return (!!value &&
+        typeof value === 'object' &&
+        'cli' in value &&
+        !!value['cli'] &&
+        typeof value['cli'] === 'object' &&
+        'cache' in value['cli']);
+}
+function normalizeCacheOptions(projectMetadata, worspaceRoot) {
+    const cacheMetadata = hasCacheMetadata(projectMetadata) ? projectMetadata.cli.cache : {};
     const { enabled = true, environment = 'local', path = '.angular/cache' } = cacheMetadata;
     const isCI = process.env['CI'] === '1' || process.env['CI']?.toLowerCase() === 'true';
     let cacheEnabled = enabled;
@@ -28,11 +34,11 @@ function normalizeCacheOptions(metadata, worspaceRoot) {
                 break;
         }
     }
-    const cacheBasePath = (0, path_1.resolve)(worspaceRoot, path);
+    const cacheBasePath = (0, node_path_1.resolve)(worspaceRoot, path);
     return {
         enabled: cacheEnabled,
         basePath: cacheBasePath,
-        path: (0, path_1.join)(cacheBasePath, package_version_1.VERSION),
+        path: (0, node_path_1.join)(cacheBasePath, VERSION),
     };
 }
 exports.normalizeCacheOptions = normalizeCacheOptions;

package/src/utils/normalize-file-replacements.d.ts

@@ -5,9 +5,8 @@
  * 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 { BaseException } from '@angular-devkit/core';
 import { FileReplacement } from '../builders/browser/schema';
-export declare class MissingFileReplacementException extends BaseException {
+export declare class MissingFileReplacementException extends Error {
     constructor(path: string);
 }
 export interface NormalizedFileReplacement {

package/src/utils/normalize-file-replacements.js

@@ -31,10 +31,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeFileReplacements = exports.MissingFileReplacementException = void 0;
-const core_1 = require("@angular-devkit/core");
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
-class MissingFileReplacementException extends core_1.BaseException {
+class MissingFileReplacementException extends Error {
     constructor(path) {
         super(`The ${path} path in file replacements does not exist.`);
     }

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

@@ -17,7 +17,6 @@ const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const url_1 = require("url");
 const javascript_transformer_1 = require("../../../tools/esbuild/javascript-transformer");
-const node_18_utils_1 = require("./node-18-utils");
 /**
  * Node.js ESM loader to redirect imports to in memory files.
  * @see: https://nodejs.org/api/esm.html#loaders for more information about loaders.
@@ -30,7 +29,6 @@ const javascriptTransformer = new javascript_transformer_1.JavaScriptTransformer
 // In a development environment the additional scope information does not
 // have a negative effect unlike production where final output size is relevant.
 { sourcemap: true, jit: true }, 1);
-(0, node_18_utils_1.callInitializeIfNeeded)(initialize);
 function initialize(data) {
     // This path does not actually exist but is used to overlay the in memory files with the
     // actual filesystem for resolution purposes.