Skip to content

Commit

Permalink
fix(es/modules): Fix jsc.paths (#6454)
Browse files Browse the repository at this point in the history 
**Related issue:**

 - Closes #6446.
  • Loading branch information
@kdy1
kdy1 committed Nov 16, 2022
1 parent ba9f47d commit 05d185d
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 24 deletions.
4 changes: 2 additions & 2 deletions crates/swc/tests/fixture/deno/paths/cjs-001/output/index.ts
View file
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
@@ -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
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
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
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
@@ -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
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
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
@@ -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
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();
"
`);
});

1 comment on commit 05d185d

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: 05d185d Previous: 6388920 Ratio
es/full/bugs-1 349632 ns/iter (± 29760) 344232 ns/iter (± 20153) 1.02
es/full/minify/libraries/antd 1957165331 ns/iter (± 53635805) 1870017561 ns/iter (± 53797770) 1.05
es/full/minify/libraries/d3 433230902 ns/iter (± 17642077) 419934434 ns/iter (± 14523502) 1.03
es/full/minify/libraries/echarts 1671474473 ns/iter (± 98476853) 1588121067 ns/iter (± 93895552) 1.05
es/full/minify/libraries/jquery 104882915 ns/iter (± 3030188) 110251465 ns/iter (± 7453291) 0.95
es/full/minify/libraries/lodash 147869608 ns/iter (± 24038492) 126503063 ns/iter (± 12762936) 1.17
es/full/minify/libraries/moment 68619452 ns/iter (± 3432784) 60735024 ns/iter (± 1532977) 1.13
es/full/minify/libraries/react 22669381 ns/iter (± 3486552) 20708172 ns/iter (± 322676) 1.09
es/full/minify/libraries/terser 369145753 ns/iter (± 39937234) 321355080 ns/iter (± 16845243) 1.15
es/full/minify/libraries/three 715356507 ns/iter (± 82567204) 564867714 ns/iter (± 17924549) 1.27
es/full/minify/libraries/typescript 4283352428 ns/iter (± 226778311) 3584339278 ns/iter (± 118889990) 1.20
es/full/minify/libraries/victory 1017507676 ns/iter (± 69442282) 872678416 ns/iter (± 47295398) 1.17
es/full/minify/libraries/vue 217195615 ns/iter (± 7995448) 178966369 ns/iter (± 16255938) 1.21
es/full/codegen/es3 39145 ns/iter (± 7077) 34200 ns/iter (± 2200) 1.14
es/full/codegen/es5 37019 ns/iter (± 7245) 34074 ns/iter (± 840) 1.09
es/full/codegen/es2015 36482 ns/iter (± 4972) 34126 ns/iter (± 1534) 1.07
es/full/codegen/es2016 36237 ns/iter (± 4597) 34873 ns/iter (± 1778) 1.04
es/full/codegen/es2017 36842 ns/iter (± 4208) 34514 ns/iter (± 2488) 1.07
es/full/codegen/es2018 43374 ns/iter (± 7329) 34407 ns/iter (± 2145) 1.26
es/full/codegen/es2019 40675 ns/iter (± 7412) 34657 ns/iter (± 1562) 1.17
es/full/codegen/es2020 35644 ns/iter (± 6538) 34543 ns/iter (± 3634) 1.03
es/full/all/es3 233796880 ns/iter (± 23717192) 207515867 ns/iter (± 21111045) 1.13
es/full/all/es5 199044625 ns/iter (± 14093987) 199288045 ns/iter (± 20306594) 1.00
es/full/all/es2015 172620647 ns/iter (± 16790762) 155166491 ns/iter (± 13875040) 1.11
es/full/all/es2016 159275145 ns/iter (± 18333985) 155754607 ns/iter (± 13486061) 1.02
es/full/all/es2017 162641875 ns/iter (± 17706312) 158548077 ns/iter (± 14597397) 1.03
es/full/all/es2018 161547619 ns/iter (± 17546494) 159638772 ns/iter (± 16745968) 1.01
es/full/all/es2019 161714485 ns/iter (± 12642274) 154337469 ns/iter (± 18614991) 1.05
es/full/all/es2020 157365213 ns/iter (± 15601094) 148226789 ns/iter (± 18017006) 1.06
es/full/parser 800604 ns/iter (± 177378) 744271 ns/iter (± 64880) 1.08
es/full/base/fixer 29917 ns/iter (± 3643) 27685 ns/iter (± 3536) 1.08
es/full/base/resolver_and_hygiene 102767 ns/iter (± 12439) 96451 ns/iter (± 11987) 1.07
serialization of ast node 237 ns/iter (± 37) 217 ns/iter (± 24) 1.09
serialization of serde 261 ns/iter (± 37) 232 ns/iter (± 15) 1.13

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.