From 756364ede7166f2dff5e91d1b88d12c3cae7f890 Mon Sep 17 00:00:00 2001 From: yuanliuus Date: Fri, 18 Oct 2024 19:58:10 -0700 Subject: [PATCH 01/13] Update vditor to the latest 3.10.7 --- media-src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-src/package.json b/media-src/package.json index b34114c..3b8497c 100644 --- a/media-src/package.json +++ b/media-src/package.json @@ -20,6 +20,6 @@ "jquery": "^3.6.0", "jquery-confirm": "^3.3.4", "lodash": "^4.17.21", - "vditor": "^3.8.4" + "vditor": "^3.10.7" } } From 46a79aac8afa79c2b19c18ddb35a1a74fe83989c Mon Sep 17 00:00:00 2001 From: yuanliuus Date: Fri, 18 Oct 2024 20:17:23 -0700 Subject: [PATCH 02/13] Update package.json --- media-src/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/media-src/package.json b/media-src/package.json index 3b8497c..c45b272 100644 --- a/media-src/package.json +++ b/media-src/package.json @@ -8,7 +8,6 @@ }, "browserslist": "> 0%", "devDependencies": { - "@types/node": "^14.14.41", "typescript": "^4.2.3" }, "dependencies": { From c250d69f61c1c994597ab60c2de375161c9cfb7c Mon Sep 17 00:00:00 2001 From: yuanliuus Date: Fri, 18 Oct 2024 20:24:07 -0700 Subject: [PATCH 03/13] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 924c66c..48e47bc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: with: node-version: 14 - name: Install - run: yarn; cd ./media-src; yarn + run: yarn; cd ./media-src; yarn; yarn global add vsce; vsce package - name: Test run: npm test - name: Publish to Visual Studio Marketplace From 7a6038a0938a559ccf2e2353a4ff77c90eaec1fd Mon Sep 17 00:00:00 2001 From: yuanliuus Date: Fri, 18 Oct 2024 20:27:29 -0700 Subject: [PATCH 04/13] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 48e47bc..1fe0ce6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 with: - node-version: 14 + node-version: 18 - name: Install run: yarn; cd ./media-src; yarn; yarn global add vsce; vsce package - name: Test From d5f9ea26f688cb37cf9654ab7830ba244899f3eb Mon Sep 17 00:00:00 2001 From: yuanliuus Date: Fri, 18 Oct 2024 20:53:39 -0700 Subject: [PATCH 05/13] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1fe0ce6..e28add7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,9 +10,9 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 with: - node-version: 18 + node-version: 14 - name: Install - run: yarn; cd ./media-src; yarn; yarn global add vsce; vsce package + run: yarn; cd ./media-src; yarn; cd ..;yarn global add vsce; vsce package - name: Test run: npm test - name: Publish to Visual Studio Marketplace From d9c71f86591776b473f47099ec5623a66d088f11 Mon Sep 17 00:00:00 2001 From: yuanliuus Date: Fri, 18 Oct 2024 20:54:16 -0700 Subject: [PATCH 06/13] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c7a3c3c..29b6ac8 100755 --- a/package.json +++ b/package.json @@ -3,11 +3,11 @@ "displayName": "Markdown Editor", "icon": "media/logo.png", "description": "A full-featured WYSIWYG editor for markdown.", - "version": "0.1.12", + "version": "0.1.13", "publisher": "zaaack", "private": true, "engines": { - "vscode": "^1.47.0" + "vscode": "^1.94.0" }, "categories": [ "Programming Languages", From fe72d279d6a6eb10b32bd3baa8fea1574ccd886c Mon Sep 17 00:00:00 2001 From: yuanliuus Date: Fri, 18 Oct 2024 21:15:02 -0700 Subject: [PATCH 07/13] Update main.yml --- .github/workflows/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e28add7..5bce11e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,6 +15,11 @@ jobs: run: yarn; cd ./media-src; yarn; cd ..;yarn global add vsce; vsce package - name: Test run: npm test + - name: Upload VSIX as an artifact + uses: actions/upload-artifact@v3 + with: + name: vsix-package + path: ${{ steps.publishToOpenVSX.outputs.vsixPath }} - name: Publish to Visual Studio Marketplace uses: HaaLeo/publish-vscode-extension@v0 with: @@ -26,4 +31,5 @@ jobs: uses: HaaLeo/publish-vscode-extension@v0 id: publishToOpenVSX with: - pat: ${{ secrets.OPEN_VSX_TOKEN }} + pat: 1312321321231 #${{ secrets.OPEN_VSX_TOKEN }} + From e9ea6b8cd82d90cc43fde46e222e3416fdc5b9c3 Mon Sep 17 00:00:00 2001 From: yuanliuus Date: Fri, 18 Oct 2024 21:15:16 -0700 Subject: [PATCH 08/13] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5bce11e..693953d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: with: node-version: 14 - name: Install - run: yarn; cd ./media-src; yarn; cd ..;yarn global add vsce; vsce package + run: yarn; cd ./media-src; yarn #; cd ..;yarn global add vsce; vsce package - name: Test run: npm test - name: Upload VSIX as an artifact From 314262246f88558f851bd2a4186a10005e6e1e9a Mon Sep 17 00:00:00 2001 From: yuanliuus Date: Fri, 18 Oct 2024 23:25:57 -0700 Subject: [PATCH 09/13] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 693953d..bc94889 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,5 +31,5 @@ jobs: uses: HaaLeo/publish-vscode-extension@v0 id: publishToOpenVSX with: - pat: 1312321321231 #${{ secrets.OPEN_VSX_TOKEN }} + pat: ${{ secrets.OPEN_VSX_TOKEN }} From 19388a436a1a9e4dfed836d58ffaed9663619428 Mon Sep 17 00:00:00 2001 From: yuanliuus Date: Fri, 18 Oct 2024 23:33:47 -0700 Subject: [PATCH 10/13] Update main.yml --- .github/workflows/main.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bc94889..8ed8a2a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,6 +15,11 @@ jobs: run: yarn; cd ./media-src; yarn #; cd ..;yarn global add vsce; vsce package - name: Test run: npm test + - name: Publish to Open VSX Registry + uses: HaaLeo/publish-vscode-extension@v0 + id: publishToOpenVSX + with: + pat: ${{ secrets.OPEN_VSX_TOKEN }} - name: Upload VSIX as an artifact uses: actions/upload-artifact@v3 with: @@ -27,9 +32,5 @@ jobs: registryUrl: https://marketplace.visualstudio.com extensionFile: ${{ steps.publishToOpenVSX.outputs.vsixPath }} packagePath: '' - - name: Publish to Open VSX Registry - uses: HaaLeo/publish-vscode-extension@v0 - id: publishToOpenVSX - with: - pat: ${{ secrets.OPEN_VSX_TOKEN }} + From a8d0ef8f2cb6063061a0a7f8fb5e941ddbb8a3c7 Mon Sep 17 00:00:00 2001 From: yuanliuus Date: Fri, 18 Oct 2024 23:38:21 -0700 Subject: [PATCH 11/13] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8ed8a2a..34b5a60 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,6 +18,7 @@ jobs: - name: Publish to Open VSX Registry uses: HaaLeo/publish-vscode-extension@v0 id: publishToOpenVSX + continue-on-error: true with: pat: ${{ secrets.OPEN_VSX_TOKEN }} - name: Upload VSIX as an artifact From 3d2b3dba148adcf23d2de32c4383e526ffb6e857 Mon Sep 17 00:00:00 2001 From: yuanliuus Date: Fri, 18 Oct 2024 23:48:14 -0700 Subject: [PATCH 12/13] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 34b5a60..7263720 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: with: node-version: 14 - name: Install - run: yarn; cd ./media-src; yarn #; cd ..;yarn global add vsce; vsce package + run: yarn; cd ./media-src; yarn; cd ..;yarn global add vsce; vsce package - name: Test run: npm test - name: Publish to Open VSX Registry From f2b7d2c1eaba4d12b4f791ea0ecd3efb2fe712dc Mon Sep 17 00:00:00 2001 From: yuanliuus Date: Sat, 19 Oct 2024 08:55:37 +0000 Subject: [PATCH 13/13] adapt to newest vditor --- .github/workflows/main.yml | 20 ++++++++------------ media-src/src/fix-table-ir.ts | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7263720..d43454f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,26 +12,22 @@ jobs: with: node-version: 14 - name: Install - run: yarn; cd ./media-src; yarn; cd ..;yarn global add vsce; vsce package + run: yarn; cd ./media-src; yarn - name: Test run: npm test + - name: Publish to Visual Studio Marketplace + uses: HaaLeo/publish-vscode-extension@v0 + with: + pat: ${{ secrets.VS_MARKETPLACE_TOKEN }} + registryUrl: https://marketplace.visualstudio.com + extensionFile: ${{ steps.publishToOpenVSX.outputs.vsixPath }} + packagePath: '' - name: Publish to Open VSX Registry uses: HaaLeo/publish-vscode-extension@v0 id: publishToOpenVSX - continue-on-error: true with: pat: ${{ secrets.OPEN_VSX_TOKEN }} - name: Upload VSIX as an artifact uses: actions/upload-artifact@v3 with: - name: vsix-package path: ${{ steps.publishToOpenVSX.outputs.vsixPath }} - - name: Publish to Visual Studio Marketplace - uses: HaaLeo/publish-vscode-extension@v0 - with: - pat: ${{ secrets.VS_MARKETPLACE_TOKEN }} - registryUrl: https://marketplace.visualstudio.com - extensionFile: ${{ steps.publishToOpenVSX.outputs.vsixPath }} - packagePath: '' - - diff --git a/media-src/src/fix-table-ir.ts b/media-src/src/fix-table-ir.ts index d8d6d74..6d0320d 100644 --- a/media-src/src/fix-table-ir.ts +++ b/media-src/src/fix-table-ir.ts @@ -3,9 +3,9 @@ */ import { keyboard } from '@testing-library/user-event/dist/keyboard' import $ from 'jquery' -import { i18n } from 'vditor/src/ts/i18n/index' +// import { i18n } from 'vditor/src/ts/i18n/index' import { updateHotkeyTip } from 'vditor/src/ts/util/compatibility' -import { lang } from './lang' +// import { lang } from './lang' const tablePanelId = 'fix-table-ir-wrapper' let disableVscodeHotkeys = false @@ -26,63 +26,63 @@ export function fixTableIr() { >