diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 1d26dd87ff..d06fd96086 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -27,9 +27,9 @@ "@vitejs/plugin-vue": "4.4.0", "@vue-macros/reactivity-transform": "0.3.23", "@vue/compiler-sfc": "3.3.6", + "aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.0.5", "astring": "1.8.6", "autosize": "6.0.1", - "aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.0.5", "broadcast-channel": "5.5.0", "browser-image-resizer": "github:misskey-dev/browser-image-resizer#v2.2.1-misskey.3", "buraha": "0.0.1", @@ -55,7 +55,6 @@ "mfm-js": "0.23.3", "misskey-js": "workspace:*", "photoswipe": "5.4.2", - "prismjs": "1.29.0", "punycode": "2.3.0", "querystring": "0.2.1", "rollup": "4.1.4", @@ -76,7 +75,6 @@ "vanilla-tilt": "1.8.1", "vite": "4.5.0", "vue": "3.3.6", - "vue-prism-editor": "2.0.0-alpha.2", "vuedraggable": "next" }, "devDependencies": { diff --git a/packages/frontend/src/components/MkCode.core.vue b/packages/frontend/src/components/MkCode.core.vue index 045d3b2e04..889674af50 100644 --- a/packages/frontend/src/components/MkCode.core.vue +++ b/packages/frontend/src/components/MkCode.core.vue @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only @@ -66,4 +69,26 @@ watch(() => props.lang, async (to) => { font-family: Consolas, Monaco, Andale Mono, Ubuntu Mono, monospace; } } + +.codeBlockRoot.codeEditor { + min-width: 100%; + height: 100%; + + & :deep(.shiki) { + padding: 12px; + margin: 0; + border-radius: 6px; + min-height: 130px; + pointer-events: none; + min-width: calc(100% - 24px); + height: 100%; + display: inline-block; + line-height: 1.5em; + font-size: 1em; + overflow: visible; + text-rendering: inherit; + text-transform: inherit; + white-space: pre-wrap; + } +} diff --git a/packages/frontend/src/components/MkCodeEditor.vue b/packages/frontend/src/components/MkCodeEditor.vue new file mode 100644 index 0000000000..e1690e1149 --- /dev/null +++ b/packages/frontend/src/components/MkCodeEditor.vue @@ -0,0 +1,150 @@ + + + + + + + diff --git a/packages/frontend/src/pages/scratchpad.vue b/packages/frontend/src/pages/scratchpad.vue index 3dfd2d661f..bdaacbcede 100644 --- a/packages/frontend/src/pages/scratchpad.vue +++ b/packages/frontend/src/pages/scratchpad.vue @@ -6,9 +6,11 @@ SPDX-License-Identifier: AGPL-3.0-only