feat(all): upgrade Angular to v10

angular.json

@@ -51,6 +51,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -267,8 +273,8 @@
               "libs/product/tsconfig.spec.json"
             ],
             "exclude": [
-							"**/node_modules/**",
-							"**/*.json"
+              "**/node_modules/**",
+              "**/*.json"
             ]
           }
         }
@@ -565,6 +571,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "fileReplacements": [
                 {
                   "replace": "apps/daffio/src/environments/environment.ts",
@@ -648,7 +660,7 @@
           "builder": "@angular-devkit/build-angular:server",
           "options": {
             "outputPath": "dist/apps/daffio/server",
-            "main": "apps/daffio/src/main.server.ts",
+            "main": "apps/daffio/server/server.ts",
             "tsConfig": "apps/daffio/tsconfig.server.json",
             "stylePreprocessorOptions": {
               "includePaths": [
@@ -668,6 +680,32 @@
               ]
             }
           }
+        },
+        "serve-ssr": {
+          "builder": "@nguniversal/builders:ssr-dev-server",
+          "options": {
+            "browserTarget": "daffio:build",
+            "serverTarget": "daffio:server"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "daffio:build:production",
+              "serverTarget": "daffio:server:production"
+            }
+          }
+        },
+        "prerender": {
+          "builder": "@nguniversal/builders:prerender",
+          "options": {
+            "browserTarget": "daffio:build:production",
+            "serverTarget": "daffio:server:production",
+            "routes": [
+              "/"
+            ]
+          },
+          "configurations": {
+            "production": {}
+          }
         }
       }
     },
@@ -803,6 +841,10 @@
                   "type": "initial",
                   "maximumWarning": "2mb",
                   "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
                 }
               ]
             }
@@ -1096,19 +1138,19 @@
     "geography": {
       "projectType": "library",
       "root": "libs/geography",
-			"sourceRoot": "libs/geography/src",
-			"prefix": "@daffodil",
+      "sourceRoot": "libs/geography/src",
+      "prefix": "@daffodil",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
-						"tsConfig": "libs/geography/tsconfig.lib.json",
+            "tsConfig": "libs/geography/tsconfig.lib.json",
             "project": "libs/geography/ng-package.json"
           },
           "configurations": {
             "production": {
-							"project": "libs/geography/ng-package.json"
-						}
+              "project": "libs/geography/ng-package.json"
+            }
           }
         },
         "test": {
@@ -1117,33 +1159,33 @@
             "main": "libs/geography/test.ts",
             "codeCoverage": true,
             "tsConfig": "libs/geography/tsconfig.spec.json",
-						"karmaConfig": "libs/geography/karma.conf.js"
-					}
+            "karmaConfig": "libs/geography/karma.conf.js"
+          }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-							"libs/geography/tsconfig.lib.json",
-							"libs/geography/tsconfig.spec.json"
-						],
+              "libs/geography/tsconfig.lib.json",
+              "libs/geography/tsconfig.spec.json"
+            ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
         }
       }
-		},
-		"paypal": {
+    },
+    "paypal": {
       "root": "libs/paypal",
       "sourceRoot": "libs/paypal/src",
-			"projectType": "library",
-			"prefix": "@daffodil",
+      "projectType": "library",
+      "prefix": "@daffodil",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
-						"tsConfig": "libs/paypal/tsconfig.lib.json",
+            "tsConfig": "libs/paypal/tsconfig.lib.json",
             "project": "libs/paypal/ng-package.json"
           },
           "configurations": {
@@ -1155,7 +1197,7 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-						"main": "libs/paypal/test.ts",
+            "main": "libs/paypal/test.ts",
             "tsConfig": "libs/paypal/tsconfig.spec.json",
             "karmaConfig": "libs/paypal/karma.conf.js"
           }
@@ -1164,7 +1206,7 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-							"libs/paypal/tsconfig.lib.json",
+              "libs/paypal/tsconfig.lib.json",
               "libs/paypal/tsconfig.spec.json"
             ],
             "exclude": [
@@ -1177,19 +1219,19 @@
     "order": {
       "projectType": "library",
       "root": "libs/order",
-			"sourceRoot": "libs/order/src",
-			"prefix": "@daffodil",
+      "sourceRoot": "libs/order/src",
+      "prefix": "@daffodil",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
-						"tsConfig": "libs/order/tsconfig.lib.json",
+            "tsConfig": "libs/order/tsconfig.lib.json",
             "project": "libs/order/ng-package.json"
           },
           "configurations": {
             "production": {
-							"project": "libs/order/ng-package.json"
-						}
+              "project": "libs/order/ng-package.json"
+            }
           }
         },
         "test": {
@@ -1198,16 +1240,16 @@
             "main": "libs/order/test.ts",
             "codeCoverage": true,
             "tsConfig": "libs/order/tsconfig.spec.json",
-						"karmaConfig": "libs/order/karma.conf.js"
-					}
+            "karmaConfig": "libs/order/karma.conf.js"
+          }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-							"libs/order/tsconfig.lib.json",
-							"libs/order/tsconfig.spec.json"
-						],
+              "libs/order/tsconfig.lib.json",
+              "libs/order/tsconfig.spec.json"
+            ],
             "exclude": [
               "**/node_modules/**"
             ]
