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: 1 addition & 0 deletions Cargo.lock

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

12 changes: 3 additions & 9 deletions crates/next-core/src/hmr_entry.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::io::Write;

use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_rcstr::rcstr;
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{FileSystem, VirtualFileSystem, rope::RopeBuilder};
use turbopack_core::{
Expand Down Expand Up @@ -143,6 +143,8 @@ impl EcmascriptChunkPlaceable for HmrEntryModule {
impl EvaluatableAsset for HmrEntryModule {}

#[turbo_tasks::value]
#[derive(ValueToString)]
#[value_to_string("entry")]
pub struct HmrEntryModuleReference {
pub module: ResolvedVc<Box<dyn Module>>,
}
Expand All @@ -155,14 +157,6 @@ impl HmrEntryModuleReference {
}
}

#[turbo_tasks::value_impl]
impl ValueToString for HmrEntryModuleReference {
#[turbo_tasks::function]
fn to_string(&self) -> Vc<RcStr> {
Vc::cell(rcstr!("entry"))
}
}

#[turbo_tasks::value_impl]
impl ModuleReference for HmrEntryModuleReference {
#[turbo_tasks::function]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_rcstr::rcstr;
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::FileContent;
use turbopack_core::{
Expand Down Expand Up @@ -78,6 +78,8 @@ impl Asset for CssClientReferenceModule {
}

#[turbo_tasks::value]
#[derive(ValueToString)]
#[value_to_string("css client reference to client")]
pub(crate) struct CssClientReference {
module: ResolvedVc<Box<dyn Module>>,
}
Expand Down Expand Up @@ -105,11 +107,3 @@ impl ModuleReference for CssClientReference {
}))
}
}

#[turbo_tasks::value_impl]
impl ValueToString for CssClientReference {
#[turbo_tasks::function]
fn to_string(&self) -> Vc<RcStr> {
Vc::cell(rcstr!("css client reference to client"))
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,8 @@ impl EcmascriptChunkItem for EcmascriptClientReferenceProxyChunkItem {
}

#[turbo_tasks::value]
#[derive(ValueToString)]
#[value_to_string(self.description)]
pub(crate) struct EcmascriptClientReference {
module: ResolvedVc<Box<dyn Module>>,
ty: ChunkGroupType,
Expand Down Expand Up @@ -390,11 +392,3 @@ impl ModuleReference for EcmascriptClientReference {
}))
}
}

#[turbo_tasks::value_impl]
impl ValueToString for EcmascriptClientReference {
#[turbo_tasks::function]
fn to_string(&self) -> Vc<RcStr> {
Vc::cell(self.description.clone())
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use anyhow::Result;
use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbopack_core::{
chunk::{ChunkingType, ChunkingTypeOption},
Expand All @@ -9,6 +7,8 @@ use turbopack_core::{
};

#[turbo_tasks::value]
#[derive(ValueToString)]
#[value_to_string("Next.js Server Component {}", self.asset.ident())]
pub struct NextServerComponentModuleReference {
asset: ResolvedVc<Box<dyn Module>>,
}
Expand All @@ -21,20 +21,6 @@ impl NextServerComponentModuleReference {
}
}

#[turbo_tasks::value_impl]
impl ValueToString for NextServerComponentModuleReference {
#[turbo_tasks::function]
async fn to_string(&self) -> Result<Vc<RcStr>> {
Ok(Vc::cell(
format!(
"Next.js Server Component {}",
self.asset.ident().to_string().await?
)
.into(),
))
}
}

#[turbo_tasks::value_impl]
impl ModuleReference for NextServerComponentModuleReference {
#[turbo_tasks::function]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use anyhow::Result;
use once_cell::sync::Lazy;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
Expand All @@ -10,6 +9,8 @@ use turbopack_core::{
};

#[turbo_tasks::value]
#[derive(ValueToString)]
#[value_to_string("Next.js server utility {}", self.asset.ident())]
pub struct NextServerUtilityModuleReference {
asset: ResolvedVc<Box<dyn Module>>,
}
Expand All @@ -22,20 +23,6 @@ impl NextServerUtilityModuleReference {
}
}

#[turbo_tasks::value_impl]
impl ValueToString for NextServerUtilityModuleReference {
#[turbo_tasks::function]
async fn to_string(&self) -> Result<Vc<RcStr>> {
Ok(Vc::cell(
format!(
"Next.js server utility {}",
self.asset.ident().to_string().await?
)
.into(),
))
}
}

pub static NEXT_SERVER_UTILITY_MERGE_TAG: Lazy<RcStr> = Lazy::new(|| rcstr!("next-server-utility"));

#[turbo_tasks::value_impl]
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.40"
"version": "16.2.0-canary.41"
}
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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"@next/eslint-plugin-next": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"main": "index.js",
"license": "MIT",
"repository": {
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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"@next/env": "16.2.0-canary.41",
"@swc/helpers": "0.5.15",
"baseline-browser-mapping": "^2.9.19",
"caniuse-lite": "^1.0.30001579",
Expand Down Expand Up @@ -162,11 +162,11 @@
"@modelcontextprotocol/sdk": "1.18.1",
"@mswjs/interceptors": "0.23.0",
"@napi-rs/triples": "1.2.0",
"@next/font": "16.2.0-canary.40",
"@next/polyfill-module": "16.2.0-canary.40",
"@next/polyfill-nomodule": "16.2.0-canary.40",
"@next/react-refresh-utils": "16.2.0-canary.40",
"@next/swc": "16.2.0-canary.40",
"@next/font": "16.2.0-canary.41",
"@next/polyfill-module": "16.2.0-canary.41",
"@next/polyfill-nomodule": "16.2.0-canary.41",
"@next/react-refresh-utils": "16.2.0-canary.41",
"@next/swc": "16.2.0-canary.41",
"@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.40",
"version": "16.2.0-canary.41",
"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.40",
"version": "16.2.0-canary.41",
"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.40",
"next": "16.2.0-canary.41",
"outdent": "0.8.0",
"prettier": "2.5.1",
"typescript": "5.9.2"
Expand Down
Loading
Loading