Merge branch 'master' into template-placeholders

sveltejs · May 23, 2022 · 89ce7f7 · 89ce7f7
2 parents 190e342 + d1342c1
commit 89ce7f7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
 		"turbo": "^1.2.6",
 		"typescript": "~4.6.2"
 	},
-	"packageManager": "pnpm@7.1.2",
+	"packageManager": "pnpm@7.1.3",
 	"engines": {
 		"pnpm": "^7.0.0"
 	},

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/turbo.json b/turbo.json
@@ -7,12 +7,12 @@
 			"outputs": ["dist/**", "docs/**", "assets/**"]
 		},
 		"kit.svelte.dev#build": {
-			"dependsOn": ["^build", "$VERCEL"],
+			"dependsOn": ["^build", "$VERCEL", "$ENABLE_VC_BUILD"],
 			"inputs": ["src/**", "../../packages/kit/docs/**", "../../documentation/**"],
 			"outputs": [".vercel_build_output/**"]
 		},
 		"build": {
-			"dependsOn": ["^build", "$VERCEL"],
+			"dependsOn": ["^build", "$VERCEL", "$ENABLE_VC_BUILD"],
 			"inputs": ["src/**", "scripts/**", "shared/**", "templates/**"],
 			"outputs": ["files/**", "dist/**", ".svelte-kit/**", ".vercel_build_output/**"]
 		},