home/vuepress
2
0
Fork 0
mirror of https://github.com/wahyd4/vuepress.git synced 2026-08-09 05:16:23 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix($theme-default): support slot and v-pre container (close: #1387) (#1389)

Browse Source
This commit is contained in:
Shigma
2019-03-03 14:51:39 +08:00
committed by ULIVZ
parent 75572620bb
commit c85f62d4a6
14 changed files with 37 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/@vuepress/core/lib/prepare/AppContext.js
+10
View File
@@ -149,6 +149,16 @@ 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 => `<template slot="${info}">`,
after: '</template>'
})
.use('@vuepress/container', {
type: 'v-pre',
before: '<div v-pre>',
after: '</div>'
})
.use('@vuepress/last-updated', !!shouldUseLastUpdated)
.use('@vuepress/register-components', {
componentsDir: [
packages/@vuepress/core/package.json
+1
View File
@@ -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",
packages/@vuepress/markdown/index.js
-5
View File
@@ -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()
packages/@vuepress/markdown/lib/constant.js
-2
View File
@@ -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',
packages/@vuepress/markdown/lib/markdownSlotsContainers.js
-12
View File
@@ -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
? `<template slot="${tokens[idx].info.trim().slice(SLOT_KEY.length).trim()}">`
: '</template>'
})
}
packages/@vuepress/plugin-container/index.js
+2 -2
View File
@@ -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) => {
packages/@vuepress/theme-default/index.js
+1 -6
View File
@@ -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: '<div v-pre>\n',
after: '</div>\n'
}]
['@vuepress/container', { type: 'danger' }]
]
})
packages/@vuepress/theme-default/package.json
+1
View File
@@ -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",
packages/@vuepress/theme-default/styles/custom-blocks.styl
-17
View File
@@ -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
packages/docs/docs/.vuepress/config.js
+1 -1
View File
@@ -81,7 +81,7 @@ module.exports = ctx => ({
}],
['@vuepress/container', {
type: 'upgrade',
before: ({ info }) => `<UpgradePath title="${info.trim().slice(7).trim()}">`,
before: info => `<UpgradePath title="${info}">`,
after: '</UpgradePath>',
}],
],
packages/docs/docs/.vuepress/styles/index.styl
+17 -1
View File
@@ -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
packages/docs/docs/plugin/official/plugin-container.md
+2 -2
View File
@@ -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
packages/docs/docs/zh/plugin/official/plugin-container.md
+2 -2
View File
@@ -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
yarn.lock
-4
View File
@@ -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"