diff --git a/package.json b/package.json index 23eba025a..a61075f6c 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "unified": "9.2.2", "vnopts": "1.0.2", "wcwidth": "1.0.1", - "yaml-unist-parser": "1.3.1" + "yaml-unist-parser": "2.0.1" }, "devDependencies": { "@babel/generator": "7.19.0", diff --git a/scripts/build/build-javascript-module.js b/scripts/build/build-javascript-module.js index 12cb5eed2..297c7485c 100644 --- a/scripts/build/build-javascript-module.js +++ b/scripts/build/build-javascript-module.js @@ -1,4 +1,5 @@ import path from "node:path"; +import { createRequire } from "node:module"; import createEsmUtils from "esm-utils"; import esbuild from "esbuild"; import { NodeModulesPolyfillPlugin as esbuildPluginNodeModulePolyfills } from "@esbuild-plugins/node-modules-polyfill"; @@ -51,10 +52,14 @@ function getEsbuildOptions({ file, files, shouldCollectLicenses, cliOptions }) { process: transform, }, // #12493, not sure what the problem is, but replace the cjs version with esm version seems fix it - { - module: require.resolve("tslib"), - path: require.resolve("tslib").replace(/tslib\.js$/, "tslib.es6.js"), - }, + ...[ + require.resolve("tslib"), + createRequire(require.resolve("vnopts")).resolve("tslib"), + createRequire(require.resolve("tsutils")).resolve("tslib"), + ].map((file) => ({ + module: file, + path: file.replace(/tslib\.js$/, "tslib.es6.js"), + })), // https://github.com/evanw/esbuild/issues/2103 { module: path.join( diff --git a/yarn.lock b/yarn.lock index 8df74ee02..bc1a13489 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6701,7 +6701,7 @@ __metadata: unified: 9.2.2 vnopts: 1.0.2 wcwidth: 1.0.1 - yaml-unist-parser: 1.3.1 + yaml-unist-parser: 2.0.1 bin: prettier: ./bin/prettier.cjs languageName: unknown @@ -7872,7 +7872,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^1.10.0, tslib@npm:^1.8.1, tslib@npm:^1.9.0, tslib@npm:^1.9.3": +"tslib@npm:^1.8.1, tslib@npm:^1.9.0, tslib@npm:^1.9.3": version: 1.14.1 resolution: "tslib@npm:1.14.1" checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd @@ -8407,14 +8407,14 @@ __metadata: languageName: node linkType: hard -"yaml-unist-parser@npm:1.3.1": - version: 1.3.1 - resolution: "yaml-unist-parser@npm:1.3.1" +"yaml-unist-parser@npm:2.0.1": + version: 2.0.1 + resolution: "yaml-unist-parser@npm:2.0.1" dependencies: - lines-and-columns: ^1.1.6 - tslib: ^1.10.0 + lines-and-columns: ^2.0.3 + tslib: ^2.4.0 yaml: ^1.10.0 - checksum: 8d8b3f6a98a38d9c8234948ac9328479440e91fded6c6c918eba4bea7e47e9cdb19186361397df8fbfb6e6cf401c05ef264350688650e1c620bceaac5e483a60 + checksum: 89d542046a502ecb14eed8ffc16d520bf41ccb8525b16e4c29c184d787cf3df047d5f9efa4eb669c9c3bd3e6178202681cee35ea5c832f761a130db16b75f638 languageName: node linkType: hard