Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(es/module): Don't resolve as node_modules from TscResolver #7866

Merged
merged 5 commits into from
Aug 25, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions crates/swc/tests/fixture/issues-7xxx/7863/1/input/.swcrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"jsc": {
"parser": {
"syntax": "typescript",
"tsx": true
},
"baseUrl": ".",
"paths": {
"~/*": [
"./src/*"
]
},
"externalHelpers": true
}
}
7 changes: 7 additions & 0 deletions crates/swc/tests/fixture/issues-7xxx/7863/1/input/1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import test from '~/util/test';

class X {

}

console.log(test, X);
7 changes: 7 additions & 0 deletions crates/swc/tests/fixture/issues-7xxx/7863/1/output/1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
import test from "./src/util/test";
var X = function X() {
"use strict";
_class_call_check(this, X);
};
console.log(test, X);
14 changes: 14 additions & 0 deletions crates/swc_ecma_loader/src/resolvers/tsc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,20 @@ where
"Resolved `{}` as `{}` from `{}`",
module_specifier, resolved, base
);

if let FileName::Real(target) = &resolved {
// If node_modules is in path, we should return module specifier.
if target.components().any(|c| {
if let Component::Normal(v) = c {
v == "node_modules"
} else {
false
}
}) {
return Ok(FileName::Real(module_specifier.into()));
}
}

Ok(resolved)
}

Expand Down
2 changes: 1 addition & 1 deletion node-swc/__tests__/transform/issue_4730_test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ it("should work", async () => {
Object.defineProperty(exports, \\"__esModule\\", {
value: true
});
const _interop_require_wildcard = require(\\"node_modules/@swc/helpers/esm/_interop_require_wildcard\\");
const _interop_require_wildcard = require(\\"@swc/helpers/_/_interop_require_wildcard\\");
const _b = require(\\"../packages/b/src\\");
async function display() {
const displayA = await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard._(require(\\"../packages/a/src\\"))).then((c)=>c.displayA);
Expand Down