Skip to content

Commit 2882ce6

Browse files
committed
updated deps and attempting to get a-t-loader to work with ts@next
1 parent 60fb36a commit 2882ce6

File tree

3 files changed

+9
-17
lines changed

3 files changed

+9
-17
lines changed

addon/ng2/blueprints/ng2/files/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"protractor": "^3.3.0",
4747
"ts-node": "^0.5.5",
4848
"tslint": "^3.6.0",
49-
"typescript": "^1.9.0-dev.20160611-1.0",
49+
"typescript": "^1.9.0-dev.20160613-1.0",
5050
"typings": "^0.8.1"
5151
}
5252
}

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ export const webpackCommonConfig = {
5555
vendor: ngAppResolve('./src/vendor.ts'),
5656
polyfills: ngAppResolve('./src/polyfills.ts')
5757
},
58-
5958
output: {
6059
path: ngAppResolve('./dist'),
6160
filename: '[name].bundle.js'
@@ -79,10 +78,10 @@ export const webpackCommonConfig = {
7978
query: {
8079
useWebpackText: true,
8180
tsconfig: ngAppResolve('./src/tsconfig.json'),
82-
resolveGlobs: false
83-
// module: "es6",
84-
// target: "es5",
85-
// lib: ["es6", "dom"]
81+
resolveGlobs: false,
82+
module: "es6",
83+
target: "es5",
84+
lib: ["es6", "dom"]
8685
}
8786
},
8887
{

package.json

+4-11
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,11 @@
3030
},
3131
"homepage": "https://github.com/angular/angular-cli",
3232
"dependencies": {
33-
"angular2-template-loader": "^0.2.0",
34-
"awesome-typescript-loader": "^0.19.0",
33+
"angular2-template-loader": "^0.4.0",
34+
"awesome-typescript-loader": "^1.0.0",
3535
"babel-core": "^6.9.1",
3636
"babel-loader": "^6.2.4",
3737
"babel-preset-es2015-webpack": "^6.4.1",
38-
"broccoli": "^1.0.0-beta.7",
39-
"broccoli-caching-writer": "^2.2.1",
40-
"broccoli-concat": "^2.2.0",
41-
"broccoli-funnel": "^1.0.1",
42-
"broccoli-merge-trees": "^1.1.1",
43-
"broccoli-source": "^1.1.0",
44-
"broccoli-uglify-js": "^0.1.3",
45-
"broccoli-writer": "^0.1.1",
4638
"chalk": "^1.1.3",
4739
"core-js": "^2.4.0",
4840
"ember-cli": "2.5.0",
@@ -65,9 +57,10 @@
6557
"systemjs-builder": "0.15.17",
6658
"ts-helpers": "^1.1.1",
6759
"ts-loader": "^0.8.2",
68-
"typescript": "^1.9.0-dev.20160611-1.0",
60+
"typescript": "^1.9.0-dev.20160613-1.0",
6961
"typings": "^0.8.1",
7062
"webpack": "2.1.0-beta.13",
63+
"webpack-closure-compiler": "^2.0.2",
7164
"webpack-dev-server": "^1.14.1"
7265
},
7366
"ember-addon": {

0 commit comments

Comments
 (0)