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

ensure CSR fallback only happens on actual errors

Browse Source
This commit is contained in:
Art Lowel
2020-09-21 18:41:10 +02:00
parent 9f396f7120
commit 5afd4a6930
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server.ts
View File

@@ -33,7 +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'; import { hasValue, hasNoValue } from './src/app/shared/empty.util';
/* /*
* Set path for the browser application's dist folder * Set path for the browser application's dist folder
@@ -140,12 +140,16 @@ function ngApp(req, res) {
baseUrl: environment.ui.nameSpace, baseUrl: environment.ui.nameSpace,
originUrl: environment.ui.baseUrl, originUrl: environment.ui.baseUrl,
requestUrl: req.originalUrl requestUrl: req.originalUrl
}, (err) => { }, (err, data) => {
console.warn('Error in SSR, serving for direct CSR.'); if (hasNoValue(err) && hasValue(data)) {
if (hasValue(err)) { res.send(data);
console.warn('Error details : ', err); } else {
console.warn('Error in SSR, serving for direct CSR.');
if (hasValue(err)) {
console.warn('Error details : ', err);
}
res.sendFile(DIST_FOLDER + '/index.html');
} }
res.sendFile(DIST_FOLDER + '/index.html');
}) })
} else { } else {
// If preboot is disabled, just serve the client // If preboot is disabled, just serve the client