Upgrade to turbo v2 (#7076)

* Upgrade to turbo v2 * fix tests * rebase
cloudflare · Oct 25, 2024 · fa8cc0d · fa8cc0d
1 parent eec2a70
commit fa8cc0d
Show file tree

Hide file tree

Showing 24 changed files with 58 additions and 59 deletions.
diff --git a/fixtures/additional-modules/turbo.json b/fixtures/additional-modules/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"outputs": ["dist/**"]
 		}

diff --git a/fixtures/nodejs-als-app/turbo.json b/fixtures/nodejs-als-app/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"outputs": ["dist/**"]
 		}

diff --git a/fixtures/nodejs-hybrid-app/turbo.json b/fixtures/nodejs-hybrid-app/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"outputs": ["dist/**"]
 		}

diff --git a/fixtures/pages-plugin-example/turbo.json b/fixtures/pages-plugin-example/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"outputs": ["dist/**"]
 		}

diff --git a/fixtures/pages-proxy-app/turbo.json b/fixtures/pages-proxy-app/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"outputs": ["dist/**"]
 		}

diff --git a/fixtures/pages-ws-app/turbo.json b/fixtures/pages-ws-app/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"outputs": ["dist/**"]
 		}

diff --git a/lint-turbo.mjs b/lint-turbo.mjs
@@ -26,7 +26,7 @@ for (const p of paths) {
 			console.log("Failed to read turbo.json for", pkg.name);
 			process.exit(1);
 		}
-		const buildOutputs = turboConfig.pipeline.build.outputs;
+		const buildOutputs = turboConfig.tasks.build.outputs;
 		assert(buildOutputs.length > 0);
 	}
 

diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
 		"prettier-plugin-packagejson": "^2.2.18",
 		"rimraf": "^5.0.1",
 		"tree-kill": "^1.2.2",
-		"turbo": "^1.13.4",
+		"turbo": "^2.2.3",
 		"typescript": "^5.5.2",
 		"vite": "^5.0.12",
 		"vitest": "catalog:default"

diff --git a/packages/cli/turbo.json b/packages/cli/turbo.json
@@ -1,6 +1,5 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-
-	"pipeline": {}
+	"tasks": {}
 }
diff --git a/packages/create-cloudflare/turbo.json b/packages/create-cloudflare/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"env": [
 				"TEST_PM",
@@ -23,7 +23,8 @@
 				"E2E_PROJECT_PATH",
 				"E2E_RETRIES",
 				"E2E_NO_DEPLOY",
-				"E2E_EXPERIMENTAL"
+				"E2E_EXPERIMENTAL",
+				"TEST_PM"
 			],
 			"dependsOn": ["build"]
 		}

diff --git a/packages/format-errors/turbo.json b/packages/format-errors/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"outputs": ["dist/**"]
 		}

diff --git a/packages/kv-asset-handler/turbo.json b/packages/kv-asset-handler/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"outputs": ["dist/**"]
 		}

diff --git a/packages/miniflare/turbo.json b/packages/miniflare/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"inputs": ["src/**", "scripts/**", "types/**", "*.mjs", "*.js", "*.json"],
 			"outputs": ["dist/**", "bootstrap.js", "worker-metafiles/**"],

diff --git a/packages/prerelease-registry/turbo.json b/packages/prerelease-registry/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"outputs": ["dist/**"]
 		}

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

diff --git a/packages/vitest-pool-workers/turbo.json b/packages/vitest-pool-workers/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"outputs": ["dist/**"]
 		}

diff --git a/packages/workers-editor-shared/turbo.json b/packages/workers-editor-shared/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"outputs": ["dist/**"],
 			"env": ["NODE_ENV"]

diff --git a/packages/workers-playground/turbo.json b/packages/workers-playground/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"outputs": ["dist/**"],
 			"env": ["NODE_ENV", "VITE_PLAYGROUND_PREVIEW", "VITE_PLAYGROUND_ROOT"]

diff --git a/packages/workers-shared/turbo.json b/packages/workers-shared/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"inputs": [
 				"asset-worker/**",

diff --git a/packages/workflows-shared/turbo.json b/packages/workflows-shared/turbo.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"inputs": ["src/**", "*.js", "*.ts", "*.json"],
 			"outputs": ["dist/**"]

diff --git a/packages/wrangler/turbo.json b/packages/wrangler/turbo.json
@@ -1,11 +1,11 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-	"pipeline": {
+	"tasks": {
 		"build": {
 			"inputs": [
-				"!**/__tests__/**",
-				"!**/.wrangler/**",
+				"!*/**/__tests__/**",
+				"!*/**/.wrangler/**",
 				"bin/**",
 				"src/**",
 				"scripts/**",
@@ -61,7 +61,7 @@
 			]
 		},
 		"test:ci": {
-			"inputs": ["!**/.wrangler/**", "**/__tests__/**"],
+			"inputs": ["!*/**/.wrangler/**", "**/__tests__/**"],
 			"dependsOn": ["build"]
 		},
 		"test:e2e": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tools/turbo.json b/tools/turbo.json
@@ -1,8 +1,7 @@
 {
 	"$schema": "http://turbo.build/schema.json",
 	"extends": ["//"],
-
-	"pipeline": {
+	"tasks": {
 		"test:ci": {
 			"inputs": ["../packages/*/package.json"],
 			"dependsOn": ["build"]

diff --git a/turbo.json b/turbo.json
@@ -4,7 +4,7 @@
 		"signature": true
 	},
 	"globalEnv": ["CI_OS", "NODE_VERSION", "VITEST"],
-	"pipeline": {
+	"tasks": {
 		"dev": {
 			"persistent": true,
 			"cache": false