@depup/angular__build 21.2.6-depup.2 → 22.0.7-depup.0
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/README.md +19 -12
- package/changes.json +51 -23
- package/package.json +89 -60
- package/src/builders/application/build-action.js +61 -46
- package/src/builders/application/build-action.js.map +1 -1
- package/src/builders/application/chunk-optimizer.js +104 -45
- package/src/builders/application/chunk-optimizer.js.map +1 -1
- package/src/builders/application/execute-build.js +33 -9
- package/src/builders/application/execute-build.js.map +1 -1
- package/src/builders/application/execute-post-bundle.d.ts +2 -2
- package/src/builders/application/execute-post-bundle.js +6 -7
- package/src/builders/application/execute-post-bundle.js.map +1 -1
- package/src/builders/application/i18n.d.ts +1 -1
- package/src/builders/application/i18n.js +2 -2
- package/src/builders/application/i18n.js.map +1 -1
- package/src/builders/application/index.js +49 -40
- package/src/builders/application/index.js.map +1 -1
- package/src/builders/application/options.d.ts +8 -3
- package/src/builders/application/options.js +5 -5
- package/src/builders/application/options.js.map +1 -1
- package/src/builders/application/results.d.ts +1 -1
- package/src/builders/application/schema.d.ts +2 -6
- package/src/builders/application/schema.js +6 -8
- package/src/builders/application/schema.js.map +1 -1
- package/src/builders/application/schema.json +2 -2
- package/src/builders/dev-server/internal.d.ts +1 -1
- package/src/builders/dev-server/internal.js +2 -2
- package/src/builders/dev-server/internal.js.map +1 -1
- package/src/builders/dev-server/options.js +11 -2
- package/src/builders/dev-server/options.js.map +1 -1
- package/src/builders/dev-server/vite/server.js +0 -3
- package/src/builders/dev-server/vite/server.js.map +1 -1
- package/src/builders/karma/application_builder.js +9 -0
- package/src/builders/karma/application_builder.js.map +1 -1
- package/src/builders/karma/progress-reporter.js +1 -3
- package/src/builders/karma/progress-reporter.js.map +1 -1
- package/src/builders/unit-test/builder.js +10 -4
- package/src/builders/unit-test/builder.js.map +1 -1
- package/src/builders/unit-test/options.d.ts +3 -0
- package/src/builders/unit-test/options.js +7 -1
- package/src/builders/unit-test/options.js.map +1 -1
- package/src/builders/unit-test/runners/dependency-checker.js +2 -2
- package/src/builders/unit-test/runners/dependency-checker.js.map +1 -1
- package/src/builders/unit-test/runners/karma/executor.js +1 -1
- package/src/builders/unit-test/runners/karma/executor.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/browser-provider.d.ts +1 -0
- package/src/builders/unit-test/runners/vitest/browser-provider.js +3 -2
- package/src/builders/unit-test/runners/vitest/browser-provider.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/build-options.d.ts +10 -0
- package/src/builders/unit-test/runners/vitest/build-options.js +125 -8
- package/src/builders/unit-test/runners/vitest/build-options.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/executor.js +3 -1
- package/src/builders/unit-test/runners/vitest/executor.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/index.js +1 -1
- package/src/builders/unit-test/runners/vitest/index.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/plugins.d.ts +2 -0
- package/src/builders/unit-test/runners/vitest/plugins.js +88 -31
- package/src/builders/unit-test/runners/vitest/plugins.js.map +1 -1
- package/src/builders/unit-test/schema.d.ts +13 -2
- package/src/builders/unit-test/schema.js.map +1 -1
- package/src/builders/unit-test/schema.json +9 -1
- package/src/index.d.ts +1 -1
- package/src/index.js +2 -2
- package/src/index.js.map +1 -1
- package/src/tools/angular/angular-host.js +11 -8
- package/src/tools/angular/angular-host.js.map +1 -1
- package/src/tools/angular/compilation/aot-compilation.js +1 -1
- package/src/tools/angular/compilation/aot-compilation.js.map +1 -1
- package/src/tools/angular/compilation/jit-compilation.js.map +1 -1
- package/src/tools/angular/compilation/parallel-compilation.js +7 -2
- package/src/tools/angular/compilation/parallel-compilation.js.map +1 -1
- package/src/tools/angular/compilation/parallel-worker.d.ts +1 -0
- package/src/tools/angular/compilation/parallel-worker.js +6 -1
- package/src/tools/angular/compilation/parallel-worker.js.map +1 -1
- package/src/tools/babel/plugins/add-code-coverage.d.ts +1 -1
- package/src/tools/babel/plugins/add-code-coverage.js +2 -3
- package/src/tools/babel/plugins/add-code-coverage.js.map +1 -1
- package/src/tools/babel/plugins/elide-angular-metadata.d.ts +4 -2
- package/src/tools/babel/plugins/elide-angular-metadata.js +2 -2
- package/src/tools/babel/plugins/elide-angular-metadata.js.map +1 -1
- package/src/tools/esbuild/angular/component-stylesheets.js +2 -1
- package/src/tools/esbuild/angular/component-stylesheets.js.map +1 -1
- package/src/tools/esbuild/angular-localize-init-warning-plugin.js +3 -0
- package/src/tools/esbuild/angular-localize-init-warning-plugin.js.map +1 -1
- package/src/tools/esbuild/application-code-bundle.js +14 -12
- package/src/tools/esbuild/application-code-bundle.js.map +1 -1
- package/src/tools/esbuild/budget-stats.d.ts +1 -1
- package/src/tools/esbuild/budget-stats.js +2 -2
- package/src/tools/esbuild/budget-stats.js.map +1 -1
- package/src/tools/esbuild/bundler-context.d.ts +2 -21
- package/src/tools/esbuild/bundler-context.js +35 -31
- package/src/tools/esbuild/bundler-context.js.map +1 -1
- package/src/tools/esbuild/bundler-execution-result.d.ts +3 -2
- package/src/tools/esbuild/bundler-execution-result.js +2 -2
- package/src/tools/esbuild/bundler-execution-result.js.map +1 -1
- package/src/tools/esbuild/bundler-files.d.ts +30 -0
- package/src/tools/esbuild/bundler-files.js +113 -0
- package/src/tools/esbuild/bundler-files.js.map +1 -0
- package/src/tools/esbuild/cache.d.ts +5 -0
- package/src/tools/esbuild/cache.js +82 -6
- package/src/tools/esbuild/cache.js.map +1 -1
- package/src/tools/esbuild/i18n-inliner-worker.js +3 -1
- package/src/tools/esbuild/i18n-inliner-worker.js.map +1 -1
- package/src/tools/esbuild/i18n-inliner.d.ts +1 -1
- package/src/tools/esbuild/i18n-inliner.js +4 -5
- package/src/tools/esbuild/i18n-inliner.js.map +1 -1
- package/src/tools/esbuild/i18n-locale-plugin.js +16 -4
- package/src/tools/esbuild/i18n-locale-plugin.js.map +1 -1
- package/src/tools/esbuild/index-html-generator.d.ts +1 -1
- package/src/tools/esbuild/index-html-generator.js +19 -2
- package/src/tools/esbuild/index-html-generator.js.map +1 -1
- package/src/tools/esbuild/javascript-transformer-worker.js +21 -2
- package/src/tools/esbuild/javascript-transformer-worker.js.map +1 -1
- package/src/tools/esbuild/javascript-transformer.js +84 -41
- package/src/tools/esbuild/javascript-transformer.js.map +1 -1
- package/src/tools/esbuild/profiling.d.ts +2 -0
- package/src/tools/esbuild/profiling.js +21 -0
- package/src/tools/esbuild/profiling.js.map +1 -1
- package/src/tools/esbuild/utils.d.ts +3 -15
- package/src/tools/esbuild/utils.js +5 -115
- package/src/tools/esbuild/utils.js.map +1 -1
- package/src/tools/esbuild/watcher.js +1 -1
- package/src/tools/esbuild/watcher.js.map +1 -1
- package/src/tools/vite/plugins/id-prefix-plugin.d.ts +7 -0
- package/src/tools/vite/plugins/id-prefix-plugin.js +23 -9
- package/src/tools/vite/plugins/id-prefix-plugin.js.map +1 -1
- package/src/tools/vite/plugins/ssr-ssl-plugin.js +2 -56
- package/src/tools/vite/plugins/ssr-ssl-plugin.js.map +1 -1
- package/src/tools/vite/utils.js +3 -3
- package/src/tools/vite/utils.js.map +1 -1
- package/src/utils/environment-options.d.ts +6 -4
- package/src/utils/environment-options.js +28 -2
- package/src/utils/environment-options.js.map +1 -1
- package/src/utils/index-file/augment-index-html.d.ts +14 -0
- package/src/utils/index-file/augment-index-html.js +22 -1
- package/src/utils/index-file/augment-index-html.js.map +1 -1
- package/src/utils/index-file/index-html-generator.d.ts +6 -0
- package/src/utils/index-file/index-html-generator.js +2 -1
- package/src/utils/index-file/index-html-generator.js.map +1 -1
- package/src/utils/index-file/inline-fonts.js +45 -2
- package/src/utils/index-file/inline-fonts.js.map +1 -1
- package/src/utils/normalize-asset-patterns.js +5 -1
- package/src/utils/normalize-asset-patterns.js.map +1 -1
- package/src/utils/normalize-cache.js +1 -1
- package/src/utils/path.d.ts +8 -0
- package/src/utils/path.js +14 -0
- package/src/utils/path.js.map +1 -1
- package/src/utils/resolve-assets.js +4 -0
- package/src/utils/resolve-assets.js.map +1 -1
- package/src/utils/resolve-project.d.ts +15 -0
- package/src/utils/resolve-project.js +24 -0
- package/src/utils/resolve-project.js.map +1 -0
- package/src/utils/server-rendering/manifest.d.ts +10 -1
- package/src/utils/server-rendering/manifest.js +17 -7
- package/src/utils/server-rendering/manifest.js.map +1 -1
- package/src/utils/server-rendering/prerender.d.ts +1 -1
- package/src/utils/server-rendering/prerender.js +2 -2
- package/src/utils/server-rendering/prerender.js.map +1 -1
- package/src/utils/server-rendering/utils.d.ts +3 -1
- package/src/utils/server-rendering/utils.js.map +1 -1
- package/src/utils/service-worker.d.ts +4 -2
- package/src/utils/service-worker.js +4 -4
- package/src/utils/service-worker.js.map +1 -1
- package/src/utils/test-files.js +2 -2
- package/src/utils/test-files.js.map +1 -1
- package/src/utils/version.js +1 -1
|
@@ -6,23 +6,57 @@
|
|
|
6
6
|
* Use of this source code is governed by an MIT-style license that can be
|
|
7
7
|
* found in the LICENSE file at https://angular.dev/license
|
|
8
8
|
*/
|
|
9
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
12
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
13
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
14
|
+
}
|
|
15
|
+
Object.defineProperty(o, k2, desc);
|
|
16
|
+
}) : (function(o, m, k, k2) {
|
|
17
|
+
if (k2 === undefined) k2 = k;
|
|
18
|
+
o[k2] = m[k];
|
|
19
|
+
}));
|
|
20
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
21
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
22
|
+
}) : function(o, v) {
|
|
23
|
+
o["default"] = v;
|
|
24
|
+
});
|
|
25
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
26
|
+
var ownKeys = function(o) {
|
|
27
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
28
|
+
var ar = [];
|
|
29
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
30
|
+
return ar;
|
|
31
|
+
};
|
|
32
|
+
return ownKeys(o);
|
|
33
|
+
};
|
|
34
|
+
return function (mod) {
|
|
35
|
+
if (mod && mod.__esModule) return mod;
|
|
36
|
+
var result = {};
|
|
37
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
38
|
+
__setModuleDefault(result, mod);
|
|
39
|
+
return result;
|
|
40
|
+
};
|
|
41
|
+
})();
|
|
9
42
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
10
43
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
11
44
|
};
|
|
12
45
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
46
|
exports.optimizeChunks = optimizeChunks;
|
|
14
47
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
const
|
|
48
|
+
const rollup_1 = require("rollup");
|
|
49
|
+
const bundler_files_1 = require("../../tools/esbuild/bundler-files");
|
|
50
|
+
const environment_options_1 = require("../../utils/environment-options");
|
|
18
51
|
const error_1 = require("../../utils/error");
|
|
52
|
+
const path_1 = require("../../utils/path");
|
|
19
53
|
/**
|
|
20
|
-
* Converts the output of a
|
|
21
|
-
* @param
|
|
54
|
+
* Converts the output of a bundle build into an esbuild-compatible metafile.
|
|
55
|
+
* @param bundleOutput The output of a bundle build.
|
|
22
56
|
* @param originalMetafile The original esbuild metafile from the build.
|
|
23
57
|
* @returns An esbuild-compatible metafile.
|
|
24
58
|
*/
|
|
25
|
-
function
|
|
59
|
+
function bundleOutputToEsbuildMetafile(bundleOutput, originalMetafile) {
|
|
26
60
|
const newMetafile = {
|
|
27
61
|
inputs: originalMetafile.inputs,
|
|
28
62
|
outputs: {},
|
|
@@ -31,7 +65,7 @@ function rolldownToEsbuildMetafile(rolldownOutput, originalMetafile) {
|
|
|
31
65
|
for (const [path, output] of Object.entries(originalMetafile.outputs)) {
|
|
32
66
|
intermediateChunkSizes[path] = Object.values(output.inputs).reduce((s, i) => s + i.bytesInOutput, 0);
|
|
33
67
|
}
|
|
34
|
-
for (const chunk of
|
|
68
|
+
for (const chunk of bundleOutput) {
|
|
35
69
|
if (chunk.type === 'asset') {
|
|
36
70
|
newMetafile.outputs[chunk.fileName] = {
|
|
37
71
|
bytes: typeof chunk.source === 'string'
|
|
@@ -74,14 +108,22 @@ function rolldownToEsbuildMetafile(rolldownOutput, originalMetafile) {
|
|
|
74
108
|
...chunk.imports.map((path) => ({ path, kind: 'import-statement' })),
|
|
75
109
|
...(chunk.dynamicImports?.map((path) => ({ path, kind: 'dynamic-import' })) ?? []),
|
|
76
110
|
];
|
|
111
|
+
let entryPoint;
|
|
112
|
+
if (chunk.facadeModuleId) {
|
|
113
|
+
const posixFacadeModuleId = (0, path_1.toPosixPath)(chunk.facadeModuleId);
|
|
114
|
+
for (const [outputPath, output] of Object.entries(originalMetafile.outputs)) {
|
|
115
|
+
if (posixFacadeModuleId.endsWith(outputPath)) {
|
|
116
|
+
entryPoint = output.entryPoint;
|
|
117
|
+
break;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
77
121
|
newMetafile.outputs[chunk.fileName] = {
|
|
78
122
|
bytes: Buffer.byteLength(chunk.code, 'utf8'),
|
|
79
123
|
inputs: newOutputInputs,
|
|
80
124
|
imports,
|
|
81
125
|
exports: chunk.exports ?? [],
|
|
82
|
-
entryPoint
|
|
83
|
-
? originalMetafile.outputs[chunk.facadeModuleId]?.entryPoint
|
|
84
|
-
: undefined,
|
|
126
|
+
entryPoint,
|
|
85
127
|
};
|
|
86
128
|
}
|
|
87
129
|
return newMetafile;
|
|
@@ -133,6 +175,7 @@ function createChunkOptimizationFailureMessage(message) {
|
|
|
133
175
|
* @param sourcemap A boolean or 'hidden' to control sourcemap generation.
|
|
134
176
|
* @returns A promise that resolves to the updated build result with optimized chunks.
|
|
135
177
|
*/
|
|
178
|
+
// eslint-disable-next-line max-lines-per-function
|
|
136
179
|
async function optimizeChunks(original, sourcemap) {
|
|
137
180
|
// Failed builds cannot be optimized
|
|
138
181
|
if (original.errors) {
|
|
@@ -156,7 +199,7 @@ async function optimizeChunks(original, sourcemap) {
|
|
|
156
199
|
const chunks = {};
|
|
157
200
|
const maps = {};
|
|
158
201
|
for (const originalFile of original.outputFiles) {
|
|
159
|
-
if (originalFile.type !==
|
|
202
|
+
if (originalFile.type !== bundler_files_1.BuildOutputFileType.Browser) {
|
|
160
203
|
continue;
|
|
161
204
|
}
|
|
162
205
|
if (originalFile.path.endsWith('.js')) {
|
|
@@ -171,38 +214,54 @@ async function optimizeChunks(original, sourcemap) {
|
|
|
171
214
|
let bundle;
|
|
172
215
|
let optimizedOutput;
|
|
173
216
|
try {
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
{
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
// All other identifiers are considered external to maintain behavior
|
|
186
|
-
return { id: source, external: true };
|
|
187
|
-
},
|
|
188
|
-
load(id) {
|
|
189
|
-
(0, node_assert_1.default)(chunks[id], `Angular chunk content should always be present in chunk optimizer [${id}].`);
|
|
190
|
-
usedChunks.add(id);
|
|
191
|
-
const result = {
|
|
192
|
-
code: chunks[id].text,
|
|
193
|
-
map: maps[id]?.text,
|
|
194
|
-
};
|
|
195
|
-
return result;
|
|
196
|
-
},
|
|
217
|
+
const plugins = [
|
|
218
|
+
{
|
|
219
|
+
name: 'angular-bundle',
|
|
220
|
+
resolveId(source) {
|
|
221
|
+
// Remove leading `./` if present
|
|
222
|
+
const file = source[0] === '.' && source[1] === '/' ? source.slice(2) : source;
|
|
223
|
+
if (chunks[file]) {
|
|
224
|
+
return file;
|
|
225
|
+
}
|
|
226
|
+
// All other identifiers are considered external to maintain behavior
|
|
227
|
+
return { id: source, external: true };
|
|
197
228
|
},
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
229
|
+
load(id) {
|
|
230
|
+
(0, node_assert_1.default)(chunks[id], `Angular chunk content should always be present in chunk optimizer [${id}].`);
|
|
231
|
+
usedChunks.add(id);
|
|
232
|
+
const result = {
|
|
233
|
+
code: chunks[id].text,
|
|
234
|
+
map: maps[id]?.text,
|
|
235
|
+
};
|
|
236
|
+
return result;
|
|
237
|
+
},
|
|
238
|
+
},
|
|
239
|
+
];
|
|
240
|
+
if (environment_options_1.useRolldownChunks) {
|
|
241
|
+
const { rolldown } = await Promise.resolve().then(() => __importStar(require('rolldown')));
|
|
242
|
+
bundle = await rolldown({
|
|
243
|
+
input: mainFile,
|
|
244
|
+
plugins,
|
|
245
|
+
});
|
|
246
|
+
const result = await bundle.generate({
|
|
247
|
+
minify: { mangle: false, compress: false },
|
|
248
|
+
sourcemap,
|
|
249
|
+
chunkFileNames: (chunkInfo) => `${chunkInfo.name.replace(/-[a-zA-Z0-9]{8}$/, '')}-[hash].js`,
|
|
250
|
+
});
|
|
251
|
+
optimizedOutput = result.output;
|
|
252
|
+
}
|
|
253
|
+
else {
|
|
254
|
+
bundle = await (0, rollup_1.rollup)({
|
|
255
|
+
input: mainFile,
|
|
256
|
+
plugins: plugins,
|
|
257
|
+
});
|
|
258
|
+
const result = await bundle.generate({
|
|
259
|
+
compact: true,
|
|
260
|
+
sourcemap,
|
|
261
|
+
chunkFileNames: (chunkInfo) => `${chunkInfo.name.replace(/-[a-zA-Z0-9]{8}$/, '')}-[hash].js`,
|
|
262
|
+
});
|
|
263
|
+
optimizedOutput = result.output;
|
|
264
|
+
}
|
|
206
265
|
}
|
|
207
266
|
catch (e) {
|
|
208
267
|
(0, error_1.assertIsError)(e);
|
|
@@ -215,7 +274,7 @@ async function optimizeChunks(original, sourcemap) {
|
|
|
215
274
|
await bundle?.close();
|
|
216
275
|
}
|
|
217
276
|
// Update metafile
|
|
218
|
-
const newMetafile =
|
|
277
|
+
const newMetafile = bundleOutputToEsbuildMetafile(optimizedOutput, original.metafile);
|
|
219
278
|
// Add back the outputs that were not part of the optimization
|
|
220
279
|
for (const [path, output] of Object.entries(original.metafile.outputs)) {
|
|
221
280
|
if (usedChunks.has(path)) {
|
|
@@ -239,9 +298,9 @@ async function optimizeChunks(original, sourcemap) {
|
|
|
239
298
|
continue;
|
|
240
299
|
}
|
|
241
300
|
importsPerFile[optimizedFile.fileName] = optimizedFile.imports;
|
|
242
|
-
original.outputFiles.push((0,
|
|
301
|
+
original.outputFiles.push((0, bundler_files_1.createOutputFile)(optimizedFile.fileName, optimizedFile.code, bundler_files_1.BuildOutputFileType.Browser));
|
|
243
302
|
if (optimizedFile.map && optimizedFile.sourcemapFileName) {
|
|
244
|
-
original.outputFiles.push((0,
|
|
303
|
+
original.outputFiles.push((0, bundler_files_1.createOutputFile)(optimizedFile.sourcemapFileName, optimizedFile.map.toString(), bundler_files_1.BuildOutputFileType.Browser));
|
|
245
304
|
}
|
|
246
305
|
}
|
|
247
306
|
// Update initial files to reflect optimized chunks
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunk-optimizer.js","sourceRoot":"","sources":["chunk-optimizer.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG
|
|
1
|
+
{"version":3,"file":"chunk-optimizer.js","sourceRoot":"","sources":["chunk-optimizer.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+MH,wCA2MC;AA5YD,8DAAiC;AACjC,mCAA6C;AAE7C,qEAK2C;AAC3C,yEAAoE;AACpE,6CAAkD;AAClD,2CAA+C;AAkC/C;;;;;GAKG;AACH,SAAS,6BAA6B,CACpC,YAA2C,EAC3C,gBAA0B;IAE1B,MAAM,WAAW,GAAa;QAC5B,MAAM,EAAE,gBAAgB,CAAC,MAAM;QAC/B,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,sBAAsB,GAA2B,EAAE,CAAC;IAC1D,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;QACtE,sBAAsB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAChE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,aAAa,EAC7B,CAAC,CACF,CAAC;IACJ,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;QACjC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC3B,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG;gBACpC,KAAK,EACH,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ;oBAC9B,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC;oBACzC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM;gBACzB,MAAM,EAAE,EAAE;gBACV,OAAO,EAAE,EAAE;gBACX,OAAO,EAAE,EAAE;aACZ,CAAC;YACF,SAAS;QACX,CAAC;QAED,MAAM,eAAe,GAA8C,EAAE,CAAC;QACtE,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAClB,KAAK,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvE,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC/D,IAAI,CAAC,mBAAmB,EAAE,MAAM,EAAE,CAAC;oBACjC,SAAS;gBACX,CAAC;gBAED,MAAM,0BAA0B,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;gBACpE,IAAI,0BAA0B,KAAK,CAAC,EAAE,CAAC;oBACrC,SAAS;gBACX,CAAC;gBAED,KAAK,MAAM,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,IAAI,MAAM,CAAC,OAAO,CACjE,mBAAmB,CAAC,MAAM,CAC3B,EAAE,CAAC;oBACF,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,GAAG,0BAA0B,CAAC;oBAChF,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,GAAG,UAAU,CAAC,CAAC;oBAEhF,MAAM,QAAQ,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC;oBACpD,IAAI,QAAQ,EAAE,CAAC;wBACb,QAAQ,CAAC,aAAa,IAAI,gBAAgB,CAAC;oBAC7C,CAAC;yBAAM,CAAC;wBACN,eAAe,CAAC,iBAAiB,CAAC,GAAG,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC;oBAC3E,CAAC;oBAED,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;wBAC3C,WAAW,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;oBACrF,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAAG;YACd,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,kBAA2B,EAAE,CAAC,CAAC;YAC7E,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAyB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;SAC5F,CAAC;QAEF,IAAI,UAA8B,CAAC;QACnC,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;YACzB,MAAM,mBAAmB,GAAG,IAAA,kBAAW,EAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAC9D,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC5E,IAAI,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC7C,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;oBAC/B,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QAED,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG;YACpC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC;YAC5C,MAAM,EAAE,eAAe;YACvB,OAAO;YACP,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,EAAE;YAC5B,UAAU;SACX,CAAC;IACJ,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAAC,KAAa;IAC5C,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,KAAK;QACjB,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,KAAK;QACjB,KAAK;KACN,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,qCAAqC,CAAC,OAAe;IAC5D,sEAAsE;IACtE,OAAO;QACL,EAAE,EAAE,EAAE;QACN,IAAI,EAAE,2BAA2B;QACjC,MAAM,EAAE,SAAS;QACjB,UAAU,EAAE,EAAE;QACd,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,IAAI;aACf;SACF;KACF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,kDAAkD;AAC3C,KAAK,UAAU,cAAc,CAClC,QAA6B,EAC7B,SAA6B;IAE7B,oCAAoC;IACpC,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;QACpB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,mCAAmC;IACnC,IAAI,QAAQ,CAAC;IACb,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC;QACnD,IACE,MAAM,CAAC,IAAI,KAAK,MAAM;YACtB,MAAM,CAAC,UAAU;YACjB,CAAC,MAAM,CAAC,UAAU;YAClB,MAAM,CAAC,IAAI,KAAK,QAAQ,EACxB,CAAC;YACD,QAAQ,GAAG,IAAI,CAAC;YAChB,MAAM;QACR,CAAC;IACH,CAAC;IAED,yEAAyE;IACzE,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACpC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,MAAM,GAAoC,EAAE,CAAC;IACnD,MAAM,IAAI,GAAoC,EAAE,CAAC;IACjD,KAAK,MAAM,YAAY,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;QAChD,IAAI,YAAY,CAAC,IAAI,KAAK,mCAAmB,CAAC,OAAO,EAAE,CAAC;YACtD,SAAS;QACX,CAAC;QAED,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACtC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC;QAC3C,CAAC;aAAM,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YACjD,iDAAiD;YACjD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC;QACtD,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAErC,IAAI,MAAM,CAAC;IACX,IAAI,eAA8C,CAAC;IACnD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG;YACd;gBACE,IAAI,EAAE,gBAAgB;gBACtB,SAAS,CAAC,MAAc;oBACtB,iCAAiC;oBACjC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;oBAE/E,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;wBACjB,OAAO,IAAI,CAAC;oBACd,CAAC;oBAED,qEAAqE;oBACrE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gBACxC,CAAC;gBACD,IAAI,CAAC,EAAU;oBACb,IAAA,qBAAM,EACJ,MAAM,CAAC,EAAE,CAAC,EACV,sEAAsE,EAAE,IAAI,CAC7E,CAAC;oBAEF,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBAEnB,MAAM,MAAM,GAAG;wBACb,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI;wBACrB,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI;qBACpB,CAAC;oBAEF,OAAO,MAAM,CAAC;gBAChB,CAAC;aACF;SACF,CAAC;QAEF,IAAI,uCAAiB,EAAE,CAAC;YACtB,MAAM,EAAE,QAAQ,EAAE,GAAG,wDAAa,UAAU,GAAC,CAAC;YAC9C,MAAM,GAAG,MAAM,QAAQ,CAAC;gBACtB,KAAK,EAAE,QAAQ;gBACf,OAAO;aACR,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC;gBACnC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;gBAC1C,SAAS;gBACT,cAAc,EAAE,CAAC,SAAS,EAAE,EAAE,CAC5B,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,YAAY;aAChE,CAAC,CAAC;YACH,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,MAAM,IAAA,eAAM,EAAC;gBACpB,KAAK,EAAE,QAAQ;gBACf,OAAO,EAAE,OAAmB;aAC7B,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC;gBACnC,OAAO,EAAE,IAAI;gBACb,SAAS;gBACT,cAAc,EAAE,CAAC,SAAS,EAAE,EAAE,CAC5B,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,YAAY;aAChE,CAAC,CAAC;YACH,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;QAClC,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC;QAEjB,OAAO;YACL,MAAM,EAAE,CAAC,qCAAqC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC1D,QAAQ,EAAE,QAAQ,CAAC,QAAQ;SAC5B,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,EAAE,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,kBAAkB;IAClB,MAAM,WAAW,GAAG,6BAA6B,CAAC,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACtF,8DAA8D;IAC9D,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACvE,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,SAAS;QACX,CAAC;QAED,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;QACnC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;gBACnC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;IACH,CAAC;IACD,QAAQ,CAAC,QAAQ,GAAG,WAAW,CAAC;IAEhC,wEAAwE;IACxE,QAAQ,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAChD,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAC1E,CAAC;IAEF,2BAA2B;IAC3B,MAAM,cAAc,GAA6B,EAAE,CAAC;IACpD,KAAK,MAAM,aAAa,IAAI,eAAe,EAAE,CAAC;QAC5C,IAAI,aAAa,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACnC,SAAS;QACX,CAAC;QAED,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC;QAE/D,QAAQ,CAAC,WAAW,CAAC,IAAI,CACvB,IAAA,gCAAgB,EAAC,aAAa,CAAC,QAAQ,EAAE,aAAa,CAAC,IAAI,EAAE,mCAAmB,CAAC,OAAO,CAAC,CAC1F,CAAC;QACF,IAAI,aAAa,CAAC,GAAG,IAAI,aAAa,CAAC,iBAAiB,EAAE,CAAC;YACzD,QAAQ,CAAC,WAAW,CAAC,IAAI,CACvB,IAAA,gCAAgB,EACd,aAAa,CAAC,iBAAiB,EAC/B,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,EAC5B,mCAAmB,CAAC,OAAO,CAC5B,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,mDAAmD;IACnD,MAAM,gBAAgB,GAAkC,EAAE,CAAC;IAC3D,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;QAClC,2DAA2D;QAC3D,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1B,oEAAoE;YACpE,gBAAgB,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC,CAAC,CAAC;YACxE,SAAS;QACX,CAAC;QAED,+BAA+B;QAC/B,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,uCAAuC;IACvC,IAAI,YAAY,CAAC;IACjB,OAAO,CAAC,YAAY,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;QAC/C,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,GAAG,YAAY,CAAC;QAE9C,KAAK,MAAM,UAAU,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;YACnD,MAAM,cAAc,GAAG,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC7D,IAAI,cAAc,EAAE,CAAC;gBACnB,iCAAiC;gBACjC,IAAI,cAAc,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;oBACjD,cAAc,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,GAAG,CAAC,CAAC;gBAC/C,CAAC;gBAED,SAAS;YACX,CAAC;YAED,MAAM,MAAM,GAAG,uBAAuB,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAE9D,gBAAgB,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -46,7 +46,9 @@ const source_file_cache_1 = require("../../tools/esbuild/angular/source-file-cac
|
|
|
46
46
|
const budget_stats_1 = require("../../tools/esbuild/budget-stats");
|
|
47
47
|
const bundler_context_1 = require("../../tools/esbuild/bundler-context");
|
|
48
48
|
const bundler_execution_result_1 = require("../../tools/esbuild/bundler-execution-result");
|
|
49
|
+
const bundler_files_1 = require("../../tools/esbuild/bundler-files");
|
|
49
50
|
const commonjs_checker_1 = require("../../tools/esbuild/commonjs-checker");
|
|
51
|
+
const i18n_locale_plugin_1 = require("../../tools/esbuild/i18n-locale-plugin");
|
|
50
52
|
const license_extractor_1 = require("../../tools/esbuild/license-extractor");
|
|
51
53
|
const profiling_1 = require("../../tools/esbuild/profiling");
|
|
52
54
|
const utils_1 = require("../../tools/esbuild/utils");
|
|
@@ -119,10 +121,6 @@ async function executeBuild(options, context, rebuildState) {
|
|
|
119
121
|
const componentResults = await componentStyleBundler.bundleAllFiles(true, true);
|
|
120
122
|
bundlingResult = bundler_context_1.BundlerContext.mergeResults([bundlingResult, ...componentResults]);
|
|
121
123
|
}
|
|
122
|
-
if (options.optimizationOptions.scripts && environment_options_1.shouldOptimizeChunks) {
|
|
123
|
-
const { optimizeChunks } = await Promise.resolve().then(() => __importStar(require('./chunk-optimizer')));
|
|
124
|
-
bundlingResult = await (0, profiling_1.profileAsync)('OPTIMIZE_CHUNKS', () => optimizeChunks(bundlingResult, options.sourcemapOptions.scripts ? !options.sourcemapOptions.hidden || 'hidden' : false));
|
|
125
|
-
}
|
|
126
124
|
const executionResult = new bundler_execution_result_1.ExecutionResult(bundlerContexts, componentStyleBundler, codeBundleCache, templateUpdates);
|
|
127
125
|
executionResult.addWarnings(bundlingResult.warnings);
|
|
128
126
|
// Add used external component style referenced files to be watched
|
|
@@ -134,6 +132,27 @@ async function executeBuild(options, context, rebuildState) {
|
|
|
134
132
|
executionResult.addErrors(bundlingResult.errors);
|
|
135
133
|
return executionResult;
|
|
136
134
|
}
|
|
135
|
+
// Optimize chunks if enabled and threshold is met.
|
|
136
|
+
// This pass uses Rollup/Rolldown to further optimize chunks generated by esbuild.
|
|
137
|
+
if (options.optimizationOptions.scripts) {
|
|
138
|
+
// Count lazy chunks (files not needed for initial load).
|
|
139
|
+
// Advanced chunk optimization is most beneficial when there are multiple lazy chunks.
|
|
140
|
+
const { metafile, initialFiles } = bundlingResult;
|
|
141
|
+
const lazyChunksCount = Object.keys(metafile.outputs).filter((path) => path.endsWith('.js') && !initialFiles.has(path)).length;
|
|
142
|
+
// Only run if the number of lazy chunks meets the configured threshold.
|
|
143
|
+
// This avoids overhead for small projects with few chunks.
|
|
144
|
+
// TODO: Remove this log once chunk optimization is supported for server builds as this
|
|
145
|
+
// causes the file to be renamed and thus causes incorrect preloading.
|
|
146
|
+
if (!options.serverEntryPoint && lazyChunksCount >= environment_options_1.optimizeChunksThreshold) {
|
|
147
|
+
const { optimizeChunks } = await Promise.resolve().then(() => __importStar(require('./chunk-optimizer')));
|
|
148
|
+
const optimizationResult = await (0, profiling_1.profileAsync)('OPTIMIZE_CHUNKS', () => optimizeChunks(bundlingResult, options.sourcemapOptions.scripts ? !options.sourcemapOptions.hidden || 'hidden' : false));
|
|
149
|
+
if (optimizationResult.errors) {
|
|
150
|
+
executionResult.addErrors(optimizationResult.errors);
|
|
151
|
+
return executionResult;
|
|
152
|
+
}
|
|
153
|
+
bundlingResult = optimizationResult;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
137
156
|
// Analyze external imports if external options are enabled
|
|
138
157
|
if (options.externalPackages || bundlingResult.externalConfiguration) {
|
|
139
158
|
const { externalConfiguration = [], externalImports: { browser = [], server = [] }, } = bundlingResult;
|
|
@@ -144,6 +163,11 @@ async function executeBuild(options, context, rebuildState) {
|
|
|
144
163
|
const exclusions = new Set(externalConfiguration);
|
|
145
164
|
const explicitExternal = new Set();
|
|
146
165
|
const isExplicitExternal = (dep) => {
|
|
166
|
+
// Locale-data imports are injected by the builder itself (see i18n-locale-plugin) and must stay resolvable
|
|
167
|
+
// even when the containing package is externalized by the user.
|
|
168
|
+
if (dep.startsWith(`${i18n_locale_plugin_1.LOCALE_DATA_BASE_MODULE}/`)) {
|
|
169
|
+
return false;
|
|
170
|
+
}
|
|
147
171
|
if (exclusions.has(dep)) {
|
|
148
172
|
return true;
|
|
149
173
|
}
|
|
@@ -206,7 +230,7 @@ async function executeBuild(options, context, rebuildState) {
|
|
|
206
230
|
}
|
|
207
231
|
// Extract and write licenses for used packages
|
|
208
232
|
if (options.extractLicenses) {
|
|
209
|
-
executionResult.addOutputFile('3rdpartylicenses.txt', await (0, license_extractor_1.extractLicenses)(metafile, workspaceRoot),
|
|
233
|
+
executionResult.addOutputFile('3rdpartylicenses.txt', await (0, license_extractor_1.extractLicenses)(metafile, workspaceRoot), bundler_files_1.BuildOutputFileType.Root);
|
|
210
234
|
}
|
|
211
235
|
// Watch input index HTML file if configured
|
|
212
236
|
if (options.indexHtmlOptions) {
|
|
@@ -216,7 +240,7 @@ async function executeBuild(options, context, rebuildState) {
|
|
|
216
240
|
}
|
|
217
241
|
// Create server app engine manifest
|
|
218
242
|
if (serverEntryPoint) {
|
|
219
|
-
executionResult.addOutputFile(manifest_1.SERVER_APP_ENGINE_MANIFEST_FILENAME, (0, manifest_1.generateAngularServerAppEngineManifest)(i18nOptions, security.allowedHosts, baseHref),
|
|
243
|
+
executionResult.addOutputFile(manifest_1.SERVER_APP_ENGINE_MANIFEST_FILENAME, (0, manifest_1.generateAngularServerAppEngineManifest)(i18nOptions, security.allowedHosts, baseHref), bundler_files_1.BuildOutputFileType.ServerRoot);
|
|
220
244
|
}
|
|
221
245
|
// Perform i18n translation inlining if enabled
|
|
222
246
|
if (i18nOptions.shouldInline) {
|
|
@@ -236,12 +260,12 @@ async function executeBuild(options, context, rebuildState) {
|
|
|
236
260
|
executionResult.outputFiles.push(...result.additionalOutputFiles);
|
|
237
261
|
executionResult.assetFiles.push(...result.additionalAssets);
|
|
238
262
|
}
|
|
239
|
-
executionResult.addOutputFile('prerendered-routes.json', JSON.stringify({ routes: executionResult.prerenderedRoutes }, null, 2),
|
|
263
|
+
executionResult.addOutputFile('prerendered-routes.json', JSON.stringify({ routes: executionResult.prerenderedRoutes }, null, 2), bundler_files_1.BuildOutputFileType.Root);
|
|
240
264
|
// Write metafile if stats option is enabled
|
|
241
265
|
if (options.stats) {
|
|
242
|
-
executionResult.addOutputFile('stats.json', JSON.stringify(metafile, null, 2),
|
|
266
|
+
executionResult.addOutputFile('stats.json', JSON.stringify(metafile, null, 2), bundler_files_1.BuildOutputFileType.Root);
|
|
243
267
|
}
|
|
244
|
-
if (!jsonLogs) {
|
|
268
|
+
if (!jsonLogs && !options.quiet) {
|
|
245
269
|
const changedFiles = rebuildState && executionResult.findChangedFiles(rebuildState.previousOutputInfo);
|
|
246
270
|
executionResult.addLog((0, utils_1.logBuildStats)(metafile, outputFiles, initialFiles, budgetFailures, colors, changedFiles, estimatedTransferSizes, !!ssrOptions, verbose));
|
|
247
271
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-build.js","sourceRoot":"","sources":["execute-build.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"execute-build.js","sourceRoot":"","sources":["execute-build.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.dev/license
|
|
7
7
|
*/
|
|
8
8
|
import type { Metafile } from 'esbuild';
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
9
|
+
import { type BuildOutputAsset, type PrerenderedRoutesRecord } from '../../tools/esbuild/bundler-execution-result';
|
|
10
|
+
import { type BuildOutputFile, type InitialFileRecord } from '../../tools/esbuild/bundler-files';
|
|
11
11
|
import { NormalizedApplicationBuildOptions } from './options';
|
|
12
12
|
/**
|
|
13
13
|
* Run additional builds steps including SSG, AppShell, Index HTML file and Service worker generation.
|
|
@@ -12,9 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.executePostBundleSteps = executePostBundleSteps;
|
|
14
14
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
15
|
-
const
|
|
15
|
+
const bundler_files_1 = require("../../tools/esbuild/bundler-files");
|
|
16
16
|
const index_html_generator_1 = require("../../tools/esbuild/index-html-generator");
|
|
17
|
-
const utils_1 = require("../../tools/esbuild/utils");
|
|
18
17
|
const environment_options_1 = require("../../utils/environment-options");
|
|
19
18
|
const manifest_1 = require("../../utils/server-rendering/manifest");
|
|
20
19
|
const models_1 = require("../../utils/server-rendering/models");
|
|
@@ -50,16 +49,16 @@ async function executePostBundleSteps(metafile, options, outputFiles, assetFiles
|
|
|
50
49
|
const { csrContent, ssrContent, errors, warnings } = await (0, index_html_generator_1.generateIndexHtml)(initialFiles, outputFiles, options, locale);
|
|
51
50
|
allErrors.push(...errors);
|
|
52
51
|
allWarnings.push(...warnings);
|
|
53
|
-
additionalHtmlOutputFiles.set(indexHtmlOptions.output, (0,
|
|
52
|
+
additionalHtmlOutputFiles.set(indexHtmlOptions.output, (0, bundler_files_1.createOutputFile)(indexHtmlOptions.output, csrContent, bundler_files_1.BuildOutputFileType.Browser));
|
|
54
53
|
if (ssrContent) {
|
|
55
|
-
additionalHtmlOutputFiles.set(options_1.INDEX_HTML_SERVER, (0,
|
|
54
|
+
additionalHtmlOutputFiles.set(options_1.INDEX_HTML_SERVER, (0, bundler_files_1.createOutputFile)(options_1.INDEX_HTML_SERVER, ssrContent, bundler_files_1.BuildOutputFileType.ServerApplication));
|
|
56
55
|
}
|
|
57
56
|
}
|
|
58
57
|
// Create server manifest
|
|
59
58
|
const initialFilesPaths = new Set(initialFiles.keys());
|
|
60
59
|
if (serverEntryPoint && (outputMode || prerenderOptions || appShellOptions || ssrOptions)) {
|
|
61
60
|
const { manifestContent, serverAssetsChunks } = (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, undefined, locale, baseHref, initialFilesPaths, metafile, publicPath);
|
|
62
|
-
additionalOutputFiles.push(...serverAssetsChunks, (0,
|
|
61
|
+
additionalOutputFiles.push(...serverAssetsChunks, (0, bundler_files_1.createOutputFile)(manifest_1.SERVER_APP_MANIFEST_FILENAME, manifestContent, bundler_files_1.BuildOutputFileType.ServerApplication));
|
|
63
62
|
}
|
|
64
63
|
// Pre-render (SSG) and App-shell
|
|
65
64
|
// If localization is enabled, prerendering is handled in the inlining process.
|
|
@@ -84,7 +83,7 @@ async function executePostBundleSteps(metafile, options, outputFiles, assetFiles
|
|
|
84
83
|
filePath = indexHtmlOptions.output;
|
|
85
84
|
}
|
|
86
85
|
}
|
|
87
|
-
additionalHtmlOutputFiles.set(filePath, (0,
|
|
86
|
+
additionalHtmlOutputFiles.set(filePath, (0, bundler_files_1.createOutputFile)(filePath, content, bundler_files_1.BuildOutputFileType.Browser));
|
|
88
87
|
}
|
|
89
88
|
const serializableRouteTreeNodeForManifest = [];
|
|
90
89
|
for (const metadata of serializableRouteTreeNode) {
|
|
@@ -118,7 +117,7 @@ async function executePostBundleSteps(metafile, options, outputFiles, assetFiles
|
|
|
118
117
|
const serviceWorkerResult = await (0, service_worker_1.augmentAppWithServiceWorkerEsbuild)(workspaceRoot, serviceWorker, baseHref, options.indexHtmlOptions?.output,
|
|
119
118
|
// Ensure additional files recently added are used
|
|
120
119
|
[...outputFiles, ...additionalOutputFiles], assetFiles);
|
|
121
|
-
additionalOutputFiles.push((0,
|
|
120
|
+
additionalOutputFiles.push((0, bundler_files_1.createOutputFile)('ngsw.json', serviceWorkerResult.manifest, bundler_files_1.BuildOutputFileType.Browser));
|
|
122
121
|
additionalAssets.push(...serviceWorkerResult.assetFiles);
|
|
123
122
|
}
|
|
124
123
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-post-bundle.js","sourceRoot":"","sources":["execute-post-bundle.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAuCH,wDAmNC;AAvPD,8DAAiC;
|
|
1
|
+
{"version":3,"file":"execute-post-bundle.js","sourceRoot":"","sources":["execute-post-bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { BuilderContext } from '@angular-devkit/architect';
|
|
9
9
|
import type { Metafile } from 'esbuild';
|
|
10
|
-
import { InitialFileRecord } from '../../tools/esbuild/bundler-context';
|
|
11
10
|
import { ExecutionResult, PrerenderedRoutesRecord } from '../../tools/esbuild/bundler-execution-result';
|
|
11
|
+
import { InitialFileRecord } from '../../tools/esbuild/bundler-files';
|
|
12
12
|
import { NormalizedApplicationBuildOptions } from './options';
|
|
13
13
|
/**
|
|
14
14
|
* Inlines all active locales as specified by the application build options into all
|
|
@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
10
10
|
exports.inlineI18n = inlineI18n;
|
|
11
11
|
exports.loadActiveTranslations = loadActiveTranslations;
|
|
12
12
|
const node_path_1 = require("node:path");
|
|
13
|
-
const
|
|
13
|
+
const bundler_files_1 = require("../../tools/esbuild/bundler-files");
|
|
14
14
|
const i18n_inliner_1 = require("../../tools/esbuild/i18n-inliner");
|
|
15
15
|
const environment_options_1 = require("../../utils/environment-options");
|
|
16
16
|
const i18n_options_1 = require("../../utils/i18n-options");
|
|
@@ -43,7 +43,7 @@ async function inlineI18n(metafile, options, executionResult, initialFiles) {
|
|
|
43
43
|
const updatedOutputFiles = [];
|
|
44
44
|
const updatedAssetFiles = [];
|
|
45
45
|
// Root and SSR entry files are not modified.
|
|
46
|
-
const unModifiedOutputFiles = executionResult.outputFiles.filter(({ type }) => type ===
|
|
46
|
+
const unModifiedOutputFiles = executionResult.outputFiles.filter(({ type }) => type === bundler_files_1.BuildOutputFileType.Root || type === bundler_files_1.BuildOutputFileType.ServerRoot);
|
|
47
47
|
try {
|
|
48
48
|
for (const locale of i18nOptions.inlineLocales) {
|
|
49
49
|
// A locale specific set of files is returned from the inliner.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["i18n.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAyBH,gCAwIC;AAOD,wDAkCC;AAtMD,yCAAiC;
|
|
1
|
+
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["i18n.ts"],"names":[],"mappings":"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"}
|