From 53442039234c6342a42988ce94e59b9bb8b31726 Mon Sep 17 00:00:00 2001 From: eps1lon Date: Wed, 1 May 2024 23:24:29 +0200 Subject: [PATCH] Collapse if because that's what Clippy wants --- .../crates/next-core/src/next_import_map.rs | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/packages/next-swc/crates/next-core/src/next_import_map.rs b/packages/next-swc/crates/next-core/src/next_import_map.rs index f33bd8099ef2..26c1e67c7011 100644 --- a/packages/next-swc/crates/next-core/src/next_import_map.rs +++ b/packages/next-swc/crates/next-core/src/next_import_map.rs @@ -728,23 +728,21 @@ async fn rsc_aliases( } } - if runtime == NextRuntime::Edge { - if ty.supports_react_server() { - alias.extend(indexmap! { - "react" => format!("next/dist/compiled/react{react_channel}/react.react-server"), - "next/dist/compiled/react" => format!("next/dist/compiled/react{react_channel}/react.react-server"), - "next/dist/compiled/react-experimental" => format!("next/dist/compiled/react-experimental/react.react-server"), - "react/jsx-runtime" => format!("next/dist/compiled/react{react_channel}/jsx-runtime.react-server"), - "next/dist/compiled/react/jsx-runtime" => format!("next/dist/compiled/react{react_channel}/jsx-runtime.react-server"), - "next/dist/compiled/react-experimental/jsx-runtime" => format!("next/dist/compiled/react-experimental/jsx-runtime.react-server"), - "react/jsx-dev-runtime" => format!("next/dist/compiled/react{react_channel}/jsx-dev-runtime.react-server"), - "next/dist/compiled/react/jsx-dev-runtime" => format!("next/dist/compiled/react{react_channel}/jsx-dev-runtime.react-server"), - "next/dist/compiled/react-experimental/jsx-dev-runtime" => format!("next/dist/compiled/react-experimental/jsx-dev-runtime.react-server"), - "react-dom" => format!("next/dist/compiled/react-dom{react_channel}/react-dom.react-server"), - "next/dist/compiled/react-dom" => format!("next/dist/compiled/react-dom{react_channel}/react-dom.react-server"), - "next/dist/compiled/react-dom-experimental" => format!("next/dist/compiled/react-dom-experimental/react-dom.react-server"), - }) - } + if runtime == NextRuntime::Edge && ty.supports_react_server() { + alias.extend(indexmap! { + "react" => format!("next/dist/compiled/react{react_channel}/react.react-server"), + "next/dist/compiled/react" => format!("next/dist/compiled/react{react_channel}/react.react-server"), + "next/dist/compiled/react-experimental" => format!("next/dist/compiled/react-experimental/react.react-server"), + "react/jsx-runtime" => format!("next/dist/compiled/react{react_channel}/jsx-runtime.react-server"), + "next/dist/compiled/react/jsx-runtime" => format!("next/dist/compiled/react{react_channel}/jsx-runtime.react-server"), + "next/dist/compiled/react-experimental/jsx-runtime" => format!("next/dist/compiled/react-experimental/jsx-runtime.react-server"), + "react/jsx-dev-runtime" => format!("next/dist/compiled/react{react_channel}/jsx-dev-runtime.react-server"), + "next/dist/compiled/react/jsx-dev-runtime" => format!("next/dist/compiled/react{react_channel}/jsx-dev-runtime.react-server"), + "next/dist/compiled/react-experimental/jsx-dev-runtime" => format!("next/dist/compiled/react-experimental/jsx-dev-runtime.react-server"), + "react-dom" => format!("next/dist/compiled/react-dom{react_channel}/react-dom.react-server"), + "next/dist/compiled/react-dom" => format!("next/dist/compiled/react-dom{react_channel}/react-dom.react-server"), + "next/dist/compiled/react-dom-experimental" => format!("next/dist/compiled/react-dom-experimental/react-dom.react-server"), + }) } insert_exact_alias_map(import_map, project_path, alias);