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.

Sign up for GitHub

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): Fix handling of * in jsc.paths #8535

Merged
merged 7 commits into from
Jan 21, 2024
+4 −4
Merged

fix(es/module): Fix handling of * in jsc.paths #8535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6f84fdf
Remove wrong
kdy1 Jan 21, 2024
c16c699
Update test refs
kdy1 Jan 21, 2024
27f6c1f
fix tsc loader
kdy1 Jan 21, 2024
b1b7973
Update test refs
kdy1 Jan 21, 2024
640b9f8
Update test refs
kdy1 Jan 21, 2024
edeab3d
fix tsc
kdy1 Jan 21, 2024
8a976fe
Merge branch 'main' into issue-8375
kdy1 Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/swc/tests/fixture/issues-8xxx/8375/1/output/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
const _interop_require_wildcard = require("src/@swc/helpers/_/_interop_require_wildcard");
const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
const _hello = require("./src/hello");
const _node = _interop_require_wildcard._(require("src/@sentry/node"));
const _node = _interop_require_wildcard._(require("@sentry/node"));
_node;
(0, _hello.helloWorld)("SWC"); /*#__PURE__*/
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/jsc-paths/vercel-site/1/output/identity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { nanoid } from "./nanoid";
import { nanoid } from "nanoid";
import { fnv1a } from "../fnv1a";
export var VERCEL_AUTHENTICATED_PREFIX = "v_";
/**
Expand Down
2 changes: 1 addition & 1 deletion crates/swc_ecma_loader/src/resolvers/tsc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ where
Err(err) => err,
});

if to.len() == 1 {
if to.len() == 1 && !prefix.is_empty() {
info!(
"Using `{}` for `{}` because the length of the jsc.paths entry is \
1",
Expand Down
Loading