From 5e405f06a93c53ee6a3ec805da7014c296e5d810 Mon Sep 17 00:00:00 2001 From: dav-is Date: Sun, 27 Sep 2026 18:58:19 -0400 Subject: [PATCH 1/2] Fix migrations --- Readme.md | 8 +++---- apps/id | 2 +- apps/members | 2 +- apps/monolith/.env.development | 13 ++++------- apps/monolith/package.json | 2 ++ package.json | 4 ++-- packages/distribution | 2 +- pnpm-lock.yaml | 40 ++++++++++++++++++++++++---------- 8 files changed, 44 insertions(+), 29 deletions(-) diff --git a/Readme.md b/Readme.md index 384e19e..7bd1bf5 100644 --- a/Readme.md +++ b/Readme.md @@ -10,10 +10,10 @@ Version **26.09.01-alpha.1** | Module | Version | Pinned at | Path | | --- | --- | --- | --- | -| [`@fairgarden/id`](https://github.com/fairgarden/id) | 0.1.0-alpha.0 | [8370e52](https://github.com/fairgarden/id/commit/8370e52440eb5384dfd4bcc34b58ffc5e61b15c5) — untagged | `apps/id` | -| [`@fairgarden/members`](https://github.com/fairgarden/members) | 0.1.0-alpha.0 | [a2539d2](https://github.com/fairgarden/members/commit/a2539d20dc238adae873ceeb21801594d65e892a) — untagged | `apps/members` | -| [`@fairgarden/design`](https://github.com/fairgarden/design)
FairGarden Design System | 0.1.0-alpha.2 | [64660c5](https://github.com/fairgarden/design/commit/64660c5904bfa42585b60d5b447bc5a1801a47a2) — unreleased, after v0.1.0-alpha.1 | `packages/design` | -| [`@fairgarden/distribution`](https://github.com/fairgarden/distribution)
Compose versioned modules into a distribution, and extend one distribution from another | 0.1.0-alpha.7 | [271c5ce](https://github.com/fairgarden/distribution/commit/271c5cedab9fcf8698d8f6d43e3afb75defd154d) — unreleased, after v0.1.0-alpha.6 | `packages/distribution` | +| [`@fairgarden/id`](https://github.com/fairgarden/id) | 0.1.0-alpha.0 | [d8ca2bb](https://github.com/fairgarden/id/commit/d8ca2bb2d123c8f90b28d305cfe2283606d32057) — untagged | `apps/id` | +| [`@fairgarden/members`](https://github.com/fairgarden/members) | 0.1.0-alpha.0 | [ffcbc26](https://github.com/fairgarden/members/commit/ffcbc260c2904b6e2d77aa7c2a256fe5aa3f4376) — untagged | `apps/members` | +| [`@fairgarden/design`](https://github.com/fairgarden/design)
FairGarden Design System | 0.1.0-alpha.2 | [ba97983](https://github.com/fairgarden/design/commit/ba97983b479f0afc474fb1d6715bddc48718c490) — unreleased, after v0.1.0-alpha.1 | `packages/design` | +| [`@fairgarden/distribution`](https://github.com/fairgarden/distribution)
Compose versioned modules into a distribution, and extend one distribution from another | 0.1.0-alpha.7 | [e747d6b](https://github.com/fairgarden/distribution/commit/e747d6b51a24d49432bdf7abbe47b4d68c00de62) — unreleased, after v0.1.0-alpha.6 | `packages/distribution` | | [`@fairgarden/indicators`](https://github.com/fairgarden/indicators)
Put locale, preferences and flags into the path, so every variant of a Next.js page is a static cache key | 0.1.0-alpha.2 | [683bb16](https://github.com/fairgarden/indicators/commit/683bb16133238b24bf7d573933fae1d1b8d27d69) — unreleased, after v0.1.0-alpha.1 | `packages/indicators` | | [`@fairgarden/monolith`](https://github.com/fairgarden/monolith)
Compose several Next.js apps into a single deployable monolith | 0.1.0-alpha.1 | [4d98122](https://github.com/fairgarden/monolith/commit/4d9812278e0e95fa890870919b86d1f7b80df1a3) — unreleased, after v0.1.0-alpha.0 | `packages/monolith` | | [`@fairgarden/policy`](https://github.com/fairgarden/policy)
An organization's policy as Open Policy Agent bundles: built in layers from the repository, run in process, disclosed to members, every decision recorded | 0.1.0-alpha.0 | [a8707b7](https://github.com/fairgarden/policy/commit/a8707b7d4524aaca5f78af0993dd501f14e16b41) — untagged | `packages/policy` | diff --git a/apps/id b/apps/id index 8370e52..c1324f9 160000 --- a/apps/id +++ b/apps/id @@ -1 +1 @@ -Subproject commit 8370e52440eb5384dfd4bcc34b58ffc5e61b15c5 +Subproject commit c1324f9ef31340a54c731c40e1ac4b11c4001a18 diff --git a/apps/members b/apps/members index a2539d2..f790068 160000 --- a/apps/members +++ b/apps/members @@ -1 +1 @@ -Subproject commit a2539d20dc238adae873ceeb21801594d65e892a +Subproject commit f790068e2802c49128f99764fd911a41630e16c8 diff --git a/apps/monolith/.env.development b/apps/monolith/.env.development index 7ac8ddb..1b21097 100644 --- a/apps/monolith/.env.development +++ b/apps/monolith/.env.development @@ -10,18 +10,13 @@ FG_ID_URL=http://localhost:3000 FG_ID_NAME=Fair Garden -# members signs in with id, and supplies the `membership` scope's claims to -# any other service a person shares it with. -FG_ID_SERVICE_MEMBERS_URL=http://localhost:3000/members -FG_ID_SERVICE_MEMBERS_NAME=Members +# members signs in with id. Mounted together, they work that out themselves — +# id enrols members at /members, members finds id at /id — and share the one +# client secret, which both read from here. FG_ID_SERVICE_MEMBERS_SECRET=dev-only-members-secret -FG_ID_SERVICE_MEMBERS_CLAIMS=membership -# members: likewise before its mount point; the id service is its issuer. +# members: likewise before its mount point. FG_MEMBERS_URL=http://localhost:3000 -FG_MEMBERS_ID_URL=http://localhost:3000/id -FG_MEMBERS_CLIENT_ID=members -FG_MEMBERS_CLIENT_SECRET=dev-only-members-secret FG_MEMBERS_SECRET=dev-only-members-session-secret # The embedded databases the apps keep for themselves, so whatever you set up diff --git a/apps/monolith/package.json b/apps/monolith/package.json index 5cd1ad1..55b5b3e 100644 --- a/apps/monolith/package.json +++ b/apps/monolith/package.json @@ -6,6 +6,8 @@ "scripts": { "dev": "fg-dist policy use && next dev -p 3000", "build": "fg-dist policy use && next build", + "check-env": "fg-dist env check --build", + "migrate": "fg-dist migrate --build", "start": "next start -p 3000", "lint": "eslint" }, diff --git a/package.json b/package.json index 5e43d2b..c00e4cc 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ "access": "public" }, "scripts": { - "build": "turbo run build --filter=./apps/monolith", + "build": "pnpm dist env check --build --cwd apps/monolith && turbo run build --filter=./apps/monolith && pnpm --filter=./apps/monolith run --if-present migrate", "dev": "turbo run dev --filter=./apps/monolith", - "modular:build": "turbo run build --filter='./apps/*' --filter='!./apps/monolith'", + "modular:build": "pnpm dist env check --build --cwd apps/id && pnpm dist env check --build --cwd apps/members && turbo run build --filter='./apps/*' --filter='!./apps/monolith' && pnpm --filter='./apps/*' --filter='!./apps/monolith' run --if-present migrate", "modular:dev": "turbo run dev --filter='./apps/*' --filter='!./apps/monolith'", "docs:build": "turbo run build --filter='./apps/*/docs' --filter='./packages/*/docs'", "docs:dev": "turbo run dev --filter='./apps/*/docs' --filter='./packages/*/docs'", diff --git a/packages/distribution b/packages/distribution index 271c5ce..9d7816e 160000 --- a/packages/distribution +++ b/packages/distribution @@ -1 +1 @@ -Subproject commit 271c5cedab9fcf8698d8f6d43e3afb75defd154d +Subproject commit 9d7816e8784e4855be4da63f9ce8dcb503660b65 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e4ee674..f419d07 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -190,6 +190,9 @@ importers: '@electric-sql/pglite-socket': specifier: ^0.2.11 version: 0.2.11(@electric-sql/pglite-age@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pg_hashids@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pg_ivm@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pg_textsearch@0.0.10(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pg_uuidv7@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pgtap@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pgvector@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite@0.5.8) + '@fairgarden/distribution': + specifier: workspace:* + version: link:../../packages/distribution '@fairgarden/indicators': specifier: workspace:* version: link:../../packages/indicators @@ -239,9 +242,6 @@ importers: '@fairgarden/design': specifier: workspace:* version: link:../../packages/design - '@fairgarden/distribution': - specifier: workspace:* - version: link:../../packages/distribution '@material-symbols/font-600': specifier: ^0.47.4 version: 0.47.5 @@ -351,6 +351,9 @@ importers: '@electric-sql/pglite-socket': specifier: ^0.2.11 version: 0.2.11(@electric-sql/pglite-age@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pg_hashids@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pg_ivm@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pg_textsearch@0.0.10(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pg_uuidv7@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pgtap@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pgvector@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite@0.5.8) + '@fairgarden/distribution': + specifier: workspace:* + version: link:../../packages/distribution '@fairgarden/monolith': specifier: workspace:* version: link:../../packages/monolith @@ -385,9 +388,6 @@ importers: '@fairgarden/design': specifier: workspace:* version: link:../../packages/design - '@fairgarden/distribution': - specifier: workspace:* - version: link:../../packages/distribution '@material-symbols/font-600': specifier: ^0.47.4 version: 0.47.5 @@ -577,6 +577,9 @@ importers: '@fairgarden/distribution': specifier: workspace:* version: link:../distribution + '@fairgarden/docs': + specifier: ^0.13.4-canary.18 + version: 0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3) '@material-symbols/svg-400': specifier: ^0.47.5 version: 0.47.5 @@ -680,8 +683,8 @@ importers: specifier: workspace:* version: link:.. '@fairgarden/docs': - specifier: ^0.13.3 - version: 0.13.3(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3) + specifier: ^0.13.4-canary.18 + version: 0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3) '@protomaps/basemaps': specifier: ^5.7.2 version: 5.7.2 @@ -764,9 +767,15 @@ importers: '@babel/parser': specifier: ^7.29.9 version: 7.29.9 + '@next/env': + specifier: ^16.0.0 + version: 16.3.6 mdast-util-from-markdown: specifier: ^2.0.3 version: 2.0.3(supports-color@10.2.2) + pg: + specifier: ^8.23.0 + version: 8.23.0 semver: specifier: ^7.8.5 version: 7.8.5 @@ -774,9 +783,18 @@ importers: '@babel/types': specifier: ^8.0.6 version: 8.0.6 + '@electric-sql/pglite': + specifier: ^0.5.8 + version: 0.5.8 + '@electric-sql/pglite-socket': + specifier: ^0.2.11 + version: 0.2.11(@electric-sql/pglite-age@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pg_hashids@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pg_ivm@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pg_textsearch@0.0.10(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pg_uuidv7@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pgtap@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite-pgvector@0.0.9(@electric-sql/pglite@0.5.8))(@electric-sql/pglite@0.5.8) '@types/node': specifier: ^26.6.2 version: 26.6.2 + '@types/pg': + specifier: ^8.23.1 + version: 8.23.1 '@types/semver': specifier: ^7.7.1 version: 7.8.0 @@ -1857,8 +1875,8 @@ packages: resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@fairgarden/docs@0.13.3': - resolution: {integrity: sha512-63b5bRVF0aZrYOto7XcVyS8/0vU6gn+cVvSxNZwaALs/zqm2LpPUha+hYadOiIGMXzcpoXJiwzJ8CAVAs6Nk7A==} + '@fairgarden/docs@0.13.4-canary.18': + resolution: {integrity: sha512-3DHKz0F8Hp+p7hkcZ3ywo5UoStXLu6x/nd0ZV+76x+4FCtKEQmBmdLXg+YNPWikEokWViF/unl19rJirpFlEyg==} engines: {node: '>=22.18.0'} hasBin: true peerDependencies: @@ -6354,7 +6372,7 @@ snapshots: '@eslint/core': 0.17.0 levn: 0.4.1 - '@fairgarden/docs@0.13.3(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3)': + '@fairgarden/docs@0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3)': dependencies: '@babel/runtime': 7.29.7 '@csstools/postcss-light-dark-function': 3.0.4(postcss@8.5.28) From bbf97307cb96008d0e07c8d21ec7c8463416f8af Mon Sep 17 00:00:00 2001 From: dav-is Date: Sun, 27 Sep 2026 22:10:12 -0400 Subject: [PATCH 2/2] Bump versions --- Readme.md | 14 ++-- apps/id | 2 +- apps/members | 2 +- packages/design | 2 +- packages/distribution | 2 +- packages/indicators | 2 +- packages/monolith | 2 +- packages/policy | 2 +- pnpm-lock.yaml | 146 ++++++++++++++++++++++++++++++++++++++++++ pnpm-workspace.yaml | 9 +++ 10 files changed, 169 insertions(+), 14 deletions(-) diff --git a/Readme.md b/Readme.md index 7bd1bf5..f2fb885 100644 --- a/Readme.md +++ b/Readme.md @@ -10,13 +10,13 @@ Version **26.09.01-alpha.1** | Module | Version | Pinned at | Path | | --- | --- | --- | --- | -| [`@fairgarden/id`](https://github.com/fairgarden/id) | 0.1.0-alpha.0 | [d8ca2bb](https://github.com/fairgarden/id/commit/d8ca2bb2d123c8f90b28d305cfe2283606d32057) — untagged | `apps/id` | -| [`@fairgarden/members`](https://github.com/fairgarden/members) | 0.1.0-alpha.0 | [ffcbc26](https://github.com/fairgarden/members/commit/ffcbc260c2904b6e2d77aa7c2a256fe5aa3f4376) — untagged | `apps/members` | -| [`@fairgarden/design`](https://github.com/fairgarden/design)
FairGarden Design System | 0.1.0-alpha.2 | [ba97983](https://github.com/fairgarden/design/commit/ba97983b479f0afc474fb1d6715bddc48718c490) — unreleased, after v0.1.0-alpha.1 | `packages/design` | -| [`@fairgarden/distribution`](https://github.com/fairgarden/distribution)
Compose versioned modules into a distribution, and extend one distribution from another | 0.1.0-alpha.7 | [e747d6b](https://github.com/fairgarden/distribution/commit/e747d6b51a24d49432bdf7abbe47b4d68c00de62) — unreleased, after v0.1.0-alpha.6 | `packages/distribution` | -| [`@fairgarden/indicators`](https://github.com/fairgarden/indicators)
Put locale, preferences and flags into the path, so every variant of a Next.js page is a static cache key | 0.1.0-alpha.2 | [683bb16](https://github.com/fairgarden/indicators/commit/683bb16133238b24bf7d573933fae1d1b8d27d69) — unreleased, after v0.1.0-alpha.1 | `packages/indicators` | -| [`@fairgarden/monolith`](https://github.com/fairgarden/monolith)
Compose several Next.js apps into a single deployable monolith | 0.1.0-alpha.1 | [4d98122](https://github.com/fairgarden/monolith/commit/4d9812278e0e95fa890870919b86d1f7b80df1a3) — unreleased, after v0.1.0-alpha.0 | `packages/monolith` | -| [`@fairgarden/policy`](https://github.com/fairgarden/policy)
An organization's policy as Open Policy Agent bundles: built in layers from the repository, run in process, disclosed to members, every decision recorded | 0.1.0-alpha.0 | [a8707b7](https://github.com/fairgarden/policy/commit/a8707b7d4524aaca5f78af0993dd501f14e16b41) — untagged | `packages/policy` | +| [`@fairgarden/id`](https://github.com/fairgarden/id) | 0.1.0-alpha.0 | [0926234](https://github.com/fairgarden/id/commit/09262342d4bcb386006a2e2b8e37b1eb2a24b52b) — untagged | `apps/id` | +| [`@fairgarden/members`](https://github.com/fairgarden/members) | 0.1.0-alpha.0 | [d08534d](https://github.com/fairgarden/members/commit/d08534dba6a7607f606762cf8b03eaca420e0e10) — untagged | `apps/members` | +| [`@fairgarden/design`](https://github.com/fairgarden/design)
FairGarden Design System | 0.1.0-alpha.3 | [51c001f](https://github.com/fairgarden/design/commit/51c001f1435f3415a6e2a10a7ab71641ca7bef28) — unreleased, after v0.1.0-alpha.2 | `packages/design` | +| [`@fairgarden/distribution`](https://github.com/fairgarden/distribution)
Compose versioned modules into a distribution, and extend one distribution from another | 0.1.0-alpha.8 | [7962a00](https://github.com/fairgarden/distribution/commit/7962a00873961e5d1ecafbe085dcd08dd247c0ac) — unreleased, after v0.1.0-alpha.7 | `packages/distribution` | +| [`@fairgarden/indicators`](https://github.com/fairgarden/indicators)
Put locale, preferences and flags into the path, so every variant of a Next.js page is a static cache key | 0.1.0-alpha.2 | [1b9c3a6](https://github.com/fairgarden/indicators/commit/1b9c3a625688c249df1edfe42e128f3a4c5e8db3) — unreleased, after v0.1.0-alpha.1 | `packages/indicators` | +| [`@fairgarden/monolith`](https://github.com/fairgarden/monolith)
Compose several Next.js apps into a single deployable monolith | 0.1.0-alpha.1 | [44efeb8](https://github.com/fairgarden/monolith/commit/44efeb84cb9a5d6ab595d59d56a49de40cb5eeb8) — unreleased, after v0.1.0-alpha.0 | `packages/monolith` | +| [`@fairgarden/policy`](https://github.com/fairgarden/policy)
An organization's policy as Open Policy Agent bundles: built in layers from the repository, run in process, disclosed to members, every decision recorded | 0.1.0-alpha.0 | [4a51b91](https://github.com/fairgarden/policy/commit/4a51b91ce0c9bcd6fd604a7c8c05942cf6c40fa4) — untagged | `packages/policy` | A module pinned at a commit rather than a tag is being shipped ahead of its last release, so its stated version is not what is deployed. diff --git a/apps/id b/apps/id index c1324f9..0926234 160000 --- a/apps/id +++ b/apps/id @@ -1 +1 @@ -Subproject commit c1324f9ef31340a54c731c40e1ac4b11c4001a18 +Subproject commit 09262342d4bcb386006a2e2b8e37b1eb2a24b52b diff --git a/apps/members b/apps/members index f790068..d08534d 160000 --- a/apps/members +++ b/apps/members @@ -1 +1 @@ -Subproject commit f790068e2802c49128f99764fd911a41630e16c8 +Subproject commit d08534dba6a7607f606762cf8b03eaca420e0e10 diff --git a/packages/design b/packages/design index 64660c5..51c001f 160000 --- a/packages/design +++ b/packages/design @@ -1 +1 @@ -Subproject commit 64660c5904bfa42585b60d5b447bc5a1801a47a2 +Subproject commit 51c001f1435f3415a6e2a10a7ab71641ca7bef28 diff --git a/packages/distribution b/packages/distribution index 9d7816e..7962a00 160000 --- a/packages/distribution +++ b/packages/distribution @@ -1 +1 @@ -Subproject commit 9d7816e8784e4855be4da63f9ce8dcb503660b65 +Subproject commit 7962a00873961e5d1ecafbe085dcd08dd247c0ac diff --git a/packages/indicators b/packages/indicators index 683bb16..1b9c3a6 160000 --- a/packages/indicators +++ b/packages/indicators @@ -1 +1 @@ -Subproject commit 683bb16133238b24bf7d573933fae1d1b8d27d69 +Subproject commit 1b9c3a625688c249df1edfe42e128f3a4c5e8db3 diff --git a/packages/monolith b/packages/monolith index 4d98122..44efeb8 160000 --- a/packages/monolith +++ b/packages/monolith @@ -1 +1 @@ -Subproject commit 4d9812278e0e95fa890870919b86d1f7b80df1a3 +Subproject commit 44efeb84cb9a5d6ab595d59d56a49de40cb5eeb8 diff --git a/packages/policy b/packages/policy index a8707b7..4a51b91 160000 --- a/packages/policy +++ b/packages/policy @@ -1 +1 @@ -Subproject commit a8707b7d4524aaca5f78af0993dd501f14e16b41 +Subproject commit 4a51b91ce0c9bcd6fd604a7c8c05942cf6c40fa4 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f419d07..0fdcdfe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -170,6 +170,12 @@ overrides: '@fairgarden/members': workspace:* '@fairgarden/monolith': workspace:* '@fairgarden/policy': workspace:* + '@fairgarden/policy-docs>@fairgarden/design': ^0.1.0-alpha.2 + '@fairgarden/id-docs>@fairgarden/design': ^0.1.0-alpha.2 + '@fairgarden/members-docs>@fairgarden/design': ^0.1.0-alpha.2 + '@fairgarden/distribution-docs>@fairgarden/design': ^0.1.0-alpha.2 + '@fairgarden/monolith-docs>@fairgarden/design': ^0.1.0-alpha.2 + '@fairgarden/indicators-docs>@fairgarden/design': ^0.1.0-alpha.2 importers: @@ -299,6 +305,15 @@ importers: apps/id/docs: dependencies: + '@base-ui/react': + specifier: ^1.8.0 + version: 1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@fairgarden/design': + specifier: ^0.1.0-alpha.2 + version: 0.1.0-alpha.2(@base-ui/react@1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(@fairgarden/docs@0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3))(@protomaps/basemaps@5.7.2)(@types/react@19.3.0)(maplibre-gl@6.11.1)(pmtiles@4.5.0)(react-dom@19.3.0(react@19.3.0))(react-is@16.13.1)(react@19.3.0)(redux@5.0.1) + '@fairgarden/docs': + specifier: ^0.13.4-canary.18 + version: 0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3) next: specifier: ^16.3.5 version: 16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) @@ -336,6 +351,12 @@ importers: eslint-config-next: specifier: ^16.3.5 version: 16.3.6(@typescript-eslint/parser@8.70.1(eslint@9.39.5(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@9.39.5(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3) + prettier: + specifier: ^3.9.8 + version: 3.9.9 + rehype-slug: + specifier: ^6.0.0 + version: 6.0.0 remark-gfm: specifier: ^4.0.1 version: 4.0.1(supports-color@10.2.2) @@ -439,6 +460,15 @@ importers: apps/members/docs: dependencies: + '@base-ui/react': + specifier: ^1.8.0 + version: 1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@fairgarden/design': + specifier: ^0.1.0-alpha.2 + version: 0.1.0-alpha.2(@base-ui/react@1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(@fairgarden/docs@0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3))(@protomaps/basemaps@5.7.2)(@types/react@19.3.0)(maplibre-gl@6.11.1)(pmtiles@4.5.0)(react-dom@19.3.0(react@19.3.0))(react-is@16.13.1)(react@19.3.0)(redux@5.0.1) + '@fairgarden/docs': + specifier: ^0.13.4-canary.18 + version: 0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3) next: specifier: ^16.3.5 version: 16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) @@ -476,6 +506,12 @@ importers: eslint-config-next: specifier: ^16.3.5 version: 16.3.6(@typescript-eslint/parser@8.70.1(eslint@9.39.5(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@9.39.5(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3) + prettier: + specifier: ^3.9.8 + version: 3.9.9 + rehype-slug: + specifier: ^6.0.0 + version: 6.0.0 remark-gfm: specifier: ^4.0.1 version: 4.0.1(supports-color@10.2.2) @@ -813,6 +849,15 @@ importers: packages/distribution/docs: dependencies: + '@base-ui/react': + specifier: ^1.8.0 + version: 1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@fairgarden/design': + specifier: ^0.1.0-alpha.2 + version: 0.1.0-alpha.2(@base-ui/react@1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(@fairgarden/docs@0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3))(@protomaps/basemaps@5.7.2)(@types/react@19.3.0)(maplibre-gl@6.11.1)(pmtiles@4.5.0)(react-dom@19.3.0(react@19.3.0))(react-is@16.13.1)(react@19.3.0)(redux@5.0.1) + '@fairgarden/docs': + specifier: ^0.13.4-canary.18 + version: 0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3) next: specifier: ^16.3.5 version: 16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) @@ -850,6 +895,15 @@ importers: eslint-config-next: specifier: ^16.3.5 version: 16.3.6(@typescript-eslint/parser@8.70.1(eslint@9.39.5(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@9.39.5(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3) + prettier: + specifier: ^3.9.8 + version: 3.9.9 + rehype-slug: + specifier: ^6.0.0 + version: 6.0.0 + remark-gfm: + specifier: ^4.0.1 + version: 4.0.1(supports-color@10.2.2) typescript: specifier: ^6.0.3 version: 6.0.3 @@ -889,6 +943,15 @@ importers: packages/indicators/docs: dependencies: + '@base-ui/react': + specifier: ^1.8.0 + version: 1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@fairgarden/design': + specifier: ^0.1.0-alpha.2 + version: 0.1.0-alpha.2(@base-ui/react@1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(@fairgarden/docs@0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3))(@protomaps/basemaps@5.7.2)(@types/react@19.3.0)(maplibre-gl@6.11.1)(pmtiles@4.5.0)(react-dom@19.3.0(react@19.3.0))(react-is@16.13.1)(react@19.3.0)(redux@5.0.1) + '@fairgarden/docs': + specifier: ^0.13.4-canary.18 + version: 0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3) '@fairgarden/indicators': specifier: workspace:* version: link:.. @@ -929,6 +992,15 @@ importers: eslint-config-next: specifier: ^16.3.5 version: 16.3.6(@typescript-eslint/parser@8.70.1(eslint@9.39.5(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@9.39.5(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3) + prettier: + specifier: ^3.9.8 + version: 3.9.9 + rehype-slug: + specifier: ^6.0.0 + version: 6.0.0 + remark-gfm: + specifier: ^4.0.1 + version: 4.0.1(supports-color@10.2.2) typescript: specifier: ^6.0.3 version: 6.0.3 @@ -987,6 +1059,15 @@ importers: packages/monolith/docs: dependencies: + '@base-ui/react': + specifier: ^1.8.0 + version: 1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@fairgarden/design': + specifier: ^0.1.0-alpha.2 + version: 0.1.0-alpha.2(@base-ui/react@1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(@fairgarden/docs@0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3))(@protomaps/basemaps@5.7.2)(@types/react@19.3.0)(maplibre-gl@6.11.1)(pmtiles@4.5.0)(react-dom@19.3.0(react@19.3.0))(react-is@16.13.1)(react@19.3.0)(redux@5.0.1) + '@fairgarden/docs': + specifier: ^0.13.4-canary.18 + version: 0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3) next: specifier: ^16.3.5 version: 16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) @@ -1024,6 +1105,15 @@ importers: eslint-config-next: specifier: ^16.3.5 version: 16.3.6(@typescript-eslint/parser@8.70.1(eslint@9.39.5(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@9.39.5(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3) + prettier: + specifier: ^3.9.8 + version: 3.9.9 + rehype-slug: + specifier: ^6.0.0 + version: 6.0.0 + remark-gfm: + specifier: ^4.0.1 + version: 4.0.1(supports-color@10.2.2) typescript: specifier: ^6.0.3 version: 6.0.3 @@ -1067,6 +1157,15 @@ importers: packages/policy/docs: dependencies: + '@base-ui/react': + specifier: ^1.8.0 + version: 1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@fairgarden/design': + specifier: ^0.1.0-alpha.2 + version: 0.1.0-alpha.2(@base-ui/react@1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(@fairgarden/docs@0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3))(@protomaps/basemaps@5.7.2)(@types/react@19.3.0)(maplibre-gl@6.11.1)(pmtiles@4.5.0)(react-dom@19.3.0(react@19.3.0))(react-is@16.13.1)(react@19.3.0)(redux@5.0.1) + '@fairgarden/docs': + specifier: ^0.13.4-canary.18 + version: 0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3) next: specifier: ^16.3.5 version: 16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) @@ -1104,6 +1203,12 @@ importers: eslint-config-next: specifier: ^16.3.5 version: 16.3.6(@typescript-eslint/parser@8.70.1(eslint@9.39.5(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3))(eslint@9.39.5(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2)(typescript@6.0.3) + prettier: + specifier: ^3.9.8 + version: 3.9.9 + rehype-slug: + specifier: ^6.0.0 + version: 6.0.0 remark-gfm: specifier: ^4.0.1 version: 4.0.1(supports-color@10.2.2) @@ -1875,6 +1980,26 @@ packages: resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@fairgarden/design@0.1.0-alpha.2': + resolution: {integrity: sha512-XDKhyeBnaHpeKAmpQQice9ISIEwGeDfLc4uqsOB6l1ZG6g4iTstDWcXDkBc9ZU3JkZsW4RwD7Cbf8j7E0mcVTQ==} + peerDependencies: + '@base-ui/react': ^1.8.0 + '@fairgarden/docs': ^0.13.4-canary.18 + '@protomaps/basemaps': ^5.7.2 + maplibre-gl: ^6.11.1 + pmtiles: ^4.5.0 + react: ^19 + react-dom: ^19 + peerDependenciesMeta: + '@fairgarden/docs': + optional: true + '@protomaps/basemaps': + optional: true + maplibre-gl: + optional: true + pmtiles: + optional: true + '@fairgarden/docs@0.13.4-canary.18': resolution: {integrity: sha512-3DHKz0F8Hp+p7hkcZ3ywo5UoStXLu6x/nd0ZV+76x+4FCtKEQmBmdLXg+YNPWikEokWViF/unl19rJirpFlEyg==} engines: {node: '>=22.18.0'} @@ -6372,6 +6497,27 @@ snapshots: '@eslint/core': 0.17.0 levn: 0.4.1 + '@fairgarden/design@0.1.0-alpha.2(@base-ui/react@1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(@fairgarden/docs@0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@playwright/test@1.63.0)(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3))(@protomaps/basemaps@5.7.2)(@types/react@19.3.0)(maplibre-gl@6.11.1)(pmtiles@4.5.0)(react-dom@19.3.0(react@19.3.0))(react-is@16.13.1)(react@19.3.0)(redux@5.0.1)': + dependencies: + '@base-ui/react': 1.8.0(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0) + '@fontsource-variable/figtree': 5.3.0 + '@fontsource-variable/fraunces': 5.3.0 + '@fontsource-variable/source-serif-4': 5.3.0 + '@fontsource/ibm-plex-mono': 5.3.0 + class-variance-authority: 0.7.1 + react: 19.3.0 + react-dom: 19.3.0(react@19.3.0) + recharts: 3.10.1(@types/react@19.3.0)(react-dom@19.3.0(react@19.3.0))(react-is@16.13.1)(react@19.3.0)(redux@5.0.1) + optionalDependencies: + '@fairgarden/docs': 0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3) + '@protomaps/basemaps': 5.7.2 + maplibre-gl: 6.11.1 + pmtiles: 4.5.0 + transitivePeerDependencies: + - '@types/react' + - react-is + - redux + '@fairgarden/docs@0.13.4-canary.18(@types/react@19.3.0)(next@16.3.6(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.2)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))(prettier@3.9.9)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(supports-color@10.2.2)(typescript@6.0.3)': dependencies: '@babel/runtime': 7.29.7 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index a8ca567..57cb4d0 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -15,6 +15,7 @@ allowBuilds: minimumReleaseAgeExclude: - '@fairgarden/docs@0.13.4-canary.18' + - '@fairgarden/design@0.1.0-alpha.2' # fg:overrides # A distribution uses its own checkouts, whatever version they are at. The @@ -28,4 +29,12 @@ overrides: "@fairgarden/members": "workspace:*" "@fairgarden/monolith": "workspace:*" "@fairgarden/policy": "workspace:*" + # The docs sites are built on the published design system, not this + # checkout of it. fg-dist keeps these lines when it rewrites the block. + "@fairgarden/policy-docs>@fairgarden/design": "^0.1.0-alpha.2" + "@fairgarden/id-docs>@fairgarden/design": "^0.1.0-alpha.2" + "@fairgarden/members-docs>@fairgarden/design": "^0.1.0-alpha.2" + "@fairgarden/distribution-docs>@fairgarden/design": "^0.1.0-alpha.2" + "@fairgarden/monolith-docs>@fairgarden/design": "^0.1.0-alpha.2" + "@fairgarden/indicators-docs>@fairgarden/design": "^0.1.0-alpha.2" # fg:overrides:end