@conduction/docusaurus-preset 2.7.0-beta.2 → 2.7.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@conduction/docusaurus-preset",
-  "version": "2.7.0-beta.2",
+  "version": "2.7.0-beta.4",
   "scripts": {
     "prepack": "node scripts/prepack-bundle-css.js"
   },

package/src/index.js

@@ -42,31 +42,47 @@ function resolveAppVersion(opts) {
   if (opts.appVersion) return String(opts.appVersion);
 
   /* Nextcloud apps: appinfo/info.xml carries the canonical version.
-     We avoid pulling in an XML parser for one tag — a non-greedy regex
-     against the file content is robust enough for the standard
-     `<version>x.y.z</version>` shape the app store mandates. */
-  try {
-    const infoPath = path.join(process.cwd(), 'appinfo', 'info.xml');
-    if (fs.existsSync(infoPath)) {
-      const xml = fs.readFileSync(infoPath, 'utf8');
-      const m = xml.match(/<version>\s*([^<\s]+)\s*<\/version>/);
-      if (m && m[1]) return m[1];
+     Conduction docs sites live at <appRepo>/docs/ next to the app's
+     <appRepo>/appinfo/, so we check both the cwd AND the parent
+     before giving up. We avoid pulling in an XML parser for one tag
+     — a non-greedy regex against the file content is robust enough
+     for the standard `<version>x.y.z</version>` shape the app store
+     mandates. */
+  const cwd = process.cwd();
+  const infoCandidates = [
+    path.join(cwd, 'appinfo', 'info.xml'),
+    path.join(cwd, '..', 'appinfo', 'info.xml'),
+  ];
+  for (const infoPath of infoCandidates) {
+    try {
+      if (fs.existsSync(infoPath)) {
+        const xml = fs.readFileSync(infoPath, 'utf8');
+        const m = xml.match(/<version>\s*([^<\s]+)\s*<\/version>/);
+        if (m && m[1]) return m[1];
+      }
+    } catch (e) {
+      /* fall through */
     }
-  } catch (e) {
-    /* fall through */
   }
 
-  /* Non-Nextcloud sites: package.json version. Walks up from cwd in
-     case the site builds from a sub-directory; one level deep is
-     enough for the conduction-website layout. */
-  try {
-    const pkgPath = path.join(process.cwd(), 'package.json');
-    if (fs.existsSync(pkgPath)) {
-      const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-      if (pkg.version) return pkg.version;
+  /* Non-Nextcloud sites: package.json version. Same parent-walk so
+     a site building from <repo>/site/ still finds <repo>/package.json. */
+  const pkgCandidates = [
+    path.join(cwd, 'package.json'),
+    path.join(cwd, '..', 'package.json'),
+  ];
+  for (const pkgPath of pkgCandidates) {
+    try {
+      if (fs.existsSync(pkgPath)) {
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+        /* Skip the docs-site's own placeholder package.json (every
+           Conduction docs site is scaffolded with name="*-docs" and
+           version="0.0.0"); fall through to the parent in that case. */
+        if (pkg.version && pkg.version !== '0.0.0') return pkg.version;
+      }
+    } catch (e) {
+      /* fall through */
     }
-  } catch (e) {
-    /* fall through */
   }
 
   return undefined;
@@ -112,10 +128,16 @@ const baseNavbar = (siteName, repoUrl) => ({
     src: 'img/logo.svg',
     srcDark: 'img/logo-dark.svg',
   },
+  /* `custom-*` prefix is the Docusaurus convention for theme-defined
+     navbar item types — items prefixed this way bypass the strict Joi
+     schema validator in @docusaurus/theme-classic, so the brand Navbar
+     swizzle can dispatch on them without registering each shape with
+     core. The swizzle accepts both `custom-github` and the bare
+     `github` (etc.) for forward-compat. */
   items: [
-    { type: 'versionPill', position: 'right' },
-    { type: 'apiDocs', position: 'right' },
-    { type: 'github', href: repoUrl || 'https://github.com/ConductionNL', position: 'right' },
+    { type: 'custom-versionPill', position: 'right' },
+    { type: 'custom-apiDocs', position: 'right' },
+    { type: 'custom-github', href: repoUrl || 'https://github.com/ConductionNL', position: 'right' },
     { type: 'localeDropdown', position: 'right' },
   ],
 });

package/src/theme/Navbar/index.jsx

@@ -24,12 +24,18 @@
  *   { type: 'doc', label, to }                       internal doc link
  *   { type: 'link', label, to | href }               internal/external link
  *   { type: 'localeDropdown' }                       Docusaurus locale switcher
- *   { type: 'github', href }                         icon-only GitHub mark
- *   { type: 'apiDocs', label?, to }                  icon + "API Documentation"
- *   { type: 'versionPill', prefix? }                 "Stable · v{x.y.z}" pill
+ *   { type: 'custom-github', href }                  icon-only GitHub mark
+ *   { type: 'custom-apiDocs', label?, to }           icon + "API Documentation"
+ *   { type: 'custom-versionPill', prefix? }          "Stable · v{x.y.z}" pill
  *                                                    reads customFields.appVersion;
  *                                                    hidden when no version
  *
+ * The `custom-` prefix is required so Docusaurus's themeConfig schema
+ * validator passes (`@docusaurus/theme-classic` rejects unknown bare
+ * type names). The swizzle below accepts both the prefixed and the
+ * bare names so 2.7.0-beta.1 sites that wired the bare names keep
+ * working after the upgrade.
+ *
  * The pill prefix defaults to "Stable" but can be overridden per site
  * (e.g. prefix="Beta" while on a pre-1.0 release line).
  *
@@ -46,6 +52,24 @@ import {brandFor, productWordmark} from '../brand.jsx';
 import {ICONS} from '../../components/primitives/icons';
 import styles from './styles.module.css';
 
+/**
+ * Brand-specific navbar item types live under the `custom-` prefix
+ * because Docusaurus's themeConfig validator (Joi schema in
+ * @docusaurus/theme-classic) rejects unknown top-level types. The
+ * `custom-` namespace is the documented escape hatch: items prefixed
+ * with `custom-` bypass schema validation and are passed through to
+ * the theme as-is. The brand Navbar then dispatches on them below.
+ *
+ * Sites may also use the bare names (`github`, `apiDocs`,
+ * `versionPill`) — they render identically here but Docusaurus will
+ * reject the config at load time. Accept both forms so the migration
+ * from 2.7.0-beta.1 to .beta.2 doesn't break sites that already
+ * configured the bare names.
+ */
+function typeIs(item, kind) {
+  return item.type === kind || item.type === 'custom-' + kind;
+}
+
 /**
  * Render a single navbar item. The brand navbar supports a small
  * subset of Docusaurus item types plus the three brand-specific types
@@ -64,7 +88,7 @@ function NavItem({item, location, appVersion}) {
   /* GitHub: icon-only link with an accessible label. The aria-label
      gives screen-readers + browser tooltips a name without rendering
      a visible text label in the navbar. */
-  if (item.type === 'github') {
+  if (typeIs(item, 'github')) {
     return (
       <a
         href={item.href || 'https://github.com/ConductionNL'}
@@ -82,7 +106,7 @@ function NavItem({item, location, appVersion}) {
   /* API Documentation: icon + label link. Target defaults to /api
      (the Redocusaurus mount point used by every Conduction docs site).
      Sites can override via `to` or `href`. */
-  if (item.type === 'apiDocs') {
+  if (typeIs(item, 'apiDocs')) {
     const label = item.label || 'API Documentation';
     const to = item.to || '/api';
     const href = item.href;
@@ -106,7 +130,7 @@ function NavItem({item, location, appVersion}) {
      or package.json). Hidden when no version is available so sites
      without an app version (Hydra, design-system itself) get a clean
      navbar instead of an empty pill. */
-  if (item.type === 'versionPill') {
+  if (typeIs(item, 'versionPill')) {
     if (!appVersion) return null;
     const prefix = item.prefix || 'Stable';
     return (
@@ -198,7 +222,12 @@ export default function Navbar() {
      position="right" — but the three brand-specific item types
      (github, apiDocs, versionPill) live on the right by convention,
      mirroring the docs-shell mock. */
-  const RIGHT_TYPES = new Set(['localeDropdown', 'github', 'apiDocs', 'versionPill']);
+  const RIGHT_TYPES = new Set([
+    'localeDropdown',
+    'github', 'custom-github',
+    'apiDocs', 'custom-apiDocs',
+    'versionPill', 'custom-versionPill',
+  ]);
   const leftItems = items.filter(i => i.position !== 'right' && !RIGHT_TYPES.has(i.type));
   const rightItems = items.filter(i => i.position === 'right' || RIGHT_TYPES.has(i.type));