Skip to content

Commit

Permalink
Made some changes that allow typings and e2e types to be read correctly.
Browse files Browse the repository at this point in the history
  • Loading branch information
TheLarkInn committed Jul 14, 2016
1 parent 42df3a6 commit 52445d8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
12 changes: 6 additions & 6 deletions addon/ng2/blueprints/ng2/files/__path__/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"baseUrl": ".",
"baseUrl":"./src",
"declaration": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
Expand All @@ -9,15 +9,15 @@
"moduleResolution": "node",
"outDir": "./dist/",
"rootDir": ".",
"mapRoot": "/",
"sourceMap": true,
"sourceRoot": "."
"sourceMap": true
},
"compileOnSave": false,
"buildOnSave": false,
"exclude": [
"node_modules",
"bower_components"
],
"files": [
"typings.d.ts"
"includes": [
"**.d.ts"
]
}
2 changes: 1 addition & 1 deletion addon/ng2/blueprints/ng2/files/e2e/typings.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/// <reference path="../typings/main.d.ts" />
/// <reference path="../typings/index.d.ts" />
3 changes: 1 addition & 2 deletions addon/ng2/models/webpack-build-common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ export const getWebpackCommonConfig = function(projectRoot: string) {
resolve: {
extensions: ['', '.ts', '.js'],
root: path.resolve(projectRoot, './src'),
plugins: [
]
moduleDirectories: ['node_modules']
},
context: path.resolve(__dirname, './'),
entry: {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@types/rimraf": "0.0.25-alpha",
"@types/webpack": "^1.12.22-alpha",
"angular2-template-loader": "^0.4.0",
"awesome-typescript-loader": "1.1.1",
"awesome-typescript-loader": "^2.0.1",
"chalk": "^1.1.3",
"compression-webpack-plugin": "^0.3.1",
"copy-webpack-plugin": "^3.0.1",
Expand Down Expand Up @@ -97,7 +97,7 @@
"typescript": "^2.0.0",
"typings": "^0.8.1",
"url-loader": "^0.5.7",
"webpack": "2.1.0-beta.15",
"webpack": "2.1.0-beta.17",
"webpack-dev-server": "^1.14.1",
"webpack-md5-hash": "0.0.5",
"webpack-merge": "^0.14.0"
Expand Down

0 comments on commit 52445d8

Please sign in to comment.