Skip to content

feat(docs): merge calm-studio docs into main docs site (#2331)#2413

Merged
markscott-ms merged 7 commits into
finos:mainfrom
gjs-opsflo:chore/calm-suite-merge-docs-into-main
May 10, 2026
Merged

feat(docs): merge calm-studio docs into main docs site (#2331)#2413
markscott-ms merged 7 commits into
finos:mainfrom
gjs-opsflo:chore/calm-suite-merge-docs-into-main

Conversation

@gjs-opsflo
Copy link
Copy Markdown
Contributor

Summary

Merges the standalone calm-suite/calm-studio/docs-site/ Docusaurus instance into the main docs/ site. Single deployment at calm.finos.org after this lands.

  • 17 markdown files moved (with git mv — history preserved) to docs/docs/calm-studio/
  • New calmStudioSidebar + navbar item in docs/sidebars.js and docs/docusaurus.config.js
  • calmstudio01.png migrated to docs/static/img/calmstudio/ (namespaced to avoid root img/ collisions)
  • 8 link rewrites: 4 absolute /docs/ links in intro.md, 2 image paths, 1 deferred-API note in mcp-server.md, 1 prose path in contributing.md
  • calm-core/README.md updated to link https://calm.finos.org/calm-studio/intro
  • calm-suite/calm-studio/docs-site/ directory deleted
  • calmstudio-docs removed from root package.json workspaces (added by chore(calm-suite): migrate calm-studio to npm workspaces #2408) and package-lock.json regenerated

Note: Sidebar ADR document IDs use Docusaurus-generated form (numeric prefix stripped by default, e.g. calm-studio/adrs/use-svelte-5-over-react not 0001-use-svelte-5-over-react).

Dependency on #2408

This PR is branched off chore/calm-studio-npm-workspaces (the #2408 branch). It removes the calmstudio-docs workspace entry that #2408 adds.

Recommended merge order: #2408 first, then this PR. If #2408 merges first, this branch will be rebased onto the updated main before merge — the workspace-removal commit will then be a no-op against main's workspaces and only the directory deletion will remain.

If #2408 is changed substantially, this PR will need rework.

Deferred (follow-up issues)

  • TypeDoc API reference (docs/api/ from docs-site) — requires adding docusaurus-plugin-typedoc to main config
  • Cross-link from working-with-calm/installation.md to CALM Studio getting-started
  • contributing.md references to finos/calmstudio repo governance files (CONTRIBUTING.md, CODE_OF_CONDUCT) — should point at finos/architecture-as-code equivalents

Test plan

  • npm run build --workspace docs passes locally with onBrokenLinks: 'throw'
  • docs/build/calm-studio/intro/index.html generated
  • Two signed-off commits, zero Co-Authored-By: lines
  • CI green on this PR (build-docs.yml, build-calm-studio.yml, s3-docs-sync dry-run)
  • EasyCLA passing
  • Reviewer spot-check: navigate to /calm-studio/intro on a preview deploy (if available)

Resolves #2331.

gjs-opsflo added 4 commits May 3, 2026 23:04
- Add calm-suite/calm-studio (orchestration root) and all sub-packages/apps to root npm workspaces:
  - calm-suite/calm-studio
  - calm-suite/calm-studio/packages/* (calm-core, extensions, mcp-server, github-action, vscode-extension, web-component, calmscript)
  - calm-suite/calm-studio/apps/* (studio)
  - calm-suite/calm-studio/docs-site
- Convert all 9 workspace:* references to file: relative paths (apps/studio, packages/github-action, packages/mcp-server, packages/vscode-extension, packages/web-component dependencies)
- Remove "packageManager: pnpm@..." from migrated package.json files
- Merge pnpm.overrides into root package.json overrides
- Align extensions vitest from ^4.1.0 to ^3.2.4 + @vitest/coverage-v8 to ^3.2.4 (pnpm strict isolation hid the version drift; npm requires alignment to single hoisted version)
- Fix apps/studio/vite.config.ts to import defineConfig from 'vitest/config' instead of 'vite' (test field was incompatible with vite's UserConfigExport type)
- Update apps/studio/src-tauri/tauri.conf.json beforeDevCommand/beforeBuildCommand to use "npm run dev"/"npm run build" instead of "pnpm dev"/"pnpm build"
- Delete calm-suite/calm-studio/pnpm-workspace.yaml and pnpm-lock.yaml
- Rewrite three CI workflows to use npm:
  - build-calm-studio.yml: actions/setup-node with cache: npm, npm ci, npm run --workspace=... --if-present for build/lint/typecheck/test across all 8 packages
  - build-calm-studio-desktop.yml: same setup pattern; tauriScript "npm run tauri --workspace=@calmstudio/studio"
  - automated-release-calm-studio.yml: npm-based bootstrap before multi-semantic-release
- Regenerate root package-lock.json (single source of truth)

Independent of finos#2407 (calm-guard half). Lockfile and root package.json overlap with finos#2407 will need rebase on whichever PR merges second.

Refs finos#2328 (calm-studio half).

Signed-off-by: Gourav Shah <gjs@opsflow.sh>
Sweep calm-studio README, AGENTS.md, package READMEs, and the docs-site for pnpm references and replace them with npm workspace equivalents.

- calm-studio/README.md and AGENTS.md: install/build/test/dev commands rewritten as npm with --workspace=@calmstudio/...
- calm-studio/packages/calm-core/README.md: install instructions
- calm-studio/docs-site/docs/getting-started/quick-start.md: prereqs + commands
- calm-studio/docs-site/docs/developer-guide/contributing.md: install + check suite
- calm-studio/docs-site/docs/developer-guide/extension-packs.md: pack scaffolding commands
- calm-studio/docs-site/docs/adrs/0008-docusaurus-for-documentation.md: update consequences note about workspace integration

Refs finos#2328.

Signed-off-by: Gourav Shah <gjs@opsflow.sh>
Migrates 17 markdown files from calm-suite/calm-studio/docs-site/docs/
into docs/docs/calm-studio/, preserving git history via git mv. Adds
calmStudioSidebar to docs/sidebars.js and a CALM Studio navbar item to
docs/docusaurus.config.js. Migrates the calmstudio01.png static asset
under a calmstudio/ subdirectory to avoid root img/ collisions. Rewrites
8 absolute /docs/ links and 2 image paths to match new routing under
the main site (routeBasePath: '/'). Updates calm-core README to point
at the new canonical docs URL https://calm.finos.org/calm-studio/intro.

Sidebar ADR IDs use Docusaurus-generated form (numeric prefix stripped
by default): e.g. 'calm-studio/adrs/use-svelte-5-over-react' not
'calm-studio/adrs/0001-use-svelte-5-over-react'.

TypeDoc API reference is intentionally deferred to a follow-up issue
(requires docusaurus-plugin-typedoc not yet present in main config).

Resolves finos#2331.

Signed-off-by: Gourav Shah <gjs@opsflow.sh>
Removes the calmstudio-docs entry from root package.json workspaces
(added by finos#2408) now that its content lives in the main docs site
(see previous commit). Regenerates package-lock.json to drop the
calmstudio-docs package and its transitive dependencies.

Note: calm-suite/calm-studio/pnpm-workspace.yaml was already cleaned up
in Phase 2 (d446522). No --filter '!calmstudio-docs' existed in
build-calm-studio.yml on the Phase 2 branch (it was rewritten to use
npm --workspace flags).

Resolves finos#2331 (with previous commit).

Signed-off-by: Gourav Shah <gjs@opsflow.sh>
…e-docs-into-main

# Conflicts:
#	.github/workflows/automated-release-calm-studio.yml
#	.github/workflows/build-calm-studio-desktop.yml
#	.github/workflows/build-calm-studio.yml
#	calm-suite/calm-studio/docs-site/package.json
#	calm-suite/calm-studio/pnpm-lock.yaml
#	package-lock.json
#	package.json
The Playwright webServer was still spawning the dev server with pnpm,
but the runner has no pnpm after the npm-workspaces migration. Use
npm run dev so the e2e CI job can start the server.

Signed-off-by: Matthew Bain <66839492+rocketstack-matt@users.noreply.github.com>
Under npm workspaces, @sveltejs/kit (and friends) install at
calm-suite/calm-studio/node_modules rather than at apps/studio/node_modules,
which is outside Vite's default fs.allow root. Without this, Playwright's
dev server boots but every page request fails with 'outside of Vite serving
allow list', and all 14 e2e tests fail with timeouts on the first locator.

Signed-off-by: Matthew Bain <66839492+rocketstack-matt@users.noreply.github.com>
@rocketstack-matt
Copy link
Copy Markdown
Member

This had been left for a while with conflicts so I've fixed them up - given both @gjs-opsflo and myself have touched it, can @opsflowanoop @eddie-knight @jpgough-ms or @markscott-ms as other codeowners of calm-studio please review

@markscott-ms markscott-ms merged commit 2b62804 into finos:main May 10, 2026
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

config docs Improvements of additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Migrate calm-studio docs-site into main documentation site

3 participants