sanity-io · bjoerge · Mar 12, 2024 · Mar 12, 2024 · Mar 12, 2024 · Mar 12, 2024
@@ -70,7 +70,7 @@ jobs:
         run: npx playwright install --with-deps
 
       - name: Build CLI
-        run: pnpm build:cli
+        run: pnpm build
 
       - name: Build E2E test studio on next
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/next' }}

@@ -46,4 +46,4 @@ jobs:
         run: pnpm install
 
       - name: Run format check
-        run: pnpm turbo run check:format
+        run: pnpm check:format
@@ -17,7 +17,7 @@
     "@sanity/google-maps-input": "^3.0.1",
     "@sanity/icons": "^2.11.0",
     "@sanity/ui": "^2.0.10",
-    "@sanity/vision": "3.32.0",
+    "@sanity/vision": "workspace:*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-is": "^18.2.0",

@@ -21,7 +21,7 @@
     "@react-three/drei": "^9.80.1",
     "@react-three/fiber": "^8.13.6",
     "@sanity/assist": "^2.0.0",
-    "@sanity/block-tools": "3.32.0",
+    "@sanity/block-tools": "workspace:*",
     "@sanity/client": "^6.15.4",
     "@sanity/color": "^3.0.0",
     "@sanity/google-maps-input": "^3.0.1",

@@ -29,7 +29,7 @@
     "start": "sanity dev --port 3337"
   },
   "dependencies": {
-    "@sanity/cli": "3.32.0",
+    "@sanity/cli": "workspace:*",
     "@sanity/ui": "^2.0.10",
     "react": "^18.2.0",
     "react-barcode": "^1.4.1",

@@ -4,23 +4,24 @@
   "private": true,
   "scripts": {
     "bootstrap": "pnpm install && pnpm build:dts && pnpm build:cli",
-    "build": "turbo run build --filter='./packages/*' --filter='./packages/@sanity/*'",
+    "build": "pnpm --filter='./packages/*' --filter='./packages/@sanity/*' build",
     "build:clean": "lerna run clean",
-    "build:cli": "turbo run build --filter=@sanity/cli --filter=sanity",
-    "build:cli-only": "turbo run --filter=@sanity/cli build",
+    "build:cli": "pnpm --filter=@sanity/cli --filter=sanity build",
+    "build:cli-only": "pnpm --filter=@sanity/cli build",
     "build:dts": "tsc --build tsconfig.lib.json",
     "build:e2e": "pnpm e2e:build",
-    "build:performance-studio": "pnpm perf:studio:build",
-    "build:test-studio": "pnpm build --filter=sanity-test-studio",
+    "build:performance-studio": "run-s build perf:studio:build",
+    "build:test-studio:only": "pnpm run --filter=sanity-test-studio build",
+    "build:test-studio": "run-s build build:test-studio:only",
     "check": "npm-run-all build --parallel check:*",
     "check:deps": "pnpm --recursive --parallel exec depcheck",
     "check:format": "prettier . --check",
-    "check:lint": "turbo run lint -- --quiet",
+    "check:lint": "eslint --quiet .",
     "check:react-exhaustive-deps": "run-s check:lint -- --quiet --rule 'react-hooks/exhaustive-deps: [error, {additionalHooks: \"(useAsync|useMemoObservable|useObservableCallback)\"}]'",
     "check:test": "run-s test -- --silent",
     "check:types": "tsc --build",
     "chore:format:fix": "prettier --cache --write .",
-    "chore:lint:fix": "turbo run lint -- --quiet --fix",
+    "chore:lint:fix": "eslint --quiet --fix .",
     "chore:normalize-versions": "node -r esbuild-register scripts/normalizeDependencyVersions.ts",
     "clean": "run-s build:clean clean:deps",
     "clean:deps": "rimraf packages/@sanity/*/node_modules packages/*/node_modules node_modules",
@@ -148,8 +149,7 @@
     "rxjs": "^7.8.1",
     "sanity": "workspace:*",
     "semver": "^7.3.5",
-    "turbo": "^1.12.4",
-    "typescript": "5.3.3",
+    "typescript": "^5.4.2",
     "yargs": "^17.3.0"
   },
   "optionalDependencies": {

@@ -60,8 +60,8 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@sanity/schema": "3.32.0",
-    "@sanity/types": "3.32.0",
+    "@sanity/schema": "workspace:*",
+    "@sanity/types": "workspace:*",
     "@types/jsdom": "^20.0.0",
     "@types/lodash": "^4.14.149",
     "@types/react": "^18.2.37",

@@ -64,7 +64,7 @@
   "dependencies": {
     "@babel/traverse": "^7.23.5",
     "@sanity/telemetry": "^0.7.6",
-    "@sanity/util": "3.32.0",
+    "@sanity/util": "workspace:*",
     "chalk": "^4.1.2",
     "decompress": "^4.2.0",
     "esbuild": "^0.19.8",

@@ -31,7 +31,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@sanity/util": "3.32.0",
+    "@sanity/util": "workspace:*",
     "archiver": "^7.0.0",
     "debug": "^4.3.4",
     "get-it": "^8.4.11",

@@ -32,7 +32,7 @@
   ],
   "dependencies": {
     "@sanity/client": "^6.15.4",
-    "@sanity/import": "3.32.0",
+    "@sanity/import": "workspace:*",
     "get-it": "^8.4.11",
     "meow": "^9.0.0",
     "ora": "^5.4.1",

@@ -34,7 +34,7 @@
   "dependencies": {
     "@sanity/asset-utils": "^1.2.5",
     "@sanity/generate-help-url": "^3.0.0",
-    "@sanity/mutator": "3.32.0",
+    "@sanity/mutator": "workspace:*",
     "@sanity/uuid": "^3.0.1",
     "debug": "^4.3.4",
     "file-url": "^2.0.2",

@@ -65,8 +65,8 @@
   "dependencies": {
     "@bjoerge/mutiny": "^0.5.1",
     "@sanity/client": "^6.15.4",
-    "@sanity/types": "3.32.0",
-    "@sanity/util": "3.32.0",
+    "@sanity/types": "workspace:*",
+    "@sanity/util": "workspace:*",
     "arrify": "^2.0.1",
     "debug": "^4.3.4",
     "fast-fifo": "^1.3.2",

@@ -7,5 +7,8 @@
     "outDir": "./lib/dts",
     "declarationDir": "./lib/dts"
   },
-  "references": [{"path": "../@sanity/types/tsconfig.lib.json"}]
+  "references": [
+    {"path": "../types/tsconfig.lib.json"},
+    {"path": "../util/tsconfig.lib.json"},
+  ]
 }
@@ -6,5 +6,9 @@
     "rootDir": ".",
     "outDir": "./lib/dts",
     "declarationDir": "./lib/dts"
-  }
+  },
+  "references": [
+    {"path": "../types/tsconfig.lib.json"},
+    {"path": "../util/tsconfig.lib.json"},
+  ]
 }
@@ -62,7 +62,7 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@sanity/types": "3.32.0",
+    "@sanity/types": "workspace:*",
     "@types/debug": "^4.1.5",
     "@types/lodash": "^4.14.149",
     "rimraf": "^3.0.2"

@@ -64,10 +64,10 @@
     "watch": "pkg-utils watch --tsconfig tsconfig.lib.json"
   },
   "dependencies": {
-    "@sanity/block-tools": "3.32.0",
-    "@sanity/schema": "3.32.0",
-    "@sanity/types": "3.32.0",
-    "@sanity/util": "3.32.0",
+    "@sanity/block-tools": "workspace:*",
+    "@sanity/schema": "workspace:*",
+    "@sanity/types": "workspace:*",
+    "@sanity/util": "workspace:*",
     "debug": "^3.2.7",
     "is-hotkey": "^0.2.0",
     "lodash": "^4.17.21",

@@ -75,7 +75,7 @@
   },
   "dependencies": {
     "@sanity/generate-help-url": "^3.0.0",
-    "@sanity/types": "3.32.0",
+    "@sanity/types": "workspace:*",
     "arrify": "^1.0.1",
     "groq-js": "^1.5.0-canary.1",
     "humanize-list": "^1.0.1",

@@ -95,7 +95,6 @@ describe('alias type test', () => {
   })
 
   it('should support alias with preview', () => {
-    //@ts-expect-error error is not in select keys
     defineType({
       type: 'custom-object',
       name: 'redefined',
@@ -106,7 +105,6 @@ describe('alias type test', () => {
       },
     })
 
-    //@ts-expect-error error is not in select keys
     defineField({
       type: 'custom-object',
       name: 'redefined',
@@ -117,7 +115,6 @@ describe('alias type test', () => {
       },
     })
 
-    //@ts-expect-error error is not in select keys
     defineArrayMember({
       type: 'custom-object',
       name: 'redefined',

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import {type BooleanDefinition, type EmailDefinition} from '../definition'
 import {defineType} from '../types'

@@ -1,10 +1,10 @@
-import {describe, it} from '@jest/globals'
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;
  * use of ts-expect-error serves the same purpose - TypeScript is the testrunner here
  */
 import {type FileDefinition, type StringDefinition} from '_self_'
+import {describe, it} from '@jest/globals'
 
 import {defineField, defineType} from '../types'
 

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -1,4 +1,5 @@
 import {describe, it} from '@jest/globals'
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Some of these tests have no expect statement;

@@ -163,7 +163,7 @@
   },
   "dependencies": {
     "@sanity/client": "^6.15.4",
-    "@sanity/types": "3.32.0",
+    "@sanity/types": "workspace:*",
     "get-random-values-esm": "1.0.2",
     "moment": "^2.29.4",
     "rxjs": "^7.8.1"

@@ -1,4 +1,5 @@
-import {it, expect} from '@jest/globals'
+import {expect, it} from '@jest/globals'
+
 import {isDeepEmpty} from '../isDeepEmpty'
 
 it('returns true for undefined', () => {

@@ -1,4 +1,5 @@
 import {expect, test} from '@jest/globals'
+
 /* eslint-disable max-nested-callbacks, @typescript-eslint/ban-ts-comment */
 import {fromString, get, resolveKeyedPath, toString} from '../src/paths'
 

@@ -8,7 +8,7 @@ import {
   syntaxHighlighting,
 } from '@codemirror/language'
 import {highlightSelectionMatches} from '@codemirror/search'
-import {Extension} from '@codemirror/state'
+import {type Extension} from '@codemirror/state'
 import {
   drawSelection,
   highlightActiveLine,

@@ -26,7 +26,7 @@
     "index.js"
   ],
   "dependencies": {
-    "@sanity/cli": "3.32.0",
+    "@sanity/cli": "workspace:*",
     "resolve-pkg": "^2.0.0"
   },
   "engines": {