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

package/src/tools/esbuild/stylesheets/sass-language.js

@@ -33,6 +33,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SassStylesheetLanguage = exports.shutdownSassWorkerPool = void 0;
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
+const cache_1 = require("../cache");
 let sassWorkerPool;
 let sassWorkerPoolPromise;
 function isSassException(error) {
@@ -81,16 +82,6 @@ function parsePackageName(url) {
         },
     };
 }
-class Cache extends Map {
-    async getOrCreate(key, creator) {
-        let value = this.get(key);
-        if (value === undefined) {
-            value = await creator();
-            this.set(key, value);
-        }
-        return value;
-    }
-}
 async function compileString(data, filePath, syntax, options, resolveUrl) {
     // Lazily load Sass when a Sass file is found
     if (sassWorkerPool === undefined) {
@@ -105,8 +96,8 @@ async function compileString(data, filePath, syntax, options, resolveUrl) {
     // A null value indicates that the cached resolution attempt failed to find a location and
     // later stage resolution should be attempted. This avoids potentially expensive repeat
     // failing resolution attempts.
-    const resolutionCache = new Cache();
-    const packageRootCache = new Cache();
+    const resolutionCache = new cache_1.MemoryCache();
+    const packageRootCache = new cache_1.MemoryCache();
     const warnings = [];
     try {
         const { css, sourceMap, loadedUrls } = await sassWorkerPool.compileStringAsync(data, {

package/src/tools/esbuild/stylesheets/stylesheet-plugin-factory.js

@@ -49,7 +49,15 @@ let postcss;
  *
  * Based on https://tailwindcss.com/docs/functions-and-directives
  */
-const TAILWIND_KEYWORDS = ['@tailwind', '@layer', '@apply', '@config', 'theme(', 'screen('];
+const TAILWIND_KEYWORDS = [
+    '@tailwind',
+    '@layer',
+    '@apply',
+    '@config',
+    'theme(',
+    'screen(',
+    '@screen', // Undocumented in version 3, see: https://github.com/tailwindlabs/tailwindcss/discussions/7516.
+];
 /**
  * Cached postcss instances that can be re-used between various StylesheetPluginFactory instances.
  */

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

@@ -7,6 +7,7 @@
  */
 import { BuilderContext } from '@angular-devkit/architect';
 import { BuildOptions, Metafile, OutputFile, PartialMessage } from 'esbuild';
+import { NormalizedOutputOptions } from '../../builders/application/options';
 import { BudgetCalculatorResult } from '../../utils/bundle-calculator';
 import { BuildOutputFile, BuildOutputFileType, InitialFileRecord } from './bundler-context';
 import { BuildOutputAsset } from './bundler-execution-result';
@@ -25,12 +26,11 @@ export declare function logMessages(context: BuilderContext, { errors, warnings
  * @returns An object that can be used with the esbuild build `supported` option.
  */
 export declare function getFeatureSupport(target: string[]): BuildOptions['supported'];
-export declare function writeResultFiles(outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[] | undefined, outputPath: string): Promise<void>;
+export declare function writeResultFiles(outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[] | undefined, { base, browser, media, server }: NormalizedOutputOptions): Promise<void>;
 export declare function emitFilesToDisk<T = BuildOutputAsset | BuildOutputFile>(files: T[], writeFileCallback: (file: T) => Promise<void>): Promise<void>;
 export declare function createOutputFileFromText(path: string, text: string, type: BuildOutputFileType): BuildOutputFile;
 export declare function createOutputFileFromData(path: string, data: Uint8Array, type: BuildOutputFileType): BuildOutputFile;
 export declare function convertOutputFile(file: OutputFile, type: BuildOutputFileType): BuildOutputFile;
-export declare function getFullOutputPath(file: BuildOutputFile): string;
 /**
  * Transform browserlists result to esbuild target.
  * @see https://esbuild.github.io/api/#target

package/src/tools/esbuild/utils.js

@@ -6,46 +6,21 @@
  * 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.getSupportedNodeTargets = exports.transformSupportedBrowsersToTargets = exports.getFullOutputPath = exports.convertOutputFile = exports.createOutputFileFromData = exports.createOutputFileFromText = exports.emitFilesToDisk = exports.writeResultFiles = exports.getFeatureSupport = exports.logMessages = exports.withNoProgress = exports.withSpinner = exports.calculateEstimatedTransferSizes = exports.logBuildStats = void 0;
+exports.getSupportedNodeTargets = exports.transformSupportedBrowsersToTargets = exports.convertOutputFile = exports.createOutputFileFromData = exports.createOutputFileFromText = exports.emitFilesToDisk = exports.writeResultFiles = exports.getFeatureSupport = exports.logMessages = exports.withNoProgress = exports.withSpinner = exports.calculateEstimatedTransferSizes = exports.logBuildStats = void 0;
 const esbuild_1 = require("esbuild");
 const node_crypto_1 = require("node:crypto");
 const node_fs_1 = require("node:fs");
 const promises_1 = __importDefault(require("node:fs/promises"));
-const node_path_1 = __importStar(require("node:path"));
-const node_util_1 = require("node:util");
+const node_path_1 = __importDefault(require("node:path"));
 const node_zlib_1 = require("node:zlib");
 const semver_1 = require("semver");
 const spinner_1 = require("../../utils/spinner");
 const stats_1 = require("../webpack/utils/stats");
 const bundler_context_1 = require("./bundler-context");
-const compressAsync = (0, node_util_1.promisify)(node_zlib_1.brotliCompress);
 function logBuildStats(context, metafile, initial, budgetFailures, changedFiles, estimatedTransferSizes) {
     const stats = [];
     let unchangedCount = 0;
@@ -90,22 +65,41 @@ function logBuildStats(context, metafile, initial, budgetFailures, changedFiles,
 exports.logBuildStats = logBuildStats;
 async function calculateEstimatedTransferSizes(outputFiles) {
     const sizes = new Map();
-    const pendingCompression = [];
-    for (const outputFile of outputFiles) {
-        // Only calculate JavaScript and CSS files
-        if (!outputFile.path.endsWith('.js') && !outputFile.path.endsWith('.css')) {
-            continue;
+    if (outputFiles.length <= 0) {
+        return sizes;
+    }
+    return new Promise((resolve, reject) => {
+        let completeCount = 0;
+        for (const outputFile of outputFiles) {
+            // Only calculate JavaScript and CSS files
+            if (!outputFile.path.endsWith('.js') && !outputFile.path.endsWith('.css')) {
+                ++completeCount;
+                continue;
+            }
+            // Skip compressing small files which may end being larger once compressed and will most likely not be
+            // compressed in actual transit.
+            if (outputFile.contents.byteLength < 1024) {
+                sizes.set(outputFile.path, outputFile.contents.byteLength);
+                ++completeCount;
+                continue;
+            }
+            // Directly use the async callback function to minimize the number of Promises that need to be created.
+            (0, node_zlib_1.brotliCompress)(outputFile.contents, (error, result) => {
+                if (error) {
+                    reject(error);
+                    return;
+                }
+                sizes.set(outputFile.path, result.byteLength);
+                if (++completeCount >= outputFiles.length) {
+                    resolve(sizes);
+                }
+            });
         }
-        // Skip compressing small files which may end being larger once compressed and will most likely not be
-        // compressed in actual transit.
-        if (outputFile.contents.byteLength < 1024) {
-            sizes.set(outputFile.path, outputFile.contents.byteLength);
-            continue;
+        // Covers the case where no files need to be compressed
+        if (completeCount >= outputFiles.length) {
+            resolve(sizes);
         }
-        pendingCompression.push(compressAsync(outputFile.contents).then((result) => sizes.set(outputFile.path, result.byteLength)));
-    }
-    await Promise.all(pendingCompression);
-    return sizes;
+    });
 }
 exports.calculateEstimatedTransferSizes = calculateEstimatedTransferSizes;
 async function withSpinner(text, action) {
@@ -182,31 +176,45 @@ function getFeatureSupport(target) {
     return supported;
 }
 exports.getFeatureSupport = getFeatureSupport;
-async function writeResultFiles(outputFiles, assetFiles, outputPath) {
+async function writeResultFiles(outputFiles, assetFiles, { base, browser, media, server }) {
     const directoryExists = new Set();
-    const ensureDirectoryExists = async (basePath) => {
-        if (basePath && !directoryExists.has(basePath)) {
-            await promises_1.default.mkdir(node_path_1.default.join(outputPath, basePath), { recursive: true });
+    const ensureDirectoryExists = async (destPath) => {
+        const basePath = node_path_1.default.dirname(destPath);
+        if (!directoryExists.has(basePath)) {
+            await promises_1.default.mkdir(node_path_1.default.join(base, basePath), { recursive: true });
             directoryExists.add(basePath);
         }
     };
     // Writes the output file to disk and ensures the containing directories are present
     await emitFilesToDisk(outputFiles, async (file) => {
-        const fullOutputPath = file.fullOutputPath;
+        let outputDir;
+        switch (file.type) {
+            case bundler_context_1.BuildOutputFileType.Browser:
+            case bundler_context_1.BuildOutputFileType.Media:
+                outputDir = browser;
+                break;
+            case bundler_context_1.BuildOutputFileType.Server:
+                outputDir = server;
+                break;
+            case bundler_context_1.BuildOutputFileType.Root:
+                outputDir = '';
+                break;
+            default:
+                throw new Error(`Unhandled write for file "${file.path}" with type "${bundler_context_1.BuildOutputFileType[file.type]}".`);
+        }
+        const destPath = node_path_1.default.join(outputDir, file.path);
         // Ensure output subdirectories exist
-        const basePath = node_path_1.default.dirname(fullOutputPath);
-        await ensureDirectoryExists(basePath);
+        await ensureDirectoryExists(destPath);
         // Write file contents
-        await promises_1.default.writeFile(node_path_1.default.join(outputPath, fullOutputPath), file.contents);
+        await promises_1.default.writeFile(node_path_1.default.join(base, destPath), file.contents);
     });
     if (assetFiles?.length) {
         await emitFilesToDisk(assetFiles, async ({ source, destination }) => {
+            const destPath = node_path_1.default.join(browser, destination);
             // Ensure output subdirectories exist
-            const destPath = (0, node_path_1.join)('browser', destination);
-            const basePath = node_path_1.default.dirname(destPath);
-            await ensureDirectoryExists(basePath);
+            await ensureDirectoryExists(destPath);
             // Copy file contents
-            await promises_1.default.copyFile(source, node_path_1.default.join(outputPath, destPath), node_fs_1.constants.COPYFILE_FICLONE);
+            await promises_1.default.copyFile(source, node_path_1.default.join(base, destPath), node_fs_1.constants.COPYFILE_FICLONE);
         });
     }
 }
@@ -235,9 +243,6 @@ function createOutputFileFromText(path, text, type) {
         get contents() {
             return Buffer.from(this.text, 'utf-8');
         },
-        get fullOutputPath() {
-            return getFullOutputPath(this);
-        },
         clone() {
             return createOutputFileFromText(this.path, this.text, this.type);
         },
@@ -257,9 +262,6 @@ function createOutputFileFromData(path, data, type) {
         get contents() {
             return data;
         },
-        get fullOutputPath() {
-            return getFullOutputPath(this);
-        },
         clone() {
             return createOutputFileFromData(this.path, this.contents, this.type);
         },
@@ -276,27 +278,12 @@ function convertOutputFile(file, type) {
         get text() {
             return Buffer.from(this.contents.buffer, this.contents.byteOffset, this.contents.byteLength).toString('utf-8');
         },
-        get fullOutputPath() {
-            return getFullOutputPath(this);
-        },
         clone() {
             return convertOutputFile(this, this.type);
         },
     };
 }
 exports.convertOutputFile = convertOutputFile;
-function getFullOutputPath(file) {
-    switch (file.type) {
-        case bundler_context_1.BuildOutputFileType.Browser:
-        case bundler_context_1.BuildOutputFileType.Media:
-            return (0, node_path_1.join)('browser', file.path);
-        case bundler_context_1.BuildOutputFileType.Server:
-            return (0, node_path_1.join)('server', file.path);
-        default:
-            return file.path;
-    }
-}
-exports.getFullOutputPath = getFullOutputPath;
 /**
  * Transform browserlists result to esbuild target.
  * @see https://esbuild.github.io/api/#target

package/src/tools/sass/lexer.d.ts

@@ -16,14 +16,3 @@ export declare function findUrls(contents: string): Iterable<{
     end: number;
     value: string;
 }>;
-/**
- * Scans a CSS or Sass file and locates all valid import/use directive values as defined by the
- * syntax specification.
- * @param contents A string containing a CSS or Sass file to scan.
- * @returns An iterable that yields each CSS directive value found.
- */
-export declare function findImports(contents: string): Iterable<{
-    start: number;
-    end: number;
-    specifier: string;
-}>;

package/src/tools/sass/lexer.js

@@ -7,7 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findImports = exports.findUrls = void 0;
+exports.findUrls = void 0;
 // TODO: Combine everything into a single pass lexer
 /**
  * Determines if a unicode code point is a CSS whitespace character.
@@ -159,89 +159,3 @@ function* findUrls(contents) {
     }
 }
 exports.findUrls = findUrls;
-/**
- * Scans a CSS or Sass file and locates all valid import/use directive values as defined by the
- * syntax specification.
- * @param contents A string containing a CSS or Sass file to scan.
- * @returns An iterable that yields each CSS directive value found.
- */
-function* findImports(contents) {
-    yield* find(contents, '@import ');
-    yield* find(contents, '@use ');
-}
-exports.findImports = findImports;
-/**
- * Scans a CSS or Sass file and locates all valid function/directive values as defined by the
- * syntax specification.
- * @param contents A string containing a CSS or Sass file to scan.
- * @param prefix The prefix to start a valid segment.
- * @returns An iterable that yields each CSS url function value found.
- */
-function* find(contents, prefix) {
-    let pos = 0;
-    let width = 1;
-    let current = -1;
-    const next = () => {
-        pos += width;
-        current = contents.codePointAt(pos) ?? -1;
-        width = current > 0xffff ? 2 : 1;
-        return current;
-    };
-    // Based on https://www.w3.org/TR/css-syntax-3/#consume-ident-like-token
-    while ((pos = contents.indexOf(prefix, pos)) !== -1) {
-        // Set to position of the last character in prefix
-        pos += prefix.length - 1;
-        width = 1;
-        // Consume all leading whitespace
-        while (isWhitespace(next())) {
-            /* empty */
-        }
-        // Initialize URL state
-        const url = { start: pos, end: -1, specifier: '' };
-        let complete = false;
-        // If " or ', then consume the value as a string
-        if (current === 0x0022 || current === 0x0027) {
-            const ending = current;
-            // Based on https://www.w3.org/TR/css-syntax-3/#consume-string-token
-            while (!complete) {
-                switch (next()) {
-                    case -1: // EOF
-                        return;
-                    case 0x000a: // line feed
-                    case 0x000c: // form feed
-                    case 0x000d: // carriage return
-                        // Invalid
-                        complete = true;
-                        break;
-                    case 0x005c: // \ -- character escape
-                        // If not EOF or newline, add the character after the escape
-                        switch (next()) {
-                            case -1:
-                                return;
-                            case 0x000a: // line feed
-                            case 0x000c: // form feed
-                            case 0x000d: // carriage return
-                                // Skip when inside a string
-                                break;
-                            default:
-                                // TODO: Handle hex escape codes
-                                url.specifier += String.fromCodePoint(current);
-                                break;
-                        }
-                        break;
-                    case ending:
-                        // Full string position should include the quotes for replacement
-                        url.end = pos + 1;
-                        complete = true;
-                        yield url;
-                        break;
-                    default:
-                        url.specifier += String.fromCodePoint(current);
-                        break;
-                }
-            }
-            next();
-            continue;
-        }
-    }
-}

package/src/utils/index-file/index-html-generator.js

@@ -6,33 +6,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
  */
-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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexHtmlGenerator = void 0;
-const fs = __importStar(require("fs"));
-const path_1 = require("path");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
 const strip_bom_1 = require("../strip-bom");
 const augment_index_html_1 = require("./augment-index-html");
 const inline_critical_css_1 = require("./inline-critical-css");
@@ -85,10 +62,20 @@ class IndexHtmlGenerator {
         };
     }
     async readAsset(path) {
-        return fs.promises.readFile(path, 'utf-8');
+        try {
+            return await (0, promises_1.readFile)(path, 'utf-8');
+        }
+        catch {
+            throw new Error(`Failed to read asset "${path}".`);
+        }
     }
     async readIndex(path) {
-        return fs.promises.readFile(path, 'utf-8');
+        try {
+            return await (0, promises_1.readFile)(path, 'utf-8');
+        }
+        catch {
+            throw new Error(`Failed to read index HTML file "${path}".`);
+        }
     }
 }
 exports.IndexHtmlGenerator = IndexHtmlGenerator;
@@ -104,7 +91,7 @@ function augmentIndexHtmlPlugin(generator) {
             sri,
             lang,
             entrypoints,
-            loadOutputFile: (filePath) => generator.readAsset((0, path_1.join)(outputPath, filePath)),
+            loadOutputFile: (filePath) => generator.readAsset((0, node_path_1.join)(outputPath, filePath)),
             imageDomains,
             files,
             hints,

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/{builders/jest → utils}/test-files.d.ts

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import fastGlob from 'fast-glob';
-import { JestBuilderOptions } from './options';
 /**
  * Finds all test files in the project.
  *
@@ -16,4 +15,4 @@ import { JestBuilderOptions } from './options';
  *     testing purposes.
  * @returns A set of all test files in the project.
  */
-export declare function findTestFiles(options: JestBuilderOptions, workspaceRoot: string, glob?: typeof fastGlob): Promise<Set<string>>;
+export declare function findTestFiles(include: string[], exclude: string[], workspaceRoot: string, glob?: typeof fastGlob): Promise<Set<string>>;

package/src/{builders/jest → utils}/test-files.js

@@ -21,14 +21,14 @@ const fast_glob_1 = __importDefault(require("fast-glob"));
  *     testing purposes.
  * @returns A set of all test files in the project.
  */
-async function findTestFiles(options, workspaceRoot, glob = fast_glob_1.default) {
+async function findTestFiles(include, exclude, workspaceRoot, glob = fast_glob_1.default) {
     const globOptions = {
         cwd: workspaceRoot,
-        ignore: ['node_modules/**'].concat(options.exclude),
+        ignore: ['node_modules/**'].concat(exclude),
         braceExpansion: false, // Do not expand `a{b,c}` to `ab,ac`.
         extglob: false, // Disable "extglob" patterns.
     };
-    const included = await Promise.all(options.include.map((pattern) => glob(pattern, globOptions)));
+    const included = await Promise.all(include.map((pattern) => glob(pattern, globOptions)));
     // Flatten and deduplicate any files found in multiple include patterns.
     return new Set(included.flat());
 }