Fix Next.js 11 React version (vercel/turborepo#333)

crates/next-dev/benches/bundlers.rs

@@ -1,4 +1,5 @@
 use std::{
+    fmt::Display,
     fs::{self, File},
     io::{self, BufRead, BufReader, Write},
     path::Path,
@@ -7,13 +8,15 @@ use std::{
 
 use anyhow::{anyhow, Context, Result};
 use regex::Regex;
-use tempfile::TempDir;
 
 pub trait Bundler {
     fn get_name(&self) -> &str;
     fn get_path(&self) -> &str {
         "/"
     }
+    fn react_version(&self) -> &str {
+        "^18.2.0"
+    }
     fn prepare(&self, _template_dir: &Path) -> Result<()> {
         Ok(())
     }
@@ -128,19 +131,11 @@ impl Bundler for Parcel {
     }
 }
 
-struct Vite {
-    install_dir: TempDir,
-}
+struct Vite {}
 
 impl Vite {
-    fn new() -> Result<Self> {
-        // Manage our own installation and avoid `npm exec`, `npx`, etc. to avoid their
-        // overhead influencing benchmarks.
-        let install_dir = tempfile::tempdir()?;
-        install_from_npm(install_dir.path(), "vite", "3.0.9")
-            .context("failed to install `vite` module")?;
-
-        Ok(Vite { install_dir })
+    fn new() -> Self {
+        Vite {}
     }
 }
 
@@ -149,12 +144,16 @@ impl Bundler for Vite {
         "Vite CSR"
     }
 
+    fn prepare(&self, install_dir: &Path) -> Result<()> {
+        install_from_npm(install_dir, "vite", "3.0.9")
+            .context("failed to install `vite` module")?;
+        Ok(())
+    }
+
     fn start_server(&self, test_dir: &Path) -> Result<(Child, String)> {
         let mut proc = Command::new("node")
             .args([
-                (self
-                    .install_dir
-                    .path()
+                (test_dir
                     .join("node_modules")
                     .join("vite")
                     .join("bin")
@@ -183,16 +182,17 @@ impl Bundler for Vite {
     }
 }
 
+#[derive(Debug)]
 struct NextJs {
-    version: u32,
+    version: NextJsVersion,
     name: String,
 }
 
 impl NextJs {
-    fn new(version: u32) -> Self {
+    fn new(version: NextJsVersion) -> Self {
         Self {
+            name: format!("{version} SSR"),
             version,
-            name: format!("Next.js {version} SSR"),
         }
     }
 }
@@ -206,8 +206,12 @@ impl Bundler for NextJs {
         "/page"
     }
 
+    fn react_version(&self) -> &str {
+        self.version.react_version()
+    }
+
     fn prepare(&self, install_dir: &Path) -> Result<()> {
-        install_from_npm(install_dir, "next", &format!("^{}", self.version))
+        install_from_npm(install_dir, "next", self.version.version())
             .context("failed to install `next` module")?;
         Ok(())
     }
@@ -251,7 +255,41 @@ impl Bundler for NextJs {
     }
 }
 
-pub fn get_bundlers() -> Result<Vec<Box<dyn Bundler>>> {
+#[derive(Debug)]
+enum NextJsVersion {
+    V11,
+    V12,
+}
+
+impl Display for NextJsVersion {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            NextJsVersion::V11 => write!(f, "Next.js 11"),
+            NextJsVersion::V12 => write!(f, "Next.js 12"),
+        }
+    }
+}
+
+impl NextJsVersion {
+    /// Returns the version of Next.js to install from npm.
+    pub fn version(&self) -> &'static str {
+        match self {
+            NextJsVersion::V11 => "^11",
+            NextJsVersion::V12 => "^12",
+        }
+    }
+
+    /// Returns the version of React to install from npm alongside this version
+    /// of Next.js.
+    pub fn react_version(&self) -> &'static str {
+        match self {
+            NextJsVersion::V11 => "^17.0.2",
+            NextJsVersion::V12 => "^18.2.0",
+        }
+    }
+}
+
+pub fn get_bundlers() -> Vec<Box<dyn Bundler>> {
     let config = std::env::var("TURBOPACK_BENCH_BUNDLERS").ok();
     let mut turbopack = false;
     let mut others = false;
@@ -274,12 +312,12 @@ pub fn get_bundlers() -> Result<Vec<Box<dyn Bundler>>> {
 
     if others {
         bundlers.push(Box::new(Parcel {}));
-        bundlers.push(Box::new(Vite::new()?));
-        bundlers.push(Box::new(NextJs::new(12)));
-        bundlers.push(Box::new(NextJs::new(11)));
+        bundlers.push(Box::new(Vite::new()));
+        bundlers.push(Box::new(NextJs::new(NextJsVersion::V12)));
+        bundlers.push(Box::new(NextJs::new(NextJsVersion::V11)));
     }
 
-    Ok(bundlers)
+    bundlers
 }
 
 fn wait_for_match(stdout: &mut ChildStdout, re: Regex) -> Option<String> {

crates/next-dev/benches/mod.rs

@@ -28,7 +28,7 @@ use tokio::{
     time::{sleep, timeout},
 };
 use tungstenite::{error::ProtocolError::ResetWithoutClosingHandshake, Error::Protocol};
-use turbopack_create_test_app::test_app_builder::{TestApp, TestAppBuilder};
+use turbopack_create_test_app::test_app_builder::{PackageJsonConfig, TestApp, TestAppBuilder};
 use url::Url;
 
 mod bundlers;
@@ -135,7 +135,7 @@ fn bench_startup_internal(mut g: BenchmarkGroup<WallTime>, wait_for_hydration: b
     let runtime = Runtime::new().unwrap();
     let browser = &runtime.block_on(create_browser());
 
-    for bundler in retry_default((), |_| get_bundlers()).expect("failed to get bundlers") {
+    for bundler in get_bundlers() {
         for module_count in get_module_counts() {
             let input = (bundler.as_ref(), module_count);
             g.bench_with_input(
@@ -178,7 +178,7 @@ fn bench_simple_file_change(c: &mut Criterion) {
     let runtime = Runtime::new().unwrap();
     let browser = &runtime.block_on(create_browser());
 
-    for bundler in retry_default((), |_| get_bundlers()).expect("failed to get bundlers") {
+    for bundler in get_bundlers() {
         for module_count in get_module_counts() {
             let input = (bundler.as_ref(), module_count);
             g.bench_with_input(
@@ -265,7 +265,7 @@ fn bench_restart(c: &mut Criterion) {
     let runtime = Runtime::new().unwrap();
     let browser = &runtime.block_on(create_browser());
 
-    for bundler in retry_default((), |_| get_bundlers()).expect("failed to get bundlers") {
+    for bundler in get_bundlers() {
         for module_count in get_module_counts() {
             let input = (bundler.as_ref(), module_count);
 
@@ -512,7 +512,9 @@ fn build_test(module_count: usize, bundler: &dyn Bundler) -> TestApp {
     let test_app = TestAppBuilder {
         module_count,
         directories_count: module_count / 20,
-        package_json: true,
+        package_json: Some(PackageJsonConfig {
+            react_version: bundler.react_version().to_string(),
+        }),
         ..Default::default()
     }
     .build()