Skip to content

Commit 6911593

Browse files
committed
fix: moved environment files for app modules
1 parent 560ae8f commit 6911593

File tree

6 files changed

+3
-4
lines changed

6 files changed

+3
-4
lines changed

addon/ng2/models/webpack-build-development.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export const getWebpackDevConfigPartial = function(projectRoot: string, sourceDi
2020
fs: 'empty',
2121
global: 'window',
2222
crypto: 'empty',
23-
process: true,
2423
module: false,
2524
clearImmediate: false,
2625
setImmediate: false

addon/ng2/models/webpack-config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export class NgCliWebpackConfig {
2626
constructor(public ngCliProject: any, public target: string, public environment: string) {
2727
const sourceDir = CliConfig.fromProject().defaults.sourceDir;
2828

29-
const environmentPath = `./${sourceDir}/app/environments/environment.${environment}.ts`;
29+
const environmentPath = `./${sourceDir}/app/environment.${environment}.ts`;
3030

3131
this.webpackBaseConfig = getWebpackCommonConfig(this.ngCliProject.root, sourceDir);
3232
this.webpackDevConfigPartial = getWebpackDevConfigPartial(this.ngCliProject.root, sourceDir);
@@ -41,7 +41,7 @@ export class NgCliWebpackConfig {
4141

4242
this.generateConfig();
4343
this.config.plugins.unshift(new NgCliEnvironmentPlugin({
44-
path: path.resolve(this.ngCliProject.root, `./${sourceDir}/app/environments/`),
44+
path: path.resolve(this.ngCliProject.root, `./${sourceDir}/app`),
4545
src: 'environment.ts',
4646
dest: `environment.${this.environment}.ts`
4747
}));

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"typedoc": "^0.4.2",
9191
"typescript": "^2.0.0",
9292
"url-loader": "^0.5.7",
93-
"webpack": "2.1.0-beta.18",
93+
"webpack": "2.1.0-beta.20",
9494
"webpack-dev-server": "2.1.0-beta.0",
9595
"webpack-md5-hash": "0.0.5",
9696
"webpack-merge": "^0.14.0"

0 commit comments

Comments
 (0)