@adobe/helix-config 5.10.3 → 5.12.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [5.12.0](https://github.com/adobe/helix-config/compare/v5.11.0...v5.12.0) (2026-08-13)
+
+
+### Features
+
+* return sitemap index list for pipeline scope ([#399](https://github.com/adobe/helix-config/issues/399)) ([e775165](https://github.com/adobe/helix-config/commit/e77516540a941deea93cf63242f823cad2963930))
+
+# [5.11.0](https://github.com/adobe/helix-config/compare/v5.10.3...v5.11.0) (2026-06-09)
+
+
+### Features
+
+* remove unsupported legacy config ([#385](https://github.com/adobe/helix-config/issues/385)) ([deb5e82](https://github.com/adobe/helix-config/commit/deb5e8237e2e36bed1739c9e6701c2b862b60de7))
+
 ## [5.10.3](https://github.com/adobe/helix-config/compare/v5.10.2...v5.10.3) (2026-05-19)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "5.10.3",
+  "version": "5.12.0",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -35,26 +35,27 @@
     "reporter-options": "configFile=.mocha-multi.json"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "3.0.27",
-    "@eslint/config-helpers": "0.5.5",
-    "@semantic-release/changelog": "6.0.3",
-    "@semantic-release/git": "10.0.1",
+    "@adobe/eslint-config-helix": "3.0.30",
+    "@eslint/config-helpers": "0.7.0",
+    "@semantic-release/changelog": "7.0.0",
+    "@semantic-release/git": "11.0.1",
     "@semantic-release/npm": "13.1.5",
-    "c8": "11.0.0",
+    "c8": "12.0.0",
     "eslint": "9.4.0",
     "husky": "9.1.7",
     "junit-report-builder": "5.1.2",
-    "lint-staged": "16.4.0",
-    "mocha": "11.7.5",
+    "lint-staged": "17.2.0",
+    "mocha": "11.7.6",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.6.0",
-    "semantic-release": "25.0.3"
+    "semantic-release": "25.0.8"
   },
   "lint-staged": {
     "*.js": "eslint",
     "*.cjs": "eslint"
   },
   "dependencies": {
+    "@adobe/helix-shared-config": "11.2.0",
     "@adobe/helix-shared-server-timing": "1.0.0",
     "@adobe/helix-shared-utils": "3.0.2"
   }

package/src/ConfigContext.js

@@ -30,7 +30,7 @@ export const SCOPE_PIPELINE = 'pipeline';
 export const SCOPE_ADMIN = 'admin';
 
 /**
- * Raw config service view, also for legacy sites.
+ * Raw config service view.
  * @type {string}
  */
 export const SCOPE_RAW = 'raw';

package/src/config-view.js

@@ -9,6 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+import { SitemapConfig } from '@adobe/helix-shared-config';
 import { computeSurrogateKey } from '@adobe/helix-shared-utils';
 // eslint-disable-next-line import/no-unresolved
 import { PipelineResponse } from './PipelineResponse.js';
@@ -18,7 +19,6 @@ import {
   SCOPE_DELIVERY,
   SCOPE_RAW, SCOPE_PUBLIC,
 } from './ConfigContext.js';
-import { resolveLegacyConfig, fetchRobotsTxt } from './config-legacy.js';
 import {
   canonicalArrayString, deepGetOrCreate, prune, uniqueArray,
 } from './utils.js';
@@ -146,11 +146,11 @@ function resolveSecret(object, idProp, dstProp, siteConfig, orgConfig) {
 /**
  * Returns the normalized access configuration for the given partition.
  *
- * SecretIds (and legacy apiKeyIds) can be set on access.preview, access.live, and access.site.
- * The normalized config only has access.preview and access.live; access.site is not present in
- * the final object and is only used during resolution. For each partition (preview or live),
- * the effective secretId and allow lists are the merge of the partition's values and
- * access.site's values (union, deduplicated).
+ * SecretIds (apiKeyId is the deprecated alias of secretId) can be set on access.preview,
+ * access.live, and access.site. The normalized config only has access.preview and access.live;
+ * access.site is not present in the final object and is only used during resolution. For each
+ * partition (preview or live), the effective secretId and allow lists are the merge of the
+ * partition's values and access.site's values (union, deduplicated).
  *
  * @param {object} ctx - The context
  * @param {object} config - The config (with access.preview, access.live, access.site)
@@ -163,7 +163,8 @@ function resolveSecret(object, idProp, dstProp, siteConfig, orgConfig) {
 export async function getAccessConfig(ctx, config, orgConfig, partition, rso) {
   const { access = {} } = config;
   const pAccess = access[partition] ?? {};
-  // merge partition and site secretIds (and legacy apiKeyIds), then allow
+
+  // union of the partition's and the site-wide secretIds (apiKeyId is the deprecated alias)
   const secretId = uniqueArray(
     pAccess.apiKeyId,
     pAccess.secretId,
@@ -171,37 +172,68 @@ export async function getAccessConfig(ctx, config, orgConfig, partition, rso) {
     access.site?.secretId,
   );
   const allow = uniqueArray(pAccess.allow, access.site?.allow);
-  const cfg = {
-    secretId,
-    allow,
-    tokenHash: secretId
-      // token ids are always stored in base64url format, but legacy apiKeyIds are not
-      .map((jti) => jti.replaceAll('/', '_').replaceAll('+', '-'))
-      .map((id) => lookupSecret(config, orgConfig, id, true))
-      .filter((hash) => !!hash),
-  };
-  // if an allow is defined but no secretId, create a fake one so that auth is still enforced.
-  if (allow.length && !cfg.secretId.length) {
-    cfg.secretId.push('dummy');
-  }
 
-  // if an secretId is defined but no tokenHash, create a fake one so that auth is still enforced.
-  if (cfg.secretId.length) {
-    // add global token hash if defined and needed
+  // resolve each secretId to its token hash (ids are stored base64url, apiKeyIds may not be)
+  const tokenHash = secretId
+    .map((id) => id.replaceAll('/', '_').replaceAll('+', '-'))
+    .map((id) => lookupSecret(config, orgConfig, id, true))
+    .filter((hash) => !!hash);
+
+  // when auth is required (an allow list or any secretId), always accept the global delivery
+  // token if configured; otherwise ensure at least one hash exists so auth stays enforced
+  if (allow.length || secretId.length) {
     const globalTokenHash = await getGlobalTokenHash(ctx, rso);
-    if (cfg.tokenHash.length && globalTokenHash) {
-      // augment the list of hashes with the global one if exists
-      cfg.tokenHash.push(globalTokenHash);
-    } else if (!cfg.tokenHash.length) {
-      // add a dummy or global hash if no tokens match the secretIds.
-      if (!config.legacy || allow.length) {
-        // but only add for non-legacy sites or legacy with allows
-        cfg.tokenHash.push(globalTokenHash || 'n/a');
-      }
+    if (globalTokenHash) {
+      tokenHash.push(globalTokenHash);
+    } else if (!tokenHash.length) {
+      tokenHash.push('n/a');
     }
   }
 
-  return cfg;
+  return { secretId, allow, tokenHash };
+}
+
+/**
+ * Retrieves the robots.txt from the code-bus
+ * @param {ConfigContext} ctx the context
+ * @param {string} owner
+ * @param {string} repo
+ * @returns {Promise<ConfigObject>} the robots.txt
+ */
+async function fetchRobotsTxt(ctx, owner, repo) {
+  const key = `${owner}/${repo}/main/robots.txt`;
+  const res = await ctx.loader.getObject(HELIX_CODE_BUS, key);
+  const robots = new ConfigObject();
+  if (res.body) {
+    robots.txt = res.body;
+    robots.updateLastModified(res.headers);
+  }
+  return robots;
+}
+
+/**
+ * Retrieves the sitemap index from the `sitemap.yaml` on the content-bus.
+ *
+ * @param {ConfigContext} ctx the context
+ * @param {object} rso RSO (ref, site, org)
+ * @param {object} config the config
+ * @returns {Promise<string[]|null>} the sitemap index list, or `null` if not configured
+ */
+async function fetchSitemapIndex(ctx, rso, config) {
+  const key = `${config.content.contentBusId}/preview/.helix/sitemap.yaml`;
+  const res = await ctx.loader.getObject(HELIX_CONTENT_BUS, key);
+
+  const sitemap = new ConfigObject();
+  if (res.body) {
+    try {
+      const sitemapConfig = await new SitemapConfig().withSource(res.body).init();
+      sitemap.index = sitemapConfig.index;
+      sitemap.updateLastModified(res.headers);
+    } catch (e) {
+      ctx.log.warn(`[${rso.org}/${rso.site}] Unable to process ${key}: ${e.message}`);
+    }
+  }
+  return sitemap;
 }
 
 /**
@@ -318,14 +350,7 @@ async function resolveConfig(ctx, rso, scope) {
       ctx.log.error('error loading config %s: %d', key, res.status);
       throw new StatusCodeError('error loading config', res.status);
     }
-    const config = await resolveLegacyConfig(ctx, rso, scope);
-    if (config) {
-      ctx.timer?.update('profile');
-      const profile = await loadProfile(ctx, rso, 'default');
-      config.merge(profile);
-      config.data.legacy = true;
-    }
-    return config;
+    return null;
   }
   const site = new ConfigObject();
   site.data = res.json();
@@ -368,6 +393,11 @@ async function resolveConfig(ctx, rso, scope) {
         config.robots = robots;
       }
     }
+    ctx.timer?.update('sitemap-index');
+    const sitemap = await fetchSitemapIndex(ctx, rso, config);
+    if (sitemap.index) {
+      config.sitemap = sitemap;
+    }
   }
   if (scope === SCOPE_PIPELINE || scope === SCOPE_RAW || scope === SCOPE_DELIVERY) {
     // although not used in raw, or delivery, load in order to set correct last-modified
@@ -649,7 +679,7 @@ export async function getConfigResponse(ctx, opts) {
       },
     });
   }
-  headers['x-hlx-version'] = siteConfig.data.legacy ? 4 : 5;
+  headers['x-hlx-version'] = 5;
 
   const config = siteConfig.data;
   if (scope === SCOPE_PIPELINE || config.extends?.profile === 'default') {
@@ -686,6 +716,7 @@ export async function getConfigResponse(ctx, opts) {
   siteConfig.updateLastModified(config.head);
   siteConfig.updateLastModified(siteConfig.sidekick);
   siteConfig.updateLastModified(config.robots);
+  siteConfig.updateLastModified(config.sitemap);
   siteConfig.updateLastModified(config.metadata?.preview);
   siteConfig.updateLastModified(config.metadata?.live);
 
@@ -770,8 +801,8 @@ export async function getConfigResponse(ctx, opts) {
       folders: config.folders,
       public: config.public,
       robots: config.robots,
+      sitemap: config.sitemap,
       access: config.access,
-      legacy: config.legacy,
       lastModified: siteConfig.lastModified,
       created: config.created,
       trustedHosts: computeTrustedHosts(org, site, config),

package/src/config-legacy.js

@@ -1,228 +0,0 @@
-/*
- * Copyright 2024 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-import {
-  SCOPE_ADMIN, SCOPE_DELIVERY, SCOPE_PIPELINE, SCOPE_RAW,
-} from './ConfigContext.js';
-import { ConfigObject } from './config-object.js';
-import { contentConfigMerge } from './legacy-config-merge.js';
-import { prune, toArray } from './utils.js';
-
-const HELIX_CODE_BUS = 'helix-code-bus';
-
-/**
- * Retrieves the head.html from the code bus
- * @param ctx
- * @param rso
- * @returns {Promise<ConfigObject|{}>}
- */
-async function fetchHeadHtml(ctx, rso) {
-  const key = `${rso.org}/${rso.site}/${rso.ref}/head.html`;
-  const res = await ctx.loader.getObject(HELIX_CODE_BUS, key);
-  if (res.body) {
-    const head = new ConfigObject();
-    head.html = res.body;
-    head.updateLastModified(res.headers);
-    return head;
-  }
-  return {};
-}
-
-/**
- * Retrieves the helix-config.json which is an aggregate from fstab.yaml and head.html.
- *
- * @param {ConfigContext} ctx the context
- * @param {RSO} rso
- * @returns {Promise<ConfigObject|null>} the helix-config or {@code null} if optional and not found.
- */
-async function fetchHelixConfig(ctx, rso) {
-  const key = `${rso.org}/${rso.site}/main/helix-config.json`;
-  const res = await ctx.loader.getObject(HELIX_CODE_BUS, key);
-  if (!res.body) {
-    return null;
-  }
-  const config = res.json();
-  // set contentbus id, if present in header
-  const cbid = res.headers.get('x-amz-meta-x-contentbus-id');
-  if (cbid && !config.content) {
-    // create the content section if not already present
-    config.content = {
-      data: Object.create(null),
-    };
-    const content = config.content.data;
-    const nvps = cbid.split(/;\s+/);
-    for (const nv of nvps) {
-      const [path, id] = nv.split('=');
-      if (!content[path]) {
-        content[path] = {};
-      }
-      content[path].contentBusId = id;
-    }
-  }
-  const cfg = new ConfigObject();
-  cfg.updateLastModified(res.headers);
-  cfg.data = config;
-  return cfg;
-}
-
-/**
- * Retrieves the robots.txt from the code-bus
- * @param {ConfigContext} ctx the context
- * @param {string} owner
- * @param {string} repo
- * @returns {Promise<ConfigObject>} the robots.txt
- */
-export async function fetchRobotsTxt(ctx, owner, repo) {
-  const key = `${owner}/${repo}/main/robots.txt`;
-  const res = await ctx.loader.getObject(HELIX_CODE_BUS, key);
-  const robots = new ConfigObject();
-  if (res.body) {
-    robots.txt = res.body;
-    robots.updateLastModified(res.headers);
-  }
-  return robots;
-}
-
-async function resolveAdminAccess(ctx, admin) {
-  const ret = {
-    ...admin,
-  };
-  if (ret.apiKeyId) {
-    ret.apiKeyId = toArray(ret.apiKeyId);
-  }
-  if (ret.defaultRole) {
-    ret.defaultRole = toArray(ret.defaultRole);
-  }
-  for (const [role, users] of Object.entries(ret.role ?? [])) {
-    // todo: load users.json
-    ret.role[role] = toArray(users);
-  }
-  return ret;
-}
-
-/**
- * Loads the content from a helix 4 project.
- * @param {import('./ConfigContext.js)'.ConfigContext} ctx
- * @param {RSO} rso
- * @param {string} scope
- * @returns {Promise<ConfigObject|null>} the config object or {@code null} if not found.
- */
-export async function resolveLegacyConfig(ctx, rso, scope) {
-  ctx.timer?.update('legacy-helix-config');
-
-  // set owner==org and repo==site and fetch from helix-config for now
-  const cfg = await fetchHelixConfig(ctx, rso);
-  if (!cfg) {
-    return null;
-  }
-  const helixConfig = cfg.data;
-  const { contentBusId } = helixConfig.content.data['/'];
-  if (!contentBusId) {
-    return null;
-  }
-  const fstab = helixConfig.fstab?.data || helixConfig.fstab;
-  if (!fstab) {
-    return null;
-  }
-  let source = fstab.mountpoints['/'];
-  if (!source) {
-    return null;
-  }
-  if (typeof source === 'string') {
-    source = {
-      type: source.startsWith('https://drive.google.com/')
-        ? 'google'
-        : 'onedrive',
-      url: source,
-    };
-  } else {
-    delete source.contentBusId;
-  }
-
-  const head = await fetchHeadHtml(ctx, rso);
-  const config = {
-    version: 1,
-    legacy: true,
-    code: {
-      owner: rso.org,
-      repo: rso.site,
-      source: {
-        type: 'github',
-        url: `https://github.com/${rso.org}/${rso.site}`,
-      },
-    },
-    content: {
-      contentBusId,
-      source,
-    },
-    folders: fstab.folders ?? {},
-    head,
-  };
-  cfg.data = config;
-  ctx.timer?.update('legacy-config-all');
-  const {
-    preview: configAllPreview,
-    live: configAllLive,
-  } = await contentConfigMerge(ctx, config.content.contentBusId, rso);
-  const { access, admin } = configAllPreview?.config?.data || {};
-  if (access) {
-    config.access = {
-      preview: access.preview,
-      live: access.live,
-    };
-    delete access.preview;
-    delete access.live;
-    config.access.site = access;
-  }
-  if (admin) {
-    if (!config.access) {
-      config.access = { };
-    }
-    config.access.admin = await resolveAdminAccess(ctx, admin);
-  }
-  if (configAllPreview) {
-    config.cdn = configAllPreview.config?.data.cdn ?? {};
-    if (!config.cdn.prod?.host && configAllPreview.config?.data.host) {
-      config.cdn.prod = {
-        host: configAllPreview.config.data.host,
-      };
-    }
-  }
-
-  if (scope !== SCOPE_DELIVERY && configAllPreview) {
-    config.headers = configAllPreview.headers?.data ?? {};
-  }
-
-  if (scope === SCOPE_PIPELINE) {
-    config.metadata = {};
-    if (configAllPreview) {
-      config.metadata.preview = configAllPreview.metadata;
-    }
-    if (configAllLive) {
-      config.metadata.live = configAllLive.metadata;
-    }
-    ctx.timer?.update('robots-txt');
-    config.robots = await fetchRobotsTxt(ctx, rso.org, rso.site);
-    if (!config.robots.txt) {
-      delete config.robots;
-    } else {
-      cfg.updateLastModified(config.robots);
-    }
-  }
-  if ((scope === SCOPE_ADMIN || scope === SCOPE_RAW) && configAllPreview?.config?.data?.metadata) {
-    if (!config.metadata) {
-      config.metadata = {};
-    }
-    config.metadata.source = configAllPreview?.config?.data?.metadata;
-  }
-
-  return prune(cfg);
-}

package/src/flatJson2Object.js

@@ -1,104 +0,0 @@
-/*
- * Copyright 2022 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-/**
- * Converts a config row-based name/value pair array with dotted key notation to an object.
- *
- * example:
- *
- * ```
- * host: www.adobe.com
- * document.level: 42,
- * document.title: hello
- * document.body.status: 200
- * acl.allow: /foo
- * acl.allow: /bar
- * cnd.0.type: fastly
- * cnd.0.host: www.adobe.com
- * cnd.1.type: cloudflare
- * ```
- *
- * becomes:
- *
- * ```
- * {
- *   host: 'www.adobe.com',
- *   document: {
- *     level: 42,
- *     title: 'hello',
- *     body: {
- *       status: 200,
- *     }
- *   },
- *   acl: {
- *     allow: ['/foo', '/bar],
- *   }
- *   cnd: [
- *     { type: 'fastly', host: 'www.adobe.com' },
- *     { type: 'cloudflare' },
- *   ]
- * }
- * ```
- *
- * @param {object[]} rows array of columns
- * @param {string} [keyName = 'key'] name of the key column.
- * @param {string} [valueName = 'value'] name of the value column.
- */
-export function flatJson2object(rows, keyName = 'key', valueName = 'value') {
-  const arrays = [];
-  const update = (o, segs, value) => {
-    const seg = segs.shift();
-    if (segs.length) {
-      if (seg in o) {
-        update(o[seg], segs, value);
-        return o;
-      }
-      const n = Number.parseInt(segs[0], 10);
-      if (Number.isNaN(n)) {
-        // eslint-disable-next-line no-param-reassign
-        o[seg] = update(Object.create(null), segs, value);
-      } else {
-        // eslint-disable-next-line no-param-reassign
-        o[seg] = update([], segs, value);
-        arrays.push(o[seg]);
-      }
-      return o;
-    }
-    if (!(seg in o)) {
-      // eslint-disable-next-line no-param-reassign
-      o[seg] = value;
-    } else if (Array.isArray(o[seg])) {
-      // eslint-disable-next-line no-param-reassign
-      o[seg].push(value);
-    } else {
-      // eslint-disable-next-line no-param-reassign
-      o[seg] = [o[seg], value];
-    }
-    return o;
-  };
-
-  const obj = Object.create(null);
-  rows.forEach((row) => {
-    update(obj, String(row[keyName]).trim().split('.'), String(row[valueName]).trim());
-  });
-
-  // compact arrays
-  arrays.forEach((a) => {
-    for (let i = 0; i < a.length; i += 1) {
-      if (!(i in a)) {
-        a.splice(i, 1);
-        i -= 1;
-      }
-    }
-  });
-  return obj;
-}

package/src/legacy-config-merge.js

@@ -1,236 +0,0 @@
-/*
- * Copyright 2022 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-/* eslint-disable no-continue,no-param-reassign */
-import { logLevelForStatusCode, propagateStatusCode } from '@adobe/helix-shared-utils';
-import { flatJson2object } from './flatJson2Object.js';
-import { ModifiersConfig } from './ModifiersConfig.js';
-
-export const CONFIG_JSON_PATH = '/.helix/config.json';
-
-export const HEADERS_JSON_PATH = '/.helix/headers.json';
-
-export const METADATA_JSON_PATH = '/metadata.json';
-
-/**
- * Coerces the given value to an array. if the value is null or undefined, an empty array is
- * returned.
- * @param {*} value
- * @param {boolean} [unique = false] if true, the resulting array will contain only unique values
- * @return {[]}
- */
-export function coerceArray(value, unique = false) {
-  if (value === null || value === undefined) {
-    return [];
-  }
-  const array = Array.isArray(value) ? value : [value];
-  if (unique) {
-    return Array.from(new Set(array));
-  }
-  return array;
-}
-
-/**
- * From a JSON response, retrieves the `data` sheet if this is a single sheet,
- * or it returns the first existing sheet given by a list of names, if it is a
- * multisheet.
- * Returns `null` if there is neither.
- *
- * @param {any} json JSON object
- * @param {String[]} names names to check in a multi sheet
- */
-export function getSheetData(json, names) {
-  /* c8 ignore next 3 */
-  if (Array.isArray(json.data)) {
-    return json.data;
-  }
-  let sheet;
-
-  const match = names.find((name) => !!json[name]);
-  if (match) {
-    sheet = json[match];
-  }
-  if (Array.isArray(sheet?.data)) {
-    return sheet.data;
-  }
-  return null;
-}
-
-/**
- * Helper class to load and generate the aggregate configs
- */
-export class ConfigMerger {
-  constructor(log, contentBusId, partition) {
-    Object.assign(this, {
-      log,
-      contentBusId,
-      partition,
-      lastModifiedTime: null,
-      lastModified: null,
-      all: {
-        version: 1,
-      },
-    });
-  }
-
-  toJSON() {
-    return this.all;
-  }
-
-  /**
-   * Loads a file from the content bus
-   * @param {ConfigContext} ctx
-   * @param {string} opts.path
-   * @param {string} opts.property
-   * @param {function} opts.mapping
-   * @returns {Promise<>}
-   */
-  async loadFile(ctx, opts) {
-    const key = `${this.contentBusId}/${this.partition}${opts.path}`;
-    const fileResponse = await ctx.loader.getObject('helix-content-bus', key);
-    const fileText = fileResponse.body;
-
-    let data;
-    if (fileResponse.status === 200) {
-      try {
-        data = getSheetData(JSON.parse(fileText), ['default']);
-        // eslint-disable-next-line no-empty
-      } catch {
-      }
-      if (!data) {
-        this.log.info(`[config-all] Error loading ${key}: empty or invalid json.`);
-      } else {
-        this.log.info(`[config-all] loaded: ${key}`);
-      }
-    } else if (fileResponse.status === 404) {
-      this.log.info(`[config-all] Error loading ${key}: no such object`);
-    } else {
-      this.log[logLevelForStatusCode(fileResponse.status)](`Invalid response (${fileResponse.status}) when loading json from ${key}`);
-      const err = new Error(`Unable to fetch json: ${fileResponse.status} ${fileText}`);
-      err.status = propagateStatusCode(fileResponse.status);
-      throw err;
-    }
-    if (data) {
-      // get the config property for this file
-      let config = this.all[opts.property];
-      if (!config) {
-        config = {};
-        this.all[opts.property] = config;
-      }
-      // update the data of the config
-      config.data = opts.mapping(data, config);
-      this.updateLastModified(config, fileResponse.headers);
-    }
-  }
-
-  /**
-   * Update the last modified in the config object and tracks the most recent one
-   * @param {object} obj
-   * @param {Map} headers
-   */
-  updateLastModified(obj, headers) {
-    const httpDate = headers.get('x-source-last-modified') ?? headers.get('last-modified');
-    /* c8 ignore next 3 */
-    if (!httpDate) {
-      return;
-    }
-    const time = new Date(httpDate).getTime();
-    /* c8 ignore next 4 */
-    if (Number.isNaN(time)) {
-      this.log.warn(`[config-all] updateLastModified date is invalid: ${httpDate}`);
-      return;
-    }
-    obj.lastModified = httpDate;
-    if (time > (this.lastModifiedTime ?? 0)) {
-      this.lastModifiedTime = time;
-      this.lastModified = httpDate;
-    }
-  }
-
-  clone(partition) {
-    const c = new ConfigMerger(this.log, this.contentBusId, partition);
-    c.lastModified = this.lastModified;
-    c.lastModifiedTime = this.lastModifiedTime;
-    // copy .helix/config.json and .helix/headers.json since it's the same for both partitions
-    c.all.config = this.all.config;
-    if (this.all.headers) {
-      c.all.headers = this.all.headers;
-    }
-    return c;
-  }
-}
-
-/**
- * Handles merging content bus configuration files. The metadata and headers are specific to
- * their partition, whereas the config is always loaded from preview.
- *
- * this means that config-all is always updated in both partitions
- *
- * @param {ConfigContext} ctx the universal context
- * @param {string} contentBusId the content bus id
- * @param {Response} res the response of the preceding content bus operation (preview/publish)
- * @returns {Promise<void>}
- * @implements ResponseHook
- */
-export async function contentConfigMerge(ctx, contentBusId) {
-  const { log } = ctx;
-
-  // load config always from preview
-  const cfgPreview = new ConfigMerger(log, contentBusId, 'preview');
-  await cfgPreview.loadFile(ctx, {
-    path: CONFIG_JSON_PATH,
-    property: 'config',
-    mapping: (data) => flatJson2object(data),
-  });
-
-  // load headers always from preview
-  await cfgPreview.loadFile(ctx, {
-    path: HEADERS_JSON_PATH,
-    property: 'headers',
-    mapping: (data) => ModifiersConfig.parseModifierSheet(data),
-  });
-
-  const cfgLive = cfgPreview.clone('live');
-  const updates = [cfgPreview, cfgLive];
-
-  // generate preview and live versions
-  await Promise.all(updates.map((async (cfg) => {
-    // generate the metadata-all.json first
-    const metadataPaths = coerceArray(cfg.all.config?.data?.metadata || [METADATA_JSON_PATH], true);
-    for (const path of metadataPaths) {
-      const loadOpts = {
-        path,
-        property: 'metadata',
-        mapping: (data, metadata) => {
-          if (!Array.isArray(metadata.data)) {
-            metadata.data = [];
-          }
-          metadata.data.push(...data);
-          return metadata.data;
-        },
-      };
-      // eslint-disable-next-line no-await-in-loop
-      await cfg.loadFile(ctx, loadOpts);
-    }
-
-    // convert to modifiers map
-    if (cfg.all.metadata?.data) {
-      cfg.all.metadata.data = ModifiersConfig.parseModifierSheet(cfg.all.metadata.data);
-    } else {
-      cfg.all.metadata = {};
-    }
-  })));
-
-  return {
-    preview: cfgPreview.toJSON(),
-    live: cfgLive.toJSON(),
-  };
-}