From 39037aec375cffba03ded35c2355f85e9cddb244 Mon Sep 17 00:00:00 2001 From: eyebrowkang <48169104+eyebrowkang@users.noreply.github.com> Date: Fri, 8 Sep 2023 10:52:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=AD=E7=9A=84path=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=AF=BC=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/replacePaths.js | 20 ++++++++++++++++++++ package.json | 3 ++- yarn.lock | 35 +++++++++++++++++++++++++++++++++-- 3 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 build/replacePaths.js diff --git a/build/replacePaths.js b/build/replacePaths.js new file mode 100644 index 00000000..8c30edf2 --- /dev/null +++ b/build/replacePaths.js @@ -0,0 +1,20 @@ +const replaceInFile = require('replace-in-file'); + +async function replacePaths() { + try { + const results = await replaceInFile({ + files: 'dist/types/**/*.d.ts', + from: /~types\//g, + to: '../../types/', + }); + for (const result of results) { + if (result.hasChanged) { + console.log(result); + } + } + } catch (error) { + console.error('Error occurred:', error); + } +} + +replacePaths(); diff --git a/package.json b/package.json index 5dc08e43..bbe94aac 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "build:engine-cjs": "cross-env BUILD_TARGET=commonjs CORE_BUILD=true NODE_ENV=production rollup --config build/rollup.engine.config.js", "build:debug": "cross-env NODE_ENV=development HOT_RELOAD=false rollup --config build/dev.js", "build:addons": "node build/addons.build.js", - "build:types": "tsc --project tsconfig.json", + "build:types": "tsc --project tsconfig.json && node build/replacePaths.js", "clean": "rimraf ./dist", "check-bundle": "es-check es5 dist/cherry-markdown.js dist/cherry-markdown.min.js", "test": "jest", @@ -125,6 +125,7 @@ "postcss": "^8.2.15", "prettier": "2.6.2", "prismjs": "^1.24.1", + "replace-in-file": "^7.0.1", "rimraf": "^3.0.2", "rollup": "~2.79.1", "rollup-plugin-livereload": "~2.0.5", diff --git a/yarn.lock b/yarn.lock index 5b883edd..b31cc74f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3109,6 +3109,15 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + clone-buffer@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" @@ -5718,7 +5727,7 @@ glob@^10.2.2: minipass "^5.0.0 || ^6.0.2 || ^7.0.0" path-scurry "^1.10.1" -glob@^8.0.3: +glob@^8.0.3, glob@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== @@ -9849,6 +9858,15 @@ replace-homedir@^1.0.0: is-absolute "^1.0.0" remove-trailing-separator "^1.1.0" +replace-in-file@^7.0.1: + version "7.0.1" + resolved "https://registry.npmjs.org/replace-in-file/-/replace-in-file-7.0.1.tgz#1bb69a2e5596341cc6f0f581309add6c1d364b71" + integrity sha512-KbhgPq04eA+TxXuUxpgWIH9k/TjF+28ofon2PXP7vq6izAILhxOtksCVcLuuQLtyjouBaPdlH6RJYYcSPVxCOA== + dependencies: + chalk "^4.1.2" + glob "^8.1.0" + yargs "^17.7.2" + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -12038,7 +12056,7 @@ yaml@^1.10.2: resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yargs-parser@20.2.9, yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.3, yargs-parser@^5.0.1: +yargs-parser@20.2.9, yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.3, yargs-parser@^21.1.1, yargs-parser@^5.0.1: version "20.2.9" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== @@ -12056,6 +12074,19 @@ yargs@^16.0.0, yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" +yargs@^17.7.2: + version "17.7.2" + resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + yargs@^7.1.0: version "7.1.2" resolved "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz#63a0a5d42143879fdbb30370741374e0641d55db" From b34b6037775a0c7de5fda628d96ec1baf990253e Mon Sep 17 00:00:00 2001 From: eyebrowkang <48169104+eyebrowkang@users.noreply.github.com> Date: Fri, 8 Sep 2023 11:21:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=B1=BB=E5=9E=8B=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E7=9A=84=E8=B7=AF=E5=BE=84=E6=9B=BF=E6=8D=A2=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E9=81=87=E5=88=B0=E9=94=99=E8=AF=AF=E9=9C=80=E6=8A=9B=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/replacePaths.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/replacePaths.js b/build/replacePaths.js index 8c30edf2..f0f4814f 100644 --- a/build/replacePaths.js +++ b/build/replacePaths.js @@ -13,7 +13,7 @@ async function replacePaths() { } } } catch (error) { - console.error('Error occurred:', error); + throw error; } }