Merge f9ff34a into e403a44

crates/next-core/src/next_config.rs

@@ -8,7 +8,7 @@ use turbo_tasks::{
     Value,
 };
 use turbo_tasks_env::EnvMapVc;
-use turbo_tasks_fs::json::parse_json_rope_with_source_context;
+use turbo_tasks_fs::{json::parse_json_rope_with_source_context, FileSystemPathVc};
 use turbopack::{
     evaluate_context::node_evaluate_asset_context,
     module_options::{WebpackLoadersOptions, WebpackLoadersOptionsVc},
@@ -600,3 +600,11 @@ pub async fn load_next_config(execution_context: ExecutionContextVc) -> Result<N
         }
     }
 }
+
+#[turbo_tasks::function]
+pub async fn has_next_config(context: FileSystemPathVc) -> Result<BoolVc> {
+    Ok(BoolVc::cell(matches!(
+        *find_context_file(context, next_configs()).await?,
+        FindContextFileResult::NotFound(_)
+    )))
+}

crates/next-core/src/router_source.rs

@@ -9,7 +9,10 @@ use turbopack_dev_server::source::{
 };
 use turbopack_node::execution_context::ExecutionContextVc;
 
-use crate::router::{route, RouterRequest, RouterResult};
+use crate::{
+    next_config::has_next_config,
+    router::{route, RouterRequest, RouterResult},
+};
 
 #[turbo_tasks::value(shared)]
 pub struct NextRouterContentSource {
@@ -60,6 +63,16 @@ impl ContentSource for NextRouterContentSource {
     ) -> Result<ContentSourceResultVc> {
         let this = self_vc.await?;
 
+        // The next-dev server can currently run against projects as simple as
+        // `index.js`. If this isn't a Next.js project, don't try to use the Next.js
+        // router.
+        let project_root = this.execution_context.await?.project_root;
+        if *(has_next_config(project_root).await?) {
+            return Ok(this
+                .inner
+                .get(path, Value::new(ContentSourceData::default())));
+        }
+
         let ContentSourceData {
             method: Some(method),
             raw_headers: Some(raw_headers),

crates/next-dev-tests/Cargo.toml

@@ -30,7 +30,6 @@ lazy_static = "1.4.0"
 mime = "0.3.16"
 next-core = { path = "../next-core" }
 next-dev = { path = "../next-dev" }
-once_cell = "1.13.0"
 owo-colors = "3"
 parking_lot = "0.12.1"
 rand = "0.8.5"
@@ -53,6 +52,7 @@ turbopack-cli-utils = { path = "../turbopack-cli-utils" }
 turbopack-core = { path = "../turbopack-core" }
 turbopack-dev-server = { path = "../turbopack-dev-server" }
 turbopack-node = { path = "../turbopack-node" }
+turbopack-test-utils = { path = "../turbopack-test-utils" }
 url = "2.2.2"
 webbrowser = "0.7.1"
 

crates/next-dev-tests/build.rs

@@ -1,6 +1,7 @@
-use turbo_tasks_build::rerun_if_glob;
+use turbo_tasks_build::{generate_register, rerun_if_glob};
 
 fn main() {
+    generate_register();
     // The test/integration crate need to be rebuilt if any test input is changed.
     // Unfortunately, we can't have the build.rs file operate differently on
     // each file, so the entire next-dev crate needs to be rebuilt.

crates/next-dev-tests/tests/integration.rs

@@ -1,3 +1,4 @@
+#![feature(min_specialization)]
 #![cfg(test)]
 extern crate test_generator;
 
@@ -25,16 +26,29 @@ use chromiumoxide::{
 };
 use futures::StreamExt;
 use lazy_static::lazy_static;
-use next_dev::{register, EntryRequest, NextDevServerBuilder};
+use next_dev::{EntryRequest, NextDevServerBuilder};
 use owo_colors::OwoColorize;
 use serde::Deserialize;
 use test_generator::test_resources;
-use tokio::{net::TcpSocket, task::JoinSet};
+use tokio::{
+    net::TcpSocket,
+    sync::mpsc::{channel, Sender},
+    task::JoinSet,
+};
 use tungstenite::{error::ProtocolError::ResetWithoutClosingHandshake, Error::Protocol};
-use turbo_tasks::TurboTasks;
-use turbo_tasks_fs::util::sys_to_unix;
+use turbo_tasks::{
+    NothingVc, RawVc, ReadRef, State, TransientInstance, TransientValue, TurboTasks,
+};
+use turbo_tasks_fs::{util::sys_to_unix, DiskFileSystemVc, FileSystem};
 use turbo_tasks_memory::MemoryBackend;
 use turbo_tasks_testing::retry::retry_async;
+use turbopack_core::issue::{CapturedIssues, IssueReporter, IssueReporterVc, PlainIssueReadRef};
+use turbopack_test_utils::snapshot::snapshot_issues;
+
+fn register() {
+    next_dev::register();
+    include!(concat!(env!("OUT_DIR"), "/register_test_integration.rs"));
+}
 
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -155,16 +169,25 @@ async fn run_test(resource: &str) -> JestRunResult {
     );
 
     let package_root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    let workspace_root = package_root.parent().unwrap().parent().unwrap();
-    let project_dir = workspace_root.join(resource).join("input");
+    let workspace_root = package_root
+        .parent()
+        .unwrap()
+        .parent()
+        .unwrap()
+        .to_path_buf();
+    let test_dir = workspace_root.join(resource);
+    let project_dir = test_dir.join("input");
     let requested_addr = get_free_local_addr().unwrap();
 
     let mock_dir = path.join("__httpmock__");
     let mock_server_future = get_mock_server_future(&mock_dir);
 
-    let turbo_tasks = TurboTasks::new(MemoryBackend::default());
+    let (issue_tx, mut issue_rx) = channel(u16::MAX as usize);
+    let issue_tx = TransientInstance::new(issue_tx);
+
+    let tt = TurboTasks::new(MemoryBackend::default());
     let server = NextDevServerBuilder::new(
-        turbo_tasks,
+        tt.clone(),
         sys_to_unix(&project_dir.to_string_lossy()).to_string(),
         sys_to_unix(&workspace_root.to_string_lossy()).to_string(),
     )
@@ -178,6 +201,9 @@ async fn run_test(resource: &str) -> JestRunResult {
     .port(requested_addr.port())
     .log_level(turbopack_core::issue::IssueSeverity::Warning)
     .log_detail(true)
+    .issue_reporter(Box::new(move || {
+        TestIssueReporterVc::new(issue_tx.clone()).into()
+    }))
     .show_all(true)
     .build()
     .await
@@ -198,6 +224,29 @@ async fn run_test(resource: &str) -> JestRunResult {
 
     env::remove_var("TURBOPACK_TEST_ONLY_MOCK_SERVER");
 
+    let task = tt.spawn_once_task(async move {
+        let issues_fs = DiskFileSystemVc::new(
+            "issues".to_string(),
+            test_dir.join("issues").to_string_lossy().to_string(),
+        )
+        .as_file_system();
+
+        let mut issues = vec![];
+        while let Ok(issue) = issue_rx.try_recv() {
+            issues.push(issue);
+        }
+
+        snapshot_issues(
+            issues.iter().cloned(),
+            issues_fs.root(),
+            &workspace_root.to_string_lossy(),
+        )
+        .await?;
+
+        Ok(NothingVc::new().into())
+    });
+    tt.wait_task_completion(task, true).await.unwrap();
+
     result
 }
 
@@ -414,3 +463,37 @@ async fn get_mock_server_future(mock_dir: &Path) -> Result<(), String> {
         std::future::pending::<Result<(), String>>().await
     }
 }
+
+#[turbo_tasks::value(shared)]
+struct TestIssueReporter {
+    #[turbo_tasks(trace_ignore, debug_ignore)]
+    pub issue_tx: State<Sender<PlainIssueReadRef>>,
+}
+
+#[turbo_tasks::value_impl]
+impl TestIssueReporterVc {
+    #[turbo_tasks::function]
+    fn new(issue_tx: TransientInstance<Sender<PlainIssueReadRef>>) -> Self {
+        TestIssueReporter {
+            issue_tx: State::new((*issue_tx).clone()),
+        }
+        .cell()
+    }
+}
+
+#[turbo_tasks::value_impl]
+impl IssueReporter for TestIssueReporter {
+    #[turbo_tasks::function]
+    async fn report_issues(
+        &self,
+        captured_issues: TransientInstance<ReadRef<CapturedIssues>>,
+        _source: TransientValue<RawVc>,
+    ) -> Result<()> {
+        let issue_tx = self.issue_tx.get_untracked().clone();
+        for issue in captured_issues.iter() {
+            issue_tx.send(issue.into_plain().await?).await?;
+        }
+
+        Ok(())
+    }
+}

crates/next-dev-tests/tests/integration/next/tailwind/basic/issues/lint TP1004 fs.existsSync(???__star__0__star__) is very dynamic-c19e79.txt

@@ -0,0 +1,50 @@
+PlainIssue {
+    severity: Warning,
+    context: "[project-with-next]/node_modules/.pnpm/postcss@8.4.20/node_modules/postcss/lib/previous-map.js",
+    category: "parse",
+    title: "lint TP1004 fs.existsSync(???*0*) is very dynamic",
+    description: "- *0* arguments[0]\n  ⚠\u{fe0f}  function calls are not analysed yet",
+    detail: "",
+    documentation_link: "",
+    source: Some(
+        PlainIssueSource {
+            asset: PlainAsset {
+                path: FileSystemPath {
+                    fs: FileSystemVc {
+                        node: TaskCell(
+                            TaskId {
+                                id: 1674,
+                            },
+                            CellId {
+                                type_id: ValueTypeId {
+                                    id: 31,
+                                    name: "turbo-tasks-fs@TODO::::attach::AttachedFileSystem",
+                                },
+                                index: 0,
+                            },
+                        ),
+                    },
+                    path: "node_modules/.pnpm/postcss@8.4.20/node_modules/postcss/lib/previous-map.js",
+                },
+                content: Content(
+                    File {
+                        meta: FileMeta {
+                            permissions: Writable,
+                            content_type: None,
+                        },
+                        content (hash): 14360826439174780891,
+                    },
+                ),
+            },
+            start: SourcePos {
+                line: 87,
+                column: 8,
+            },
+            end: SourcePos {
+                line: 87,
+                column: 8,
+            },
+        },
+    ),
+    sub_issues: [],
+}

crates/next-dev-tests/tests/integration/next/tailwind/basic/issues/lint TP1004 fs.readFileSync(???__star__0__star__, "utf-8") is very dynamic-58d7af.txt

@@ -0,0 +1,50 @@
+PlainIssue {
+    severity: Warning,
+    context: "[project-with-next]/node_modules/.pnpm/postcss@8.4.20/node_modules/postcss/lib/previous-map.js",
+    category: "parse",
+    title: "lint TP1004 fs.readFileSync(???*0*, \"utf-8\") is very dynamic",
+    description: "- *0* arguments[0]\n  ⚠\u{fe0f}  function calls are not analysed yet",
+    detail: "",
+    documentation_link: "",
+    source: Some(
+        PlainIssueSource {
+            asset: PlainAsset {
+                path: FileSystemPath {
+                    fs: FileSystemVc {
+                        node: TaskCell(
+                            TaskId {
+                                id: 1674,
+                            },
+                            CellId {
+                                type_id: ValueTypeId {
+                                    id: 31,
+                                    name: "turbo-tasks-fs@TODO::::attach::AttachedFileSystem",
+                                },
+                                index: 0,
+                            },
+                        ),
+                    },
+                    path: "node_modules/.pnpm/postcss@8.4.20/node_modules/postcss/lib/previous-map.js",
+                },
+                content: Content(
+                    File {
+                        meta: FileMeta {
+                            permissions: Writable,
+                            content_type: None,
+                        },
+                        content (hash): 14360826439174780891,
+                    },
+                ),
+            },
+            start: SourcePos {
+                line: 89,
+                column: 13,
+            },
+            end: SourcePos {
+                line: 89,
+                column: 13,
+            },
+        },
+    ),
+    sub_issues: [],
+}