-
Notifications
You must be signed in to change notification settings - Fork 4
feat(workbench): rebase onto main #1110
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
c47e68c
feat: workbench dev server (#770)
gu-stav bfb48f8
feat(dev): forward CLI config organization id to workbench runtime (#…
gu-stav b5c11d0
feat: add federation vite plugin (#826)
joshuaellis 94e946c
feat: improve warmup files when federation is enabled (#906)
joshuaellis d6481c8
fix: update lockfile
gu-stav 2964984
feat(dev): enable react-refresh for shared dev-server HMR [SDK-1187] …
joshuaellis a6c01d8
chore(deps): bump @sanity/federation from 0.1.0-alpha.2 to 0.1.0-alpha.3
gu-stav 3c630cd
fix(workbench): require `sanity/workbench` and no `@sanity/workbench`…
gu-stav ab7cd8a
feat(federation): pass additional props to federation plugin (#918)
joshuaellis bc7d3c6
chore: add changeset for cli-core
joshuaellis 9a96153
fix(dev): disable strict ports for applications (#930)
gu-stav fba09f5
ci: auto-release dist tag for feature branch (#931)
gu-stav 1cd3a9b
feat(workbench): support only running one workbench instance and find…
joshuaellis 4babd9d
fix: remove load-in-dashboard flag from dev command
joshuaellis 86a1e3f
fix(workbench): propagate staging env to workbench dev server (#964)
joshuaellis 6810b9a
fix: update snapshot release workflow (#965)
gu-stav a8d7c08
chore(workflow): ensure we NEVER have the ability to do PROD release
joshuaellis a9b1567
fix(workbench): externalize sanity and @sanity/workbench (#971)
gu-stav 4a0d4c7
fix(workbench): use the same clock for workbench lock (#972)
gu-stav 8e50a77
fix(federation): align fixture react/styled-components with main
joshuaellis fa6fdcd
feat(workbench): resolve organization id from project [SDK-1277] (#973)
joshuaellis 1ef26fa
feat(init): add promt for federation (#988)
gu-stav 03e3a39
fix(init): types for federation prompt (#989)
gu-stav 8e8ea3d
chore(cli): bump @sanity/federation to 0.1.0-alpha.6 (#990)
joshuaellis 5b982eb
feat(workbench): extend local application payloads (#987)
gu-stav bc66408
feat(init): use `workbench` dist-tag for `sanity` package (#992)
gu-stav 7f496fb
fix(init): do not resolve dist tags (#1000)
gu-stav cec3c8c
feat(dev): extract manifests for local applications (#997)
gu-stav c5a21e6
fix: recover workbench rebase
gu-stav cb5dbca
fix: update lockfile
gu-stav 5cdbbae
fix(cli): apply user vite config to federation builds [SDK-1281] (#1005)
joshuaellis 0987f92
fix(workbench): remove warmup for dependencies (#1047)
gu-stav 4418327
fix: pass `--no-federation` to all e2e tests
gu-stav e5e92de
feat(init): add --federation CLI flag
gu-stav 26c89ac
fix(workbench): prune stale lock files (#1057)
gu-stav de55f71
refactor: reorganise branch additions in a coherent way (#1064)
joshuaellis e484b23
fix(workbench): throw error on invalid `SANITY_INTERNAL_WORKBENCH_REM…
gu-stav 773e0a2
fix(workbench): detect PID reuse on Windows via PowerShell (#1067)
gu-stav 98596ad
fix: post-rebase compile + test fixes
gu-stav 007a278
chore: regenerate pnpm-lock.yaml after rebase
gu-stav fcf69a8
chore: apply formatting
gu-stav File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@sanity/cli": patch | ||
| --- | ||
|
|
||
| bump @sanity/federation to 0.1.0-alpha.6 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@sanity/cli-core': minor | ||
| --- | ||
|
|
||
| Add federation to CLI config |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@sanity/cli": patch | ||
| --- | ||
|
|
||
| externalize sanity and @sanity/workbench |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| do not resolve dist tags |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| apply user vite config to federation builds [SDK-1281] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli-core': patch | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| watch for changes of the cli config file |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| forward CLI project id for local applications |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| fix(workbench): add `__mf__temp` directory to .gitignore |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| perf(workbench): preload workbench and warmup dev-server files |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| fix(workbench): remove warmup for dependencies |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| fix(workbench): prune stale lock files |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| fix(workbench): throw error on invalid `SANITY_INTERNAL_WORKBENCH_REMOTE_URL` |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| fix(workbench): detect PID reuse on Windows via PowerShell |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@sanity/cli': minor | ||
| --- | ||
|
|
||
| Enforce single workbench instance with dev-server registry, fix PID-reuse detection and signal cleanup |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@sanity/cli': minor | ||
| --- | ||
|
|
||
| Support passing organization ID to the workbench dev server |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| Prevent dev server from failing to start when the default port is already in use |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| propagate staging env to workbench dev server |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| use the same clock for workbench locks |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': minor | ||
| --- | ||
|
|
||
| add promt for federation |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': patch | ||
| --- | ||
|
|
||
| types for federation promt |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': minor | ||
| --- | ||
|
|
||
| use `workbench` dist-tag for `sanity` package |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <!-- auto-generated --> | ||
| --- | ||
| '@sanity/cli': minor | ||
| --- | ||
|
|
||
| extract manifests for local applications |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@sanity/cli': minor | ||
| --- | ||
|
|
||
| Resolve the workbench organization ID from the configured project when `app.organizationId` is not set in the CLI config |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@sanity/cli': minor | ||
| --- | ||
|
|
||
| Workbench now displays each local application's title and icon and can match local applications to their remote counterparts by ID. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. | ||
|
|
||
| # Dependencies | ||
| /node_modules | ||
| /.pnp | ||
| .pnp.js | ||
|
|
||
| # Compiled Sanity Studio | ||
| /dist | ||
|
|
||
| # Temporary Sanity runtime, generated by the CLI on every dev server start | ||
| /.sanity | ||
|
|
||
| # Logs | ||
| /logs | ||
| *.log | ||
|
|
||
| # Coverage directory used by testing tools | ||
| /coverage | ||
|
|
||
| # Misc | ||
| .DS_Store | ||
| *.pem | ||
|
|
||
| # Typescript | ||
| *.tsbuildinfo | ||
|
|
||
| # Dotenv and similar local-only files | ||
| *.local | ||
|
|
||
| .__mf__temp |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| { | ||
| "name": "federated-studio", | ||
| "version": "1.0.0", | ||
| "private": true, | ||
| "keywords": [ | ||
| "sanity" | ||
| ], | ||
| "license": "MIT", | ||
| "type": "module", | ||
| "scripts": { | ||
| "dev": "sanity dev", | ||
| "build:fixture": "sanity build" | ||
| }, | ||
| "dependencies": { | ||
| "react": "^19.2.5", | ||
| "react-dom": "^19.2.5", | ||
| "sanity": "catalog:", | ||
| "styled-components": "^6.4.0" | ||
| }, | ||
| "devDependencies": { | ||
| "@types/react": "^19.2.14", | ||
| "typescript": "^5.9.3" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import {defineCliConfig} from 'sanity/cli' | ||
|
|
||
| export default defineCliConfig({ | ||
| api: { | ||
| dataset: 'test', | ||
| projectId: 'ppsg7ml5', | ||
| }, | ||
| deployment: { | ||
| autoUpdates: true, | ||
| }, | ||
| federation: { | ||
| enabled: true, | ||
| }, | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import {defineConfig} from 'sanity' | ||
| import {structureTool} from 'sanity/structure' | ||
|
|
||
| import {schemaTypes} from './schemaTypes' | ||
|
|
||
| export default defineConfig({ | ||
| title: 'Basic Studio', | ||
|
|
||
| dataset: 'test', | ||
| projectId: 'ppsg7ml5', | ||
|
|
||
| plugins: [structureTool()], | ||
|
|
||
| schema: { | ||
| types: schemaTypes, | ||
| }, | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export const schemaTypes = [] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "compilerOptions": { | ||
| "target": "ES2017", | ||
| "lib": ["dom", "dom.iterable", "esnext"], | ||
| "allowJs": true, | ||
| "skipLibCheck": true, | ||
| "strict": true, | ||
| "forceConsistentCasingInFileNames": true, | ||
| "module": "Preserve", | ||
| "moduleDetection": "force", | ||
| "isolatedModules": true, | ||
| "jsx": "preserve", | ||
| "incremental": true | ||
| }, | ||
| "include": ["**/*.ts", "**/*.tsx"], | ||
| "exclude": ["node_modules"] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Snapshot publish ignores user-provided dist-tag input
Medium Severity
The
pnpm changeset publishcommand hardcodes--tag "workbench"instead of using the$DIST_TAGenvironment variable (which is still set frominputs.tagon the next line). Anyworkflow_dispatchinvocation with a custom tag value will be silently ignored, and packages will always be published under theworkbenchdist-tag. TheforceBumpinput definition also remains but all steps that referenced it were removed, making it dead configuration.Additional Locations (1)
.github/workflows/snapshot-release.yml#L76-L77Reviewed by Cursor Bugbot for commit 007a278. Configure here.