@adobe/helix-config 2.17.0 → 2.18.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.18.1](https://github.com/adobe/helix-config/compare/v2.18.0...v2.18.1) (2024-05-09)
+
+
+### Bug Fixes
+
+* allow to set public configuration ([#80](https://github.com/adobe/helix-config/issues/80)) ([3a5b175](https://github.com/adobe/helix-config/commit/3a5b175f1afc074edd398f5a75a0c271c91ddc72))
+
+# [2.18.0](https://github.com/adobe/helix-config/compare/v2.17.0...v2.18.0) (2024-05-09)
+
+
+### Features
+
+* delivery token hashes for pipeline scope ([#79](https://github.com/adobe/helix-config/issues/79)) ([371c771](https://github.com/adobe/helix-config/commit/371c7718fb9592e526fcef2f76efbd0ed6a209f6))
+
 # [2.17.0](https://github.com/adobe/helix-config/compare/v2.16.1...v2.17.0) (2024-05-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "2.17.0",
+  "version": "2.18.1",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/config-merge.js

@@ -32,6 +32,7 @@ const ROOT_PROPERTIES = {
   robots: {},
   extends: {},
   tokens: {},
+  public: {},
 };
 
 const FORCED_TYPES = {

package/src/config-view.js

@@ -314,10 +314,15 @@ export async function getConfigResponse(ctx, opts) {
     });
   }
 
-  // delete token hashes
+  // delete token hashes but keep for pipeline because the cloudflare worker still needs them
   delete config.tokens;
-  delete config.access?.preview?.tokenHash;
-  delete config.access?.live?.tokenHash;
+  if (opts.scope !== SCOPE_PIPELINE) {
+    delete config.access?.preview?.tokenHash;
+    delete config.access?.live?.tokenHash;
+  } else {
+    delete config.access?.preview?.apiKeyId;
+    delete config.access?.live?.apiKeyId;
+  }
 
   if (opts.scope === SCOPE_ADMIN) {
     const adminConfig = {
@@ -364,6 +369,7 @@ export async function getConfigResponse(ctx, opts) {
       folders: config.folders,
       public: config.public,
       robots: config.robots,
+      access: config.access,
     };
     return new PipelineResponse(JSON.stringify(pipelineConfig, null, 2), {
       headers: {

package/src/schemas/profile.schema.json

@@ -49,6 +49,9 @@
     },
     "robots": {
       "$ref": "https://ns.adobe.com/helix/config/robots"
+    },
+    "public": {
+      "$ref": "https://ns.adobe.com/helix/config/public"
     }
   },
   "required": [

package/src/schemas/public.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('./public.schema.json');

package/src/schemas/public.schema.json

@@ -0,0 +1,18 @@
+{
+  "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/public",
+  "type": "object",
+  "title": "public",
+  "description": "Public configuration"
+}

package/src/schemas/site.schema.json

@@ -55,6 +55,9 @@
     "robots": {
       "$ref": "https://ns.adobe.com/helix/config/robots"
     },
+    "public": {
+      "$ref": "https://ns.adobe.com/helix/config/public"
+    },
     "extends": {
       "profile": {
         "type": "string",

package/src/storage/config-validator.js

@@ -26,6 +26,7 @@ import markupSchema from '../schemas/content-source-markup.schema.cjs';
 import metadataSchema from '../schemas/metadata-source.schema.cjs';
 import orgSchema from '../schemas/org.schema.cjs';
 import onedriveSchema from '../schemas/content-source-onedrive.schema.cjs';
+import publicSchema from '../schemas/public.schema.cjs';
 import profileSchema from '../schemas/profile.schema.cjs';
 import robotsSchema from '../schemas/robots.schema.cjs';
 import sidekickSchema from '../schemas/sidekick.schema.cjs';
@@ -46,6 +47,7 @@ const SCHEMAS = [
   metadataSchema,
   orgSchema,
   onedriveSchema,
+  publicSchema,
   profileSchema,
   robotsSchema,
   sidekickSchema,

package/types/profile-config.d.ts

@@ -31,6 +31,7 @@ export interface HelixProfileConfig {
   sidekick?: SidekickConfig;
   metadata?: Metadata;
   robots?: Robots;
+  public?: Public;
 }
 /**
  * Defines the content bus location and source.
@@ -246,3 +247,9 @@ export interface Metadata {
 export interface Robots {
   txt?: string;
 }
+/**
+ * Public configuration
+ */
+export interface Public {
+  [k: string]: unknown;
+}

package/types/site-config.d.ts

@@ -35,6 +35,7 @@ export interface HelixSiteConfig {
   sidekick?: SidekickConfig;
   metadata?: Metadata;
   robots?: Robots;
+  public?: Public;
   extends?: {
     [k: string]: unknown;
   };
@@ -253,3 +254,9 @@ export interface Metadata {
 export interface Robots {
   txt?: string;
 }
+/**
+ * Public configuration
+ */
+export interface Public {
+  [k: string]: unknown;
+}