Skip to content

Commit a41acae

Browse files
committed
fixup! fix(@angular/build): resolve dev-server sslKey and sslCert relative to the workspace root
1 parent e6056d3 commit a41acae

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎packages/angular/build/src/builders/dev-server/options.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ export async function normalizeOptions(
147147
proxyConfig,
148148
servePath,
149149
ssl,
150-
sslCert,
151-
sslKey,
150+
sslCert: sslCert && path.resolve(workspaceRoot, sslCert),
151+
sslKey: sslKey && path.resolve(workspaceRoot, sslKey),
152152
// Prebundling defaults to true but requires caching to function
153153
prebundle: cacheOptions.enabled && !optimization.scripts && prebundle,
154154
inspect,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import { readFile } from 'node:fs/promises';
10-
import { join, resolve } from 'node:path';
10+
import { join } from 'node:path';
1111
import type * as Vite from 'vite' with {
1212
'resolution-mode': 'import',
1313
};
@@ -85,8 +85,8 @@ async function createServerConfig(
8585

8686
if (serverOptions.ssl && serverOptions.sslCert && serverOptions.sslKey) {
8787
const [cert, key] = await Promise.all([
88-
readFile(resolve(serverOptions.workspaceRoot, serverOptions.sslCert)),
89-
readFile(resolve(serverOptions.workspaceRoot, serverOptions.sslKey)),
88+
readFile(serverOptions.sslCert),
89+
readFile(serverOptions.sslKey),
9090
]);
9191

9292
server.https = {

0 commit comments

Comments
 (0)