@angular-devkit/build-angular 17.0.0-next.5 → 17.0.0-next.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +5 -5
- package/src/builders/application/execute-build.js +18 -4
- package/src/builders/application/i18n.d.ts +25 -0
- package/src/builders/application/i18n.js +110 -0
- package/src/builders/application/index.js +12 -1
- package/src/builders/application/options.d.ts +5 -0
- package/src/builders/application/options.js +6 -3
- package/src/builders/browser-esbuild/builder-status-warnings.js +1 -6
- package/src/builders/dev-server/vite-server.js +20 -1
- package/src/builders/extract-i18n/application-extraction.js +2 -1
- package/src/tools/esbuild/angular/angular-host.d.ts +1 -0
- package/src/tools/esbuild/angular/angular-host.js +1 -1
- package/src/tools/esbuild/angular/compilation/aot-compilation.js +12 -6
- package/src/tools/esbuild/angular/compilation/jit-compilation.js +12 -5
- package/src/tools/esbuild/angular/compiler-plugin.js +48 -15
- package/src/tools/esbuild/angular/web-worker-transformer.d.ts +17 -0
- package/src/tools/esbuild/angular/web-worker-transformer.js +95 -0
- package/src/tools/esbuild/application-code-bundle.js +47 -3
- package/src/tools/esbuild/bundler-context.js +3 -3
- package/src/tools/esbuild/bundler-execution-result.d.ts +2 -2
- package/src/tools/esbuild/bundler-execution-result.js +1 -1
- package/src/tools/esbuild/i18n-inliner-worker.d.ts +37 -0
- package/src/tools/esbuild/i18n-inliner-worker.js +138 -0
- package/src/tools/esbuild/i18n-inliner.d.ts +40 -0
- package/src/tools/esbuild/i18n-inliner.js +119 -0
- package/src/tools/esbuild/i18n-locale-plugin.d.ts +18 -0
- package/src/tools/esbuild/i18n-locale-plugin.js +91 -0
- package/src/tools/esbuild/index-html-generator.d.ts +2 -2
- package/src/tools/esbuild/index-html-generator.js +4 -4
- package/src/tools/esbuild/utils.d.ts +2 -0
- package/src/tools/esbuild/utils.js +34 -2
- package/src/tools/esbuild/virtual-module-plugin.d.ts +2 -0
- package/src/tools/esbuild/virtual-module-plugin.js +3 -3
- package/src/tools/vite/i18n-locale-plugin.d.ts +18 -0
- package/src/tools/vite/i18n-locale-plugin.js +56 -0
- package/src/utils/routes-extractor/extractor.js +16 -12
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.io/license
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.createAngularLocaleDataPlugin = exports.LOCALE_DATA_BASE_MODULE = void 0;
|
|
11
|
+
/**
|
|
12
|
+
* The base module location used to search for locale specific data.
|
|
13
|
+
*/
|
|
14
|
+
exports.LOCALE_DATA_BASE_MODULE = '@angular/common/locales/global';
|
|
15
|
+
/**
|
|
16
|
+
* Creates a Vite plugin that resolves Angular locale data files from `@angular/common`.
|
|
17
|
+
*
|
|
18
|
+
* @returns A Vite plugin.
|
|
19
|
+
*/
|
|
20
|
+
function createAngularLocaleDataPlugin() {
|
|
21
|
+
return {
|
|
22
|
+
name: 'angular-locale-data',
|
|
23
|
+
enforce: 'pre',
|
|
24
|
+
async resolveId(source) {
|
|
25
|
+
if (!source.startsWith('angular:locale/data:')) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
// Extract the locale from the path
|
|
29
|
+
const originalLocale = source.split(':', 3)[2];
|
|
30
|
+
// Remove any private subtags since these will never match
|
|
31
|
+
let partialLocale = originalLocale.replace(/-x(-[a-zA-Z0-9]{1,8})+$/, '');
|
|
32
|
+
let exact = true;
|
|
33
|
+
while (partialLocale) {
|
|
34
|
+
const potentialPath = `${exports.LOCALE_DATA_BASE_MODULE}/${partialLocale}`;
|
|
35
|
+
const result = await this.resolve(potentialPath);
|
|
36
|
+
if (result) {
|
|
37
|
+
if (!exact) {
|
|
38
|
+
this.warn(`Locale data for '${originalLocale}' cannot be found. Using locale data for '${partialLocale}'.`);
|
|
39
|
+
}
|
|
40
|
+
return result;
|
|
41
|
+
}
|
|
42
|
+
// Remove the last subtag and try again with a less specific locale
|
|
43
|
+
const parts = partialLocale.split('-');
|
|
44
|
+
partialLocale = parts.slice(0, -1).join('-');
|
|
45
|
+
exact = false;
|
|
46
|
+
// The locales "en" and "en-US" are considered exact to retain existing behavior
|
|
47
|
+
if (originalLocale === 'en-US' && partialLocale === 'en') {
|
|
48
|
+
exact = true;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
return null;
|
|
52
|
+
},
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
exports.createAngularLocaleDataPlugin = createAngularLocaleDataPlugin;
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaTE4bi1sb2NhbGUtcGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYW5ndWxhcl9kZXZraXQvYnVpbGRfYW5ndWxhci9zcmMvdG9vbHMvdml0ZS9pMThuLWxvY2FsZS1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7R0FNRzs7O0FBSUg7O0dBRUc7QUFDVSxRQUFBLHVCQUF1QixHQUFHLGdDQUFnQyxDQUFDO0FBRXhFOzs7O0dBSUc7QUFDSCxTQUFnQiw2QkFBNkI7SUFDM0MsT0FBTztRQUNMLElBQUksRUFBRSxxQkFBcUI7UUFDM0IsT0FBTyxFQUFFLEtBQUs7UUFDZCxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU07WUFDcEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsc0JBQXNCLENBQUMsRUFBRTtnQkFDOUMsT0FBTzthQUNSO1lBRUQsbUNBQW1DO1lBQ25DLE1BQU0sY0FBYyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBRS9DLDBEQUEwRDtZQUMxRCxJQUFJLGFBQWEsR0FBRyxjQUFjLENBQUMsT0FBTyxDQUFDLHlCQUF5QixFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBRTFFLElBQUksS0FBSyxHQUFHLElBQUksQ0FBQztZQUNqQixPQUFPLGFBQWEsRUFBRTtnQkFDcEIsTUFBTSxhQUFhLEdBQUcsR0FBRywrQkFBdUIsSUFBSSxhQUFhLEVBQUUsQ0FBQztnQkFFcEUsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO2dCQUNqRCxJQUFJLE1BQU0sRUFBRTtvQkFDVixJQUFJLENBQUMsS0FBSyxFQUFFO3dCQUNWLElBQUksQ0FBQyxJQUFJLENBQ1Asb0JBQW9CLGNBQWMsNkNBQTZDLGFBQWEsSUFBSSxDQUNqRyxDQUFDO3FCQUNIO29CQUVELE9BQU8sTUFBTSxDQUFDO2lCQUNmO2dCQUVELG1FQUFtRTtnQkFDbkUsTUFBTSxLQUFLLEdBQUcsYUFBYSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztnQkFDdkMsYUFBYSxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUM3QyxLQUFLLEdBQUcsS0FBSyxDQUFDO2dCQUNkLGdGQUFnRjtnQkFDaEYsSUFBSSxjQUFjLEtBQUssT0FBTyxJQUFJLGFBQWEsS0FBSyxJQUFJLEVBQUU7b0JBQ3hELEtBQUssR0FBRyxJQUFJLENBQUM7aUJBQ2Q7YUFDRjtZQUVELE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQztLQUNGLENBQUM7QUFDSixDQUFDO0FBM0NELHNFQTJDQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgdHlwZSB7IFBsdWdpbiB9IGZyb20gJ3ZpdGUnO1xuXG4vKipcbiAqIFRoZSBiYXNlIG1vZHVsZSBsb2NhdGlvbiB1c2VkIHRvIHNlYXJjaCBmb3IgbG9jYWxlIHNwZWNpZmljIGRhdGEuXG4gKi9cbmV4cG9ydCBjb25zdCBMT0NBTEVfREFUQV9CQVNFX01PRFVMRSA9ICdAYW5ndWxhci9jb21tb24vbG9jYWxlcy9nbG9iYWwnO1xuXG4vKipcbiAqIENyZWF0ZXMgYSBWaXRlIHBsdWdpbiB0aGF0IHJlc29sdmVzIEFuZ3VsYXIgbG9jYWxlIGRhdGEgZmlsZXMgZnJvbSBgQGFuZ3VsYXIvY29tbW9uYC5cbiAqXG4gKiBAcmV0dXJucyBBIFZpdGUgcGx1Z2luLlxuICovXG5leHBvcnQgZnVuY3Rpb24gY3JlYXRlQW5ndWxhckxvY2FsZURhdGFQbHVnaW4oKTogUGx1Z2luIHtcbiAgcmV0dXJuIHtcbiAgICBuYW1lOiAnYW5ndWxhci1sb2NhbGUtZGF0YScsXG4gICAgZW5mb3JjZTogJ3ByZScsXG4gICAgYXN5bmMgcmVzb2x2ZUlkKHNvdXJjZSkge1xuICAgICAgaWYgKCFzb3VyY2Uuc3RhcnRzV2l0aCgnYW5ndWxhcjpsb2NhbGUvZGF0YTonKSkge1xuICAgICAgICByZXR1cm47XG4gICAgICB9XG5cbiAgICAgIC8vIEV4dHJhY3QgdGhlIGxvY2FsZSBmcm9tIHRoZSBwYXRoXG4gICAgICBjb25zdCBvcmlnaW5hbExvY2FsZSA9IHNvdXJjZS5zcGxpdCgnOicsIDMpWzJdO1xuXG4gICAgICAvLyBSZW1vdmUgYW55IHByaXZhdGUgc3VidGFncyBzaW5jZSB0aGVzZSB3aWxsIG5ldmVyIG1hdGNoXG4gICAgICBsZXQgcGFydGlhbExvY2FsZSA9IG9yaWdpbmFsTG9jYWxlLnJlcGxhY2UoLy14KC1bYS16QS1aMC05XXsxLDh9KSskLywgJycpO1xuXG4gICAgICBsZXQgZXhhY3QgPSB0cnVlO1xuICAgICAgd2hpbGUgKHBhcnRpYWxMb2NhbGUpIHtcbiAgICAgICAgY29uc3QgcG90ZW50aWFsUGF0aCA9IGAke0xPQ0FMRV9EQVRBX0JBU0VfTU9EVUxFfS8ke3BhcnRpYWxMb2NhbGV9YDtcblxuICAgICAgICBjb25zdCByZXN1bHQgPSBhd2FpdCB0aGlzLnJlc29sdmUocG90ZW50aWFsUGF0aCk7XG4gICAgICAgIGlmIChyZXN1bHQpIHtcbiAgICAgICAgICBpZiAoIWV4YWN0KSB7XG4gICAgICAgICAgICB0aGlzLndhcm4oXG4gICAgICAgICAgICAgIGBMb2NhbGUgZGF0YSBmb3IgJyR7b3JpZ2luYWxMb2NhbGV9JyBjYW5ub3QgYmUgZm91bmQuIFVzaW5nIGxvY2FsZSBkYXRhIGZvciAnJHtwYXJ0aWFsTG9jYWxlfScuYCxcbiAgICAgICAgICAgICk7XG4gICAgICAgICAgfVxuXG4gICAgICAgICAgcmV0dXJuIHJlc3VsdDtcbiAgICAgICAgfVxuXG4gICAgICAgIC8vIFJlbW92ZSB0aGUgbGFzdCBzdWJ0YWcgYW5kIHRyeSBhZ2FpbiB3aXRoIGEgbGVzcyBzcGVjaWZpYyBsb2NhbGVcbiAgICAgICAgY29uc3QgcGFydHMgPSBwYXJ0aWFsTG9jYWxlLnNwbGl0KCctJyk7XG4gICAgICAgIHBhcnRpYWxMb2NhbGUgPSBwYXJ0cy5zbGljZSgwLCAtMSkuam9pbignLScpO1xuICAgICAgICBleGFjdCA9IGZhbHNlO1xuICAgICAgICAvLyBUaGUgbG9jYWxlcyBcImVuXCIgYW5kIFwiZW4tVVNcIiBhcmUgY29uc2lkZXJlZCBleGFjdCB0byByZXRhaW4gZXhpc3RpbmcgYmVoYXZpb3JcbiAgICAgICAgaWYgKG9yaWdpbmFsTG9jYWxlID09PSAnZW4tVVMnICYmIHBhcnRpYWxMb2NhbGUgPT09ICdlbicpIHtcbiAgICAgICAgICBleGFjdCA9IHRydWU7XG4gICAgICAgIH1cbiAgICAgIH1cblxuICAgICAgcmV0dXJuIG51bGw7XG4gICAgfSxcbiAgfTtcbn1cbiJdfQ==
|
|
@@ -5,20 +5,17 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
|
-
import { ApplicationRef, createPlatformFactory, platformCore } from '@angular/core';
|
|
8
|
+
import { ApplicationRef, Compiler, createPlatformFactory, platformCore, } from '@angular/core';
|
|
9
9
|
import { INITIAL_CONFIG, ɵINTERNAL_SERVER_PLATFORM_PROVIDERS as INTERNAL_SERVER_PLATFORM_PROVIDERS, } from '@angular/platform-server';
|
|
10
|
-
import { Router,
|
|
10
|
+
import { Router, ɵloadChildren as loadChildrenHelper } from '@angular/router';
|
|
11
11
|
import { first } from 'rxjs/operators'; // Import from `/operators` to support rxjs 6 which is still supported by the Framework.
|
|
12
|
-
|
|
13
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
14
|
-
const RouterConfigLoader = ɵROUTER_PROVIDERS[5];
|
|
15
|
-
async function* getRoutesFromRouterConfig(routes, routerConfigLoader, injector, parent = '') {
|
|
12
|
+
async function* getRoutesFromRouterConfig(routes, compiler, parentInjector, parentRoute = '') {
|
|
16
13
|
for (const route of routes) {
|
|
17
14
|
const { path, redirectTo, loadChildren, children } = route;
|
|
18
15
|
if (path === undefined) {
|
|
19
16
|
continue;
|
|
20
17
|
}
|
|
21
|
-
const currentRoutePath = buildRoutePath(
|
|
18
|
+
const currentRoutePath = buildRoutePath(parentRoute, path);
|
|
22
19
|
if (redirectTo !== undefined) {
|
|
23
20
|
// TODO: handle `redirectTo`.
|
|
24
21
|
yield { route: currentRoutePath, success: false, redirect: true };
|
|
@@ -30,8 +27,15 @@ async function* getRoutesFromRouterConfig(routes, routerConfigLoader, injector,
|
|
|
30
27
|
continue;
|
|
31
28
|
}
|
|
32
29
|
yield { route: currentRoutePath, success: true, redirect: false };
|
|
33
|
-
if (children?.length
|
|
34
|
-
yield* getRoutesFromRouterConfig(children
|
|
30
|
+
if (children?.length) {
|
|
31
|
+
yield* getRoutesFromRouterConfig(children, compiler, parentInjector, currentRoutePath);
|
|
32
|
+
}
|
|
33
|
+
if (loadChildren) {
|
|
34
|
+
const loadedChildRoutes = await loadChildrenHelper(route, compiler, parentInjector).toPromise();
|
|
35
|
+
if (loadedChildRoutes) {
|
|
36
|
+
const { routes: childRoutes, injector = parentInjector } = loadedChildRoutes;
|
|
37
|
+
yield* getRoutesFromRouterConfig(childRoutes, compiler, injector, currentRoutePath);
|
|
38
|
+
}
|
|
35
39
|
}
|
|
36
40
|
}
|
|
37
41
|
}
|
|
@@ -58,9 +62,9 @@ export async function* extractRoutes(bootstrapAppFnOrModule, document) {
|
|
|
58
62
|
await applicationRef.isStable.pipe(first((isStable) => isStable)).toPromise();
|
|
59
63
|
const injector = applicationRef.injector;
|
|
60
64
|
const router = injector.get(Router);
|
|
61
|
-
const
|
|
65
|
+
const compiler = injector.get(Compiler);
|
|
62
66
|
// Extract all the routes from the config.
|
|
63
|
-
yield* getRoutesFromRouterConfig(router.config,
|
|
67
|
+
yield* getRoutesFromRouterConfig(router.config, compiler, injector);
|
|
64
68
|
}
|
|
65
69
|
finally {
|
|
66
70
|
platformRef.destroy();
|
|
@@ -73,4 +77,4 @@ function isBootstrapFn(value) {
|
|
|
73
77
|
function buildRoutePath(...routeParts) {
|
|
74
78
|
return routeParts.filter(Boolean).join('/');
|
|
75
79
|
}
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"extractor.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular_devkit/build_angular/src/utils/routes-extractor/extractor.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {\n  ApplicationRef,\n  Compiler,\n  Injector,\n  Type,\n  createPlatformFactory,\n  platformCore,\n} from '@angular/core';\nimport {\n  INITIAL_CONFIG,\n  ɵINTERNAL_SERVER_PLATFORM_PROVIDERS as INTERNAL_SERVER_PLATFORM_PROVIDERS,\n} from '@angular/platform-server';\nimport { Route, Router, ɵloadChildren as loadChildrenHelper } from '@angular/router';\nimport { first } from 'rxjs/operators'; // Import from `/operators` to support rxjs 6 which is still supported by the Framework.\n\ninterface RouterResult {\n  route: string;\n  success: boolean;\n  redirect: boolean;\n}\n\nasync function* getRoutesFromRouterConfig(\n  routes: Route[],\n  compiler: Compiler,\n  parentInjector: Injector,\n  parentRoute = '',\n): AsyncIterableIterator<RouterResult> {\n  for (const route of routes) {\n    const { path, redirectTo, loadChildren, children } = route;\n    if (path === undefined) {\n      continue;\n    }\n\n    const currentRoutePath = buildRoutePath(parentRoute, path);\n\n    if (redirectTo !== undefined) {\n      // TODO: handle `redirectTo`.\n      yield { route: currentRoutePath, success: false, redirect: true };\n      continue;\n    }\n\n    if (/[:*]/.test(path)) {\n      // TODO: handle parameterized routes population.\n      yield { route: currentRoutePath, success: false, redirect: false };\n      continue;\n    }\n\n    yield { route: currentRoutePath, success: true, redirect: false };\n\n    if (children?.length) {\n      yield* getRoutesFromRouterConfig(children, compiler, parentInjector, currentRoutePath);\n    }\n\n    if (loadChildren) {\n      const loadedChildRoutes = await loadChildrenHelper(\n        route,\n        compiler,\n        parentInjector,\n      ).toPromise();\n\n      if (loadedChildRoutes) {\n        const { routes: childRoutes, injector = parentInjector } = loadedChildRoutes;\n        yield* getRoutesFromRouterConfig(childRoutes, compiler, injector, currentRoutePath);\n      }\n    }\n  }\n}\n\nexport async function* extractRoutes(\n  bootstrapAppFnOrModule: (() => Promise<ApplicationRef>) | Type<unknown>,\n  document: string,\n): AsyncIterableIterator<RouterResult> {\n  const platformRef = createPlatformFactory(platformCore, 'server', [\n    [\n      {\n        provide: INITIAL_CONFIG,\n        useValue: { document, url: '' },\n      },\n    ],\n    ...INTERNAL_SERVER_PLATFORM_PROVIDERS,\n  ])();\n\n  try {\n    let applicationRef: ApplicationRef;\n    if (isBootstrapFn(bootstrapAppFnOrModule)) {\n      applicationRef = await bootstrapAppFnOrModule();\n    } else {\n      const moduleRef = await platformRef.bootstrapModule(bootstrapAppFnOrModule);\n      applicationRef = moduleRef.injector.get(ApplicationRef);\n    }\n\n    // Wait until the application is stable.\n    await applicationRef.isStable.pipe(first((isStable) => isStable)).toPromise();\n\n    const injector = applicationRef.injector;\n    const router = injector.get(Router);\n    const compiler = injector.get(Compiler);\n\n    // Extract all the routes from the config.\n    yield* getRoutesFromRouterConfig(router.config, compiler, injector);\n  } finally {\n    platformRef.destroy();\n  }\n}\n\nfunction isBootstrapFn(value: unknown): value is () => Promise<ApplicationRef> {\n  // We can differentiate between a module and a bootstrap function by reading compiler-generated `ɵmod` static property:\n  return typeof value === 'function' && !('ɵmod' in value);\n}\n\nfunction buildRoutePath(...routeParts: string[]): string {\n  return routeParts.filter(Boolean).join('/');\n}\n"]}
|