@adobe/helix-html-pipeline 3.9.0 → 3.10.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.10.1](https://github.com/adobe/helix-html-pipeline/compare/v3.10.0...v3.10.1) (2023-04-11)
+
+
+### Bug Fixes
+
+* read contentbus-id from helix-config ([#291](https://github.com/adobe/helix-html-pipeline/issues/291)) ([c3ff2a8](https://github.com/adobe/helix-html-pipeline/commit/c3ff2a85a33f34c81a8d99f9afcbe085691734e9))
+
+# [3.10.0](https://github.com/adobe/helix-html-pipeline/compare/v3.9.0...v3.10.0) (2023-03-28)
+
+
+### Features
+
+* **picture:** update mobile breakpoint to 600px ([#280](https://github.com/adobe/helix-html-pipeline/issues/280)) ([6c72cba](https://github.com/adobe/helix-html-pipeline/commit/6c72cbaead55fb69b1c7d4c102052cc09a330b50))
+
 # [3.9.0](https://github.com/adobe/helix-html-pipeline/compare/v3.8.12...v3.9.0) (2023-03-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "3.9.0",
+  "version": "3.10.1",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -56,12 +56,12 @@
     "mdast-util-gfm-table": "1.0.7",
     "mdast-util-gfm-task-list-item": "1.0.2",
     "mdast-util-to-hast": "12.3.0",
-    "mdast-util-to-string": "3.1.1",
-    "micromark-extension-gfm-footnote": "1.0.4",
-    "micromark-extension-gfm-strikethrough": "1.0.4",
+    "mdast-util-to-string": "3.2.0",
+    "micromark-extension-gfm-footnote": "1.1.0",
+    "micromark-extension-gfm-strikethrough": "1.0.5",
     "micromark-extension-gfm-table": "1.0.5",
-    "micromark-extension-gfm-tagfilter": "1.0.1",
-    "micromark-extension-gfm-task-list-item": "1.0.3",
+    "micromark-extension-gfm-tagfilter": "1.0.2",
+    "micromark-extension-gfm-task-list-item": "1.0.4",
     "micromark-util-combine-extensions": "1.0.0",
     "mime": "3.0.0",
     "rehype-format": "4.0.1",
@@ -79,24 +79,24 @@
   "devDependencies": {
     "@adobe/eslint-config-helix": "2.0.2",
     "@markedjs/html-differ": "4.0.2",
-    "@semantic-release/changelog": "6.0.2",
+    "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@semantic-release/npm": "9.0.2",
+    "@semantic-release/npm": "10.0.3",
     "c8": "7.13.0",
-    "eslint": "8.36.0",
+    "eslint": "8.38.0",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.27.5",
-    "esmock": "2.1.0",
+    "esmock": "2.2.1",
     "husky": "8.0.3",
     "js-yaml": "4.1.0",
     "jsdom": "21.1.1",
     "junit-report-builder": "3.0.1",
-    "lint-staged": "13.2.0",
+    "lint-staged": "13.2.1",
     "mocha": "10.2.0",
     "mocha-multi-reporters": "1.5.1",
     "remark-gfm": "3.0.1",
-    "semantic-release": "20.1.3"
+    "semantic-release": "21.0.1"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/forms-pipe.js

@@ -14,6 +14,7 @@ import { PipelineResponse } from './PipelineResponse.js';
 import fetchConfigAll from './steps/fetch-config-all.js';
 import setCustomResponseHeaders from './steps/set-custom-response-headers.js';
 import { authenticate } from './steps/authenticate.js';
+import fetchConfig from './steps/fetch-config.js';
 
 function error(log, msg, status, response) {
   log.error(msg);
@@ -83,25 +84,36 @@ export async function extractBodyData(request) {
  * Handle a pipeline POST request.
  * At this point POST's only apply to json files that are backed by a workbook.
  * @param {PipelineState} state pipeline options
- * @param {PipelineRequest} request
+ * @param {PipelineRequest} req
  * @returns {Promise<PipelineResponse>} a response
  */
-export async function formsPipe(state, request) {
+export async function formsPipe(state, req) {
   const { log } = state;
   state.type = 'form';
 
   // todo: improve
-  const response = new PipelineResponse('', {
+  const res = new PipelineResponse('', {
     headers: {
       'content-type': 'text/plain; charset=utf-8',
     },
   });
-  await fetchConfigAll(state, request, response);
-  await authenticate(state, request, response);
-  if (response.error) {
-    return response;
+  try {
+    await fetchConfig(state, req, res);
+  } catch (e) {
+    // ignore
+  }
+  if (!state.contentBusId) {
+    res.status = 400;
+    res.headers.set('x-error', 'contentBusId missing');
+    return res;
+  }
+
+  await fetchConfigAll(state, req, res);
+  await authenticate(state, req, res);
+  if (res.error) {
+    return res;
   }
-  await setCustomResponseHeaders(state, request, response);
+  await setCustomResponseHeaders(state, req, res);
 
   const {
     owner, repo, ref, contentBusId, partition, s3Loader,
@@ -111,7 +123,7 @@ export async function formsPipe(state, request) {
 
   // block all POSTs to resources with extensions
   if (state.info.originalExtension !== '') {
-    return error(log, 'POST to URL with extension not allowed', 405, response);
+    return error(log, 'POST to URL with extension not allowed', 405, res);
   }
 
   // head workbook in content bus
@@ -122,22 +134,22 @@ export async function formsPipe(state, request) {
 
   let body;
   try {
-    body = await extractBodyData(request);
+    body = await extractBodyData(req);
   } catch (err) {
-    return error(log, err.message, 400, response);
+    return error(log, err.message, 400, res);
   }
 
   const sheets = resourceFetchResponse.headers.get('x-amz-meta-x-sheet-names');
   if (!sheets) {
-    return error(log, `Target workbook at ${resourcePath} missing x-sheet-names header.`, 403, response);
+    return error(log, `Target workbook at ${resourcePath} missing x-sheet-names header.`, 403, res);
   }
 
   const sourceLocation = resourceFetchResponse.headers.get('x-amz-meta-x-source-location');
-  const referer = request.headers.get('referer') || 'unknown';
+  const referer = req.headers.get('referer') || 'unknown';
   const sheetNames = sheets.split(',').map((s) => s.trim());
 
   if (!sourceLocation || !sheetNames.includes('incoming')) {
-    return error(log, `Target workbook at ${resourcePath} is not setup to intake data.`, 403, response);
+    return error(log, `Target workbook at ${resourcePath} is not setup to intake data.`, 403, res);
   }
 
   // Send message to SQS if workbook contains and incoming
@@ -159,11 +171,11 @@ export async function formsPipe(state, request) {
   try {
     // Send message to forms queue
     const { requestId, messageId } = await state.messageDispatcher.dispatch(message);
-    response.status = 201;
-    response.headers.set('x-request-id', requestId);
-    response.headers.set('x-message-id', messageId);
-    return response;
+    res.status = 201;
+    res.headers.set('x-request-id', requestId);
+    res.headers.set('x-message-id', messageId);
+    return res;
   } catch (err) {
-    return error(log, `Failed to send message to forms queue: ${err}`, 500, response);
+    return error(log, `Failed to send message to forms queue: ${err}`, 500, res);
   }
 }

package/src/html-pipe.js

@@ -71,15 +71,14 @@ export async function htmlPipe(state, req) {
     }
   }
 
-  if (!state.contentBusId) {
-    res.status = 400;
-    res.headers.set('x-error', 'contentBusId missing');
-    return res;
-  }
-
   try { // fetch config first, since we need to compute the content-bus-id from the fstab ...
     state.timer?.update('config-fetch');
     await fetchConfig(state, req, res);
+    if (!state.contentBusId) {
+      res.status = 400;
+      res.headers.set('x-error', 'contentBusId missing');
+      return res;
+    }
 
     // ...and apply the folder mapping
     await folderMapping(state);

package/src/json-pipe.js

@@ -102,6 +102,14 @@ export async function jsonPipe(state, req) {
   try {
     // fetch config and apply the folder mapping
     await fetchConfig(state, req);
+    if (!state.contentBusId) {
+      return new PipelineResponse('', {
+        status: 400,
+        headers: {
+          'x-error': 'contentBusId missing',
+        },
+      });
+    }
     await folderMapping(state);
 
     /** @type PipelineResponse */

package/src/steps/create-pictures.js

@@ -14,7 +14,7 @@ import { h } from 'hastscript';
 import { visitParents } from 'unist-util-visit-parents';
 
 const BREAK_POINTS = [
-  { media: '(min-width: 400px)', width: '2000' },
+  { media: '(min-width: 600px)', width: '2000' },
   { width: '750' },
 ];
 

package/src/steps/fetch-config.js

@@ -47,6 +47,21 @@ export default async function fetchConfig(state, req, res) {
     });
   }
 
+  // set contentbusid from header if missing in config
+  const cbid = ret.headers.get('x-contentbus-id');
+  if (!config.content && cbid) {
+    config.content = {
+      data: {
+        '/': {
+          contentBusId: cbid.substring(2),
+        },
+      },
+    };
+  }
+  if (!state.contentBusId) {
+    state.contentBusId = config.content?.data?.['/']?.contentBusId;
+  }
+
   if (res) {
     // also update last-modified
     const configLastModified = extractLastModified(ret.headers);

package/src/steps/render-code.js

@@ -11,6 +11,8 @@
  */
 import mime from 'mime';
 
+const CHARSET_RE = /charset=([^()<>@,;:"/[\]?.=\s]*)/i;
+
 /**
  * "Renders" the content from the code-bus as-is
  * @type PipelineStep
@@ -21,5 +23,13 @@ import mime from 'mime';
  */
 export default async function renderCode(state, req, res) {
   res.body = state.content.data;
-  res.headers.set('content-type', mime.getType(state.info.resourcePath));
+  let contentType = mime.getType(state.info.resourcePath);
+  const originalType = res.headers.get('content-type');
+  if (originalType) {
+    const match = CHARSET_RE.exec(originalType);
+    if (match) {
+      contentType += `; charset=${match[1]}`;
+    }
+  }
+  res.headers.set('content-type', contentType);
 }