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

package/components/page/layouts/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.0.2/components/page/layouts/content.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/layouts/content.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_content_page_metadata_template = require("../metadata/content.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -56,7 +56,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.0.2/components/page/layouts/content.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/layouts/content.marko",
     tags: [
       "../metadata/content.marko"
     ]

package/components/page/layouts/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.0.2/components/page/layouts/default.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/components/page/layouts/default.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_web_default_page_metadata_template = require("../metadata/default.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -54,7 +54,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.0.2/components/page/layouts/default.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/components/page/layouts/default.marko",
     tags: [
       "../metadata/default.marko"
     ]

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.0.2/components/page/layouts/dynamic-page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/layouts/dynamic-page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/layouts/magazine-issue.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/layouts/magazine-issue.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/layouts/magazine-publication.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/layouts/magazine-publication.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/layouts/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/layouts/website-section.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/components/common.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/components/common.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/content.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/content.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/default.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/default.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/dynamic-page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/dynamic-page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/magazine-issue.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/magazine-issue.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/magazine-publication.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/magazine-publication.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/metadata/website-section.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/rel-canonical.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/rel-canonical.marko"
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/title.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/title.marko"
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/wrapper.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/page/wrapper.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/resolve/page.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/resolve/page.marko",
+    id: "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/rss/website-section.marko",
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.1/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.0.2/components/rss/website-section.marko"
+    id: "/@parameter1/base-cms-marko-web$4.1.1/components/rss/website-section.marko"
   };

package/config/asset-manifest.js

@@ -8,7 +8,7 @@ class AssetManifest {
   js() {
     if (!this.scripts) {
       const { js } = this.load();
-      this.scripts = [js['main.js']];
+      this.scripts = [js['browser/index.js']];
     }
     return this.scripts;
   }
@@ -16,7 +16,7 @@ class AssetManifest {
   css() {
     if (!this.stylesheets) {
       const { css } = this.load();
-      this.stylesheets = [css['main.css']];
+      this.stylesheets = [css['server/styles/index.scss']];
     }
     return this.stylesheets;
   }
@@ -36,7 +36,7 @@ class AssetManifest {
     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]) }), {});
+    return Object.keys(json).reduce((o, k) => ({ ...o, [k]: join('/', distFolder, type, json[k].file) }), {});
   }
 }
 

package/eslint.log

@@ -0,0 +1,3 @@
+yarn run v1.22.10
+$ eslint --ext .js --ext .vue --max-warnings 5 ./
+Done in 3.75s.

package/integration/test-website-boot.js

@@ -0,0 +1,31 @@
+const fetch = require('node-fetch');
+
+const { error, log } = console;
+
+setInterval(async () => {
+  try {
+    const res = await fetch('http://localhost:80', { method: 'get' });
+    if (!res.ok) {
+      error('Response not ok!', res.status, res.statusText);
+      process.exit(1);
+    } else {
+      const html = await res.text();
+      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);
+    }
+  } catch (e) {
+    // noop
+  }
+}, 100);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "4.0.2",
+  "version": "4.1.1",
   "description": "Core Marko+Express components for BaseCMS websites",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "main": "index.js",
@@ -32,7 +32,7 @@
     "@parameter1/base-cms-inflector": "^4.0.2",
     "@parameter1/base-cms-marko-express": "^4.0.2",
     "@parameter1/base-cms-marko-node-require": "^4.0.2",
-    "@parameter1/base-cms-marko-web-deferred-script-loader": "^4.0.2",
+    "@parameter1/base-cms-marko-web-deferred-script-loader": "^4.1.0",
     "@parameter1/base-cms-object-path": "^4.0.2",
     "@parameter1/base-cms-tenant-context": "^4.0.2",
     "@parameter1/base-cms-utils": "^4.0.2",
@@ -47,6 +47,7 @@
     "http-errors": "^1.8.1",
     "jquery": "^3.6.3",
     "marko": "~4.20.0",
+    "node-fetch": "^2.6.9",
     "vue": "^2.7.14",
     "vue-server-renderer": "^2.7.14"
   },
@@ -56,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "68e4f2db27a0deb0f4b33c57d3dc86978f53ee54"
+  "gitHead": "1812ced14a9b5d37f7668f4f0dcc7512ada23fea"
 }

package/scss/node.scss

@@ -1,4 +1,6 @@
 
+@use "sass:math";
+
 $marko-web-node-image-aspect-ratios: () !default;
 // stylelint-disable-next-line scss/dollar-variable-default
 $marko-web-node-image-aspect-ratios: join(
@@ -38,7 +40,7 @@ $marko-web-node-placeholder-image-opacity:      .2 !default;
     display: block;
     content: "";
     @if $ratio-y and $ratio-x {
-      padding-top: percentage($ratio-y / $ratio-x);
+      padding-top: percentage(math.div($ratio-y, $ratio-x));
     }
   }
 }

package/.eslintrc.js

@@ -1,9 +0,0 @@
-module.exports = {
-  settings: {
-    'import/resolver': {
-      node: {
-        extensions: ['.js', '.marko'],
-      },
-    },
-  },
-};