feat(): update to ng 9 wip

lib/angular-universal.constants.ts

@@ -1,2 +1 @@
 export const ANGULAR_UNIVERSAL_OPTIONS = 'ANGULAR_UNIVERSAL_OPTIONS';
-export const LIVE_RELOAD_SCRIPT = `<script src="http://localhost:35729/livereload.js?snipver=1"></script>`;

lib/angular-universal.module.ts

@@ -1,9 +1,9 @@
+import { APP_BASE_HREF } from '@angular/common';
 import { DynamicModule, Inject, Module, OnModuleInit } from '@nestjs/common';
 import { HttpAdapterHost } from '@nestjs/core';
-import { readFileSync } from 'fs';
+import { existsSync } from 'fs';
 import { join } from 'path';
 import 'reflect-metadata';
-import 'zone.js/dist/zone-node';
 import { ANGULAR_UNIVERSAL_OPTIONS } from './angular-universal.constants';
 import { angularUniversalProviders } from './angular-universal.providers';
 import { AngularUniversalOptions } from './interfaces/angular-universal-options.interface';
@@ -19,23 +19,23 @@ export class AngularUniversalModule implements OnModuleInit {
   ) {}
 
   static forRoot(options: AngularUniversalOptions): DynamicModule {
+    const indexHtml = existsSync(join(options.viewsPath, 'index.original.html'))
+      ? 'index.original.html'
+      : 'index';
+
     options = {
-      templatePath: join(options.viewsPath, 'index.html'),
+      templatePath: indexHtml,
       rootStaticPath: '*.*',
       renderPath: '*',
       ...options
     };
-    const template = readFileSync(options.templatePath).toString();
 
     return {
       module: AngularUniversalModule,
       providers: [
         {
           provide: ANGULAR_UNIVERSAL_OPTIONS,
-          useValue: {
-            ...options,
-            template
-          }
+          useValue: options
         }
       ]
     };
@@ -51,7 +51,11 @@ export class AngularUniversalModule implements OnModuleInit {
     }
     const app = httpAdapter.getInstance();
     app.get(this.ngOptions.renderPath, (req, res) =>
-      res.render(this.ngOptions.templatePath, { req, res })
+      res.render(this.ngOptions.templatePath, {
+        req,
+        res,
+        providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }]
+      })
     );
   }
 }

lib/index.ts

@@ -1,7 +1,5 @@
 export * from './angular-universal.module';
 export * from './cache/in-memory-cache.storage';
-export * from './compiler';
 export * from './interfaces/angular-universal-options.interface';
 export * from './interfaces/cache-storage.interface';
 export * from './utils/domino.utils';
-export * from './webpack-config.factory';

lib/interfaces/angular-universal-options.interface.ts

@@ -5,15 +5,6 @@ export interface AngularUniversalOptions {
    * The directory where the module should look for client bundle (Angular app).
    */
   viewsPath: string;
-  /**
-   * Bundle file (webpack output with "AppServerModuleNgFactory")
-   */
-  bundle: {
-    AppServerModuleNgFactory;
-    LAZY_MODULE_MAP;
-    provideModuleMap;
-    ngExpressEngine;
-  };
   /**
    * Path to index file.
    * Default: {viewsPaths}/index.html
@@ -43,7 +34,7 @@ export interface AngularUniversalOptions {
         storage?: CacheStorage;
       };
   /**
-   * Enable live-reload (auto-browser refresh)
+   * Module to bootstrap
    */
-  liveReload?: boolean;
+  bootstrap: any;
 }

lib/utils/setup-universal.utils.ts

@@ -1,22 +1,13 @@
+import { ngExpressEngine } from '@nguniversal/express-engine';
 import * as express from 'express';
-import { LIVE_RELOAD_SCRIPT } from '../angular-universal.constants';
 import { InMemoryCacheStorage } from '../cache/in-memory-cache.storage';
 import { AngularUniversalOptions } from '../interfaces/angular-universal-options.interface';
 
 const DEFAULT_CACHE_EXPIRATION_TIME = 60000; // 60 seconds
 
-export function setupUniversal(
-  app: any,
-  ngOptions: AngularUniversalOptions & { template: string }
-) {
-  const {
-    AppServerModuleNgFactory,
-    LAZY_MODULE_MAP,
-    provideModuleMap,
-    ngExpressEngine
-  } = ngOptions.bundle;
-
+export function setupUniversal(app: any, ngOptions: AngularUniversalOptions) {
   const cacheOptions = getCacheOptions(ngOptions);
+
   app.engine('html', (_, options, callback) => {
     const originalUrl = options.req.originalUrl;
     if (cacheOptions.isEnabled) {
@@ -27,11 +18,8 @@ export function setupUniversal(
     }
 
     ngExpressEngine({
-      bootstrap: AppServerModuleNgFactory,
-      document: ngOptions.template,
-      url: options.req.url,
+      bootstrap: ngOptions.bootstrap,
       providers: [
-        provideModuleMap(LAZY_MODULE_MAP),
         {
           provide: 'serverUrl',
           useValue: `${options.req.protocol}://${options.req.get('host')}`
@@ -42,18 +30,13 @@ export function setupUniversal(
       if (cacheOptions.isEnabled) {
         cacheOptions.storage.set(originalUrl, html, cacheOptions.expiresIn);
       }
-      if (ngOptions.liveReload) {
-        const headTagIndex = html.indexOf('<head>');
-        html =
-          html.substr(0, headTagIndex + 6) +
-          LIVE_RELOAD_SCRIPT +
-          html.substr(headTagIndex + 7, html.length);
-      }
       callback(null, html);
     });
   });
+
   app.set('view engine', 'html');
   app.set('views', ngOptions.viewsPath);
+
   // Serve static files
   app.get(
     ngOptions.rootStaticPath,

package.json

@@ -15,20 +15,20 @@
     "publish:next": "npm publish --access public --tag next"
   },
   "peerDependencies": {
-    "@angular/platform-server": "^8.0.0",
+    "@angular/platform-server": "^9.0.0",
     "@nestjs/common": "^6.0.0",
     "@nestjs/core": "^6.0.0",
-    "@nguniversal/common": "^8.0.0",
-    "@nguniversal/express-engine": "^8.0.0",
-    "express": "^4.16.4",
+    "@nguniversal/common": "^9.0.0",
+    "@nguniversal/express-engine": "^9.0.0",
+    "express": "^4.17.1",
     "zone.js": "^0.8.29 || ^0.9.0 || ^0.10.0"
   },
   "devDependencies": {
-    "@angular/platform-server": "8.2.12",
+    "@angular/platform-server": "9.0.0",
     "@nestjs/common": "6.8.5",
     "@nestjs/core": "6.8.5",
-    "@nguniversal/common": "8.1.1",
-    "@nguniversal/express-engine": "8.1.1",
+    "@nguniversal/common": "9.0.0",
+    "@nguniversal/express-engine": "9.0.0",
     "@types/memory-cache": "0.2.0",
     "@types/node": "11.15.0",
     "express": "4.17.1",