Skip to content

Commit

Permalink
Merge branch 'next' into tommy/testbench-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jtpetty authored Oct 13, 2023
2 parents 4a77787 + 2001ced commit 46ee28b
Show file tree
Hide file tree
Showing 55 changed files with 1,087 additions and 971 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/depCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
timeout-minutes: 30
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docReport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache node modules
id: cache-node-modules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docReportTeardown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache node modules
id: cache-node-modules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-ct.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/etl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache node modules
id: cache-node-modules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/formatCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
timeout-minutes: 30
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-fix-if-needed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# workflow_dispatch always lets you select the branch ref, even though in this case we only ever want to run the action on `main` thus we need an if check
if: ${{ github.ref_name == 'next' }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: lts/*
Expand All @@ -45,7 +45,7 @@ jobs:
path: .eslintcache
key: eslint-v1-${{ hashFiles('.eslintrc.cjs') }}
- run: "yarn lint:fix --rule 'prettier/prettier: [off]'"
- uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92 # v1
- uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2
# Run even if `yarn lint:fix` fails
if: always()
id: generate-token
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lintChanged.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache node modules
id: cache-node-modules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
if: github.event_name == 'deployment_status' && github.event.deployment.environment == 'production' && github.event.deployment_status.state == 'success' && startsWith(github.event.deployment_status.target_url, 'https://performance-studio')
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prettier-if-needed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# workflow_dispatch always lets you select the branch ref, even though in this case we only ever want to run the action on `main` thus we need an if check
if: ${{ github.ref_name == 'next' }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: lts/*
Expand All @@ -47,7 +47,7 @@ jobs:
- run: yarn prettier --write
- name: GitHub blocks PRs from automation that alter workflows in any way
run: git restore .github/workflows yarn.lock
- uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92 # v1
- uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2
id: generate-token
with:
app_id: ${{ secrets.ECOSPARK_APP_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typeCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/yarn-if-needed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
# workflow_dispatch always lets you select the branch ref, even though in this case we only ever want to run the action on `main` thus we need an if check
if: ${{ github.ref_name == 'next' }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Cache node modules
id: cache-node-modules
uses: actions/cache@v3
Expand All @@ -39,7 +39,7 @@ jobs:
if: steps.cache-node-modules.outputs.cache-hit != 'true'
run: yarn install --ignore-scripts --frozen-lockfile --update-checksums --force
- run: npx yarn-deduplicate -- yarn.lock --strategy highest
- uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92 # v1
- uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2
id: generate-token
with:
app_id: ${{ secrets.ECOSPARK_APP_ID }}
Expand Down
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.16.7",
"version": "3.18.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.16.7",
"version": "3.18.0",
"private": true,
"description": "Sanity Design Studio",
"keywords": [
Expand Down Expand Up @@ -34,7 +34,7 @@
"@sanity/ui": "^1.7.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sanity": "3.16.7",
"sanity": "3.18.0",
"styled-components": "^5.2.0"
}
}
4 changes: 2 additions & 2 deletions dev/starter-cra-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "starter-cra-studio",
"version": "3.16.7",
"version": "3.18.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -25,7 +25,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-scripts": "^5.0.0",
"sanity": "3.16.7",
"sanity": "3.18.0",
"styled-components": "^5.2.0"
}
}
4 changes: 2 additions & 2 deletions 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.16.7",
"version": "3.18.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -14,7 +14,7 @@
"next": "^12.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sanity": "3.16.7",
"sanity": "3.18.0",
"styled-components": "^5.2.0"
}
}
4 changes: 2 additions & 2 deletions 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.16.7",
"version": "3.18.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -12,7 +12,7 @@
},
"dependencies": {
"react": "^18.2.0",
"sanity": "3.16.7",
"sanity": "3.18.0",
"styled-components": "^5.2.0"
}
}
4 changes: 2 additions & 2 deletions 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.16.7",
"version": "3.18.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -13,7 +13,7 @@
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sanity": "3.16.7",
"sanity": "3.18.0",
"styled-components": "^5.2.0"
}
}
4 changes: 2 additions & 2 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.16.7",
"version": "3.18.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -14,7 +14,7 @@
"next": "^13.2.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sanity": "3.16.7",
"sanity": "3.18.0",
"styled-components": "^5.2.0"
}
}
16 changes: 8 additions & 8 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.16.7",
"version": "3.18.0",
"private": true,
"license": "MIT",
"author": "Sanity.io <[email protected]>",
Expand All @@ -20,19 +20,19 @@
"@react-three/drei": "^9.80.1",
"@react-three/fiber": "^8.13.6",
"@sanity/assist": "^1.0.8",
"@sanity/block-tools": "3.16.7",
"@sanity/block-tools": "3.18.0",
"@sanity/color": "^2.1.20",
"@sanity/google-maps-input": "^3.0.1",
"@sanity/icons": "^2.4.0",
"@sanity/image-url": "^1.0.2",
"@sanity/portable-text-editor": "3.16.7",
"@sanity/portable-text-editor": "3.18.0",
"@sanity/tsdoc": "1.0.0-alpha.38",
"@sanity/types": "3.16.7",
"@sanity/types": "3.18.0",
"@sanity/ui": "^1.7.2",
"@sanity/ui-workshop": "^1.0.0",
"@sanity/util": "3.16.7",
"@sanity/util": "3.18.0",
"@sanity/uuid": "^3.0.1",
"@sanity/vision": "3.16.7",
"@sanity/vision": "3.18.0",
"@turf/helpers": "^6.0.1",
"@turf/points-within-polygon": "^5.1.5",
"@types/three": "^0.150.0",
Expand All @@ -48,10 +48,10 @@
"react-refractor": "^2.1.6",
"refractor": "^3.6.0",
"rxjs": "^7.8.0",
"sanity": "3.16.7",
"sanity": "3.18.0",
"sanity-plugin-mux-input": "^2.2.1",
"styled-components": "^5.2.0",
"three": "^0.155.0",
"three": "^0.157.0",
"three-stdlib": "^2.24.2"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/blog-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "blog-studio",
"version": "3.16.7",
"version": "3.18.0",
"private": true,
"description": "Content studio running with schema from the blog init template",
"keywords": [
Expand Down Expand Up @@ -29,7 +29,7 @@
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sanity": "3.16.7",
"sanity": "3.18.0",
"styled-components": "^5.2.0"
}
}
4 changes: 2 additions & 2 deletions examples/clean-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clean-studio",
"version": "3.16.7",
"version": "3.18.0",
"private": true,
"description": "Content studio running with schema from the clean template",
"keywords": [
Expand Down Expand Up @@ -29,7 +29,7 @@
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sanity": "3.16.7",
"sanity": "3.18.0",
"styled-components": "^5.2.0"
}
}
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.16.7",
"version": "3.18.0",
"private": true,
"description": "",
"keywords": [
Expand Down Expand Up @@ -28,12 +28,12 @@
"start": "sanity dev --port 3337"
},
"dependencies": {
"@sanity/cli": "3.16.7",
"@sanity/cli": "3.18.0",
"@sanity/ui": "^1.7.2",
"react": "^18.2.0",
"react-barcode": "^1.4.1",
"react-dom": "^18.2.0",
"sanity": "3.16.7",
"sanity": "3.18.0",
"styled-components": "^5.2.0"
}
}
4 changes: 2 additions & 2 deletions examples/movies-studio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "movies-studio",
"version": "3.16.7",
"version": "3.18.0",
"private": true,
"description": "Content studio running with schema from the moviedb init template",
"keywords": [
Expand Down Expand Up @@ -31,7 +31,7 @@
"@sanity/google-maps-input": "^3.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sanity": "3.16.7",
"sanity": "3.18.0",
"styled-components": "^5.2.0"
}
}
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"packages/groq",
"packages/sanity"
],
"version": "3.16.7"
"version": "3.18.0"
}
Loading

0 comments on commit 46ee28b

Please sign in to comment.