Merge branch 'canary' into fix/app-not-found-isr-status

vercel · Sep 18, 2023 · 7334dd3 · 7334dd3
2 parents 451e00b + 0338dcd
commit 7334dd3
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 36 deletions.
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.4.20-canary.37"
+  "version": "13.4.20-canary.38"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "description": "ESLint configuration used by Next.js.",
   "main": "index.js",
   "license": "MIT",
@@ -10,7 +10,7 @@
   },
   "homepage": "https://nextjs.org/docs/app/building-your-application/configuring/eslint#eslint-config",
   "dependencies": {
-    "@next/eslint-plugin-next": "13.4.20-canary.37",
+    "@next/eslint-plugin-next": "13.4.20-canary.38",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0",
     "eslint-import-resolver-node": "^0.3.6",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "description": "ESLint plugin for NextJS.",
   "main": "dist/index.js",
   "license": "MIT",

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "private": true,
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -90,7 +90,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "13.4.20-canary.37",
+    "@next/env": "13.4.20-canary.38",
     "@swc/helpers": "0.5.2",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001406",
@@ -145,11 +145,11 @@
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/cli": "2.16.2",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "13.4.20-canary.37",
-    "@next/polyfill-nomodule": "13.4.20-canary.37",
-    "@next/react-dev-overlay": "13.4.20-canary.37",
-    "@next/react-refresh-utils": "13.4.20-canary.37",
-    "@next/swc": "13.4.20-canary.37",
+    "@next/polyfill-module": "13.4.20-canary.38",
+    "@next/polyfill-nomodule": "13.4.20-canary.38",
+    "@next/react-dev-overlay": "13.4.20-canary.38",
+    "@next/react-refresh-utils": "13.4.20-canary.38",
+    "@next/swc": "13.4.20-canary.38",
     "@opentelemetry/api": "1.4.1",
     "@playwright/test": "^1.35.1",
     "@segment/ajv-human-errors": "2.1.2",

diff --git a/packages/next/src/cli/next-dev.ts b/packages/next/src/cli/next-dev.ts
@@ -253,6 +253,7 @@ const nextDev: CliCommand = async (args) => {
         stdio: 'inherit',
         env: {
           ...((initialEnv || process.env) as typeof process.env),
+          TURBOPACK: process.env.TURBOPACK,
           NEXT_PRIVATE_WORKER: '1',
         },
       })

diff --git a/packages/next/webpack.config.js b/packages/next/webpack.config.js
@@ -191,7 +191,7 @@ module.exports = ({ dev, turbo, bundleType, experimental }) => {
     module: {
       rules: [
         {
-          include: /vendored\/rsc\/entrypoints/,
+          include: /vendored[\\/]rsc[\\/]entrypoints/,
           resolve: {
             conditionNames: ['react-server', '...'],
             alias: {

diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/third-parties/package.json b/packages/third-parties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/third-parties",
-  "version": "13.4.20-canary.37",
+  "version": "13.4.20-canary.38",
   "private": true,
   "repository": {
     "url": "vercel/next.js",
@@ -14,7 +14,7 @@
   ],
   "license": "MIT",
   "scripts": {
-    "build": "rm -rf dist && tsc -d -p tsconfig.json",
+    "build": "rimraf dist && tsc -d -p tsconfig.json",
     "prepublishOnly": "cd ../../ && turbo run build",
     "dev": "tsc -d -w -p tsconfig.json",
     "typescript": "tsec --noEmit -p tsconfig.json"
@@ -23,9 +23,10 @@
     "third-party-capital": "1.0.20"
   },
   "devDependencies": {
-    "next": "13.4.20-canary.37",
+    "next": "13.4.20-canary.38",
     "outdent": "0.8.0",
-    "prettier": "2.5.1"
+    "prettier": "2.5.1",
+    "rimraf": "^3.0.2"
   },
   "peerDependencies": {
     "next": "^13.0.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml