hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 18:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated server.ts to latest fixes

Browse Source
This commit is contained in:
lotte
2020-09-09 16:04:42 +02:00
parent cced7a2914
commit a6dd87f78c
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server.ts
View File

@@ -15,7 +15,6 @@
* import for `ngExpressEngine`. * import for `ngExpressEngine`.
*/ */
import 'zone.js/dist/zone-node';
import 'reflect-metadata'; import 'reflect-metadata';
import 'rxjs'; import 'rxjs';
@@ -34,6 +33,7 @@ import { enableProdMode, NgModuleFactory, Type } from '@angular/core';
import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens'; import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
import { environment } from './src/environments/environment'; import { environment } from './src/environments/environment';
import { createProxyMiddleware } from 'http-proxy-middleware'; import { createProxyMiddleware } from 'http-proxy-middleware';
import { hasValue } from './src/app/shared/empty.util';
/* /*
* Set path for the browser application's dist folder * Set path for the browser application's dist folder
@@ -131,25 +131,24 @@ app.get('*.*', cacheControl, express.static(DIST_FOLDER, { index: false }));
*/ */
function ngApp(req, res) { function ngApp(req, res) {
if (environment.universal.preboot) { if (environment.universal.preboot) {
// If preboot is enabled, create a new zone for SSR, and
// register the error handler for when it throws an error
res.render(DIST_FOLDER + '/index.html', { res.render(DIST_FOLDER + '/index.html', {
req, req,
res, res,
preboot: environment.universal.preboot, preboot: environment.universal.preboot,
async: environment.universal.async, async: environment.universal.async,
time: environment.universal.time, time: environment.universal.time,
baseUrl: environment.ui.nameSpace, baseUrl: environment.ui.nameSpace,
originUrl: environment.ui.baseUrl, originUrl: environment.ui.baseUrl,
requestUrl: req.originalUrl requestUrl: req.originalUrl
}, (err) => { }, (err) => {
console.warn('Error in SSR, serving for direct CSR. Error details : ', err); console.warn('Error in SSR, serving for direct CSR.');
res.sendFile(DIST_FOLDER + '/index.html'); if (hasValue(err)) {
console.warn('Error details : ', err);
} }
); res.sendFile(DIST_FOLDER + '/index.html');
})
} else { } else {
// If preboot is disabled, just serve the client side ejs template and pass it the required // If preboot is disabled, just serve the client
// variables
console.log('Universal off, serving for direct CSR'); console.log('Universal off, serving for direct CSR');
res.sendFile(DIST_FOLDER + '/index.html'); res.sendFile(DIST_FOLDER + '/index.html');
} }