@adobe/helix-html-pipeline 3.7.10 → 3.8.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [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)
+
+
+### Bug Fixes
+
+* use node 18 ([#231](https://github.com/adobe/helix-html-pipeline/issues/231)) ([e3f8540](https://github.com/adobe/helix-html-pipeline/commit/e3f85406fcf2fa82ce0c8d9b6a07335d7582b468))
+
 ## [3.7.10](https://github.com/adobe/helix-html-pipeline/compare/v3.7.9...v3.7.10) (2023-01-07)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "3.7.10",
+  "version": "3.8.0",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -90,7 +90,7 @@
     "esmock": "2.1.0",
     "husky": "8.0.3",
     "js-yaml": "4.1.0",
-    "jsdom": "20.0.3",
+    "jsdom": "21.0.0",
     "junit-report-builder": "3.0.1",
     "lint-staged": "13.1.0",
     "mocha": "10.2.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`);