Merge branch 'canary' into update/dev-logs

# Conflicts:
#	test/integration/appdir-missing-config/test/index.test.ts

.github/.kodiak.toml

@@ -6,7 +6,7 @@ automerge_label = "ready to land"
 require_automerge_label = false
 method = "squash"
 delete_branch_on_merge = true
-optimistic_updates = true
+optimistic_updates = false
 prioritize_ready_to_merge = true
 notify_on_conflict = false
 

Cargo.toml

@@ -42,11 +42,11 @@ swc_relay = { version = "0.2.7" }
 testing = { version = "0.33.6" }
 
 # Turbo crates
-turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230503.2" }
+turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230504.3" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230503.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230504.3" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230503.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230504.3" }
 
 # General Deps
 

docs/advanced-features/turbopack.md

@@ -2,7 +2,7 @@
 description: Turbopack, an incremental bundler built with Rust, can be used with Next.js 13 using the --turbo flag for faster local development.
 ---
 
-# Turbopack (alpha)
+# Turbopack (beta)
 
 [Turbopack](https://turbo.build/pack) is an incremental bundler optimized for JavaScript and TypeScript, written in Rust, and built into Next.js 13.
 

examples/with-turbopack/README.md

@@ -4,7 +4,7 @@
 
 This playground is a mirror of the [Next.js v13 App Directory Playground](https://github.com/vercel/app-playground), but uses Turbopack as the Next.js development server (`next dev --turbo`).
 
-**As a reminder, Turbopack is currently in alpha and not yet ready for production. We appreciate your ongoing support as we work to make it ready for everyone.**
+**As a reminder, Turbopack is currently in beta and not yet ready for production. We appreciate your ongoing support as we work to make it ready for everyone.**
 
 ## Running Locally
 

lerna.json

@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.3.5-canary.8"
+  "version": "13.4.0"
 }

package.json

@@ -87,8 +87,8 @@
     "@types/jest": "24.0.13",
     "@types/node": "14.14.31",
     "@types/node-fetch": "2.6.1",
-    "@types/react": "18.0.37",
-    "@types/react-dom": "18.0.11",
+    "@types/react": "18.2.5",
+    "@types/react-dom": "18.2.3",
     "@types/relay-runtime": "13.0.0",
     "@types/selenium-webdriver": "4.0.15",
     "@types/sharp": "0.29.3",

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "13.3.5-canary.8",
+  "version": "13.4.0",
   "keywords": [
     "react",
     "next",

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "13.3.5-canary.8",
+  "version": "13.4.0",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "13.3.5-canary.8",
+    "@next/eslint-plugin-next": "13.4.0",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.42.0",
     "eslint-import-resolver-node": "^0.3.6",

packages/eslint-plugin-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "13.3.5-canary.8",
+  "version": "13.4.0",
   "description": "ESLint plugin for NextJS.",
   "main": "dist/index.js",
   "license": "MIT",

packages/font/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "13.3.5-canary.8",
+  "version": "13.4.0",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"