diff --git a/packages/docusaurus-theme/src/components/ProductSearch/ProductSearch.module.css b/packages/docusaurus-theme/src/components/ProductSearch/ProductSearch.module.css index f5a3c46..93946a4 100644 --- a/packages/docusaurus-theme/src/components/ProductSearch/ProductSearch.module.css +++ b/packages/docusaurus-theme/src/components/ProductSearch/ProductSearch.module.css @@ -79,7 +79,7 @@ .badge{padding:.16rem .55rem;border-radius:999px;font-size:.72rem;border:1px solid var(--ifm-color-emphasis-300)} .p_frontdoor{background:#e8f3ff;border-color:#c6e1ff;color:#145ea8} .p_openziti{background:#e9fff3;border-color:#c8f2df;color:#0d7a4e} -.p_onprem{background:#fff3e8;border-color:#ffdcbf;color:#9a4d00} +.p_selfhosted{background:#fff3e8;border-color:#ffdcbf;color:#9a4d00} .p_zlan{background:#f1edff;border-color:#d9d0ff;color:#5335b7} .p_zrok{background:#fff0f0;border-color:#ffd0d0;color:#b71c1c} @@ -173,7 +173,7 @@ border-color: #c8f2df; color: #0d7a4e; } -.pill.active[data-product="onprem"] { +.pill.active[data-product="selfhosted"] { background: #fff3e8; border-color: #ffdcbf; color: #9a4d00; diff --git a/packages/docusaurus-theme/src/components/ProductSearch/ProductSearch.tsx b/packages/docusaurus-theme/src/components/ProductSearch/ProductSearch.tsx index 9a9e2dd..4167ae1 100644 --- a/packages/docusaurus-theme/src/components/ProductSearch/ProductSearch.tsx +++ b/packages/docusaurus-theme/src/components/ProductSearch/ProductSearch.tsx @@ -146,7 +146,7 @@ export function ProductSearch({ appId, apiKey, indexName, - products = ["frontdoor", "openziti", "onprem", "zlan", "zrok"], + products = ["frontdoor", "openziti", "selfhosted", "zlan", "zrok"], extraContainerClasses = [], }: ProductSearchProps) { // read initial pill from ?product= for back/forward + shareable URLs diff --git a/unified-doc/README.md b/unified-doc/README.md index 93ef006..b85d2c7 100644 --- a/unified-doc/README.md +++ b/unified-doc/README.md @@ -60,7 +60,7 @@ The unified-doc site includes BackstopJS for visual regression testing against p ### Overview - Compares screenshots of local dev site vs production (`https://netfoundry.io/docs/`) -- Tests organized by product: `openziti`, `frontdoor`, `onprem`, `zrok`, `zlan`, `home` +- Tests organized by product: `openziti`, `frontdoor`, `selfhosted`, `zrok`, `zlan`, `home` - 3 viewports: desktop (1920x1080), tablet (768x1024), mobile (375x812) - Generates HTML diff reports highlighting visual differences @@ -100,7 +100,7 @@ Each product has its own set of commands: | `vrt:approve:` | Approve current test screenshots as new reference | | `vrt:report:` | Open HTML diff report in browser | -Products: `home`, `openziti`, `frontdoor`, `onprem`, `zrok`, `zlan` +Products: `home`, `openziti`, `frontdoor`, `selfhosted`, `zrok`, `zlan` ### Workflow diff --git a/unified-doc/algolia-prod-crawler.json b/unified-doc/algolia-prod-crawler.json index fb9bb9d..e214da9 100644 --- a/unified-doc/algolia-prod-crawler.json +++ b/unified-doc/algolia-prod-crawler.json @@ -46,8 +46,10 @@ new Crawler({ rec.product = "frontdoor"; else if (rec.url_without_anchor.includes("/docs/openziti")) rec.product = "openziti"; + else if (rec.url_without_anchor.includes("/docs/selfhosted")) + rec.product = "selfhosted"; else if (rec.url_without_anchor.includes("/docs/onprem")) - rec.product = "onprem"; + rec.product = "selfhosted"; else if (rec.url_without_anchor.includes("/docs/zlan")) rec.product = "zlan"; else if (rec.url_without_anchor.includes("/docs/zrok")) diff --git a/unified-doc/build-docs.sh b/unified-doc/build-docs.sh index 3e84753..90f5d25 100755 --- a/unified-doc/build-docs.sh +++ b/unified-doc/build-docs.sh @@ -154,7 +154,7 @@ lint_docs() { "${script_dir}/_remotes/zlan/docusaurus/docs" "${script_dir}/_remotes/frontdoor/docusaurus/docs" "${script_dir}/_remotes/zrok/website/docs" - "${script_dir}/_remotes/onprem/docusaurus/docs" + "${script_dir}/_remotes/selfhosted/docusaurus/docs" "${script_dir}/_remotes/openziti/docusaurus/docs" ) @@ -284,11 +284,12 @@ if [ "${CLEAN:-0}" -eq 1 ]; then find "$script_dir/_remotes" -mindepth 1 -maxdepth 1 ! -name 'package.json' -exec rm -rf {} + fi -clone_or_update "https://bitbucket.org/netfoundry/zrok-connector.git" frontdoor develop -clone_or_update "https://bitbucket.org/netfoundry/k8s-on-prem-installations.git" onprem main -clone_or_update "https://github.com/openziti/ziti-doc.git" openziti main -clone_or_update "https://github.com/netfoundry/zlan.git" zlan main -clone_or_update "https://github.com/openziti/zrok.git" zrok main +clone_or_update "https://bitbucket.org/netfoundry/zrok-connector.git" frontdoor develop +clone_or_update "https://bitbucket.org/netfoundry/k8s-on-prem-installations.git" onprem full-rename +clone_or_update "https://bitbucket.org/netfoundry/k8s-on-prem-installations.git" selfhosted full-rename +clone_or_update "https://github.com/openziti/ziti-doc.git" openziti main +clone_or_update "https://github.com/netfoundry/zlan.git" zlan full-rename +clone_or_update "https://github.com/openziti/zrok.git" zrok main echo "========================================" echo "bd POST-CLONE DEBUG" diff --git a/unified-doc/docusaurus.config.ts b/unified-doc/docusaurus.config.ts index 13b4f0e..9535f80 100644 --- a/unified-doc/docusaurus.config.ts +++ b/unified-doc/docusaurus.config.ts @@ -17,6 +17,7 @@ import {zrokDocsPluginConfig} from "./_remotes/zrok/website/docusaurus-plugin-zr // This runs in Node.js - Don't use client-side code here (browser APIs, JSX...) const frontdoor = `./_remotes/frontdoor`; const onprem = `./_remotes/onprem`; +const selfhosted = `./_remotes/selfhosted`; const openziti = `./_remotes/openziti`; const zrokRoot = `./_remotes/zrok/website`; const zlan = `./_remotes/zlan`; @@ -36,7 +37,7 @@ const BUILD_FLAGS = { NONE: 0x0, OPENZITI: 0x1, FRONTDOOR: 0x2, - ONPREM: 0x4, + SELFHOSTED: 0x4, ZROK: 0x8, ZLAN: 0x10, }; @@ -82,13 +83,15 @@ const prod: PublishConfig = { const cfg: PublishConfig = process.env.DOCUSAURUS_PUBLISH_ENV === 'prod' ? prod : staging; const REMARK_MAPPINGS = [ - { from: '@onpremdocs', to: `${docsBase}onprem` }, + { from: '@selfhosteddocs', to: `${docsBase}selfhosted` }, + { from: '@onpremdocs', to: `${docsBase}selfhosted` }, { from: '@openzitidocs', to: `${docsBase}openziti`}, { from: '@zrokdocs', to: `${docsBase}zrok`}, { from: '@static', to: docsBase}, { from: '/openziti/', to: `${docsBase}/openziti/` }, { from: '/frontdoor/', to: `${docsBase}/frontdoor/` }, - { from: '/onprem/', to: `${docsBase}/onprem/` }, + { from: '/selfhosted/', to: `${docsBase}/selfhosted/` }, + { from: '/onprem/', to: `${docsBase}/selfhosted/` }, { from: '/zrok/', to: `${docsBase}/zrok/` }, { from: '/zlan/', to: `${docsBase}/zlan/` }, ]; @@ -200,6 +203,7 @@ const config: Config = { 'static', '_remotes/frontdoor/docusaurus/static/', '_remotes/onprem/docusaurus/static/', + '_remotes/selfhosted/docusaurus/static/', '_remotes/openziti/docusaurus/static/', '_remotes/zlan/docusaurus/static/', `${zrokRoot}/static/`, @@ -233,6 +237,7 @@ const config: Config = { '@openziti': path.resolve(__dirname, `${openziti}/docusaurus`), '@frontdoor': path.resolve(__dirname, `${frontdoor}/docusaurus`), '@onprem': path.resolve(__dirname, `${onprem}/docusaurus`), + '@selfhosted': path.resolve(__dirname, `${selfhosted}/docusaurus`), '@zlan': path.resolve(__dirname, `${zlan}/docusaurus`), '@zrok': path.resolve(__dirname, `${zrokRoot}`), '@zrokroot': path.resolve(__dirname, `${zrokRoot}`), @@ -254,14 +259,31 @@ const config: Config = { ['@docusaurus/plugin-content-pages',{path: 'src/pages',routeBasePath: '/'}], build(BUILD_FLAGS.FRONTDOOR) && ['@docusaurus/plugin-content-pages',{id: `frontdoor-pages`, path: `${frontdoor}/docusaurus/src/pages`, routeBasePath: '/frontdoor'}], - build(BUILD_FLAGS.ONPREM) && ['@docusaurus/plugin-content-pages',{id: `onprem-pages`, path: `${onprem}/docusaurus/src/pages`, routeBasePath: '/onprem'}], + build(BUILD_FLAGS.SELFHOSTED) && ['@docusaurus/plugin-content-pages',{id: `selfhosted-pages`, path: `${selfhosted}/docusaurus/src/pages`, routeBasePath: '/selfhosted'}], build(BUILD_FLAGS.OPENZITI) && ['@docusaurus/plugin-content-pages',{id: `openziti-pages`, path: `${openziti}/docusaurus/src/pages`, routeBasePath: '/openziti'}], build(BUILD_FLAGS.ZLAN) && ['@docusaurus/plugin-content-pages',{id: `zlan-pages`, path: `${zlan}/docusaurus/src/pages`, routeBasePath: '/zlan'}], build(BUILD_FLAGS.ZROK) && ['@docusaurus/plugin-content-pages',{id: `zrok-pages`, path: `${zrokRoot}/src/pages`, routeBasePath: '/zrok'}], - build(BUILD_FLAGS.ONPREM) && [ + build(BUILD_FLAGS.SELFHOSTED) && [ '@docusaurus/plugin-content-docs', { - id: 'onprem', // do not change - affects algolia search + id: 'selfhosted', + path: `${selfhosted}/docusaurus/docs`, + routeBasePath: routeBase('selfhosted'), + sidebarPath: `${selfhosted}/docusaurus/sidebars.ts`, + includeCurrentVersion: true, + beforeDefaultRemarkPlugins: [ + remarkGithubAdmonitionsToDirectives, + ], + remarkPlugins: [ + [remarkScopedPath, { mappings: REMARK_MAPPINGS, debug: false }], + [remarkCodeSections, { logLevel: LogLevel.Silent }], + ], + }, + ], + build(BUILD_FLAGS.SELFHOSTED) && [ + '@docusaurus/plugin-content-docs', + { + id: 'onprem', // RETAINED: Critical for Algolia Index continuity path: `${onprem}/docusaurus/docs`, routeBasePath: routeBase('onprem'), sidebarPath: `${onprem}/docusaurus/sidebars.ts`, @@ -275,6 +297,7 @@ const config: Config = { ], }, ], + build(BUILD_FLAGS.FRONTDOOR) && [ '@docusaurus/plugin-content-docs', { @@ -346,15 +369,20 @@ const config: Config = { }, ], build(BUILD_FLAGS.ZROK) && extendDocsPlugins(zrokDocsPluginConfig(zrokRoot, REMARK_MAPPINGS, routeBase('zrok'))), - // Fallback redirects for JSX pages with hardcoded /docs/ paths (from upstream repos) - isVercel && [ + [ '@docusaurus/plugin-client-redirects', { createRedirects(existingPath: string) { - // Redirect /docs/X → /X for all doc paths - return existingPath.match(/^\/(onprem|frontdoor|openziti|zrok|zlan)/) - ? [`/docs${existingPath}`] - : undefined; + const redirects: string[] = []; + // Vercel previews: redirect /docs/X → /X for all doc paths + if (isVercel && existingPath.match(/^\/(selfhosted|frontdoor|openziti|zrok|zlan)/)) { + redirects.push(`/docs${existingPath}`); + } + // Migration: redirect old /onprem/* paths to /selfhosted/* + if (existingPath.startsWith('/selfhosted/')) { + redirects.push(existingPath.replace('/selfhosted/', '/onprem/')); + } + return redirects.length > 0 ? redirects : undefined; }, }, ], @@ -365,7 +393,7 @@ const config: Config = { themeConfig: { docs: { sidebar: { - hideable: false, + hideable: false, autoCollapseCategories: true } }, @@ -386,7 +414,7 @@ const config: Config = { label: 'Docs', position: 'left', items: [ - { to: '/onprem/intro', label: 'On-Prem' }, + { to: '/selfhosted/intro', label: 'Self-Hosted' }, { to: '/frontdoor/intro', label: 'Frontdoor' }, { to: '/openziti/learn/introduction', label: 'OpenZiti' }, ], @@ -442,4 +470,4 @@ const config: Config = { ], }; -export default config; +export default config; \ No newline at end of file diff --git a/unified-doc/package.json b/unified-doc/package.json index c38b014..b72c22d 100644 --- a/unified-doc/package.json +++ b/unified-doc/package.json @@ -16,31 +16,31 @@ "vrt:generate": "node scripts/generate-vrt-scenarios.mjs all", "vrt:generate:openziti": "node scripts/generate-vrt-scenarios.mjs openziti", "vrt:generate:frontdoor": "node scripts/generate-vrt-scenarios.mjs frontdoor", - "vrt:generate:onprem": "node scripts/generate-vrt-scenarios.mjs onprem", + "vrt:generate:selfhosted": "node scripts/generate-vrt-scenarios.mjs selfhosted", "vrt:generate:zrok": "node scripts/generate-vrt-scenarios.mjs zrok", "vrt:generate:zlan": "node scripts/generate-vrt-scenarios.mjs zlan", "vrt:generate:home": "node scripts/generate-vrt-scenarios.mjs home", "vrt:reference:openziti": "backstop reference --config=backstop.openziti.json", "vrt:reference:frontdoor": "backstop reference --config=backstop.frontdoor.json", - "vrt:reference:onprem": "backstop reference --config=backstop.onprem.json", + "vrt:reference:selfhosted": "backstop reference --config=backstop.selfhosted.json", "vrt:reference:zrok": "backstop reference --config=backstop.zrok.json", "vrt:reference:zlan": "backstop reference --config=backstop.zlan.json", "vrt:reference:home": "backstop reference --config=backstop.home.json", "vrt:test:openziti": "backstop test --config=backstop.openziti.json", "vrt:test:frontdoor": "backstop test --config=backstop.frontdoor.json", - "vrt:test:onprem": "backstop test --config=backstop.onprem.json", + "vrt:test:selfhosted": "backstop test --config=backstop.selfhosted.json", "vrt:test:zrok": "backstop test --config=backstop.zrok.json", "vrt:test:zlan": "backstop test --config=backstop.zlan.json", "vrt:test:home": "backstop test --config=backstop.home.json", "vrt:approve:openziti": "backstop approve --config=backstop.openziti.json", "vrt:approve:frontdoor": "backstop approve --config=backstop.frontdoor.json", - "vrt:approve:onprem": "backstop approve --config=backstop.onprem.json", + "vrt:approve:selfhosted": "backstop approve --config=backstop.selfhosted.json", "vrt:approve:zrok": "backstop approve --config=backstop.zrok.json", "vrt:approve:zlan": "backstop approve --config=backstop.zlan.json", "vrt:approve:home": "backstop approve --config=backstop.home.json", "vrt:report:openziti": "backstop openReport --config=backstop.openziti.json", "vrt:report:frontdoor": "backstop openReport --config=backstop.frontdoor.json", - "vrt:report:onprem": "backstop openReport --config=backstop.onprem.json", + "vrt:report:selfhosted": "backstop openReport --config=backstop.selfhosted.json", "vrt:report:zrok": "backstop openReport --config=backstop.zrok.json", "vrt:report:zlan": "backstop openReport --config=backstop.zlan.json", "vrt:report:home": "backstop openReport --config=backstop.home.json", diff --git a/unified-doc/scripts/generate-vrt-scenarios.mjs b/unified-doc/scripts/generate-vrt-scenarios.mjs index c5e4bf7..92f8a7c 100644 --- a/unified-doc/scripts/generate-vrt-scenarios.mjs +++ b/unified-doc/scripts/generate-vrt-scenarios.mjs @@ -5,7 +5,7 @@ * Usage: * node scripts/generate-vrt-scenarios.mjs [product] * - * Products: openziti, frontdoor, onprem, zrok, zlan, home, all + * Products: openziti, frontdoor, selfhosted, zrok, zlan, home, all * * Examples: * node scripts/generate-vrt-scenarios.mjs openziti # Only OpenZiti pages @@ -40,10 +40,10 @@ const PRODUCTS = { pattern: /\/frontdoor\//, include: (url) => url.includes('/frontdoor/') }, - onprem: { - label: 'On-Prem', - pattern: /\/onprem\//, - include: (url) => url.includes('/onprem/') + selfhosted: { + label: 'Self-Hosted', + pattern: /\/selfhosted\//, + include: (url) => url.includes('/selfhosted/') }, zrok: { label: 'zrok', @@ -96,7 +96,7 @@ function categorizeUrls(urls) { home: [], openziti: [], frontdoor: [], - onprem: [], + selfhosted: [], zrok: [], zlan: [], other: [] diff --git a/unified-doc/scripts/vrt-run.mjs b/unified-doc/scripts/vrt-run.mjs index 1c1c894..9854094 100644 --- a/unified-doc/scripts/vrt-run.mjs +++ b/unified-doc/scripts/vrt-run.mjs @@ -15,7 +15,7 @@ const [,, action, product, flag] = process.argv; if (!action || !product) { console.error('[VRT] Usage: vrt-run.mjs [--filter]'); - console.error('[VRT] Products: home, openziti, frontdoor, onprem, zrok, zlan'); + console.error('[VRT] Products: home, openziti, frontdoor, selfhosted, zrok, zlan'); process.exit(1); } diff --git a/unified-doc/src/components/ProductSearch.module.css b/unified-doc/src/components/ProductSearch.module.css index 4dd0df1..8f20c0d 100644 --- a/unified-doc/src/components/ProductSearch.module.css +++ b/unified-doc/src/components/ProductSearch.module.css @@ -79,7 +79,7 @@ .badge{padding:.16rem .55rem;border-radius:999px;font-size:.72rem;border:1px solid var(--ifm-color-emphasis-300)} .p_frontdoor{background:#e8f3ff;border-color:#c6e1ff;color:#145ea8} .p_openziti{background:#e9fff3;border-color:#c8f2df;color:#0d7a4e} -.p_onprem{background:#fff3e8;border-color:#ffdcbf;color:#9a4d00} +.p_selfhosted{background:#fff3e8;border-color:#ffdcbf;color:#9a4d00} .p_zlan{background:#f1edff;border-color:#d9d0ff;color:#5335b7} /* ===== Pagination ===== */ @@ -172,7 +172,7 @@ border-color: #c8f2df; color: #0d7a4e; } -.pill.active[data-product="onprem"] { +.pill.active[data-product="selfhosted"] { background: #fff3e8; border-color: #ffdcbf; color: #9a4d00; diff --git a/unified-doc/src/components/ProductSearch.tsx b/unified-doc/src/components/ProductSearch.tsx index 21c23b9..09f3545 100644 --- a/unified-doc/src/components/ProductSearch.tsx +++ b/unified-doc/src/components/ProductSearch.tsx @@ -146,7 +146,7 @@ export default function ProductSearch({ appId, apiKey, indexName, - products = ["frontdoor", "openziti", "onprem", "zlan", "zrok"], + products = ["frontdoor", "openziti", "selfhosted", "zlan", "zrok"], extraContainerClasses = [], }: Props) { // read initial pill from ?product= for back/forward + shareable URLs diff --git a/unified-doc/src/components/footer.tsx b/unified-doc/src/components/footer.tsx index 571524c..e8a0f5c 100644 --- a/unified-doc/src/components/footer.tsx +++ b/unified-doc/src/components/footer.tsx @@ -4,7 +4,7 @@ import React from "react"; export const unifiedFooter = { ...defaultNetFoundryFooterProps(), description: - 'Cloud isn’t always viable. NetFoundry On-Prem™ lets you control and manage your own OpenZiti overlay network.', + 'Cloud isn\'t always viable. NetFoundry Self-Hosted™ lets you control and manage your own OpenZiti overlay network.', socialProps: { ...defaultSocialProps, githubUrl: 'https://github.com/netfoundry/', @@ -13,10 +13,10 @@ export const unifiedFooter = { twitterUrl: 'https://twitter.com/netfoundry/', }, documentationLinks: [ - Getting Starteda 4 + Getting Started ], communityLinks: [ - Getting Startedb 5 + Getting Started ], resourceLinks: [ OpenZiti Tech Blog, diff --git a/unified-doc/src/pages/docs/index.tsx b/unified-doc/src/pages/docs/index.tsx index d17ea80..c9349e7 100644 --- a/unified-doc/src/pages/docs/index.tsx +++ b/unified-doc/src/pages/docs/index.tsx @@ -31,7 +31,7 @@ export default function Home(): ReactNode {
NetFoundry SaaS Docs - On-Prem Docs + Self-Hosted Docs Frontdoor Docs @@ -58,12 +58,12 @@ export default function Home(): ReactNode {
-

NetFoundry On-Prem

+

NetFoundry Self-Hosted

Enterprise self-hosted platform for OpenZiti overlays.
- Go to NetFoundry On-Prem + Go to NetFoundry Self-Hosted
@@ -108,8 +108,8 @@ export default function Home(): ReactNode {

Quick Links

    -
  • NetFoundry Troubleshooting
    • -
  • On-Prem Deployment
    • +
  • NetFoundry Troubleshooting
    • +
  • Self-Hosted Deployment
  • Frontdoor Getting Started
  • OpenZiti CLI Reference
  • zLAN FAQ
    • @@ -122,8 +122,8 @@ export default function Home(): ReactNode {

    Support

      -
    • NetFoundry Troubleshooting
      • -
    • On-Prem Troubleshooting
      • +
    • NetFoundry Troubleshooting
      • +
    • Self-Hosted Troubleshooting
    • Frontdoor Troubleshooting
    • OpenZiti FAQ
    • zLAN FAQ
      • diff --git a/unified-doc/src/pages/index.tsx b/unified-doc/src/pages/index.tsx index 8fe6c95..6d579b3 100644 --- a/unified-doc/src/pages/index.tsx +++ b/unified-doc/src/pages/index.tsx @@ -31,7 +31,7 @@ export default function Home(): ReactNode {
      NetFoundry SaaS Docs - On-Prem Docs + Self-Hosted Docs Frontdoor Docs @@ -58,12 +58,12 @@ export default function Home(): ReactNode {
      -

      NetFoundry On-Prem

      +

      NetFoundry Self-Hosted

      Enterprise self-hosted platform for OpenZiti overlays.
      - Go to NetFoundry On-Prem + Go to NetFoundry Self-Hosted
      @@ -119,8 +119,8 @@ export default function Home(): ReactNode {

      Quick Links

        -
      • NetFoundry Troubleshooting
        • -
      • On-Prem Deployment
        • +
      • NetFoundry Troubleshooting
        • +
      • Self-Hosted Deployment
      • Frontdoor Getting Started
      • OpenZiti CLI Reference
      • zLAN FAQ
        • @@ -133,8 +133,8 @@ export default function Home(): ReactNode {

        Support

          -
        • NetFoundry Troubleshooting
          • -
        • On-Prem Troubleshooting
          • +
        • NetFoundry Troubleshooting
          • +
        • Self-Hosted Troubleshooting
        • Frontdoor Troubleshooting
        • OpenZiti FAQ
        • zLAN FAQ
          • diff --git a/unified-doc/src/theme/DocSearch/index.tsx b/unified-doc/src/theme/DocSearch/index.tsx index 4354d01..5ebbed9 100644 --- a/unified-doc/src/theme/DocSearch/index.tsx +++ b/unified-doc/src/theme/DocSearch/index.tsx @@ -5,7 +5,7 @@ import type { Props } from "@theme/DocSearch"; import { createPortal } from "react-dom"; import styles from "./styles.module.css"; -const PRODUCTS = ["frontdoor", "openziti", "onprem", "zlan"] as const; +const PRODUCTS = ["frontdoor", "openziti", "selfhosted", "zlan"] as const; function Pills({ product, diff --git a/unified-doc/src/theme/Layout/index.tsx b/unified-doc/src/theme/Layout/index.tsx index 511d680..2847899 100644 --- a/unified-doc/src/theme/Layout/index.tsx +++ b/unified-doc/src/theme/Layout/index.tsx @@ -3,7 +3,7 @@ import {NetFoundryLayout, NetFoundryLayoutProps, StarUsProps} from '@netfoundry/ import {useLocation} from "@docusaurus/router"; import {unifiedFooter} from "@site/src/components/footer"; import {frontdoorFooter} from "@frontdoor/src/components/footer"; -import {onpremFooter} from "@onprem/src/components/footer"; +import {onpremFooter} from "@selfhosted/src/components/footer"; import {zlanFooter} from "@zlan/src/components/footer"; import {openZitiFooter} from "@openziti/src/components/footer"; import {zrokFooter} from "@zrok/src/components/footer"; @@ -13,7 +13,7 @@ const matchPath = (p: string, segment: string) => const mapFooter = (p: string) => { if (matchPath(p, 'frontdoor')) return frontdoorFooter; - if (matchPath(p, 'onprem')) return onpremFooter; + if (matchPath(p, 'selfhosted')) return onpremFooter; if (matchPath(p, 'openziti')) return openZitiFooter; if (matchPath(p, 'zlan')) return zlanFooter; if (matchPath(p, 'zrok')) return zrokFooter; diff --git a/unified-doc/src/theme/Navbar/Content/index.tsx b/unified-doc/src/theme/Navbar/Content/index.tsx index e53ccba..2d794ea 100644 --- a/unified-doc/src/theme/Navbar/Content/index.tsx +++ b/unified-doc/src/theme/Navbar/Content/index.tsx @@ -25,7 +25,7 @@ const defaultItems: Item[] = [ const netfoundryDocs = {to: `https://support.netfoundry.io/hc/en-us/categories/360000991011-Docs-Guides`, label: 'NetFoundry SaaS'}; const nfFrontDoorDocs = {to: `${DOCS_PREFIX}/frontdoor/intro`, label: 'Frontdoor'}; -const onPremDocs = {to: `${DOCS_PREFIX}/onprem/intro`, label: 'On-Prem'}; +const onPremDocs = {to: `${DOCS_PREFIX}/selfhosted/intro`, label: 'Self-Hosted'}; const zlanDocs = {to: `${DOCS_PREFIX}/zlan/intro`, label: 'zLAN'}; const ozDocs = {to: `${DOCS_PREFIX}/openziti/learn/introduction`, label: 'OpenZiti'}; const zrokDocs = {to: `${DOCS_PREFIX}/zrok/getting-started`, label: 'zrok'}; @@ -48,8 +48,8 @@ const openZitiNav: Item[] = [ const onpremNav: Item[] = [ { - label: 'On-Prem Docs', - to: `${DOCS_PREFIX}/onprem/intro`, + label: 'Self-Hosted Docs', + to: `${DOCS_PREFIX}/selfhosted/intro`, position: 'left', type: 'dropdown', items: [ @@ -118,7 +118,7 @@ const zrokNav: Item[] = [ const mapNavbar = (p: string): Item[] => { if (p.startsWith(`${DOCS_PREFIX}/frontdoor`)) return frontdoorNav; - if (p.startsWith(`${DOCS_PREFIX}/onprem`)) return onpremNav; + if (p.startsWith(`${DOCS_PREFIX}/selfhosted`)) return onpremNav; if (p.startsWith(`${DOCS_PREFIX}/openziti`)) return openZitiNav; if (p.startsWith(`${DOCS_PREFIX}/zlan`)) return zlanNav; if (p.startsWith(`${DOCS_PREFIX}/zrok`)) return zrokNav; diff --git a/unified-doc/src/theme/Navbar/Logo/index.tsx b/unified-doc/src/theme/Navbar/Logo/index.tsx index e5930a9..192aa7d 100644 --- a/unified-doc/src/theme/Navbar/Logo/index.tsx +++ b/unified-doc/src/theme/Navbar/Logo/index.tsx @@ -11,7 +11,7 @@ const mapTitle = (p: string) => { const checkPath = (segment: string) => p.includes(`/${segment}`); if (checkPath('frontdoor')) return {includeNFLogo: true, to: '/frontdoor', alt:'Frontdoor', logoLight: `/img/frontdoor-sm-logo.svg`, logoDark: `/img/frontdoor-sm-logo.svg`}; - if (checkPath('onprem')) return {includeNFLogo: true, to: '/onprem',alt:'On-Prem', logoLight: `/img/onprem-sm-logo.svg`, logoDark: `/img/onprem-sm-logo.svg`}; + if (checkPath('selfhosted')) return {includeNFLogo: true, to: '/selfhosted',alt:'Self-Hosted', logoLight: `/img/onprem-sm-logo.svg`, logoDark: `/img/onprem-sm-logo.svg`}; if (checkPath('openziti')) return {includeNFLogo: true, to: '/openziti',alt:'OpenZiti', logoLight: `/img/openziti-sm-logo.svg`, logoDark: `/img/openziti-sm-logo.svg`}; if (checkPath('zlan')) return {includeNFLogo: true, to: '/zlan', alt:'zlan', logoLight: `/img/zlan-logo.svg`, logoDark: `/img/zlan-logo.svg`}; if (checkPath('zrok')) return {text: '', includeNFLogo: true, to: '/zrok', alt:'zrok', logoLight: `/img/zrok-1.0.0-rocket-purple.svg`, logoDark: `/img/zrok-1.0.0-rocket-green.svg`}; diff --git a/unified-doc/tsconfig.json b/unified-doc/tsconfig.json index bbed11c..332f461 100644 --- a/unified-doc/tsconfig.json +++ b/unified-doc/tsconfig.json @@ -12,12 +12,17 @@ "allowSyntheticDefaultImports": true, "resolveJsonModule": true, "isolatedModules": true, - "skipLibCheck": true - }, - "paths": { - "@frontdoor/*": ["_remotes/frontdoor/*"], - "@onprem/*": ["_remotes/onprem/*"], - "@openziti/*": ["_remotes/openziti/*"] + "skipLibCheck": true, + "paths": { + "@frontdoor/*": ["_remotes/frontdoor/*"], + "@onprem/*": ["_remotes/onprem/*"], + "@selfhosted/*": ["_remotes/selfhosted/*"], + "@openziti/*": ["_remotes/openziti/*"], + "@zlan/*": ["_remotes/zlan/*"], + "@zrok/*": ["_remotes/zrok/website/*"], + "@zrokroot/*": ["_remotes/zrok/website/*"], + "@site/*": ["./*"] + } }, "exclude": [".docusaurus", "build"] }