diff --git a/.vscode/settings.json b/.vscode/settings.json index c8298e95c1e19..c0d580944b7fd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -66,6 +66,7 @@ "napi", "nextjs", "opentelemetry", + "prerendered", "Threadsafe", "Turbopack", "zipkin" diff --git a/Cargo.lock b/Cargo.lock index db9b82793722d..6fb0fa90b01fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -321,7 +321,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "serde", "smallvec", @@ -3528,7 +3528,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "serde", @@ -7639,7 +7639,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "async-trait", @@ -7671,7 +7671,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "cargo-lock", @@ -7683,7 +7683,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "bytes", @@ -7698,7 +7698,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "dotenvs", @@ -7712,7 +7712,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7729,7 +7729,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "auto-hash-map", @@ -7759,7 +7759,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "base16", "hex", @@ -7771,7 +7771,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7785,7 +7785,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "proc-macro2", "quote", @@ -7795,7 +7795,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "mimalloc", ] @@ -7803,7 +7803,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "auto-hash-map", @@ -7828,7 +7828,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "async-recursion", @@ -7859,7 +7859,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "auto-hash-map", "mdxjs", @@ -7899,7 +7899,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7921,7 +7921,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "clap 4.4.2", @@ -7945,7 +7945,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "async-recursion", @@ -7975,7 +7975,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "async-trait", @@ -7997,7 +7997,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8021,7 +8021,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "async-compression", @@ -8058,7 +8058,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "async-trait", @@ -8092,7 +8092,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "serde", "serde_json", @@ -8103,7 +8103,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "async-trait", @@ -8126,7 +8126,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "indoc", @@ -8143,7 +8143,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8159,7 +8159,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "base64 0.21.4", @@ -8179,7 +8179,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "serde", @@ -8194,7 +8194,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "mdxjs", @@ -8209,7 +8209,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "async-stream", @@ -8244,7 +8244,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "serde", @@ -8260,7 +8260,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "swc_core", "turbo-tasks", @@ -8271,7 +8271,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231024.2#546c9867a8d6ec2fdc52f246e8cdc7d9363ec3fb" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231025.1#51b47690aa579b8829b28e18402a28444c301514" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 1fd1e7000ccb9..1c3820e163ca5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,11 +40,11 @@ swc_core = { version = "0.86.10", features = [ testing = { version = "0.35.0" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231024.2" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231025.1" } # [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-231024.2" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231025.1" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231024.2" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231025.1" } # General Deps diff --git a/lerna.json b/lerna.json index 8d48c59976ba8..5ad0c8f60c77b 100644 --- a/lerna.json +++ b/lerna.json @@ -16,5 +16,5 @@ "registry": "https://registry.npmjs.org/" } }, - "version": "13.5.7-canary.25" + "version": "13.5.7-canary.26" } diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json index 545770eff6756..6bc3bc74fc0f1 100644 --- a/packages/create-next-app/package.json +++ b/packages/create-next-app/package.json @@ -1,6 +1,6 @@ { "name": "create-next-app", - "version": "13.5.7-canary.25", + "version": "13.5.7-canary.26", "keywords": [ "react", "next", diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json index 958329bc9ff50..8a8470dd64ff9 100644 --- a/packages/eslint-config-next/package.json +++ b/packages/eslint-config-next/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-next", - "version": "13.5.7-canary.25", + "version": "13.5.7-canary.26", "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.5.7-canary.25", + "@next/eslint-plugin-next": "13.5.7-canary.26", "@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 index 99b4d8aabc4b0..7c6c34d7267f0 100644 --- 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.5.7-canary.25", + "version": "13.5.7-canary.26", "description": "ESLint plugin for Next.js.", "main": "dist/index.js", "license": "MIT", diff --git a/packages/font/package.json b/packages/font/package.json index 1baba48f800bf..c9f3375b360e0 100644 --- a/packages/font/package.json +++ b/packages/font/package.json @@ -1,6 +1,6 @@ { "name": "@next/font", - "version": "13.5.7-canary.25", + "version": "13.5.7-canary.26", "repository": { "url": "vercel/next.js", "directory": "packages/font" diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json index 84e9b36cad544..0f590ee0175b8 100644 --- a/packages/next-bundle-analyzer/package.json +++ b/packages/next-bundle-analyzer/package.json @@ -1,6 +1,6 @@ { "name": "@next/bundle-analyzer", - "version": "13.5.7-canary.25", + "version": "13.5.7-canary.26", "main": "index.js", "types": "index.d.ts", "license": "MIT", diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json index 1c9d88f88b109..b4bedc451b08a 100644 --- a/packages/next-codemod/package.json +++ b/packages/next-codemod/package.json @@ -1,6 +1,6 @@ { "name": "@next/codemod", - "version": "13.5.7-canary.25", + "version": "13.5.7-canary.26", "license": "MIT", "repository": { "type": "git", diff --git a/packages/next-env/package.json b/packages/next-env/package.json index f7a4d29001de3..311d33bbd0628 100644 --- a/packages/next-env/package.json +++ b/packages/next-env/package.json @@ -1,6 +1,6 @@ { "name": "@next/env", - "version": "13.5.7-canary.25", + "version": "13.5.7-canary.26", "keywords": [ "react", "next", diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json index fc1f68860a711..d4ce180c6fdad 100644 --- a/packages/next-mdx/package.json +++ b/packages/next-mdx/package.json @@ -1,6 +1,6 @@ { "name": "@next/mdx", - "version": "13.5.7-canary.25", + "version": "13.5.7-canary.26", "main": "index.js", "license": "MIT", "repository": { diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json index d81ac3918ec19..6f342b6e78ef5 100644 --- a/packages/next-plugin-storybook/package.json +++ b/packages/next-plugin-storybook/package.json @@ -1,6 +1,6 @@ { "name": "@next/plugin-storybook", - "version": "13.5.7-canary.25", + "version": "13.5.7-canary.26", "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 index 0f6d5b70a8830..02b0a52ab78ca 100644 --- a/packages/next-polyfill-module/package.json +++ b/packages/next-polyfill-module/package.json @@ -1,6 +1,6 @@ { "name": "@next/polyfill-module", - "version": "13.5.7-canary.25", + "version": "13.5.7-canary.26", "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 index 78b226be2767f..0935907dc2074 100644 --- a/packages/next-polyfill-nomodule/package.json +++ b/packages/next-polyfill-nomodule/package.json @@ -1,6 +1,6 @@ { "name": "@next/polyfill-nomodule", - "version": "13.5.7-canary.25", + "version": "13.5.7-canary.26", "description": "A polyfill for non-dead, nomodule browsers.", "main": "dist/polyfill-nomodule.js", "license": "MIT", diff --git a/packages/next-swc/crates/core/tests/errors.rs b/packages/next-swc/crates/core/tests/errors.rs index d0f048bb8941f..a60fe3d3caba8 100644 --- a/packages/next-swc/crates/core/tests/errors.rs +++ b/packages/next-swc/crates/core/tests/errors.rs @@ -100,7 +100,6 @@ fn react_server_components_server_graph_errors(input: PathBuf) { ), tr.comments.as_ref().clone(), None, - String::from("server").into(), ) }, &input, @@ -127,7 +126,6 @@ fn react_server_components_client_graph_errors(input: PathBuf) { ), tr.comments.as_ref().clone(), None, - String::from("client").into(), ) }, &input, @@ -213,7 +211,6 @@ fn react_server_actions_client_errors(input: PathBuf) { ), tr.comments.as_ref().clone(), None, - String::from("client").into(), ), server_actions( &FileName::Real("/app/item.js".into()), diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json index 21095425a0ebd..498a2432afbcf 100644 --- a/packages/next-swc/package.json +++ b/packages/next-swc/package.json @@ -1,6 +1,6 @@ { "name": "@next/swc", - "version": "13.5.7-canary.25", + "version": "13.5.7-canary.26", "private": true, "scripts": { "clean": "node ../../scripts/rm.mjs native", diff --git a/packages/next/package.json b/packages/next/package.json index 285a3ff952d16..a012578c2edd3 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -1,6 +1,6 @@ { "name": "next", - "version": "13.5.7-canary.25", + "version": "13.5.7-canary.26", "description": "The React Framework", "main": "./dist/server/next.js", "license": "MIT", @@ -92,7 +92,7 @@ ] }, "dependencies": { - "@next/env": "13.5.7-canary.25", + "@next/env": "13.5.7-canary.26", "@swc/helpers": "0.5.2", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001406", @@ -146,11 +146,11 @@ "@mswjs/interceptors": "0.23.0", "@napi-rs/cli": "2.16.2", "@napi-rs/triples": "1.1.0", - "@next/polyfill-module": "13.5.7-canary.25", - "@next/polyfill-nomodule": "13.5.7-canary.25", - "@next/react-dev-overlay": "13.5.7-canary.25", - "@next/react-refresh-utils": "13.5.7-canary.25", - "@next/swc": "13.5.7-canary.25", + "@next/polyfill-module": "13.5.7-canary.26", + "@next/polyfill-nomodule": "13.5.7-canary.26", + "@next/react-dev-overlay": "13.5.7-canary.26", + "@next/react-refresh-utils": "13.5.7-canary.26", + "@next/swc": "13.5.7-canary.26", "@opentelemetry/api": "1.4.1", "@playwright/test": "^1.35.1", "@taskr/clear": "1.1.0", @@ -193,7 +193,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.22.6", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231024.2", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231025.1", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts index 2f4fa5511b726..82703f782df79 100644 --- a/packages/next/src/build/index.ts +++ b/packages/next/src/build/index.ts @@ -1807,6 +1807,7 @@ export default async function build( runtime: pageRuntime, pageDuration: undefined, ssgPageDurations: undefined, + hasEmptyPrelude: undefined, }) }) }) @@ -2237,8 +2238,16 @@ export default async function build( const { revalidate = appConfig.revalidate ?? false, metadata = {}, + hasEmptyPrelude, + hasPostponed, } = exportResult.byPath.get(route) ?? {} + pageInfos.set(route, { + ...(pageInfos.get(route) as PageInfo), + hasPostponed, + hasEmptyPrelude, + }) + if (revalidate !== 0) { const normalizedRoute = normalizePagePath(route) const dataRoute = isRouteHandler @@ -2299,6 +2308,11 @@ export default async function build( const normalizedRoute = normalizePagePath(page) const dataRoute = path.posix.join(`${normalizedRoute}.rsc`) + pageInfos.set(page, { + ...(pageInfos.get(page) as PageInfo), + isDynamicAppRoute: true, + }) + // TODO: create a separate manifest to allow enforcing // dynamicParams for non-static paths? finalDynamicRoutes[page] = { diff --git a/packages/next/src/build/utils.ts b/packages/next/src/build/utils.ts index ec1f57c01216d..09b4813e1d7ee 100644 --- a/packages/next/src/build/utils.ts +++ b/packages/next/src/build/utils.ts @@ -337,6 +337,9 @@ export interface PageInfo { pageDuration: number | undefined ssgPageDurations: number[] | undefined runtime: ServerRuntime + hasEmptyPrelude?: boolean + hasPostponed?: boolean + isDynamicAppRoute?: boolean } export async function printTreeView( @@ -450,18 +453,28 @@ export async function printTreeView( (pageInfo?.pageDuration || 0) + (pageInfo?.ssgPageDurations?.reduce((a, b) => a + (b || 0), 0) || 0) - const symbol = - item === '/_app' || item === '/_app.server' - ? ' ' - : isEdgeRuntime(pageInfo?.runtime) - ? 'ℇ' - : pageInfo?.isPPR - ? '◐' - : pageInfo?.isStatic - ? '○' - : pageInfo?.isSSG - ? '●' - : 'λ' + let symbol: string + + if (item === '/_app' || item === '/_app.server') { + symbol = ' ' + } else if (isEdgeRuntime(pageInfo?.runtime)) { + symbol = 'ℇ' + } else if (pageInfo?.isPPR) { + // If the page has an empty prelude, then it's equivalent to a static page. + if (pageInfo?.hasEmptyPrelude) { + symbol = 'λ' + } else if (!pageInfo?.hasPostponed && !pageInfo.isDynamicAppRoute) { + symbol = '○' + } else { + symbol = '◐' + } + } else if (pageInfo?.isStatic) { + symbol = '○' + } else if (pageInfo?.isSSG) { + symbol = '●' + } else { + symbol = 'λ' + } usedSymbols.add(symbol) @@ -667,34 +680,11 @@ export async function printTreeView( print( textTable( [ - usedSymbols.has('◐') && [ - '◐', - '(Partially Pre-Rendered)', - 'static parts of the page were pre-rendered and the dynamic parts will be streamed', - ], - usedSymbols.has('ℇ') && [ - 'ℇ', - '(Streaming)', - `server-side renders with streaming (uses React 18 SSR streaming or Server Components)`, - ], - usedSymbols.has('λ') && [ - 'λ', - '(Server)', - `server-side renders at runtime (uses ${cyan( - 'getInitialProps' - )} or ${cyan('getServerSideProps')})`, - ], - usedSymbols.has('○') && [ - '○', - '(Static)', - 'automatically rendered as static HTML (uses no initial props)', - ], + usedSymbols.has('○') && ['○', '(Static)', 'prerendered as static HTML'], usedSymbols.has('●') && [ '●', '(SSG)', - `automatically generated as static HTML + JSON (uses ${cyan( - 'getStaticProps' - )})`, + `prerendered as static HTML (uses ${cyan('getStaticProps')})`, ], usedSymbols.has('ISR') && [ '', @@ -703,6 +693,21 @@ export async function printTreeView( 'getStaticProps' )})`, ], + usedSymbols.has('◐') && [ + '◐', + '(Partial Prerender)', + 'prerendered as static HTML with dynamic server-streamed content', + ], + usedSymbols.has('λ') && [ + 'λ', + '(Dynamic)', + `server-rendered on demand using Node.js`, + ], + usedSymbols.has('ℇ') && [ + 'ℇ', + '(Edge Runtime)', + `server-rendered on demand using the Edge Runtime`, + ], ].filter((x) => x) as [string, string, string][], { align: ['l', 'l', 'l'], diff --git a/packages/next/src/client/components/react-dev-overlay/hot-reloader-client.tsx b/packages/next/src/client/components/react-dev-overlay/hot-reloader-client.tsx index 6c4240d780a91..9a1a98ade1aa7 100644 --- a/packages/next/src/client/components/react-dev-overlay/hot-reloader-client.tsx +++ b/packages/next/src/client/components/react-dev-overlay/hot-reloader-client.tsx @@ -245,6 +245,9 @@ function processMessage( console.log('[Fast Refresh] rebuilding') break } + case HMR_ACTIONS_SENT_TO_BROWSER.FINISH_BUILDING: { + break + } case HMR_ACTIONS_SENT_TO_BROWSER.BUILT: case HMR_ACTIONS_SENT_TO_BROWSER.SYNC: { if (obj.hash) { diff --git a/packages/next/src/client/dev/hot-middleware-client.ts b/packages/next/src/client/dev/hot-middleware-client.ts index ef6e04c33e0f2..922fa041ff50c 100644 --- a/packages/next/src/client/dev/hot-middleware-client.ts +++ b/packages/next/src/client/dev/hot-middleware-client.ts @@ -58,7 +58,9 @@ export default (mode: 'webpack' | 'turbopack') => { return } case 'serverError': - case 'devPagesManifestUpdate': { + case 'devPagesManifestUpdate': + case 'building': + case 'finishBuilding': { return } default: { diff --git a/packages/next/src/export/index.ts b/packages/next/src/export/index.ts index 0466870a9e425..c7a6a56a99861 100644 --- a/packages/next/src/export/index.ts +++ b/packages/next/src/export/index.ts @@ -746,6 +746,15 @@ export async function exportAppImpl( if (typeof result.metadata !== 'undefined') { info.metadata = result.metadata } + + if (typeof result.hasEmptyPrelude !== 'undefined') { + info.hasEmptyPrelude = result.hasEmptyPrelude + } + + if (typeof result.hasPostponed !== 'undefined') { + info.hasPostponed = result.hasPostponed + } + collector.byPath.set(path, info) // Update not found. diff --git a/packages/next/src/export/routes/app-page.ts b/packages/next/src/export/routes/app-page.ts index 9615910a3208a..5da68b15884fa 100644 --- a/packages/next/src/export/routes/app-page.ts +++ b/packages/next/src/export/routes/app-page.ts @@ -160,7 +160,12 @@ export async function exportAppPage( ) // Writing the request metadata to a file. - const meta: RouteMetadata = { status: undefined, headers, postponed } + const meta: RouteMetadata = { + status: undefined, + headers, + postponed, + } + await fileWriter( ExportedAppPageFiles.META, htmlFilepath.replace(/\.html$/, '.meta'), @@ -177,6 +182,8 @@ export async function exportAppPage( return { // Only include the metadata if the environment has next support. metadata: hasNextSupport ? meta : undefined, + hasEmptyPrelude: Boolean(postponed) && html === '', + hasPostponed: Boolean(postponed), revalidate, } } catch (err: any) { diff --git a/packages/next/src/export/types.ts b/packages/next/src/export/types.ts index fc31a4a300e40..1f94d9ce809e8 100644 --- a/packages/next/src/export/types.ts +++ b/packages/next/src/export/types.ts @@ -73,6 +73,8 @@ export type ExportRouteResult = headers?: OutgoingHttpHeaders } ssgNotFound?: boolean + hasEmptyPrelude?: boolean + hasPostponed?: boolean } | { error: boolean @@ -135,6 +137,14 @@ export type ExportAppResult = { * The metadata for the page. */ metadata?: { status?: number; headers?: OutgoingHttpHeaders } + /** + * If the page has an empty prelude when using PPR. + */ + hasEmptyPrelude?: boolean + /** + * If the page has postponed when using PPR. + */ + hasPostponed?: boolean } > diff --git a/packages/next/src/export/worker.ts b/packages/next/src/export/worker.ts index cfed198f0bcbb..3f221db6f65aa 100644 --- a/packages/next/src/export/worker.ts +++ b/packages/next/src/export/worker.ts @@ -360,5 +360,7 @@ export default async function exportPage( revalidate: result.revalidate, metadata: result.metadata, ssgNotFound: result.ssgNotFound, + hasEmptyPrelude: result.hasEmptyPrelude, + hasPostponed: result.hasPostponed, } } diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json index 120303def98a4..a7c448a2678b5 100644 --- 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.5.7-canary.25", + "version": "13.5.7-canary.26", "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 index f28b7b32044da..260c48284c123 100644 --- 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.5.7-canary.25", + "version": "13.5.7-canary.26", "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 index de4daecb0b878..5214d42a8df91 100644 --- a/packages/third-parties/package.json +++ b/packages/third-parties/package.json @@ -1,6 +1,6 @@ { "name": "@next/third-parties", - "version": "13.5.7-canary.25", + "version": "13.5.7-canary.26", "repository": { "url": "vercel/next.js", "directory": "packages/third-parties" @@ -22,7 +22,7 @@ "third-party-capital": "1.0.20" }, "devDependencies": { - "next": "13.5.7-canary.25", + "next": "13.5.7-canary.26", "outdent": "0.8.0", "prettier": "2.5.1" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ba4e591eefdde..dcd729c1cc4a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -735,7 +735,7 @@ importers: packages/eslint-config-next: dependencies: '@next/eslint-plugin-next': - specifier: 13.5.7-canary.25 + specifier: 13.5.7-canary.26 version: link:../eslint-plugin-next '@rushstack/eslint-patch': specifier: ^1.3.3 @@ -796,7 +796,7 @@ importers: packages/next: dependencies: '@next/env': - specifier: 13.5.7-canary.25 + specifier: 13.5.7-canary.26 version: link:../next-env '@swc/helpers': specifier: 0.5.2 @@ -920,19 +920,19 @@ importers: specifier: 1.1.0 version: 1.1.0 '@next/polyfill-module': - specifier: 13.5.7-canary.25 + specifier: 13.5.7-canary.26 version: link:../next-polyfill-module '@next/polyfill-nomodule': - specifier: 13.5.7-canary.25 + specifier: 13.5.7-canary.26 version: link:../next-polyfill-nomodule '@next/react-dev-overlay': - specifier: 13.5.7-canary.25 + specifier: 13.5.7-canary.26 version: link:../react-dev-overlay '@next/react-refresh-utils': - specifier: 13.5.7-canary.25 + specifier: 13.5.7-canary.26 version: link:../react-refresh-utils '@next/swc': - specifier: 13.5.7-canary.25 + specifier: 13.5.7-canary.26 version: link:../next-swc '@opentelemetry/api': specifier: 1.4.1 @@ -1061,8 +1061,8 @@ importers: specifier: 0.22.6 version: 0.22.6 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231024.2 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231024.2(react-refresh@0.12.0)(webpack@5.86.0)' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231025.1 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231025.1(react-refresh@0.12.0)(webpack@5.86.0)' acorn: specifier: 8.5.0 version: 8.5.0 @@ -1583,7 +1583,7 @@ importers: version: 1.0.20 devDependencies: next: - specifier: 13.5.7-canary.25 + specifier: 13.5.7-canary.26 version: link:../next outdent: specifier: 0.8.0 @@ -24947,9 +24947,9 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} - '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231024.2(react-refresh@0.12.0)(webpack@5.86.0)': - resolution: {registry: https://registry.npmjs.org/, tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231024.2} - id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231024.2' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231025.1(react-refresh@0.12.0)(webpack@5.86.0)': + resolution: {registry: https://registry.npmjs.org/, tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231025.1} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231025.1' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: