github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-22 17:47:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to angular2-universal 0.103.0 and amend boot-server.ts to fix "there can only be one platform" issue

Browse Source
This commit is contained in:
SteveSandersonMS
2016-06-22 17:02:11 +01:00
parent ce6cdfd2bc
commit 8423233f44
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
templates/Angular2Spa/ClientApp/boot-server.ts
View File

@@ -1,32 +1,33 @@
import 'angular2-universal/polyfills'; import 'angular2-universal/polyfills';
import * as ngCore from '@angular/core'; import * as ngCore from '@angular/core';
import * as ngRouter from '@angular/router-deprecated';
import * as ngUniversal from 'angular2-universal'; import * as ngUniversal from 'angular2-universal';
import { BASE_URL, ORIGIN_URL, REQUEST_URL } from 'angular2-universal/common'; import { BASE_URL, ORIGIN_URL, REQUEST_URL } from 'angular2-universal/common';
import { App } from './components/app/app'; import { App } from './components/app/app';
export default function (params: any): Promise<{ html: string, globals?: any }> { const bootloader = ngUniversal.bootloader({
const serverBindings = [ async: true,
ngCore.provide(BASE_URL, { useValue: '/' }), preboot: false,
ngCore.provide(ORIGIN_URL, { useValue: params.origin }), platformProviders: [
ngCore.provide(REQUEST_URL, { useValue: params.url }), ngCore.provide(BASE_URL, { useValue: '/' })
...ngUniversal.NODE_PLATFORM_PIPES, ]
...ngUniversal.NODE_ROUTER_PROVIDERS, });
...ngUniversal.NODE_HTTP_PROVIDERS,
];
let bootloader = ngUniversal.bootloader({ export default function (params: any): Promise<{ html: string, globals?: any }> {
const config: ngUniversal.AppConfig = {
directives: [App], directives: [App],
componentProviders: serverBindings, providers: [
async: true, ngCore.provide(REQUEST_URL, { useValue: params.url }),
preboot: false, ngCore.provide(ORIGIN_URL, { useValue: params.origin }),
...ngUniversal.NODE_PLATFORM_PIPES,
...ngUniversal.NODE_ROUTER_PROVIDERS,
...ngUniversal.NODE_HTTP_PROVIDERS,
],
// TODO: Render just the <app> component instead of wrapping it inside an extra HTML document // TODO: Render just the <app> component instead of wrapping it inside an extra HTML document
// Waiting on https://github.com/angular/universal/issues/347 // Waiting on https://github.com/angular/universal/issues/347
template: '<!DOCTYPE html>\n<html><head></head><body><app></app></body></html>' template: '<!DOCTYPE html>\n<html><head></head><body><app></app></body></html>'
}); };
return bootloader.serializeApplication().then(html => { return bootloader.serializeApplication(config).then(html => {
bootloader.dispose();
return { html }; return { html };
}); });
} }

2
templates/Angular2Spa/package.json
View File

@@ -27,7 +27,7 @@
"@angular/platform-server": "2.0.0-rc.1", "@angular/platform-server": "2.0.0-rc.1",
"@angular/router": "2.0.0-rc.1", "@angular/router": "2.0.0-rc.1",
"@angular/router-deprecated": "2.0.0-rc.1", "@angular/router-deprecated": "2.0.0-rc.1",
"angular2-universal": "0.100.3", "angular2-universal": "0.103.0",
"aspnet-prerendering": "^1.0.2", "aspnet-prerendering": "^1.0.2",
"aspnet-webpack": "^1.0.1", "aspnet-webpack": "^1.0.1",
"css": "^2.2.1", "css": "^2.2.1",