Merge branch 'canary' into sam/github-workflow/bankrupt

.github/workflows/build_and_deploy.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   NAPI_CLI_VERSION: 2.16.2
-  TURBO_VERSION: 1.13.3-canary.2
+  TURBO_VERSION: 2.0.3
   NODE_LTS_VERSION: 20
   CARGO_PROFILE_RELEASE_LTO: 'true'
   TURBO_TEAM: 'vercel'

.github/workflows/build_and_test.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 1.13.3-canary.2
+  TURBO_VERSION: 2.0.3
   NODE_MAINTENANCE_VERSION: 18
   NODE_LTS_VERSION: 20
   TEST_CONCURRENCY: 8

.github/workflows/build_reusable.yml

@@ -62,7 +62,7 @@ on:
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 1.13.3-canary.2
+  TURBO_VERSION: 2.0.3
   NODE_LTS_VERSION: 20.9.0
   TEST_CONCURRENCY: 8
   # disable backtrace for test snapshots

.github/workflows/code_freeze.yml

@@ -17,7 +17,7 @@ name: Code Freeze
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 1.13.3-canary.2
+  TURBO_VERSION: 2.0.3
   NODE_LTS_VERSION: 20
 
 jobs:

.github/workflows/pull_request_stats.yml

@@ -6,7 +6,7 @@ name: Generate Pull Request Stats
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 1.13.3-canary.2
+  TURBO_VERSION: 2.0.3
   NODE_LTS_VERSION: 20
   TEST_CONCURRENCY: 6
 

.github/workflows/trigger_release.yml

@@ -35,7 +35,7 @@ name: Trigger Release
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 1.13.3-canary.2
+  TURBO_VERSION: 2.0.3
   NODE_LTS_VERSION: 20
 
 jobs:

package.json

@@ -232,7 +232,7 @@
     "taskr": "1.1.0",
     "tree-kill": "1.2.2",
     "tsec": "0.2.1",
-    "turbo": "1.13.3-canary.2",
+    "turbo": "2.0.3",
     "typescript": "5.3.3",
     "unfetch": "4.2.0",
     "wait-port": "0.2.2",

packages/create-next-app/package.json

@@ -51,6 +51,8 @@
     "validate-npm-package-name": "5.0.1"
   },
   "engines": {
-    "node": ">=18.17.0"
-  }
+    "node": ">=18.17.0",
+    "pnpm": "8.15.7"
+  },
+  "packageManager": "[email protected]"
 }

packages/next-swc/turbo.json

@@ -1,6 +1,6 @@
 {
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "build-native": {
       "inputs": [
         "../../.cargo/**",

packages/next/package.json

@@ -344,6 +344,8 @@
     "vercel"
   ],
   "engines": {
-    "node": ">=18.17.0"
-  }
+    "node": ">=18.17.0",
+    "pnpm": "8.15.7"
+  },
+  "packageManager": "[email protected]"
 }

scripts/normalize-version-bump.js

@@ -72,5 +72,6 @@ const writeJson = async (filePath, data) =>
     private: true,
     workspaces: ['packages/*'],
     scripts: {},
+    packageManager: '[email protected]',
   })
 })()

test/deploy-tests-manifest.json

@@ -7,7 +7,6 @@
       "test/production/**/*.test.{t,j}s{,x}"
     ],
     "exclude": [
-      "test/e2e/app-dir/app-routes/app-custom-routes.test.ts",
       "test/e2e/app-dir/next-after-app/index.test.ts",
       "test/e2e/app-dir/scss/nm-module-nested/nm-module-nested.test.ts",
       "test/e2e/cancel-request/stream-cancel.test.ts",

test/e2e/app-dir/app-routes/app-custom-routes.test.ts

@@ -1,5 +1,5 @@
 import { nextTestSetup } from 'e2e-utils'
-import { check, waitFor } from 'next-test-utils'
+import { check, waitFor, retry } from 'next-test-utils'
 import { Readable } from 'stream'
 
 import {
@@ -679,18 +679,19 @@ describe('app-custom-routes', () => {
     })
   }
 
-  describe('no response returned', () => {
-    it('should print an error when no response is returned', async () => {
-      await next.fetch(basePath + '/no-response', { method: 'POST' })
-
-      await check(() => {
-        expect(next.cliOutput).toMatch(
-          /No response is returned from route handler '.+\/route\.ts'\. Ensure you return a `Response` or a `NextResponse` in all branches of your handler\./
-        )
-        return 'yes'
-      }, 'yes')
+  // This test is skipped in deploy mode because `next.cliOutput` will only contain build-time logs.
+  if (!isNextDeploy) {
+    describe('no response returned', () => {
+      it('should print an error when no response is returned', async () => {
+        await next.fetch(basePath + '/no-response', { method: 'POST' })
+        await retry(() => {
+          expect(next.cliOutput).toMatch(
+            /No response is returned from route handler '.+\/route\.ts'\. Ensure you return a `Response` or a `NextResponse` in all branches of your handler\./
+          )
+        })
+      })
     })
-  })
+  }
 
   describe('no bundle error', () => {
     it('should not print bundling warning about React', async () => {

turbo.json

@@ -1,7 +1,6 @@
 {
   "$schema": "https://turborepo.org/schema.json",
-  "experimentalUI": true,
-  "pipeline": {
+  "tasks": {
     "build": {
       "dependsOn": ["^build"],
       "outputs": ["dist/**"]