@adobe/helix-config 3.2.12 → 3.2.14

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.2.14](https://github.com/adobe/helix-config/compare/v3.2.13...v3.2.14) (2024-06-20)
+
+
+### Bug Fixes
+
+* separate headers config ([#108](https://github.com/adobe/helix-config/issues/108)) ([cef56df](https://github.com/adobe/helix-config/commit/cef56df1245960f271b17c842ae379dd8ed660bb))
+
+## [3.2.13](https://github.com/adobe/helix-config/compare/v3.2.12...v3.2.13) (2024-06-15)
+
+
+### Bug Fixes
+
+* **deps:** update adobe fixes ([df5fb5c](https://github.com/adobe/helix-config/commit/df5fb5c1351958e9a8e0f13326ac23e7fef2aeb0))
+
 ## [3.2.12](https://github.com/adobe/helix-config/compare/v3.2.11...v3.2.12) (2024-06-11)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "3.2.12",
+  "version": "3.2.14",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -41,12 +41,12 @@
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "12.0.1",
-    "c8": "10.0.0",
+    "c8": "10.1.2",
     "eslint": "8.57.0",
     "husky": "9.0.11",
     "json-schema-to-typescript": "14.0.5",
     "junit-report-builder": "3.2.1",
-    "lint-staged": "15.2.5",
+    "lint-staged": "15.2.7",
     "mocha": "10.4.0",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.5.1",
@@ -59,8 +59,8 @@
   },
   "dependencies": {
     "@adobe/fetch": "4.1.8",
-    "@adobe/helix-shared-config": "10.5.2",
-    "@adobe/helix-shared-git": "3.0.11",
+    "@adobe/helix-shared-config": "10.5.3",
+    "@adobe/helix-shared-git": "3.0.12",
     "@adobe/helix-shared-storage": "1.0.2",
     "@adobe/helix-shared-utils": "3.0.2",
     "ajv": "8.16.0",

package/src/schemas/code.schema.json

@@ -16,8 +16,8 @@
   "type": "object",
   "description": "Defines the code bus location and source.",
   "properties": {
-    "title": { "$ref": "https://ns.adobe.com/helix/config/common#/$defs/title" },
-    "description": { "$ref": "https://ns.adobe.com/helix/config/common#/$defs/description" },
+    "title": { "$ref": "https://ns.adobe.com/helix/config/common#/definitions/title" },
+    "description": { "$ref": "https://ns.adobe.com/helix/config/common#/definitions/description" },
     "owner": {
       "$comment": "Note, that owner/repo are no longer part of the hostname and can therefor have more allowed characters than in helix4",
       "type": "string",

package/src/schemas/common.schema.json

@@ -12,7 +12,7 @@
   ],
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://ns.adobe.com/helix/config/common",
-  "$defs": {
+  "definitions": {
     "title": {
       "type": "string",
       "description": "human readable title. has no influence on the configuration."
@@ -32,18 +32,6 @@
         "value"
       ],
       "additionalProperties": false
-    },
-    "modifier-map": {
-      "type": "object",
-      "patternProperties": {
-        "^/[a-zA-Z0-9-/.]*\\*{0,2}$": {
-          "type": "array",
-          "items": [
-            { "$ref": "#/$defs/keyValuePair" }
-          ]
-        }
-      },
-      "additionalProperties": false
     }
   }
 }

package/src/schemas/content.schema.json

@@ -16,8 +16,8 @@
   "title": "Content Bus",
   "description": "Defines the content bus location and source.",
   "properties": {
-    "title": { "$ref": "https://ns.adobe.com/helix/config/common#/$defs/title" },
-    "description": { "$ref": "https://ns.adobe.com/helix/config/common#/$defs/description" },
+    "title": { "$ref": "https://ns.adobe.com/helix/config/common#/definitions/title" },
+    "description": { "$ref": "https://ns.adobe.com/helix/config/common#/definitions/description" },
     "contentBusId": {"type": "string" },
     "source": {
       "oneOf": [

package/src/schemas/headers.schema.cjs

@@ -0,0 +1,12 @@
+/*
+ * 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.
+ */
+module.exports = require('./headers.schema.json');

package/src/schemas/headers.schema.json

@@ -0,0 +1,26 @@
+{
+  "meta:license": [
+    "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."
+  ],
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://ns.adobe.com/helix/config/headers",
+  "type": "object",
+  "title": "Helix Headers Config",
+  "patternProperties": {
+    "^/[a-zA-Z0-9-/.]*\\*{0,2}$": {
+      "type": "array",
+      "items": [
+        { "$ref": "https://ns.adobe.com/helix/config/common#/definitions/keyValuePair" }
+      ]
+    }
+  },
+  "additionalProperties": false
+}

package/src/schemas/org.schema.json

@@ -20,8 +20,8 @@
       "enum": [1],
       "default": 1
     },
-    "title": { "$ref": "https://ns.adobe.com/helix/config/common#/$defs/title" },
-    "description": { "$ref": "https://ns.adobe.com/helix/config/common#/$defs/description" },
+    "title": { "$ref": "https://ns.adobe.com/helix/config/common#/definitions/title" },
+    "description": { "$ref": "https://ns.adobe.com/helix/config/common#/definitions/description" },
     "tokens": {
       "$ref": "https://ns.adobe.com/helix/config/tokens"
     },

package/src/schemas/profile.schema.json

@@ -20,8 +20,8 @@
       "enum": [1],
       "default": 1
     },
-    "title": { "$ref": "https://ns.adobe.com/helix/config/common#/$defs/title" },
-    "description": { "$ref": "https://ns.adobe.com/helix/config/common#/$defs/description" },
+    "title": { "$ref": "https://ns.adobe.com/helix/config/common#/definitions/title" },
+    "description": { "$ref": "https://ns.adobe.com/helix/config/common#/definitions/description" },
 
     "content": {
       "$ref": "https://ns.adobe.com/helix/config/content"
@@ -33,7 +33,7 @@
       "$ref": "https://ns.adobe.com/helix/config/folders"
     },
     "headers": {
-      "$ref": "https://ns.adobe.com/helix/config/common#/$defs/modifier-map"
+      "$ref": "https://ns.adobe.com/helix/config/headers"
     },
     "cdn": {
       "$ref": "https://ns.adobe.com/helix/config/cdn"

package/src/schemas/sidekick.schema.json

@@ -12,7 +12,7 @@
   ],
   "$id": "https://ns.adobe.com/helix/config/sidekick",
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$defs": {
+  "definitions": {
     "sidekickPlugin": {
       "type": "object",
       "properties": {
@@ -39,7 +39,7 @@
     "plugins": {
       "type": "array",
       "items": {
-        "$ref": "#/$defs/sidekickPlugin"
+        "$ref": "#/definitions/sidekickPlugin"
       }
     }
   }

package/src/schemas/site.schema.json

@@ -25,8 +25,8 @@
       "description": "Site name; part of the hostname",
       "pattern": "^[a-z0-9]+(?:-[a-z0-9]+)*$"
     },
-    "title": { "$ref": "https://ns.adobe.com/helix/config/common#/$defs/title" },
-    "description": { "$ref": "https://ns.adobe.com/helix/config/common#/$defs/description" },
+    "title": { "$ref": "https://ns.adobe.com/helix/config/common#/definitions/title" },
+    "description": { "$ref": "https://ns.adobe.com/helix/config/common#/definitions/description" },
 
     "content": {
       "$ref": "https://ns.adobe.com/helix/config/content"
@@ -38,7 +38,7 @@
       "$ref": "https://ns.adobe.com/helix/config/folders"
     },
     "headers": {
-      "$ref": "https://ns.adobe.com/helix/config/common#/$defs/modifier-map"
+      "$ref": "https://ns.adobe.com/helix/config/headers"
     },
     "cdn": {
       "$ref": "https://ns.adobe.com/helix/config/cdn"

package/src/storage/config-validator.js

@@ -22,6 +22,7 @@ import codeSchema from '../schemas/code.schema.cjs';
 import contentSchema from '../schemas/content.schema.cjs';
 import foldersSchema from '../schemas/folders.schema.cjs';
 import googleSchema from '../schemas/content-source-google.schema.cjs';
+import headersSchema from '../schemas/headers.schema.cjs';
 import markupSchema from '../schemas/content-source-markup.schema.cjs';
 import metadataSchema from '../schemas/metadata-source.schema.cjs';
 import orgSchema from '../schemas/org.schema.cjs';
@@ -45,6 +46,7 @@ export const SCHEMAS = [
   codeSchema,
   foldersSchema,
   googleSchema,
+  headersSchema,
   markupSchema,
   metadataSchema,
   orgSchema,

package/types/org-config.d.ts

@@ -12,6 +12,8 @@
 
 // NOTE: this file is autogenerated via 'npm run docs:types'
 
+export type Users = HttpsNsAdobeComHelixConfigUser[];
+
 export interface HelixOrgConfig {
   version: 1;
   /**
@@ -23,6 +25,7 @@ export interface HelixOrgConfig {
    */
   description?: string;
   tokens?: Tokens;
+  users?: Users;
 }
 export interface Tokens {
   /**
@@ -35,3 +38,9 @@ export interface Tokens {
     created?: string;
   };
 }
+export interface HttpsNsAdobeComHelixConfigUser {
+  id: string;
+  email: string;
+  name?: string;
+  roles: ('admin' | 'author' | 'publish' | 'config')[];
+}

package/types/profile-config.d.ts

@@ -25,7 +25,7 @@ export interface HelixProfileConfig {
   content?: ContentBus;
   code?: CodeBus;
   folders?: Folders;
-  headers?: ModifierMap;
+  headers?: HelixHeadersConfig;
   cdn?: CDNConfig;
   access?: Access;
   sidekick?: SidekickConfig;
@@ -93,13 +93,13 @@ export interface CodeBus {
 export interface Folders {
   /**
    * This interface was referenced by `Folders`'s JSON-Schema definition
-   * via the `patternProperty` "^/[a-zA-Z0-9-/.]+$".
+   * via the `patternProperty` "^/[a-zA-Z0-9-/.]*$".
    */
-  [k: string]: [] | [string];
+  [k: string]: string;
 }
-export interface ModifierMap {
+export interface HelixHeadersConfig {
   /**
-   * This interface was referenced by `ModifierMap`'s JSON-Schema definition
+   * This interface was referenced by `HelixHeadersConfig`'s JSON-Schema definition
    * via the `patternProperty` "^/[a-zA-Z0-9-/.]*\*{0,2}$".
    */
   [k: string]: [] | [KeyValuePair];
@@ -232,7 +232,7 @@ export interface SiteAccessConfig {
   clientCertDN?: string[];
 }
 export interface SidekickConfig {
-  plugins?: [] | [SidekickPlugin];
+  plugins?: SidekickPlugin[];
   [k: string]: unknown;
 }
 export interface SidekickPlugin {
@@ -242,7 +242,7 @@ export interface SidekickPlugin {
   [k: string]: unknown;
 }
 export interface Metadata {
-  source?: [] | [string];
+  source?: string[];
 }
 export interface Robots {
   txt?: string;

package/types/site-config.d.ts

@@ -29,7 +29,7 @@ export interface HelixSiteConfig {
   content: ContentBus;
   code: CodeBus;
   folders?: Folders;
-  headers?: ModifierMap;
+  headers?: HelixHeadersConfig;
   cdn?: CDNConfig;
   access?: Access;
   sidekick?: SidekickConfig;
@@ -37,7 +37,7 @@ export interface HelixSiteConfig {
   robots?: Robots;
   public?: Public;
   extends?: {
-    [k: string]: unknown;
+    profile?: string;
   };
 }
 /**
@@ -100,13 +100,13 @@ export interface CodeBus {
 export interface Folders {
   /**
    * This interface was referenced by `Folders`'s JSON-Schema definition
-   * via the `patternProperty` "^/[a-zA-Z0-9-/.]+$".
+   * via the `patternProperty` "^/[a-zA-Z0-9-/.]*$".
    */
-  [k: string]: [] | [string];
+  [k: string]: string;
 }
-export interface ModifierMap {
+export interface HelixHeadersConfig {
   /**
-   * This interface was referenced by `ModifierMap`'s JSON-Schema definition
+   * This interface was referenced by `HelixHeadersConfig`'s JSON-Schema definition
    * via the `patternProperty` "^/[a-zA-Z0-9-/.]*\*{0,2}$".
    */
   [k: string]: [] | [KeyValuePair];
@@ -239,7 +239,7 @@ export interface SiteAccessConfig {
   clientCertDN?: string[];
 }
 export interface SidekickConfig {
-  plugins?: [] | [SidekickPlugin];
+  plugins?: SidekickPlugin[];
   [k: string]: unknown;
 }
 export interface SidekickPlugin {
@@ -249,7 +249,7 @@ export interface SidekickPlugin {
   [k: string]: unknown;
 }
 export interface Metadata {
-  source?: [] | [string];
+  source?: string[];
 }
 export interface Robots {
   txt?: string;