From 0c46f95ea82d40f047e005dac3df586e66219086 Mon Sep 17 00:00:00 2001
From: Fabian Wiles <fabianwiles@live.com>
Date: Tue, 1 Jan 2019 08:43:26 +1300
Subject: [PATCH] clean up config

---
 angular.json | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 package.json |  1 -
 server.ts    |  3 ++-
 3 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/angular.json b/angular.json
index 1660064bf..559508b62 100644
--- a/angular.json
+++ b/angular.json
@@ -53,6 +53,78 @@
               "src/styles.css"
             ],
             "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "ng-universal-demo:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "ng-universal-demo:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "ng-universal-demo:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "karmaConfig": "./karma.conf.js",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "scripts": [],
+            "styles": [
+              "src/styles.css"
+            ],
+            "assets": [
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "favicon.ico",
+                "input": "src",
+                "output": "/"
+              }
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {            
+            "tsConfig": [
+              "src/tsconfig.app.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
           }
         },
         "server": {
diff --git a/package.json b/package.json
index c9faac0fe..5caa5fb01 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,6 @@
     "express": "^4.15.2",
     "reflect-metadata": "^0.1.10",
     "rxjs": "^6.2.2",
-    "tslib": "^1.9.3",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
diff --git a/server.ts b/server.ts
index c4ca4d96c..887ede925 100644
--- a/server.ts
+++ b/server.ts
@@ -19,7 +19,8 @@ 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('./dist/server/main');
+// NOTE: this will be an error in your console until the universal bundle is built
+import { AppServerModuleNgFactory, LAZY_MODULE_MAP } from './dist/server/main';
 
 // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
 app.engine('html', ngExpressEngine({