Skip to content

fix(@angular/build): simplify disabling server features with --no-server via command line #28714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2024
Merged

fix(@angular/build): simplify disabling server features with --no-server via command line #28714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d349ed2
fix(@angular/build): add warning when `--prerendering` or `--app-shel…
alan-agius4 Oct 25, 2024
94c9c78
fix(@angular/build): simplify disabling server features with `--no-se…
alan-agius4 Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/angular/build/src/builders/application/options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,17 +220,17 @@ export async function normalizeOptions(
options.ssr = false;
}

if (options.prerender) {
if (options.prerender !== undefined) {
context.logger.warn(
'The "prerender" option is no longer needed when "outputMode" is specified.',
'The "prerender" option is not considered when "outputMode" is specified.',
);
} else {
options.prerender = !!options.server;
}

if (options.appShell) {
options.prerender = !!options.server;

if (options.appShell !== undefined) {
context.logger.warn(
'The "appShell" option is no longer needed when "outputMode" is specified.',
'The "appShell" option is not considered when "outputMode" is specified.',
);
}
}
Expand Down
17 changes: 13 additions & 4 deletions packages/angular/build/src/builders/application/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,18 @@
},
"server": {
"type": "string",
"description": "The full path for the server entry point to the application, relative to the current workspace."
"description": "The full path for the server entry point to the application, relative to the current workspace.",
"oneOf": [
{
"type": "string",
"description": "The full path for the server entry point to the application, relative to the current workspace."
},
{
"const": false,
"type": "boolean",
"description": "Indicates that a server entry point is not provided."
}
]
},
"polyfills": {
"description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
Expand Down Expand Up @@ -536,7 +547,6 @@
},
"prerender": {
"description": "Prerender (SSG) pages of your application during build time.",
"default": false,
"oneOf": [
{
"type": "boolean",
Expand Down Expand Up @@ -586,8 +596,7 @@
},
"appShell": {
"type": "boolean",
"description": "Generates an application shell during build time.",
"default": false
"description": "Generates an application shell during build time."
},
"outputMode": {
"type": "string",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/build/src/builders/dev-server/vite-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export async function* serveWithVite(
if (browserOptions.prerender || (browserOptions.outputMode && browserOptions.server)) {
// Disable prerendering if enabled and force SSR.
// This is so instead of prerendering all the routes for every change, the page is "prerendered" when it is requested.
browserOptions.prerender = false;
browserOptions.prerender = undefined;
browserOptions.ssr ||= true;
}

Expand Down
5 changes: 3 additions & 2 deletions packages/angular_devkit/build_angular/src/builders/extract-i18n/application-extraction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,9 @@ export async function extractMessages(
buildOptions.serviceWorker = false;
buildOptions.server = undefined;
buildOptions.ssr = false;
buildOptions.appShell = false;
buildOptions.prerender = false;
buildOptions.appShell = undefined;
buildOptions.prerender = undefined;
buildOptions.outputMode = undefined;

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

Expand Down