Skip to content

Commit 06e5176

Browse files
committed
fix(@angular/build): add warning when --prerendering or --app-shell are no-ops
Both options are ineffective when used with `outputMode`, so a warning is now issued. (cherry picked from commit 137e8e0)
1 parent 4e2a5fe commit 06e5176

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

packages/angular/build/src/builders/application/options.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -220,17 +220,17 @@ export async function normalizeOptions(
220220
options.ssr = false;
221221
}
222222

223-
if (options.prerender) {
223+
if (options.prerender !== undefined) {
224224
context.logger.warn(
225-
'The "prerender" option is no longer needed when "outputMode" is specified.',
225+
'The "prerender" option is not considered when "outputMode" is specified.',
226226
);
227-
} else {
228-
options.prerender = !!options.server;
229227
}
230228

231-
if (options.appShell) {
229+
options.prerender = !!options.server;
230+
231+
if (options.appShell !== undefined) {
232232
context.logger.warn(
233-
'The "appShell" option is no longer needed when "outputMode" is specified.',
233+
'The "appShell" option is not considered when "outputMode" is specified.',
234234
);
235235
}
236236
}

packages/angular/build/src/builders/application/schema.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,6 @@
536536
},
537537
"prerender": {
538538
"description": "Prerender (SSG) pages of your application during build time.",
539-
"default": false,
540539
"oneOf": [
541540
{
542541
"type": "boolean",
@@ -586,8 +585,7 @@
586585
},
587586
"appShell": {
588587
"type": "boolean",
589-
"description": "Generates an application shell during build time.",
590-
"default": false
588+
"description": "Generates an application shell during build time."
591589
},
592590
"outputMode": {
593591
"type": "string",

packages/angular/build/src/builders/dev-server/vite-server.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export async function* serveWithVite(
102102
if (browserOptions.prerender || (browserOptions.outputMode && browserOptions.server)) {
103103
// Disable prerendering if enabled and force SSR.
104104
// This is so instead of prerendering all the routes for every change, the page is "prerendered" when it is requested.
105-
browserOptions.prerender = false;
105+
browserOptions.prerender = undefined;
106106
browserOptions.ssr ||= true;
107107
}
108108

packages/angular_devkit/build_angular/src/builders/extract-i18n/application-extraction.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ export async function extractMessages(
5353
buildOptions.serviceWorker = false;
5454
buildOptions.server = undefined;
5555
buildOptions.ssr = false;
56-
buildOptions.appShell = false;
57-
buildOptions.prerender = false;
56+
buildOptions.appShell = undefined;
57+
buildOptions.prerender = undefined;
58+
buildOptions.outputMode = undefined;
5859

5960
const builderResult = await first(buildApplicationInternal(buildOptions, context));
6061

0 commit comments

Comments
 (0)