fix(hapi-engine): update schematic for server.ts

angular · Sep 16, 2019 · 029b659 · 029b659
1 parent abe57e0
commit 029b659
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 85 deletions.
diff --git a/integration/hapi-engine-ivy/package.json b/integration/hapi-engine-ivy/package.json
@@ -32,8 +32,7 @@
     "hapi": "file:../../node_modules/hapi",
     "inert": "5.1.0",
     "rxjs": "file:../../node_modules/rxjs",
-    "zone.js": "file:../../node_modules/zone.js",
-    "vision": "5.4.4"
+    "zone.js": "file:../../node_modules/zone.js"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "0.900.0-next.4",
@@ -42,7 +41,6 @@
     "@types/inert": "file:../../node_modules/@types/inert",
     "@types/node": "file:../../node_modules/@types/node",
     "@types/jasmine": "file:../../node_modules/@types/jasmine",
-    "@types/vision": "file:../../node_modules/@types/vision",
     "codelyzer": "5.1.0",
     "concurrently": "3.1.0",
     "jasmine-core": "3.4.0",

diff --git a/integration/hapi-engine-ivy/server.ts b/integration/hapi-engine-ivy/server.ts
@@ -2,11 +2,11 @@ import 'zone.js/dist/zone-node';
 
 import { ngHapiEngine } from '@nguniversal/hapi-engine';
 import * as inert from 'inert';
-import * as vision from 'vision';
 import { Request, Server, ResponseToolkit } from 'hapi';
 import { join } from 'path';
 
 import { AppServerModule } from './src/main.server';
+import { readFileSync } from 'fs';
 
 // Hapi server
 async function run(): Promise<void> {
@@ -22,25 +22,16 @@ async function run(): Promise<void> {
     },
   });
 
-  await server.register(vision);
-  server.views({
-    engines: {
-      html : {
-        compile: (document: string) => (req: Request) => ngHapiEngine({
-          bootstrap: AppServerModule,
-          document,
-          req,
-        })
-      }
-    },
-    path: distFolder,
-  });
+  const document = readFileSync(join(distFolder, 'index.html'), 'utf-8');
 
   server.route({
     method: 'GET',
     path: '/{path*}',
-    handler: (req: Request, res: ResponseToolkit) =>
-      res.view('index', req)
+    handler: (req: Request) => ngHapiEngine({
+      bootstrap: AppServerModule,
+      document,
+      req,
+    })
   });
 
   await server.register(inert);

diff --git a/integration/hapi-engine-ve/package.json b/integration/hapi-engine-ve/package.json
@@ -32,8 +32,7 @@
     "hapi": "file:../../node_modules/hapi",
     "inert": "5.1.0",
     "rxjs": "file:../../node_modules/rxjs",
-    "zone.js": "file:../../node_modules/zone.js",
-    "vision": "5.4.4"
+    "zone.js": "file:../../node_modules/zone.js"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "0.900.0-next.4",
@@ -42,7 +41,6 @@
     "@types/inert": "file:../../node_modules/@types/inert",
     "@types/node": "file:../../node_modules/@types/node",
     "@types/jasmine": "file:../../node_modules/@types/jasmine",
-    "@types/vision": "file:../../node_modules/@types/vision",
     "codelyzer": "5.1.0",
     "concurrently": "3.1.0",
     "jasmine-core": "3.4.0",

diff --git a/integration/hapi-engine-ve/server.ts b/integration/hapi-engine-ve/server.ts
@@ -2,10 +2,9 @@ import 'zone.js/dist/zone-node';
 
 import { ngHapiEngine } from '@nguniversal/hapi-engine';
 import * as inert from 'inert';
-import * as vision from 'vision';
 import { Request, Server, ResponseToolkit } from 'hapi';
 import { join } from 'path';
-
+import { readFileSync } from 'fs';
 import { AppServerModuleNgFactory } from './src/main.server';
 
 // Hapi server
@@ -22,25 +21,16 @@ async function run(): Promise<void> {
     },
   });
 
-  await server.register(vision);
-  server.views({
-    engines: {
-      html : {
-        compile: (document: string) => (req: Request) => ngHapiEngine({
-          bootstrap: AppServerModuleNgFactory,
-          document,
-          req,
-        })
-      }
-    },
-    path: distFolder,
-  });
+  const document = readFileSync(join(distFolder, 'index.html'), 'utf-8');
 
   server.route({
     method: 'GET',
     path: '/{path*}',
-    handler: (req: Request, res: ResponseToolkit) =>
-      res.view('index', req)
+    handler: (req: Request) => ngHapiEngine({
+      bootstrap: AppServerModuleNgFactory,
+      document,
+      req,
+    })
   });
 
   await server.register(inert);

