Skip to content

Commit

Permalink
Merge pull request #50 from yel-hadd/master
Browse files Browse the repository at this point in the history
Fixed conflicting packages versions, solved issues with sidebar.
  • Loading branch information
bogdanssh authored Feb 6, 2024
2 parents 41b7b24 + c4b9e9e commit a2be048
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 18 deletions.
5 changes: 2 additions & 3 deletions docs/.vuepress/theme/util.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {inject} from "vue";
import sidebarItems from "../config-client/sidebar";

export const hashRE = /#.*$/ // a regular expression to match the hash portion of a URL.
export const extRE = /\.(md|html)$/ // a regular expression to match file extensions.
Expand Down Expand Up @@ -163,8 +163,7 @@ function resolvePath(relative, base, append) {
*/

export function resolveSidebarItems(page, route, pages) {
const {locales} = inject('themeConfig')
const {base, config} = resolveMatchingConfig(route, locales.sidebar)
const {base, config} = resolveMatchingConfig(route, sidebarItems)
return config
? config.map(item => resolveItem(item, pages, base))
: []
Expand Down
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@
"preview": "vite preview"
},
"dependencies": {
"@types/vue-select": "^3.16.2",
"@vuepress/core": "^1.9.9",
"@vuepress/plugin-container": "^2.0.0-beta.8",
"@vuepress/theme-default": "^1.9.9",
"@vuepress/utils": "^2.0.0-alpha.1",
"@types/vue-select": "3.16.2",
"@vuepress/core": "1.9.9",
"@vuepress/plugin-container": "2.0.0-beta.8",
"@vuepress/theme-default": "1.9.9",
"@vuepress/utils": "2.0.0-alpha.1",
"cl-doc-vue-bot-ui": "0.1.4",
"mitt": "^3.0.0",
"@vuepress/plugin-prismjs": "^2.0.0-beta.4",
"stylus": "^0.59.0",
"vue-multiselect": "^3.0.0-beta.2",
"vue-select": "^4.0.0-beta.6"
"mitt": "3.0.0",
"@vuepress/plugin-prismjs": "2.0.0-beta.4",
"stylus": "0.59.0",
"vue-multiselect": "3.0.0-beta.2",
"vue-select": "4.0.0-beta.6"
},
"devDependencies": {
"@vitejs/plugin-vue": "^4.1.0",
"@vuepress/plugin-register-components": "^2.0.0-beta.63",
"typescript": "^5.0.2",
"vite": "^4.3.0",
"vue-tsc": "^1.2.0",
"@vitejs/plugin-vue": "4.1.0",
"@vuepress/plugin-register-components": "2.0.0-beta.63",
"typescript": "5.0.2",
"vite": "4.3.0",
"vue-tsc": "1.2.0",
"vuepress": "2.0.0-beta.61"
}
}

0 comments on commit a2be048

Please sign in to comment.