Skip to content

Commit

Permalink
refactor: only use builtin sourcemap support
Browse files Browse the repository at this point in the history
  • Loading branch information
merceyz committed Feb 4, 2023
1 parent 031d483 commit 9b5f65e
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 60 deletions.
21 changes: 0 additions & 21 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"@babel/preset-env": "^7.18.10",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.18.6",
"@cspotcode/source-map-support": "^0.8.1",
"@types/jest": "^28.1.6",
"@types/node": "^18.11.11",
"@yarnpkg/cli": "workspace:^",
Expand Down
20 changes: 3 additions & 17 deletions scripts/setup-ts-execution.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const resolveVirtual = process.versions.pnp ? require(`pnpapi`).resolveVirtual :
const weeksSinceUNIXEpoch = Math.floor(Date.now() / 604800000);

const cache = {
version: [esbuild.version, weeksSinceUNIXEpoch, process.versions.node, !!process.setSourceMapsEnabled].join(`\0`),
version: [esbuild.version, weeksSinceUNIXEpoch, process.versions.node].join(`\0`),
files: new Map(),
isDirty: false,
};
Expand Down Expand Up @@ -51,20 +51,7 @@ function persistCache() {
process.once(`exit`, persistCache);
process.nextTick(persistCache);

process.setSourceMapsEnabled
? process.setSourceMapsEnabled(true)
: require(`@cspotcode/source-map-support`).install({
environment: `node`,
retrieveSourceMap(filename) {
filename = resolveVirtual?.(filename) || filename;

const cacheEntry = cache.files.get(filename);
if (cacheEntry)
return {url: filename, map: cacheEntry.map};

return null;
},
});
process.setSourceMapsEnabled?.(true);

pirates.addHook(
(sourceCode, filename) => {
Expand All @@ -79,7 +66,7 @@ pirates.addHook(
target: `node${process.versions.node}`,
loader: path.extname(filename).slice(1),
sourcefile: filename,
sourcemap: process.setSourceMapsEnabled ? `inline` : `both`,
sourcemap: `inline`,
platform: `node`,
format: `cjs`,
});
Expand All @@ -88,7 +75,6 @@ pirates.addHook(
cache.files.set(filename, {
source: sourceCode,
code: res.code,
map: res.map,
});

return res.code;
Expand Down
22 changes: 1 addition & 21 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2158,15 +2158,6 @@ __metadata:
languageName: node
linkType: hard

"@cspotcode/source-map-support@npm:^0.8.1":
version: 0.8.1
resolution: "@cspotcode/source-map-support@npm:0.8.1"
dependencies:
"@jridgewell/trace-mapping": "npm:0.3.9"
checksum: 4327d8e6e4347897f5baf265c43ff094260a3ad7b53920fa07472aa18699ba7d570e5171082e88d19e4b5cce6f35cc1666b1c8ccb8b74d67e4f482395b8c511d
languageName: node
linkType: hard

"@docsearch/css@npm:3.2.1":
version: 3.2.1
resolution: "@docsearch/css@npm:3.2.1"
Expand Down Expand Up @@ -4465,7 +4456,7 @@ __metadata:
languageName: node
linkType: hard

"@jridgewell/resolve-uri@npm:3.1.0, @jridgewell/resolve-uri@npm:^3.0.3":
"@jridgewell/resolve-uri@npm:3.1.0":
version: 3.1.0
resolution: "@jridgewell/resolve-uri@npm:3.1.0"
checksum: 6b641bb7e25bc92a9848898cc91a77a390f393f086297ec2336d911387bdd708919c418e74a22732cfc21d0e7300b94306f437d2e9de5ab58b33ebc6c39d6f9d
Expand Down Expand Up @@ -4496,16 +4487,6 @@ __metadata:
languageName: node
linkType: hard

"@jridgewell/trace-mapping@npm:0.3.9":
version: 0.3.9
resolution: "@jridgewell/trace-mapping@npm:0.3.9"
dependencies:
"@jridgewell/resolve-uri": "npm:^3.0.3"
"@jridgewell/sourcemap-codec": "npm:^1.4.10"
checksum: 542c5f0f0ae874121e9de649581f9619cc0c65e33292e1285f1233f5ff3e41e6f4f216d69a4c3f800b4d6db208ff6c710307e19e1ff170ed5304807e346e6cf9
languageName: node
linkType: hard

"@jridgewell/trace-mapping@npm:^0.3.0, @jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.14, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.8, @jridgewell/trace-mapping@npm:^0.3.9":
version: 0.3.17
resolution: "@jridgewell/trace-mapping@npm:0.3.17"
Expand Down Expand Up @@ -7405,7 +7386,6 @@ __metadata:
"@babel/preset-env": "npm:^7.18.10"
"@babel/preset-react": "npm:^7.18.6"
"@babel/preset-typescript": "npm:^7.18.6"
"@cspotcode/source-map-support": "npm:^0.8.1"
"@types/jest": "npm:^28.1.6"
"@types/node": "npm:^18.11.11"
"@yarnpkg/cli": "workspace:^"
Expand Down

0 comments on commit 9b5f65e

Please sign in to comment.