From 4268c7986002b040632f6e452c2debec205cc635 Mon Sep 17 00:00:00 2001 From: Ben Hong Date: Fri, 25 Sep 2020 12:25:23 -0400 Subject: [PATCH 001/156] chore: version 1.6.0 changelog --- CHANGELOG.md | 10 ++++++++++ yarn.lock | 21 +++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afeea586c2..d8d2924f44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# [1.6.0](https://github.com/vuejs/vuepress/compare/v1.5.4...v1.6.0) (2020-09-25) + + +### Features + +* **$theme-default:** add code group and code block components ([#2594](https://github.com/vuejs/vuepress/issues/2594)) ([394c4f6](https://github.com/vuejs/vuepress/commit/394c4f6)) +* **$theme-default:** inform screen readers link opens in new tab/window (fix [#2601](https://github.com/vuejs/vuepress/issues/2601)) ([#2603](https://github.com/vuejs/vuepress/issues/2603)) ([8d10119](https://github.com/vuejs/vuepress/commit/8d10119)) + + + ## [1.5.4](https://github.com/vuejs/vuepress/compare/v1.5.3...v1.5.4) (2020-08-23) diff --git a/yarn.lock b/yarn.lock index 099cf8daa9..57c98472bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9127,7 +9127,7 @@ mkdirp-promise@^5.0.1: dependencies: mkdirp "*" -mkdirp@*, mkdirp@0.5.x, mkdirp@0.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1, mkdirp@~0.5.x: +mkdirp@*, mkdirp@0.5.x, mkdirp@0.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: @@ -9138,6 +9138,11 @@ mkdirp@0.3.0: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e" integrity sha1-G79asbqCevI1dRQ0kEJkVfSB/h4= +mkdirp@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + modify-values@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" @@ -12565,18 +12570,18 @@ stylus-loader@^3.0.2: lodash.clonedeep "^4.5.0" when "~3.6.x" -stylus@^0.54.5: - version "0.54.7" - resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.7.tgz#c6ce4793965ee538bcebe50f31537bfc04d88cd2" - integrity sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug== +stylus@^0.54.8: + version "0.54.8" + resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.8.tgz#3da3e65966bc567a7b044bfe0eece653e099d147" + integrity sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg== dependencies: css-parse "~2.0.0" debug "~3.1.0" - glob "^7.1.3" - mkdirp "~0.5.x" + glob "^7.1.6" + mkdirp "~1.0.4" safer-buffer "^2.1.2" sax "~1.2.4" - semver "^6.0.0" + semver "^6.3.0" source-map "^0.7.3" supports-color@^2.0.0: From 795c23052a9beebfc7273f65ea7bdaddd1cf8a62 Mon Sep 17 00:00:00 2001 From: Eduardo San Martin Morote Date: Mon, 28 Sep 2020 15:27:51 +0200 Subject: [PATCH 002/156] refactor($core): catch initial push to avoid warning (#2629) --- packages/@vuepress/core/lib/client/serverEntry.js | 5 +++-- packages/@vuepress/core/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/@vuepress/core/lib/client/serverEntry.js b/packages/@vuepress/core/lib/client/serverEntry.js index fca4628a05..6e4fc4a352 100644 --- a/packages/@vuepress/core/lib/client/serverEntry.js +++ b/packages/@vuepress/core/lib/client/serverEntry.js @@ -9,7 +9,8 @@ export default context => new Promise((resolve, reject) => { return reject({ url: fullPath }) } - router.push(url) - router.onReady(() => resolve(app)) + // error handled in onReady + router.push(url).catch(() => {}) + router.onReady(() => resolve(app), reject) }) }) diff --git a/packages/@vuepress/core/package.json b/packages/@vuepress/core/package.json index 09c18f2e0a..9d8dc9e704 100644 --- a/packages/@vuepress/core/package.json +++ b/packages/@vuepress/core/package.json @@ -51,7 +51,7 @@ "url-loader": "^1.0.1", "vue": "^2.6.10", "vue-loader": "^15.7.1", - "vue-router": "^3.1.3", + "vue-router": "^3.4.5", "vue-server-renderer": "^2.6.10", "vue-template-compiler": "^2.6.10", "vuepress-html-webpack-plugin": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index 57c98472bc..17d2c0b79e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13715,10 +13715,10 @@ vue-loader@^15.7.1: vue-hot-reload-api "^2.3.0" vue-style-loader "^4.1.0" -vue-router@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.3.tgz#e6b14fabc0c0ee9fda0e2cbbda74b350e28e412b" - integrity sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ== +vue-router@^3.4.5: + version "3.4.5" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.5.tgz#d396ec037b35931bdd1e9b7edd86f9788dc15175" + integrity sha512-ioRY5QyDpXM9TDjOX6hX79gtaMXSVDDzSlbIlyAmbHNteIL81WIVB2e+jbzV23vzxtoV0krdS2XHm+GxFg+Nxg== vue-server-renderer@^2.6.10: version "2.6.10" From 2fbad2867deaa21240a4e2339e1d63bce7ef20b4 Mon Sep 17 00:00:00 2001 From: Jabster28 <29015942+Jabster28@users.noreply.github.com> Date: Mon, 28 Sep 2020 15:13:09 +0100 Subject: [PATCH 003/156] docs: fix typo (#2624) Co-authored-by: Ben Hong --- packages/docs/docs/guide/markdown.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/docs/docs/guide/markdown.md b/packages/docs/docs/guide/markdown.md index 473df89d4f..85720eb865 100644 --- a/packages/docs/docs/guide/markdown.md +++ b/packages/docs/docs/guide/markdown.md @@ -159,7 +159,7 @@ This is a dangerous warning ::: ::: details -This is a details block, which does not work in That is / Edge +This is a details block, which does not work in Internet Explorer or Edge. ::: ### Custom Title From 64e92ca6a14a4778c7801ee2b5625e0b89727f5d Mon Sep 17 00:00:00 2001 From: Derek Pollard Date: Thu, 1 Oct 2020 11:33:13 -0500 Subject: [PATCH 004/156] fix: textlint bug causing PR's to fail checks fix #2636 (#2637) --- packages/docs/docs/miscellaneous/design-concepts.md | 4 ++-- packages/docs/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/docs/docs/miscellaneous/design-concepts.md b/packages/docs/docs/miscellaneous/design-concepts.md index 05ecd00262..f07ad651f4 100644 --- a/packages/docs/docs/miscellaneous/design-concepts.md +++ b/packages/docs/docs/miscellaneous/design-concepts.md @@ -16,11 +16,11 @@ VuePress 1.0 has been rewritten extensively, and the most important one is the i ### Decoupling -With plugins, we can implement many of the core functions with plugins, and you can see many built-in plugins [here](https://github.com/vuejs/vuepress/tree/master/packages/%40vuepress/core/lib/node/internal-plugins) that cover many of the core functions of VuePress, which used to blend in all parts of the code base, but now they’re clear at a glance. +With plugins, we can implement many of the core functions with plugins, and you can see many built-in plugins [here](https://github.com/vuejs/vuepress/tree/master/packages/%40vuepress/core/lib/node/internal-plugins) that cover many of the core functions of VuePress, which used to blend in all parts of the codebase, but now they’re clear at a glance. ### Configuration management -In the past, when we came across some less common requirements, we had some doubts: if we wanted to not support it, VuePress usage scenarios were limited; but if we wanted to support it, we had to write it into the core code base and set up a separate configuration API for it. For the maintainers, apart from not conducive to long-term maintenance, this sometimes makes us feel exhausted. We must think of some better solutions. Yes, this is plugin. +In the past, when we came across some less common requirements, we had some doubts: if we wanted to not support it, VuePress usage scenarios were limited; but if we wanted to support it, we had to write it into the core codebase and set up a separate configuration API for it. For the maintainers, apart from not conducive to long-term maintenance, this sometimes makes us feel exhausted. We must think of some better solutions. Yes, this is plugin. ### `.vuepress/config.js` is also a plugin diff --git a/packages/docs/package.json b/packages/docs/package.json index 19f1c0f987..23d0c33504 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -45,7 +45,7 @@ "textlint-rule-diacritics": "^1.0.0", "textlint-rule-en-capitalization": "^2.0.2", "textlint-rule-stop-words": "^1.0.17", - "textlint-rule-terminology": "^1.1.30", + "textlint-rule-terminology": "^2.1.4", "textlint-rule-write-good": "^1.6.2", "vue-toasted": "^1.1.25", "vuepress": "1.6.0", From 35865ecf0fbc0af85534e0e67dbc5f7088af7eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucien=20B=C3=A9ni=C3=A9?= Date: Fri, 2 Oct 2020 06:47:40 -0400 Subject: [PATCH 005/156] fix: adds accessibility to code-group component (#2630) --- .../global-components/CodeGroup.vue | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/packages/@vuepress/theme-default/global-components/CodeGroup.vue b/packages/@vuepress/theme-default/global-components/CodeGroup.vue index e0a340b2a1..a067af5f85 100644 --- a/packages/@vuepress/theme-default/global-components/CodeGroup.vue +++ b/packages/@vuepress/theme-default/global-components/CodeGroup.vue @@ -1,15 +1,23 @@