@adobe/helix-html-pipeline 1.5.1 → 1.5.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.5.2](https://github.com/adobe/helix-html-pipeline/compare/v1.5.1...v1.5.2) (2022-05-08)
+
+
+### Bug Fixes
+
+* respect x-source-last-modified for json ([#51](https://github.com/adobe/helix-html-pipeline/issues/51)) ([094f22b](https://github.com/adobe/helix-html-pipeline/commit/094f22b4bc86306a3727472bdb1f03c65fe67012))
+
 ## [1.5.1](https://github.com/adobe/helix-html-pipeline/compare/v1.5.0...v1.5.1) (2022-05-06)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -59,7 +59,7 @@
     "remark-parse": "10.0.1",
     "strip-markdown": "5.0.0",
     "unified": "10.1.2",
-    "unist-util-map": "3.0.1",
+    "unist-util-map": "3.1.1",
     "unist-util-remove": "3.1.0",
     "unist-util-remove-position": "4.0.1",
     "unist-util-select": "4.0.1",
@@ -67,6 +67,7 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.3.2",
+    "@adobe/semantic-release-coralogix": "1.1.1",
     "@markedjs/html-differ": "4.0.2",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
@@ -76,7 +77,7 @@
     "codecov": "3.8.3",
     "commitizen": "4.2.4",
     "cz-conventional-changelog": "3.3.0",
-    "eslint": "8.14.0",
+    "eslint": "8.15.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.26.0",
     "esmock": "1.7.5",

package/src/json-pipe.js

@@ -13,7 +13,7 @@ import fetchMetadata from './steps/fetch-metadata.js';
 import setCustomResponseHeaders from './steps/set-custom-response-headers.js';
 import { PipelineResponse } from './PipelineResponse.js';
 import jsonFilter from './utils/json-filter.js';
-import { updateLastModified } from './utils/last-modified.js';
+import { extractLastModified, updateLastModified } from './utils/last-modified.js';
 
 /**
  * Runs the default pipeline and returns the response.
@@ -73,7 +73,7 @@ export async function jsonPipe(state, req) {
   });
 
   // set last-modified
-  updateLastModified(state, response, dataResponse.headers.get('last-modified'));
+  updateLastModified(state, response, extractLastModified(dataResponse.headers));
 
   // set surrogate key
   response.headers.set('x-surrogate-key', `${contentBusId}${path}`.replace(/\//g, '_'));

package/src/steps/fetch-metadata.js

@@ -39,8 +39,8 @@ export default async function fetchMetadata(state, req, res) {
     }
     state.metadata = data;
 
-    if (state.type === 'html') {
-      // also update last-modified (only for html pipeline)
+    if (state.type === 'html' && state.info.selector !== 'plain') {
+      // also update last-modified (only for extensionless html pipeline)
       updateLastModified(state, res, extractLastModified(ret.headers));
     }
     return;

package/src/utils/last-modified.js

@@ -41,7 +41,8 @@ export function updateLastModified(state, res, httpDate) {
 /**
  * Returns the last modified date from response headers, giving 'x-amz-meta-x-source-last-modified'
  * preference.
- * @param {object} headers
+ * @param {Map<string, string>} headers
+ * @return {string} the last modified date
  */
 export function extractLastModified(headers) {
   return headers.get('x-amz-meta-x-source-last-modified') ?? headers.get('last-modified');