From 7c5d5142c60bc547b28862abe845fddc4784e830 Mon Sep 17 00:00:00 2001
From: ota <y.ohta.z3@future.co.jp>
Date: Tue, 7 Apr 2020 11:53:30 +0900
Subject: [PATCH] Upgrade vuepress and vue-eslint-editor.

---
 docs/.vuepress/components/eslint-code-block.vue  |  3 +--
 docs/.vuepress/config.js                         | 11 +++++++----
 docs/.vuepress/{style.styl => styles/index.styl} |  2 +-
 docs/.vuepress/theme/index.js                    |  3 +++
 docs/.vuepress/theme/{ => layouts}/Layout.vue    | 13 ++++++++-----
 docs/rules/README.md                             |  4 ++--
 package.json                                     |  7 ++++---
 tools/update-docs-rules-index.js                 |  4 ++--
 8 files changed, 28 insertions(+), 19 deletions(-)
 rename docs/.vuepress/{style.styl => styles/index.styl} (81%)
 create mode 100644 docs/.vuepress/theme/index.js
 rename docs/.vuepress/theme/{ => layouts}/Layout.vue (83%)

diff --git a/docs/.vuepress/components/eslint-code-block.vue b/docs/.vuepress/components/eslint-code-block.vue
index ab33abdf1..fed685d91 100644
--- a/docs/.vuepress/components/eslint-code-block.vue
+++ b/docs/.vuepress/components/eslint-code-block.vue
@@ -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 {
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 0b78e7eba..a6756baa7 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -66,12 +66,18 @@ 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',
@@ -79,9 +85,6 @@ module.exports = {
     docsBranch: 'master',
     editLinks: true,
     lastUpdated: true,
-    serviceWorker: {
-      updatePopup: true
-    },
 
     nav: [
       { text: 'User Guide', link: '/user-guide/' },
diff --git a/docs/.vuepress/style.styl b/docs/.vuepress/styles/index.styl
similarity index 81%
rename from docs/.vuepress/style.styl
rename to docs/.vuepress/styles/index.styl
index 564ebd26e..48680bbf3 100644
--- a/docs/.vuepress/style.styl
+++ b/docs/.vuepress/styles/index.styl
@@ -1,4 +1,4 @@
-.theme-container.rule-details .content > h1 {
+.theme-container.rule-details .theme-default-content > h1 {
   font-size: 1.8rem;
 
   + blockquote {
diff --git a/docs/.vuepress/theme/index.js b/docs/.vuepress/theme/index.js
new file mode 100644
index 000000000..b91b8a576
--- /dev/null
+++ b/docs/.vuepress/theme/index.js
@@ -0,0 +1,3 @@
+module.exports = {
+  extend: '@vuepress/theme-default'
+}
diff --git a/docs/.vuepress/theme/Layout.vue b/docs/.vuepress/theme/layouts/Layout.vue
similarity index 83%
rename from docs/.vuepress/theme/Layout.vue
rename to docs/.vuepress/theme/layouts/Layout.vue
index 78dab76f9..b88c846cd 100644
--- a/docs/.vuepress/theme/Layout.vue
+++ b/docs/.vuepress/theme/layouts/Layout.vue
@@ -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>
@@ -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
   },
@@ -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>
diff --git a/docs/rules/README.md b/docs/rules/README.md
index e184873e5..cc2a97313 100644
--- a/docs/rules/README.md
+++ b/docs/rules/README.md
@@ -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.
 :::
diff --git a/package.json b/package.json
index c6bde732b..2d568134e 100644
--- a/package.json
+++ b/package.json
@@ -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",
@@ -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"
   }
 }
diff --git a/tools/update-docs-rules-index.js b/tools/update-docs-rules-index.js
index e2283b3bf..23b1172b5 100644
--- a/tools/update-docs-rules-index.js
+++ b/tools/update-docs-rules-index.js
@@ -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.
 :::