From ef401a357b732afd2b04fcce1a757f347b78e689 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Thu, 21 Jan 2021 05:57:32 +0800 Subject: [PATCH] chore: update --- package.json | 4 ++-- pnpm-lock.yaml | 26 ++++++++++++-------------- src/styles/prism-vscode-dark.css | 14 +++++--------- src/styles/prism-vscode-light.css | 15 ++++++++------- src/vue-shim.d.ts | 8 +++++++- vite.config.ts | 5 ++--- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index b730e5d..510af2f 100644 --- a/package.json +++ b/package.json @@ -32,10 +32,10 @@ "postcss-nested": "^5.0.3", "tailwindcss": "^2.0.2", "typescript": "^4.1.3", - "vite": "2.0.0-beta.34", + "vite": "2.0.0-beta.35", "vite-plugin-components": "^0.6.6", "vite-plugin-icons": "^0.2.1", - "vite-plugin-md": "^0.3.0", + "vite-plugin-md": "^0.4.0", "vite-plugin-pages": "^0.1.4", "vite-plugin-pwa": "^0.3.9", "vite-ssg": "^0.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cfbd8ae..9dd80f0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,13 +25,13 @@ devDependencies: postcss-nested: 5.0.3_postcss@8.2.4 tailwindcss: 2.0.2_d337930ac9ab3cde8278bf6b015e1ea7 typescript: 4.1.3 - vite: 2.0.0-beta.34 + vite: 2.0.0-beta.35 vite-plugin-components: 0.6.6 vite-plugin-icons: 0.2.1_e5c88c3c0e28b872685c1cd2aa188e9a - vite-plugin-md: 0.3.0_e6a368fc0bebe9c82eba059b82b82f92 + vite-plugin-md: 0.4.0_vite@2.0.0-beta.35 vite-plugin-pages: 0.1.4_vue@3.0.5 vite-plugin-pwa: 0.3.9 - vite-ssg: 0.4.1_f86d2656254d747d8a8d89ded79424e0 + vite-ssg: 0.4.1_03c565c87c45009742312717860d5a53 voie-pages: 0.4.0_vue@3.0.5 lockfileVersion: 5.2 packages: @@ -5309,18 +5309,16 @@ packages: '@vue/compiler-sfc': ^3.0.2 resolution: integrity: sha512-ZIJ8G2AHwEDt4oDST46E6Uy7W2EtVyoe1hzmJMkutbq3esUkcYVoYydT6Y12lhq1ppnVnShkbc0XzfKqolfCSg== - /vite-plugin-md/0.3.0_e6a368fc0bebe9c82eba059b82b82f92: + /vite-plugin-md/0.4.0_vite@2.0.0-beta.35: dependencies: - '@vue/compiler-sfc': 3.0.5_vue@3.0.5 gray-matter: 4.0.2 markdown-it: 12.0.4 - vite: 2.0.0-beta.34 + vite: 2.0.0-beta.35 dev: true peerDependencies: - '@vue/compiler-sfc': ^3.0.5 vite: ^2.0.0-beta.1 resolution: - integrity: sha512-GU8wrwJ/gSZcUCFHt7XNspfEPPBrcQcFnXCgPBY5ME+WOk0mtGPvlBg+JCD4iJgCrdkY0zOS8DZKJ9NB6v3rwQ== + integrity: sha512-V/0P2DYAKKxyTP03IW781gt7BIuwYLMwatCl4/+vw0KNpiPWOZHAZ8D6PPCVm3Z3gdsr44ZGp/j9Zmg53+bkFA== /vite-plugin-pages/0.1.4_vue@3.0.5: dependencies: debug: 4.3.2 @@ -5342,7 +5340,7 @@ packages: dev: true resolution: integrity: sha512-7UwG/jmBBzmmwFllc6fUmEpXyMYlBZsLBpjBfteHPp4lVptNrXVRT6Ou/ggVjPK2vlJqlh3GzvSo1sCNUxecgw== - /vite-ssg/0.4.1_f86d2656254d747d8a8d89ded79424e0: + /vite-ssg/0.4.1_03c565c87c45009742312717860d5a53: dependencies: '@vue/compiler-sfc': 3.0.5_vue@3.0.5 '@vue/server-renderer': 3.0.5_vue@3.0.5 @@ -5350,7 +5348,7 @@ packages: chalk: 4.1.0 fs-extra: 9.1.0 jsdom: 16.4.0 - vite: 2.0.0-beta.34 + vite: 2.0.0-beta.35 vue: 3.0.5 vue-router: 4.0.3_vue@3.0.5 yargs: 16.2.0 @@ -5366,7 +5364,7 @@ packages: vue-router: ^4.0.1 resolution: integrity: sha512-/RyTOXeEGgLVuy/RChz0acE5aNRyieYqy34VqlF+TVTsEG0t/KZD9u6Ma7VmytcQ+8n3PZh91vTs/XR9pzWOLA== - /vite/2.0.0-beta.34: + /vite/2.0.0-beta.35: dependencies: esbuild: 0.8.31 postcss: 8.2.4 @@ -5379,7 +5377,7 @@ packages: optionalDependencies: fsevents: 2.1.3 resolution: - integrity: sha512-D4/2WBf219mZBgDRiKfMwK/07UGiP+d56W2a2SEqf21iMOfM3yNBf3cfTY7qrHoi28EUo8l1LVwkSFPNbFlV2w== + integrity: sha512-22+MuR3fvy5GmGdjIXHXcUbfVS8P2DK8C2wdcDcdZnugCTd+4XySF2xeRt+VFPyhqq+/KSbdOuA2r47F+VMwig== /voie-pages/0.4.0_vue@3.0.5: dependencies: vue-router: 4.0.2_vue@3.0.5 @@ -5832,10 +5830,10 @@ specifiers: postcss-nested: ^5.0.3 tailwindcss: ^2.0.2 typescript: ^4.1.3 - vite: 2.0.0-beta.34 + vite: 2.0.0-beta.35 vite-plugin-components: ^0.6.6 vite-plugin-icons: ^0.2.1 - vite-plugin-md: ^0.3.0 + vite-plugin-md: ^0.4.0 vite-plugin-pages: ^0.1.4 vite-plugin-pwa: ^0.3.9 vite-ssg: ^0.4.1 diff --git a/src/styles/prism-vscode-dark.css b/src/styles/prism-vscode-dark.css index 899ec64..b621e46 100644 --- a/src/styles/prism-vscode-dark.css +++ b/src/styles/prism-vscode-dark.css @@ -2,7 +2,7 @@ * https://raw.githubusercontent.com/PrismJS/prism-themes/master/themes/prism-vsc-dark-plus.css */ -html.dark .prose { +html.dark { pre[class*='language-'], code[class*='language-'] { color: #d4d4d4; @@ -34,7 +34,7 @@ html.dark .prose { .token.comment, .token.prolog { - color: #6a9955; + color: #707c70; font-style: italic; } @@ -98,7 +98,7 @@ html.dark .prose { } .token.keyword { - color: #569cd6; + color: #38a776; } .token.keyword.module, @@ -232,8 +232,8 @@ html.dark .prose { color: #808080; } /********************************************************* - * Line highlighting - */ +* Line highlighting +*/ pre[data-line] { position: relative; } @@ -256,8 +256,4 @@ html.dark .prose { line-height: inherit; white-space: pre; } - - code, a code { - color: #eee; - } } diff --git a/src/styles/prism-vscode-light.css b/src/styles/prism-vscode-light.css index b9a2896..55ff331 100644 --- a/src/styles/prism-vscode-light.css +++ b/src/styles/prism-vscode-light.css @@ -5,7 +5,7 @@ * https://raw.githubusercontent.com/PrismJS/prism-themes/master/themes/prism-vs.css */ -html:not(.dark) .prose { +html:not(.dark) { code[class*='language-'], pre[class*='language-'] { color: #393a34; @@ -27,7 +27,7 @@ html:not(.dark) .prose { /* Code blocks */ pre[class*='language-'] { - background-color: #f8f8f8; + background-color: #f8f8f8 !important; } /* Inline code */ @@ -39,7 +39,7 @@ html:not(.dark) .prose { .token.prolog, .token.doctype, .token.cdata { - color: #008000; + color: #758575; font-style: italic; } @@ -73,11 +73,11 @@ html:not(.dark) .prose { .language-json .token.boolean, .language-json .token.number, code[class*='language-css'] { - color: #0000ff; + color: #248459; } .token.function { - color: #393a34; + color: #849145; } .token.deleted, @@ -87,7 +87,7 @@ html:not(.dark) .prose { .token.selector, .language-autohotkey .token.keyword { - color: #00009f; + color: #248459; } .token.important, @@ -105,6 +105,7 @@ html:not(.dark) .prose { } .token.tag, + .token.builtin, .token.selector { color: #800000; } @@ -113,7 +114,7 @@ html:not(.dark) .prose { .token.property, .token.regex, .token.entity { - color: #ff0000; + color: #ce9178; } .token.directive.tag .tag { diff --git a/src/vue-shim.d.ts b/src/vue-shim.d.ts index 14edcf0..3a010be 100644 --- a/src/vue-shim.d.ts +++ b/src/vue-shim.d.ts @@ -1,5 +1,11 @@ +import { defineComponent } from 'vue' + declare module '*.vue' { - import { defineComponent } from 'vue' + const Component: ReturnType + export default Component +} + +declare module '*.md' { const Component: ReturnType export default Component } diff --git a/vite.config.ts b/vite.config.ts index 4f811af..2fbeae9 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -5,9 +5,9 @@ import Pages from 'vite-plugin-pages' import ViteIcons, { ViteIconsResolver } from 'vite-plugin-icons' import ViteComponents from 'vite-plugin-components' import Markdown from 'vite-plugin-md' -import Prism from 'markdown-it-prism' import { VitePWA } from 'vite-plugin-pwa' import VueI18n from '@intlify/vite-plugin-vue-i18n' +import Prism from 'markdown-it-prism' const config: UserConfig = { alias: { @@ -15,7 +15,7 @@ const config: UserConfig = { }, plugins: [ Vue({ - ssr: !!process.env.SSG, + include: [/\.vue$/, /\.md$/], }), // https://github.com/hannoeru/vite-plugin-pages @@ -30,7 +30,6 @@ const config: UserConfig = { // https://github.com/antfu/vite-plugin-md Markdown({ - // for https://github.com/tailwindlabs/tailwindcss-typography wrapperClasses: 'prose prose-sm m-auto', headEnabled: true, markdownItSetup(md) {