Merge pull request 'feat(nav): move config page to settings foldout (buildManifest)' (#60) from feat/settings-foldout-via-shared-buildmanifest into development

Author: rubenvdlinde

package-lock.json

@@ -30,7 +30,7 @@
   "dependencies": {
     "@babel/core": "^7.29.0",
     "@codemirror/lang-json": "^6.0.0",
-    "@conduction/nextcloud-vue": "^1.0.0-beta.125",
+    "@conduction/nextcloud-vue": "1.0.0-beta.135",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
     "@nextcloud/axios": "^2.5.0",

package.json

@@ -21,11 +21,13 @@ import {
 	registerTranslations,
 	useAppManifest,
 	resolveManifestSentinels,
+	buildManifest,
 } from '@conduction/nextcloud-vue'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 import pinia from './pinia.js'
 import App from './App.vue'
 import bundledManifest from './manifest.json'
+import menuLayout from './menu-layout.json'
 import customComponents from './customComponents.js'
 import registry from './registry.js'
 import { routesFromManifest } from './router.js'
@@ -71,33 +73,9 @@ function tryLoadTranslations() {
 	}
 }
 
-/**
- * ADR-037: merge modular manifest fragments from src/manifest.d/*.json onto the
- * bundled base manifest. Each OpenSpec change drops its own fragment (pages/menu)
- * instead of editing the monolith src/manifest.json, so concurrent builds touch
- * disjoint files. `pages` and `menu` arrays are concatenated.
- *
- * @param {object} base The bundled base manifest.
- * @return {object} The manifest with all fragment pages/menu appended.
- */
-function mergeManifestFragments(base) {
-	const merged = { ...base, pages: [...(base.pages || [])], menu: [...(base.menu || [])] }
-	// require.context is resolved at build time; src/manifest.d/ must exist (it
-	// ships with a _placeholder.json). It is a no-op when no real fragments exist.
-	const ctx = require.context('./manifest.d/', false, /\.json$/)
-	ctx.keys().sort().forEach((key) => {
-		const frag = ctx(key)
-		if (Array.isArray(frag.pages)) {
-			merged.pages.push(...frag.pages)
-		}
-		if (Array.isArray(frag.menu)) {
-			merged.menu.push(...frag.menu)
-		}
-	})
-	return merged
-}
-
-const mergedManifest = mergeManifestFragments(bundledManifest)
+const fragmentCtx = require.context('./manifest.d/', false, /\.json$/)
+const fragments = fragmentCtx.keys().sort().map((key) => fragmentCtx(key))
+const mergedManifest = buildManifest(bundledManifest, fragments, menuLayout)
 
 tryLoadTranslations()
 

src/main.js

@@ -0,0 +1,10 @@
+{
+	"_meta": {
+		"description": "settings-foldout layout"
+	},
+	"relocations": {},
+	"removals": [],
+	"settingsSection": [
+		"SettingsMenu"
+	]
+}