Skip to content

Commit 3dd9c17

Browse files
hanslhansl
committed
.
1 parent f4d94a7 commit 3dd9c17

File tree

9 files changed

+41
-49
lines changed

9 files changed

+41
-49
lines changed

‎packages/@ngtools/webpack/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
"source-map": "^0.5.6"
3232
},
3333
"peerDependencies": {
34-
"@angular/compiler": "2.2.3",
35-
"@angular/compiler-cli": "2.2.3",
36-
"@angular/core": "2.2.3",
34+
"@angular/compiler": "~2.3.1",
35+
"@angular/compiler-cli": "~2.3.1",
36+
"@angular/core": "~2.3.1",
3737
"@angular/tsc-wrapped": "0.4.0",
3838
"typescript": "^2.0.2",
3939
"reflect-metadata": "^0.1.8",

‎packages/@ngtools/webpack/src/plugin.ts

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {WebpackResourceLoader} from './resource_loader';
99
import {createResolveDependenciesFromContextMap} from './utils';
1010
import {WebpackCompilerHost} from './compiler_host';
1111
import {resolveEntryModuleFromMain} from './entry_resolver';
12-
import {StaticSymbol} from '@angular/compiler-cli';
1312
import {Tapable} from './webpack';
1413
import {PathsPlugin} from './paths-plugin';
1514

@@ -122,7 +121,7 @@ export class AotPlugin implements Tapable {
122121

123122
const re = new RegExp('^' + pattern + '$');
124123
fileNames = fileNames.filter(x => !x.match(re));
125-
})
124+
});
126125
} else {
127126
fileNames = fileNames.filter(fileName => !/\.spec\.ts$/.test(fileName));
128127
}
@@ -140,7 +139,7 @@ export class AotPlugin implements Tapable {
140139
);
141140

142141
if (this._angularCompilerOptions.hasOwnProperty('genDir')) {
143-
genDir = this._angularCompilerOptions.genDir;
142+
genDir = path.join(basePath, this._angularCompilerOptions.genDir);
144143
}
145144

146145
this._basePath = basePath;
@@ -245,13 +244,6 @@ export class AotPlugin implements Tapable {
245244

246245
this._resourceLoader = new WebpackResourceLoader(compilation);
247246

248-
const i18nOptions: ngCompiler.NgcCliOptions = {
249-
i18nFile: this.i18nFile,
250-
i18nFormat: this.i18nFormat,
251-
locale: this.locale,
252-
basePath: this.basePath
253-
};
254-
255247
this._donePromise = Promise.resolve()
256248
.then(() => {
257249
if (this._skipCodeGeneration) {
@@ -265,9 +257,9 @@ export class AotPlugin implements Tapable {
265257
program: this._program,
266258
host: this._compilerHost,
267259
angularCompilerOptions: this._angularCompilerOptions,
268-
i18nFormat: null,
269-
i18nFile: null,
270-
locale: null,
260+
i18nFile: this.i18nFile,
261+
i18nFormat: this.i18nFormat,
262+
locale: this.locale,
271263

272264
readResource: (path: string) => this._resourceLoader.get(path)
273265
});
@@ -306,7 +298,7 @@ export class AotPlugin implements Tapable {
306298
program: this._program,
307299
host: this._compilerHost,
308300
angularCompilerOptions: this._angularCompilerOptions,
309-
entryModule: this._entryModule.toString()
301+
entryModule: this._entryModule
310302
});
311303
Object.keys(allLazyRoutes)
312304
.forEach(k => {

‎packages/angular-cli/blueprints/ng2/files/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/common": "2.2.3",
17-
"@angular/compiler": "2.2.3",
18-
"@angular/core": "2.2.3",
19-
"@angular/forms": "2.2.3",
20-
"@angular/http": "2.2.3",
21-
"@angular/platform-browser": "2.2.3",
22-
"@angular/platform-browser-dynamic": "2.2.3",
16+
"@angular/common": "~2.3.1",
17+
"@angular/compiler": "~2.3.1",
18+
"@angular/core": "~2.3.1",
19+
"@angular/forms": "~2.3.1",
20+
"@angular/http": "~2.3.1",
21+
"@angular/platform-browser": "~2.3.1",
22+
"@angular/platform-browser-dynamic": "~2.3.1",
2323
"@angular/router": "3.2.3",
2424
"core-js": "^2.4.1",
2525
"rxjs": "5.0.0-beta.12",
2626
"ts-helpers": "^1.1.1",
2727
"zone.js": "^0.6.23"
2828
},
2929
"devDependencies": {
30-
"@angular/compiler-cli": "2.2.3",
30+
"@angular/compiler-cli": "~2.3.1",
3131
"@types/jasmine": "2.5.38",
3232
"@types/node": "^6.0.42",
3333
"angular-cli": "<%= version %>",

‎packages/angular-cli/models/webpack-build-typescript.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ export const getWebpackAotConfigPartial = function(projectRoot: string, appConfi
5151
mainPath: path.join(projectRoot, appConfig.root, appConfig.main),
5252
i18nFile: i18nFile,
5353
i18nFormat: i18nFormat,
54-
locale: locale
54+
locale: locale,
5555
exclude: [
5656
path.join(projectRoot, appConfig.root, appConfig.test),
5757
'**/*.spec.ts'
5858
]
59-
}),
59+
})
6060
]
6161
};
6262
};

