Skip to content

Commit 826df12

Browse files
alexeyzimarevalexeyzimarev
authored
Use async and proper attributes (#932)
1 parent adc11fe commit 826df12

File tree

2 files changed

+43
-40
lines changed

2 files changed

+43
-40
lines changed

‎docs/.vuepress/client.ts‎

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import "iconify-icon";
2-
import {onMounted} from "vue";
32
import type {RouteLocationNormalized} from "vue-router";
43
import {defineClientConfig, useRoute} from 'vuepress/client';
54
import CloudBanner from "./components/CloudBanner.vue";
@@ -121,33 +120,50 @@ export default defineClientConfig({
121120
addFixedRoute(`/clients/grpc/:pathMatch(.*)*`, "/clients/");
122121

123122
addDynamicRoute(`/clients/${clients}/latest/:pathMatch(.*)*`, to => {
124-
const latestVersion = __VERSIONS__.all.find(x => x.id === `${to.params.lang}-client`)?.versions[0]
125-
return `/clients/${to.params.lang}/${latestVersion?.version}/${to.params.pathMatch}`;
123+
const latestVersion = __VERSIONS__.all.find(x => x.id === `${to.params.lang}-client`)?.versions[0]
124+
if (!latestVersion?.version) {
125+
return `/clients/`;
126+
}
127+
return `/clients/${to.params.lang}/${latestVersion?.version}/${to.params.pathMatch}`;
126128
});
127129
addDynamicRoute(`/clients/${clients}/latest`, to => {
128-
const latestVersion = __VERSIONS__.all.find(x => x.id === `${to.params.lang}-client`)?.versions[0]
129-
return `/clients/${to.params.lang}/${latestVersion?.version}/${latestVersion?.startPage}`;
130+
const latestVersion = __VERSIONS__.all.find(x => x.id === `${to.params.lang}-client`)?.versions?.[0];
131+
if (!latestVersion?.version || !latestVersion?.startPage) {
132+
return `/clients/`;
133+
}
134+
return `/clients/${to.params.lang}/${latestVersion.version}/${latestVersion.startPage}`;
130135
});
131136
addDynamicRoute(`/clients/${clients}/legacy/:version`, to => {
132-
const version = to.params.version;
133-
const latestVersion = __VERSIONS__.all.find(x => x.id === `${to.params.lang}-client`)?.versions.find(v => v.path === `legacy/${version}`)
134-
return `/clients/${to.params.lang}/legacy/${to.params.version}/${latestVersion?.startPage}`;
137+
const version = to.params.version;
138+
const latestVersion = __VERSIONS__.all.find(x => x.id === `${to.params.lang}-client`)?.versions.find(v => v.path === `legacy/${version}`)
139+
if (!latestVersion?.version || !latestVersion?.startPage) {
140+
return `/clients/`;
141+
}
142+
return `/clients/${to.params.lang}/legacy/${to.params.version}/${latestVersion?.startPage}`;
135143
});
136144
addDynamicRoute(`/clients/${clients}/legacy`, to => {
137-
const latestVersion = __VERSIONS__.all.find(x => x.id === `${to.params.lang}-client`)?.versions.find(v => v.path.startsWith('legacy/'))
138-
return `/clients/${to.params.lang}/${latestVersion?.path}/${latestVersion?.startPage}`;
145+
const latestVersion = __VERSIONS__.all.find(x => x.id === `${to.params.lang}-client`)?.versions.find(v => v.path.startsWith('legacy/'))
146+
if (!latestVersion?.version || !latestVersion?.startPage) {
147+
return `/clients/`;
148+
}
149+
return `/clients/${to.params.lang}/${latestVersion?.path}/${latestVersion?.startPage}`;
139150
})
140151
addDynamicRoute(`/clients/${clients}/:version`, to => {
141-
const version = to.params.version;
142-
const latestVersion = __VERSIONS__.all.find(x => x.id === `${to.params.lang}-client`)?.versions.find(v => v.path === version)
143-
return `/clients/${to.params.lang}/${version}/${latestVersion?.startPage}`;
152+
const version = to.params.version;
153+
const latestVersion = __VERSIONS__.all.find(x => x.id === `${to.params.lang}-client`)?.versions.find(v => v.path === version)
154+
if (!latestVersion?.version || !latestVersion?.startPage) {
155+
return `/clients/`;
156+
}
157+
return `/clients/${to.params.lang}/${version}/${latestVersion?.startPage}`;
144158
});
145159
addDynamicRoute(`/clients/${clients}`, to => {
146-
const latestVersion = __VERSIONS__.all.find(x => x.id === `${to.params.lang}-client`)?.versions[0]
147-
return `/clients/${to.params.lang}/${latestVersion?.path}/${latestVersion?.startPage}`;
160+
const latestVersion = __VERSIONS__.all.find(x => x.id === `${to.params.lang}-client`)?.versions[0]
161+
if (!latestVersion?.version || !latestVersion?.startPage) {
162+
return `/clients/`;
163+
}
164+
return `/clients/${to.params.lang}/${latestVersion?.path}/${latestVersion?.startPage}`;
148165
})
149166

150-
151167
// Add fixed routes for server versions because they don't use the same sidebar structure as the other versions
152168
addFixedRoute("/server/v22.10", "/server/v22.10/introduction.html");
153169
addFixedRoute("/server/v5", "/server/v5/introduction.html");
@@ -200,11 +216,4 @@ export default defineClientConfig({
200216
});
201217
router.beforeEach((to, from) => leave(to, from));
202218
},
203-
setup() {
204-
onMounted(() => {
205-
const route = useRoute();
206-
if (route.path !== "/") ;
207-
});
208-
209-
},
210219
});

