From cc6c859bf6d464e1bc60ce164fb6986b528051e4 Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Mon, 31 Mar 2025 08:03:11 +0000 Subject: [PATCH] fix(@angular/build): correctly handle `false` value in server option The schema included a top-level `type`, preventing this option from functioning correctly. Closes: #29969 --- goldens/public-api/angular/build/index.api.md | 4 ++-- .../angular/build/src/builders/application/options.ts | 8 +++++--- .../angular/build/src/builders/application/schema.json | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/goldens/public-api/angular/build/index.api.md b/goldens/public-api/angular/build/index.api.md index 3e0a2578ed12..4eba5f49ed98 100644 --- a/goldens/public-api/angular/build/index.api.md +++ b/goldens/public-api/angular/build/index.api.md @@ -57,8 +57,8 @@ export type ApplicationBuilderOptions = { progress?: boolean; scripts?: ScriptElement[]; security?: Security; - server?: string; - serviceWorker?: ServiceWorker_2; + server?: Serv; + serviceWorker?: Serv; sourceMap?: SourceMapUnion; ssr?: SsrUnion; statsJson?: boolean; diff --git a/packages/angular/build/src/builders/application/options.ts b/packages/angular/build/src/builders/application/options.ts index 2fd1a2f5430c..d80a6312ba69 100644 --- a/packages/angular/build/src/builders/application/options.ts +++ b/packages/angular/build/src/builders/application/options.ts @@ -259,10 +259,12 @@ export async function normalizeOptions( : await getTailwindConfig(searchDirectories, workspaceRoot, context); let serverEntryPoint: string | undefined; - if (options.server) { + if (typeof options.server === 'string') { + if (options.server === '') { + throw new Error('The "server" option cannot be an empty string.'); + } + serverEntryPoint = path.join(workspaceRoot, options.server); - } else if (options.server === '') { - throw new Error('The "server" option cannot be an empty string.'); } let prerenderOptions; diff --git a/packages/angular/build/src/builders/application/schema.json b/packages/angular/build/src/builders/application/schema.json index 38232fe0ccbb..9fa9ce324698 100644 --- a/packages/angular/build/src/builders/application/schema.json +++ b/packages/angular/build/src/builders/application/schema.json @@ -17,7 +17,6 @@ "description": "The full path for the browser entry point to the application, relative to the current workspace." }, "server": { - "type": "string", "description": "The full path for the server entry point to the application, relative to the current workspace.", "oneOf": [ {