Skip to content

Commit 52445d8

Browse files
committed
Made some changes that allow typings and e2e types to be read correctly.
1 parent 42df3a6 commit 52445d8

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
"baseUrl": ".",
3+
"baseUrl":"./src",
44
"declaration": false,
55
"emitDecoratorMetadata": true,
66
"experimentalDecorators": true,
@@ -9,15 +9,15 @@
99
"moduleResolution": "node",
1010
"outDir": "./dist/",
1111
"rootDir": ".",
12-
"mapRoot": "/",
13-
"sourceMap": true,
14-
"sourceRoot": "."
12+
"sourceMap": true
1513
},
14+
"compileOnSave": false,
15+
"buildOnSave": false,
1616
"exclude": [
1717
"node_modules",
1818
"bower_components"
1919
],
20-
"files": [
21-
"typings.d.ts"
20+
"includes": [
21+
"**.d.ts"
2222
]
2323
}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/// <reference path="../typings/main.d.ts" />
1+
/// <reference path="../typings/index.d.ts" />

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ export const getWebpackCommonConfig = function(projectRoot: string) {
1818
resolve: {
1919
extensions: ['', '.ts', '.js'],
2020
root: path.resolve(projectRoot, './src'),
21-
plugins: [
22-
]
21+
moduleDirectories: ['node_modules']
2322
},
2423
context: path.resolve(__dirname, './'),
2524
entry: {

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@types/rimraf": "0.0.25-alpha",
3737
"@types/webpack": "^1.12.22-alpha",
3838
"angular2-template-loader": "^0.4.0",
39-
"awesome-typescript-loader": "1.1.1",
39+
"awesome-typescript-loader": "^2.0.1",
4040
"chalk": "^1.1.3",
4141
"compression-webpack-plugin": "^0.3.1",
4242
"copy-webpack-plugin": "^3.0.1",
@@ -97,7 +97,7 @@
9797
"typescript": "^2.0.0",
9898
"typings": "^0.8.1",
9999
"url-loader": "^0.5.7",
100-
"webpack": "2.1.0-beta.15",
100+
"webpack": "2.1.0-beta.17",
101101
"webpack-dev-server": "^1.14.1",
102102
"webpack-md5-hash": "0.0.5",
103103
"webpack-merge": "^0.14.0"

0 commit comments

Comments
 (0)