Skip to content

Commit e2c8331

Browse files
author
Angular Builds
committed
aa6c757 fix(@angular-devkit/build-angular): construct SSR request URL using server resolvedUrls
1 parent a02327a commit e2c8331

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "@angular-devkit/build-angular",
3-
"version": "17.0.7+sha-0662048",
3+
"version": "17.0.7+sha-aa6c757",
44
"description": "Angular Webpack Build Facade",
55
"main": "src/index.js",
66
"typings": "src/index.d.ts",
77
"builders": "builders.json",
88
"dependencies": {
99
"@ampproject/remapping": "2.2.1",
10-
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#0662048",
11-
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#0662048",
12-
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#0662048",
10+
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#aa6c757",
11+
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#aa6c757",
12+
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#aa6c757",
1313
"@babel/core": "7.23.2",
1414
"@babel/generator": "7.23.0",
1515
"@babel/helper-annotate-as-pure": "7.22.5",
@@ -20,7 +20,7 @@
2020
"@babel/preset-env": "7.23.2",
2121
"@babel/runtime": "7.23.2",
2222
"@discoveryjs/json-ext": "0.5.7",
23-
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#0662048",
23+
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#aa6c757",
2424
"@vitejs/plugin-basic-ssl": "1.0.1",
2525
"ansi-colors": "4.1.3",
2626
"autoprefixer": "10.4.16",

src/builders/dev-server/vite-server.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,11 +505,9 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
505505
return;
506506
}
507507
transformIndexHtmlAndAddHeaders(url, rawHtml, res, next, async (html) => {
508-
const protocol = serverOptions.ssl ? 'https' : 'http';
509-
const route = `${protocol}://${req.headers.host}${req.originalUrl}`;
510508
const { content } = await (0, render_page_1.renderPage)({
511509
document: html,
512-
route,
510+
route: new URL(req.originalUrl ?? '/', server.resolvedUrls?.local[0]).toString(),
513511
serverContext: 'ssr',
514512
loadBundle: (uri) =>
515513
// eslint-disable-next-line @typescript-eslint/no-explicit-any

uniqueId

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Wed Dec 13 2023 17:20:34 GMT+0000 (Coordinated Universal Time)
1+
Wed Dec 13 2023 19:18:26 GMT+0000 (Coordinated Universal Time)

0 commit comments

Comments
 (0)