From 1b9c7df62c89d1a1f3c1eeb718a95fc1b2ef922b Mon Sep 17 00:00:00 2001 From: Colum Ferry Date: Fri, 18 Nov 2022 11:37:28 +0000 Subject: [PATCH] fix(angular): setup-ssr environments file replacements should be removed (#13244) (cherry picked from commit b88dc35aa56376d6c0fa2a01a728ffddb95eec47) --- .../__snapshots__/setup-ssr.spec.ts.snap | 6 ------ .../src/generators/setup-ssr/files/src/__main__ | 8 -------- .../setup-ssr/files/src/main.ts__tpl__ | 6 ------ .../setup-ssr/lib/update-project-config.ts | 12 ------------ .../src/generators/setup-ssr/setup-ssr.spec.ts | 16 +--------------- 5 files changed, 1 insertion(+), 47 deletions(-) diff --git a/packages/angular/src/generators/setup-ssr/__snapshots__/setup-ssr.spec.ts.snap b/packages/angular/src/generators/setup-ssr/__snapshots__/setup-ssr.spec.ts.snap index 1cf5440b8ac02..10c0e58642afb 100644 --- a/packages/angular/src/generators/setup-ssr/__snapshots__/setup-ssr.spec.ts.snap +++ b/packages/angular/src/generators/setup-ssr/__snapshots__/setup-ssr.spec.ts.snap @@ -9,12 +9,6 @@ Object { "sourceMap": true, }, "production": Object { - "fileReplacements": Array [ - Object { - "replace": "apps/app1/src/environments/environment.ts", - "with": "apps/app1/src/environments/environment.prod.ts", - }, - ], "outputHashing": "media", }, }, diff --git a/packages/angular/src/generators/setup-ssr/files/src/__main__ b/packages/angular/src/generators/setup-ssr/files/src/__main__ index 489e972eb5853..ccb72c72f9e23 100644 --- a/packages/angular/src/generators/setup-ssr/files/src/__main__ +++ b/packages/angular/src/generators/setup-ssr/files/src/__main__ @@ -7,13 +7,5 @@ */ import '@angular/platform-server/init'; -import { enableProdMode } from '@angular/core'; - -import { environment } from './environments/environment'; - -if (environment.production) { - enableProdMode(); -} - export { <%= rootModuleClassName %> } from './app/<%= rootModuleFileName.slice(0, -3) %>'; export { renderModule } from '@angular/platform-server'; \ No newline at end of file diff --git a/packages/angular/src/generators/setup-ssr/files/src/main.ts__tpl__ b/packages/angular/src/generators/setup-ssr/files/src/main.ts__tpl__ index 4d51709a53d60..d2a3aa3f049f7 100644 --- a/packages/angular/src/generators/setup-ssr/files/src/main.ts__tpl__ +++ b/packages/angular/src/generators/setup-ssr/files/src/main.ts__tpl__ @@ -1,12 +1,6 @@ -import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module'; -import { environment } from './environments/environment'; - -if (environment.production) { - enableProdMode(); -} function bootstrap() { platformBrowserDynamic() diff --git a/packages/angular/src/generators/setup-ssr/lib/update-project-config.ts b/packages/angular/src/generators/setup-ssr/lib/update-project-config.ts index 5b239fb614c7d..c5e87a82bbe14 100644 --- a/packages/angular/src/generators/setup-ssr/lib/update-project-config.ts +++ b/packages/angular/src/generators/setup-ssr/lib/update-project-config.ts @@ -21,18 +21,6 @@ export function updateProjectConfig(tree: Tree, schema: Schema) { configurations: { production: { outputHashing: 'media', - fileReplacements: [ - { - replace: joinPathFragments( - projectConfig.sourceRoot, - 'environments/environment.ts' - ), - with: joinPathFragments( - projectConfig.sourceRoot, - 'environments/environment.prod.ts' - ), - }, - ], }, development: { optimization: false, diff --git a/packages/angular/src/generators/setup-ssr/setup-ssr.spec.ts b/packages/angular/src/generators/setup-ssr/setup-ssr.spec.ts index 594abbcc6d891..607407c0e039b 100644 --- a/packages/angular/src/generators/setup-ssr/setup-ssr.spec.ts +++ b/packages/angular/src/generators/setup-ssr/setup-ssr.spec.ts @@ -34,27 +34,13 @@ describe('setupSSR', () => { */ import '@angular/platform-server/init'; - import { enableProdMode } from '@angular/core'; - - import { environment } from './environments/environment'; - - if (environment.production) { - enableProdMode(); - } - export { AppServerModule } from './app/app.server.module'; export { renderModule } from '@angular/platform-server';" `); expect(tree.read('apps/app1/src/main.ts', 'utf-8')).toMatchInlineSnapshot(` - "import { enableProdMode } from '@angular/core'; - import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + "import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module'; - import { environment } from './environments/environment'; - - if (environment.production) { - enableProdMode(); - } function bootstrap() { platformBrowserDynamic()