@adobe/helix-html-pipeline 3.7.11 → 3.8.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.8.1](https://github.com/adobe/helix-html-pipeline/compare/v3.8.0...v3.8.1) (2023-01-15)
+
+
+### Bug Fixes
+
+* ignore 'null' as header value ([#236](https://github.com/adobe/helix-html-pipeline/issues/236)) ([9f212f2](https://github.com/adobe/helix-html-pipeline/commit/9f212f2e9bafc57a33ed8e1203d18ac16bd4e6d7))
+
+# [3.8.0](https://github.com/adobe/helix-html-pipeline/compare/v3.7.11...v3.8.0) (2023-01-13)
+
+
+### Features
+
+* add contentbusId/path as surrogate key ([085e029](https://github.com/adobe/helix-html-pipeline/commit/085e029c5486e03871890ffc9fe52d9804f759d1))
+
 ## [3.7.11](https://github.com/adobe/helix-html-pipeline/compare/v3.7.10...v3.7.11) (2023-01-12)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "3.7.11",
+  "version": "3.8.1",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -47,7 +47,7 @@
     "github-slugger": "2.0.0",
     "hast-util-raw": "7.2.3",
     "hast-util-select": "5.0.3",
-    "hast-util-to-html": "8.0.3",
+    "hast-util-to-html": "8.0.4",
     "hast-util-to-string": "2.0.0",
     "hastscript": "7.2.0",
     "jose": "4.11.2",
@@ -81,12 +81,12 @@
     "@markedjs/html-differ": "4.0.2",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/git": "10.0.1",
-    "@semantic-release/npm": "9.0.1",
+    "@semantic-release/npm": "9.0.2",
     "c8": "7.12.0",
     "eslint": "8.31.0",
-    "eslint-import-resolver-exports": "1.0.0-beta.3",
+    "eslint-import-resolver-exports": "1.0.0-beta.4",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-import": "2.27.4",
     "esmock": "2.1.0",
     "husky": "8.0.3",
     "js-yaml": "4.1.0",

package/src/json-pipe.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import { cleanupHeaderValue } from '@adobe/helix-shared-utils';
+import { cleanupHeaderValue, computeSurrogateKey } from '@adobe/helix-shared-utils';
 import fetchConfigAll from './steps/fetch-config-all.js';
 import setCustomResponseHeaders from './steps/set-custom-response-headers.js';
 import { PipelineResponse } from './PipelineResponse.js';
@@ -112,8 +112,11 @@ export async function jsonPipe(state, req) {
     // set last-modified
     updateLastModified(state, response, extractLastModified(dataResponse.headers));
 
-    // set surrogate key
-    response.headers.set('x-surrogate-key', `${contentBusId}${path}`.replace(/\//g, '_'));
+    // set surrogate keys
+    const keys = [];
+    keys.push(`${contentBusId}${path}`.replace(/\//g, '_')); // TODO: remove
+    keys.push(await computeSurrogateKey(`${contentBusId}${path}`));
+    response.headers.set('x-surrogate-key', keys.join(' '));
 
     // Load config-all and set response headers
     await fetchConfigAll(state, req, response);

package/src/steps/set-x-surrogate-key-header.js

@@ -20,13 +20,25 @@ import { computeSurrogateKey } from '@adobe/helix-shared-utils';
  */
 export default async function setXSurrogateKeyHeader(state, req, res) {
   const {
-    content, contentBusId, owner, repo, ref,
+    content, contentBusId, owner, repo, ref, info,
   } = state;
 
+  let { path } = info;
+
   const keys = [];
   if (content.sourceLocation) {
     keys.push(await computeSurrogateKey(content.sourceLocation));
   }
+
+  // surrogate key for path
+  // strip [index].plain.html
+  if (path.endsWith('index.plain.html')) {
+    path = path.substring(0, path.length - 'index.plain.html'.length);
+  } else if (path.endsWith('.plain.html')) {
+    path = path.substring(0, path.length - '.plain.html'.length);
+  }
+  keys.push(await computeSurrogateKey(`${contentBusId}${path}`));
+
   keys.push(`${contentBusId}_metadata`);
   keys.push(`${ref}--${repo}--${owner}_head`);
 

package/src/utils/last-modified.js

@@ -45,5 +45,9 @@ export function updateLastModified(state, res, httpDate) {
  * @return {string} the last modified date
  */
 export function extractLastModified(headers) {
-  return headers.get('x-amz-meta-x-source-last-modified') ?? headers.get('last-modified');
+  const lastModified = headers.get('x-amz-meta-x-source-last-modified');
+  if (lastModified && lastModified !== 'null') {
+    return lastModified;
+  }
+  return headers.get('last-modified');
 }