‎docs/.vuepress/config.ts‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,6 @@ export default defineUserConfig({
7878
},
7979
theme: hopeTheme(themeOptions, {custom: true}),
8080
head: [
81-
// Business Institution 247, before the user accepts cookie
82-
['script', {
83-
type: 'text/javascript',
84-
src: 'https://secure.businessintuition247.com/js/264384.js',
85-
}],
86-
['noscript', {},
87-
'<img alt="" src="https://secure.businessintuition247.com/264384.png" style="display:none;" />'
88-
],
89-
9081
// Scarf
9182
['noscript', {},
9283
'<img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=a2c83cb1-95a4-4437-91e2-ab0211cc0298" />'
@@ -96,9 +87,9 @@ export default defineUserConfig({
9687
['script', {
9788
id: 'Cookiebot',
9889
src: 'https://consent.cookiebot.com/uc.js',
90+
type: 'text/javascript',
9991
'data-cbid': 'ee971b30-e872-46e8-b421-706ef26d9dcc',
10092
'data-blockingmode': 'auto',
101-
type: 'text/javascript',
10293
}],
10394

10495
// Cookiebot declaration
@@ -109,14 +100,12 @@ export default defineUserConfig({
109100
async: true,
110101
}],
111102

112-
// Segment
113-
// ['script', { src: '/js/snippet.js' }],
114-
115-
// Business Institution 247 “consent‑only” loader
116-
['script', {
103+
// Business Institution 247 “consent‑only” loader
104+
['script', {
105+
src: 'https://secure.businessintuition247.com/js/sc/264384.js',
117106
type: 'text/plain',
107+
async: true,
118108
'data-cookiecategory': 'marketing',
119-
src: 'https://secure.businessintuition247.com/js/sc/264384.js',
120109
}],
121110

122111
// Kapa helper widget
@@ -129,7 +118,12 @@ export default defineUserConfig({
129118
}],
130119

131120
// Reo
132-
['script', { src: "/js/reo.js"}],
121+
['script', {
122+
src: "/js/reo.js",
123+
type: 'text/plain',
124+
async: true,
125+
'data-cookiecategory': 'marketing',
126+
}],
133127

134128
// CSS override to hide the modal mask and wrapper entirely
135129
['style', {}, `

0 commit comments

Comments
 (0)