diff --git a/modules/hapi-engine/schematics/install/files/__serverFileName@stripTsExtension__.ts b/modules/hapi-engine/schematics/install/files/__serverFileName@stripTsExtension__.ts
@@ -2,9 +2,9 @@ import 'zone.js/dist/zone-node';
 
 import { ngHapiEngine } from '@nguniversal/hapi-engine';
 import * as inert from 'inert';
-import * as vision from 'vision';
 import { Request, Server, ResponseToolkit } from 'hapi';
 import { join } from 'path';
+import { readFileSync } from 'fs';
 
 import { AppServerModule } from './src/<%= stripTsExtension(main) %>';
 
@@ -22,25 +22,16 @@ async function run(): Promise<void> {
     },
   });
 
-  await server.register(vision);
-  server.views({
-    engines: {
-      html : {
-        compile: (document: string) => (req: Request) => ngHapiEngine({
-          bootstrap: AppServerModule,
-          document,
-          req,
-        })
-      }
-    },
-    path: distFolder,
-  });
+  const document = readFileSync(join(distFolder, 'index.html'), 'utf-8');
 
   server.route({
     method: 'GET',
     path: '/{path*}',
-    handler: (req: Request, res: ResponseToolkit) =>
-      res.view('index', req)
+    handler: (req: Request) => ngHapiEngine({
+      bootstrap: AppServerModule,
+      document,
+      req,
+    })
   });
 
   await server.register(inert);

diff --git a/modules/hapi-engine/schematics/install/index.ts b/modules/hapi-engine/schematics/install/index.ts
@@ -50,16 +50,6 @@ function addDependencies(options: UniversalOptions): Rule {
       name: 'inert',
       version: '^5.1.0',
     });
-    addPackageJsonDependency(host, {
-      type: NodeDependencyType.Default,
-      name: 'vision',
-      version: '^5.4.4',
-    });
-    addPackageJsonDependency(host, {
-      type: NodeDependencyType.Dev,
-      name: '@types/vision',
-      version: '^5.4.4',
-    });
     addPackageJsonDependency(host, {
       type: NodeDependencyType.Dev,
       name: '@types/inert',

diff --git a/package.json b/package.json
@@ -103,7 +103,6 @@
     "@types/inert": "^5.1.2",
     "@types/jasmine": "^2.8.6",
     "@types/node": "^9.4.6",
-    "@types/vision": "^5.3.6",
     "camelcase": "^4.1.0",
     "domino": "^2.1.2",
     "express": "^4.15.2",

diff --git a/yarn.lock b/yarn.lock
@@ -561,14 +561,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/vision@^5.3.6":
-  version "5.3.6"
-  resolved "https://registry.yarnpkg.com/@types/vision/-/vision-5.3.6.tgz#d696d007ca82254b955fd485bfae0f738d8ae617"
-  integrity sha512-Wo+9LNI9wGcHRShuZW+lbwwj+g6+dyTxtHtNpzfYl4iehYzvFVzGyNo1MgW4qTHQCFEYOirLHBlrutkIRE2TMw==
-  dependencies:
-    "@types/hapi" "*"
-    handlebars "^4.1.0"
-
 "@types/[email protected]":
   version "3.16.31"
   resolved "https://registry.yarnpkg.com/@types/z-schema/-/z-schema-3.16.31.tgz#2eb1d00a5e4ec3fa58c76afde12e182b66dc5c1c"
@@ -2630,17 +2622,6 @@ handlebars@^4.0.3:
   optionalDependencies:
     uglify-js "^3.1.4"
 
-handlebars@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.2.0.tgz#57ce8d2175b9bbb3d8b3cf3e4217b1aec8ddcb2e"
-  integrity sha512-Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw==
-  dependencies:
-    neo-async "^2.6.0"
-    optimist "^0.6.1"
-    source-map "^0.6.1"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
 hapi@^17.5.1:
   version "17.8.1"
   resolved "https://registry.yarnpkg.com/hapi/-/hapi-17.8.1.tgz#63cc5bbc138b6ae0919e977764647a17556e4c87"