styles: clean the code style a little bit

pull/104/head
Kia Ishii 5 years ago
parent 944bf801b7
commit 3a0af1aa26

@ -1,9 +1,9 @@
import { computed } from 'vue' import { computed } from 'vue'
import { useSiteData, useSiteDataByRoute, useRoute } from 'vitepress' import { useSiteData, useSiteDataByRoute, useRoute } from 'vitepress'
import { inBrowser } from '/@app/utils'
import NavBarLink from './NavBarLink.vue' import NavBarLink from './NavBarLink.vue'
import NavDropdownLink from './NavDropdownLink.vue' import NavDropdownLink from './NavDropdownLink.vue'
import { DefaultTheme } from '../config' import { DefaultTheme } from '../config'
import { inBrowser } from '/@app/utils'
const platforms = ['GitHub', 'GitLab', 'Bitbucket'].map( const platforms = ['GitHub', 'GitLab', 'Bitbucket'].map(
(platform) => [platform, new RegExp(platform, 'i')] as const (platform) => [platform, new RegExp(platform, 'i')] as const
@ -91,6 +91,7 @@ export default {
const navData = computed(() => { const navData = computed(() => {
return siteDataByRoute.value.themeConfig.nav return siteDataByRoute.value.themeConfig.nav
}) })
return { return {
navData, navData,
repoInfo, repoInfo,

@ -1,4 +1,5 @@
import { SiteData } from '../../types/shared' import { SiteData } from '../../types/shared'
const inBrowser = typeof window !== 'undefined' const inBrowser = typeof window !== 'undefined'
function findMatchRoot(route: string, roots: string[]) { function findMatchRoot(route: string, roots: string[]) {
@ -28,12 +29,8 @@ function resolveLocales<T>(
// this merges the locales data to the main data by the route // this merges the locales data to the main data by the route
export function resolveSiteDataByRoute(siteData: SiteData, route: string) { export function resolveSiteDataByRoute(siteData: SiteData, route: string) {
if (inBrowser) { route = cleanRoute(siteData, route)
const siteBaseWithoutSuffix = siteData.base.endsWith('/')
? siteData.base.slice(0, -1)
: siteData.base
route = route.slice(siteBaseWithoutSuffix.length)
}
const localeData = resolveLocales(siteData.locales || {}, route) || {} const localeData = resolveLocales(siteData.locales || {}, route) || {}
const localeThemeConfig = const localeThemeConfig =
resolveLocales<any>( resolveLocales<any>(
@ -53,3 +50,17 @@ export function resolveSiteDataByRoute(siteData: SiteData, route: string) {
locales: {} locales: {}
} }
} }
/**
* Clean up the route by removing the `base` path if it's set in config.
*/
function cleanRoute(siteData: SiteData, route: string): string {
if (!inBrowser) {
return route
}
const base = siteData.base
const baseWithoutSuffix = base.endsWith('/') ? base.slice(0, -1) : base
return route.slice(baseWithoutSuffix.length)
}

Loading…
Cancel
Save