@adobe/helix-config 5.4.5 → 5.4.6

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [5.4.6](https://github.com/adobe/helix-config/compare/v5.4.5...v5.4.6) (2025-06-10)
+
+
+### Bug Fixes
+
+* always include org user roles ([#287](https://github.com/adobe/helix-config/issues/287)) ([3c8f41c](https://github.com/adobe/helix-config/commit/3c8f41c7bf27f6388634d65376fc20ca90601550))
+
 ## [5.4.5](https://github.com/adobe/helix-config/compare/v5.4.4...v5.4.5) (2025-06-03)
 
 

package/eslint.config.js

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2025 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 { defineConfig, globalIgnores } from '@eslint/config-helpers';
+import { recommended, source, test } from '@adobe/eslint-config-helix';
+
+export default defineConfig([
+  globalIgnores([
+    '.vscode/*',
+    'coverage/*',
+  ]),
+  {
+    rules: {
+      // see https://github.com/import-js/eslint-plugin-import/issues/1868
+      'import/no-unresolved': ['error', { ignore: ['@adobe/helix-shared-config/modifiers'] }]
+    },
+    plugins: {
+      import: recommended.plugins.import,
+    },
+    extends: [recommended],
+  },
+  source,
+  test,
+]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "5.4.5",
+  "version": "5.4.6",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -35,16 +35,17 @@
     "reporter-options": "configFile=.mocha-multi.json"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "2.0.9",
+    "@adobe/eslint-config-helix": "3.0.3",
+    "@eslint/config-helpers": "0.2.2",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "12.0.1",
     "c8": "10.1.3",
-    "eslint": "8.57.1",
+    "eslint": "9.4.0",
     "husky": "9.1.7",
     "junit-report-builder": "5.1.1",
     "lint-staged": "16.1.0",
-    "mocha": "11.5.0",
+    "mocha": "11.6.0",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.5.1",
     "nock": "13.5.6",

package/src/config-view.js

@@ -497,23 +497,23 @@ export async function getConfigResponse(ctx, opts) {
   }
 
   const orgConfig = await loadOrgConfig(ctx, org);
-  if (config.access || orgConfig?.access) {
-    // normalize access config
-    const { admin = {} } = config.access ?? {};
-    config.access = {
-      preview: await getAccessConfig(ctx, config, orgConfig, 'preview', rso),
-      live: await getAccessConfig(ctx, config, orgConfig, 'live', rso),
-      // access.require.repository ?
-    };
-    if (opts.scope === SCOPE_ADMIN || opts.scope === SCOPE_RAW) {
-      // eslint-disable-next-line max-len
-      config.access.admin = computeSiteAdminRoles(admin, orgConfig, config.groups);
-    }
-    prune(config.access);
-    if (!Object.keys(config.access).length) {
-      delete config.access;
-    }
+
+  // normalize access config
+  const { admin = {} } = config.access ?? {};
+  config.access = {
+    preview: await getAccessConfig(ctx, config, orgConfig, 'preview', rso),
+    live: await getAccessConfig(ctx, config, orgConfig, 'live', rso),
+    // access.require.repository ?
+  };
+  if (opts.scope === SCOPE_ADMIN || opts.scope === SCOPE_RAW) {
+    // eslint-disable-next-line max-len
+    config.access.admin = computeSiteAdminRoles(admin, orgConfig, config.groups);
   }
+  prune(config.access);
+  if (!Object.keys(config.access).length) {
+    delete config.access;
+  }
+
   if (opts.scope === SCOPE_ADMIN || opts.scope === SCOPE_RAW) {
     const merged = { ...config.apiKeys, ...orgConfig?.apiKeys };
     if (Object.keys(merged).length) {

package/.eslintrc.cjs

@@ -1,16 +0,0 @@
-/*
- * Copyright 2021 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 = {
-  root: true,
-  extends: '@adobe/helix',
-};