@depup/angular__build 22.1.8-depup.5 → 22.2.0-depup.0

package/src/tools/esbuild/i18n-locale-plugin.js

@@ -7,17 +7,15 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LOCALE_DATA_BASE_MODULE = exports.LOCALE_DATA_NAMESPACE = void 0;
+exports.resolveLocaleDataPath = exports.loadLocaleData = exports.LOCALE_DATA_BASE_MODULE = exports.LOCALE_DATA_NAMESPACE = void 0;
 exports.createAngularLocaleDataPlugin = createAngularLocaleDataPlugin;
 const resolve_project_1 = require("../../utils/resolve-project");
-/**
- * The internal namespace used by generated locale import statements and Angular locale data plugin.
- */
-exports.LOCALE_DATA_NAMESPACE = 'angular:locale/data';
-/**
- * The base module location used to search for locale specific data.
- */
-exports.LOCALE_DATA_BASE_MODULE = '@angular/common/locales/global';
+const locale_data_1 = require("../i18n/locale-data");
+var locale_data_2 = require("../i18n/locale-data");
+Object.defineProperty(exports, "LOCALE_DATA_NAMESPACE", { enumerable: true, get: function () { return locale_data_2.LOCALE_DATA_NAMESPACE; } });
+Object.defineProperty(exports, "LOCALE_DATA_BASE_MODULE", { enumerable: true, get: function () { return locale_data_2.LOCALE_DATA_BASE_MODULE; } });
+Object.defineProperty(exports, "loadLocaleData", { enumerable: true, get: function () { return locale_data_2.loadLocaleData; } });
+Object.defineProperty(exports, "resolveLocaleDataPath", { enumerable: true, get: function () { return locale_data_2.resolveLocaleDataPath; } });
 /**
  * Creates an esbuild plugin that resolves Angular locale data files from `@angular/common`.
  *
@@ -28,120 +26,41 @@ function createAngularLocaleDataPlugin() {
         name: 'angular-locale-data',
         setup(build) {
             build.onResolve({ filter: /^angular:locale\/data:/ }, async ({ path }) => {
-                // Extract the locale from the path
                 const rawLocaleTag = path.split(':', 3)[2];
-                // Extract and normalize the base name of the raw locale tag
-                let partialLocaleTag;
-                try {
-                    const locale = new Intl.Locale(rawLocaleTag);
-                    partialLocaleTag = locale.baseName;
-                }
-                catch {
+                const { absWorkingDir } = build.initialOptions;
+                let projectResolve;
+                const resolution = (0, locale_data_1.resolveLocaleDataPath)(rawLocaleTag, (potentialPath) => {
+                    projectResolve ??= (0, resolve_project_1.createProjectResolver)(absWorkingDir ?? process.cwd());
+                    try {
+                        return projectResolve(potentialPath);
+                    }
+                    catch {
+                        return undefined;
+                    }
+                });
+                if (resolution.error) {
                     return {
                         path: rawLocaleTag,
-                        namespace: exports.LOCALE_DATA_NAMESPACE,
-                        errors: [
-                            {
-                                text: `Invalid or unsupported locale provided in configuration: "${rawLocaleTag}"`,
-                            },
-                        ],
+                        namespace: locale_data_1.LOCALE_DATA_NAMESPACE,
+                        errors: [{ text: resolution.error }],
                     };
                 }
-                let exact = true;
-                let projectResolve;
-                while (partialLocaleTag) {
-                    // Angular embeds the `en`/`en-US` locale into the framework and it does not need to be included again here.
-                    // The onLoad hook below for the locale data namespace has an `empty` loader that will prevent inclusion.
-                    // Angular does not contain exact locale data for `en-US` but `en` is equivalent.
-                    if (partialLocaleTag === 'en' || partialLocaleTag === 'en-US') {
-                        return {
-                            path: rawLocaleTag,
-                            namespace: exports.LOCALE_DATA_NAMESPACE,
-                        };
-                    }
-                    // Attempt to resolve the locale tag data within the Angular base module location
-                    const potentialPath = `${exports.LOCALE_DATA_BASE_MODULE}/${partialLocaleTag}`;
-                    // If packages are configured to be external then leave the original angular locale import path.
-                    // This happens when using the development server with caching enabled to allow Vite prebundling to work.
-                    // There currently is no option on the esbuild resolve function to resolve while disabling the option.
-                    // NOTE: If esbuild eventually allows controlling the external package options in a build.resolve call, this
-                    // workaround can be removed.
-                    let result;
-                    const { packages, absWorkingDir } = build.initialOptions;
-                    if (packages === 'external' && absWorkingDir) {
-                        projectResolve ??= (0, resolve_project_1.createProjectResolver)(absWorkingDir);
-                        try {
-                            projectResolve(potentialPath);
-                            result = {
-                                errors: [],
-                                warnings: [],
-                                external: true,
-                                sideEffects: true,
-                                namespace: '',
-                                suffix: '',
-                                pluginData: undefined,
-                                path: potentialPath,
-                            };
-                        }
-                        catch { }
-                    }
-                    else {
-                        result = await build.resolve(potentialPath, {
-                            kind: 'import-statement',
-                            resolveDir: absWorkingDir,
-                        });
-                        if (result && result.external && absWorkingDir) {
-                            projectResolve ??= (0, resolve_project_1.createProjectResolver)(absWorkingDir);
-                            try {
-                                const resolvedPath = projectResolve(potentialPath);
-                                result = {
-                                    ...result,
-                                    external: false,
-                                    path: resolvedPath,
-                                };
-                            }
-                            catch { }
-                        }
-                    }
-                    if (result?.path) {
-                        if (exact) {
-                            return result;
-                        }
-                        else {
-                            return {
-                                ...result,
-                                warnings: [
-                                    ...result.warnings,
-                                    {
-                                        location: null,
-                                        text: `Locale data for '${rawLocaleTag}' cannot be found. Using locale data for '${partialLocaleTag}'.`,
-                                    },
-                                ],
-                            };
-                        }
-                    }
-                    // Remove the last subtag and try again with a less specific locale.
-                    // Usually the match is exact so the string splitting here is not done until actually needed after the exact
-                    // match fails to resolve.
-                    const parts = partialLocaleTag.split('-');
-                    partialLocaleTag = parts.slice(0, -1).join('-');
-                    exact = false;
+                if (!resolution.path) {
+                    return {
+                        path: rawLocaleTag,
+                        namespace: locale_data_1.LOCALE_DATA_NAMESPACE,
+                        warnings: resolution.warning
+                            ? [{ location: null, text: resolution.warning }]
+                            : undefined,
+                    };
                 }
-                // Not found so issue a warning and use an empty loader. Framework built-in `en-US` data will be used.
-                // This retains existing behavior as in the Webpack-based builder.
                 return {
-                    path: rawLocaleTag,
-                    namespace: exports.LOCALE_DATA_NAMESPACE,
-                    warnings: [
-                        {
-                            location: null,
-                            text: `Locale data for '${rawLocaleTag}' cannot be found. No locale data will be included for this locale.`,
-                        },
-                    ],
+                    path: resolution.path,
+                    warnings: resolution.warning ? [{ location: null, text: resolution.warning }] : undefined,
                 };
             });
-            // Locales that cannot be found will be loaded as empty content with a warning from the resolve step
-            build.onLoad({ filter: /./, namespace: exports.LOCALE_DATA_NAMESPACE }, () => ({
+            // Locales that cannot be found or are en/en-US will be loaded as empty content
+            build.onLoad({ filter: /./, namespace: locale_data_1.LOCALE_DATA_NAMESPACE }, () => ({
                 contents: '',
                 loader: 'empty',
             }));

package/src/tools/esbuild/i18n-locale-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"i18n-locale-plugin.js","sourceRoot":"","sources":["i18n-locale-plugin.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAoBH,sEAiIC;AAlJD,iEAAoE;AAEpE;;GAEG;AACU,QAAA,qBAAqB,GAAG,qBAAqB,CAAC;AAE3D;;GAEG;AACU,QAAA,uBAAuB,GAAG,gCAAgC,CAAC;AAExE;;;;GAIG;AACH,SAAgB,6BAA6B;IAC3C,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,KAAK,CAAC,KAAK;YACT,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,wBAAwB,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;gBACvE,mCAAmC;gBACnC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE3C,4DAA4D;gBAC5D,IAAI,gBAAwB,CAAC;gBAC7B,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBAC7C,gBAAgB,GAAG,MAAM,CAAC,QAAQ,CAAC;gBACrC,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO;wBACL,IAAI,EAAE,YAAY;wBAClB,SAAS,EAAE,6BAAqB;wBAChC,MAAM,EAAE;4BACN;gCACE,IAAI,EAAE,6DAA6D,YAAY,GAAG;6BACnF;yBACF;qBACF,CAAC;gBACJ,CAAC;gBAED,IAAI,KAAK,GAAG,IAAI,CAAC;gBACjB,IAAI,cAA6D,CAAC;gBAClE,OAAO,gBAAgB,EAAE,CAAC;oBACxB,4GAA4G;oBAC5G,yGAAyG;oBACzG,iFAAiF;oBACjF,IAAI,gBAAgB,KAAK,IAAI,IAAI,gBAAgB,KAAK,OAAO,EAAE,CAAC;wBAC9D,OAAO;4BACL,IAAI,EAAE,YAAY;4BAClB,SAAS,EAAE,6BAAqB;yBACjC,CAAC;oBACJ,CAAC;oBAED,iFAAiF;oBACjF,MAAM,aAAa,GAAG,GAAG,+BAAuB,IAAI,gBAAgB,EAAE,CAAC;oBAEvE,gGAAgG;oBAChG,yGAAyG;oBACzG,sGAAsG;oBACtG,4GAA4G;oBAC5G,6BAA6B;oBAC7B,IAAI,MAAiC,CAAC;oBACtC,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC;oBACzD,IAAI,QAAQ,KAAK,UAAU,IAAI,aAAa,EAAE,CAAC;wBAC7C,cAAc,KAAK,IAAA,uCAAqB,EAAC,aAAa,CAAC,CAAC;wBAExD,IAAI,CAAC;4BACH,cAAc,CAAC,aAAa,CAAC,CAAC;4BAE9B,MAAM,GAAG;gCACP,MAAM,EAAE,EAAE;gCACV,QAAQ,EAAE,EAAE;gCACZ,QAAQ,EAAE,IAAI;gCACd,WAAW,EAAE,IAAI;gCACjB,SAAS,EAAE,EAAE;gCACb,MAAM,EAAE,EAAE;gCACV,UAAU,EAAE,SAAS;gCACrB,IAAI,EAAE,aAAa;6BACpB,CAAC;wBACJ,CAAC;wBAAC,MAAM,CAAC,CAAA,CAAC;oBACZ,CAAC;yBAAM,CAAC;wBACN,MAAM,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE;4BAC1C,IAAI,EAAE,kBAAkB;4BACxB,UAAU,EAAE,aAAa;yBAC1B,CAAC,CAAC;wBACH,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,IAAI,aAAa,EAAE,CAAC;4BAC/C,cAAc,KAAK,IAAA,uCAAqB,EAAC,aAAa,CAAC,CAAC;4BACxD,IAAI,CAAC;gCACH,MAAM,YAAY,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;gCACnD,MAAM,GAAG;oCACP,GAAG,MAAM;oCACT,QAAQ,EAAE,KAAK;oCACf,IAAI,EAAE,YAAY;iCACnB,CAAC;4BACJ,CAAC;4BAAC,MAAM,CAAC,CAAA,CAAC;wBACZ,CAAC;oBACH,CAAC;oBAED,IAAI,MAAM,EAAE,IAAI,EAAE,CAAC;wBACjB,IAAI,KAAK,EAAE,CAAC;4BACV,OAAO,MAAM,CAAC;wBAChB,CAAC;6BAAM,CAAC;4BACN,OAAO;gCACL,GAAG,MAAM;gCACT,QAAQ,EAAE;oCACR,GAAG,MAAM,CAAC,QAAQ;oCAClB;wCACE,QAAQ,EAAE,IAAI;wCACd,IAAI,EAAE,oBAAoB,YAAY,6CAA6C,gBAAgB,IAAI;qCACxG;iCACF;6BACF,CAAC;wBACJ,CAAC;oBACH,CAAC;oBAED,oEAAoE;oBACpE,4GAA4G;oBAC5G,0BAA0B;oBAC1B,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAC1C,gBAAgB,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAChD,KAAK,GAAG,KAAK,CAAC;gBAChB,CAAC;gBAED,sGAAsG;gBACtG,kEAAkE;gBAClE,OAAO;oBACL,IAAI,EAAE,YAAY;oBAClB,SAAS,EAAE,6BAAqB;oBAChC,QAAQ,EAAE;wBACR;4BACE,QAAQ,EAAE,IAAI;4BACd,IAAI,EAAE,oBAAoB,YAAY,qEAAqE;yBAC5G;qBACF;iBACF,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,oGAAoG;YACpG,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,6BAAqB,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;gBACrE,QAAQ,EAAE,EAAE;gBACZ,MAAM,EAAE,OAAO;aAChB,CAAC,CAAC,CAAC;QACN,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"i18n-locale-plugin.js","sourceRoot":"","sources":["i18n-locale-plugin.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AA0BH,sEAiDC;AAxED,iEAAoE;AACpE,qDAM6B;AAE7B,mDAO6B;AAN3B,oHAAA,qBAAqB,OAAA;AACrB,sHAAA,uBAAuB,OAAA;AAGvB,6GAAA,cAAc,OAAA;AACd,oHAAA,qBAAqB,OAAA;AAGvB;;;;GAIG;AACH,SAAgB,6BAA6B;IAC3C,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,KAAK,CAAC,KAAK;YACT,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,wBAAwB,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;gBACvE,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC3C,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC;gBAC/C,IAAI,cAA6D,CAAC;gBAElE,MAAM,UAAU,GAAG,IAAA,mCAAqB,EAAC,YAAY,EAAE,CAAC,aAAa,EAAE,EAAE;oBACvE,cAAc,KAAK,IAAA,uCAAqB,EAAC,aAAa,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;oBACzE,IAAI,CAAC;wBACH,OAAO,cAAc,CAAC,aAAa,CAAC,CAAC;oBACvC,CAAC;oBAAC,MAAM,CAAC;wBACP,OAAO,SAAS,CAAC;oBACnB,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;oBACrB,OAAO;wBACL,IAAI,EAAE,YAAY;wBAClB,SAAS,EAAE,mCAAqB;wBAChC,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC;qBACrC,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;oBACrB,OAAO;wBACL,IAAI,EAAE,YAAY;wBAClB,SAAS,EAAE,mCAAqB;wBAChC,QAAQ,EAAE,UAAU,CAAC,OAAO;4BAC1B,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;4BAChD,CAAC,CAAC,SAAS;qBACd,CAAC;gBACJ,CAAC;gBAED,OAAO;oBACL,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;iBAC1F,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,+EAA+E;YAC/E,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,mCAAqB,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;gBACrE,QAAQ,EAAE,EAAE;gBACZ,MAAM,EAAE,OAAO;aAChB,CAAC,CAAC,CAAC;QACN,CAAC;KACF,CAAC;AACJ,CAAC"}

package/src/tools/esbuild/license-extractor.d.ts

@@ -22,4 +22,4 @@ import type { Metafile } from 'esbuild';
  * @param rootDirectory The root directory of the workspace.
  * @returns A string containing the content of the output licenses file.
  */
