Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion addon/ng2/blueprints/ng2/files/__path__/app/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export * from './environments/environment';
export * from './app.component';
export * from './app.module';
3 changes: 2 additions & 1 deletion addon/ng2/blueprints/ng2/files/__path__/main.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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();
Expand Down
4 changes: 2 additions & 2 deletions addon/ng2/models/webpack-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}/environments/environment.${environment}.ts`;

this.webpackBaseConfig = getWebpackCommonConfig(this.ngCliProject.root, sourceDir);
this.webpackDevConfigPartial = getWebpackDevConfigPartial(this.ngCliProject.root, sourceDir);
Expand All @@ -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}/environments`),
src: 'environment.ts',
dest: `environment.${this.environment}.ts`
}));
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down