diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9de99667a9..fbe569ba87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: filter: tree:0 fetch-depth: 0 - - run: npx nx start-ci-run --distribute-on="3 linux-large-js" --stop-agents-after="build" + - run: npx nx start-ci-run --distribute-on="3 linux-extra-large-js" --stop-agents-after="build" - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v4 diff --git a/docs/docs/self-hosting/manage/configure/configure.mdx b/docs/docs/self-hosting/manage/configure/configure.mdx index 75d7ad961c..c68f716d63 100644 --- a/docs/docs/self-hosting/manage/configure/configure.mdx +++ b/docs/docs/self-hosting/manage/configure/configure.mdx @@ -10,8 +10,8 @@ import Compose from "./_compose.mdx"; import Helm from "./_helm.mdx"; import Login from "./_login.md"; import CodeBlock from "@theme/CodeBlock"; -import DefaultsYamlSource from "!!raw-loader!../../../../../apps/api/cmd/defaults.yaml"; -import StepsYamlSource from "!!raw-loader!../../../../../apps/api/cmd/setup/steps.yaml"; +import DefaultsYamlSource from "!!raw-loader!./defaults.yaml"; +import StepsYamlSource from "!!raw-loader!./steps.yaml"; This guide assumes you are familiar with [running ZITADEL using the least amount of configuration possible](/docs/self-hosting/deploy/overview). diff --git a/docs/package.json b/docs/package.json index 152548e42b..81c89e90ab 100644 --- a/docs/package.json +++ b/docs/package.json @@ -12,9 +12,10 @@ "write-heading-ids": "docusaurus write-heading-ids", "ensure-plugins": "if [ ! -f \"protoc-gen-connect-openapi/protoc-gen-connect-openapi\" ]; then sh ./plugin-download.sh; fi", "debug-plugins": "echo \"PWD: $(pwd)\" && echo \"Plugin file exists: $(test -f protoc-gen-connect-openapi/protoc-gen-connect-openapi && echo 'yes' || echo 'no')\" && echo \"Plugin executable: $(test -x protoc-gen-connect-openapi/protoc-gen-connect-openapi && echo 'yes' || echo 'no')\" && ls -la protoc-gen-connect-openapi/ || echo 'Plugin directory not found'", - "generate": "pnpm run generate:grpc && pnpm run generate:apidocs && pnpm run ensure-plugins", + "generate": "pnpm run generate:grpc && pnpm run generate:apidocs && pnpm run generate:configdocs", "generate:grpc": "pnpm run ensure-plugins && buf generate ../proto", "generate:apidocs": "docusaurus gen-api-docs all", + "generate:configdocs": "cp -r ../apps/api/cmd/defaults.yaml ./docs/self-hosting/manage/configure/ && cp -r ../apps/api/cmd/setup/steps.yaml ./docs/self-hosting/manage/configure/", "generate:re-gen": "yarn generate:clean-all && pnpm generate", "generate:clean-all": "docusaurus clean-api-docs all", "postinstall": "sh ./plugin-download.sh", @@ -25,13 +26,13 @@ "@docusaurus/core": "^3.8.1", "@docusaurus/faster": "^3.8.1", "@docusaurus/preset-classic": "^3.8.1", - "@docusaurus/theme-mermaid": "^3.8.1", "@docusaurus/theme-common": "^3.8.1", + "@docusaurus/theme-mermaid": "^3.8.1", "@docusaurus/theme-search-algolia": "^3.8.1", "@headlessui/react": "^1.7.4", "@heroicons/react": "^2.0.13", - "@signalwire/docusaurus-plugin-llms-txt": "^1.2.0", "@inkeep/cxkit-docusaurus": "^0.5.89", + "@signalwire/docusaurus-plugin-llms-txt": "^1.2.0", "autoprefixer": "^10.4.13", "clsx": "^1.2.1", "docusaurus-plugin-image-zoom": "^3.0.1", @@ -62,6 +63,7 @@ "devDependencies": { "@docusaurus/module-type-aliases": "^3.8.1", "@docusaurus/types": "^3.8.1", + "@nx-extend/docusaurus": "^4.0.0", "tailwindcss": "^3.2.4" } } diff --git a/docs/project.json b/docs/project.json index 78f46bb820..edcdf06bee 100644 --- a/docs/project.json +++ b/docs/project.json @@ -4,7 +4,8 @@ "targets": { "generate": { "outputs": [ - "{projectRoot}/docs/apis/resources/**" + "{projectRoot}/docs/apis/resources/**", + "{projectRoot}/docs/self-hosting/manage/configure/*.yaml" ] }, "start": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d88e93bc95..b071d747d1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -560,6 +560,9 @@ importers: '@docusaurus/types': specifier: ^3.8.1 version: 3.8.1(@swc/core@1.13.3(@swc/helpers@0.5.17))(acorn@8.15.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@nx-extend/docusaurus': + specifier: ^4.0.0 + version: 4.0.0(1137cfb34852dbaf34153359cc0b2a7a) tailwindcss: specifier: ^3.2.4 version: 3.4.14(ts-node@10.9.1(@swc/core@1.13.3(@swc/helpers@0.5.17))(@types/node@24.1.0)(typescript@5.8.3)) @@ -2404,6 +2407,9 @@ packages: resolution: {integrity: sha512-OTp6eebuMcf2rJt4bqnvuwmm3NVXfzfYejL+u/Y1qwKhZPrjPoKWfk1CbOP5xH5ZOPkiAsx4dHdQBRJszK3z2g==} engines: {node: '>=18.0'} + '@docusaurus/tsconfig@3.8.1': + resolution: {integrity: sha512-XBWCcqhRHhkhfolnSolNL+N7gj3HVE3CoZVqnVjfsMzCoOsuQw2iCLxVVHtO+rePUUfouVZHURDgmqIySsF66A==} + '@docusaurus/types@3.8.1': resolution: {integrity: sha512-ZPdW5AB+pBjiVrcLuw3dOS6BFlrG0XkS2lDGsj8TizcnREQg3J8cjsgfDviszOk4CweNfwo1AEELJkYaMUuOPg==} peerDependencies: @@ -3830,6 +3836,18 @@ packages: resolution: {integrity: sha512-x+gi/fKdM6uQNIti9exFlm3V5LBP3Y8vOEziO42HdOigyrXa0S0HD2WMpccmp6PclYKhwEDUjKJ39xh5sdh4Ig==} hasBin: true + '@nx-extend/docusaurus@4.0.0': + resolution: {integrity: sha512-g/rjkdg30JT5bI/d27PV+v8tdxuLFiIgHPvuhw4S9ZmR8J1tGeTuJkBiVsw41CqKF1DqQymyIn54JgTyvQuPKQ==} + peerDependencies: + '@docusaurus/core': ^3.4.0 + '@docusaurus/preset-classic': ^3.4.0 + '@mdx-js/react': ^3.0.1 + '@nx/devkit': ^20.0.0 + clsx: ^2.1.1 + prism-react-renderer: ^2.3.1 + react: ^18.3.1 + react-dom: ^18.3.1 + '@nx/angular@21.4.0-beta.5': resolution: {integrity: sha512-Y2nPnVPeuasOxu7zRKM3TstlkTk40emEOyCOjXGY1mz4KXJWcX/1coIxwssIA9XQfGPfyHyWJcVQkeO06Ne+Lg==} peerDependencies: @@ -18911,6 +18929,8 @@ snapshots: fs-extra: 11.3.0 tslib: 2.8.1 + '@docusaurus/tsconfig@3.8.1': {} + '@docusaurus/types@3.8.1(@swc/core@1.13.3(@swc/helpers@0.5.17))(acorn@8.15.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@mdx-js/mdx': 3.1.0(acorn@8.15.0) @@ -20812,6 +20832,28 @@ snapshots: - '@swc/core' - debug + '@nx-extend/docusaurus@4.0.0(1137cfb34852dbaf34153359cc0b2a7a)': + dependencies: + '@docusaurus/core': 3.8.1(@docusaurus/faster@3.8.1(@docusaurus/types@3.8.1(@swc/core@1.13.3(@swc/helpers@0.5.17))(acorn@8.15.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/helpers@0.5.17))(@mdx-js/react@3.1.0(@types/react@19.1.2)(react@18.3.1))(@rspack/core@1.4.11(@swc/helpers@0.5.17))(@swc/core@1.13.3(@swc/helpers@0.5.17))(acorn@8.15.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.8.3) + '@docusaurus/module-type-aliases': 3.8.1(@swc/core@1.13.3(@swc/helpers@0.5.17))(acorn@8.15.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@docusaurus/preset-classic': 3.8.1(@algolia/client-search@5.35.0)(@docusaurus/faster@3.8.1(@docusaurus/types@3.8.1(@swc/core@1.13.3(@swc/helpers@0.5.17))(acorn@8.15.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/helpers@0.5.17))(@mdx-js/react@3.1.0(@types/react@19.1.2)(react@18.3.1))(@rspack/core@1.4.11(@swc/helpers@0.5.17))(@swc/core@1.13.3(@swc/helpers@0.5.17))(@types/react@19.1.2)(acorn@8.15.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(search-insights@2.17.3)(typescript@5.8.3) + '@docusaurus/tsconfig': 3.8.1 + '@docusaurus/types': 3.8.1(@swc/core@1.13.3(@swc/helpers@0.5.17))(acorn@8.15.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mdx-js/react': 3.1.0(@types/react@19.1.2)(react@18.3.1) + '@nx/devkit': 21.4.0-beta.5(nx@21.4.0-beta.5(@swc/core@1.13.3(@swc/helpers@0.5.17))) + clsx: 1.2.1 + prism-react-renderer: 2.4.1(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + tslib: 2.8.1 + transitivePeerDependencies: + - '@swc/core' + - acorn + - esbuild + - supports-color + - uglify-js + - webpack-cli + '@nx/angular@21.4.0-beta.5(@angular-devkit/core@20.1.4)(@angular-devkit/schematics@16.2.16)(@babel/traverse@7.28.0)(@module-federation/enhanced@0.17.1(@rspack/core@1.4.11(@swc/helpers@0.5.17))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)(webpack@5.99.9(@swc/core@1.13.3(@swc/helpers@0.5.17))))(@module-federation/node@2.7.10(@rspack/core@1.4.11(@swc/helpers@0.5.17))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)(webpack@5.99.9(@swc/core@1.13.3(@swc/helpers@0.5.17))))(@rspack/core@1.4.11(@swc/helpers@0.5.17))(@schematics/angular@16.2.16)(@swc/core@1.13.3(@swc/helpers@0.5.17))(@swc/helpers@0.5.17)(@types/express@4.17.23)(@zkochan/js-yaml@0.0.7)(eslint@8.57.1)(html-webpack-plugin@5.6.3(@rspack/core@1.4.11(@swc/helpers@0.5.17))(webpack@5.99.9(@swc/core@1.13.3(@swc/helpers@0.5.17))))(less@4.1.3)(nx@21.3.11(@swc/core@1.13.3(@swc/helpers@0.5.17)))(react-dom@19.1.0(react@19.1.0))(react-refresh@0.17.0)(react@19.1.0)(rxjs@7.8.2)(typescript@5.8.3)': dependencies: '@angular-devkit/core': 20.1.4