feat(#7): sync website with last angular universal repo

Author: peterpeterparker

angular.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {

package.json

@@ -46,6 +46,8 @@
     "bootstrap": "^4.1.3",
     "cookieconsent": "^3.1.0",
     "core-js": "^2.5.7",
+    "express": "^4.16.3",
+    "reflect-metadata": "^0.1.12",
     "hammerjs": "^2.0.8",
     "moment": "^2.22.2",
     "ngx-markdown": "^6.2.1",
@@ -66,12 +68,10 @@
     "codelyzer": "^4.4.4",
     "cpy-cli": "^2.0.0",
     "del": "^3.0.0",
-    "express": "^4.16.3",
     "gulp": "^3.9.1",
     "gulp-remove-code": "^3.0.4",
     "http-server": "^0.11.1",
     "pre-commit": "^1.2.2",
-    "reflect-metadata": "^0.1.12",
     "replace": "1.0.0",
     "ts-loader": "^5.2.1",
     "tslint": "^5.11.0",

server.ts

@@ -1,47 +1,57 @@
 import 'zone.js/dist/zone-node';
 import 'reflect-metadata';
-import {enableProdMode} from '@angular/core';
+import { enableProdMode } from '@angular/core';
+
 // Express Engine
-import {ngExpressEngine} from '@nguniversal/express-engine';
+import { ngExpressEngine } from '@nguniversal/express-engine';
 // Import module map for lazy loading
-import {provideModuleMap} from '@nguniversal/module-map-ngfactory-loader';
+import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader';
 
 import * as express from 'express';
-import {join} from 'path';
+import { join } from 'path';
 
 // Faster server renders w/ Prod mode (dev mode never needed)
 enableProdMode();
 
 // Express server
 const app = express();
 
-const PORT = process.env.PORT || 8000;
+const PORT = process.env.PORT || 4000;
 const DIST_FOLDER = join(process.cwd(), 'dist');
 
 // * NOTE :: leave this as require() since this file is built Dynamically from webpack
-const {AppServerModuleNgFactory, LAZY_MODULE_MAP} = require('./server/main');
+const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./server/main');
 
 // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
 app.engine('html', ngExpressEngine({
   bootstrap: AppServerModuleNgFactory,
   providers: [
-    provideModuleMap(LAZY_MODULE_MAP)
+    provideModuleMap(LAZY_MODULE_MAP),
+    // In case you want to use an AppShell with SSR and Lazy loading
+    // you'd need to uncomment the below. (see: https://github.com/angular/angular-cli/issues/9202)
+    // {
+    //   provide: NgModuleFactoryLoader,
+    //   useClass: ModuleMapNgFactoryLoader,
+    //   deps: [
+    //     Compiler,
+    //     MODULE_MAP
+    //   ],
+    // },
   ]
 }));
 
 app.set('view engine', 'html');
 app.set('views', join(DIST_FOLDER, 'browser'));
 
-/* - Example Express Rest API endpoints -
-  app.get('/api/**', (req, res) => { });
-*/
+// Example Express Rest API endpoints
+// app.get('/api/**', (req, res) => { });
 
 // Server static files from /browser
 app.get('*.*', express.static(join(DIST_FOLDER, 'browser'), {
   maxAge: '1y'
 }));
 
-// ALl regular routes use the Universal engine
+// All regular routes use the Universal engine
 app.get('*', (req, res) => {
   res.render('index', { req });
 });

src/environments/environment.ts

@@ -1,7 +1,7 @@
 // The file contents for the current environment will overwrite these during build.
 // The build system defaults to the dev environment which uses `environment.ts`, but if you do
 // `ng build --env=prod` then `environment.prod.ts` will be used instead.
-// The list of which env maps to which file can be found in `.angular-cli.json`.
+// The list of which env maps to which file can be found in `.angular.json`.
 
 export const environment = {
   production: false