@parameter1/base-cms-marko-web 4.1.1 → 4.2.0

package/components/page/layouts/dynamic-page.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/layouts/dynamic-page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/layouts/dynamic-page.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_dynamic_page_metadata_template = require("../metadata/dynamic-page.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -52,7 +52,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/layouts/dynamic-page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/layouts/dynamic-page.marko",
     tags: [
       "../metadata/dynamic-page.marko"
     ]

package/components/page/layouts/magazine-issue.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/layouts/magazine-issue.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/layouts/magazine-issue.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_magazine_issue_page_metadata_template = require("../metadata/magazine-issue.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -52,7 +52,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/layouts/magazine-issue.marko",
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/layouts/magazine-issue.marko",
     tags: [
       "../metadata/magazine-issue.marko"
     ]

package/components/page/layouts/magazine-publication.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/layouts/magazine-publication.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/layouts/magazine-publication.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_magazine_publication_page_metadata_template = require("../metadata/magazine-publication.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -52,7 +52,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/layouts/magazine-publication.marko",
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/layouts/magazine-publication.marko",
     tags: [
       "../metadata/magazine-publication.marko"
     ]

package/components/page/layouts/website-section.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/layouts/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/layouts/website-section.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_baseCmsObjectPath_module = require("@parameter1/base-cms-object-path"),
     baseCmsObjectPath_module = module_baseCmsObjectPath_module.default || module_baseCmsObjectPath_module,
@@ -70,7 +70,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/layouts/website-section.marko",
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/layouts/website-section.marko",
     tags: [
       "../metadata/website-section.marko",
       "../../rss/website-section.marko"

package/components/page/metadata/components/common.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/components/common.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/components/common.marko",
     marko_component = require("./common.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_page_title_template = require("../../title.marko"),
@@ -98,7 +98,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/components/common.marko",
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/components/common.marko",
     component: "./common.marko",
     tags: [
       "../../title.marko",

package/components/page/metadata/content.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/content.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/content.marko",
     marko_component = require("./content.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -197,7 +197,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/content.marko",
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/content.marko",
     component: "./content.marko",
     tags: [
       "./components/common.marko",

package/components/page/metadata/default.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/default.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/default.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     common_template = require("./components/common.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -22,7 +22,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/default.marko",
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/default.marko",
     tags: [
       "./components/common.marko"
     ]

package/components/page/metadata/dynamic-page.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/dynamic-page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/dynamic-page.marko",
     marko_component = require("./dynamic-page.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -75,7 +75,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/dynamic-page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/dynamic-page.marko",
     component: "./dynamic-page.marko",
     tags: [
       "./components/common.marko",

package/components/page/metadata/magazine-issue.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/magazine-issue.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/magazine-issue.marko",
     marko_component = require("./magazine-issue.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -74,7 +74,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/magazine-issue.marko",
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/magazine-issue.marko",
     component: "./magazine-issue.marko",
     tags: [
       "./components/common.marko",

package/components/page/metadata/magazine-publication.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/magazine-publication.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/magazine-publication.marko",
     marko_component = require("./magazine-publication.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -70,7 +70,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/magazine-publication.marko",
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/magazine-publication.marko",
     component: "./magazine-publication.marko",
     tags: [
       "./components/common.marko",

package/components/page/metadata/website-section.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/website-section.marko",
     marko_component = require("./website-section.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -70,7 +70,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/metadata/website-section.marko",
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/metadata/website-section.marko",
     component: "./website-section.marko",
     tags: [
       "./components/common.marko",

package/components/page/rel-canonical.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/rel-canonical.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/rel-canonical.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_baseCmsUtils_module = require("@parameter1/base-cms-utils"),
     baseCmsUtils_module = module_baseCmsUtils_module.default || module_baseCmsUtils_module,
@@ -38,5 +38,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/rel-canonical.marko"
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/rel-canonical.marko"
   };

package/components/page/title.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/title.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/title.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_baseCmsUtils_module = require("@parameter1/base-cms-utils"),
     baseCmsUtils_module = module_baseCmsUtils_module.default || module_baseCmsUtils_module,
@@ -42,5 +42,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/title.marko"
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/title.marko"
   };

package/components/page/wrapper.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/wrapper.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/page/wrapper.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_baseCmsObjectPath_module = require("@parameter1/base-cms-object-path"),
     baseCmsObjectPath_module = module_baseCmsObjectPath_module.default || module_baseCmsObjectPath_module,
@@ -56,7 +56,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/wrapper.marko",
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/page/wrapper.marko",
     tags: [
       "../element/index.marko"
     ]

package/components/resolve/page.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/resolve/page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/resolve/page.marko",
     marko_component = require("./page.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_baseCmsUtils_module = require("@parameter1/base-cms-utils"),
@@ -41,7 +41,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/resolve/page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/resolve/page.marko",
     component: "./page.marko",
     tags: [
       "@parameter1/base-cms-marko-core/components/resolve.marko"

package/components/rss/website-section.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/rss/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.2.0/components/rss/website-section.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_url_module = require("url"),
     url_module = module_url_module.default || module_url_module,
@@ -42,5 +42,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.1.1/components/rss/website-section.marko"
+    id: "/@parameter1/base-cms-marko-web$4.2.0/components/rss/website-section.marko"
   };

package/config/core.js

@@ -1,6 +1,6 @@
 const { get } = require('@parameter1/base-cms-object-path');
 const AbstractConfig = require('./abstract-config');
-const AssetManifest = require('./asset-manifest');
+const distLoader = require('./dist-loader');
 
 class CoreConfig extends AbstractConfig {
   /**
@@ -9,7 +9,11 @@ class CoreConfig extends AbstractConfig {
    */
   constructor(config) {
     super(config);
-    this.assets = new AssetManifest({ distDir: this.get('distDir') });
+    const distDir = this.get('distDir');
+    this.assetLoader = {
+      js: distLoader({ distDir, type: 'js', entry: 'browser/index.js' }),
+      css: distLoader({ distDir, type: 'css', entry: 'server/styles/index.scss' }),
+    };
   }
 
   setWebsiteContext(context) {
@@ -55,11 +59,13 @@ class CoreConfig extends AbstractConfig {
   }
 
   sources() {
-    return this.assets.js();
+    const js = this.assetLoader.js();
+    return [js];
   }
 
   styles() {
-    return this.assets.css();
+    const css = this.assetLoader.css();
+    return [css];
   }
 }
 

package/config/dist-loader.js

@@ -0,0 +1,24 @@
+const path = require('path');
+const { readFileSync } = require('fs');
+
+const loadFromManifest = ({ distDir, type, entry }) => {
+  const file = path.resolve(distDir, type, 'manifest.json');
+  const json = readFileSync(file, { encoding: 'utf8' });
+  const manifest = JSON.parse(json);
+  const asset = manifest[entry];
+  if (!asset) throw new Error(`Unable to extract an asset for type ${type} using manifest entry ${entry}`);
+  return `/dist/${type}/${asset.file}`;
+};
+
+module.exports = ({ distDir, type, entry }) => {
+  let file;
+  const isDevelopment = process.env.NODE_ENV !== 'production';
+  return () => {
+    // when on dev, always return the file from the manifest
+    // as it may have changed during build.
+    if (isDevelopment) return loadFromManifest({ distDir, type, entry });
+    // otherwise, only retrieve it once
+    if (!file) file = loadFromManifest({ distDir, type, entry });
+    return file;
+  };
+};

package/integration/test-website-boot.js

@@ -1,26 +1,35 @@
 const fetch = require('node-fetch');
+const { htmlEntities } = require('@parameter1/base-cms-html');
 
 const { error, log } = console;
 
+const url = process.env.MARKO_WEB_INTEGRATION_TEST_URL || 'http://localhost:80';
+
 setInterval(async () => {
   try {
-    const res = await fetch('http://localhost:80', { method: 'get' });
+    const res = await fetch(url, { method: 'get' });
     if (!res.ok) {
       error('Response not ok!', res.status, res.statusText);
       process.exit(1);
     } else {
       const html = await res.text();
+      // check for in-body body errors
+      const matches = [...html.matchAll(/data-marko-error="(.*?)"/g)];
+      const errors = [];
+      matches.forEach((values) => {
+        const value = values[1];
+        errors.push(htmlEntities.decode(value));
+      });
+      if (errors.length) {
+        error('In-page, server-side Marko error(s) were encountered!', errors);
+        process.exit(0);
+      }
+
+      // if not in-body errors, ensure page rendered.
       const found = /.*<\/head>.*<\/body>.*<\/html>.*/is.test(html);
       if (!found) {
         error('Unable to find closing HTML tags!');
         process.exit(1);
-        return;
-      }
-      // now check for any server errors
-      if (/data-marko-error="true"/g.test(html)) {
-        error('An in-page server-side Marko error was encountered!');
-        process.exit(1);
-        return;
       }
       log('Integration tests passed!');
       process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "description": "Core Marko+Express components for BaseCMS websites",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "main": "index.js",
@@ -28,6 +28,7 @@
     "@parameter1/base-cms-embedded-media": "^4.0.2",
     "@parameter1/base-cms-express-apollo": "^4.0.2",
     "@parameter1/base-cms-graphql-fragment-types": "^4.0.2",
+    "@parameter1/base-cms-html": "^4.0.2",
     "@parameter1/base-cms-image": "^4.0.2",
     "@parameter1/base-cms-inflector": "^4.0.2",
     "@parameter1/base-cms-marko-express": "^4.0.2",
@@ -57,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1812ced14a9b5d37f7668f4f0dcc7512ada23fea"
+  "gitHead": "696e9c8ede5717385922f0ebae0d6dba32132a53"
 }

package/config/asset-manifest.js

@@ -1,43 +0,0 @@
-const { join } = require('path');
-
-class AssetManifest {
-  constructor({ distDir } = {}) {
-    this.distDir = distDir;
-  }
-
-  js() {
-    if (!this.scripts) {
-      const { js } = this.load();
-      this.scripts = [js['browser/index.js']];
-    }
-    return this.scripts;
-  }
-
-  css() {
-    if (!this.stylesheets) {
-      const { css } = this.load();
-      this.stylesheets = [css['server/styles/index.scss']];
-    }
-    return this.stylesheets;
-  }
-
-  load() {
-    if (!this.manifest) {
-      this.manifest = {
-        js: this.loadDataFor('js'),
-        css: this.loadDataFor('css'),
-      };
-    }
-    return this.manifest;
-  }
-
-  loadDataFor(type) {
-    const { distDir } = this;
-    const distFolder = distDir.split('/').pop();
-    // eslint-disable-next-line global-require, import/no-dynamic-require
-    const json = require(join(distDir, type, 'manifest.json'));
-    return Object.keys(json).reduce((o, k) => ({ ...o, [k]: join('/', distFolder, type, json[k].file) }), {});
-  }
-}
-
-module.exports = AssetManifest;