diff --git a/templates/Angular2Spa/ClientApp/boot-client.ts b/templates/Angular2Spa/ClientApp/boot-client.ts index 3dcb429..ac1b873 100644 --- a/templates/Angular2Spa/ClientApp/boot-client.ts +++ b/templates/Angular2Spa/ClientApp/boot-client.ts @@ -1,14 +1,16 @@ -import 'angular2/bundles/angular2-polyfills'; import 'bootstrap'; +require('zone.js'); +import 'reflect-metadata'; import './styles/site.css'; -import { bootstrap } from 'angular2/platform/browser'; -import { FormBuilder } from 'angular2/common'; -import * as router from 'angular2/router'; -import { Http, HTTP_PROVIDERS } from 'angular2/http'; + +import { bootstrap } from '@angular/platform-browser-dynamic'; +import { FormBuilder } from '@angular/common'; +import * as router from '@angular/router-deprecated'; +import { Http, HTTP_PROVIDERS } from '@angular/http'; import { App } from './components/app/app'; -bootstrap(App, [router.ROUTER_BINDINGS, HTTP_PROVIDERS, FormBuilder]); +bootstrap(App, [router.ROUTER_PROVIDERS, HTTP_PROVIDERS, FormBuilder]); // Basic hot reloading support. Automatically reloads and restarts the Angular 2 app each time // you modify source files. This will not preserve any application state other than the URL. diff --git a/templates/Angular2Spa/ClientApp/boot-server.ts b/templates/Angular2Spa/ClientApp/boot-server.ts index ccfe58e..d27d286 100644 --- a/templates/Angular2Spa/ClientApp/boot-server.ts +++ b/templates/Angular2Spa/ClientApp/boot-server.ts @@ -1,6 +1,6 @@ import 'angular2-universal/polyfills'; -import * as ngCore from 'angular2/core'; -import * as ngRouter from 'angular2/router'; +import * as ngCore from '@angular/core'; +import * as ngRouter from '@angular/router-deprecated'; import * as ngUniversal from 'angular2-universal'; import { BASE_URL, ORIGIN_URL, REQUEST_URL } from 'angular2-universal/common'; import { App } from './components/app/app'; @@ -10,13 +10,14 @@ export default function (params: any): Promise<{ html: string, globals?: any }> ngCore.provide(BASE_URL, { useValue: '/' }), ngCore.provide(ORIGIN_URL, { useValue: params.origin }), ngCore.provide(REQUEST_URL, { useValue: params.url }), - ngUniversal.NODE_HTTP_PROVIDERS, - ngUniversal.NODE_ROUTER_PROVIDERS + ...ngUniversal.NODE_PLATFORM_PIPES, + ...ngUniversal.NODE_ROUTER_PROVIDERS, + ...ngUniversal.NODE_HTTP_PROVIDERS, ]; return ngUniversal.bootloader({ directives: [App], - providers: serverBindings, + componentProviders: serverBindings, async: true, preboot: false, // TODO: Render just the component instead of wrapping it inside an extra HTML document diff --git a/templates/Angular2Spa/ClientApp/components/app/app.ts b/templates/Angular2Spa/ClientApp/components/app/app.ts index fd88d1f..be0e694 100644 --- a/templates/Angular2Spa/ClientApp/components/app/app.ts +++ b/templates/Angular2Spa/ClientApp/components/app/app.ts @@ -1,6 +1,6 @@ -import * as ng from 'angular2/core'; -import * as router from 'angular2/router'; -import { Http, HTTP_BINDINGS } from 'angular2/http'; +import * as ng from '@angular/core'; +import * as router from '@angular/router-deprecated'; +import { Http, HTTP_BINDINGS } from '@angular/http'; import { NavMenu } from '../nav-menu/nav-menu'; import { Home } from '../home/home'; import { FetchData } from '../fetch-data/fetch-data'; diff --git a/templates/Angular2Spa/ClientApp/components/counter/counter.ts b/templates/Angular2Spa/ClientApp/components/counter/counter.ts index aaf03fe..00b4b95 100644 --- a/templates/Angular2Spa/ClientApp/components/counter/counter.ts +++ b/templates/Angular2Spa/ClientApp/components/counter/counter.ts @@ -1,4 +1,4 @@ -import * as ng from 'angular2/core'; +import * as ng from '@angular/core'; @ng.Component({ selector: 'counter', diff --git a/templates/Angular2Spa/ClientApp/components/fetch-data/fetch-data.html b/templates/Angular2Spa/ClientApp/components/fetch-data/fetch-data.html index d7c78e8..8d24e71 100644 --- a/templates/Angular2Spa/ClientApp/components/fetch-data/fetch-data.html +++ b/templates/Angular2Spa/ClientApp/components/fetch-data/fetch-data.html @@ -14,7 +14,7 @@ - + {{ forecast.dateFormatted }} {{ forecast.temperatureC }} {{ forecast.temperatureF }} diff --git a/templates/Angular2Spa/ClientApp/components/fetch-data/fetch-data.ts b/templates/Angular2Spa/ClientApp/components/fetch-data/fetch-data.ts index 96f8fc4..cede7eb 100644 --- a/templates/Angular2Spa/ClientApp/components/fetch-data/fetch-data.ts +++ b/templates/Angular2Spa/ClientApp/components/fetch-data/fetch-data.ts @@ -1,5 +1,5 @@ -import * as ng from 'angular2/core'; -import { Http } from 'angular2/http'; +import * as ng from '@angular/core'; +import { Http } from '@angular/http'; @ng.Component({ selector: 'fetch-data', diff --git a/templates/Angular2Spa/ClientApp/components/home/home.ts b/templates/Angular2Spa/ClientApp/components/home/home.ts index 2561977..656f757 100644 --- a/templates/Angular2Spa/ClientApp/components/home/home.ts +++ b/templates/Angular2Spa/ClientApp/components/home/home.ts @@ -1,4 +1,4 @@ -import * as ng from 'angular2/core'; +import * as ng from '@angular/core'; @ng.Component({ selector: 'home', diff --git a/templates/Angular2Spa/ClientApp/components/nav-menu/nav-menu.ts b/templates/Angular2Spa/ClientApp/components/nav-menu/nav-menu.ts index 7eb6aa8..fecbedc 100644 --- a/templates/Angular2Spa/ClientApp/components/nav-menu/nav-menu.ts +++ b/templates/Angular2Spa/ClientApp/components/nav-menu/nav-menu.ts @@ -1,5 +1,5 @@ -import * as ng from 'angular2/core'; -import * as router from 'angular2/router'; +import * as ng from '@angular/core'; +import * as router from '@angular/router-deprecated'; @ng.Component({ selector: 'nav-menu', diff --git a/templates/Angular2Spa/package.json b/templates/Angular2Spa/package.json index f2e31aa..0708703 100644 --- a/templates/Angular2Spa/package.json +++ b/templates/Angular2Spa/package.json @@ -18,14 +18,23 @@ "webpack-hot-middleware": "^2.10.0" }, "dependencies": { - "angular2": "2.0.0-beta.15", - "angular2-universal": "0.98.1", + "@angular/common": "^2.0.0-rc.1", + "@angular/compiler": "^2.0.0-rc.1", + "@angular/core": "^2.0.0-rc.1", + "@angular/http": "^2.0.0-rc.1", + "@angular/platform-browser": "^2.0.0-rc.1", + "@angular/platform-browser-dynamic": "^2.0.0-rc.1", + "@angular/platform-server": "2.0.0-rc.1", + "@angular/router": "^2.0.0-rc.1", + "@angular/router-deprecated": "^2.0.0-rc.1", + "angular2-universal": "0.100.3", "aspnet-prerendering": "^1.0.1", "aspnet-webpack": "^1.0.1", "css": "^2.2.1", "isomorphic-fetch": "^2.2.1", - "preboot": "2.0.5", - "rxjs": "5.0.0-beta.2", - "webpack-externals-plugin": "^1.0.0" + "preboot": "^2.0.5", + "rxjs": "^5.0.0-beta.7", + "webpack-externals-plugin": "^1.0.0", + "zone.js": "^0.6.12" } } diff --git a/templates/Angular2Spa/webpack.config.vendor.js b/templates/Angular2Spa/webpack.config.vendor.js index e1b70c3..9e84309 100644 --- a/templates/Angular2Spa/webpack.config.vendor.js +++ b/templates/Angular2Spa/webpack.config.vendor.js @@ -15,7 +15,21 @@ module.exports = { ] }, entry: { - vendor: ['angular2-universal-polyfills', 'bootstrap', 'bootstrap/dist/css/bootstrap.css', 'style-loader', 'jquery', 'angular2/core', 'angular2/common', 'angular2/http', 'angular2/router', 'angular2/platform/browser'] + vendor: [ + 'bootstrap', + 'bootstrap/dist/css/bootstrap.css', + 'style-loader', + 'jquery', + '@angular/common', + '@angular/compiler', + '@angular/core', + '@angular/http', + '@angular/platform-browser', + '@angular/platform-browser-dynamic', + '@angular/router-deprecated', + '@angular/platform-server', + '@angular/router-deprecated', + ] }, output: { path: path.join(__dirname, 'wwwroot', 'dist'),