From 0c158ed78eb2dd9b3b00c27ce12441f6db5b1e1a Mon Sep 17 00:00:00 2001 From: Sean Larkin Date: Tue, 9 Aug 2016 09:46:03 -0500 Subject: [PATCH 1/6] fix: moved environment files for app modules --- .../files/__path__/app/{environments => }/environment.dev.ts | 0 .../files/__path__/app/{environments => }/environment.prod.ts | 0 .../ng2/files/__path__/app/{environments => }/environment.ts | 0 addon/ng2/models/webpack-build-development.ts | 1 - addon/ng2/models/webpack-config.ts | 4 ++-- package.json | 2 +- 6 files changed, 3 insertions(+), 4 deletions(-) rename addon/ng2/blueprints/ng2/files/__path__/app/{environments => }/environment.dev.ts (100%) rename addon/ng2/blueprints/ng2/files/__path__/app/{environments => }/environment.prod.ts (100%) rename addon/ng2/blueprints/ng2/files/__path__/app/{environments => }/environment.ts (100%) diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/environments/environment.dev.ts b/addon/ng2/blueprints/ng2/files/__path__/app/environment.dev.ts similarity index 100% rename from addon/ng2/blueprints/ng2/files/__path__/app/environments/environment.dev.ts rename to addon/ng2/blueprints/ng2/files/__path__/app/environment.dev.ts diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/environments/environment.prod.ts b/addon/ng2/blueprints/ng2/files/__path__/app/environment.prod.ts similarity index 100% rename from addon/ng2/blueprints/ng2/files/__path__/app/environments/environment.prod.ts rename to addon/ng2/blueprints/ng2/files/__path__/app/environment.prod.ts diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/environments/environment.ts b/addon/ng2/blueprints/ng2/files/__path__/app/environment.ts similarity index 100% rename from addon/ng2/blueprints/ng2/files/__path__/app/environments/environment.ts rename to addon/ng2/blueprints/ng2/files/__path__/app/environment.ts diff --git a/addon/ng2/models/webpack-build-development.ts b/addon/ng2/models/webpack-build-development.ts index 8c0ad7d146e4..b2b88bde63d3 100644 --- a/addon/ng2/models/webpack-build-development.ts +++ b/addon/ng2/models/webpack-build-development.ts @@ -20,7 +20,6 @@ export const getWebpackDevConfigPartial = function(projectRoot: string, sourceDi fs: 'empty', global: 'window', crypto: 'empty', - process: true, module: false, clearImmediate: false, setImmediate: false diff --git a/addon/ng2/models/webpack-config.ts b/addon/ng2/models/webpack-config.ts index a215217c0afa..53f5de786304 100644 --- a/addon/ng2/models/webpack-config.ts +++ b/addon/ng2/models/webpack-config.ts @@ -26,7 +26,7 @@ export class NgCliWebpackConfig { constructor(public ngCliProject: any, public target: string, public environment: string) { const sourceDir = CliConfig.fromProject().defaults.sourceDir; - const environmentPath = `./${sourceDir}/app/environments/environment.${environment}.ts`; + const environmentPath = `./${sourceDir}/app/environment.${environment}.ts`; this.webpackBaseConfig = getWebpackCommonConfig(this.ngCliProject.root, sourceDir); this.webpackDevConfigPartial = getWebpackDevConfigPartial(this.ngCliProject.root, sourceDir); @@ -41,7 +41,7 @@ export class NgCliWebpackConfig { this.generateConfig(); this.config.plugins.unshift(new NgCliEnvironmentPlugin({ - path: path.resolve(this.ngCliProject.root, `./${sourceDir}/app/environments/`), + path: path.resolve(this.ngCliProject.root, `./${sourceDir}/app`), src: 'environment.ts', dest: `environment.${this.environment}.ts` })); diff --git a/package.json b/package.json index 0e8cc9d9ce9f..5c9c5a2414b9 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "typedoc": "^0.4.2", "typescript": "^2.0.0", "url-loader": "^0.5.7", - "webpack": "2.1.0-beta.18", + "webpack": "2.1.0-beta.20", "webpack-dev-server": "2.1.0-beta.0", "webpack-md5-hash": "0.0.5", "webpack-merge": "^0.14.0" From c39f7f4ae76d8571f10c36fc290d8caa320be054 Mon Sep 17 00:00:00 2001 From: Sean Larkin Date: Tue, 9 Aug 2016 09:57:36 -0500 Subject: [PATCH 2/6] fix: moved environment files for app modules --- addon/ng2/models/webpack-build-common.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/addon/ng2/models/webpack-build-common.ts b/addon/ng2/models/webpack-build-common.ts index dfcbb9f65def..bcd7c117c284 100644 --- a/addon/ng2/models/webpack-build-common.ts +++ b/addon/ng2/models/webpack-build-common.ts @@ -83,6 +83,7 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) { fs: 'empty', global: 'window', crypto: 'empty', + process: true, module: false, clearImmediate: false, setImmediate: false From 196502129484884843ae116b1d5ed036de1aa603 Mon Sep 17 00:00:00 2001 From: Sean Larkin Date: Tue, 9 Aug 2016 09:58:42 -0500 Subject: [PATCH 3/6] fix: moved environment files for app modules --- addon/ng2/models/webpack-build-common.ts | 1 - addon/ng2/models/webpack-build-development.ts | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/ng2/models/webpack-build-common.ts b/addon/ng2/models/webpack-build-common.ts index bcd7c117c284..dfcbb9f65def 100644 --- a/addon/ng2/models/webpack-build-common.ts +++ b/addon/ng2/models/webpack-build-common.ts @@ -83,7 +83,6 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) { fs: 'empty', global: 'window', crypto: 'empty', - process: true, module: false, clearImmediate: false, setImmediate: false diff --git a/addon/ng2/models/webpack-build-development.ts b/addon/ng2/models/webpack-build-development.ts index b2b88bde63d3..8c0ad7d146e4 100644 --- a/addon/ng2/models/webpack-build-development.ts +++ b/addon/ng2/models/webpack-build-development.ts @@ -20,6 +20,7 @@ export const getWebpackDevConfigPartial = function(projectRoot: string, sourceDi fs: 'empty', global: 'window', crypto: 'empty', + process: true, module: false, clearImmediate: false, setImmediate: false From 284d85a2e5ae6af60ae650417d9c5f54f60030ef Mon Sep 17 00:00:00 2001 From: Sean Larkin Date: Tue, 9 Aug 2016 11:09:25 -0500 Subject: [PATCH 4/6] fix: update barrel export for envionment --- addon/ng2/blueprints/ng2/files/__path__/app/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/index.ts b/addon/ng2/blueprints/ng2/files/__path__/app/index.ts index 87743c9d56ee..587f81f19971 100644 --- a/addon/ng2/blueprints/ng2/files/__path__/app/index.ts +++ b/addon/ng2/blueprints/ng2/files/__path__/app/index.ts @@ -1,3 +1,3 @@ -export * from './environments/environment'; +export * from './environment'; export * from './app.component'; export * from './app.module'; From cb59744f0f8cb9c8ed05519c61fea2d83bd733b0 Mon Sep 17 00:00:00 2001 From: Sean Larkin Date: Tue, 9 Aug 2016 12:17:41 -0500 Subject: [PATCH 5/6] fix: move environment to config instead of app --- addon/ng2/blueprints/ng2/files/__path__/app/index.ts | 1 - .../files/__path__/{app => environments}/environment.dev.ts | 0 .../files/__path__/{app => environments}/environment.prod.ts | 0 .../ng2/files/__path__/{app => environments}/environment.ts | 0 addon/ng2/blueprints/ng2/files/__path__/main.ts | 4 +++- addon/ng2/models/webpack-config.ts | 4 ++-- 6 files changed, 5 insertions(+), 4 deletions(-) rename addon/ng2/blueprints/ng2/files/__path__/{app => environments}/environment.dev.ts (100%) rename addon/ng2/blueprints/ng2/files/__path__/{app => environments}/environment.prod.ts (100%) rename addon/ng2/blueprints/ng2/files/__path__/{app => environments}/environment.ts (100%) diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/index.ts b/addon/ng2/blueprints/ng2/files/__path__/app/index.ts index 587f81f19971..875bdb2f254f 100644 --- a/addon/ng2/blueprints/ng2/files/__path__/app/index.ts +++ b/addon/ng2/blueprints/ng2/files/__path__/app/index.ts @@ -1,3 +1,2 @@ -export * from './environment'; export * from './app.component'; export * from './app.module'; diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/environment.dev.ts b/addon/ng2/blueprints/ng2/files/__path__/environments/environment.dev.ts similarity index 100% rename from addon/ng2/blueprints/ng2/files/__path__/app/environment.dev.ts rename to addon/ng2/blueprints/ng2/files/__path__/environments/environment.dev.ts diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/environment.prod.ts b/addon/ng2/blueprints/ng2/files/__path__/environments/environment.prod.ts similarity index 100% rename from addon/ng2/blueprints/ng2/files/__path__/app/environment.prod.ts rename to addon/ng2/blueprints/ng2/files/__path__/environments/environment.prod.ts diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/environment.ts b/addon/ng2/blueprints/ng2/files/__path__/environments/environment.ts similarity index 100% rename from addon/ng2/blueprints/ng2/files/__path__/app/environment.ts rename to addon/ng2/blueprints/ng2/files/__path__/environments/environment.ts diff --git a/addon/ng2/blueprints/ng2/files/__path__/main.ts b/addon/ng2/blueprints/ng2/files/__path__/main.ts index 4bdf15c04a38..f8763a3e06a2 100644 --- a/addon/ng2/blueprints/ng2/files/__path__/main.ts +++ b/addon/ng2/blueprints/ng2/files/__path__/main.ts @@ -1,6 +1,8 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { enableProdMode } from '@angular/core'; -import { AppModule, environment } from './app/'; +import { AppModule } from './app/'; +import { environment } from './environments/environment'; + if (environment.production) { enableProdMode(); diff --git a/addon/ng2/models/webpack-config.ts b/addon/ng2/models/webpack-config.ts index 53f5de786304..8d3180cad798 100644 --- a/addon/ng2/models/webpack-config.ts +++ b/addon/ng2/models/webpack-config.ts @@ -26,7 +26,7 @@ export class NgCliWebpackConfig { constructor(public ngCliProject: any, public target: string, public environment: string) { const sourceDir = CliConfig.fromProject().defaults.sourceDir; - const environmentPath = `./${sourceDir}/app/environment.${environment}.ts`; + const environmentPath = `./${sourceDir}/environments/environment.${environment}.ts`; this.webpackBaseConfig = getWebpackCommonConfig(this.ngCliProject.root, sourceDir); this.webpackDevConfigPartial = getWebpackDevConfigPartial(this.ngCliProject.root, sourceDir); @@ -41,7 +41,7 @@ export class NgCliWebpackConfig { this.generateConfig(); this.config.plugins.unshift(new NgCliEnvironmentPlugin({ - path: path.resolve(this.ngCliProject.root, `./${sourceDir}/app`), + path: path.resolve(this.ngCliProject.root, `./${sourceDir}/environments`), src: 'environment.ts', dest: `environment.${this.environment}.ts` })); From dc77ec6e63f4bde342540153a384a35d13849bf4 Mon Sep 17 00:00:00 2001 From: Sean Larkin Date: Tue, 9 Aug 2016 14:43:31 -0500 Subject: [PATCH 6/6] fix: move the environment files in an envronment folder in src next to main.ts --- addon/ng2/blueprints/ng2/files/__path__/main.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/addon/ng2/blueprints/ng2/files/__path__/main.ts b/addon/ng2/blueprints/ng2/files/__path__/main.ts index f8763a3e06a2..adabd542bd68 100644 --- a/addon/ng2/blueprints/ng2/files/__path__/main.ts +++ b/addon/ng2/blueprints/ng2/files/__path__/main.ts @@ -3,7 +3,6 @@ import { enableProdMode } from '@angular/core'; import { AppModule } from './app/'; import { environment } from './environments/environment'; - if (environment.production) { enableProdMode(); }