github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-23 01:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Angular2Spa and ReactReduxSpa to use aspnet-prerendering 2.0.0

Browse Source
This commit is contained in:
SteveSandersonMS
2016-11-25 17:45:20 +00:00
parent 17f9ecec29
commit 157b74a0cd
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
import 'angular2-universal-polyfills'; import 'angular2-universal-polyfills';
import 'zone.js'; import 'zone.js';
import { createServerRenderer, RenderResult } from 'aspnet-prerendering';
import { enableProdMode } from '@angular/core'; import { enableProdMode } from '@angular/core';
import { platformNodeDynamic } from 'angular2-universal'; import { platformNodeDynamic } from 'angular2-universal';
import { AppModule } from './app/app.module'; import { AppModule } from './app/app.module';
@@ -7,8 +8,8 @@ import { AppModule } from './app/app.module';
enableProdMode(); enableProdMode();
const platform = platformNodeDynamic(); const platform = platformNodeDynamic();
export default function (params: any) : Promise<{ html: string, globals?: any }> { export default createServerRenderer(params => {
return new Promise((resolve, reject) => { return new Promise<RenderResult>((resolve, reject) => {
const requestZone = Zone.current.fork({ const requestZone = Zone.current.fork({
name: 'angular-universal request', name: 'angular-universal request',
properties: { properties: {
@@ -29,4 +30,4 @@ export default function (params: any) : Promise<{ html: string, globals?: any }>
resolve({ html: html }); resolve({ html: html });
}, reject); }, reject);
}); });
} });

2
templates/Angular2Spa/package.json
View File

@@ -19,7 +19,7 @@
"angular2-template-loader": "^0.6.0", "angular2-template-loader": "^0.6.0",
"angular2-universal": "~2.0.11", "angular2-universal": "~2.0.11",
"angular2-universal-polyfills": "~2.0.11", "angular2-universal-polyfills": "~2.0.11",
"aspnet-prerendering": "^1.0.7", "aspnet-prerendering": "^2.0.0",
"aspnet-webpack": "^1.0.17", "aspnet-webpack": "^1.0.17",
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",
"css": "^2.2.1", "css": "^2.2.1",

8
templates/ReactReduxSpa/ClientApp/boot-server.tsx
View File

@@ -3,12 +3,12 @@ import { Provider } from 'react-redux';
import { renderToString } from 'react-dom/server'; import { renderToString } from 'react-dom/server';
import { match, RouterContext } from 'react-router'; import { match, RouterContext } from 'react-router';
import createMemoryHistory from 'history/lib/createMemoryHistory'; import createMemoryHistory from 'history/lib/createMemoryHistory';
import { createServerRenderer, RenderResult } from 'aspnet-prerendering';
import routes from './routes'; import routes from './routes';
import configureStore from './configureStore'; import configureStore from './configureStore';
type BootResult = { html?: string, globals?: { [key: string]: any }, redirectUrl?: string};
export default function (params: any): Promise<{ html: string }> { export default createServerRenderer(params => {
return new Promise<BootResult>((resolve, reject) => { return new Promise<RenderResult>((resolve, reject) => {
// Match the incoming request against the list of client-side routes // Match the incoming request against the list of client-side routes
match({ routes, location: params.location }, (error, redirectLocation, renderProps: any) => { match({ routes, location: params.location }, (error, redirectLocation, renderProps: any) => {
if (error) { if (error) {
@@ -47,4 +47,4 @@ export default function (params: any): Promise<{ html: string }> {
}, reject); // Also propagate any errors back into the host application }, reject); // Also propagate any errors back into the host application
}); });
}); });
} });

2
templates/ReactReduxSpa/package.json
View File

@@ -14,7 +14,7 @@
"@types/webpack": "^1.12.35", "@types/webpack": "^1.12.35",
"@types/webpack-env": "^1.12.1", "@types/webpack-env": "^1.12.1",
"@types/whatwg-fetch": "0.0.28", "@types/whatwg-fetch": "0.0.28",
"aspnet-prerendering": "^1.0.7", "aspnet-prerendering": "^2.0.0",
"aspnet-webpack": "^1.0.17", "aspnet-webpack": "^1.0.17",
"aspnet-webpack-react": "^1.0.2", "aspnet-webpack-react": "^1.0.2",
"babel-core": "^6.5.2", "babel-core": "^6.5.2",