Skip to content

Commit 5e9f34b

Browse files
committed
feat: update blueprints and broccoli config to [email protected]
Closes #108
1 parent d89d717 commit 5e9f34b

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"version": "0.0.0",
44
"license": "Apache-2.0",
55
"dependencies": {
6-
"angular2": "2.0.0-alpha.53",
6+
"angular2": "2.0.0-alpha.54",
77
"es6-promise": "^3.0.2",
88
"es6-shim": "^0.33.3",
99
"reflect-metadata": "0.1.2",
10-
"rxjs": "5.0.0-alpha.14",
10+
"rxjs": "5.0.0-beta.0",
1111
"systemjs": "0.19.4",
12-
"zone.js": "0.5.8"
12+
"zone.js": "0.5.10"
1313
},
1414
"devDependencies": {
1515
"angular-cli": "0.0.*",
+11-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
<!doctype html>
22
<html>
33
<head>
4+
<meta charset="utf-8">
45
<title><%= jsComponentName %></title>
56
<base href=".">
7+
<script src="vendor/angular2/bundles/angular2-polyfills.js"></script>
8+
{{content-for 'head'}}
9+
<link rel="icon" type="image/x-icon" href="favicon.ico">
10+
</head>
11+
<body>
12+
<<%= htmlComponentName %>-app>Loading...</<%= htmlComponentName %>-app>
13+
614
<script src="vendor/systemjs/dist/system.src.js"></script>
15+
<script src="vendor/rxjs/bundles/Rx.js"></script>
716
<script src="vendor/angular2/bundles/angular2.dev.js"></script>
8-
{{content-for 'head'}}
17+
<script src="vendor/angular2/bundles/http.dev.js"></script>
18+
<script src="vendor/angular2/bundles/router.dev.js"></script>
919
<script>
1020
System.config({
1121
packages: {
@@ -17,9 +27,5 @@
1727
});
1828
System.import('app.js').then(null, console.error.bind(console));
1929
</script>
20-
<link rel="icon" type="image/x-icon" href="favicon.ico" />
21-
</head>
22-
<body>
23-
<<%= htmlComponentName %>-app>Loading...</<%= htmlComponentName %>-app>
2430
</body>
2531
</html>

lib/broccoli/angular2-app.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,12 @@ Angular2App.prototype.toTree = function () {
3636

3737
var vendorJsTree = new Funnel('node_modules', {
3838
files: [
39+
'angular2/bundles/angular2-polyfills.js',
3940
'angular2/bundles/angular2.dev.js',
40-
'angular2/bundles/router.dev.js',
4141
'angular2/bundles/http.dev.js',
42+
'angular2/bundles/router.dev.js',
43+
'angular2/bundles/upgrade.dev.js',
44+
'rxjs/bundles/Rx.js',
4245
'systemjs/dist/system.src.js'
4346
],
4447
destDir: 'vendor'

0 commit comments

Comments
 (0)