@angular/build 22.1.6 → 22.1.8
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 +3 -3
- package/src/builders/application/build-action.js +4 -0
- package/src/builders/application/build-action.js.map +1 -1
- package/src/builders/application/chunk-optimizer.js +4 -1
- package/src/builders/application/chunk-optimizer.js.map +1 -1
- package/src/builders/application/execute-post-bundle.js +2 -5
- package/src/builders/application/execute-post-bundle.js.map +1 -1
- package/src/builders/dev-server/options.d.ts +4 -1
- package/src/builders/dev-server/options.js +1 -0
- package/src/builders/dev-server/options.js.map +1 -1
- package/src/builders/dev-server/vite/server.js +2 -2
- package/src/builders/dev-server/vite/server.js.map +1 -1
- package/src/builders/unit-test/options.d.ts +1 -0
- package/src/builders/unit-test/options.js +2 -1
- package/src/builders/unit-test/options.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/build-options.js +5 -6
- package/src/builders/unit-test/runners/vitest/build-options.js.map +1 -1
- package/src/builders/unit-test/schema.d.ts +7 -0
- package/src/builders/unit-test/schema.js.map +1 -1
- package/src/builders/unit-test/schema.json +5 -0
- package/src/tools/esbuild/angular/compiler-plugin.js +1 -1
- package/src/tools/esbuild/angular/compiler-plugin.js.map +1 -1
- package/src/tools/esbuild/sourcemap-ignorelist-plugin.js +109 -0
- package/src/tools/esbuild/sourcemap-ignorelist-plugin.js.map +1 -1
- package/src/tools/esbuild/sqlite-cache-store.d.ts +8 -0
- package/src/tools/esbuild/sqlite-cache-store.js +19 -7
- package/src/tools/esbuild/sqlite-cache-store.js.map +1 -1
- package/src/utils/normalize-cache.d.ts +11 -1
- package/src/utils/normalize-cache.js +6 -3
- package/src/utils/normalize-cache.js.map +1 -1
- package/src/utils/purge-cache.js +24 -13
- package/src/utils/purge-cache.js.map +1 -1
- package/src/utils/server-rendering/prerender.d.ts +2 -1
- package/src/utils/server-rendering/prerender.js +31 -18
- package/src/utils/server-rendering/prerender.js.map +1 -1
- package/src/utils/server-rendering/render-worker.d.ts +6 -4
- package/src/utils/server-rendering/render-worker.js +3 -1
- package/src/utils/server-rendering/render-worker.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular/build",
|
|
3
|
-
"version": "22.1.
|
|
3
|
+
"version": "22.1.8",
|
|
4
4
|
"description": "Official build system for Angular",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Angular CLI",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"builders": "builders.json",
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@ampproject/remapping": "2.3.0",
|
|
26
|
-
"@angular-devkit/architect": "0.2201.
|
|
26
|
+
"@angular-devkit/architect": "0.2201.8",
|
|
27
27
|
"@babel/core": "8.0.1",
|
|
28
28
|
"@babel/helper-annotate-as-pure": "8.0.0",
|
|
29
29
|
"@babel/helper-split-export-declaration": "7.24.7",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"@angular/platform-browser": "^22.0.0",
|
|
61
61
|
"@angular/platform-server": "^22.0.0",
|
|
62
62
|
"@angular/service-worker": "^22.0.0",
|
|
63
|
-
"@angular/ssr": "^22.1.
|
|
63
|
+
"@angular/ssr": "^22.1.8",
|
|
64
64
|
"istanbul-lib-instrument": "^6.0.0",
|
|
65
65
|
"karma": "^6.4.0",
|
|
66
66
|
"less": "^4.2.0",
|
|
@@ -96,6 +96,10 @@ async function* runEsBuildBuildAction(action, options) {
|
|
|
96
96
|
cacheOptions.basePath,
|
|
97
97
|
`${(0, path_1.toPosixPath)(workspaceRoot)}/**/.*/**`,
|
|
98
98
|
];
|
|
99
|
+
if (cacheOptions.localBasePath && cacheOptions.localBasePath !== cacheOptions.basePath) {
|
|
100
|
+
const normalizedLocalCacheBase = (0, path_1.toPosixPath)(cacheOptions.localBasePath);
|
|
101
|
+
ignored.push(normalizedLocalCacheBase, `${normalizedLocalCacheBase}/**`);
|
|
102
|
+
}
|
|
99
103
|
// Setup a watcher
|
|
100
104
|
const { createWatcher } = await Promise.resolve().then(() => __importStar(require('../../tools/esbuild/watcher')));
|
|
101
105
|
watcher = createWatcher({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-action.js","sourceRoot":"","sources":["build-action.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqCH,
|
|
1
|
+
{"version":3,"file":"build-action.js","sourceRoot":"","sources":["build-action.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,9 +87,12 @@ function bundleOutputToEsbuildMetafile(bundleOutput, originalMetafile) {
|
|
|
87
87
|
if (totalOriginalBytesInModule === 0) {
|
|
88
88
|
continue;
|
|
89
89
|
}
|
|
90
|
+
// Read once per module: in Rolldown, `renderedLength` is an uncached getter that
|
|
91
|
+
// copies the entire module code across the NAPI bridge on each access.
|
|
92
|
+
const { renderedLength } = renderedModule;
|
|
90
93
|
for (const [originalInputPath, originalInputInfo] of Object.entries(originalOutputEntry.inputs)) {
|
|
91
94
|
const proportion = originalInputInfo.bytesInOutput / totalOriginalBytesInModule;
|
|
92
|
-
const newBytesInOutput = Math.floor(
|
|
95
|
+
const newBytesInOutput = Math.floor(renderedLength * proportion);
|
|
93
96
|
const existing = newOutputInputs[originalInputPath];
|
|
94
97
|
if (existing) {
|
|
95
98
|
existing.bytesInOutput += newBytesInOutput;
|
|
@@ -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":"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"}
|
|
@@ -16,7 +16,6 @@ const bundler_files_1 = require("../../tools/esbuild/bundler-files");
|
|
|
16
16
|
const index_html_generator_1 = require("../../tools/esbuild/index-html-generator");
|
|
17
17
|
const environment_options_1 = require("../../utils/environment-options");
|
|
18
18
|
const manifest_1 = require("../../utils/server-rendering/manifest");
|
|
19
|
-
const models_1 = require("../../utils/server-rendering/models");
|
|
20
19
|
const prerender_1 = require("../../utils/server-rendering/prerender");
|
|
21
20
|
const service_worker_1 = require("../../utils/service-worker");
|
|
22
21
|
const inject_debug_ids_1 = require("./inject-debug-ids");
|
|
@@ -74,9 +73,10 @@ async function executePostBundleSteps(metafile, options, outputFiles, assetFiles
|
|
|
74
73
|
(prerenderOptions || appShellOptions || (outputMode && serverEntryPoint)) &&
|
|
75
74
|
!allErrors.length) {
|
|
76
75
|
(0, node_assert_1.default)(indexHtmlOptions, 'The "index" option is required when using the "ssg" or "appShell" options.');
|
|
77
|
-
const { output, warnings, errors, serializableRouteTreeNode } = await (0, prerender_1.prerenderPages)(workspaceRoot, baseHref, appShellOptions, prerenderOptions, [...outputFiles, ...additionalOutputFiles], assetFiles, outputMode, sourcemapOptions.scripts, environment_options_1.maxWorkers);
|
|
76
|
+
const { output, warnings, errors, serializableRouteTreeNode, prerenderedRoutes: generatedPrerenderedRoutes, } = await (0, prerender_1.prerenderPages)(workspaceRoot, baseHref, appShellOptions, prerenderOptions, [...outputFiles, ...additionalOutputFiles], assetFiles, outputMode, sourcemapOptions.scripts, environment_options_1.maxWorkers);
|
|
78
77
|
allErrors.push(...errors);
|
|
79
78
|
allWarnings.push(...warnings);
|
|
79
|
+
Object.assign(prerenderedRoutes, generatedPrerenderedRoutes);
|
|
80
80
|
const indexHasBeenPrerendered = output[indexHtmlOptions.output];
|
|
81
81
|
for (const [path, { content, appShellRoute }] of Object.entries(output)) {
|
|
82
82
|
// Update the index contents with the app shell under these conditions:
|
|
@@ -96,9 +96,6 @@ async function executePostBundleSteps(metafile, options, outputFiles, assetFiles
|
|
|
96
96
|
const serializableRouteTreeNodeForManifest = [];
|
|
97
97
|
for (const metadata of serializableRouteTreeNode) {
|
|
98
98
|
serializableRouteTreeNodeForManifest.push(metadata);
|
|
99
|
-
if (metadata.renderMode === models_1.RouteRenderMode.Prerender && !metadata.route.includes('*')) {
|
|
100
|
-
prerenderedRoutes[metadata.route] = { headers: metadata.headers };
|
|
101
|
-
}
|
|
102
99
|
}
|
|
103
100
|
if (outputMode === schema_1.OutputMode.Server) {
|
|
104
101
|
// Regenerate the manifest to append route tree. This is only needed if SSR is enabled.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-post-bundle.js","sourceRoot":"","sources":["execute-post-bundle.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAwCH,
|
|
1
|
+
{"version":3,"file":"execute-post-bundle.js","sourceRoot":"","sources":["execute-post-bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,9 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { BuilderContext } from '@angular-devkit/architect';
|
|
9
9
|
import { Schema as DevServerOptions } from './schema';
|
|
10
|
-
export type NormalizedDevServerOptions = Awaited<ReturnType<typeof normalizeOptions
|
|
10
|
+
export type NormalizedDevServerOptions = Omit<Awaited<ReturnType<typeof normalizeOptions>>, 'strictPort'> & {
|
|
11
|
+
strictPort?: boolean;
|
|
12
|
+
};
|
|
11
13
|
/**
|
|
12
14
|
* Normalize the user provided options by creating full paths for all path based options
|
|
13
15
|
* and converting multi-form options into a single form that can be directly used
|
|
@@ -22,6 +24,7 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
|
|
|
22
24
|
buildTarget: import("@angular-devkit/architect").Target;
|
|
23
25
|
host: string;
|
|
24
26
|
port: number;
|
|
27
|
+
strictPort: boolean;
|
|
25
28
|
poll: number | undefined;
|
|
26
29
|
open: boolean | undefined;
|
|
27
30
|
verbose: boolean | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,7 +64,7 @@ async function createServerConfig(serverOptions, assets, ssrMode, preTransformRe
|
|
|
64
64
|
ssrFiles,
|
|
65
65
|
},
|
|
66
66
|
port: serverOptions.port,
|
|
67
|
-
strictPort: true,
|
|
67
|
+
strictPort: serverOptions.strictPort ?? true,
|
|
68
68
|
host: serverOptions.host,
|
|
69
69
|
open: serverOptions.open,
|
|
70
70
|
allowedHosts: serverOptions.allowedHosts,
|
|
@@ -138,7 +138,7 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
|
|
|
138
138
|
* (e.g., 'foo/bar'), as they are not correctly re-based from the base href.
|
|
139
139
|
*/
|
|
140
140
|
const preTransformRequests = externalMetadata.explicitBrowser.length === 0 && ssrMode === plugins_1.ServerSsrMode.NoSsr;
|
|
141
|
-
const cacheDir = (0, node_path_1.join)(serverOptions.cacheOptions.path, serverOptions.buildTarget.project, 'vite');
|
|
141
|
+
const cacheDir = (0, node_path_1.join)(serverOptions.cacheOptions.localPath ?? serverOptions.cacheOptions.path, serverOptions.buildTarget.project, 'vite');
|
|
142
142
|
const configuration = {
|
|
143
143
|
configFile: false,
|
|
144
144
|
envDir: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8HH,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,6 +45,7 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
|
|
|
45
45
|
debug: boolean;
|
|
46
46
|
ui: boolean | undefined;
|
|
47
47
|
isolate: boolean | undefined;
|
|
48
|
+
splitting: boolean;
|
|
48
49
|
quiet: boolean;
|
|
49
50
|
providersFile: string | undefined;
|
|
50
51
|
setupFiles: string[];
|
|
@@ -54,7 +54,7 @@ async function normalizeOptions(context, projectName, options) {
|
|
|
54
54
|
// Gather persistent caching option and provide a project specific cache location
|
|
55
55
|
const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot);
|
|
56
56
|
cacheOptions.path = node_path_1.default.join(cacheOptions.path, projectName);
|
|
57
|
-
const { runner, browsers, progress, filter, browserViewport, ui, runnerConfig, isolate } = options;
|
|
57
|
+
const { runner, browsers, progress, filter, browserViewport, ui, runnerConfig, isolate, splitting = true, } = options;
|
|
58
58
|
if (ui && runner !== schema_1.Runner.Vitest) {
|
|
59
59
|
throw new Error('The "ui" option is only available for the "vitest" runner.');
|
|
60
60
|
}
|
|
@@ -114,6 +114,7 @@ async function normalizeOptions(context, projectName, options) {
|
|
|
114
114
|
debug: options.debug ?? false,
|
|
115
115
|
ui: process.env['CI'] ? false : ui,
|
|
116
116
|
isolate,
|
|
117
|
+
splitting,
|
|
117
118
|
quiet: options.quiet ?? (process.env['CI'] ? false : true),
|
|
118
119
|
providersFile: options.providersFile && node_path_1.default.join(workspaceRoot, options.providersFile),
|
|
119
120
|
setupFiles: options.setupFiles
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAiCH,
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"}
|
|
@@ -229,13 +229,12 @@ async function getVitestBuildOptions(options, baseBuildOptions) {
|
|
|
229
229
|
sourceMap: { scripts: true, vendor: false, styles: false },
|
|
230
230
|
outputHashing: adjustOutputHashing(baseBuildOptions.outputHashing),
|
|
231
231
|
optimization: false,
|
|
232
|
+
namedChunks: false,
|
|
232
233
|
entryPoints,
|
|
233
|
-
//
|
|
234
|
-
//
|
|
235
|
-
//
|
|
236
|
-
|
|
237
|
-
// downloads these bundles, so there is no benefit to weigh against that.
|
|
238
|
-
disableCodeSplitting: true,
|
|
234
|
+
// Vitest's Node-based module loading emulation (vite-node) is not fully spec compliant and lacks
|
|
235
|
+
// live ESM bindings across chunk boundaries. This can cause uninitialized exports or break mocking.
|
|
236
|
+
// Disabling code splitting avoids shared chunks, but increases build and coverage memory/time.
|
|
237
|
+
disableCodeSplitting: !options.splitting,
|
|
239
238
|
// Enable support for vitest browser prebundling. Excludes can be controlled with a runnerConfig
|
|
240
239
|
// and the `optimizeDeps.exclude` option.
|
|
241
240
|
externalPackages: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-options.js","sourceRoot":"","sources":["build-options.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AA8LH,
|
|
1
|
+
{"version":3,"file":"build-options.js","sourceRoot":"","sources":["build-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -140,6 +140,13 @@ export type Schema = {
|
|
|
140
140
|
* application's polyfills and the Angular TestBed are always initialized before these files.
|
|
141
141
|
*/
|
|
142
142
|
setupFiles?: string[];
|
|
143
|
+
/**
|
|
144
|
+
* Enables code splitting for test execution. When enabled, shared code between test files
|
|
145
|
+
* is split into separate chunks. Issues with live ESM bindings in Node.js environments
|
|
146
|
+
* (such as uninitialized exports or mocking failures) can be resolved by disabling
|
|
147
|
+
* splitting. This option is only available for the Vitest runner.
|
|
148
|
+
*/
|
|
149
|
+
splitting?: boolean;
|
|
143
150
|
/**
|
|
144
151
|
* The path to the TypeScript configuration file, relative to the workspace root. Defaults
|
|
145
152
|
* to `tsconfig.spec.json` in the project root if it exists. If not specified and the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["schema.ts"],"names":[],"mappings":";AACA,mFAAmF;AACnF,oFAAoF;;;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["schema.ts"],"names":[],"mappings":";AACA,mFAAmF;AACnF,oFAAoF;;;AA6KpF,IAAY,oBASX;AATD,WAAY,oBAAoB;IAC5B,+CAAuB,CAAA;IACvB,qCAAa,CAAA;IACb,qCAAa,CAAA;IACb,oDAA4B,CAAA;IAC5B,qCAAa,CAAA;IACb,6CAAqB,CAAA;IACrB,qCAAa,CAAA;IACb,oDAA4B,CAAA;AAChC,CAAC,EATW,oBAAoB,oCAApB,oBAAoB,QAS/B;AAwDD;;GAEG;AACH,IAAY,MAGX;AAHD,WAAY,MAAM;IACd,yBAAe,CAAA;IACf,2BAAiB,CAAA;AACrB,CAAC,EAHW,MAAM,sBAAN,MAAM,QAGjB"}
|
|
@@ -77,6 +77,11 @@
|
|
|
77
77
|
"type": "boolean",
|
|
78
78
|
"description": "Enables isolation for test execution. When true, Vitest runs tests in separate threads or processes. This option is only available for the Vitest runner. Defaults to false to align with the Karma/Jasmine experience."
|
|
79
79
|
},
|
|
80
|
+
"splitting": {
|
|
81
|
+
"type": "boolean",
|
|
82
|
+
"description": "Enables code splitting for test execution. When enabled, shared code between test files is split into separate chunks. Issues with live ESM bindings in Node.js environments (such as uninitialized exports or mocking failures) can be resolved by disabling splitting. This option is only available for the Vitest runner.",
|
|
83
|
+
"default": true
|
|
84
|
+
},
|
|
80
85
|
"quiet": {
|
|
81
86
|
"type": "boolean",
|
|
82
87
|
"description": "Suppresses the verbose build summary and stats table on each rebuild. Defaults to `true` locally and `false` in CI environments."
|
|
@@ -420,7 +420,7 @@ function createCompilerPlugin(pluginOptions, compilationContextOrCompilation, st
|
|
|
420
420
|
const replacement = pluginOptions.fileReplacements?.[path.normalize(args.path)];
|
|
421
421
|
if (replacement) {
|
|
422
422
|
return {
|
|
423
|
-
contents: await
|
|
423
|
+
contents: await (0, promises_1.readFile)(path.normalize(replacement)),
|
|
424
424
|
loader: 'json',
|
|
425
425
|
watchFiles: [replacement],
|
|
426
426
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler-plugin.js","sourceRoot":"","sources":["compiler-plugin.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compiler-plugin.js","sourceRoot":"","sources":["compiler-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,87 @@ const IGNORE_LIST_ID = 'x_google_ignoreList';
|
|
|
19
19
|
* of a full source map if not present in the source map data.
|
|
20
20
|
*/
|
|
21
21
|
const NODE_MODULE_BYTES = Buffer.from('node_modules/', 'utf-8');
|
|
22
|
+
/**
|
|
23
|
+
* The UTF-8 bytes for the "sources" property key used to locate the sources array.
|
|
24
|
+
*/
|
|
25
|
+
const SOURCES_KEY_BYTES = Buffer.from('"sources"', 'utf-8');
|
|
26
|
+
/**
|
|
27
|
+
* The UTF-8 bytes for the ignore list identifier to check if already present.
|
|
28
|
+
*/
|
|
29
|
+
const IGNORE_LIST_BYTES = Buffer.from(`"${IGNORE_LIST_ID}"`, 'utf-8');
|
|
30
|
+
function extractSources(contents) {
|
|
31
|
+
const sourcesKeyIndex = contents.indexOf(SOURCES_KEY_BYTES);
|
|
32
|
+
if (sourcesKeyIndex === -1) {
|
|
33
|
+
return undefined;
|
|
34
|
+
}
|
|
35
|
+
// Find the ':' after "sources"
|
|
36
|
+
let colonIndex = sourcesKeyIndex + SOURCES_KEY_BYTES.length;
|
|
37
|
+
while (colonIndex < contents.length && contents[colonIndex] <= 0x20) {
|
|
38
|
+
colonIndex++;
|
|
39
|
+
}
|
|
40
|
+
if (contents[colonIndex] !== 0x3a /* : */) {
|
|
41
|
+
return undefined;
|
|
42
|
+
}
|
|
43
|
+
// Find the '[' for the array
|
|
44
|
+
let arrayStartIndex = colonIndex + 1;
|
|
45
|
+
while (arrayStartIndex < contents.length && contents[arrayStartIndex] <= 0x20) {
|
|
46
|
+
arrayStartIndex++;
|
|
47
|
+
}
|
|
48
|
+
if (contents[arrayStartIndex] !== 0x5b /* [ */) {
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
// Scan until matching ']'
|
|
52
|
+
let depth = 0;
|
|
53
|
+
let inString = false;
|
|
54
|
+
for (let i = arrayStartIndex; i < contents.length; i++) {
|
|
55
|
+
const byte = contents[i];
|
|
56
|
+
if (inString) {
|
|
57
|
+
if (byte === 0x5c /* \ */) {
|
|
58
|
+
i++; // skip escaped character
|
|
59
|
+
}
|
|
60
|
+
else if (byte === 0x22 /* " */) {
|
|
61
|
+
inString = false;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
else if (byte === 0x22 /* " */) {
|
|
65
|
+
inString = true;
|
|
66
|
+
}
|
|
67
|
+
else if (byte === 0x5b /* [ */) {
|
|
68
|
+
depth++;
|
|
69
|
+
}
|
|
70
|
+
else if (byte === 0x5d /* ] */) {
|
|
71
|
+
depth--;
|
|
72
|
+
if (depth === 0) {
|
|
73
|
+
try {
|
|
74
|
+
const slice = contents.toString('utf-8', arrayStartIndex, i + 1);
|
|
75
|
+
const parsed = JSON.parse(slice);
|
|
76
|
+
return Array.isArray(parsed) && parsed.every((s) => typeof s === 'string')
|
|
77
|
+
? parsed
|
|
78
|
+
: undefined;
|
|
79
|
+
}
|
|
80
|
+
catch {
|
|
81
|
+
return undefined;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
return undefined;
|
|
87
|
+
}
|
|
88
|
+
function updateSourcemapFast(contents, ignoreList) {
|
|
89
|
+
let braceIndex = 0;
|
|
90
|
+
while (braceIndex < contents.length && contents[braceIndex] <= 0x20) {
|
|
91
|
+
braceIndex++;
|
|
92
|
+
}
|
|
93
|
+
if (contents[braceIndex] !== 0x7b /* { */) {
|
|
94
|
+
return undefined;
|
|
95
|
+
}
|
|
96
|
+
const injection = Buffer.from(`"${IGNORE_LIST_ID}":${JSON.stringify(ignoreList)},`, 'utf-8');
|
|
97
|
+
return Buffer.concat([
|
|
98
|
+
contents.subarray(0, braceIndex + 1),
|
|
99
|
+
injection,
|
|
100
|
+
contents.subarray(braceIndex + 1),
|
|
101
|
+
]);
|
|
102
|
+
}
|
|
22
103
|
/**
|
|
23
104
|
* Creates an esbuild plugin that updates generated sourcemaps to include the Chrome
|
|
24
105
|
* DevTools ignore list extension. All source files that originate from a node modules
|
|
@@ -49,7 +130,35 @@ function createSourcemapIgnorelistPlugin() {
|
|
|
49
130
|
if (!contents.includes(NODE_MODULE_BYTES)) {
|
|
50
131
|
continue;
|
|
51
132
|
}
|
|
133
|
+
let fastPathSuccess = false;
|
|
134
|
+
if (!contents.includes(IGNORE_LIST_BYTES)) {
|
|
135
|
+
const sources = extractSources(contents);
|
|
136
|
+
if (sources) {
|
|
137
|
+
const ignoreList = [];
|
|
138
|
+
for (let index = 0; index < sources.length; ++index) {
|
|
139
|
+
const location = sources[index].indexOf('node_modules/');
|
|
140
|
+
if (location === 0 || (location > 0 && sources[index][location - 1] === '/')) {
|
|
141
|
+
ignoreList.push(index);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
if (ignoreList.length === 0) {
|
|
145
|
+
continue;
|
|
146
|
+
}
|
|
147
|
+
const updated = updateSourcemapFast(contents, ignoreList);
|
|
148
|
+
if (updated) {
|
|
149
|
+
file.contents = updated;
|
|
150
|
+
fastPathSuccess = true;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
if (fastPathSuccess) {
|
|
155
|
+
continue;
|
|
156
|
+
}
|
|
157
|
+
// Fallback to full JSON parse/stringify if fast scanning or splicing fails
|
|
52
158
|
const map = JSON.parse(contents.toString('utf-8'));
|
|
159
|
+
if (map[IGNORE_LIST_ID]) {
|
|
160
|
+
continue;
|
|
161
|
+
}
|
|
53
162
|
const ignoreList = [];
|
|
54
163
|
// Check and store the index of each source originating from a node modules directory
|
|
55
164
|
for (let index = 0; index < map.sources.length; ++index) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourcemap-ignorelist-plugin.js","sourceRoot":"","sources":["sourcemap-ignorelist-plugin.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"sourcemap-ignorelist-plugin.js","sourceRoot":"","sources":["sourcemap-ignorelist-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,14 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.dev/license
|
|
7
7
|
*/
|
|
8
8
|
import { Cache, PersistentCacheStore } from './cache';
|
|
9
|
+
/**
|
|
10
|
+
* A persistent cache store backed by SQLite.
|
|
11
|
+
*
|
|
12
|
+
* Values are persisted with the V8 structured clone serialization API instead of JSON. Cached
|
|
13
|
+
* values include binary data such as the `Uint8Array` output of the JavaScript transformer and
|
|
14
|
+
* the `contents` of an esbuild load result. A JSON round-trip converts those into plain objects
|
|
15
|
+
* (`{"0":105,"1":109,...}`), which breaks consumers on any build that reads them back from disk.
|
|
16
|
+
*/
|
|
9
17
|
export declare class SqliteCacheStore implements PersistentCacheStore<unknown> {
|
|
10
18
|
#private;
|
|
11
19
|
readonly cachePath: string;
|
|
@@ -9,7 +9,16 @@
|
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.SqliteCacheStore = void 0;
|
|
11
11
|
const node_sqlite_1 = require("node:sqlite");
|
|
12
|
+
const node_v8_1 = require("node:v8");
|
|
12
13
|
const cache_1 = require("./cache");
|
|
14
|
+
/**
|
|
15
|
+
* A persistent cache store backed by SQLite.
|
|
16
|
+
*
|
|
17
|
+
* Values are persisted with the V8 structured clone serialization API instead of JSON. Cached
|
|
18
|
+
* values include binary data such as the `Uint8Array` output of the JavaScript transformer and
|
|
19
|
+
* the `contents` of an esbuild load result. A JSON round-trip converts those into plain objects
|
|
20
|
+
* (`{"0":105,"1":109,...}`), which breaks consumers on any build that reads them back from disk.
|
|
21
|
+
*/
|
|
13
22
|
class SqliteCacheStore {
|
|
14
23
|
cachePath;
|
|
15
24
|
maxPayloadSize;
|
|
@@ -36,7 +45,7 @@ class SqliteCacheStore {
|
|
|
36
45
|
this.#db.exec('PRAGMA busy_timeout = 5000;');
|
|
37
46
|
this.#db.exec('PRAGMA temp_store = MEMORY;');
|
|
38
47
|
this.#db.exec('PRAGMA mmap_size = 268435456;');
|
|
39
|
-
this.#db.exec('CREATE TABLE IF NOT EXISTS cache (key TEXT PRIMARY KEY, value
|
|
48
|
+
this.#db.exec('CREATE TABLE IF NOT EXISTS cache (key TEXT PRIMARY KEY, value BLOB, last_accessed INTEGER NOT NULL) WITHOUT ROWID;');
|
|
40
49
|
this.#getStmt = this.#db.prepare('SELECT value FROM cache WHERE key = ?');
|
|
41
50
|
this.#hasStmt = this.#db.prepare('SELECT 1 FROM cache WHERE key = ?');
|
|
42
51
|
this.#setStmt = this.#db.prepare('INSERT OR REPLACE INTO cache (key, value, last_accessed) VALUES (?, ?, unixepoch())');
|
|
@@ -84,14 +93,17 @@ class SqliteCacheStore {
|
|
|
84
93
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
85
94
|
async get(key) {
|
|
86
95
|
this.#ensureDb();
|
|
96
|
+
// SQLite column types are dynamic, so the stored value is only known at runtime.
|
|
87
97
|
const row = this.#getStmt?.get(key);
|
|
88
98
|
if (row) {
|
|
89
99
|
this.#queueAccessUpdate(key);
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
100
|
+
if (row.value instanceof Uint8Array) {
|
|
101
|
+
try {
|
|
102
|
+
return (0, node_v8_1.deserialize)(row.value);
|
|
103
|
+
}
|
|
104
|
+
catch {
|
|
105
|
+
// Treat corrupt or unparseable cached payloads as a cache miss.
|
|
106
|
+
}
|
|
95
107
|
}
|
|
96
108
|
}
|
|
97
109
|
return undefined;
|
|
@@ -103,7 +115,7 @@ class SqliteCacheStore {
|
|
|
103
115
|
async set(key, value) {
|
|
104
116
|
this.#ensureDb();
|
|
105
117
|
this.#pendingAccessedKeys.delete(key);
|
|
106
|
-
this.#setStmt?.run(key,
|
|
118
|
+
this.#setStmt?.run(key, (0, node_v8_1.serialize)(value));
|
|
107
119
|
return this;
|
|
108
120
|
}
|
|
109
121
|
createCache(namespace) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlite-cache-store.js","sourceRoot":"","sources":["sqlite-cache-store.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sqlite-cache-store.js","sourceRoot":"","sources":["sqlite-cache-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,5 +12,15 @@ export interface NormalizedCachedOptions {
|
|
|
12
12
|
path: string;
|
|
13
13
|
/** Disk cache base path. Example: `/.angular/cache`. */
|
|
14
14
|
basePath: string;
|
|
15
|
+
/**
|
|
16
|
+
* Workspace-local disk cache path. Example: `/.angular/cache/v12.0.0`.
|
|
17
|
+
* Always resolves relative to the current workspace root, even within a Git worktree.
|
|
18
|
+
*/
|
|
19
|
+
localPath?: string;
|
|
20
|
+
/**
|
|
21
|
+
* Workspace-local disk cache base path. Example: `/.angular/cache`.
|
|
22
|
+
* Always resolves relative to the current workspace root, even within a Git worktree.
|
|
23
|
+
*/
|
|
24
|
+
localBasePath?: string;
|
|
15
25
|
}
|
|
16
|
-
export declare function normalizeCacheOptions(projectMetadata: unknown,
|
|
26
|
+
export declare function normalizeCacheOptions(projectMetadata: unknown, workspaceRoot: string): NormalizedCachedOptions;
|
|
@@ -11,7 +11,7 @@ exports.normalizeCacheOptions = normalizeCacheOptions;
|
|
|
11
11
|
const node_fs_1 = require("node:fs");
|
|
12
12
|
const node_path_1 = require("node:path");
|
|
13
13
|
/** Version placeholder is replaced during the build process with actual package version */
|
|
14
|
-
const VERSION = '22.1.
|
|
14
|
+
const VERSION = '22.1.8';
|
|
15
15
|
function hasCacheMetadata(value) {
|
|
16
16
|
return (!!value &&
|
|
17
17
|
typeof value === 'object' &&
|
|
@@ -57,7 +57,7 @@ function getCacheBasePath(workspaceRoot, cachePathSetting) {
|
|
|
57
57
|
catch { }
|
|
58
58
|
return (0, node_path_1.resolve)(workspaceRoot, cachePathSetting);
|
|
59
59
|
}
|
|
60
|
-
function normalizeCacheOptions(projectMetadata,
|
|
60
|
+
function normalizeCacheOptions(projectMetadata, workspaceRoot) {
|
|
61
61
|
const cacheMetadata = hasCacheMetadata(projectMetadata) ? projectMetadata.cli.cache : {};
|
|
62
62
|
const {
|
|
63
63
|
// Webcontainers do not currently benefit from persistent disk caching and can lead to increased browser memory usage
|
|
@@ -74,11 +74,14 @@ function normalizeCacheOptions(projectMetadata, worspaceRoot) {
|
|
|
74
74
|
break;
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
|
-
const cacheBasePath = getCacheBasePath(
|
|
77
|
+
const cacheBasePath = getCacheBasePath(workspaceRoot, path);
|
|
78
|
+
const localCacheBasePath = (0, node_path_1.isAbsolute)(path) ? path : (0, node_path_1.resolve)(workspaceRoot, path);
|
|
78
79
|
return {
|
|
79
80
|
enabled: cacheEnabled,
|
|
80
81
|
basePath: cacheBasePath,
|
|
81
82
|
path: (0, node_path_1.join)(cacheBasePath, VERSION),
|
|
83
|
+
localBasePath: localCacheBasePath,
|
|
84
|
+
localPath: (0, node_path_1.join)(localCacheBasePath, VERSION),
|
|
82
85
|
};
|
|
83
86
|
}
|
|
84
87
|
//# sourceMappingURL=normalize-cache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-cache.js","sourceRoot":"","sources":["normalize-cache.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"normalize-cache.js","sourceRoot":"","sources":["normalize-cache.ts"],"names":[],"mappings":"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"}
|
package/src/utils/purge-cache.js
CHANGED
|
@@ -18,23 +18,34 @@ async function purgeStaleBuildCache(context) {
|
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
20
|
const metadata = await context.getProjectMetadata(projectName);
|
|
21
|
-
const { basePath, path, enabled } = (0, normalize_cache_1.normalizeCacheOptions)(metadata, context.workspaceRoot);
|
|
21
|
+
const { basePath, path, localBasePath, localPath, enabled } = (0, normalize_cache_1.normalizeCacheOptions)(metadata, context.workspaceRoot);
|
|
22
22
|
if (!enabled) {
|
|
23
23
|
return;
|
|
24
24
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
const basePaths = new Set([basePath]);
|
|
26
|
+
if (localBasePath) {
|
|
27
|
+
basePaths.add(localBasePath);
|
|
28
28
|
}
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
for (const base of basePaths) {
|
|
30
|
+
let baseEntries;
|
|
31
|
+
try {
|
|
32
|
+
baseEntries = await (0, promises_1.readdir)(base, { withFileTypes: true });
|
|
33
|
+
}
|
|
34
|
+
catch {
|
|
35
|
+
// No purging possible if base path does not exist or cannot otherwise be accessed
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
const currentPath = base === localBasePath ? localPath : path;
|
|
39
|
+
if (!currentPath) {
|
|
40
|
+
// Avoid purging if current path is unavailable to prevent deleting the active cache
|
|
41
|
+
continue;
|
|
42
|
+
}
|
|
43
|
+
const entriesToDelete = baseEntries
|
|
44
|
+
.filter((d) => d.isDirectory())
|
|
45
|
+
.map((d) => (0, node_path_1.join)(base, d.name))
|
|
46
|
+
.filter((cachePath) => cachePath !== currentPath)
|
|
47
|
+
.map((stalePath) => (0, promises_1.rm)(stalePath, { force: true, recursive: true, maxRetries: 3 }));
|
|
48
|
+
await Promise.allSettled(entriesToDelete);
|
|
32
49
|
}
|
|
33
|
-
const entriesToDelete = baseEntries
|
|
34
|
-
.filter((d) => d.isDirectory())
|
|
35
|
-
.map((d) => (0, node_path_1.join)(basePath, d.name))
|
|
36
|
-
.filter((cachePath) => cachePath !== path)
|
|
37
|
-
.map((stalePath) => (0, promises_1.rm)(stalePath, { force: true, recursive: true, maxRetries: 3 }));
|
|
38
|
-
await Promise.allSettled(entriesToDelete);
|
|
39
50
|
}
|
|
40
51
|
//# sourceMappingURL=purge-cache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"purge-cache.js","sourceRoot":"","sources":["purge-cache.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAQH,
|
|
1
|
+
{"version":3,"file":"purge-cache.js","sourceRoot":"","sources":["purge-cache.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAQH,oDA4CC;AAjDD,+CAA+C;AAC/C,yCAAiC;AACjC,uDAA0D;AAE1D,iFAAiF;AAC1E,KAAK,UAAU,oBAAoB,CAAC,OAAuB;IAChE,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;IAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC/D,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAA,uCAAqB,EACjF,QAAQ,EACR,OAAO,CAAC,aAAa,CACtB,CAAC;IAEF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACtC,IAAI,aAAa,EAAE,CAAC;QAClB,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,IAAI,WAAW,CAAC;QAChB,IAAI,CAAC;YACH,WAAW,GAAG,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7D,CAAC;QAAC,MAAM,CAAC;YACP,kFAAkF;YAClF,SAAS;QACX,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,oFAAoF;YACpF,SAAS;QACX,CAAC;QAED,MAAM,eAAe,GAAG,WAAW;aAChC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;aAC9B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,gBAAI,EAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;aAC9B,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,WAAW,CAAC;aAChD,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAA,aAAE,EAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAEtF,MAAM,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { NormalizedApplicationBuildOptions } from '../../builders/application/options';
|
|
9
9
|
import { OutputMode } from '../../builders/application/schema';
|
|
10
|
-
import { BuildOutputAsset } from '../../tools/esbuild/bundler-execution-result';
|
|
10
|
+
import { BuildOutputAsset, PrerenderedRoutesRecord } from '../../tools/esbuild/bundler-execution-result';
|
|
11
11
|
import { BuildOutputFile } from '../../tools/esbuild/bundler-files';
|
|
12
12
|
import { SerializableRouteTreeNode } from './models';
|
|
13
13
|
type PrerenderOptions = NormalizedApplicationBuildOptions['prerenderOptions'];
|
|
@@ -34,6 +34,7 @@ export declare function prerenderPages(workspaceRoot: string, baseHref: string,
|
|
|
34
34
|
output: PrerenderOutput;
|
|
35
35
|
warnings: string[];
|
|
36
36
|
errors: string[];
|
|
37
|
+
prerenderedRoutes: PrerenderedRoutesRecord;
|
|
37
38
|
serializableRouteTreeNode: SerializableRouteTreeNode;
|
|
38
39
|
}>;
|
|
39
40
|
export {};
|
|
@@ -95,6 +95,7 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
|
|
|
95
95
|
errors,
|
|
96
96
|
warnings,
|
|
97
97
|
output: {},
|
|
98
|
+
prerenderedRoutes: {},
|
|
98
99
|
serializableRouteTreeNode,
|
|
99
100
|
};
|
|
100
101
|
}
|
|
@@ -108,10 +109,19 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
|
|
|
108
109
|
// Render routes
|
|
109
110
|
const { errors: renderingErrors, output } = await renderPages(baseHref, sourcemap, serializableRouteTreeNodeForPrerender, maxThreads, workspaceRoot, outputFilesForWorker, assetsReversed, outputMode, appShellRoute ?? appShellOptions?.route);
|
|
110
111
|
errors.push(...renderingErrors);
|
|
112
|
+
const prerenderedRoutes = {};
|
|
113
|
+
const baseHrefPathnameWithLeadingSlash = new URL(baseHref, 'http://localhost').pathname;
|
|
114
|
+
for (const metadata of serializableRouteTreeNodeForPrerender) {
|
|
115
|
+
const outPath = getRouteOutPath(metadata.route, baseHrefPathnameWithLeadingSlash);
|
|
116
|
+
if (output[outPath]) {
|
|
117
|
+
prerenderedRoutes[metadata.route] = { headers: metadata.headers };
|
|
118
|
+
}
|
|
119
|
+
}
|
|
111
120
|
return {
|
|
112
121
|
errors,
|
|
113
122
|
warnings,
|
|
114
123
|
output,
|
|
124
|
+
prerenderedRoutes,
|
|
115
125
|
serializableRouteTreeNode,
|
|
116
126
|
};
|
|
117
127
|
}
|
|
@@ -120,17 +130,13 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
|
|
|
120
130
|
const errors = [];
|
|
121
131
|
const baseHrefPathnameWithLeadingSlash = new URL(baseHref, 'http://localhost').pathname;
|
|
122
132
|
const appShellRouteWithoutBaseHref = appShellRoute
|
|
123
|
-
? (0, url_1.
|
|
124
|
-
? (0, url_1.addLeadingSlash)(appShellRoute.slice(baseHrefPathnameWithLeadingSlash.length))
|
|
125
|
-
: (0, url_1.addLeadingSlash)(appShellRoute)
|
|
133
|
+
? (0, url_1.addLeadingSlash)(getRouteWithoutBaseHref(appShellRoute, baseHrefPathnameWithLeadingSlash))
|
|
126
134
|
: undefined;
|
|
127
135
|
const routesToRender = [];
|
|
128
136
|
for (const { route, redirectTo } of serializableRouteTreeNode) {
|
|
129
137
|
// Remove the base href from the file output path.
|
|
130
|
-
const routeWithoutBaseHref = (
|
|
131
|
-
|
|
132
|
-
: route;
|
|
133
|
-
const outPath = (0, url_1.stripLeadingSlash)(node_path_1.posix.join(routeWithoutBaseHref, 'index.html'));
|
|
138
|
+
const routeWithoutBaseHref = getRouteWithoutBaseHref(route, baseHrefPathnameWithLeadingSlash);
|
|
139
|
+
const outPath = getRouteOutPath(route, baseHrefPathnameWithLeadingSlash);
|
|
134
140
|
if (typeof redirectTo === 'string') {
|
|
135
141
|
output[outPath] = { content: (0, utils_2.generateRedirectStaticPage)(redirectTo), appShellRoute: false };
|
|
136
142
|
continue;
|
|
@@ -183,19 +189,17 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
|
|
|
183
189
|
const renderBatchPromise = renderWorker.run(urls);
|
|
184
190
|
const batchResultPromise = renderBatchPromise
|
|
185
191
|
.then((results) => {
|
|
186
|
-
for (const
|
|
187
|
-
if (error) {
|
|
188
|
-
errors.push(`An error occurred while prerendering route '${url}'.\n\n${error}`);
|
|
192
|
+
for (const result of results) {
|
|
193
|
+
if ('error' in result) {
|
|
194
|
+
errors.push(`An error occurred while prerendering route '${result.url}'.\n\n${result.error}`);
|
|
189
195
|
continue;
|
|
190
196
|
}
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
};
|
|
198
|
-
}
|
|
197
|
+
const routeInfo = routeOutPathMap.get(result.url);
|
|
198
|
+
if (routeInfo) {
|
|
199
|
+
output[routeInfo.outPath] = {
|
|
200
|
+
content: result.content,
|
|
201
|
+
appShellRoute: routeInfo.isAppShell,
|
|
202
|
+
};
|
|
199
203
|
}
|
|
200
204
|
}
|
|
201
205
|
})
|
|
@@ -287,4 +291,13 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset
|
|
|
287
291
|
void renderWorker.destroy();
|
|
288
292
|
}
|
|
289
293
|
}
|
|
294
|
+
function getRouteWithoutBaseHref(route, baseHrefPathname) {
|
|
295
|
+
return (0, url_1.addTrailingSlash)(route).startsWith(baseHrefPathname)
|
|
296
|
+
? (0, url_1.addLeadingSlash)(route.slice(baseHrefPathname.length))
|
|
297
|
+
: route;
|
|
298
|
+
}
|
|
299
|
+
function getRouteOutPath(route, baseHrefPathname) {
|
|
300
|
+
const routeWithoutBaseHref = getRouteWithoutBaseHref(route, baseHrefPathname);
|
|
301
|
+
return (0, url_1.stripLeadingSlash)(node_path_1.posix.join(routeWithoutBaseHref, 'index.html'));
|
|
302
|
+
}
|
|
290
303
|
//# sourceMappingURL=prerender.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prerender.js","sourceRoot":"","sources":["prerender.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"prerender.js","sourceRoot":"","sources":["prerender.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAkDH,wCAyKC;AAzND,+CAA4C;AAC5C,yCAA2C;AAE3C,8DAA+D;AAK/D,qEAAyF;AACzF,oCAAyC;AACzC,kCAAsC;AACtC,gCAA4F;AAC5F,gDAA4C;AAC5C,wDAIsC;AACtC,yCAA0D;AAC1D,qCAMkB;AAElB,mCAAqD;AAqB9C,KAAK,UAAU,cAAc,CAClC,aAAqB,EACrB,QAAgB,EAChB,eAA4C,EAC5C,gBAA8C,EAC9C,WAAwC,EACxC,MAAoC,EACpC,UAAkC,EAClC,SAAS,GAAG,KAAK,EACjB,UAAU,GAAG,CAAC;IAQd,MAAM,cAAc,GAA2B,EAAE,CAAC;IAClD,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC1D,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,WAAW,EAAE,CAAC;QAC/C,IAAI,IAAI,KAAK,mCAAmB,CAAC,iBAAiB,IAAI,IAAI,KAAK,mCAAmB,CAAC,UAAU,EAAE,CAAC;YAC9F,SAAS;QACX,CAAC;QAED,gDAAgD;QAChD,IAAI,IAAA,mBAAO,EAAC,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC;YAC7B,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACvD,CAAC;aAAM,CAAC;YACN,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,mFAAmF;IACnF,gEAAgE;IAChE,KAAK,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,uBAAuB,EAAE,CAAC;QACtD,MAAM,SAAS,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,SAAS,EAAE,CAAC;YACd,cAAc,CAAC,QAAQ,CAAC;gBACtB,SAAS;oBACT,yBAAyB;oBACzB,gCAAgC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1E,CAAC;IACH,CAAC;IACD,uBAAuB,CAAC,KAAK,EAAE,CAAC;IAEhC,MAAM,oBAAoB,GAAG,IAAA,+BAAuB,EAAC,cAAc,CAAC,CAAC;IAErE,MAAM,cAAc,GAA4D,EAAE,CAAC;IACnF,KAAK,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,MAAM,EAAE,CAAC;QAC7C,uDAAuD;QACvD,mEAAmE;QACnE,cAAc,CAAC,IAAA,kBAAY,EAAC,QAAQ,EAAE,IAAA,kBAAW,EAAC,WAAW,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;IAC5E,CAAC;IAED,0BAA0B;IAC1B,MAAM,EACJ,MAAM,EAAE,gBAAgB,EACxB,mBAAmB,EAAE,yBAAyB,EAC9C,aAAa,GACd,GAAG,MAAM,YAAY,CACpB,aAAa,EACb,QAAQ,EACR,oBAAoB,EACpB,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,SAAS,EACT,UAAU,CACX,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACd,IAAA,qBAAa,EAAC,GAAG,CAAC,CAAC;QAEnB,OAAO;YACL,MAAM,EAAE;gBACN,iDAAiD,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,EAAE;aAC/F;YACD,mBAAmB,EAAE,EAAE;YACvB,aAAa,EAAE,SAAS;SACzB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAEjC,MAAM,qCAAqC,GAAsC,EAAE,CAAC;IACpF,KAAK,MAAM,QAAQ,IAAI,yBAAyB,EAAE,CAAC;QACjD,IAAI,UAAU,KAAK,mBAAU,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;YAC5D,+CAA+C;YAC/C,SAAS;QACX,CAAC;QAED,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,wCAAwC;YACxC,SAAS;QACX,CAAC;QAED,QAAQ,QAAQ,CAAC,UAAU,EAAE,CAAC;YAC5B,KAAK,SAAS,CAAC,CAAC,0BAA0B;YAC1C,KAAK,wBAAe,CAAC,SAAS;gBAC5B,qCAAqC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACrD,MAAM;YACR,KAAK,wBAAe,CAAC,MAAM;gBACzB,IAAI,UAAU,KAAK,mBAAU,CAAC,MAAM,EAAE,CAAC;oBACrC,MAAM,CAAC,IAAI,CACT,UAAU,QAAQ,CAAC,KAAK,yFAAyF,CAClH,CAAC;gBACJ,CAAC;gBACD,MAAM;QACV,CAAC;IACH,CAAC;IAED,IAAI,CAAC,qCAAqC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvE,OAAO;YACL,MAAM;YACN,QAAQ;YACR,MAAM,EAAE,EAAE;YACV,iBAAiB,EAAE,EAAE;YACrB,yBAAyB;SAC1B,CAAC;IACJ,CAAC;IAED,iDAAiD;IACjD,wGAAwG;IACxG,MAAM,QAAQ,GAAG,oBAAoB,CAAC,uCAA4B,CAAC,CAAC;IACpE,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,YAAY,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAExD,oBAAoB,CAAC,uCAA4B,CAAC,GAAG,IAAA,wBAAgB,EACnE,YAAY,CAAC,OAAO,CAClB,oBAAoB,EACpB,WAAW,IAAI,CAAC,SAAS,CAAC,qCAAqC,EAAE,SAAS,EAAE,CAAC,CAAC,GAAG,CAClF,CACF,CAAC;IACJ,CAAC;IAED,gBAAgB;IAChB,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CAC3D,QAAQ,EACR,SAAS,EACT,qCAAqC,EACrC,UAAU,EACV,aAAa,EACb,oBAAoB,EACpB,cAAc,EACd,UAAU,EACV,aAAa,IAAI,eAAe,EAAE,KAAK,CACxC,CAAC;IAEF,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;IAEhC,MAAM,iBAAiB,GAA4B,EAAE,CAAC;IACtD,MAAM,gCAAgC,GAAG,IAAI,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC;IAExF,KAAK,MAAM,QAAQ,IAAI,qCAAqC,EAAE,CAAC;QAC7D,MAAM,OAAO,GAAG,eAAe,CAAC,QAAQ,CAAC,KAAK,EAAE,gCAAgC,CAAC,CAAC;QAElF,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YACpB,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC;QACpE,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM;QACN,QAAQ;QACR,MAAM;QACN,iBAAiB;QACjB,yBAAyB;KAC1B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,QAAgB,EAChB,SAAkB,EAClB,yBAAoD,EACpD,UAAkB,EAClB,aAAqB,EACrB,oBAAgD,EAChD,mBAA2C,EAC3C,UAAkC,EAClC,aAAiC;IAKjC,MAAM,MAAM,GAAoB,EAAE,CAAC;IACnC,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,MAAM,gCAAgC,GAAG,IAAI,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC;IACxF,MAAM,4BAA4B,GAAG,aAAa;QAChD,CAAC,CAAC,IAAA,qBAAe,EAAC,uBAAuB,CAAC,aAAa,EAAE,gCAAgC,CAAC,CAAC;QAC3F,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,cAAc,GAA8D,EAAE,CAAC;IAErF,KAAK,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,yBAAyB,EAAE,CAAC;QAC9D,kDAAkD;QAClD,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,KAAK,EAAE,gCAAgC,CAAC,CAAC;QAC9F,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,EAAE,gCAAgC,CAAC,CAAC;QAEzE,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,IAAA,kCAA0B,EAAC,UAAU,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;YAE5F,SAAS;QACX,CAAC;QAED,cAAc,CAAC,IAAI,CAAC;YAClB,KAAK;YACL,OAAO;YACP,UAAU,EAAE,4BAA4B,KAAK,oBAAoB;SAClE,CAAC,CAAC;IACL,CAAC;IAED,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO;YACL,MAAM;YACN,MAAM;SACP,CAAC;IACJ,CAAC;IAED,oHAAoH;IACpH,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjG,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAChE,MAAM,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAE7D,MAAM,cAAc,GAAG,CAAC,wBAAgB,CAAC,CAAC;IAC1C,IAAI,SAAS,EAAE,CAAC;QACd,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,wBAAU,CAAC;QAClC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC;QAC5C,UAAU,EAAE,mBAAmB;QAC/B,UAAU,EAAE;YACV,aAAa;YACb,WAAW,EAAE,oBAAoB;YACjC,UAAU,EAAE,mBAAmB;YAC/B,UAAU;YACV,WAAW,EAAE,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC;SAC9B;QACrB,QAAQ,EAAE,cAAc;QACxB,GAAG,EAAE;YACH,GAAG,OAAO,CAAC,GAAG;YACd,kBAAkB,EAAE,WAAW;SAChC;KACF,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,IAAI,GAAG,EAAoD,CAAC;QACpF,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;YAClC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,iBAAiB,GAAoB,EAAE,CAAC;QAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE,CAAC;YAC1D,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;YACrD,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7C,MAAM,kBAAkB,GAA0B,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACzE,MAAM,kBAAkB,GAAG,kBAAkB;iBAC1C,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAChB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;oBAC7B,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;wBACtB,MAAM,CAAC,IAAI,CACT,+CAA+C,MAAM,CAAC,GAAG,SAAS,MAAM,CAAC,KAAK,EAAE,CACjF,CAAC;wBACF,SAAS;oBACX,CAAC;oBAED,MAAM,SAAS,GAAG,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBAClD,IAAI,SAAS,EAAE,CAAC;wBACd,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG;4BAC1B,OAAO,EAAE,MAAM,CAAC,OAAO;4BACvB,aAAa,EAAE,SAAS,CAAC,UAAU;yBACpC,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACb,IAAA,qBAAa,EAAC,GAAG,CAAC,CAAC;gBACnB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;oBACvB,MAAM,CAAC,IAAI,CACT,+CAA+C,GAAG,SAAS,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,EAAE,CACzG,CAAC;gBACJ,CAAC;YACH,CAAC,CAAC,CAAC;YAEL,iBAAiB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;YAAS,CAAC;QACT,KAAK,YAAY,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAED,OAAO;QACL,MAAM;QACN,MAAM;KACP,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,aAAqB,EACrB,QAAgB,EAChB,oBAAgD,EAChD,mBAA2C,EAC3C,eAA4C,EAC5C,gBAA8C,EAC9C,SAAkB,EAClB,UAAkC;IAMlC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,gBAAgB,IAAI,EAAE,CAAC;IAC9D,MAAM,MAAM,GAAsC,EAAE,CAAC;IACrD,IAAI,aAAiC,CAAC;IAEtC,IAAI,eAAe,EAAE,CAAC;QACpB,aAAa,GAAG,IAAA,kBAAY,EAAC,QAAQ,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;QAE9D,MAAM,CAAC,IAAI,CAAC;YACV,UAAU,EAAE,wBAAe,CAAC,SAAS;YACrC,KAAK,EAAE,aAAa;SACrB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,cAAc,GAAG,CAAC,MAAM,IAAA,mBAAQ,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3E,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC;gBACV,UAAU,EAAE,wBAAe,CAAC,SAAS;gBACrC,KAAK,EAAE,IAAA,kBAAY,EAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;aAC5C,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,EAAE,CAAC;IACpE,CAAC;IAED,MAAM,cAAc,GAAG,CAAC,wBAAgB,CAAC,CAAC;IAE1C,IAAI,SAAS,EAAE,CAAC;QACd,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,wBAAU,CAAC;QAClC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,2BAA2B,CAAC;QACtD,UAAU,EAAE,CAAC;QACb,UAAU,EAAE;YACV,aAAa;YACb,WAAW,EAAE,oBAAoB;YACjC,UAAU,EAAE,mBAAmB;YAC/B,UAAU;YACV,WAAW,EAAE,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC;SACrB;QAC9B,QAAQ,EAAE,cAAc;QACxB,GAAG,EAAE;YACH,GAAG,OAAO,CAAC,GAAG;YACd,kBAAkB,EAAE,WAAW;SAChC;KACF,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,EAAE,GAClD,MAAM,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE7B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,EAAE,CAAC;QACxD,CAAC;QAED,0BAA0B;QAC1B,MAAM,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;QAC/B,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,MAAM,EAAE,GAAG,mBAAmB,CAAC,EAAE,CAAC;YACvD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACrC,CAAC;QACH,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;IAC5E,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,qBAAa,EAAC,GAAG,CAAC,CAAC;QAEnB,OAAO;YACL,MAAM,EAAE;gBACN,iDAAiD,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,EAAE;aAC/F;YACD,mBAAmB,EAAE,EAAE;SACxB,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,KAAK,YAAY,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAa,EAAE,gBAAwB;IACtE,OAAO,IAAA,sBAAgB,EAAC,KAAK,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC;QACzD,CAAC,CAAC,IAAA,qBAAe,EAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACvD,CAAC,CAAC,KAAK,CAAC;AACZ,CAAC;AAED,SAAS,eAAe,CAAC,KAAa,EAAE,gBAAwB;IAC9D,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IAE9E,OAAO,IAAA,uBAAiB,EAAC,iBAAK,CAAC,IAAI,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC,CAAC;AAC3E,CAAC"}
|
|
@@ -12,11 +12,13 @@ export interface RenderWorkerData extends ESMInMemoryFileLoaderWorkerData {
|
|
|
12
12
|
outputMode: OutputMode | undefined;
|
|
13
13
|
hasSsrEntry: boolean;
|
|
14
14
|
}
|
|
15
|
-
export
|
|
15
|
+
export type RenderResultItem = {
|
|
16
16
|
url: string;
|
|
17
|
-
content: string
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
content: string;
|
|
18
|
+
} | {
|
|
19
|
+
url: string;
|
|
20
|
+
error: string;
|
|
21
|
+
};
|
|
20
22
|
export type RenderResult = RenderResultItem[];
|
|
21
23
|
/**
|
|
22
24
|
* Renders routes in batch or individual URL.
|
|
@@ -74,13 +74,15 @@ async function renderPages(urls) {
|
|
|
74
74
|
for (const currentUrl of urls) {
|
|
75
75
|
try {
|
|
76
76
|
const content = await renderPage(currentUrl, angularServerApp);
|
|
77
|
+
if (content === null) {
|
|
78
|
+
throw new Error('The content returned was empty.');
|
|
79
|
+
}
|
|
77
80
|
results.push({ url: currentUrl, content });
|
|
78
81
|
}
|
|
79
82
|
catch (err) {
|
|
80
83
|
(0, error_1.assertIsError)(err);
|
|
81
84
|
results.push({
|
|
82
85
|
url: currentUrl,
|
|
83
|
-
content: null,
|
|
84
86
|
error: err.stack ?? err.message ?? err.code ?? `${err}`,
|
|
85
87
|
});
|
|
86
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-worker.js","sourceRoot":"","sources":["render-worker.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,6DAAiD;AAEjD,oCAAyC;AAEzC,+CAA+D;AAC/D,mDAA4D;AAC5D,iEAAiE;AACjE,mCAAqD;
|
|
1
|
+
{"version":3,"file":"render-worker.js","sourceRoot":"","sources":["render-worker.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,6DAAiD;AAEjD,oCAAyC;AAEzC,+CAA+D;AAC/D,mDAA4D;AAC5D,iEAAiE;AACjE,mCAAqD;AAoBrD;;GAEG;AACH,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,gCAGnC,CAAC;AAEF,IAAI,SAAS,GAAG,2BAAW,CAAC;AAE5B;;GAEG;AACH,KAAK,UAAU,UAAU,CACvB,GAAW,EACX,gBAA4E;IAE5E,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAC5C,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAC9E,CAAC;IAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAElD,OAAO,QAAQ,CAAC,CAAC,CAAC,IAAA,kCAA0B,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;AAC3E,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,WAAW,CAAC,IAAc;IACvC,MAAM,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,GACjE,MAAM,IAAA,8CAAuB,EAAC,mBAAmB,CAAC,CAAC;IAErD,MAAM,gBAAgB,GAAG,2BAA2B,CAAC;QACnD,sBAAsB,EAAE,IAAI;KAC7B,CAAC,CAAC;IAEH,MAAM,OAAO,GAAiB,EAAE,CAAC;IACjC,KAAK,MAAM,UAAU,IAAI,IAAI,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;YAE/D,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBACrB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;YACrD,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,qBAAa,EAAC,GAAG,CAAC,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC;gBACX,GAAG,EAAE,UAAU;gBACf,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,GAAG,EAAE;aACxD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,UAAU;IACvB,iFAAiF;IACjF,4EAA4E;IAC5E,wDAAa,mBAAmB,GAAC,CAAC;IAElC,IAAI,UAAU,KAAK,SAAS,IAAI,WAAW,EAAE,CAAC;QAC5C,SAAS,GAAG,MAAM,IAAA,4BAAY,GAAE,CAAC;IACnC,CAAC;IAED,IAAA,4CAA8B,EAAC,SAAS,CAAC,CAAC;IAE1C,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,kBAAe,UAAU,EAAE,CAAC"}
|