chore(ng2-template): upgrade angular 2 template to rc1 version

This commit is contained in:
Andrei Tserakhau
2016-05-10 14:14:06 +03:00
committed by SteveSandersonMS
parent 8005427d94
commit 58a1aa3538
10 changed files with 53 additions and 27 deletions

View File

@@ -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.

View File

@@ -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 <app> component instead of wrapping it inside an extra HTML document

View File

@@ -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';

View File

@@ -1,4 +1,4 @@
import * as ng from 'angular2/core';
import * as ng from '@angular/core';
@ng.Component({
selector: 'counter',

View File

@@ -14,7 +14,7 @@
</tr>
</thead>
<tbody>
<tr *ngFor="#forecast of forecasts">
<tr *ngFor="let forecast of forecasts">
<td>{{ forecast.dateFormatted }}</td>
<td>{{ forecast.temperatureC }}</td>
<td>{{ forecast.temperatureF }}</td>

View File

@@ -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',

View File

@@ -1,4 +1,4 @@
import * as ng from 'angular2/core';
import * as ng from '@angular/core';
@ng.Component({
selector: 'home',

View File

@@ -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',

View File

@@ -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"
}
}

View File

@@ -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'),