From d697026b2ca5754367d5f79ac8178e8763692ef4 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Thu, 28 May 2020 14:49:14 +0800 Subject: [PATCH] feat(markdown-loader): compatible with vue 3 --- packages/vant-cli/package.json | 2 +- packages/vant-cli/yarn.lock | 14 +++++++------- packages/vant-markdown-loader/package.json | 2 +- packages/vant-markdown-loader/src/index.js | 18 ++++++++---------- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/packages/vant-cli/package.json b/packages/vant-cli/package.json index 5e4c2313a..115ef09d6 100644 --- a/packages/vant-cli/package.json +++ b/packages/vant-cli/package.json @@ -50,7 +50,7 @@ "@nuxt/friendly-errors-webpack-plugin": "^2.5.0", "@types/jest": "^25.2.1", "@vant/eslint-config": "^2.2.2", - "@vant/markdown-loader": "^2.3.0", + "@vant/markdown-loader": "^3.0.0-alpha.0", "@vant/markdown-vetur": "^2.0.1", "@vant/stylelint-config": "^1.3.0", "@vant/touch-emulator": "^1.2.0", diff --git a/packages/vant-cli/yarn.lock b/packages/vant-cli/yarn.lock index 8651cd6bd..61adc1459 100644 --- a/packages/vant-cli/yarn.lock +++ b/packages/vant-cli/yarn.lock @@ -1640,13 +1640,13 @@ eslint-plugin-import "^2.20.2" eslint-plugin-vue "^6.2.2" -"@vant/markdown-loader@^2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@vant/markdown-loader/-/markdown-loader-2.3.0.tgz#ea8ab4d8d41609839b40b817bc3a598cf13f9920" - integrity sha512-efNAnJMQbX3yP0+/zvnlYda+xIATLl+T9BXOB179M8KkS3hKk0b8tYHYVeLmdCLbJFeVd8bVXICILIplOYQJ5A== +"@vant/markdown-loader@^3.0.0-alpha.0": + version "3.0.0-alpha.0" + resolved "https://registry.npmjs.org/@vant/markdown-loader/-/markdown-loader-3.0.0-alpha.0.tgz#a14fa5c6bf4ffd57916855210dffc0daf8d9d6cb" + integrity sha512-cDDXfYhyS6yfVtqx+hwgN4blqd/+V1mYsvtDKsrpAZnirFhWfVFWeNZEjXPN6JYfXk3rEprEepjY/FPtCJG2EQ== dependencies: front-matter "^3.0.2" - highlight.js "^9.16.2" + highlight.js "^9.17.1" loader-utils "^1.2.3" markdown-it "^10.0.0" markdown-it-anchor "^5.2.5" @@ -5497,9 +5497,9 @@ he@^1.2.0: resolved "https://registry.npm.taobao.org/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha1-hK5l+n6vsWX922FWauFLrwVmTw8= -highlight.js@^9.16.2: +highlight.js@^9.17.1: version "9.18.1" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c" + resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c" integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg== hmac-drbg@^1.0.0: diff --git a/packages/vant-markdown-loader/package.json b/packages/vant-markdown-loader/package.json index ac97807a5..606bce339 100644 --- a/packages/vant-markdown-loader/package.json +++ b/packages/vant-markdown-loader/package.json @@ -1,6 +1,6 @@ { "name": "@vant/markdown-loader", - "version": "2.3.0", + "version": "3.0.0-alpha.0", "description": "Simple and fast vue markdown loader", "main": "src/index.js", "publishConfig": { diff --git a/packages/vant-markdown-loader/src/index.js b/packages/vant-markdown-loader/src/index.js index d04430519..301ba7ead 100644 --- a/packages/vant-markdown-loader/src/index.js +++ b/packages/vant-markdown-loader/src/index.js @@ -12,16 +12,11 @@ function wrapper(content) { content = escape(content); return ` - +import { h } from 'vue'; + +const content = unescape(\`${content}\`); - `; } @@ -53,7 +51,7 @@ const parser = new MarkdownIt({ slugify, }); -module.exports = function(source) { +module.exports = function (source) { let options = loaderUtils.getOptions(this) || {}; this.cacheable && this.cacheable();