Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ env:
NAPI_CLI_VERSION: 2.18.4
TURBO_VERSION: 2.8.11
NODE_LTS_VERSION: 20
CARGO_PROFILE_RELEASE_LTO: 'true'
TURBO_TEAM: 'vercel'
TURBO_CACHE: 'remote:rw'
# Without this environment variable, rust-lld will fail because some dependencies defaults to newer version of macOS by default.
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ opt-level = 1
opt-level = 3

[profile.release]
lto = "thin"

[profile.release.package]

Expand Down Expand Up @@ -433,6 +434,7 @@ owo-colors = "4.2.2"
parcel_selectors = "0.28.2"
parking_lot = "0.12.1"
pathdiff = "0.2.1"
phf = { version = "0.11", features = ["macros"] }
petgraph = "0.8.3"
pin-project-lite = "0.2.9"
postcard = "1.0.4"
Expand Down
2 changes: 1 addition & 1 deletion crates/next-napi-bindings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = "0.0.0"
publish = false

[lib]
crate-type = ["cdylib", "rlib"]
crate-type = ["cdylib"]

[features]
# Instead of enabling all the plugin-related functionality by default, make it
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
"registry": "https://registry.npmjs.org/"
}
},
"version": "16.2.0-canary.98"
"version": "16.2.0-canary.99"
}
2 changes: 1 addition & 1 deletion packages/create-next-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-next-app",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"keywords": [
"react",
"next",
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-config-next/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-config-next",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"description": "ESLint configuration used by Next.js.",
"license": "MIT",
"repository": {
Expand All @@ -12,7 +12,7 @@
"dist"
],
"dependencies": {
"@next/eslint-plugin-next": "16.2.0-canary.98",
"@next/eslint-plugin-next": "16.2.0-canary.99",
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^3.5.2",
"eslint-plugin-import": "^2.32.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-internal/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@next/eslint-plugin-internal",
"private": true,
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"description": "ESLint plugin for working on Next.js.",
"exports": {
".": "./src/eslint-plugin-internal.js"
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-next/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/eslint-plugin-next",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"description": "ESLint plugin for Next.js.",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/font/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@next/font",
"private": true,
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"repository": {
"url": "vercel/next.js",
"directory": "packages/font"
Expand Down
2 changes: 1 addition & 1 deletion packages/next-bundle-analyzer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/bundle-analyzer",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"main": "index.js",
"types": "index.d.ts",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-codemod/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/codemod",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"license": "MIT",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-env/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/env",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"keywords": [
"react",
"next",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-mdx/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/mdx",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"main": "index.js",
"license": "MIT",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/next-playwright/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/playwright",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"repository": {
"url": "vercel/next.js",
"directory": "packages/next-playwright"
Expand Down
2 changes: 1 addition & 1 deletion packages/next-plugin-storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/plugin-storybook",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"repository": {
"url": "vercel/next.js",
"directory": "packages/next-plugin-storybook"
Expand Down
2 changes: 1 addition & 1 deletion packages/next-polyfill-module/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/polyfill-module",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"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",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-polyfill-nomodule/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/polyfill-nomodule",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"description": "A polyfill for non-dead, nomodule browsers.",
"main": "dist/polyfill-nomodule.js",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-routing/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/routing",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"keywords": [
"react",
"next",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-rspack/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "next-rspack",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"repository": {
"url": "vercel/next.js",
"directory": "packages/next-rspack"
Expand Down
2 changes: 1 addition & 1 deletion packages/next-swc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/swc",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"private": true,
"files": [
"native/"
Expand Down
14 changes: 7 additions & 7 deletions packages/next/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "next",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"description": "The React Framework",
"main": "./dist/server/next.js",
"license": "MIT",
Expand Down Expand Up @@ -97,7 +97,7 @@
]
},
"dependencies": {
"@next/env": "16.2.0-canary.98",
"@next/env": "16.2.0-canary.99",
"@swc/helpers": "0.5.15",
"baseline-browser-mapping": "^2.9.19",
"caniuse-lite": "^1.0.30001579",
Expand Down Expand Up @@ -161,11 +161,11 @@
"@modelcontextprotocol/sdk": "1.18.1",
"@mswjs/interceptors": "0.23.0",
"@napi-rs/triples": "1.2.0",
"@next/font": "16.2.0-canary.98",
"@next/polyfill-module": "16.2.0-canary.98",
"@next/polyfill-nomodule": "16.2.0-canary.98",
"@next/react-refresh-utils": "16.2.0-canary.98",
"@next/swc": "16.2.0-canary.98",
"@next/font": "16.2.0-canary.99",
"@next/polyfill-module": "16.2.0-canary.99",
"@next/polyfill-nomodule": "16.2.0-canary.99",
"@next/react-refresh-utils": "16.2.0-canary.99",
"@next/swc": "16.2.0-canary.99",
"@opentelemetry/api": "1.6.0",
"@playwright/test": "1.51.1",
"@rspack/core": "1.6.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-refresh-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/react-refresh-utils",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"description": "An experimental package providing utilities for React Refresh.",
"repository": {
"url": "vercel/next.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/third-parties/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/third-parties",
"version": "16.2.0-canary.98",
"version": "16.2.0-canary.99",
"repository": {
"url": "vercel/next.js",
"directory": "packages/third-parties"
Expand All @@ -26,7 +26,7 @@
"third-party-capital": "1.0.20"
},
"devDependencies": {
"next": "16.2.0-canary.98",
"next": "16.2.0-canary.99",
"outdent": "0.8.0",
"prettier": "2.5.1",
"typescript": "5.9.2"
Expand Down
16 changes: 8 additions & 8 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions turbopack/crates/turbo-tasks-backend/src/backend/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {

let _span = tracing::trace_span!(
"recomputation",
cell_type = get_value_type(cell.type_id).global_name,
cell_type = get_value_type(cell.type_id).ty.global_name,
cell_index = cell.index
)
.entered();
Expand Down Expand Up @@ -3615,7 +3615,11 @@ impl DebugTraceTransientTask {
cell_type_id: Option<ValueTypeId>,
) -> fmt::Result {
if let Some(ty) = cell_type_id {
write!(f, " (read cell of type {})", get_value_type(ty).global_name)
write!(
f,
" (read cell of type {})",
get_value_type(ty).ty.global_name
)
} else {
Ok(())
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ impl std::fmt::Display for TaskDirtyCauseInContext<'_> {
write!(
f,
"{} cell changed",
turbo_tasks::registry::get_value_type(*value_type).name
turbo_tasks::registry::get_value_type(*value_type).ty.name
)
} else {
write!(
f,
"{} cell changed (keys: {})",
turbo_tasks::registry::get_value_type(*value_type).name,
turbo_tasks::registry::get_value_type(*value_type).ty.name,
keys.iter()
.map(|key| match key {
Some(k) => k.to_string(),
Expand All @@ -158,7 +158,7 @@ impl std::fmt::Display for TaskDirtyCauseInContext<'_> {
write!(
f,
"{} cell removed",
turbo_tasks::registry::get_value_type(*value_type).name
turbo_tasks::registry::get_value_type(*value_type).ty.name
)
}
TaskDirtyCause::OutputChange { .. } => {
Expand All @@ -168,7 +168,7 @@ impl std::fmt::Display for TaskDirtyCauseInContext<'_> {
write!(
f,
"{} collectible changed",
turbo_tasks::registry::get_trait(*collectible_type).name
turbo_tasks::registry::get_trait(*collectible_type).ty.name
)
}
TaskDirtyCause::Invalidator => write!(f, "invalidator"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ impl UpdateCellOperation {
&& content != task.get_cell_data(is_serializable_cell_content, cell)
{
let task_description = task.get_task_description();
let cell_type = turbo_tasks::registry::get_value_type(cell.type_id).global_name;
let cell_type = turbo_tasks::registry::get_value_type(cell.type_id)
.ty
.global_name;
eprintln!(
"Task {} updated cell #{} (type: {}) while recomputing",
task_description, cell.index, cell_type
Expand Down
5 changes: 1 addition & 4 deletions turbopack/crates/turbo-tasks-macros/src/func.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1131,14 +1131,11 @@ impl NativeFn {
quote! {
{
#[allow(deprecated)]
const IMPL: &dyn turbo_tasks::task::TaskFn =
const { &#task_fn as &dyn turbo_tasks::task::TaskFn };
#[allow(deprecated)]
turbo_tasks::macro_helpers::NativeFunction::new(
#function_path_string,
#function_global_name,
#arg_meta,
IMPL,
&#task_fn,
#is_root,
)
}
Expand Down
9 changes: 3 additions & 6 deletions turbopack/crates/turbo-tasks-macros/src/function_macro.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,9 @@ pub fn function(args: TokenStream, input: TokenStream) -> TokenStream {
#[doc(hidden)]
#inline_signature #inline_block

static #native_function_ident: #native_function_ty = #native_function_def;

// Register the function for deserialization
turbo_tasks::macro_helpers::inventory_submit! {
turbo_tasks::macro_helpers::CollectableFunction(&#native_function_ident)
}
turbo_tasks::macro_helpers::turbo_register!(
#native_function_ident: #native_function_ty = #native_function_def
);

#(#errors)*
}
Expand Down
Loading
Loading