chore(deps): upgrade turbo to v2 (#6985)

* chore: run `clean-globs` codemod * chore: run `rename-output-mode` codemod * chore: run `rename-pipeline` codemod * refactor: declare all env deps and bump turbo to v2 * chore: inspect failing exports test * chore: identified the issue
sanity-io · Jun 30, 2024 · 2fb8f9b · 2fb8f9b
1 parent 868a44b
commit 2fb8f9b
Show file tree

Hide file tree

Showing 16 changed files with 180 additions and 128 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -21,6 +21,7 @@ const config = {
     'plugin:react/jsx-runtime',
     'prettier',
     '@sanity/eslint-config-i18n',
+    'turbo',
   ],
   parser: '@typescript-eslint/parser',
   plugins: [
@@ -261,6 +262,17 @@ const config = {
         'react-compiler/react-compiler': 'off',
       },
     },
+    // Don't lint Turbo undeclared process env variables in code that is used in the CLI at runtime
+    {
+      files: [
+        'packages/@sanity/cli/**',
+        'packages/sanity/src/_internal/cli/**',
+        'packages/sanity/playwright-ct/**',
+      ],
+      rules: {
+        'turbo/no-undeclared-env-vars': 'off',
+      },
+    },
   ],
 }
 

diff --git a/.github/workflows/testExports.yml b/.github/workflows/testExports.yml
@@ -43,5 +43,4 @@ jobs:
         run: pnpm install
 
       - name: Check export conditions in native node ESM and CJS
-        # Adds the github reporter on the CI to highlight in diffs failling tests
-        run: pnpm test:exports -- --test-reporter spec --test-reporter-destination stdout --test-reporter node-test-github-reporter --test-reporter-destination stdout
+        run: pnpm test:exports
diff --git a/dev/page-building-studio/turbo.json b/dev/page-building-studio/turbo.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "build": {
       "outputs": ["./sanity/**", "dist/**"]
     }

diff --git a/dev/studio-e2e-testing/turbo.json b/dev/studio-e2e-testing/turbo.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "https://turbo.build/schema.json",
+  "extends": ["//"],
+  "tasks": {
+    "build": {
+      "env": ["SANITY_E2E_PROJECT_ID", "SANITY_E2E_DATASET"],
+      "outputs": [".sanity/**", "dist/**"]
+    }
+  }
+}
diff --git a/dev/test-next-studio/turbo.json b/dev/test-next-studio/turbo.json
@@ -1,9 +1,9 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "build": {
-      "env": ["NEXT_PUBLIC_SANITY_*", "NEXT_PUBLIC_VERCEL_ENV", "SANITY_*", "REACT_COMPILER"],
+      "env": ["REACT_COMPILER"],
       "outputs": [".next/**", "!.next/cache/**", "out/**"],
       "dependsOn": ["^build"]
     },

diff --git a/dev/test-studio/turbo.json b/dev/test-studio/turbo.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "build": {
       "outputs": [".sanity/**", "dist/**", "workshop/scopes.js"]
     }

diff --git a/package.json b/package.json
@@ -132,6 +132,7 @@
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-sanity": "^7.1.2",
+    "eslint-config-turbo": "^2.0.4",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-boundaries": "^4.2.1",
     "eslint-plugin-import": "^2.29.1",
@@ -161,7 +162,7 @@
     "rxjs": "^7.8.1",
     "sanity": "workspace:*",
     "semver": "^7.3.5",
-    "turbo": "^1.13.4",
+    "turbo": "^2.0.4",
     "typescript": "5.4.5",
     "vite": "^4.5.3",
     "vite-tsconfig-paths": "^4.3.2",

diff --git a/packages/@repo/test-exports/turbo.json b/packages/@repo/test-exports/turbo.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "test": {
       "dependsOn": ["^build"]
     }

diff --git a/packages/@sanity/schema/turbo.json b/packages/@sanity/schema/turbo.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "build": {
       "outputs": ["lib/**", "index.js", "_internal.js"]
     }

diff --git a/packages/@sanity/util/turbo.json b/packages/@sanity/util/turbo.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "build": {
       "outputs": [
         "lib/**",

diff --git a/packages/sanity/src/_internal/cli/server/renderDocument.ts b/packages/sanity/src/_internal/cli/server/renderDocument.ts
@@ -24,7 +24,7 @@ import {type SanityMonorepo} from './sanityMonorepo'
 const debug = serverDebug.extend('renderDocument')
 
 // Don't use threads in the jest world
-// eslint-disable-next-line no-process-env
+// eslint-disable-next-line no-process-env, turbo/no-undeclared-env-vars
 const useThreads = typeof process.env.JEST_WORKER_ID === 'undefined'
 const hasWarnedAbout = new Set<string>()
 

diff --git a/packages/sanity/turbo.json b/packages/sanity/turbo.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "build": {
       "outputs": [
         "lib/**",

diff --git a/perf/studio/turbo.json b/perf/studio/turbo.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "build": {
       "outputs": [".sanity/**", "dist/**"]
     }

diff --git a/perf/tests/turbo.json b/perf/tests/turbo.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "build": {
       "outputs": [".sanity/**", "dist/**"]
     }