fix(es/module): Fix resolving of dependencies

crates/swc/src/config/mod.rs

@@ -619,7 +619,7 @@ impl Options {
                                 &plugin_name,
                             )?;
 
-                            let path = if let FileName::Real(value) = resolved_path {
+                            let path = if let FileName::Real(value) = resolved_path.filename {
                                 value
                             } else {
                                 anyhow::bail!("Failed to resolve plugin path: {:?}", resolved_path);

crates/swc/tests/fixture/deno/paths/ext/002/output/index.js

@@ -1,2 +1,2 @@
-import styles from "./foo.ts/index.js";
+import styles from "./foo.ts/index";
 console.log(styles);

crates/swc/tests/fixture/issues-3xxx/3547/1/output/index.js

@@ -1,2 +1,2 @@
-import { NekoRoute } from "./src/lib/structures/route/index.js";
+import { NekoRoute } from "./src/lib/structures/route";
 console.log(NekoRoute);

crates/swc/tests/fixture/issues-7xxx/7829/1/output/1.js

@@ -1,2 +1,2 @@
-import { fn } from "./libs/pkg/src";
+import { fn } from "./libs/pkg/src/index.ts";
 console.log(fn);

crates/swc/tests/fixture/issues-7xxx/7898/1/output/index.ts

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-const _a = require("./packages/a/src/index.js");
+const _a = require("./packages/a/src/index.ts");
 console.log(`${(0, _a.displayA)()}`);

crates/swc/tests/fixture/issues-8xxx/8184/1/input/.swcrc

@@ -0,0 +1,14 @@
+{
+    "jsc": {
+        "parser": {
+            "syntax": "typescript",
+            "tsx": true
+        },
+        "baseUrl": ".",
+        "paths": {
+            "~/*": [
+                "./src/*"
+            ]
+        }
+    }
+}

crates/swc/tests/fixture/issues-8xxx/8184/1/input/src/a/index.jsx

@@ -0,0 +1,16 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const a = props => {
+  return (
+    <div>
+
+    </div>
+  );
+};
+
+a.propTypes = {
+
+};
+
+export default a;

crates/swc/tests/fixture/issues-8xxx/8184/1/input/src/b/index.js

@@ -0,0 +1,16 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const b = props => {
+  return (
+    <div>
+
+    </div>
+  );
+};
+
+b.propTypes = {
+
+};
+
+export default b;

crates/swc/tests/fixture/issues-8xxx/8184/1/input/src/c/index.ts

@@ -0,0 +1 @@
+export default (a) => a

crates/swc/tests/fixture/issues-8xxx/8184/1/input/src/d/index.tsx

@@ -0,0 +1,10 @@
+import * as React from 'react';
+
+interface IAppProps {
+}
+
+const App: React.FunctionComponent<IAppProps> = (props) => {
+  return <div>123</div>;
+};
+
+export default App;

crates/swc/tests/fixture/issues-8xxx/8184/1/input/src/index.ts

@@ -0,0 +1,6 @@
+import a from '~/a';
+import b from '~/b';
+import c from '~/c';
+import d from '~/d';
+
+console.log(a, b, c, d);

crates/swc/tests/fixture/issues-8xxx/8184/1/output/src/b/index.js

@@ -0,0 +1,6 @@
+import React from "react";
+var b = function(props) {
+    return /*#__PURE__*/ React.createElement("div", null);
+};
+b.propTypes = {};
+export default b;

crates/swc/tests/fixture/issues-8xxx/8184/1/output/src/c/index.ts

@@ -0,0 +1,3 @@
+export default function(a) {
+    return a;
+};

crates/swc/tests/fixture/issues-8xxx/8184/1/output/src/d/index.tsx

@@ -0,0 +1,5 @@
+import * as React from "react";
+var App = function(props) {
+    return /*#__PURE__*/ React.createElement("div", null, "123");
+};
+export default App;

crates/swc/tests/fixture/issues-8xxx/8184/1/output/src/index.ts

@@ -0,0 +1,5 @@
+import a from "./a";
+import b from "./b";
+import c from "./c";
+import d from "./d";
+console.log(a, b, c, d);

crates/swc_bundler/examples/path.rs

@@ -5,6 +5,7 @@ use swc_bundler::{BundleKind, Bundler, Config, Hook, Load, ModuleData, ModuleRec
 use swc_common::{sync::Lrc, FileName, FilePathMapping, Globals, SourceMap, Span};
 use swc_ecma_ast::KeyValueProp;
 use swc_ecma_codegen::{text_writer::JsWriter, Emitter};
+use swc_ecma_loader::resolve::Resolution;
 use swc_ecma_parser::{parse_file_as_module, Syntax};
 
 fn main() {
@@ -87,7 +88,7 @@ impl Load for PathLoader {
 struct PathResolver;
 
 impl Resolve for PathResolver {
-    fn resolve(&self, base: &FileName, module_specifier: &str) -> Result<FileName, Error> {
+    fn resolve(&self, base: &FileName, module_specifier: &str) -> Result<Resolution, Error> {
         assert!(
             module_specifier.starts_with('.'),
             "We are not using node_modules within this example"
@@ -98,12 +99,15 @@ impl Resolve for PathResolver {
             _ => unreachable!(),
         };
 
-        Ok(FileName::Real(
-            base.parent()
-                .unwrap()
-                .join(module_specifier)
-                .with_extension("js"),
-        ))
+        Ok(Resolution {
+            filename: FileName::Real(
+                base.parent()
+                    .unwrap()
+                    .join(module_specifier)
+                    .with_extension("js"),
+            ),
+            slug: None,
+        })
     }
 }
 

crates/swc_bundler/src/bundler/finalize.rs

@@ -382,7 +382,7 @@ where
             .resolver
             .resolve(&FileName::Real(self.base.clone()), &import.src.value)
         {
-            Ok(v) => match v {
+            Ok(v) => match v.filename {
                 FileName::Real(v) => v,
                 _ => panic!("rename_bundles called with non-path module"),
             },

crates/swc_bundler/src/bundler/import/mod.rs

@@ -57,6 +57,7 @@ where
             let path = self
                 .resolver
                 .resolve(base, module_specifier)
+                .map(|v| v.filename)
                 .with_context(|| format!("failed to resolve {} from {}", module_specifier, base))?;
 
             let path = Lrc::new(path);

crates/swc_bundler/src/bundler/tests.rs

@@ -5,6 +5,7 @@ use anyhow::Error;
 use indexmap::IndexMap;
 use swc_common::{collections::ARandomState, sync::Lrc, FileName, SourceMap, Span, GLOBALS};
 use swc_ecma_ast::*;
+use swc_ecma_loader::resolve::Resolution;
 use swc_ecma_parser::{lexer::Lexer, Parser, StringInput};
 use swc_ecma_utils::drop_span;
 use swc_ecma_visit::VisitMutWith;
@@ -52,7 +53,7 @@ impl Load for Loader {
 pub struct Resolver;
 
 impl Resolve for Resolver {
-    fn resolve(&self, _: &FileName, s: &str) -> Result<FileName, Error> {
+    fn resolve(&self, _: &FileName, s: &str) -> Result<Resolution, Error> {
         assert!(s.starts_with("./"));
 
         let path = PathBuf::from(s.to_string())
@@ -61,7 +62,10 @@ impl Resolve for Resolver {
             .unwrap()
             .into();
 
-        Ok(FileName::Real(path))
+        Ok(Resolution {
+            filename: FileName::Real(path),
+            slug: None,
+        })
     }
 }
 

crates/swc_bundler/tests/common/mod.rs

@@ -17,6 +17,7 @@ use swc_common::{
     FileName, Mark, SourceMap,
 };
 use swc_ecma_ast::{EsVersion, Program};
+use swc_ecma_loader::resolve::Resolution;
 use swc_ecma_parser::{parse_file_as_module, Syntax, TsConfig};
 use swc_ecma_transforms_base::{
     helpers::{inject_helpers, Helpers, HELPERS},
@@ -273,10 +274,8 @@ impl NodeResolver {
             None => bail!("not found"),
         }
     }
-}
 
-impl Resolve for NodeResolver {
-    fn resolve(&self, base: &FileName, target: &str) -> Result<FileName, Error> {
+    fn resolve_inner(&self, base: &FileName, target: &str) -> Result<FileName, Error> {
         if let Ok(v) = Url::parse(target) {
             return Ok(FileName::Custom(v.to_string()));
         }
@@ -337,3 +336,13 @@ impl Resolve for NodeResolver {
             .and_then(|p| self.wrap(p))
     }
 }
+
+impl Resolve for NodeResolver {
+    fn resolve(&self, base: &FileName, module_specifier: &str) -> Result<Resolution, Error> {
+        self.resolve_inner(base, module_specifier)
+            .map(|filename| Resolution {
+                filename,
+                slug: None,
+            })
+    }
+}

crates/swc_ecma_loader/Cargo.toml

@@ -36,6 +36,7 @@ serde       = { version = "1", features = ["derive"] }
 serde_json  = { version = "1.0.64", optional = true }
 tracing     = "0.1.37"
 
+swc_atoms  = { version = "0.6.5", path = "../swc_atoms" }
 swc_cached = { version = "0.3.18", optional = true, path = "../swc_cached" }
 swc_common = { version = "0.33.14", path = "../swc_common" }
 

crates/swc_ecma_loader/src/resolve.rs

@@ -1,13 +1,20 @@
 use std::sync::Arc;
 
 use anyhow::Error;
+use swc_atoms::Atom;
 use swc_common::{
     sync::{Send, Sync},
     FileName,
 };
 
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Resolution {
+    pub filename: FileName,
+    pub slug: Option<Atom>,
+}
+
 pub trait Resolve: Send + Sync {
-    fn resolve(&self, base: &FileName, module_specifier: &str) -> Result<FileName, Error>;
+    fn resolve(&self, base: &FileName, module_specifier: &str) -> Result<Resolution, Error>;
 }
 
 macro_rules! impl_ref {
@@ -16,7 +23,7 @@ macro_rules! impl_ref {
         where
             R: ?Sized + Resolve,
         {
-            fn resolve(&self, base: &FileName, src: &str) -> Result<FileName, Error> {
+            fn resolve(&self, base: &FileName, src: &str) -> Result<Resolution, Error> {
                 (**self).resolve(base, src)
             }
         }

crates/swc_ecma_loader/src/resolvers/lru.rs

@@ -5,14 +5,14 @@ use lru::LruCache;
 use parking_lot::Mutex;
 use swc_common::FileName;
 
-use crate::resolve::Resolve;
+use crate::resolve::{Resolution, Resolve};
 
 #[derive(Debug)]
 pub struct CachingResolver<R>
 where
     R: Resolve,
 {
-    cache: Mutex<LruCache<(FileName, String), FileName>>,
+    cache: Mutex<LruCache<(FileName, String), Resolution>>,
     inner: R,
 }
 
@@ -43,7 +43,7 @@ impl<R> Resolve for CachingResolver<R>
 where
     R: Resolve,
 {
-    fn resolve(&self, base: &FileName, src: &str) -> Result<FileName, Error> {
+    fn resolve(&self, base: &FileName, src: &str) -> Result<Resolution, Error> {
         {
             let mut lock = self.cache.lock();
             //

crates/swc_ecma_loader/src/resolvers/node.rs

@@ -23,7 +23,10 @@ use swc_common::{
 };
 use tracing::{debug, trace, Level};
 
-use crate::{resolve::Resolve, TargetEnv, NODE_BUILTINS};
+use crate::{
+    resolve::{Resolution, Resolve},
+    TargetEnv, NODE_BUILTINS,
+};
 
 static PACKAGE: &str = "package.json";
 
@@ -409,10 +412,8 @@ impl NodeModulesResolver {
 
         Ok(None)
     }
-}
 
-impl Resolve for NodeModulesResolver {
-    fn resolve(&self, base: &FileName, target: &str) -> Result<FileName, Error> {
+    fn resolve_filename(&self, base: &FileName, target: &str) -> Result<FileName, Error> {
         debug!(
             "Resolving {} from {:#?} for {:#?}",
             target, base, self.target_env
@@ -527,3 +528,13 @@ impl Resolve for NodeModulesResolver {
         file_name
     }
 }
+
+impl Resolve for NodeModulesResolver {
+    fn resolve(&self, base: &FileName, module_specifier: &str) -> Result<Resolution, Error> {
+        self.resolve_filename(base, module_specifier)
+            .map(|filename| Resolution {
+                filename,
+                slug: None,
+            })
+    }
+}