Skip to content

Commit 672a558

Browse files
author
Chris Wheatley
committed
Merge pull request #43 from albertoLago/beta-2
Beta 2
2 parents 00fcdb0 + 531244a commit 672a558

File tree

6 files changed

+21
-9
lines changed

6 files changed

+21
-9
lines changed

app/templates/_gulpfile.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ gulp.task('dependencies', function () {
3131
'node_modules/systemjs/dist/system-csp-production.src.js',
3232
'node_modules/systemjs/dist/system.js',
3333
'node_modules/reflect-metadata/Reflect.js',
34-
'node_modules/angular2/bundles/angular2.js'
34+
'node_modules/angular2/bundles/angular2.js',
35+
'node_modules/angular2/bundles/angular2-polyfills.js',
36+
'node_modules/rxjs/bundles/Rx.js',
37+
'node_modules/es6-shim/es6-shim.min.js',
38+
'node_modules/es6-shim/es6-shim.map'
3539
])
3640
.pipe(gulp.dest('build/lib'));
3741
});

app/templates/_package.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,19 @@
66
"start": "gulp dev"
77
},
88
"dependencies": {
9-
"angular2": "2.0.0-alpha.46",
10-
"reflect-metadata": "0.1.1",
11-
"systemjs": "0.18.17",
12-
"traceur": "0.0.92"
9+
"angular2": "2.0.0-beta.2",
10+
"traceur": "0.0.102",
11+
"es6-promise": "^3.0.2",
12+
"es6-shim": "^0.33.3",
13+
"rxjs": "5.0.0-beta.0",
14+
"zone.js": "0.5.10",
15+
"reflect-metadata": "0.1.2",
16+
"systemjs": "0.19.6"
1317
},
1418
"devDependencies": {
1519
"gulp": "3.9.0",
1620
"gulp-rename": "1.2.2",
17-
"gulp-traceur": "0.17.1",
21+
"gulp-traceur": "0.17.2",
1822
"gulp-webserver": "0.9.1"
1923
}
2024
}

app/templates/src/_basic-template.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {ComponentMetadata as Component, ViewMetadata as View} from 'angular2/angular2';
1+
import {Component, View} from 'angular2/core';
22

33
@Component({
44
selector: '<%= appname %>'

app/templates/src/_index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
<main>Loading...</main>
1212

13+
<script src="lib/es6-shim.min.js"></script>
14+
<script src="lib/angular2-polyfills.js"></script>
1315
<script src="lib/traceur-runtime.js"></script>
1416
<script src="lib/system-csp-production.src.js"></script>
1517
<script src="lib/Reflect.js"></script>
@@ -19,6 +21,7 @@
1921
</script>
2022

2123
<script src="lib/angular2.js"></script>
24+
<script src="lib/Rx.js"></script>
2225

2326
<script>
2427
System.import('index').catch(console.log.bind(console));

app/templates/src/_index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import {Component, View, bootstrap} from 'angular2/angular2';
1+
import {Component, View} from 'angular2/core';
2+
import {bootstrap} from 'angular2/platform/browser';
23
import {<%= classname %>} from '<%= appname %>';
34

45
@Component({

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "generator-angular2",
3-
"version": "0.6.3",
3+
"version": "0.6.4",
44
"description": "Angular2 Yeoman Generator",
55
"license": "MIT",
66
"main": "app/index.js",

0 commit comments

Comments
 (0)