diff --git a/package.json b/package.json index 78ed2fd76001b56bb3f8bb94e1077cedaea5639c..aa4e6edd703f0659a483746863e895c7796657cb 100644 --- a/package.json +++ b/package.json @@ -246,7 +246,6 @@ "vue-i18n": "9.0.0-beta.4", "vue-json-pretty": "1.7.0", "vue-loader": "16.0.0-beta.7", - "vue-prism-component": "1.2.0", "vue-prism-editor": "1.2.2", "vue-router": "4.0.0-beta.13", "vue-style-loader": "4.1.2", diff --git a/src/client/components/code-core.vue b/src/client/components/code-core.vue index cfb9d47ed9cba617969af4c24fcbda6dd3719458..9cff7b4448fc026fab207435a83e26cd2c75aab9 100644 --- a/src/client/components/code-core.vue +++ b/src/client/components/code-core.vue @@ -1,17 +1,14 @@ <template> -<XPrism :inline="inline" :language="prismLang">{{ code }}</XPrism> +<code v-if="inline" v-html="html" :class="`language-${prismLang}`"></code> +<pre v-else :class="`language-${prismLang}`"><code v-html="html" :class="`language-${prismLang}`"></code></pre> </template> <script lang="ts"> import { defineComponent } from 'vue'; import 'prismjs'; import 'prismjs/themes/prism-okaidia.css'; -import XPrism from 'vue-prism-component';import * as os from '@/os'; export default defineComponent({ - components: { - XPrism - }, props: { code: { type: String, @@ -29,6 +26,9 @@ export default defineComponent({ computed: { prismLang() { return Prism.languages[this.lang] ? this.lang : 'js'; + }, + html() { + return Prism.highlight(this.code, Prism.languages[this.prismLang], this.prismLang); } } }); diff --git a/yarn.lock b/yarn.lock index a0bd63379cc446dd96a2bf1a5b3d74eea14efde9..2f35a16da849a0c53cfe86a49a693e21f4bdf90e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10401,11 +10401,6 @@ vue-loader@16.0.0-beta.7: merge-source-map "^1.1.0" source-map "^0.6.1" -vue-prism-component@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/vue-prism-component/-/vue-prism-component-1.2.0.tgz#406252e16979def13b5d28827d95b2b6dc647825" - integrity sha512-0N9CNuQu+36CJpdsZHrhdq7d18oBvjVMjawyKdIr8xuzFWLfdxECZQYbFaYoopPBg3SvkEEMtkhYqdgTQl5Y+A== - vue-prism-editor@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/vue-prism-editor/-/vue-prism-editor-1.2.2.tgz#023cfd4329848f191aac851f2f5e6c7a8c2e059f"