fix error in fastify 2.x

Author: Clark Wang

.gitignore

@@ -61,3 +61,4 @@ typings/
 .next
 
 .idea
+dist

package.json

@@ -29,6 +29,7 @@
     "@angular/platform-browser-dynamic": ">=7.0.0",
     "@angular/platform-server": ">=7.0.0",
     "@angular/router": ">=7.0.0",
+    "@types/node": "^11.13.4",
     "fastify": ">=2.1.0",
     "lerna": "^3.13.0",
     "rxjs": "^6.3.3",

packages/fastify-angular/index.js

@@ -14,15 +14,7 @@ function fastifyAngular(fastify, opts, next) {
     .register(require('./plugins/locale'), {
       browser: opts.browser,
       i18n   : opts.i18n,
-    })
-    .after(() => {
-      fastify.supportedBrowserLocales.forEach((locale) => {
-        fastify.register(fastifyAngularBundle, {
-          prefix : locale ? `/${locale}/` : '/',
-          locale : locale,
-          browser: join(opts.browser, locale),
-        });
-      });
+      bundle : fastifyAngularBundle,
     });
 
   if (opts.universal) {

packages/fastify-angular/plugins/locale.js

@@ -23,6 +23,14 @@ function fastifyAngularLocale(fastify, opts, next) {
     },
   });
 
+  locales.forEach((locale) => {
+    fastify.register(opts.bundle, {
+      prefix : locale ? `/${locale}/` : '/',
+      locale : locale,
+      browser: join(opts.browser, locale),
+    });
+  });
+
   next();
 }
 

packages/test-app/package.json

@@ -54,6 +54,7 @@
     "fastify": ">=2.1.0",
     "fastify-language-parser": "^2.0.0",
     "fastify-static": "^2.4.0",
+    "fastify-accepts": "^0.5.0",
     "rxjs": "~6.3.3",
     "zone.js": "~0.8.26"
   },

packages/test-app/server.ts

@@ -1,32 +1,25 @@
 import 'zone.js/dist/zone-node';
 import 'reflect-metadata';
 
-import * as fastify       from 'fastify';
 import { enableProdMode } from '@angular/core';
 
 // Faster server renders w/ Prod mode (dev mode never needed)
 enableProdMode();
 
-const PORT = +process.env.PORT || 4000;
+export = function server(fastify, opts, next) {
 
-// Fastify server
-const app = fastify();
+  fastify
+    .register(require('fastify-accepts'))
+    .register(require('fastify-language-parser'), {
+      order        : ['header'],
+      fallbackLng  : 'en',
+      supportedLngs: ['zh', 'en'],
+    })
+    .register(require('fastify-angular'), {
+      dist     : __dirname,
+      i18n     : true,
+      universal: true,
+    });
 
-app
-  .register(require('fastify-accepts'))
-  .register(require('fastify-language-parser'), {
-    order        : ['header'],
-    fallbackLng  : 'en',
-    supportedLngs: ['zh', 'en'],
-  })
-  .register(require('fastify-angular'), {
-    dist     : __dirname,
-    i18n     : true,
-    universal: true,
-  })
-  .listen(PORT, (err, address) => {
-    if (err) {
-      throw err;
-    }
-    console.log(`Node Fastify server listening on ${address}`);
-  });
+  next();
+};

packages/test-app/server.tsconfig.json

@@ -8,9 +8,6 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "target": "es5",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
     "lib": [
       "es2017",
       "dom"

packages/test-app/src/polyfills.ts

@@ -38,8 +38,8 @@
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /** Evergreen browsers require these. **/
-import 'core-js/es6/reflect';
-import 'core-js/es7/reflect';
+// import 'core-js/es6/reflect';
+// import 'core-js/es7/reflect';
 
 
 /**

packages/test-app/tsconfig.json

@@ -9,6 +9,9 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "target": "es5",
+    "types": [
+      "node"
+    ],
     "typeRoots": [
       "node_modules/@types"
     ],

yarn.lock

@@ -1033,7 +1033,7 @@
     semver "5.6.0"
     semver-intersect "1.4.0"
 
-"@types/node@*", "@types/node@^11.13.0":
+"@types/node@*", "@types/node@^11.13.0", "@types/node@^11.13.4":
   version "11.13.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
   integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
@@ -1238,7 +1238,7 @@ accept-language-parser@^1.5.0:
   resolved "https://registry.yarnpkg.com/accept-language-parser/-/accept-language-parser-1.5.0.tgz#8877c54040a8dcb59e0a07d9c1fde42298334791"
   integrity sha1-iHfFQECo3LWeCgfZwf3kIpgzR5E=
 
-accepts@~1.3.4, accepts@~1.3.5:
+accepts@^1.3.3, accepts@~1.3.4, accepts@~1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
   integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
@@ -3558,6 +3558,14 @@ fastfall@^1.5.0:
   dependencies:
     reusify "^1.0.0"
 
+fastify-accepts@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/fastify-accepts/-/fastify-accepts-0.5.0.tgz#c17c201278f2bfc51bfb93ffe48efc4fc40fd363"
+  integrity sha1-wXwgEnjyv8Ub+5P/5I78T8QP02M=
+  dependencies:
+    accepts "^1.3.3"
+    fastify-plugin "^0.2.1"
+
 fastify-autoload@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/fastify-autoload/-/fastify-autoload-0.7.0.tgz#d55ad8c00bbf9c197dc9d0f9d3969c2fa69cc653"
@@ -3601,6 +3609,13 @@ fastify-plugin@>=1.2.0, fastify-plugin@^1.4.0, fastify-plugin@^1.5.0:
   dependencies:
     semver "^5.5.0"
 
+fastify-plugin@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/fastify-plugin/-/fastify-plugin-0.2.2.tgz#e01b67685fd02e87edc98670ce2acfe251a2c715"
+  integrity sha512-oRJdjdudgCkQQUARNeh2rkbxFAmj2OhCJSVBNBLUbhS0orF+IMQ4u/bc661N1jh/wDI2J+YKmXmmHSVFQI4e7A==
+  dependencies:
+    semver "^5.4.1"
+
 fastify-static@>=0.14.0, fastify-static@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/fastify-static/-/fastify-static-2.4.0.tgz#7d3937897a8feaa66a920a915f72a11e795c3351"