Skip to content

Commit

Permalink
Merge branch 'next' into corel
Browse files Browse the repository at this point in the history
* next: (37 commits)
  v3.65.0
  fix(deps): update dependency @sanity/insert-menu to v1.0.13 (#7880)
  fix(deps): update dependency @sanity/presentation to v1.18.5 (#7881)
  fix(deps): Update dev-non-major (#7875)
  fix(deps): update dependency @sanity/ui to ^2.8.25 (#7876)
  fix(telemetry): log (well known) workspace and dataset names (#7859)
  fix(deps): update dependency @portabletext/editor to ^1.11.3 (#7865)
  fix(deps): update dependency react-rx to ^4.1.7 (#7874)
  chore(deps): dedupe pnpm-lock.yaml (#7873)
  chore(ci): max react compiler warnings are now 79
  fix(deps): update React Compiler dependencies 🤖 ✨ (#7872)
  fix(core): discard announcements dialog onClickOutside (#7863)
  feat(structure): History UI updates (#7462)
  chore(cli): temporarily disable telemetry tests (#7845)
  chore(deps): update dependency turbo to ^2.3.0 (#7846)
  chore(lockfile): update dependency @sanity/asset-utils to v2.2.0 (#7847)
  chore(lockfile): update dependency react-focus-lock to v2.13.2 (#7848)
  feat: add support for React Compiler beta (#7702)
  v3.64.3
  fix(deps): update dependency @portabletext/editor to ^1.11.1 (#7861)
  ...
  • Loading branch information
bjoerge committed Nov 26, 2024
2 parents 027aabf + 76d18ea commit 3e700a8
Show file tree
Hide file tree
Showing 107 changed files with 2,182 additions and 1,005 deletions.
4 changes: 3 additions & 1 deletion .depcheckrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"@sanity/eslint-config-studio",
"dotenv-flow",
"esbuild",
"esbuild-register"
"esbuild-register",
"react-compiler-runtime",
"babel-plugin-react-compiler"
]
}
48 changes: 48 additions & 0 deletions .github/workflows/react-compiler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Maintain React Compiler

on:
schedule:
- cron: "10 12 * * 1" # Runs at 12:10 PM UTC every Monday, which is 3 hours after the React Compiler release: https://github.com/facebook/react/blob/989af12f72080c17db03ead91d99b6394a215564/.github/workflows/compiler_prereleases_weekly.yml#L5-L6
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}
cancel-in-progress: true

permissions:
contents: read # for checkout

jobs:
run:
name: Should React Compiler dependencies be updated? 🤔
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
cache: pnpm
node-version: lts/*
- run: pnpm -r up --ignore-scripts react-compiler-runtime@beta babel-plugin-react-compiler@beta eslint-plugin-react-compiler@beta
- uses: actions/create-github-app-token@v1
id: generate-token
with:
app-id: ${{ secrets.ECOSPARK_APP_ID }}
private-key: ${{ secrets.ECOSPARK_APP_PRIVATE_KEY }}
- id: check-changes
run: |
if git diff --name-only | grep -q 'package.json'; then
echo "changed=true" >> $GITHUB_OUTPUT
else
echo "changed=false" >> $GITHUB_OUTPUT
fi
- if: steps.check-changes.outputs.changed == 'true'
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7
with:
body: I ran `pnpm -r up react-compiler-runtime@beta babel-plugin-react-compiler@beta eslint-plugin-react-compiler@beta` 🧑‍💻
branch: actions/react-compiler
commit-message: "fix(deps): update react compiler dependencies 🤖 ✨"
labels: 🤖 bot
sign-commits: true
title: "fix(deps): update React Compiler dependencies 🤖 ✨"
token: ${{ steps.generate-token.outputs.token }}
2 changes: 1 addition & 1 deletion dev/depcheck-test/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "depcheck-test",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>"
Expand Down
4 changes: 2 additions & 2 deletions dev/design-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "design-studio",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"description": "Sanity Design Studio",
"keywords": [
Expand Down Expand Up @@ -32,7 +32,7 @@
},
"dependencies": {
"@sanity/icons": "^3.4.0",
"@sanity/ui": "^2.8.23",
"@sanity/ui": "^2.8.25",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sanity": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions dev/embedded-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "embedded-studio",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"scripts": {
"build": "tsc && vite build && sanity manifest extract",
"dev": "vite",
"preview": "vite preview"
},
"dependencies": {
"@sanity/ui": "^2.8.23",
"@sanity/ui": "^2.8.25",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sanity": "workspace:*",
Expand Down
4 changes: 3 additions & 1 deletion dev/page-building-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sanity-page-building-studio",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -13,7 +13,9 @@
},
"dependencies": {
"@sanity/vision": "workspace:*",
"babel-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
"react": "^18.2.0",
"react-compiler-runtime": "19.0.0-beta-df7b47d-20241124",
"react-dom": "^18.2.0",
"react-icons": "^5.2.1",
"sanity": "workspace:*",
Expand Down
1 change: 1 addition & 0 deletions dev/page-building-studio/sanity.cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ export default defineCliConfig({
projectId: 'ppsg7ml5',
dataset: 'page-building',
},
reactCompiler: {target: '18'},
})
2 changes: 1 addition & 1 deletion dev/starter-next-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sanity-starter-next-studio",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand Down
4 changes: 3 additions & 1 deletion dev/starter-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sanity-starter-studio",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -12,7 +12,9 @@
"start": "../.bin/sanity start --port 3337"
},
"dependencies": {
"babel-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
"react": "^18.3.1",
"react-compiler-runtime": "19.0.0-beta-df7b47d-20241124",
"react-dom": "^18.3.1",
"sanity": "workspace:*",
"styled-components": "^6.1.0"
Expand Down
1 change: 1 addition & 0 deletions dev/starter-studio/sanity.cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ export default defineCliConfig({
projectId: 'ppsg7ml5',
dataset: 'test',
},
reactCompiler: {target: '18'},
})
2 changes: 1 addition & 1 deletion dev/strict-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sanity-strict-studio",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand Down
8 changes: 5 additions & 3 deletions dev/studio-e2e-testing/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "studio-e2e-testing",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"keywords": [
"sanity"
Expand All @@ -17,9 +17,11 @@
"dependencies": {
"@sanity/google-maps-input": "^4.0.0",
"@sanity/icons": "^3.4.0",
"@sanity/ui": "^2.8.23",
"@sanity/vision": "3.64.1",
"@sanity/ui": "^2.8.25",
"@sanity/vision": "3.65.0",
"babel-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
"react": "^18.3.1",
"react-compiler-runtime": "19.0.0-beta-df7b47d-20241124",
"react-dom": "^18.3.1",
"sanity": "workspace:*",
"sanity-plugin-media": "^2.3.1",
Expand Down
1 change: 1 addition & 0 deletions dev/studio-e2e-testing/sanity.cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export default defineCliConfig({
projectId: process.env.SANITY_E2E_PROJECT_ID,
dataset: process.env.SANITY_E2E_DATASET,
},
reactCompiler: {target: '18'},
vite: {
define: {
'process.env.SANITY_E2E_PROJECT_ID': JSON.stringify(process.env.SANITY_E2E_PROJECT_ID),
Expand Down
2 changes: 1 addition & 1 deletion dev/test-create-integration-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "test-create-integration-studio",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand Down
6 changes: 2 additions & 4 deletions dev/test-next-studio/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ function requireResolve(id) {
return import.meta.resolve(id).replace('file://', '')
}

const reactCompiler = process.env.REACT_COMPILER === 'true'
const reactProductionProfiling = process.env.REACT_PRODUCTION_PROFILING === 'true'
const productionBrowserSourceMaps = reactCompiler || reactProductionProfiling

// eslint-disable-next-line tsdoc/syntax
/** @type {import('next').NextConfig} */
Expand Down Expand Up @@ -86,10 +84,10 @@ const config = {
},
// Makes it much easier to see which component got memoized by the react compiler
// when testing on https://test-next-studio.sanity.build
productionBrowserSourceMaps,
productionBrowserSourceMaps: reactProductionProfiling,
reactProductionProfiling,
experimental: {
reactCompiler,
reactCompiler: true,
turbo: {
resolveAlias: {
'@sanity/block-tools': '@sanity/block-tools/src/index.ts',
Expand Down
10 changes: 5 additions & 5 deletions dev/test-next-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sanity-test-next-studio",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -12,11 +12,11 @@
},
"dependencies": {
"@sanity/vision": "workspace:*",
"babel-plugin-react-compiler": "beta",
"babel-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
"next": "15.0.3",
"react": "19.0.0-rc-a7d1240c-20240731",
"react-dom": "19.0.0-rc-a7d1240c-20240731",
"react-is": "19.0.0-rc-a7d1240c-20240731",
"react": "rc",
"react-dom": "rc",
"react-is": "rc",
"sanity": "workspace:*",
"sanity-test-studio": "workspace:*",
"styled-components": "^6.1.12",
Expand Down
2 changes: 1 addition & 1 deletion dev/test-next-studio/turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"extends": ["//"],
"tasks": {
"build": {
"env": ["REACT_COMPILER", "REACT_PRODUCTION_PROFILING"],
"env": ["REACT_PRODUCTION_PROFILING"],
"outputs": [".next/**", "!.next/cache/**", "out/**"],
"dependsOn": ["^build"]
},
Expand Down
3 changes: 2 additions & 1 deletion dev/test-studio/.depcheckignore.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"@sanity/preview-url-secret",
"@sanity/react-loader",
"@sanity/visual-editing",
"@vercel/stega"
"@vercel/stega",
"babel-plugin-react-compiler"
]
}
16 changes: 9 additions & 7 deletions dev/test-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sanity-test-studio",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -16,11 +16,11 @@
"workshop:dev": "node -r esbuild-register scripts/workshop/dev.ts"
},
"dependencies": {
"@portabletext/editor": "^1.8.0",
"@portabletext/editor": "^1.11.3",
"@portabletext/react": "^3.0.0",
"@sanity/assist": "^3.0.2",
"@sanity/block-tools": "3.64.1",
"@sanity/client": "^6.22.4",
"@sanity/block-tools": "3.65.0",
"@sanity/client": "^6.22.5",
"@sanity/color": "^3.0.0",
"@sanity/google-maps-input": "^4.0.0",
"@sanity/icons": "^3.4.0",
Expand All @@ -34,14 +34,14 @@
"@sanity/migrate": "workspace:*",
"@sanity/preview-url-secret": "^2.0.0",
"@sanity/react-loader": "^1.8.3",
"@sanity/tsdoc": "1.0.131",
"@sanity/tsdoc": "1.0.134",
"@sanity/types": "workspace:*",
"@sanity/ui": "^2.8.23",
"@sanity/ui": "^2.8.25",
"@sanity/ui-workshop": "^1.0.0",
"@sanity/util": "workspace:*",
"@sanity/uuid": "^3.0.1",
"@sanity/vision": "workspace:*",
"@sanity/visual-editing": "2.7.0",
"@sanity/visual-editing": "2.8.0",
"@turf/helpers": "^6.0.1",
"@turf/points-within-polygon": "^5.1.5",
"@vercel/stega": "0.1.2",
Expand All @@ -51,6 +51,7 @@
"lodash": "^4.17.21",
"qs": "^6.10.2",
"react": "^18.3.1",
"react-compiler-runtime": "19.0.0-beta-df7b47d-20241124",
"react-dom": "^18.3.1",
"react-refractor": "^2.1.6",
"refractor": "^3.6.0",
Expand All @@ -62,6 +63,7 @@
"styled-components": "^6.1.11"
},
"devDependencies": {
"babel-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
"chokidar": "^3.6.0",
"vite": "^4.5.5"
},
Expand Down
1 change: 1 addition & 0 deletions dev/test-studio/sanity.cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export default defineCliConfig({
// A) `SANITY_STUDIO_REACT_STRICT_MODE=false pnpm dev`
// B) creating a `.env` file locally that sets the same env variable as above
reactStrictMode: true,
reactCompiler: {target: '18'},
vite(viteConfig: UserConfig): UserConfig {
const reactProductionProfiling = process.env.REACT_PRODUCTION_PROFILING === 'true'

Expand Down
2 changes: 1 addition & 1 deletion examples/blog-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "blog-studio",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"description": "Content studio running with schema from the blog init template",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion examples/clean-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clean-studio",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"description": "Content studio running with schema from the clean template",
"keywords": [
Expand Down
6 changes: 3 additions & 3 deletions examples/ecommerce-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ecommerce-studio",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"description": "",
"keywords": [
Expand Down Expand Up @@ -29,8 +29,8 @@
"start": "sanity dev --port 3337"
},
"dependencies": {
"@sanity/cli": "3.64.1",
"@sanity/ui": "^2.8.23",
"@sanity/cli": "3.65.0",
"@sanity/ui": "^2.8.25",
"react": "^18.3.1",
"react-barcode": "^1.4.1",
"react-dom": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/movies-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "movies-studio",
"version": "3.64.1",
"version": "3.65.0",
"private": true,
"description": "Content studio running with schema from the moviedb init template",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
"packages/groq",
"packages/sanity"
],
"version": "3.64.1"
"version": "3.65.0"
}
Loading

0 comments on commit 3e700a8

Please sign in to comment.