Skip to content

Commit a90d971

Browse files
posvaposva
committed
fix(links): keep relative hash links as is
1 parent 4e47701 commit a90d971

File tree

4 files changed

+25
-114
lines changed

4 files changed

+25
-114
lines changed

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
"author": "Evan You",
5555
"license": "MIT",
5656
"dependencies": {
57-
"@vue/compiler-sfc": "3.0.0-rc.10",
58-
"@vue/server-renderer": "3.0.0-rc.10",
57+
"@vue/compiler-sfc": "^3.0.0-rc.11",
58+
"@vue/server-renderer": "^3.0.0-rc.11",
5959
"debug": "^4.1.1",
6060
"diacritics": "^1.3.0",
6161
"escape-html": "^1.0.3",
@@ -72,7 +72,7 @@
7272
"prismjs": "^1.20.0",
7373
"slash": "^3.0.0",
7474
"vite": "^1.0.0-rc.4",
75-
"vue": "3.0.0-rc.10"
75+
"vue": "^3.0.0-rc.11"
7676
},
7777
"devDependencies": {
7878
"@types/fs-extra": "^9.0.1",

‎src/client/theme-default/components/NextAndPrevLinks.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { defineComponent, computed } from 'vue'
1+
import { computed } from 'vue'
22
import { usePageData, useSiteData } from 'vitepress'
33
import { DefaultTheme } from '../config'
44

5-
export default defineComponent({
5+
export default {
66
setup() {
77
const pageData = usePageData()
88
// TODO: could this be useSiteData<DefaultTheme.Config> or is the siteData
@@ -51,4 +51,4 @@ export default defineComponent({
5151
hasLinks
5252
}
5353
}
54-
})
54+
}

‎src/client/theme-default/components/SideBar.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,12 @@ function resolveMultiSidebar(
153153
}
154154

155155
function resolveLink(base: string, path: string): string | undefined {
156-
return path ? joinUrl(base, path || '') : undefined
156+
return path
157+
? // keep relative hash to the same page
158+
path.startsWith('#')
159+
? path
160+
: joinUrl(base, path)
161+
: undefined
157162
}
158163

159164
function createLink(active: boolean, text: string, link?: string): VNode {

‎yarn.lock

+13-107
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
chalk "^2.0.0"
2929
js-tokens "^4.0.0"
3030

31-
"@babel/parser@^7.10.4", "@babel/parser@^7.11.5":
31+
"@babel/parser@^7.11.5":
3232
version "7.11.5"
3333
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
3434
integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==
@@ -45,7 +45,7 @@
4545
dependencies:
4646
regenerator-runtime "^0.13.4"
4747

48-
"@babel/types@^7.10.4", "@babel/types@^7.11.5":
48+
"@babel/types@^7.11.5":
4949
version "7.11.5"
5050
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d"
5151
integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==
@@ -314,17 +314,6 @@
314314
"@types/express-serve-static-core" "*"
315315
"@types/mime" "*"
316316

317-
"@vue/compiler-core@3.0.0-rc.10":
318-
version "3.0.0-rc.10"
319-
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-rc.10.tgz#a76f713fb0462429ec0ec10a472fff1f539c5772"
320-
integrity sha512-kQzHzRsM0NPAWHeqSTb2J4VsHhjRkGeLTsGzeMnW+sojgTnS3T94KacwvYgVS4qeZAKiDq0bMNZoJWrHVQ3T8g==
321-
dependencies:
322-
"@babel/parser" "^7.10.4"
323-
"@babel/types" "^7.10.4"
324-
"@vue/shared" "3.0.0-rc.10"
325-
estree-walker "^2.0.1"
326-
source-map "^0.6.1"
327-
328317
"@vue/compiler-core@3.0.0-rc.11":
329318
version "3.0.0-rc.11"
330319
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-rc.11.tgz#4fb60aeab0b8e560fe4e587b02a546a5ad575754"
@@ -336,14 +325,6 @@
336325
estree-walker "^2.0.1"
337326
source-map "^0.6.1"
338327

339-
"@vue/compiler-dom@3.0.0-rc.10":
340-
version "3.0.0-rc.10"
341-
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.10.tgz#dd1380d1ee61170de76f9eb91e0d8ac7985f0ae0"
342-
integrity sha512-pqIUf5leZm0P9379utrRSVBMxhV8XaqJTEFFp5etCtbEa/H5ALs29EjFMtMcm9sQaVkZlKLu86mgIacbYB9Q3w==
343-
dependencies:
344-
"@vue/compiler-core" "3.0.0-rc.10"
345-
"@vue/shared" "3.0.0-rc.10"
346-
347328
"@vue/compiler-dom@3.0.0-rc.11", "@vue/compiler-dom@^3.0.0-rc.5":
348329
version "3.0.0-rc.11"
349330
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.11.tgz#f991bba3d312e58b80927454e42d2e75adae186f"
@@ -352,29 +333,7 @@
352333
"@vue/compiler-core" "3.0.0-rc.11"
353334
"@vue/shared" "3.0.0-rc.11"
354335

355-
"@vue/compiler-sfc@3.0.0-rc.10":
356-
version "3.0.0-rc.10"
357-
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.10.tgz#4351ece66cdf4d758877482f69421c43d994dbaf"
358-
integrity sha512-VIJ+VXqeM7WoRNgD9uYSARVb6CYq+JS2NNHfeerfNc7Uk3pjYHRv1MwEicAvN6zWFm5GLC1ZYTVD+WFg3xGAkQ==
359-
dependencies:
360-
"@babel/parser" "^7.10.4"
361-
"@babel/types" "^7.10.4"
362-
"@vue/compiler-core" "3.0.0-rc.10"
363-
"@vue/compiler-dom" "3.0.0-rc.10"
364-
"@vue/compiler-ssr" "3.0.0-rc.10"
365-
"@vue/shared" "3.0.0-rc.10"
366-
consolidate "^0.15.1"
367-
estree-walker "^2.0.1"
368-
hash-sum "^2.0.0"
369-
lru-cache "^5.1.1"
370-
magic-string "^0.25.7"
371-
merge-source-map "^1.1.0"
372-
postcss "^7.0.27"
373-
postcss-modules "^3.1.0"
374-
postcss-selector-parser "^6.0.2"
375-
source-map "^0.6.1"
376-
377-
"@vue/compiler-sfc@^3.0.0-rc.5":
336+
"@vue/compiler-sfc@^3.0.0-rc.11", "@vue/compiler-sfc@^3.0.0-rc.5":
378337
version "3.0.0-rc.11"
379338
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.11.tgz#bea07c12c5985ed97e744af1b0461169e7501a60"
380339
integrity sha512-5rNbRiY9pG/govbwv53Y5PcL5qZRDv6twz7Nmap+hfo06u/yhjFmMeU6ftulc6fu/u/hpePVu4rrthFrmOj3hg==
@@ -396,14 +355,6 @@
396355
postcss-selector-parser "^6.0.2"
397356
source-map "^0.6.1"
398357

399-
"@vue/compiler-ssr@3.0.0-rc.10":
400-
version "3.0.0-rc.10"
401-
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.10.tgz#95a5f6b65b19a514c94f056994ec144b3b1b03ae"
402-
integrity sha512-JBPil8sO5j7puB8acX2CQMRXEYB/EP8PoEur7RcF/+aqATI7C4yqWcSLC5TRJpigj6xE6ku6sx8om+j7ZHvgBw==
403-
dependencies:
404-
"@vue/compiler-dom" "3.0.0-rc.10"
405-
"@vue/shared" "3.0.0-rc.10"
406-
407358
"@vue/compiler-ssr@3.0.0-rc.11":
408359
version "3.0.0-rc.11"
409360
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.11.tgz#b88df800c890de939955d6e620c7a1316a89b763"
@@ -412,28 +363,13 @@
412363
"@vue/compiler-dom" "3.0.0-rc.11"
413364
"@vue/shared" "3.0.0-rc.11"
414365

415-
"@vue/reactivity@3.0.0-rc.10":
416-
version "3.0.0-rc.10"
417-
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-rc.10.tgz#34d5f51bcc5a7c36e27d7a9c1bd7a3d25ffa7c56"
418-
integrity sha512-mkUZfOJlbqGZx2cARmhCs5r2+xLJPL7VFNagmlA3Fd66ZXBc3ZvTQdYsY4VUbYJFe5ByIzqu9TZiAkzXY+JVaA==
419-
dependencies:
420-
"@vue/shared" "3.0.0-rc.10"
421-
422366
"@vue/reactivity@3.0.0-rc.11":
423367
version "3.0.0-rc.11"
424368
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-rc.11.tgz#e3a856f2e4e7ebbd7050b2ef71997c91e3a28a40"
425369
integrity sha512-dlnCZdv4rKm6z4szfaua0Hsd5LQeUeZi6BI5c9Y+CBRU1Dwo8wb9Sz3I42ZRKDrkxB2ii9WhprW4d4H50RCnCA==
426370
dependencies:
427371
"@vue/shared" "3.0.0-rc.11"
428372

429-
"@vue/runtime-core@3.0.0-rc.10":
430-
version "3.0.0-rc.10"
431-
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-rc.10.tgz#9055aef5113cbc328aaec29760c2151e0ed3cf40"
432-
integrity sha512-VK/kq4gDDoqZ45CVwdbLLpikXLYLCt6YLhdgXX3fhf20gvPqrbEZv1ZNLruNnhhTpf9cLyU4tZ18DHeaUYPziw==
433-
dependencies:
434-
"@vue/reactivity" "3.0.0-rc.10"
435-
"@vue/shared" "3.0.0-rc.10"
436-
437373
"@vue/runtime-core@3.0.0-rc.11":
438374
version "3.0.0-rc.11"
439375
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-rc.11.tgz#6fade3a5d7ceed6a61683e375855bf452ce9d301"
@@ -442,15 +378,6 @@
442378
"@vue/reactivity" "3.0.0-rc.11"
443379
"@vue/shared" "3.0.0-rc.11"
444380

445-
"@vue/runtime-dom@3.0.0-rc.10":
446-
version "3.0.0-rc.10"
447-
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.10.tgz#50f95cb991483a4262163723320967ad17bb321f"
448-
integrity sha512-bH4GuneHt3FQ+/21jba5orM/CO9N1cnT7J3wtrxopFJ4/4H5cvHXyG6v+ZVTu1d733Ij/6yMRA7xbtfi9a4zJw==
449-
dependencies:
450-
"@vue/runtime-core" "3.0.0-rc.10"
451-
"@vue/shared" "3.0.0-rc.10"
452-
csstype "^2.6.8"
453-
454381
"@vue/runtime-dom@3.0.0-rc.11":
455382
version "3.0.0-rc.11"
456383
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.11.tgz#3700e1f95b822cb6bf9a01c8cd389ae3d54af64c"
@@ -460,18 +387,13 @@
460387
"@vue/shared" "3.0.0-rc.11"
461388
csstype "^2.6.8"
462389

463-
"@vue/server-renderer@3.0.0-rc.10":
464-
version "3.0.0-rc.10"
465-
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.0-rc.10.tgz#57e42d5783b526c4fe7cc6a2555d49dca55d328a"
466-
integrity sha512-yJeRmN+pEWvJy/+3RhwBd7sL+H977oNZHI4SbFR88fDbMuYVSF6YEVVnTcP+v51Z1bVfoQSxZMCsQ9dTRY79MQ==
390+
"@vue/server-renderer@^3.0.0-rc.11":
391+
version "3.0.0-rc.11"
392+
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.0.0-rc.11.tgz#ddf583e2dfebb6670d20a4545dddf89358d192f7"
393+
integrity sha512-F5CimUuZd70YLVearQIHmmgCKfGogmyirCg/W3ro9yVercqMKTLKLht8ZsjjTask9eV44/bxLUjBhGSxgRCPiw==
467394
dependencies:
468-
"@vue/compiler-ssr" "3.0.0-rc.10"
469-
"@vue/shared" "3.0.0-rc.10"
470-
471-
"@vue/shared@3.0.0-rc.10":
472-
version "3.0.0-rc.10"
473-
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-rc.10.tgz#e7ab62abcabbfc738545902b96a3aa78f59f3286"
474-
integrity sha512-fI6gVhhgb3cAmEkY4oeVVA2hWZ2xvkgogHdBI5PL7gSvZnOB6XZ2eQGsYjC4W+7BegvEkoMBuZsFXVa4ZQ07XQ==
395+
"@vue/compiler-ssr" "3.0.0-rc.11"
396+
"@vue/shared" "3.0.0-rc.11"
475397

476398
"@vue/shared@3.0.0-rc.11":
477399
version "3.0.0-rc.11"
@@ -604,7 +526,7 @@ binary-extensions@^2.0.0:
604526
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
605527
integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
606528

607-
bluebird@^3.1.1, bluebird@^3.7.2:
529+
bluebird@^3.7.2:
608530
version "3.7.2"
609531
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
610532
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -890,13 +812,6 @@ concat-map@0.0.1:
890812
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
891813
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
892814

893-
consolidate@^0.15.1:
894-
version "0.15.1"
895-
resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
896-
integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==
897-
dependencies:
898-
bluebird "^3.1.1"
899-
900815
consolidate@^0.16.0:
901816
version "0.16.0"
902817
resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.16.0.tgz#a11864768930f2f19431660a65906668f5fbdc16"
@@ -3062,7 +2977,7 @@ postcss-modules-values@^3.0.0:
30622977
icss-utils "^4.0.0"
30632978
postcss "^7.0.6"
30642979

3065-
postcss-modules@^3.1.0, postcss-modules@^3.2.2:
2980+
postcss-modules@^3.2.2:
30662981
version "3.2.2"
30672982
resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-3.2.2.tgz#ee390de0f9f18e761e1778dfb9be26685c02c51f"
30682983
integrity sha512-JQ8IAqHELxC0N6tyCg2UF40pACY5oiL6UpiqqcIFRWqgDYO8B0jnxzoQ0EOpPrWXvcpu6BSbQU/3vSiq7w8Nhw==
@@ -3096,7 +3011,7 @@ postcss-value-parser@^4.1.0:
30963011
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
30973012
integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
30983013

3099-
postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
3014+
postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
31003015
version "7.0.32"
31013016
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
31023017
integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
@@ -4010,16 +3925,7 @@ vite@^1.0.0-rc.4:
40103925
vue "^3.0.0-rc.5"
40113926
ws "^7.2.3"
40123927

4013-
vue@3.0.0-rc.10:
4014-
version "3.0.0-rc.10"
4015-
resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-rc.10.tgz#31298a757b4fad6ee8973d0fa27c4fde8574bd01"
4016-
integrity sha512-nRsyIQtOWLDMBb5dsPwg/WdIqznCMVWN6O6wJSzhseKC768wHlZKcJ7SPHhWPid9wi3Ykhtl9vtgvxTK/qICkw==
4017-
dependencies:
4018-
"@vue/compiler-dom" "3.0.0-rc.10"
4019-
"@vue/runtime-dom" "3.0.0-rc.10"
4020-
"@vue/shared" "3.0.0-rc.10"
4021-
4022-
vue@^3.0.0-rc.5:
3928+
vue@^3.0.0-rc.11, vue@^3.0.0-rc.5:
40233929
version "3.0.0-rc.11"
40243930
resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-rc.11.tgz#c383e74262a51f6bcffd8da9b2049db617533000"
40253931
integrity sha512-5Hbgf5c17gZvKXxxwYXL3Xsf+IsknQMiNoKCf/JcS2OvzUdiwRrlu/Pk2kNFPxD/EGX7k1+OTPWUxoq5Aq55ow==

0 commit comments

Comments
 (0)