From 031d48340e5f26e34f8858f3ec9076401b9f92e9 Mon Sep 17 00:00:00 2001 From: merceyz Date: Sat, 4 Feb 2023 15:01:59 +0100 Subject: [PATCH] chore: remove babel setup --- .pnp.cjs | 29 ----- ...ister-npm-7.18.9-bcdce8aed1-e66100046d.zip | Bin 11927 -> 0 bytes bench.sh | 51 -------- package.json | 1 - scripts/setup-ts-execution-babel.js | 27 ----- scripts/setup-ts-execution-esbuild.js | 107 ---------------- scripts/setup-ts-execution.js | 114 ++++++++++++++++-- yarn.lock | 20 +-- 8 files changed, 108 insertions(+), 241 deletions(-) delete mode 100644 .yarn/cache/@babel-register-npm-7.18.9-bcdce8aed1-e66100046d.zip delete mode 100644 bench.sh delete mode 100644 scripts/setup-ts-execution-babel.js delete mode 100644 scripts/setup-ts-execution-esbuild.js diff --git a/.pnp.cjs b/.pnp.cjs index 8272f205b2aa..2b019f38d8f2 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -257,7 +257,6 @@ const RAW_RUNTIME_STATE = ["@babel/preset-env", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.19.1"],\ ["@babel/preset-react", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.18.6"],\ ["@babel/preset-typescript", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.18.6"],\ - ["@babel/register", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.18.9"],\ ["@cspotcode/source-map-support", "npm:0.8.1"],\ ["@types/jest", "npm:28.1.6"],\ ["@types/node", "npm:18.11.11"],\ @@ -4670,33 +4669,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["@babel/register", [\ - ["npm:7.18.9", {\ - "packageLocation": "./.yarn/cache/@babel-register-npm-7.18.9-bcdce8aed1-e66100046d.zip/node_modules/@babel/register/",\ - "packageDependencies": [\ - ["@babel/register", "npm:7.18.9"]\ - ],\ - "linkType": "SOFT"\ - }],\ - ["virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.18.9", {\ - "packageLocation": "./.yarn/__virtual__/@babel-register-virtual-e138932ac7/0/cache/@babel-register-npm-7.18.9-bcdce8aed1-e66100046d.zip/node_modules/@babel/register/",\ - "packageDependencies": [\ - ["@babel/register", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.18.9"],\ - ["@babel/core", "npm:7.19.1"],\ - ["@types/babel__core", null],\ - ["clone-deep", "npm:4.0.1"],\ - ["find-cache-dir", "npm:2.1.0"],\ - ["make-dir", "npm:2.1.0"],\ - ["pirates", "npm:4.0.5"],\ - ["source-map-support", "npm:0.5.20"]\ - ],\ - "packagePeers": [\ - "@babel/core",\ - "@types/babel__core"\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["@babel/runtime", [\ ["npm:7.19.0", {\ "packageLocation": "./.yarn/cache/@babel-runtime-npm-7.19.0-86b37fbb72-1f8c11a414.zip/node_modules/@babel/runtime/",\ @@ -13475,7 +13447,6 @@ const RAW_RUNTIME_STATE = ["@babel/preset-env", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.19.1"],\ ["@babel/preset-react", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.18.6"],\ ["@babel/preset-typescript", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.18.6"],\ - ["@babel/register", "virtual:e470d99b1e4fdf4c5db5d090ff5472cdeba0404b7ffd31cd2efab3493dd184c67bc45f60c2ef1c040e2c41afe38c6280bffc5df2fbe3aefaa2b6eacf685ab07c#npm:7.18.9"],\ ["@cspotcode/source-map-support", "npm:0.8.1"],\ ["@types/jest", "npm:28.1.6"],\ ["@types/node", "npm:18.11.11"],\ diff --git a/.yarn/cache/@babel-register-npm-7.18.9-bcdce8aed1-e66100046d.zip b/.yarn/cache/@babel-register-npm-7.18.9-bcdce8aed1-e66100046d.zip deleted file mode 100644 index a122be6030e6696530621c05dba5436290895f08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11927 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 J?_5~G{{dk3rM& { - if (p?.endsWith(`.js`)) { - const normalizedP = p.replace(/\\/g, `/`); - return normalizedP.includes(`packages/yarnpkg-pnp/sources/node`) || normalizedP.endsWith(`packages/yarnpkg-pnp/sources/loader/node-options.js`); - } - - return true; - }, - ], -}); diff --git a/scripts/setup-ts-execution-esbuild.js b/scripts/setup-ts-execution-esbuild.js deleted file mode 100644 index 33f19d666df9..000000000000 --- a/scripts/setup-ts-execution-esbuild.js +++ /dev/null @@ -1,107 +0,0 @@ -const esbuild = require(`esbuild-wasm`); -const fs = require(`fs`); -const crypto = require(`crypto`); -const v8 = require(`v8`); -const zlib = require(`zlib`); -const path = require(`path`); -const pirates = require(`pirates`); - -// Needed by the worker spawned by Esbuild -if (process.versions.pnp) - process.env.NODE_OPTIONS = `${process.env.NODE_OPTIONS || ``} -r ${JSON.stringify(require.resolve(`pnpapi`))}`; - -const resolveVirtual = process.versions.pnp ? require(`pnpapi`).resolveVirtual : undefined; - -const weeksSinceUNIXEpoch = Math.floor(Date.now() / 604800000); - -const cache = { - version: [6, esbuild.version, weeksSinceUNIXEpoch, process.versions.node, !!process.setSourceMapsEnabled].join(`\0`), - files: new Map(), - isDirty: false, -}; - -const cachePath = path.join(__dirname, `../node_modules/.cache/yarn/esbuild-transpile-cache.bin`); -try { - const cacheData = v8.deserialize(zlib.gunzipSync(fs.readFileSync(cachePath))); - if (cacheData.version === cache.version) { - cache.files = cacheData.files; - } -} catch { } - -function persistCache() { - if (!cache.isDirty) - return; - cache.isDirty = false; - - fs.mkdirSync(path.dirname(cachePath), {recursive: true}); - const tmpPath = cachePath + crypto.randomBytes(8).toString(`hex`); - fs.writeFileSync( - tmpPath, - zlib.gzipSync( - v8.serialize({ - version: cache.version, - files: cache.files, - }), - {level: 1}, - ), - ); - fs.renameSync(tmpPath, cachePath); -} - -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; - }, - }); - -pirates.addHook( - (sourceCode, filename) => { - filename = resolveVirtual?.(filename) || filename; - - const cacheEntry = cache.files.get(filename); - - if (cacheEntry?.source === sourceCode) - return cacheEntry.code; - - const res = esbuild.transformSync(sourceCode, { - target: `node${process.versions.node}`, - loader: path.extname(filename).slice(1), - sourcefile: filename, - sourcemap: process.setSourceMapsEnabled ? `inline` : `both`, - platform: `node`, - format: `cjs`, - }); - - cache.isDirty = true; - cache.files.set(filename, { - source: sourceCode, - code: res.code, - map: res.map, - }); - - return res.code; - }, - { - extensions: [`.tsx`, `.ts`, `.js`], - matcher(p) { - if (p?.endsWith(`.js`)) { - const normalizedP = p.replace(/\\/g, `/`); - return normalizedP.includes(`packages/yarnpkg-pnp/sources/node`) || normalizedP.endsWith(`packages/yarnpkg-pnp/sources/loader/node-options.js`); - } - - return true; - }, - }, -); diff --git a/scripts/setup-ts-execution.js b/scripts/setup-ts-execution.js index 8c0b68a28f1d..33621ca2bb56 100644 --- a/scripts/setup-ts-execution.js +++ b/scripts/setup-ts-execution.js @@ -1,9 +1,107 @@ -switch (process.env.YARNPKG_TRANSPILER) { - case `esbuild`: - require(`./setup-ts-execution-esbuild.js`); - break; - default: - case `babel`: - require(`./setup-ts-execution-babel.js`); - break; +const esbuild = require(`esbuild-wasm`); +const fs = require(`fs`); +const crypto = require(`crypto`); +const v8 = require(`v8`); +const zlib = require(`zlib`); +const path = require(`path`); +const pirates = require(`pirates`); + +// Needed by the worker spawned by Esbuild +if (process.versions.pnp) + process.env.NODE_OPTIONS = `${process.env.NODE_OPTIONS || ``} -r ${JSON.stringify(require.resolve(`pnpapi`))}`; + +const resolveVirtual = process.versions.pnp ? require(`pnpapi`).resolveVirtual : undefined; + +const weeksSinceUNIXEpoch = Math.floor(Date.now() / 604800000); + +const cache = { + version: [esbuild.version, weeksSinceUNIXEpoch, process.versions.node, !!process.setSourceMapsEnabled].join(`\0`), + files: new Map(), + isDirty: false, +}; + +const cachePath = path.join(__dirname, `../node_modules/.cache/yarn/esbuild-transpile-cache.bin`); +try { + const cacheData = v8.deserialize(zlib.gunzipSync(fs.readFileSync(cachePath))); + if (cacheData.version === cache.version) { + cache.files = cacheData.files; + } +} catch { } + +function persistCache() { + if (!cache.isDirty) + return; + cache.isDirty = false; + + fs.mkdirSync(path.dirname(cachePath), {recursive: true}); + const tmpPath = cachePath + crypto.randomBytes(8).toString(`hex`); + fs.writeFileSync( + tmpPath, + zlib.gzipSync( + v8.serialize({ + version: cache.version, + files: cache.files, + }), + {level: 1}, + ), + ); + fs.renameSync(tmpPath, cachePath); } + +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; + }, + }); + +pirates.addHook( + (sourceCode, filename) => { + filename = resolveVirtual?.(filename) || filename; + + const cacheEntry = cache.files.get(filename); + + if (cacheEntry?.source === sourceCode) + return cacheEntry.code; + + const res = esbuild.transformSync(sourceCode, { + target: `node${process.versions.node}`, + loader: path.extname(filename).slice(1), + sourcefile: filename, + sourcemap: process.setSourceMapsEnabled ? `inline` : `both`, + platform: `node`, + format: `cjs`, + }); + + cache.isDirty = true; + cache.files.set(filename, { + source: sourceCode, + code: res.code, + map: res.map, + }); + + return res.code; + }, + { + extensions: [`.tsx`, `.ts`, `.js`], + matcher(p) { + if (p?.endsWith(`.js`)) { + const normalizedP = p.replace(/\\/g, `/`); + return normalizedP.includes(`packages/yarnpkg-pnp/sources/node`) || normalizedP.endsWith(`packages/yarnpkg-pnp/sources/loader/node-options.js`); + } + + return true; + }, + }, +); diff --git a/yarn.lock b/yarn.lock index 1383b4ef358c..df20cca9c9bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1778,21 +1778,6 @@ __metadata: languageName: node linkType: hard -"@babel/register@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/register@npm:7.18.9" - dependencies: - clone-deep: "npm:^4.0.1" - find-cache-dir: "npm:^2.0.0" - make-dir: "npm:^2.1.0" - pirates: "npm:^4.0.5" - source-map-support: "npm:^0.5.16" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: e66100046daa1dee8bed8322d17f8374b47d3b30945accd3761303ca7bf93db406cea5edd530684b4964dbf969c1b5d0aaea07ecf5146ee68cf0fee6b1de88b5 - languageName: node - linkType: hard - "@babel/runtime-corejs3@npm:^7.10.2, @babel/runtime-corejs3@npm:^7.18.6": version: 7.19.1 resolution: "@babel/runtime-corejs3@npm:7.19.1" @@ -7420,7 +7405,6 @@ __metadata: "@babel/preset-env": "npm:^7.18.10" "@babel/preset-react": "npm:^7.18.6" "@babel/preset-typescript": "npm:^7.18.6" - "@babel/register": "npm:^7.18.9" "@cspotcode/source-map-support": "npm:^0.8.1" "@types/jest": "npm:^28.1.6" "@types/node": "npm:^18.11.11" @@ -14605,7 +14589,7 @@ __metadata: languageName: node linkType: hard -"find-cache-dir@npm:^2.0.0, find-cache-dir@npm:^2.1.0": +"find-cache-dir@npm:^2.1.0": version: 2.1.0 resolution: "find-cache-dir@npm:2.1.0" dependencies: @@ -27439,7 +27423,7 @@ pem@dexus/pem: languageName: node linkType: hard -"source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.17, source-map-support@npm:^0.5.19, source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.20": +"source-map-support@npm:^0.5.17, source-map-support@npm:^0.5.19, source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.20": version: 0.5.20 resolution: "source-map-support@npm:0.5.20" dependencies: