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)
angular · Mar 22, 2024 · 935f931 · 935f931
1 parent c12907d
commit 935f931
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/index.ts b/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/index.ts
@@ -220,7 +220,7 @@ function startNodeServer(
 ): Observable<void> {
   const outputPath = serverOutput.outputPath as string;
   const path = join(outputPath, 'main.js');
-  const env = { ...process.env, PORT: '' + port };
+  const env = { ...process.env, SSR_PORT: '' + port, PORT: '' + port };
 
   const args = ['--enable-source-maps', `"${path}"`];
   if (inspectMode) {

diff --git a/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/proxy_spec.ts b/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/proxy_spec.ts
@@ -58,7 +58,7 @@ describe('Serve SSR Builder', () => {
           return server;
         }
 
-        app().listen(process.env['PORT']);
+        app().listen(process.env['SSR_PORT']);
 
         export * from './app/app.module.server';
       `,

diff --git a/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/ssl_spec.ts b/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/ssl_spec.ts
@@ -58,7 +58,7 @@ describe('Serve SSR Builder', () => {
           return server;
         }
 
-        app().listen(process.env['PORT']);
+        app().listen(process.env['SSR_PORT']);
 
         export * from './app/app.module.server';
       `,

diff --git a/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/works_spec.ts b/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/works_spec.ts
@@ -57,7 +57,7 @@ describe('Serve SSR Builder', () => {
         return server;
       }
 
-      app().listen(process.env['PORT']);
+      app().listen(process.env['SSR_PORT']);
 
       export * from './app/app.module.server';
       `,

diff --git a/packages/schematics/angular/migrations/update-17/replace-nguniversal-engines.ts b/packages/schematics/angular/migrations/update-17/replace-nguniversal-engines.ts
@@ -202,7 +202,7 @@ export function app(): express.Express {
 }
 
 function run(): void {
-  const port = process.env['PORT'] || 4000;
+  const port = process.env['SSR_PORT'] || 4000;
 
   // Start up the Node server
   const server = app();

diff --git a/packages/schematics/angular/migrations/update-17/replace-nguniversal-engines_spec.ts b/packages/schematics/angular/migrations/update-17/replace-nguniversal-engines_spec.ts
@@ -128,7 +128,7 @@ export function app(): express.Express {
 }
 
 function run() {
-  const port = process.env.PORT || 4000;
+  const port = process.env.SSR_PORT || 4000;
 
   // Start up the Node server
   const server = app();

diff --git a/packages/schematics/angular/ssr/files/application-builder/server.ts.template b/packages/schematics/angular/ssr/files/application-builder/server.ts.template
@@ -44,7 +44,7 @@ export function app(): express.Express {
 }
 
 function run(): void {
-  const port = process.env['PORT'] || 4000;
+  const port = process.env['SSR_PORT'] || 4000;
 
   // Start up the Node server
   const server = app();

diff --git a/packages/schematics/angular/ssr/files/server-builder/server.ts.template b/packages/schematics/angular/ssr/files/server-builder/server.ts.template
@@ -47,7 +47,7 @@ export function app(): express.Express {
 }
 
 function run(): void {
-  const port = process.env['PORT'] || 4000;
+  const port = process.env['SSR_PORT'] || 4000;
 
   // Start up the Node server
   const server = app();

diff --git a/tests/legacy-cli/e2e/assets/17-ssr-project-webpack/server.ts b/tests/legacy-cli/e2e/assets/17-ssr-project-webpack/server.ts
@@ -47,7 +47,7 @@ export function app(): express.Express {
 }
 
 function run(): void {
-  const port = process.env['PORT'] || 4000;
+  const port = process.env['SSR_PORT'] || 4000;
 
   // Start up the Node server
   const server = app();