From 34935ca531c60392d63ac9aa0741e059620a8cfb Mon Sep 17 00:00:00 2001
From: Adi Cohen <adico1@gmail.com>
Date: Thu, 8 Oct 2020 23:59:58 +0300
Subject: [PATCH 1/4] fix($core): #2627 Dup ID violates HTML5

---
 .../lib/client/components/OutboundLink.vue    |  3 +--
 yarn.lock                                     | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/@vuepress/core/lib/client/components/OutboundLink.vue b/packages/@vuepress/core/lib/client/components/OutboundLink.vue
index b2be4027cb..5f2636c3c4 100644
--- a/packages/@vuepress/core/lib/client/components/OutboundLink.vue
+++ b/packages/@vuepress/core/lib/client/components/OutboundLink.vue
@@ -2,7 +2,6 @@
   <svg
     class="icon outbound"
     xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby="outbound-link-title"
     role="img"
     focusable="false"
     x="0px"
@@ -11,7 +10,7 @@
     width="15"
     height="15"
   >
-    <title id="outbound-link-title">{{ openInNewWindowTitle }}</title>
+    <title>{{ openInNewWindowTitle }}</title>
     <path
       fill="currentColor"
       d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"
diff --git a/yarn.lock b/yarn.lock
index 17d2c0b79e..82ab6679bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12530,15 +12530,15 @@ strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
 
-strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-
 strip-json-comments@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
   integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
 
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+
 strong-log-transformer@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
@@ -12838,13 +12838,14 @@ textlint-rule-stop-words@^1.0.17:
     split-lines "^2.0.0"
     textlint-rule-helper "^2.0.0"
 
-textlint-rule-terminology@^1.1.30:
-  version "1.1.30"
-  resolved "https://registry.yarnpkg.com/textlint-rule-terminology/-/textlint-rule-terminology-1.1.30.tgz#b9c5e8c665132dea2b141e3fe995316159c2d296"
+textlint-rule-terminology@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/textlint-rule-terminology/-/textlint-rule-terminology-2.1.4.tgz#d6004ae65dbe757b2f4c7bd2bf0fe77d202f0c14"
+  integrity sha512-kLw4qL8RwY2lCNqgKveHc5sjCDlS5Tdw2TXWOrHvSvQxqaVOwsv3+51oMIQLGfJzQrhFSMlSlw5MvfaOerBvPQ==
   dependencies:
-    lodash "^4.17.4"
-    strip-json-comments "^2.0.1"
-    textlint-rule-helper "^2.0.0"
+    lodash "^4.17.15"
+    strip-json-comments "^3.0.1"
+    textlint-rule-helper "^2.1.1"
 
 textlint-rule-write-good@^1.6.2:
   version "1.6.2"

From fa3d4818ecdd89034a2c1815913b3cadb53c2660 Mon Sep 17 00:00:00 2001
From: Adi Cohen <adico1@gmail.com>
Date: Fri, 9 Oct 2020 00:46:56 +0300
Subject: [PATCH 2/4] fix($core): #2627 Dup ID violates HTML5-2

---
 .../@vuepress/core/lib/client/components/OutboundLink.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/@vuepress/core/lib/client/components/OutboundLink.vue b/packages/@vuepress/core/lib/client/components/OutboundLink.vue
index 5f2636c3c4..2fa1d24694 100644
--- a/packages/@vuepress/core/lib/client/components/OutboundLink.vue
+++ b/packages/@vuepress/core/lib/client/components/OutboundLink.vue
@@ -2,6 +2,7 @@
   <svg
     class="icon outbound"
     xmlns="http://www.w3.org/2000/svg"
+    :aria-labelledby="rIdx"
     role="img"
     focusable="false"
     x="0px"
@@ -10,7 +11,7 @@
     width="15"
     height="15"
   >
-    <title>{{ openInNewWindowTitle }}</title>
+    <title :id="rIdx">{{ openInNewWindowTitle }}</title>
     <path
       fill="currentColor"
       d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"
