@parameter1/base-cms-marko-web 4.0.0 → 4.1.0

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

@@ -1,13 +1,13 @@
 // Compiled using marko@4.20.2 - DO NOT EDIT
 "use strict";
 
-var marko_template = module.exports = require("marko/src/html").t(__filename),
-    marko_componentType = "/@parameter1/base-cms-marko-web$4.0.0/components/rss/website-section.marko",
-    marko_renderer = require("marko/src/runtime/components/renderer"),
+var marko_template = module.exports = require("marko/dist/html").t(__filename),
+    marko_componentType = "/@parameter1/base-cms-marko-web$4.1.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,
     URLSearchParams = module_url_module.URLSearchParams,
-    marko_attr = require("marko/src/runtime/html/helpers/attr");
+    marko_attr = require("marko/dist/runtime/html/helpers/attr");
 
 function render(input, out, __component, component, state) {
   var data = input;
@@ -37,10 +37,10 @@ function render(input, out, __component, component, state) {
 }
 
 marko_template._ = marko_renderer(render, {
-    ___implicit: true,
-    ___type: marko_componentType
+    d_: true,
+    e_: marko_componentType
   });
 
 marko_template.meta = {
-    id: "/@parameter1/base-cms-marko-web$4.0.0/components/rss/website-section.marko"
+    id: "/@parameter1/base-cms-marko-web$4.1.0/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parameter1/base-cms-marko-web",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Core Marko+Express components for BaseCMS websites",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "main": "index.js",
@@ -23,20 +23,20 @@
   },
   "dependencies": {
     "@godaddy/terminus": "^4.11.2",
-    "@parameter1/base-cms-apollo-ssr": "^4.0.0",
-    "@parameter1/base-cms-dayjs": "^4.0.0",
-    "@parameter1/base-cms-embedded-media": "^4.0.0",
-    "@parameter1/base-cms-express-apollo": "^4.0.0",
-    "@parameter1/base-cms-graphql-fragment-types": "^4.0.0",
-    "@parameter1/base-cms-image": "^4.0.0",
-    "@parameter1/base-cms-inflector": "^4.0.0",
-    "@parameter1/base-cms-marko-express": "^4.0.0",
-    "@parameter1/base-cms-marko-node-require": "^4.0.0",
-    "@parameter1/base-cms-marko-web-deferred-script-loader": "^4.0.0",
-    "@parameter1/base-cms-object-path": "^4.0.0",
-    "@parameter1/base-cms-tenant-context": "^4.0.0",
-    "@parameter1/base-cms-utils": "^4.0.0",
-    "@parameter1/base-cms-web-common": "^4.0.0",
+    "@parameter1/base-cms-apollo-ssr": "^4.0.2",
+    "@parameter1/base-cms-dayjs": "^4.0.2",
+    "@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-image": "^4.0.2",
+    "@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.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",
+    "@parameter1/base-cms-web-common": "^4.0.2",
     "cheerio": "^1.0.0-rc.12",
     "cookie-parser": "^1.4.6",
     "express": "^4.18.2",
@@ -56,5 +56,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5a70f4f025093e8aa62949b6732ba86647dc7aa1"
+  "gitHead": "8a5353f4c06ccc6b21a0fb99220cb9f992107cde"
 }

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'],
-      },
-    },
-  },
-};

package/express/marko.js

@@ -1,36 +0,0 @@
-/* eslint-disable no-underscore-dangle */
-require('marko');
-const buildGlobal = require('@parameter1/base-cms-marko-core/utils/build-marko-global');
-
-// eslint-disable-next-line import/no-extraneous-dependencies
-const express = module.main ? module.main.require('express') : require('express');
-
-if (!express) throw new Error('Unable to load Express.');
-
-const patch = (response) => {
-  response.marko = response.marko || function markoResponse(template, data) {
-    if (typeof template === 'string') throw new Error('res.marko does not accept a string or path as a template.');
-
-    const res = this;
-    const { req } = res;
-    res.set({ 'content-type': 'text/html; charset=utf-8' });
-    const $global = buildGlobal(res, data);
-    return template.render({ ...(data || {}), $global }, res).on('error', req.next);
-  };
-};
-
-patch(express.response);
-delete require.cache[__filename];
-
-module.exports = () => {
-  const app = express();
-  app.once('mount', (parent) => {
-    patch(parent.response);
-    if (parent._router) {
-      parent._router.stack.pop(); // express <= 4.x
-    } else {
-      parent.router.stack.pop(); // express 5.x
-    }
-  });
-  return app;
-};