‎packages/angular-cli/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"dependencies": {
2828
"@angular-cli/ast-tools": "^1.0.1",
2929
"@angular-cli/base-href-webpack": "^1.0.0",
30-
"@angular/compiler": "2.2.3",
31-
"@angular/compiler-cli": "2.2.3",
32-
"@angular/core": "2.2.3",
30+
"@angular/compiler": "~2.3.1",
31+
"@angular/compiler-cli": "~2.3.1",
32+
"@angular/core": "~2.3.1",
3333
"@ngtools/webpack": "^1.0.0",
3434
"async": "^2.1.4",
3535
"autoprefixer": "^6.5.3",

‎tests/e2e/assets/webpack/test-app-weird/not/so/source/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"compilerOptions": {
3-
"baseUrl": "",
43
"module": "es2015",
54
"moduleResolution": "node",
65
"target": "es5",

‎tests/e2e/assets/webpack/test-app-weird/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"name": "test",
33
"license": "MIT",
44
"dependencies": {
5-
"@angular/common": "2.2.1",
6-
"@angular/compiler": "2.2.1",
7-
"@angular/compiler-cli": "2.2.1",
8-
"@angular/core": "2.2.1",
9-
"@angular/http": "2.2.1",
10-
"@angular/platform-browser": "2.2.1",
11-
"@angular/platform-browser-dynamic": "2.2.1",
12-
"@angular/platform-server": "2.2.1",
13-
"@angular/router": "3.2.1",
5+
"@angular/common": "~2.3.1",
6+
"@angular/compiler": "~2.3.1",
7+
"@angular/compiler-cli": "~2.3.1",
8+
"@angular/core": "~2.3.1",
9+
"@angular/http": "~2.3.1",
10+
"@angular/platform-browser": "~2.3.1",
11+
"@angular/platform-browser-dynamic": "~2.3.1",
12+
"@angular/platform-server": "~2.3.1",
13+
"@angular/router": "~3.2.3",
1414
"@ngtools/webpack": "0.0.0",
1515
"core-js": "^2.4.1",
1616
"rxjs": "^5.0.0-beta.12",

‎tests/e2e/assets/webpack/test-app/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"name": "test",
33
"license": "MIT",
44
"dependencies": {
5-
"@angular/common": "2.2.3",
6-
"@angular/compiler": "2.2.3",
7-
"@angular/compiler-cli": "2.2.3",
8-
"@angular/core": "2.2.3",
9-
"@angular/http": "2.2.3",
10-
"@angular/platform-browser": "2.2.3",
11-
"@angular/platform-browser-dynamic": "2.2.3",
12-
"@angular/platform-server": "2.2.3",
13-
"@angular/router": "3.2.3",
5+
"@angular/common": "~2.3.1",
6+
"@angular/compiler": "~2.3.1",
7+
"@angular/compiler-cli": "~2.3.1",
8+
"@angular/core": "~2.3.1",
9+
"@angular/http": "~2.3.1",
10+
"@angular/platform-browser": "~2.3.1",
11+
"@angular/platform-browser-dynamic": "~2.3.1",
12+
"@angular/platform-server": "~2.3.1",
13+
"@angular/router": "~3.2.3",
1414
"@ngtools/webpack": "0.0.0",
1515
"core-js": "^2.4.1",
1616
"rxjs": "^5.0.0-beta.12",

‎tests/e2e/assets/webpack/test-app/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"compilerOptions": {
3+
"baseUrl": "",
34
"module": "es2015",
45
"moduleResolution": "node",
56
"target": "es5",

0 commit comments

Comments
 (0)