From 76e49af688d351154a17682474a831efc0fe085d Mon Sep 17 00:00:00 2001 From: Shigma <1700011071@pku.edu.cn> Date: Sun, 3 Mar 2019 09:27:22 +0800 Subject: [PATCH 1/6] support slot container --- packages/@vuepress/markdown/index.js | 5 ----- .../markdown/lib/markdownSlotsContainers.js | 12 ------------ packages/@vuepress/plugin-container/index.js | 4 ++-- packages/@vuepress/theme-default/index.js | 5 +++++ packages/docs/docs/.vuepress/config.js | 2 +- .../docs/docs/plugin/official/plugin-container.md | 4 ++-- .../docs/docs/zh/plugin/official/plugin-container.md | 4 ++-- 7 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 packages/@vuepress/markdown/lib/markdownSlotsContainers.js diff --git a/packages/@vuepress/markdown/index.js b/packages/@vuepress/markdown/index.js index 58c6a2a19c..dd5271d9fb 100644 --- a/packages/@vuepress/markdown/index.js +++ b/packages/@vuepress/markdown/index.js @@ -14,7 +14,6 @@ const lineNumbersPlugin = require('./lib/lineNumbers') const componentPlugin = require('./lib/component') const hoistScriptStylePlugin = require('./lib/hoist') const convertRouterLinkPlugin = require('./lib/link') -const markdownSlotsContainersPlugin = require('./lib/markdownSlotsContainers') const snippetPlugin = require('./lib/snippet') const tocPlugin = require('./lib/tableOfContents') const emojiPlugin = require('markdown-it-emoji') @@ -74,10 +73,6 @@ module.exports = (markdown = {}) => { .use(hoistScriptStylePlugin) .end() - .plugin(PLUGINS.MARKDOWN_SLOTS_CONTAINERS) - .use(markdownSlotsContainersPlugin) - .end() - .plugin(PLUGINS.EMOJI) .use(emojiPlugin) .end() diff --git a/packages/@vuepress/markdown/lib/markdownSlotsContainers.js b/packages/@vuepress/markdown/lib/markdownSlotsContainers.js deleted file mode 100644 index c70101f122..0000000000 --- a/packages/@vuepress/markdown/lib/markdownSlotsContainers.js +++ /dev/null @@ -1,12 +0,0 @@ -const container = require('markdown-it-container') - -const SLOT_KEY = 'slot' - -module.exports = md => { - md - .use(container, SLOT_KEY, { - render: (tokens, idx) => tokens[idx].nesting === 1 - ? `' - }) -} diff --git a/packages/@vuepress/plugin-container/index.js b/packages/@vuepress/plugin-container/index.js index 4715ae046a..8eefc9ee2a 100644 --- a/packages/@vuepress/plugin-container/index.js +++ b/packages/@vuepress/plugin-container/index.js @@ -26,8 +26,8 @@ module.exports = (options, context) => ({ if (!render) { if (before !== undefined && after !== undefined) { render = (tokens, index) => { - const token = tokens[index] - return token.nesting === 1 ? call(before, token) : call(after, token) + const info = tokens[index].info.trim().slice(type.length).trim + return tokens[index].nesting === 1 ? call(before, info) : call(after, info) } } else { render = (tokens, index) => { diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js index 0f214621ce..33f5251c58 100644 --- a/packages/@vuepress/theme-default/index.js +++ b/packages/@vuepress/theme-default/index.js @@ -28,6 +28,11 @@ module.exports = (options, ctx) => ({ type: 'v-pre', before: '
\n', after: '
\n' + }], + ['@vuepress/container', { + type: 'slot', + before: info => `\n' }] ] }) diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js index 999cc2535d..a76f0e22e7 100755 --- a/packages/docs/docs/.vuepress/config.js +++ b/packages/docs/docs/.vuepress/config.js @@ -81,7 +81,7 @@ module.exports = ctx => ({ }], ['@vuepress/container', { type: 'upgrade', - before: ({ info }) => ``, + before: info => ``, after: '', }], ], diff --git a/packages/docs/docs/plugin/official/plugin-container.md b/packages/docs/docs/plugin/official/plugin-container.md index 994cf2e86e..b50794c85e 100644 --- a/packages/docs/docs/plugin/official/plugin-container.md +++ b/packages/docs/docs/plugin/official/plugin-container.md @@ -49,14 +49,14 @@ The default title for the container. If no title was provided, `defaultTitle` wi - Type: `string | Function` - Default: `undefined` -String to be placed before the block. If specified as a function, a argument `token` will be passed to it. If specified, it will override `defaultTitle`. +String to be placed before the block. If specified as a function, a argument `info` will be passed to it. (In the example above, `info` will be `bar`.) If specified, it will override `defaultTitle`. ### after - Type: `string | Function` - Default: `undefined` -String to be placed after the block. If specified as a function, a argument `token` will be passed to it. If specified, it will override `defaultTitle`. +String to be placed after the block. If specified as a function, a argument `info` will be passed to it. (In the example above, `info` will be `bar`.) If specified, it will override `defaultTitle`. ### validate diff --git a/packages/docs/docs/zh/plugin/official/plugin-container.md b/packages/docs/docs/zh/plugin/official/plugin-container.md index e3d3e5f288..fcf47117c8 100644 --- a/packages/docs/docs/zh/plugin/official/plugin-container.md +++ b/packages/docs/docs/zh/plugin/official/plugin-container.md @@ -49,14 +49,14 @@ module.exports = { - 类型: `string | Function` - 默认值: `undefined` -要插入在容器前的 HTML。如果设置为一个函数，将传入当前的 `token` 作为第一个参数。如果设置了这个值，它将覆盖 `defaultTitle` 的效果。 +要插入在容器前的 HTML。如果设置为一个函数，将传入当前的 `info` 作为第一个参数。（在上面的例子中，`info` 的值为 `bar`。）如果设置了这个值，它将覆盖 `defaultTitle` 的效果。 ### after - 类型: `string | Function` - 默认值: `undefined` -要插入在容器后的 HTML。如果设置为一个函数，将传入当前的 `token` 作为第一个参数。如果设置了这个值，它将覆盖 `defaultTitle` 的效果。 +要插入在容器后的 HTML。如果设置为一个函数，将传入当前的 `info` 作为第一个参数。（在上面的例子中，`info` 的值为 `bar`。）如果设置了这个值，它将覆盖 `defaultTitle` 的效果。 ### validate From abdbc80a64e0352fa4b584ef2ef868bb56056783 Mon Sep 17 00:00:00 2001 From: Shigma <1700011071@pku.edu.cn> Date: Sun, 3 Mar 2019 10:24:16 +0800 Subject: [PATCH 2/6] remove constants --- packages/@vuepress/markdown/lib/constant.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/@vuepress/markdown/lib/constant.js b/packages/@vuepress/markdown/lib/constant.js index 1334788e7d..ca9e041663 100644 --- a/packages/@vuepress/markdown/lib/constant.js +++ b/packages/@vuepress/markdown/lib/constant.js @@ -5,8 +5,6 @@ exports.PLUGINS = { SNIPPET: 'snippet', CONVERT_ROUTER_LINK: 'convert-router-link', HOIST_SCRIPT_STYLE: 'hoist-script-style', - CONTAINERS: 'containers', - MARKDOWN_SLOTS_CONTAINERS: 'markdown-slots-containers', ANCHOR: 'anchor', EMOJI: 'emoji', TOC: 'toc', From 7240e4d536dac3a607348b4df78ef7ecaed35669 Mon Sep 17 00:00:00 2001 From: Shigma <1700011071@pku.edu.cn> Date: Sun, 3 Mar 2019 11:26:09 +0800 Subject: [PATCH 3/6] move slot container to core --- packages/@vuepress/core/lib/prepare/AppContext.js | 5 +++++ packages/@vuepress/core/package.json | 1 + packages/@vuepress/theme-default/index.js | 5 ----- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js index f769842f87..65f3effea1 100755 --- a/packages/@vuepress/core/lib/prepare/AppContext.js +++ b/packages/@vuepress/core/lib/prepare/AppContext.js @@ -149,6 +149,11 @@ module.exports = class AppContext { .use(require('../internal-plugins/transformModule')) .use(require('../internal-plugins/dataBlock')) .use(require('../internal-plugins/frontmatterBlock')) + .use('@vuepress/container', { + type: 'slot', + before: info => `' + }) .use('@vuepress/last-updated', !!shouldUseLastUpdated) .use('@vuepress/register-components', { componentsDir: [ diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json index a911d64654..ebc8845326 100644 --- a/packages/@vuepress/core/package.json +++ b/packages/@vuepress/core/package.json @@ -33,6 +33,7 @@ "@vue/babel-preset-app": "^3.1.1", "@vuepress/markdown": "^1.0.0-alpha.41", "@vuepress/markdown-loader": "^1.0.0-alpha.41", + "@vuepress/plugin-container": "^1.0.0-alpha.41", "@vuepress/plugin-last-updated": "^1.0.0-alpha.41", "@vuepress/plugin-register-components": "^1.0.0-alpha.41", "@vuepress/shared-utils": "^1.0.0-alpha.41", diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js index 33f5251c58..0f214621ce 100644 --- a/packages/@vuepress/theme-default/index.js +++ b/packages/@vuepress/theme-default/index.js @@ -28,11 +28,6 @@ module.exports = (options, ctx) => ({ type: 'v-pre', before: '
\n', after: '
\n' - }], - ['@vuepress/container', { - type: 'slot', - before: info => `\n' }] ] }) From 2e62b9dc1ff7e6fd24b78cfb406e94c874d88c2c Mon Sep 17 00:00:00 2001 From: Shigma <1700011071@pku.edu.cn> Date: Sun, 3 Mar 2019 12:03:27 +0800 Subject: [PATCH 4/6] Update package.json --- packages/@vuepress/theme-default/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/@vuepress/theme-default/package.json b/packages/@vuepress/theme-default/package.json index 0bc332086a..9631893233 100644 --- a/packages/@vuepress/theme-default/package.json +++ b/packages/@vuepress/theme-default/package.json @@ -31,6 +31,7 @@ "homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/theme-default#readme", "dependencies": { "@vuepress/plugin-active-header-links": "^1.0.0-alpha.41", + "@vuepress/plugin-container": "^1.0.0-alpha.41", "@vuepress/plugin-nprogress": "^1.0.0-alpha.41", "@vuepress/plugin-search": "^1.0.0-alpha.41", "docsearch.js": "^2.5.2", From d83babc23838e72018f5daf455c97ef9bdcc04da Mon Sep 17 00:00:00 2001 From: Shigma <1700011071@pku.edu.cn> Date: Sun, 3 Mar 2019 12:12:17 +0800 Subject: [PATCH 5/6] move v-pre to core also move vue-container styles to docs --- .../@vuepress/core/lib/prepare/AppContext.js | 5 +++++ packages/@vuepress/theme-default/index.js | 7 +------ .../theme-default/styles/custom-blocks.styl | 17 ----------------- packages/docs/docs/.vuepress/styles/index.styl | 18 +++++++++++++++++- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/packages/@vuepress/core/lib/prepare/AppContext.js b/packages/@vuepress/core/lib/prepare/AppContext.js index 65f3effea1..e7d71bb51a 100755 --- a/packages/@vuepress/core/lib/prepare/AppContext.js +++ b/packages/@vuepress/core/lib/prepare/AppContext.js @@ -154,6 +154,11 @@ module.exports = class AppContext { before: info => `' }) + .use('@vuepress/container', { + type: 'v-pre', + before: '
', + after: '
' + }) .use('@vuepress/last-updated', !!shouldUseLastUpdated) .use('@vuepress/register-components', { componentsDir: [ diff --git a/packages/@vuepress/theme-default/index.js b/packages/@vuepress/theme-default/index.js index 0f214621ce..0bf3d1e892 100644 --- a/packages/@vuepress/theme-default/index.js +++ b/packages/@vuepress/theme-default/index.js @@ -23,11 +23,6 @@ module.exports = (options, ctx) => ({ '@vuepress/plugin-nprogress', ['@vuepress/container', { type: 'tip' }], ['@vuepress/container', { type: 'warning' }], - ['@vuepress/container', { type: 'danger' }], - ['@vuepress/container', { - type: 'v-pre', - before: '
\n', - after: '
\n' - }] + ['@vuepress/container', { type: 'danger' }] ] }) diff --git a/packages/@vuepress/theme-default/styles/custom-blocks.styl b/packages/@vuepress/theme-default/styles/custom-blocks.styl index 33b3e2063f..2d07835b88 100644 --- a/packages/@vuepress/theme-default/styles/custom-blocks.styl +++ b/packages/@vuepress/theme-default/styles/custom-blocks.styl @@ -27,21 +27,4 @@ a color $textColor -pre.vue-container - border-left-width: .5rem; - border-left-style: solid; - border-color: #42b983; - border-radius: 0px; - & > code - font-size: 14px !important; - & > p - margin: -5px 0 -20px 0; - code - background-color: #42b983 !important; - padding: 3px 5px; - border-radius: 3px; - color #000 - em - color #808080 - font-weight light diff --git a/packages/docs/docs/.vuepress/styles/index.styl b/packages/docs/docs/.vuepress/styles/index.styl index 9014ba7608..596a926f1d 100644 --- a/packages/docs/docs/.vuepress/styles/index.styl +++ b/packages/docs/docs/.vuepress/styles/index.styl @@ -4,5 +4,21 @@ // font-size 30px; //} - +pre.vue-container + border-left-width: .5rem; + border-left-style: solid; + border-color: #42b983; + border-radius: 0px; + & > code + font-size: 14px !important; + & > p + margin: -5px 0 -20px 0; + code + background-color: #42b983 !important; + padding: 3px 5px; + border-radius: 3px; + color #000 + em + color #808080 + font-weight light From cf9ed80ed92052a8d9d2248a15954a6712fb99cd Mon Sep 17 00:00:00 2001 From: Shigma <1700011071@pku.edu.cn> Date: Sun, 3 Mar 2019 13:59:15 +0800 Subject: [PATCH 6/6] Update yarn.lock --- yarn.lock | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index c33c127ab1..2bcf92a03f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6580,10 +6580,6 @@ markdown-it-emoji@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz#9bee0e9a990a963ba96df6980c4fddb05dfb4dcc" -markdown-it-table-of-contents@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/markdown-it-table-of-contents/-/markdown-it-table-of-contents-0.4.0.tgz#950541bec9a365a75265f5265a09dc0cb5935909" - markdown-it@^8.4.1: version "8.4.2" resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"