Skip to content

Upgrade vuepress and vue-eslint-editor. #1096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions docs/.vuepress/components/eslint-code-block.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
</template>

<script>
// https://github.com/vuejs/vuepress/issues/451
import EslintEditor from '../../../node_modules/vue-eslint-editor'
import EslintEditor from 'vue-eslint-editor'
import { rules, processors } from '../../../'

export default {
Expand Down
11 changes: 7 additions & 4 deletions docs/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,25 @@ module.exports = {
base: '/',
title: 'eslint-plugin-vue',
description: 'Official ESLint plugin for Vue.js',
serviceWorker: true,
evergreen: true,
head: [
['link', { rel: 'icon', href: '/favicon.png' }]
],

plugins: {
'@vuepress/pwa': {
serviceWorker: true,
updatePopup: true
}
},

themeConfig: {
repo: 'vuejs/eslint-plugin-vue',
docsRepo: 'vuejs/eslint-plugin-vue',
docsDir: 'docs',
docsBranch: 'master',
editLinks: true,
lastUpdated: true,
serviceWorker: {
updatePopup: true
},

nav: [
{ text: 'User Guide', link: '/user-guide/' },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.theme-container.rule-details .content > h1 {
.theme-container.rule-details .theme-default-content > h1 {
font-size: 1.8rem;

+ blockquote {
Expand Down
3 changes: 3 additions & 0 deletions docs/.vuepress/theme/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extend: '@vuepress/theme-default'
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/>
<template
slot="page-top">
<div class="content beta-doc-description">
<div class="theme-default-content beta-doc-description">
<div class="warning custom-block">
<p class="custom-block-title">Note</p>
<p>This is a documentation for version <code>{{docVersion}}</code>.<template v-if="hasNotYetBeenReleased"> Also, this documentation may contain content that has not yet been released.</template><br>
Expand All @@ -30,14 +30,16 @@
/>
</BaseLayout>
</template>

<script>
/**
* Layout definition to navigate to older versions of the document.
*/
import BaseLayout from 'vuepress/lib/default-theme/Layout.vue'
import BaseLayout from '@vuepress/theme-default/layouts/Layout.vue'
import semver from 'semver'
const version = semver.parse(require('../../../package.json').version)
const version = semver.parse(require('../../../../package.json').version)
export default {
name: 'MyLayout',
components: {
BaseLayout
},
Expand All @@ -63,14 +65,15 @@ export default {
}
}
</script>

<style scoped>
.beta-doc-description {
padding-bottom: 0;
}
* ::v-deep .content ~ .content {
* ::v-deep .theme-default-content ~ .theme-default-content {
padding-top: 0;
}
* ::v-deep .content:not(.custom) h1{
* ::v-deep .theme-default-content:not(.custom) h1{
margin-top: -3.1rem;
}
</style>
4 changes: 2 additions & 2 deletions docs/rules/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
sidebarDepth: 0
---

<!-- This file is automatically generated in tools/update-docs-rules-index.js, do not change! -->

# Available rules

<!-- This file is automatically generated in tools/update-docs-rules-index.js, do not change! -->

::: tip Legend
:wrench: Indicates that the rule is fixable, and using `--fix` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the reported problems.
:::
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"devDependencies": {
"@types/node": "^4.2.16",
"@typescript-eslint/parser": "^2.6.1",
"@vuepress/plugin-pwa": "^1.4.0",
"acorn": "^7.1.0",
"babel-eslint": "^10.0.2",
"chai": "^4.1.0",
Expand All @@ -66,12 +67,12 @@
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-vue": "file:.",
"eslint-plugin-vue-libs": "^4.0.0",
"eslint4b": "^6.6.0",
"eslint4b": "^6.8.0",
"lodash": "^4.17.4",
"mocha": "^5.2.0",
"nyc": "^12.0.2",
"typescript": "^3.5.2",
"vue-eslint-editor": "^0.1.4",
"vuepress": "^0.14.5"
"vue-eslint-editor": "^1.1.0",
"vuepress": "^1.4.0"
}
}
4 changes: 2 additions & 2 deletions tools/update-docs-rules-index.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ fs.writeFileSync(
sidebarDepth: 0
---

<!-- This file is automatically generated in tools/update-docs-rules-index.js, do not change! -->

# Available rules

<!-- This file is automatically generated in tools/update-docs-rules-index.js, do not change! -->

::: tip Legend
:wrench: Indicates that the rule is fixable, and using \`--fix\` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the reported problems.
:::
Expand Down