diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json index e4d8798924..7fc3d8997c 100644 --- a/packages/@vuepress/core/package.json +++ b/packages/@vuepress/core/package.json @@ -54,11 +54,11 @@ "postcss-safe-parser": "^4.0.1", "toml": "^3.0.0", "url-loader": "^1.0.1", - "vue": "^2.5.16", - "vue-loader": "^15.2.4", + "vue": "^2.6.8", + "vue-loader": "^15.7.0", "vue-router": "^3.0.2", - "vue-server-renderer": "^2.5.16", - "vue-template-compiler": "^2.5.16", + "vue-server-renderer": "^2.6.8", + "vue-template-compiler": "^2.6.8", "vuepress-html-webpack-plugin": "^3.2.0", "vuepress-plugin-container": "^2.0.0", "webpack": "^4.8.1", diff --git a/packages/@vuepress/markdown/index.js b/packages/@vuepress/markdown/index.js index fae5948ab4..c1cca2489c 100644 --- a/packages/@vuepress/markdown/index.js +++ b/packages/@vuepress/markdown/index.js @@ -20,7 +20,9 @@ const tocPlugin = require('markdown-it-table-of-contents') const { slugify: _slugify, parseHeaders, - logger, chalk, normalizeConfig, + logger, + chalk, + normalizeConfig, moduleResolver: { getMarkdownItResolver } } = require('@vuepress/shared-utils') @@ -47,64 +49,76 @@ module.exports = (markdown = {}) => { // using chainedAPI const config = new Config() - config - .options - .html(true) - .highlight(highlight) - .end() + config.options + .html(true) + .highlight(highlight) + .end() .plugin(PLUGINS.COMPONENT) - .use(componentPlugin) - .end() + .use(componentPlugin) + .end() .plugin(PLUGINS.HIGHLIGHT_LINES) - .use(highlightLinesPlugin) - .end() + .use(highlightLinesPlugin) + .end() .plugin(PLUGINS.PRE_WRAPPER) - .use(preWrapperPlugin) - .end() + .use(preWrapperPlugin) + .end() .plugin(PLUGINS.SNIPPET) - .use(snippetPlugin) - .end() + .use(snippetPlugin) + .end() .plugin(PLUGINS.CONVERT_ROUTER_LINK) - .use(convertRouterLinkPlugin, [Object.assign({ - target: '_blank', - rel: 'noopener noreferrer' - }, externalLinks)]) - .end() + .use(convertRouterLinkPlugin, [ + Object.assign( + { + target: '_blank', + rel: 'noopener noreferrer' + }, + externalLinks + ) + ]) + .end() .plugin(PLUGINS.HOIST_SCRIPT_STYLE) - .use(hoistScriptStylePlugin) - .end() + .use(hoistScriptStylePlugin) + .end() .plugin(PLUGINS.EMOJI) - .use(emojiPlugin) - .end() + .use(emojiPlugin) + .end() .plugin(PLUGINS.ANCHOR) - .use(anchorPlugin, [Object.assign({ - slugify, - permalink: true, - permalinkBefore: true, - permalinkSymbol: '#' - }, anchor)]) - .end() + .use(anchorPlugin, [ + Object.assign( + { + slugify, + permalink: true, + permalinkBefore: true, + permalinkSymbol: '#' + }, + anchor + ) + ]) + .end() .plugin(PLUGINS.TOC) - .use(tocPlugin, [Object.assign({ - slugify, - includeLevel: [2, 3], - format: parseHeaders - }, toc)]) - .end() + .use(tocPlugin, [ + Object.assign( + { + slugify, + includeLevel: [2, 3], + format: parseHeaders + }, + toc + ) + ]) + .end() if (lineNumbers) { - config - .plugin(PLUGINS.LINE_NUMBERS) - .use(lineNumbersPlugin) + config.plugin(PLUGINS.LINE_NUMBERS).use(lineNumbersPlugin) } beforeInstantiate && beforeInstantiate(config) @@ -159,7 +173,9 @@ function isRequiredPlugin (plugin) { } function removePlugin (config, plugin) { - logger.debug(`Built-in markdown-it plugin ${chalk.green(plugin)} was removed.`) + logger.debug( + `Built-in markdown-it plugin ${chalk.green(plugin)} was removed.` + ) config.plugins.delete(plugin) } diff --git a/packages/@vuepress/test-utils/package.json b/packages/@vuepress/test-utils/package.json index d92d6fb403..9a39dd9875 100644 --- a/packages/@vuepress/test-utils/package.json +++ b/packages/@vuepress/test-utils/package.json @@ -33,6 +33,10 @@ "vue-jest": "^4.0.0-beta.1", "vue-template-compiler": "^2.5.16" }, + "peerDependencies": { + "vue": "^2.x", + "vue-template-compiler": "^2.x" + }, "author": "ULIVZ ", "license": "MIT", "bugs": { diff --git a/packages/@vuepress/theme-blog/layouts/Layout2.vue b/packages/@vuepress/theme-blog/layouts/Layout2.vue new file mode 100755 index 0000000000..6e1b480f1a --- /dev/null +++ b/packages/@vuepress/theme-blog/layouts/Layout2.vue @@ -0,0 +1,13 @@ + diff --git a/packages/@vuepress/theme-default/components/SidebarLink.vue b/packages/@vuepress/theme-default/components/SidebarLink.vue index bc5de287d8..5183aa6f2e 100644 --- a/packages/@vuepress/theme-default/components/SidebarLink.vue +++ b/packages/@vuepress/theme-default/components/SidebarLink.vue @@ -38,7 +38,7 @@ export default { $themeLocaleConfig.sidebarDepth, $themeConfig.sidebarDepth, 1 - ].find(depth => depth !== undefined); + ].find(depth => depth !== undefined) const displayAllHeaders = $themeLocaleConfig.displayAllHeaders || $themeConfig.displayAllHeaders diff --git a/packages/@vuepress/theme-default/layouts/Layout.vue b/packages/@vuepress/theme-default/layouts/Layout.vue index 6fdbe74b9d..78356e7340 100644 --- a/packages/@vuepress/theme-default/layouts/Layout.vue +++ b/packages/@vuepress/theme-default/layouts/Layout.vue @@ -21,11 +21,11 @@ > @@ -37,11 +37,11 @@ > diff --git a/packages/@vuepress/theme-vue/layouts/Layout.vue b/packages/@vuepress/theme-vue/layouts/Layout.vue index 632abbec77..383a5772de 100644 --- a/packages/@vuepress/theme-vue/layouts/Layout.vue +++ b/packages/@vuepress/theme-vue/layouts/Layout.vue @@ -1,7 +1,7 @@ diff --git a/packages/docs/docs/plugin/official/plugin-pwa.md b/packages/docs/docs/plugin/official/plugin-pwa.md index 955619f777..b033a79f75 100644 --- a/packages/docs/docs/plugin/official/plugin-pwa.md +++ b/packages/docs/docs/plugin/official/plugin-pwa.md @@ -216,7 +216,7 @@ First, you need to create a global component (e.g. `MySWUpdatePopup`) at `.vuepr