Merge branch 'canary' into patch-3

Author: sevtdy

Cargo.lock

@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer-ui",
-  "version": "16.0.2-canary.16",
+  "version": "16.0.2-canary.27",
   "private": true,
   "scripts": {
     "build": "cross-env NEXT_TEST_NATIVE_DIR=no next build --no-mangling",

apps/bundle-analyzer/package.json

@@ -27,7 +27,9 @@
     "**/*.ts",
     "**/*.tsx",
     ".next/types/**/*.ts",
-    ".next/dev/types/**/*.ts"
+    ".next/dev/types/**/*.ts",
+    "dist/types/**/*.ts",
+    "dist/dev/types/**/*.ts"
   ],
   "exclude": ["node_modules"]
 }

apps/bundle-analyzer/tsconfig.json

@@ -21,6 +21,7 @@ use next_api::{
         ProjectOptions, WatchOptions,
     },
     route::Endpoint,
+    routes_hashes_manifest::routes_hashes_manifest_asset_if_enabled,
 };
 use next_core::tracing_presets::{
     TRACING_NEXT_OVERVIEW_TARGETS, TRACING_NEXT_TARGETS, TRACING_NEXT_TURBO_TASKS_TARGETS,
@@ -175,6 +176,9 @@ pub struct NapiProjectOptions {
     /// debugging/profiling purposes.
     pub no_mangling: bool,
 
+    /// Whether to write the route hashes manifest.
+    pub write_routes_hashes_manifest: bool,
+
     /// The version of Node.js that is available/currently running.
     pub current_node_js_version: RcStr,
 }
@@ -220,6 +224,9 @@ pub struct NapiPartialProjectOptions {
     /// The browserslist query to use for targeting browsers.
     pub browserslist_query: Option<RcStr>,
 
+    /// Whether to write the route hashes manifest.
+    pub write_routes_hashes_manifest: Option<bool>,
+
     /// When the code is minified, this opts out of the default mangling of
     /// local names for variables, functions etc., which can be useful for
     /// debugging/profiling purposes.
@@ -277,6 +284,7 @@ impl From<NapiProjectOptions> for ProjectOptions {
             preview_props,
             browserslist_query,
             no_mangling,
+            write_routes_hashes_manifest,
             current_node_js_version,
         } = val;
         ProjectOptions {
@@ -292,6 +300,7 @@ impl From<NapiProjectOptions> for ProjectOptions {
             preview_props: preview_props.into(),
             browserslist_query,
             no_mangling,
+            write_routes_hashes_manifest,
             current_node_js_version,
         }
     }
@@ -312,6 +321,7 @@ impl From<NapiPartialProjectOptions> for PartialProjectOptions {
             preview_props,
             browserslist_query,
             no_mangling,
+            write_routes_hashes_manifest,
         } = val;
         PartialProjectOptions {
             root_path,
@@ -326,6 +336,7 @@ impl From<NapiPartialProjectOptions> for PartialProjectOptions {
             preview_props: preview_props.map(|props| props.into()),
             browserslist_query,
             no_mangling,
+            write_routes_hashes_manifest,
         }
     }
 }
@@ -1057,12 +1068,15 @@ async fn output_assets_operation(
 
     let nft = next_server_nft_assets(project).await?;
 
+    let routes_hashes_manifest = routes_hashes_manifest_asset_if_enabled(project).await?;
+
     whole_app_module_graphs.as_side_effect().await?;
 
     Ok(Vc::cell(
         output_assets
             .into_iter()
             .chain(nft.iter().copied())
+            .chain(routes_hashes_manifest.iter().copied())
             .collect(),
     ))
 }

crates/napi/src/next_api/project.rs

@@ -28,6 +28,7 @@ swc_core = { workspace = true }
 tracing = { workspace = true }
 turbo-rcstr = { workspace = true }
 turbo-tasks = { workspace = true }
+turbo-tasks-hash = { workspace = true }
 turbo-tasks-env = { workspace = true }
 turbo-tasks-fs = { workspace = true }
 turbo-unix-path = { workspace = true }
@@ -39,6 +40,7 @@ turbopack-ecmascript = { workspace = true }
 turbopack-node = { workspace = true }
 turbopack-nodejs = { workspace = true }
 turbopack-wasm = { workspace = true }
+urlencoding = { workspace = true }
 
 [dev-dependencies]
 turbo-tasks-malloc = { workspace = true }

crates/next-api/Cargo.toml

@@ -1,4 +1,4 @@
-use std::io::Write;
+use std::{borrow::Cow, io::Write};
 
 use anyhow::Result;
 use byteorder::{BE, WriteBytesExt};
@@ -23,7 +23,7 @@ use turbopack_core::{
     reference::all_assets_from_entries,
 };
 
-use crate::route::{Endpoint, ModuleGraphs};
+use crate::route::ModuleGraphs;
 
 #[derive(
     Default, Clone, Debug, Deserialize, Eq, NonLocalValue, PartialEq, Serialize, TraceRawVcs,
@@ -371,9 +371,16 @@ pub async fn analyze_output_assets(output_assets: Vc<OutputAssets>) -> Result<Vc
         let output_file_index = builder.add_output_file(AnalyzeOutputFile { filename });
         let chunk_parts = split_output_asset_into_parts(*asset).await?;
         for chunk_part in chunk_parts {
-            let source_index = builder
-                .ensure_source(chunk_part.source.trim_start_matches(&prefix))
-                .1;
+            let decoded_source = urlencoding::decode(&chunk_part.source)?;
+            let source = if let Some(stripped) = decoded_source.strip_prefix(&prefix) {
+                Cow::Borrowed(stripped)
+            } else {
+                Cow::Owned(format!(
+                    "[project]/{}",
+                    decoded_source.trim_start_matches("../")
+                ))
+            };
+            let source_index = builder.ensure_source(&source).1;
             let chunk_part_index = builder.add_chunk_part(AnalyzeChunkPart {
                 source_index,
                 output_file_index,
@@ -533,13 +540,6 @@ pub async fn analyze_module_graphs(module_graphs: Vc<ModuleGraphs>) -> Result<Vc
     Ok(FileContent::Content(File::from(rope)).cell())
 }
 
-#[turbo_tasks::function]
-pub async fn analyze_endpoint(endpoint: Vc<Box<dyn Endpoint>>) -> Result<Vc<FileContent>> {
-    Ok(analyze_output_assets(
-        *endpoint.output().await?.output_assets,
-    ))
-}
-
 #[turbo_tasks::value]
 pub struct AnalyzeDataOutputAsset {
     pub path: FileSystemPath,
@@ -549,10 +549,13 @@ pub struct AnalyzeDataOutputAsset {
 #[turbo_tasks::value_impl]
 impl AnalyzeDataOutputAsset {
     #[turbo_tasks::function]
-    pub async fn new(path: FileSystemPath, output_assets: Vc<OutputAssets>) -> Result<Vc<Self>> {
+    pub async fn new(
+        path: FileSystemPath,
+        output_assets: ResolvedVc<OutputAssets>,
+    ) -> Result<Vc<Self>> {
         Ok(Self {
             path,
-            output_assets: output_assets.to_resolved().await?,
+            output_assets,
         }
         .cell())
     }

crates/next-api/src/analyze.rs

@@ -21,6 +21,7 @@ mod pages;
 pub mod paths;
 pub mod project;
 pub mod route;
+pub mod routes_hashes_manifest;
 mod server_actions;
 mod versioned_content_map;
 mod webpack_stats;

crates/next-api/src/lib.rs

@@ -1713,7 +1713,11 @@ impl Endpoint for PageEndpoint {
     async fn module_graphs(self: Vc<Self>) -> Result<Vc<ModuleGraphs>> {
         let client_module_graph = self.client_module_graph().to_resolved().await?;
         let ssr_module_graph = self.ssr_module_graph().to_resolved().await?;
-        Ok(Vc::cell(vec![client_module_graph, ssr_module_graph]))
+        Ok(Vc::cell(if client_module_graph != ssr_module_graph {
+            vec![client_module_graph, ssr_module_graph]
+        } else {
+            vec![ssr_module_graph]
+        }))
     }
 }
 

crates/next-api/src/pages.rs

@@ -189,6 +189,9 @@ pub struct ProjectOptions {
     /// debugging/profiling purposes.
     pub no_mangling: bool,
 
+    /// Whether to write the route hashes manifest.
+    pub write_routes_hashes_manifest: bool,
+
     /// The version of Node.js that is available/currently running.
     pub current_node_js_version: RcStr,
 }
@@ -237,6 +240,9 @@ pub struct PartialProjectOptions {
     /// local names for variables, functions etc., which can be useful for
     /// debugging/profiling purposes.
     pub no_mangling: Option<bool>,
+
+    /// Whether to write the route hashes manifest.
+    pub write_routes_hashes_manifest: Option<bool>,
 }
 
 #[derive(
@@ -357,6 +363,7 @@ impl ProjectContainer {
             preview_props,
             browserslist_query,
             no_mangling,
+            write_routes_hashes_manifest,
         } = options;
 
         let resolved_self = self.to_resolved().await?;
@@ -404,6 +411,9 @@ impl ProjectContainer {
         if let Some(no_mangling) = no_mangling {
             new_options.no_mangling = no_mangling;
         }
+        if let Some(write_routes_hashes_manifest) = write_routes_hashes_manifest {
+            new_options.write_routes_hashes_manifest = write_routes_hashes_manifest;
+        }
 
         // TODO: Handle mode switch, should prevent mode being switched.
         let watch = new_options.watch;
@@ -468,6 +478,7 @@ impl ProjectContainer {
         let preview_props;
         let browserslist_query;
         let no_mangling;
+        let write_routes_hashes_manifest;
         let current_node_js_version;
         {
             let options = self.options_state.get();
@@ -491,6 +502,7 @@ impl ProjectContainer {
             preview_props = options.preview_props.clone();
             browserslist_query = options.browserslist_query.clone();
             no_mangling = options.no_mangling;
+            write_routes_hashes_manifest = options.write_routes_hashes_manifest;
             current_node_js_version = options.current_node_js_version.clone();
         }
 
@@ -516,6 +528,7 @@ impl ProjectContainer {
             encryption_key,
             preview_props,
             no_mangling,
+            write_routes_hashes_manifest,
             current_node_js_version,
         }
         .cell())
@@ -603,6 +616,9 @@ pub struct Project {
     /// debugging/profiling purposes.
     no_mangling: bool,
 
+    /// Whether to write the route hashes manifest.
+    write_routes_hashes_manifest: bool,
+
     current_node_js_version: RcStr,
 }
 
@@ -823,6 +839,11 @@ impl Project {
         Ok(Vc::cell(self.watch.enable))
     }
 
+    #[turbo_tasks::function]
+    pub(super) fn should_write_routes_hashes_manifest(&self) -> Result<Vc<bool>> {
+        Ok(Vc::cell(self.write_routes_hashes_manifest))
+    }
+
     #[turbo_tasks::function]
     pub(super) async fn per_page_module_graph(&self) -> Result<Vc<bool>> {
         Ok(Vc::cell(*self.mode.await? == NextMode::Development))