feat(pack): modularizeImport support skip type import

Author: fireairforce

crates/pack-core/src/shared/transforms/modularize_imports.rs

@@ -6,6 +6,7 @@ use bincode::{Decode, Encode};
 use modularize_imports::{Config, PackageConfig, modularize_imports};
 use serde::{Deserialize, Serialize};
 use swc_core::ecma::ast::Program;
+use swc_core::ecma::transforms::typescript::{Config as TypescriptConfig, typescript};
 use turbo_tasks::{FxIndexMap, NonLocalValue, OperationValue, ResolvedVc, trace::TraceRawVcs};
 use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
 use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext};
@@ -120,10 +121,27 @@ impl ModularizeImportsTransformer {
     }
 }
 
+fn is_typescript_like_file(file_name: &str) -> bool {
+    file_name.ends_with(".ts")
+        || file_name.ends_with(".tsx")
+        || file_name.ends_with(".mts")
+        || file_name.ends_with(".cts")
+}
+
 #[async_trait]
 impl CustomTransformer for ModularizeImportsTransformer {
     #[tracing::instrument(level = "trace", name = "modularize_imports", skip_all)]
-    async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
+    async fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Result<()> {
+        if is_typescript_like_file(ctx.file_name_str) {
+            // Keep this localized to modularize-imports path: strip type-only usages
+            // before import path rewriting.
+            let config = TypescriptConfig {
+                verbatim_module_syntax: false,
+                ..Default::default()
+            };
+            program.mutate(typescript(config, ctx.unresolved_mark, ctx.top_level_mark));
+        }
+
         program.mutate(modularize_imports(&self.config));
 
         Ok(())

crates/pack-tests/tests/snapshot/optimization/modularize_imports_keba_case/config.json

@@ -2,7 +2,7 @@
   "config": {
     "entry": [
       {
-        "import": "input/index.ts",
+        "import": "input/index.tsx",
         "name": "main"
       }
     ],

…ularize_imports_keba_case/input/index.ts …larize_imports_keba_case/input/index.tsxcrates/pack-tests/tests/snapshot/optimization/modularize_imports_keba_case/input/index.ts renamed to crates/pack-tests/tests/snapshot/optimization/modularize_imports_keba_case/input/index.tsx crates/pack-tests/tests/snapshot/optimization/modularize_imports_keba_case/input/index.ts renamed to crates/pack-tests/tests/snapshot/optimization/modularize_imports_keba_case/input/index.tsx

@@ -1,6 +1,7 @@
 import { Button, DatePicker } from "antd";
 import { UploadProps } from "antd";
 import type { UploadFile } from "antd";
+import React from 'react';
 
 const props: UploadProps = {
     name: "test"
@@ -14,4 +15,14 @@ console.log('props', props);
 console.log('file', file);
 
 console.log(Button);
-console.log(DatePicker);
+console.log(DatePicker);
+
+const App = () => {
+    return (
+        <div>
+            <Button>Click</Button>
+        </div>
+    )
+}
+
+export default App;

crates/pack-tests/tests/snapshot/optimization/modularize_imports_keba_case/issues/Module-not-found-Can-t-resolve-antd-es-upload-prop-65101e.txt

@@ -1,5 +1,5 @@
 (globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push([
     typeof document === "object" ? document.currentScript : undefined,
-    {"otherChunks":["_project___2fe66d90.js"],"runtimeModuleIds":["[project]/optimization/modularize_imports_keba_case/input/index.ts [client] (ecmascript)"]}
+    {"otherChunks":["_project___4f43be0f.js"],"runtimeModuleIds":["[project]/optimization/modularize_imports_keba_case/input/index.tsx [client] (ecmascript)"]}
 ]);
 // Dummy runtime