add integration test for templateProcessor

electrode-io · Aug 6, 2018 · bc2272f · bc2272f
1 parent 1e6b771
commit bc2272f
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 52 deletions.
diff --git a/packages/electrode-react-webapp/lib/async-template.js b/packages/electrode-react-webapp/lib/async-template.js
@@ -10,6 +10,7 @@ const Renderer = require("./renderer");
 const { resolvePath } = require("./utils");
 const Token = require("./token");
 const stringArray = require("string-array");
+const _ = require("lodash");
 const Path = require("path");
 
 const { TEMPLATE_DIR } = require("./symbols");
@@ -28,14 +29,24 @@ const tokenOpenTagRegex = new RegExp(
 class AsyncTemplate {
   constructor(options) {
     this._options = options;
-    this._tokenHandlers = [];
+    this._tokenHandlers = [].concat(this._options.tokenHandlers).filter(x => x);
     this._handlersMap = {};
+    // the same context that gets passed to each token handler's setup function
+    this._handlerContext = _.merge(
+      {
+        user: {
+          // set routeOptions in user also for consistency
+          routeOptions: options.routeOptions
+        }
+      },
+      options
+    );
     this._initializeTemplate(options.htmlFile);
-    this._initializeTokenHandlers([].concat(this._options.tokenHandlers).filter(x => x));
   }
 
   initializeRenderer(reset) {
     if (reset || !this._renderer) {
+      this._initializeTokenHandlers(this._tokenHandlers);
       this._applyTokenLoad();
       this._renderer = new Renderer({
         htmlTokens: this._tokens,
@@ -328,7 +339,7 @@ class AsyncTemplate {
 
   _loadTokenHandler(path) {
     const mod = loadHandler(path);
-    return mod(this._options, this);
+    return mod(this._handlerContext, this);
   }
 
   _applyTokenLoad() {

diff --git a/packages/electrode-react-webapp/lib/react-webapp.js b/packages/electrode-react-webapp/lib/react-webapp.js
@@ -85,7 +85,11 @@ const setupOptions = options => {
 const setupPathOptions = (routeOptions, path) => {
   const options = routeOptions.paths[path];
   return _.defaults(
-    { htmlFile: options.htmlFile, tokenHandler: options.tokenHandler },
+    {
+      htmlFile: options.htmlFile,
+      tokenHandler: options.tokenHandler,
+      tokenHandlers: options.tokenHandlers
+    },
     routeOptions
   );
 };

diff --git a/packages/electrode-react-webapp/lib/react/token-handlers.js b/packages/electrode-react-webapp/lib/react/token-handlers.js
@@ -24,8 +24,8 @@ const PREFETCH_MARKER = "PREFETCH_BUNDLES";
 const META_TAGS_MARKER = "META_TAGS";
 const CRITICAL_CSS_MARKER = "CRITICAL_CSS";
 
-module.exports = function setup(handlerContext /* , asyncTemplate */) {
-  const routeOptions = handlerContext.routeOptions;
+module.exports = function setup(handlerContext /*, asyncTemplate*/) {
+  const routeOptions = handlerContext.user.routeOptions;
 
   const WEBPACK_DEV = routeOptions.webpackDev;
   const RENDER_JS = routeOptions.renderJS;
@@ -49,7 +49,7 @@ module.exports = function setup(handlerContext /* , asyncTemplate */) {
     criticalCSS
   };
 
-  handlerContext.routeData = routeData;
+  handlerContext.user.routeData = routeData;
 
   const bundleManifest = () => {
     if (!assets.manifest) {

diff --git a/packages/electrode-react-webapp/test/fixtures/react-helmet-handler.js b/packages/electrode-react-webapp/test/fixtures/react-helmet-handler.js
@@ -5,8 +5,8 @@ const Helmet = require("react-helmet").Helmet;
 const emptyTitleRegex = /<title[^>]*><\/title>/;
 
 module.exports = handlerContext => {
-  const routeOptions = handlerContext.routeOptions;
-  const iconStats = handlerContext.routeData.iconStats;
+  const routeOptions = handlerContext.user.routeOptions;
+  const iconStats = handlerContext.user.routeData.iconStats;
 
   return {
     HEAD_INITIALIZE: context => {
@@ -21,18 +21,11 @@ module.exports = handlerContext => {
       return helmetTitleEmpty ? `<title>${routeOptions.pageTitle}</title>` : helmetTitleScript;
     },
 
-    WEBAPP_HEADER_BUNDLES: (context, next) => {
-      context.handleTokenResult(
-        "WEBAPP_HEADER_BUNDLES",
-        context.getTokens("electrode-react-token-handlers").WEBAPP_HEADER_BUNDLES(context), // eslint-disable-line
-        () => {
-          const scriptsFromHelmet = ["link", "style", "script", "noscript"]
-            .map(tagName => context.user.helmet[tagName].toString())
-            .join("");
-          context.output.add(`<!--scripts from helmet-->${scriptsFromHelmet}`);
-          next();
-        }
-      );
+    REACT_HELMET_SCRIPTS: context => {
+      const scriptsFromHelmet = ["link", "style", "script", "noscript"]
+        .map(tagName => context.user.helmet[tagName].toString())
+        .join("");
+      return `<!--scripts from helmet-->${scriptsFromHelmet}`;
     },
 
     META_TAGS: context => {