@adobe/helix-html-pipeline 5.2.0 → 5.4.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [5.4.0](https://github.com/adobe/helix-html-pipeline/compare/v5.3.0...v5.4.0) (2023-12-15)
+
+
+### Features
+
+* render static html from code bus ([#471](https://github.com/adobe/helix-html-pipeline/issues/471)) ([a46dab0](https://github.com/adobe/helix-html-pipeline/commit/a46dab0a9a2eb33e146bf5995e801da517389f69))
+
+# [5.3.0](https://github.com/adobe/helix-html-pipeline/compare/v5.2.0...v5.3.0) (2023-12-05)
+
+
+### Features
+
+* add xfh debug ([#468](https://github.com/adobe/helix-html-pipeline/issues/468)) ([940a57b](https://github.com/adobe/helix-html-pipeline/commit/940a57bee7a0b7c394c08da59c3a66b7a1d5868d))
+
 # [5.2.0](https://github.com/adobe/helix-html-pipeline/compare/v5.1.3...v5.2.0) (2023-11-15)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "5.2.0",
+  "version": "5.4.0",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -53,10 +53,10 @@
     "hast-util-to-html": "9.0.0",
     "hast-util-to-string": "3.0.0",
     "hastscript": "8.0.0",
-    "jose": "5.1.0",
+    "jose": "5.1.3",
     "mdast-util-to-hast": "13.0.2",
     "mdast-util-to-string": "4.0.0",
-    "mime": "3.0.0",
+    "mime": "4.0.0",
     "rehype-format": "5.0.0",
     "rehype-parse": "9.0.0",
     "remark-parse": "11.0.0",
@@ -70,26 +70,26 @@
     "unist-util-visit-parents": "6.0.1"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "2.0.4",
+    "@adobe/eslint-config-helix": "2.0.5",
     "@markedjs/html-differ": "4.0.2",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@semantic-release/npm": "11.0.1",
+    "@semantic-release/npm": "11.0.2",
     "c8": "8.0.1",
-    "eslint": "8.53.0",
+    "eslint": "8.55.0",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.29.0",
     "esmock": "2.6.0",
     "husky": "8.0.3",
     "js-yaml": "4.1.0",
-    "jsdom": "22.1.0",
+    "jsdom": "23.0.1",
     "junit-report-builder": "3.1.0",
-    "lint-staged": "15.1.0",
+    "lint-staged": "15.2.0",
     "mocha": "10.2.0",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.4.1",
-    "semantic-release": "22.0.7"
+    "semantic-release": "22.0.10"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/html-pipe.js

@@ -96,6 +96,11 @@ export async function htmlPipe(state, req) {
       return res;
     }
 
+    // force code-bus for .html files
+    if (state.info.originalExtension === '.html' && state.info.selector !== 'plain') {
+      state.content.sourceBus = 'code';
+    }
+
     // ...and apply the folder mapping
     state.timer?.update('content-fetch');
     let contentPromise = await fetchContent(state, req, res);

package/src/index.d.ts

@@ -22,7 +22,7 @@ export * from './PipelineStatusError';
 /**
  * Path Info
  */
-declare interface PathInfo {
+export declare interface PathInfo {
   /**
    * Resource path
    * @example '/express/index.md'
@@ -72,7 +72,7 @@ declare interface PathInfo {
   unmappedPath: string;
 }
 
-declare interface S3Loader {
+export declare interface S3Loader {
   /**
    * Loads a S3 object from the given bucket and key.
    * @param {string} bucketId
@@ -88,7 +88,7 @@ declare interface S3Loader {
   headObject(bucketId, key): Promise<PipelineResponse>;
 }
 
-declare interface AuthEnvLoader {
+export declare interface AuthEnvLoader {
 
   /**
    * loads (secret) parameters needed for authentication. The parameters are added to the
@@ -98,12 +98,12 @@ declare interface AuthEnvLoader {
   load(state:PipelineState):Promise<void>;
 }
 
-declare interface DispatchMessageResponse {
+export declare interface DispatchMessageResponse {
   messageId:string,
   requestId:string,
 }
 
-declare interface FormsMessageDispatcher {
+export declare interface FormsMessageDispatcher {
   /**
    * Dispatches the message to the forms queue
    * @param {object} message
@@ -114,13 +114,13 @@ declare interface FormsMessageDispatcher {
 /**
  * Timer
  */
-declare interface PipelineTimer {
+export declare interface PipelineTimer {
   /**
    * Records the timestamp of the given `step`
    */
   update(step:string): void;
 }
 
-declare interface PipelineStep {
+export declare interface PipelineStep {
   async(state: PipelineState, req: PipelineRequest, resp: PipelineResponse): Promise<void>;
 }

package/src/steps/fetch-content.js

@@ -41,7 +41,7 @@ export default async function fetchContent(state, req, res) {
   if (redirectLocation) {
     res.status = 301;
     res.body = '';
-    if (redirectLocation.startsWith('/') && state.info.selector === 'plain') {
+    if (redirectLocation.startsWith('/') && info.selector === 'plain') {
       redirectLocation += '.plain.html';
     }
     res.headers.set('location', redirectLocation);

package/src/utils/auth.js

@@ -109,7 +109,8 @@ export async function decodeIdToken(state, idToken, lenient = false) {
 function getRequestHostAndProto(state, req) {
   // determine the location of 'this' document based on the xfh header. so that logins to
   // .page stay on .page. etc. but fallback to the config.host if non set
-  let host = req.headers.get('x-forwarded-host');
+  const xfh = req.headers.get('x-forwarded-host');
+  let host = xfh;
   if (host) {
     host = host.split(',')[0].trim();
   }
@@ -118,7 +119,7 @@ function getRequestHostAndProto(state, req) {
   }
   // fastly overrides the x-forwarded-proto, so we use x-forwarded-scheme
   const proto = req.headers.get('x-forwarded-scheme') || req.headers.get('x-forwarded-proto') || 'https';
-  state.log.info(`request host is: ${host} (${proto})`);
+  state.log.info(`request host is: ${host} (${proto}) (xfh=${xfh})`);
   return {
     host,
     proto,

package/src/utils/path.js

@@ -43,7 +43,7 @@ export function getPathInfo(path) {
   // path         -> web path (no .html, no index)
   // resourcePath -> content path (.md)
   let fileName = info.originalFilename;
-  if (!fileName || fileName === 'index.html' || fileName === 'index.md' || fileName === 'index') {
+  if (!fileName || fileName === 'index.md' || fileName === 'index') {
     // last segment empty or index
     const lastDot = fileName.lastIndexOf('.');
     if (lastDot >= 0) {
@@ -62,21 +62,19 @@ export function getPathInfo(path) {
     info.extension = fileName.substring(lastDot);
     info.originalExtension = info.extension;
     const baseName = fileName.substring(0, firstDot);
+    if (lastDot !== firstDot) {
+      info.selector = fileName.substring(firstDot + 1, lastDot);
+    }
     let resExt = info.extension;
-    if (resExt === '.md') {
-      info.extension = '.html';
-      segs.push(baseName);
-    } else if (resExt === '.html') {
-      resExt = '.md';
-      segs.push(baseName);
+    if (info.selector) {
+      if (resExt === '.html') {
+        // force .plain.html as markdown resources
+        resExt = '.md';
+      }
+      segs.push(`${baseName}.${info.selector}${info.extension}`);
     } else {
       segs.push(`${baseName}${resExt}`);
     }
-
-    if (lastDot !== firstDot) {
-      info.selector = fileName.substring(firstDot + 1, lastDot);
-      segs[segs.length - 1] = `${baseName}.${info.selector}${info.extension}`;
-    }
     fileName = `${baseName}${resExt}`;
   }