-export declare function extractLicenses(metafile: Metafile, rootDirectory: string): Promise<string>;
+export declare function extractLicenses(metafiles: Metafile[], rootDirectory: string): Promise<string>;

package/src/tools/esbuild/license-extractor.js

@@ -58,106 +58,109 @@ const EXTRACTION_FILE_SEPARATOR = '-'.repeat(80) + '\n';
  * @param rootDirectory The root directory of the workspace.
  * @returns A string containing the content of the output licenses file.
  */
-async function extractLicenses(metafile, rootDirectory) {
+async function extractLicenses(metafiles, rootDirectory) {
     let extractedLicenseContent = `${EXTRACTION_FILE_HEADER}\n${EXTRACTION_FILE_SEPARATOR}`;
     const seenPaths = new Set();
     const seenPackageDirectories = new Set();
     const seenPackages = new Set();
-    for (const entry of Object.values(metafile.outputs)) {
-        for (const [inputPath, { bytesInOutput }] of Object.entries(entry.inputs)) {
-            // Skip if not included in output
-            if (bytesInOutput <= 0) {
-                continue;
-            }
-            // Skip already processed paths
-            if (seenPaths.has(inputPath)) {
-                continue;
-            }
-            seenPaths.add(inputPath);
-            // Skip non-package paths
-            if (!inputPath.includes(NODE_MODULE_SEGMENT)) {
-                continue;
-            }
-            // Extract the package name from the path
-            let baseDirectory = node_path_1.default.join(rootDirectory, inputPath);
-            let nameOrScope, nameOrFile;
-            let found = false;
-            while (baseDirectory !== node_path_1.default.dirname(baseDirectory)) {
-                const segment = node_path_1.default.basename(baseDirectory);
-                if (segment === NODE_MODULE_SEGMENT) {
-                    found = true;
-                    break;
+    for (const metafile of metafiles) {
+        for (const entry of Object.values(metafile.outputs)) {
+            for (const [inputPath, { bytesInOutput }] of Object.entries(entry.inputs)) {
+                // Skip if not included in output
+                if (bytesInOutput <= 0) {
+                    continue;
                 }
-                nameOrFile = nameOrScope;
-                nameOrScope = segment;
-                baseDirectory = node_path_1.default.dirname(baseDirectory);
-            }
-            // Skip non-package path edge cases that are not caught in the includes check above
-            if (!found || !nameOrScope) {
-                continue;
-            }
-            const packageName = nameOrScope.startsWith('@')
-                ? `${nameOrScope}/${nameOrFile}`
-                : nameOrScope;
-            const packageDirectory = node_path_1.default.join(baseDirectory, packageName);
-            if (seenPackageDirectories.has(packageDirectory)) {
-                continue;
-            }
-            seenPackageDirectories.add(packageDirectory);
-            // Load the package's metadata to find the package's name, version, and license type
-            const packageJsonPath = node_path_1.default.join(packageDirectory, 'package.json');
-            let packageJson;
-            try {
-                packageJson = JSON.parse(await (0, promises_1.readFile)(packageJsonPath, 'utf-8'));
-            }
-            catch {
-                // Invalid package
-                continue;
-            }
-            // Skip already processed packages
-            const packageId = `${packageName}@${packageJson.version}`;
-            if (seenPackages.has(packageId)) {
-                continue;
-            }
-            seenPackages.add(packageId);
-            // Attempt to find license text inside package
-            let licenseText = '';
-            if (typeof packageJson.license === 'string' &&
-                packageJson.license.toUpperCase().startsWith(CUSTOM_LICENSE_TEXT)) {
-                // Attempt to load the package's custom license
-                let customLicensePath;
-                const customLicenseFile = node_path_1.default.normalize(packageJson.license.slice(CUSTOM_LICENSE_TEXT.length).trim());
-                if (customLicenseFile.startsWith('..') || node_path_1.default.isAbsolute(customLicenseFile)) {
-                    // Path is attempting to access files outside of the package
-                    // TODO: Issue warning?
+                // Skip already processed paths
+                if (seenPaths.has(inputPath)) {
+                    continue;
                 }
-                else {
-                    customLicensePath = node_path_1.default.join(packageDirectory, customLicenseFile);
-                    try {
-                        licenseText = await (0, promises_1.readFile)(customLicensePath, 'utf-8');
+                seenPaths.add(inputPath);
+                // Skip non-package paths
+                if (!inputPath.includes(NODE_MODULE_SEGMENT)) {
+                    continue;
+                }
+                // Extract the package name from the path
+                let baseDirectory = node_path_1.default.join(rootDirectory, inputPath);
+                let nameOrScope, nameOrFile;
+                let found = false;
+                while (baseDirectory !== node_path_1.default.dirname(baseDirectory)) {
+                    const segment = node_path_1.default.basename(baseDirectory);
+                    if (segment === NODE_MODULE_SEGMENT) {
+                        found = true;
+                        break;
                     }
-                    catch { }
+                    nameOrFile = nameOrScope;
+                    nameOrScope = segment;
+                    baseDirectory = node_path_1.default.dirname(baseDirectory);
                 }
-            }
-            else {
-                // Search for a license file within the root of the package
-                const entries = await (0, promises_1.readdir)(packageDirectory, { withFileTypes: true }).catch(() => []);
-                for (const entry of entries) {
-                    if ((entry.isFile() || entry.isSymbolicLink()) && LICENSE_FILE_REGEXP.test(entry.name)) {
-                        const packageLicensePath = node_path_1.default.join(packageDirectory, entry.name);
+                // Skip non-package path edge cases that are not caught in the includes check above
+                if (!found || !nameOrScope) {
+                    continue;
+                }
+                const packageName = nameOrScope.startsWith('@')
+                    ? `${nameOrScope}/${nameOrFile}`
+                    : nameOrScope;
+                const packageDirectory = node_path_1.default.join(baseDirectory, packageName);
+                if (seenPackageDirectories.has(packageDirectory)) {
+                    continue;
+                }
+                seenPackageDirectories.add(packageDirectory);
+                // Load the package's metadata to find the package's name, version, and license type
+                const packageJsonPath = node_path_1.default.join(packageDirectory, 'package.json');
+                let packageJson;
+                try {
+                    packageJson = JSON.parse(await (0, promises_1.readFile)(packageJsonPath, 'utf-8'));
+                }
+                catch {
+                    // Invalid package
+                    continue;
+                }
+                // Skip already processed packages
+                const packageId = `${packageName}@${packageJson.version}`;
+                if (seenPackages.has(packageId)) {
+                    continue;
+                }
+                seenPackages.add(packageId);
+                // Attempt to find license text inside package
+                let licenseText = '';
+                if (typeof packageJson.license === 'string' &&
+                    packageJson.license.toUpperCase().startsWith(CUSTOM_LICENSE_TEXT)) {
+                    // Attempt to load the package's custom license
+                    let customLicensePath;
+                    const customLicenseFile = node_path_1.default.normalize(packageJson.license.slice(CUSTOM_LICENSE_TEXT.length).trim());
+                    if (customLicenseFile.startsWith('..') || node_path_1.default.isAbsolute(customLicenseFile)) {
+                        // Path is attempting to access files outside of the package
+                        // TODO: Issue warning?
+                    }
+                    else {
+                        customLicensePath = node_path_1.default.join(packageDirectory, customLicenseFile);
                         try {
-                            licenseText = await (0, promises_1.readFile)(packageLicensePath, 'utf-8');
-                            break;
+                            licenseText = await (0, promises_1.readFile)(customLicensePath, 'utf-8');
                         }
                         catch { }
                     }
                 }
+                else {
+                    // Search for a license file within the root of the package
+                    const entries = await (0, promises_1.readdir)(packageDirectory, { withFileTypes: true }).catch(() => []);
+                    for (const entry of entries) {
+                        if ((entry.isFile() || entry.isSymbolicLink()) &&
+                            LICENSE_FILE_REGEXP.test(entry.name)) {
+                            const packageLicensePath = node_path_1.default.join(packageDirectory, entry.name);
+                            try {
+                                licenseText = await (0, promises_1.readFile)(packageLicensePath, 'utf-8');
+                                break;
+                            }
+                            catch { }
+                        }
+                    }
+                }
+                // Generate the package's license entry in the output content
+                extractedLicenseContent += `Package: ${packageJson.name}\n`;
+                extractedLicenseContent += `License: ${JSON.stringify(packageJson.license, null, 2)}\n`;
+                extractedLicenseContent += `\n${licenseText}\n`;
+                extractedLicenseContent += EXTRACTION_FILE_SEPARATOR;
             }
-            // Generate the package's license entry in the output content
-            extractedLicenseContent += `Package: ${packageJson.name}\n`;
-            extractedLicenseContent += `License: ${JSON.stringify(packageJson.license, null, 2)}\n`;
-            extractedLicenseContent += `\n${licenseText}\n`;
-            extractedLicenseContent += EXTRACTION_FILE_SEPARATOR;
         }
     }
     return extractedLicenseContent;

package/src/tools/esbuild/license-extractor.js.map

@@ -1 +1 @@
-{"version":3,"file":"license-extractor.js","sourceRoot":"","sources":["license-extractor.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAwDH,0CA0HC;AA/KD,+CAAqD;AACrD,0DAA6B;AAE7B;;GAEG;AACH,MAAM,mBAAmB,GAAG,cAAc,CAAC;AAE3C;;;;;;;;;;;GAWG;AACH,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAE9C;;GAEG;AACH,MAAM,mBAAmB,GAAG,kCAAkC,CAAC;AAE/D;;GAEG;AACH,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAElC;;GAEG;AACH,MAAM,yBAAyB,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;AAExD;;;;;;;;;;;;;;;GAeG;AACI,KAAK,UAAU,eAAe,CAAC,QAAkB,EAAE,aAAqB;IAC7E,IAAI,uBAAuB,GAAG,GAAG,sBAAsB,KAAK,yBAAyB,EAAE,CAAC;IAExF,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAU,CAAC;IACjD,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IAEvC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,KAAK,MAAM,CAAC,SAAS,EAAE,EAAE,aAAa,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1E,iCAAiC;YACjC,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;gBACvB,SAAS;YACX,CAAC;YAED,+BAA+B;YAC/B,IAAI,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC7B,SAAS;YACX,CAAC;YACD,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAEzB,yBAAyB;YACzB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBAC7C,SAAS;YACX,CAAC;YAED,yCAAyC;YACzC,IAAI,aAAa,GAAG,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;YACxD,IAAI,WAAW,EAAE,UAAU,CAAC;YAC5B,IAAI,KAAK,GAAG,KAAK,CAAC;YAClB,OAAO,aAAa,KAAK,mBAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;gBACrD,MAAM,OAAO,GAAG,mBAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAC7C,IAAI,OAAO,KAAK,mBAAmB,EAAE,CAAC;oBACpC,KAAK,GAAG,IAAI,CAAC;oBACb,MAAM;gBACR,CAAC;gBAED,UAAU,GAAG,WAAW,CAAC;gBACzB,WAAW,GAAG,OAAO,CAAC;gBACtB,aAAa,GAAG,mBAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAC9C,CAAC;YAED,mFAAmF;YACnF,IAAI,CAAC,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC3B,SAAS;YACX,CAAC;YAED,MAAM,WAAW,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC;gBAC7C,CAAC,CAAC,GAAG,WAAW,IAAI,UAAU,EAAE;gBAChC,CAAC,CAAC,WAAW,CAAC;YAChB,MAAM,gBAAgB,GAAG,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;YAE/D,IAAI,sBAAsB,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACjD,SAAS;YACX,CAAC;YACD,sBAAsB,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAE7C,oFAAoF;YACpF,MAAM,eAAe,GAAG,mBAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;YACpE,IAAI,WAAW,CAAC;YAChB,IAAI,CAAC;gBACH,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,eAAe,EAAE,OAAO,CAAC,CAKhE,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBACP,kBAAkB;gBAClB,SAAS;YACX,CAAC;YAED,kCAAkC;YAClC,MAAM,SAAS,GAAG,GAAG,WAAW,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YAC1D,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBAChC,SAAS;YACX,CAAC;YACD,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAE5B,8CAA8C;YAC9C,IAAI,WAAW,GAAG,EAAE,CAAC;YACrB,IACE,OAAO,WAAW,CAAC,OAAO,KAAK,QAAQ;gBACvC,WAAW,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EACjE,CAAC;gBACD,+CAA+C;gBAC/C,IAAI,iBAAiB,CAAC;gBACtB,MAAM,iBAAiB,GAAG,mBAAI,CAAC,SAAS,CACtC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAC7D,CAAC;gBACF,IAAI,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,mBAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;oBAC7E,4DAA4D;oBAC5D,uBAAuB;gBACzB,CAAC;qBAAM,CAAC;oBACN,iBAAiB,GAAG,mBAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;oBACnE,IAAI,CAAC;wBACH,WAAW,GAAG,MAAM,IAAA,mBAAQ,EAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;oBAC3D,CAAC;oBAAC,MAAM,CAAC,CAAA,CAAC;gBACZ,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,2DAA2D;gBAC3D,MAAM,OAAO,GAAG,MAAM,IAAA,kBAAO,EAAC,gBAAgB,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;gBAEzF,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;oBAC5B,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;wBACvF,MAAM,kBAAkB,GAAG,mBAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;wBACnE,IAAI,CAAC;4BACH,WAAW,GAAG,MAAM,IAAA,mBAAQ,EAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;4BAC1D,MAAM;wBACR,CAAC;wBAAC,MAAM,CAAC,CAAA,CAAC;oBACZ,CAAC;gBACH,CAAC;YACH,CAAC;YAED,6DAA6D;YAC7D,uBAAuB,IAAI,YAAY,WAAW,CAAC,IAAI,IAAI,CAAC;YAC5D,uBAAuB,IAAI,YAAY,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;YACxF,uBAAuB,IAAI,KAAK,WAAW,IAAI,CAAC;YAChD,uBAAuB,IAAI,yBAAyB,CAAC;QACvD,CAAC;IACH,CAAC;IAED,OAAO,uBAAuB,CAAC;AACjC,CAAC"}
+{"version":3,"file":"license-extractor.js","sourceRoot":"","sources":["license-extractor.ts"],"names":[],"mappings":"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"}

package/src/tools/esbuild/load-result-cache.d.ts

@@ -7,8 +7,9 @@
  */
 import type { OnLoadResult, PluginBuild } from 'esbuild';
 export interface LoadResultCache {
-    get(path: string): OnLoadResult | undefined;
+    get(path: string): OnLoadResult | Promise<OnLoadResult | undefined> | undefined;
     put(path: string, result: OnLoadResult): Promise<void>;
+    invalidate(path: string): boolean;
     readonly watchFiles: ReadonlyArray<string>;
 }
 export declare function createCachedLoad(cache: LoadResultCache | undefined, callback: Parameters<PluginBuild['onLoad']>[1]): Parameters<PluginBuild['onLoad']>[1];

package/src/tools/esbuild/load-result-cache.js

@@ -16,7 +16,7 @@ function createCachedLoad(cache, callback) {
     }
     return async (args) => {
         const loadCacheKey = `${args.namespace}:${args.path}`;
-        let result = cache.get(loadCacheKey);
+        let result = await cache.get(loadCacheKey);
         if (result === undefined) {
             result = await callback(args);
             // Do not cache null or undefined
@@ -24,7 +24,9 @@ function createCachedLoad(cache, callback) {
                 // Ensure requested path is included if it was a resolved file
                 if (args.namespace === 'file') {
                     result.watchFiles ??= [];
-                    result.watchFiles.push(args.path);
+                    if (!result.watchFiles.includes(args.path)) {
+                        result.watchFiles.push(args.path);
+                    }
                 }
                 await cache.put(loadCacheKey, result);
             }
@@ -40,13 +42,29 @@ class MemoryLoadResultCache {
         return this.#loadResults.get(path);
     }
     async put(path, result) {
+        const previousWatchFiles = this.#watchFilesPerKey.get(path);
         if (result.errors && result.errors.length > 0) {
-            const previousWatchFiles = this.#watchFilesPerKey.get(path);
             if (previousWatchFiles) {
                 result.watchFiles = Array.from(new Set([...(result.watchFiles ?? []), ...previousWatchFiles]));
             }
         }
-        else if (result.watchFiles && result.watchFiles.length > 0) {
+        const currentNormalizedWatchFiles = new Set(result.watchFiles?.map(node_path_1.normalize) ?? []);
+        // Clean up any previous file dependencies that are no longer referenced
+        if (previousWatchFiles) {
+            for (const watchFile of previousWatchFiles) {
+                const normalizedWatchFile = (0, node_path_1.normalize)(watchFile);
+                if (!currentNormalizedWatchFiles.has(normalizedWatchFile)) {
+                    const affected = this.#fileDependencies.get(normalizedWatchFile);
+                    if (affected) {
+                        affected.delete(path);
+                        if (affected.size === 0) {
+                            this.#fileDependencies.delete(normalizedWatchFile);
+                        }
+                    }
+                }
+            }
+        }
+        if (result.watchFiles && result.watchFiles.length > 0) {
             this.#watchFilesPerKey.set(path, [...result.watchFiles]);
         }
         else {
@@ -68,16 +86,13 @@ class MemoryLoadResultCache {
     }
     invalidate(path) {
         const affectedPaths = this.#fileDependencies.get(path);
-        let found = false;
-        if (affectedPaths) {
-            for (const affected of affectedPaths) {
-                if (this.#loadResults.delete(affected)) {
-                    found = true;
-                }
-            }
-            this.#fileDependencies.delete(path);
+        if (!affectedPaths) {
+            return false;
+        }
+        for (const affected of affectedPaths) {
+            this.#loadResults.delete(affected);
         }
-        return found;
+        return true;
     }
     get watchFiles() {
         // this.#loadResults.keys() is not included here because the keys

package/src/tools/esbuild/load-result-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-result-cache.js","sourceRoot":"","sources":["load-result-cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"load-result-cache.js","sourceRoot":"","sources":["load-result-cache.ts"],"names":[],"mappings":"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"}

package/src/tools/esbuild/persistent-load-result-cache.d.ts

@@ -0,0 +1,87 @@
+/**
+ * @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.dev/license
+ */
+/**
+ * @fileoverview
+ * Implements a generic, two-tier (L1 memory + L2 persistent disk store) caching system for
+ * esbuild plugin `OnLoadResult` outcomes across the `@angular/build` compiler pipeline.
+ *
+ * Supported Module Types:
+ * 1. **Disk File Modules** (`file:` namespace): Standard disk-based source files (TS, JS, CSS, Sass, Less).
+ *    Cache keys are computed using the root `globalConfigHash`, file path, and file content. Validity is
+ *    verified via fast-path metadata (`mtimeMs` + `size`) with fallback to content hashing (`sha256`).
+ * 2. **Custom Plugin Namespace Modules** (e.g. `angular:script/global`, `sass:`): Modules loaded through
+ *    custom esbuild namespaces that resolve to disk source files.
+ * 3. **Virtual Modules & Remote Resources** (e.g. `angular:styles/component`, `css-inline-fonts`): Synthetic
+ *    in-memory modules or remote asset declarations whose compiled outcomes depend on parent source file
+ *    dependencies (`watchFiles`) or global configuration options (`globalConfigHash`).
+ *
+ * Key Exported Types:
+ * - {@link PersistentLoadResultCache}: Primary two-tier cache manager implementing `LoadResultCache`.
+ * - {@link CachedLoadResultEntry}: Serialized structure persisted to disk for cached esbuild `OnLoadResult` items.
+ * - {@link CachedDependencyMetadata}: Per-dependency file metadata (`hash`, `mtimeMs`, `size`) used for cache validation and healing.
+ */
+import type { Loader, OnLoadResult, PartialMessage } from 'esbuild';
+import type { Cache as PersistentCacheStore } from '../../utils/cache';
+import { LoadResultCache } from './load-result-cache';
+/**
+ * Metadata for a single watch file dependency.
+ */
+export interface CachedDependencyMetadata {
+    hash: string;
+    mtimeMs: number;
+    size: number;
+}
+/**
+ * Serialized representation of any esbuild load result stored in persistent cache.
+ */
+export interface CachedLoadResultEntry {
+    /** Compiled output string or binary data */
+    contents: string | Uint8Array;
+    /** esbuild loader type */
+    loader?: Loader;
+    /** Absolute paths of all imported/watched dependency files */
+    watchFiles: string[];
+    /** Absolute paths of all watched directories */
+    watchDirs?: string[];
+    /** Map of watchFile absolute paths to dependency metadata */
+    watchFilesMetadata: Record<string, CachedDependencyMetadata>;
+    /** Warnings emitted during load processing */
+    warnings?: PartialMessage[];
+    /** Errors emitted during load processing */
+    errors?: PartialMessage[];
+}
+/**
+ * Normalizes a namespaced cache key into a valid disk file path if one exists.
+ * Handles 'file:' URIs, OS platform differences, and custom plugin namespaces.
+ */
+export declare function extractDiskFilePath(path: string): string | undefined;
+export declare class PersistentLoadResultCache implements LoadResultCache {
+    private readonly persistentStore?;
+    private readonly globalConfigHash;
+    private readonly memoryCache;
+    constructor(persistentStore?: PersistentCacheStore<CachedLoadResultEntry> | undefined, globalConfigHash?: string);
+    /**
+     * Retrieves a load result from cache.
+     * Checks L1 memory cache first for immediate watch-mode speed, falling back to L2 persistent disk
+     * store on L1 cache miss. L2 persistent cache entries are validated against dependency metadata.
+     */
+    get(path: string): Promise<OnLoadResult | undefined>;
+    /**
+     * Stores a load result in both L1 memory cache and L2 persistent disk store.
+     */
+    put(path: string, result: OnLoadResult): Promise<void>;
+    /**
+     * Invalidates cached entries affected by a modified dependency file during watch mode.
+     *
+     * Note: Invalidation of L1 memory cache is sufficient for active watch mode.
+     * Cross-process/cold start stale entries in L2 persistent store are automatically handled
+     * during `get()` via dependency metadata verification (`validateAndHealCacheEntry`).
+     */
+    invalidate(path: string): boolean;
+    get watchFiles(): ReadonlyArray<string>;
+}