Skip to content

Commit 016f97a

Browse files
author
Chris Wheatley
committed
Merge pull request #27 from swirlycheetah/alpha-24
update compatibility to alpha 24
2 parents 5314677 + 39ee817 commit 016f97a

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

app/templates/_gulpfile.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ gulp.task('watch', function () {
2929
// move dependencies into build dir
3030
gulp.task('dependencies', function () {
3131
return gulp.src([
32-
'node_modules/angular2/node_modules/rx/dist/rx.all.js',
32+
'node_modules/angular2/node_modules/rx/dist/rx.js',
3333
'node_modules/angular2/node_modules/traceur/bin/traceur.js',
3434
'node_modules/angular2/node_modules/traceur/bin/traceur-runtime.js',
35-
'node_modules/angular2/node_modules/zone.js/zone.js',
35+
'node_modules/angular2/node_modules/zone.js/dist/zone.js',
3636
'node_modules/es6-module-loader/dist/es6-module-loader.js',
3737
'node_modules/es6-module-loader/dist/es6-module-loader.js.map',
38+
'node_modules/reflect-metadata/Reflect.js',
3839
'node_modules/systemjs/dist/system.js',
3940
'node_modules/systemjs/dist/system.js.map'
4041
])

app/templates/_package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
"name": "<%= appname %>",
33
"version": "0.0.0",
44
"dependencies": {
5-
"angular2": "2.0.0-alpha.21",
5+
"angular2": "2.0.0-alpha.24",
66
"es6-module-loader": "0.16.6",
7-
"systemjs": "0.16.10"
7+
"reflect-metadata": "0.1.0",
8+
"systemjs": "0.16.11"
89
},
910
"devDependencies": {
1011
"gulp": "3.8.11",

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 {Component, View} from 'angular2/angular2';
1+
import {ComponentAnnotation as Component, ViewAnnotation as View} from 'angular2/angular2';
22

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

app/templates/src/_index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212

1313
<script src="lib/system.js"></script>
1414
<script src="lib/zone.js"></script>
15+
<script src="lib/Reflect.js"></script>
1516

1617
<script>
1718
System.config({
1819
paths: {
1920
'angular2/*': 'lib/angular2.js',
2021
'traceur-runtime': 'lib/traceur-runtime.js',
21-
'rx/dist/rx.all': 'lib/rx.all.js',
22+
'rx': 'lib/rx.js',
2223
'index': 'index.js'
2324
}
2425
});

app/templates/src/_index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component, View, bootstrap} from 'angular2/angular2';
1+
import {ComponentAnnotation as Component, ViewAnnotation as View, bootstrap} from 'angular2/angular2';
22
import {<%= classname %>} from '<%= appname %>';
33

44
@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.3.1",
3+
"version": "0.4.0",
44
"description": "Angular2 Yeoman Generator",
55
"license": "MIT",
66
"main": "app/index.js",

0 commit comments

Comments
 (0)