diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json index 450bb44d0b..c599609de8 100644 --- a/addon/ng2/blueprints/ng2/files/package.json +++ b/addon/ng2/blueprints/ng2/files/package.json @@ -3,13 +3,13 @@ "version": "0.0.0", "license": "Apache-2.0", "dependencies": { - "angular2": "2.0.0-alpha.53", + "angular2": "2.0.0-alpha.54", "es6-promise": "^3.0.2", "es6-shim": "^0.33.3", "reflect-metadata": "0.1.2", - "rxjs": "5.0.0-alpha.14", + "rxjs": "5.0.0-beta.0", "systemjs": "0.19.4", - "zone.js": "0.5.8" + "zone.js": "0.5.10" }, "devDependencies": { "angular-cli": "0.0.*", diff --git a/addon/ng2/blueprints/ng2/files/src/index.html b/addon/ng2/blueprints/ng2/files/src/index.html index 763a2682c3..b1fca8382b 100644 --- a/addon/ng2/blueprints/ng2/files/src/index.html +++ b/addon/ng2/blueprints/ng2/files/src/index.html @@ -1,11 +1,21 @@ + <%= jsComponentName %> - - + {{content-for 'head'}} + + + + <<%= htmlComponentName %>-app>Loading...-app> + + + + + + - - - - <<%= htmlComponentName %>-app>Loading...-app> diff --git a/lib/broccoli/angular2-app.js b/lib/broccoli/angular2-app.js index 379ebac348..53fec98d6c 100644 --- a/lib/broccoli/angular2-app.js +++ b/lib/broccoli/angular2-app.js @@ -36,9 +36,12 @@ Angular2App.prototype.toTree = function () { var vendorJsTree = new Funnel('node_modules', { files: [ + 'angular2/bundles/angular2-polyfills.js', 'angular2/bundles/angular2.dev.js', - 'angular2/bundles/router.dev.js', 'angular2/bundles/http.dev.js', + 'angular2/bundles/router.dev.js', + 'angular2/bundles/upgrade.dev.js', + 'rxjs/bundles/Rx.js', 'systemjs/dist/system.src.js' ], destDir: 'vendor'