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

Jump to bottom

fix(es/modules): Fix jsc.paths #6454

Merged
merged 5 commits into from Nov 16, 2022
Merged

fix(es/modules): Fix jsc.paths #6454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f10869
Fix
kdy1 Nov 16, 2022
4ea3dc8
Update test refs
kdy1 Nov 16, 2022
55e27c5
Update test refs
kdy1 Nov 16, 2022
5d923ee
Update test refs
kdy1 Nov 16, 2022
6545520
Merge branch 'main' into paths
swc-bot Nov 16, 2022
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
4 changes: 2 additions & 2 deletions crates/swc/tests/fixture/deno/paths/cjs-001/output/index.ts
View file
Open in desktop
Expand Up @@ -2,5 +2,5 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
require("./src/dep.ts");
require("./src2/dep-2.ts");
require("./src/dep");
require("./src2/dep-2");
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/deno/paths/ext/002/output/index.js
View file
Open in desktop
@@ -1,2 +1,2 @@
import styles from "./foo.ts/index.js";
import styles from "./foo.ts/index";
console.log(styles);
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/deno/paths/issue-2126/output/src/index.ts
View file
Open in desktop
Expand Up @@ -2,5 +2,5 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
const _a = require("../packages/a/src/index.ts");
const _a = require("../packages/a/src/index");
console.log(`${(0, _a.displayA)()}`);
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/deno/paths/issue-2724/output/src/index.ts
View file
Open in desktop
Expand Up @@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
});
const _interopRequireWildcard = require("@swc/helpers/lib/_interop_require_wildcard.js").default;
(async function() {
const { displayA } = await Promise.resolve().then(()=>/*#__PURE__*/ _interopRequireWildcard(require("../packages/a/src/index.ts")));
const { displayA } = await Promise.resolve().then(()=>/*#__PURE__*/ _interopRequireWildcard(require("../packages/a/src/index")));
console.log(displayA());
})();
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/deno/paths/issue-2844/output/src/index.ts
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
require("./core/module/moduleFile.ts");
require("./core/module/moduleFile");
require("./core/utils");
require("./core/utilFile");
require("./utils");
Expand Down
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/deno/paths/issue-3447/output/src/index.ts
View file
Open in desktop
@@ -1,3 +1,3 @@
import { sum } from "./modules/01-moduleA/utils.ts";
import { sum } from "./modules/01-moduleA/utils";
export { multiply } from "./modules/03-moduleB/utils";
console.log(sum(1, 2));
2 changes: 1 addition & 1 deletion crates/swc/tests/fixture/issues-2xxx/2050/output/index.ts
View file
Open in desktop
Expand Up @@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
const _interopRequireDefault = require("@swc/helpers/lib/_interop_require_default.js").default;
const _a = /*#__PURE__*/ _interopRequireDefault(require("./subfolder/A.ts"));
const _a = /*#__PURE__*/ _interopRequireDefault(require("./subfolder/A"));
console.log(_a.default);
2 changes: 2 additions & 0 deletions crates/swc_ecma_transforms_module/src/path.rs
View file
Open in desktop
Expand Up @@ -129,6 +129,8 @@ where
if use_orig {
p.set_extension(orig_ext);
}
} else {
p.set_extension("");
}

p.display().to_string().into()
Expand Down
4 changes: 2 additions & 2 deletions crates/swc_ecma_transforms_module/tests/fixture-manual/issue-4730/output/index.js
View file
Open in desktop
@@ -1,6 +1,6 @@
import { displayB } from "../packages/b/src/index.ts";
import { displayB } from "../packages/b/src/index";
async function display() {
const displayA = await import("../packages/a/src/index.ts").then((c)=>c.displayA);
const displayA = await import("../packages/a/src/index").then((c)=>c.displayA);
console.log(displayA());
console.log(displayB());
}
Expand Down
28 changes: 14 additions & 14 deletions node-swc/__tests__/transform/issue_4730_test.mjs
View file
Open in desktop
Expand Up @@ -32,18 +32,18 @@ it("should work", async () => {
},
});
expect(code).toMatchInlineSnapshot(`
"\\"use strict\\";
Object.defineProperty(exports, \\"__esModule\\", {
value: true
});
const _interopRequireWildcard = require(\\"@swc/helpers/lib/_interop_require_wildcard.js\\").default;
const _b = require(\\"../packages/b/src/index.ts\\");
async function display() {
const displayA = await Promise.resolve().then(()=>/*#__PURE__*/ _interopRequireWildcard(require(\\"../packages/a/src/index.ts\\"))).then((c)=>c.displayA);
console.log(displayA());
console.log((0, _b.displayB)());
}
display();
"
`);
"\\"use strict\\";
Object.defineProperty(exports, \\"__esModule\\", {
value: true
});
const _interopRequireWildcard = require(\\"@swc/helpers/lib/_interop_require_wildcard.js\\").default;
const _b = require(\\"../packages/b/src/index\\");
async function display() {
const displayA = await Promise.resolve().then(()=>/*#__PURE__*/ _interopRequireWildcard(require(\\"../packages/a/src/index\\"))).then((c)=>c.displayA);
console.log(displayA());
console.log((0, _b.displayB)());
}
display();
"
`);
});