Skip to content

Commit 935f931

Browse files
9kubczas4clydin
authored andcommittedMar 22, 2024·
fix(@schematics/angular): rename SSR port env variable
Rename the SSR port env variable to SSR_PORT. It could help to resolve this firebase issue: firebase/firebase-tools#6651 (comment), cause PORT is reserved environment variable: https://firebase.google.com/docs/functions/config-env?gen=2nd#reserved-names. (cherry picked from commit 950a445)
1 parent c12907d commit 935f931

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed
 

‎packages/angular_devkit/build_angular/src/builders/ssr-dev-server/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ function startNodeServer(
220220
): Observable<void> {
221221
const outputPath = serverOutput.outputPath as string;
222222
const path = join(outputPath, 'main.js');
223-
const env = { ...process.env, PORT: '' + port };
223+
const env = { ...process.env, SSR_PORT: '' + port, PORT: '' + port };
224224

225225
const args = ['--enable-source-maps', `"${path}"`];
226226
if (inspectMode) {

‎packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/proxy_spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ describe('Serve SSR Builder', () => {
5858
return server;
5959
}
6060
61-
app().listen(process.env['PORT']);
61+
app().listen(process.env['SSR_PORT']);
6262
6363
export * from './app/app.module.server';
6464
`,

‎packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/ssl_spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ describe('Serve SSR Builder', () => {
5858
return server;
5959
}
6060
61-
app().listen(process.env['PORT']);
61+
app().listen(process.env['SSR_PORT']);
6262
6363
export * from './app/app.module.server';
6464
`,

‎packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/works_spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ describe('Serve SSR Builder', () => {
5757
return server;
5858
}
5959
60-
app().listen(process.env['PORT']);
60+
app().listen(process.env['SSR_PORT']);
6161
6262
export * from './app/app.module.server';
6363
`,

‎packages/schematics/angular/migrations/update-17/replace-nguniversal-engines.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ export function app(): express.Express {
202202
}
203203
204204
function run(): void {
205-
const port = process.env['PORT'] || 4000;
205+
const port = process.env['SSR_PORT'] || 4000;
206206
207207
// Start up the Node server
208208
const server = app();

‎packages/schematics/angular/migrations/update-17/replace-nguniversal-engines_spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export function app(): express.Express {
128128
}
129129
130130
function run() {
131-
const port = process.env.PORT || 4000;
131+
const port = process.env.SSR_PORT || 4000;
132132
133133
// Start up the Node server
134134
const server = app();

‎packages/schematics/angular/ssr/files/application-builder/server.ts.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export function app(): express.Express {
4444
}
4545

4646
function run(): void {
47-
const port = process.env['PORT'] || 4000;
47+
const port = process.env['SSR_PORT'] || 4000;
4848

4949
// Start up the Node server
5050
const server = app();

‎packages/schematics/angular/ssr/files/server-builder/server.ts.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export function app(): express.Express {
4747
}
4848

4949
function run(): void {
50-
const port = process.env['PORT'] || 4000;
50+
const port = process.env['SSR_PORT'] || 4000;
5151

5252
// Start up the Node server
5353
const server = app();

‎tests/legacy-cli/e2e/assets/17-ssr-project-webpack/server.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export function app(): express.Express {
4747
}
4848

4949
function run(): void {
50-
const port = process.env['PORT'] || 4000;
50+
const port = process.env['SSR_PORT'] || 4000;
5151

5252
// Start up the Node server
5353
const server = app();

0 commit comments

Comments
 (0)
Please sign in to comment.