@@ -1261,6 +1303,7 @@
     "warnings": {
       "typescriptMismatch": false,
       "versionMismatch": false
-    }
+    },
+    "analytics": "afd3c7da-d12a-4ec7-8adc-6cb3b4e33196"
   }
 }

apps/daffio/package.json

@@ -8,13 +8,15 @@
     "url": "https://github.com/graycoreio/daffodil/issues"
   },
   "scripts": {
-    "build": "npm run build:client-and-server-bundles && npm run compile:server && npm run build:serverless",
-    "build:client-and-server-bundles": "ng build daffio --prod && ng run daffio:server:production",
-    "build:serverless": "cp ./serverless/* ../../dist/apps/daffio/",
+    "build": "npm run build:client-and-server-bundles && npm run build:serverless",
+    "build:client": "ng build daffio --prod",
+    "build:server": "ng run daffio:server:production",
+    "build:client-and-server-bundles": "npm run build:client && npm run build:server",
+    "build:serverless": "cp -r ./serverless/vercel/* ../../dist/apps/daffio/",
     "test": "ng test daffio --watch=false --browsers=ChromeHeadless",
     "lint": "ng lint daffio",
-    "compile:server": "webpack --config ./server/webpack.server.config.js --progress --colors",
-    "serve:ssr": "node ../../dist/apps/daffio/server.js"
+    "dev:ssr": "ng run daffio:serve-ssr",
+    "serve:ssr": "node ../../dist/apps/daffio/server/main.js"
   },
   "homepage": "https://github.com/graycoreio/daffodil",
   "description": "A documentation site for the daffodil project",

apps/daffio/server/server.ts

@@ -1,41 +1,61 @@
 import 'zone.js/dist/zone-node';
-import { enableProdMode } from '@angular/core';
-// Express Engine
 
 import { ngExpressEngine } from '@nguniversal/express-engine';
-// Import module map for lazy loading
-import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader';
-
-
-
 import * as express from 'express';
 import { join } from 'path';
 
-// Faster server renders w/ Prod mode (dev mode never needed)
-enableProdMode();
-
-// Express server
-export const app = express();
-
-const BROWSER_FOLDER = join(__dirname, 'browser');
-
-const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./../../../dist/apps/daffio/server/main');
-
-
-app.engine('html', ngExpressEngine({
-  bootstrap: AppServerModuleNgFactory,
-  providers: [
-    provideModuleMap(LAZY_MODULE_MAP)
-  ]
-}));
-
-app.set('view engine', 'html');
-app.set('views', join(BROWSER_FOLDER));
-
-// Server static files from /browser
-app.get('*.*', express.static(BROWSER_FOLDER));
-
-// All regular routes use the Universal engine
-app.get('*', (req, res) => {
-  res.render(join(BROWSER_FOLDER, 'index.html'), { req });
-});
+import { AppServerModule } from '../src/main.server';
+import { APP_BASE_HREF } from '@angular/common';
+import { existsSync } from 'fs';
+
+// The Express app is exported so that it can be used by serverless Functions.
+export function app(): express.Express {
+  const server = express();
+  const BROWSER_FOLDER = join(__dirname, '../browser');
+
+  const indexHtml = existsSync(join(BROWSER_FOLDER, 'index.original.html')) ? 'index.original.html' : 'index';
+
+  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
+  server.engine('html', ngExpressEngine({
+    bootstrap: AppServerModule,
+  }));
+
+  server.set('view engine', 'html');
+  server.set('views', BROWSER_FOLDER);
+
+  // Example Express Rest API endpoints
+  // server.get('/api/**', (req, res) => { });
+  // Serve static files from /browser
+  server.get('*.*', express.static(BROWSER_FOLDER, {
+    maxAge: '1y'
+  }));
+
+  // All regular routes use the Universal engine
+  server.get('*', (req, res) => {
+    res.render(indexHtml, { req, providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }] });
+  });
+
+  return server;
+}
+
+function run(): void {
+  const port = process.env.PORT || 4000;
+
+  // Start up the Node server
+  const server = app();
+  server.listen(port, () => {
+    console.log(`Node Express server listening on http://localhost:${port}`);
+  });
+}
+
+// Webpack will replace 'require' with '__webpack_require__'
+// '__non_webpack_require__' is a proxy to Node 'require'
+// The below code is to ensure that the server is run only when not requiring the bundle.
+declare const __non_webpack_require__: NodeRequire;
+const mainModule = __non_webpack_require__.main;
+const moduleFilename = mainModule && mainModule.filename || '';
+if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
+  run();
+}
+
+export * from '../src/main.server';