refactor(next-core): reduce duplicated decl

vercel · Apr 26, 2023 · dfc1c1e · dfc1c1e
1 parent e1d0367
commit dfc1c1e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/packages/next-swc/crates/next-core/src/next_server/context.rs b/packages/next-swc/crates/next-core/src/next_server/context.rs
@@ -65,6 +65,7 @@ pub async fn get_server_resolve_options_context(
         get_next_server_import_map(project_path, ty, next_config, execution_context);
     let foreign_code_context_condition = foreign_code_context_condition(next_config).await?;
     let root_dir = project_path.root().resolve().await?;
+    let unsupported_modules_resolve_plugin = UnsupportedModulesResolvePluginVc::new(project_path);
 
     Ok(match ty.into_value() {
         ServerContextType::Pages { .. } | ServerContextType::PagesData { .. } => {
@@ -82,7 +83,7 @@ pub async fn get_server_resolve_options_context(
                 import_map: Some(next_server_import_map),
                 plugins: vec![
                     external_cjs_modules_plugin.into(),
-                    UnsupportedModulesResolvePluginVc::new(project_path).into(),
+                    unsupported_modules_resolve_plugin.into(),
                 ],
                 ..Default::default()
             };
@@ -104,7 +105,7 @@ pub async fn get_server_resolve_options_context(
                 module: true,
                 custom_conditions: vec!["development".to_string()],
                 import_map: Some(next_server_import_map),
-                plugins: vec![UnsupportedModulesResolvePluginVc::new(project_path).into()],
+                plugins: vec![unsupported_modules_resolve_plugin.into()],
                 ..Default::default()
             };
             ResolveOptionsContext {
@@ -125,7 +126,7 @@ pub async fn get_server_resolve_options_context(
                 module: true,
                 custom_conditions: vec!["development".to_string(), "react-server".to_string()],
                 import_map: Some(next_server_import_map),
-                plugins: vec![UnsupportedModulesResolvePluginVc::new(project_path).into()],
+                plugins: vec![unsupported_modules_resolve_plugin.into()],
                 ..Default::default()
             };
             ResolveOptionsContext {
@@ -144,7 +145,7 @@ pub async fn get_server_resolve_options_context(
                 module: true,
                 custom_conditions: vec!["development".to_string()],
                 import_map: Some(next_server_import_map),
-                plugins: vec![UnsupportedModulesResolvePluginVc::new(project_path).into()],
+                plugins: vec![unsupported_modules_resolve_plugin.into()],
                 ..Default::default()
             };
             ResolveOptionsContext {
@@ -163,7 +164,7 @@ pub async fn get_server_resolve_options_context(
                 enable_node_externals: true,
                 module: true,
                 custom_conditions: vec!["development".to_string()],
-                plugins: vec![UnsupportedModulesResolvePluginVc::new(project_path).into()],
+                plugins: vec![unsupported_modules_resolve_plugin.into()],
                 ..Default::default()
             };
             ResolveOptionsContext {

diff --git a/packages/next-swc/crates/next-core/src/next_shared/resolve.rs b/packages/next-swc/crates/next-core/src/next_shared/resolve.rs
@@ -17,8 +17,8 @@ use turbo_binding::{
 use turbo_tasks_fs::glob::GlobVc;
 
 lazy_static! {
-    static ref UNSUPPORTED_PACKAGES: HashSet<String> = ["@vercel/og".to_owned()].into();
-    static ref UNSUPPORTED_PACKAGE_PATHS: HashSet<(String, String)> = [].into();
+    static ref UNSUPPORTED_PACKAGES: HashSet<&'static str> = ["@vercel/og"].into();
+    static ref UNSUPPORTED_PACKAGE_PATHS: HashSet<(&'static str, &'static str)> = [].into();
 }
 
 #[turbo_tasks::value]
@@ -55,7 +55,7 @@ impl ResolvePlugin for UnsupportedModulesResolvePlugin {
         } = &*request.await?
         {
             // Warn if the package is known not to be supported by Turbopack at the moment.
-            if UNSUPPORTED_PACKAGES.contains(module) {
+            if UNSUPPORTED_PACKAGES.contains(module.as_str()) {
                 UnsupportedModuleIssue {
                     context,
                     package: module.into(),
@@ -67,7 +67,7 @@ impl ResolvePlugin for UnsupportedModulesResolvePlugin {
             }
 
             if let Pattern::Constant(path) = path {
-                if UNSUPPORTED_PACKAGE_PATHS.contains(&(module.to_string(), path.to_owned())) {
+                if UNSUPPORTED_PACKAGE_PATHS.contains(&(module, path)) {
                     UnsupportedModuleIssue {
                         context,
                         package: module.into(),