@@ -24,6 +25,11 @@
 
 <script>
 export default {
+  data: function () {
+    return {
+      rIdx: 'outbound-link-title-' + Math.floor(Math.random() * 1000000)
+    }
+  },
   computed: {
     openInNewWindowTitle () {
       return this.$themeLocaleConfig.openNewWindowText || '(opens new window)'

From 235a4aaac26e2996f3538b802eb132b7c6c22c13 Mon Sep 17 00:00:00 2001
From: Adi Cohen <adico1@gmail.com>
Date: Fri, 9 Oct 2020 02:53:36 +0300
Subject: [PATCH 3/4] fix($core): #2627 Dup ID violates HTML5-3

---
 .../lib/client/components/OutboundLink.vue    | 51 +++++++++----------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/packages/@vuepress/core/lib/client/components/OutboundLink.vue b/packages/@vuepress/core/lib/client/components/OutboundLink.vue
index 2fa1d24694..6323cd9acc 100644
--- a/packages/@vuepress/core/lib/client/components/OutboundLink.vue
+++ b/packages/@vuepress/core/lib/client/components/OutboundLink.vue
@@ -1,35 +1,34 @@
 <template>
-  <svg
-    class="icon outbound"
-    xmlns="http://www.w3.org/2000/svg"
-    :aria-labelledby="rIdx"
-    role="img"
-    focusable="false"
-    x="0px"
-    y="0px"
-    viewBox="0 0 100 100"
-    width="15"
-    height="15"
+  <span
+    :title="openInNewWindowTitle"
+    class="sr-only"
   >
-    <title :id="rIdx">{{ openInNewWindowTitle }}</title>
-    <path
-      fill="currentColor"
-      d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"
-    />
-    <polygon
-      fill="currentColor"
-      points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"
-    />
-  </svg>
+    <svg
+      class="icon outbound"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-hidden="true"
+      role="img"
+      focusable="false"
+      x="0px"
+      y="0px"
+      viewBox="0 0 100 100"
+      width="15"
+      height="15"
+    >
+      <path
+        fill="currentColor"
+        d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"
+      />
+      <polygon
+        fill="currentColor"
+        points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"
+      />
+    </svg>
+  </span>
 </template>
 
 <script>
 export default {
-  data: function () {
-    return {
-      rIdx: 'outbound-link-title-' + Math.floor(Math.random() * 1000000)
-    }
-  },
   computed: {
     openInNewWindowTitle () {
       return this.$themeLocaleConfig.openNewWindowText || '(opens new window)'

From 56daec72207c43cf83ab3a6a811624dfd34c0914 Mon Sep 17 00:00:00 2001
From: Adi Cohen <adico1@gmail.com>
Date: Sat, 10 Oct 2020 02:46:34 +0300
Subject: [PATCH 4/4] fix($core): #2627 Dup ID violates HTML5-4

---
 .../core/lib/client/components/OutboundLink.vue        |  7 ++-----
 packages/@vuepress/theme-default/styles/index.styl     | 10 ++++++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/@vuepress/core/lib/client/components/OutboundLink.vue b/packages/@vuepress/core/lib/client/components/OutboundLink.vue
index 6323cd9acc..5aaa7d11fa 100644
--- a/packages/@vuepress/core/lib/client/components/OutboundLink.vue
+++ b/packages/@vuepress/core/lib/client/components/OutboundLink.vue
@@ -1,13 +1,9 @@
 <template>
-  <span
-    :title="openInNewWindowTitle"
-    class="sr-only"
-  >
+  <span>
     <svg
       class="icon outbound"
       xmlns="http://www.w3.org/2000/svg"
       aria-hidden="true"
-      role="img"
       focusable="false"
       x="0px"
       y="0px"
@@ -24,6 +20,7 @@
         points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"
       />
     </svg>
+    <span class="sr-only">{{ openInNewWindowTitle }}</span>
   </span>
 </template>
 
diff --git a/packages/@vuepress/theme-default/styles/index.styl b/packages/@vuepress/theme-default/styles/index.styl
index 976bfb0447..0a3e8430c0 100644
--- a/packages/@vuepress/theme-default/styles/index.styl
+++ b/packages/@vuepress/theme-default/styles/index.styl
@@ -189,6 +189,16 @@ th, td
     .sidebar
       top 0
 
+.sr-only 
+  position absolute
+  width 1px
+  height 1px
+  padding 0
+  margin -1px
+  overflow hidden
+  clip rect(0, 0, 0, 0)
+  white-space nowrap
+  border-width 0
 
 @media (min-width: ($MQMobile + 1px))
   .theme-container.no-sidebar