/
- const vueRE = /-vue$/
-
- const highlightCode = (str: string, lang: string, attrs: string, additionalClass: string = '') => {
- const vPre = vueRE.test(lang) ? '' : 'v-pre'
- lang = lang.replace(vueRE, '').toLowerCase()
-
- const lineOptions = attrsToLines(attrs)
-
- if (hasSingleTheme) {
- return highlighter
- .codeToHtml(str, { lang, lineOptions, theme: getThemeName(theme) })
- .replace(preRE, ``)
- }
-
- const dark = highlighter
- .codeToHtml(str, { lang, lineOptions, theme: getThemeName(theme.dark) })
- .replace(preRE, ``)
-
- const light = highlighter
- .codeToHtml(str, { lang, lineOptions, theme: getThemeName(theme.light) })
- .replace(preRE, ``)
-
- return dark + light
- }
-
- return (code: string, lang: string, attrs: string) => {
- if (lang === 'ts' || lang === 'typescript') {
- const prettierOptions = {
- ...PRETTIERRC,
- printWidth: 90
- }
-
- const javascript = getJavaScript(code)
- const formattedJS = prettier.format(javascript, {
- ...prettierOptions,
- parser: 'babel'
- })
- const formattedTS = prettier.format(code, {
- ...prettierOptions,
- parser: 'typescript'
- })
- const tsCode = highlightCode(formattedTS, lang, attrs, 'language-selectable')
- const jsCode = highlightCode(formattedJS, 'js', '', 'language-selectable')
-
- return tsCode + jsCode
- }
-
- return highlightCode(code, lang, attrs)
- }
-}
diff --git a/docs/.vitepress/style/main.postcss b/docs/.vitepress/style/main.postcss
index bbd32a60e2..2e6670f070 100644
--- a/docs/.vitepress/style/main.postcss
+++ b/docs/.vitepress/style/main.postcss
@@ -1,8 +1,18 @@
@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@400;700&display=swap');
:root body {
- font-family: 'Poppins', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell,
- 'Open Sans', 'Helvetica Neue', sans-serif !important;
+ font-family:
+ 'Poppins',
+ -apple-system,
+ BlinkMacSystemFont,
+ 'Segoe UI',
+ Roboto,
+ Oxygen,
+ Ubuntu,
+ Cantarell,
+ 'Open Sans',
+ 'Helvetica Neue',
+ sans-serif !important;
}
html {
-webkit-tap-highlight-color: transparent;
@@ -12,6 +22,12 @@ html {
.home-page .VPNavBar {
border-bottom: none;
}
+
+.home-page .VPNav {
+ --vp-nav-bg-color: transparent;
+ --vp-c-gutter: transparent;
+}
+
/* Remove the search button from the home page. Keyboard shortcut still works. */
.home-page #docsearch {
/* display: none; */
@@ -99,24 +115,6 @@ body .bg-base-100 {
backdrop-filter: none;
-webkit-backdrop-filter: none;
}
- #app:not('.home-page') .VPNav.no-sidebar {
- backdrop-filter: saturate(50%) blur(2px);
- -webkit-backdrop-filter: saturate(50%) blur(2px);
- background: none;
- }
- .dark #app .VPNav.no-sidebar {
- backdrop-filter: saturate(50%) blur(2px);
- -webkit-backdrop-filter: saturate(50%) blur(2px);
- background: none;
- }
- #app:not('.home-page') .VPNavBar.has-sidebar .content[data-v-1dc33fef] {
- backdrop-filter: saturate(50%) blur(2px);
- -webkit-backdrop-filter: saturate(50%) blur(2px);
- background: #ffffffcc;
- }
- .dark #app:not('.home-page') .VPNavBar.has-sidebar .content[data-v-1dc33fef] {
- background: #242424cc;
- }
}
/* Overrides */
diff --git a/docs/.vitepress/theme/FeathersLayout.vue b/docs/.vitepress/theme/FeathersLayout.vue
index 033c35e569..3b1ac2b8e6 100644
--- a/docs/.vitepress/theme/FeathersLayout.vue
+++ b/docs/.vitepress/theme/FeathersLayout.vue
@@ -1,7 +1,6 @@
-
-> **Important:** An experimental Deno first implementation is currently under development at https://github.com/feathersjs/feathers/pull/2828
diff --git a/docs/.vitepress/components.d.ts b/docs/.vitepress/components.d.ts
index f4fb8aafe9..febaf90a5b 100644
--- a/docs/.vitepress/components.d.ts
+++ b/docs/.vitepress/components.d.ts
@@ -1,11 +1,11 @@
-// generated by unplugin-vue-components
-// We suggest you to commit this file into source control
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core'
-
export {}
-declare module '@vue/runtime-core' {
+declare module 'vue' {
export interface GlobalComponents {
Badges: typeof import('./components/Badges.vue')['default']
BlockQuote: typeof import('./components/BlockQuote.vue')['default']
diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts
index b6a966ff46..ac98489661 100644
--- a/docs/.vitepress/config.ts
+++ b/docs/.vitepress/config.ts
@@ -1,5 +1,4 @@
import { defineConfig } from 'vitepress'
-import { highlight } from './highlight'
import { discord, font, github, ogImage, ogUrl, twitter, feathersDescription, feathersName } from './meta'
import sidebar from './config.sidebar'
import nav from './config.nav'
@@ -47,16 +46,6 @@ export default defineConfig({
],
lastUpdated: true,
markdown: {
- config: async (md) => {
- md.set({
- highlight: await highlight({
- light: 'vitesse-light',
- dark: 'vitesse-dark'
- })
- })
-
- return md
- },
theme: {
light: 'vitesse-light',
dark: 'vitesse-dark'
diff --git a/docs/.vitepress/highlight.ts b/docs/.vitepress/highlight.ts
deleted file mode 100644
index d70dc971f6..0000000000
--- a/docs/.vitepress/highlight.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { IThemeRegistration, getHighlighter, HtmlRendererOptions } from 'shiki'
-import type { ThemeOptions } from 'vitepress'
-import { getJavaScript, PRETTIERRC } from '@feathersjs/generators/lib/commons'
-import prettier from 'prettier'
-
-/**
- * 2 steps:
- *
- * 1. convert attrs into line numbers:
- * {4,7-13,16,23-27,40} -> [4,7,8,9,10,11,12,13,16,23,24,25,26,27,40]
- * 2. convert line numbers into line options:
- * [{ line: number, classes: string[] }]
- */
-const attrsToLines = (attrs: string): HtmlRendererOptions['lineOptions'] => {
- const result: number[] = []
- if (!attrs.trim()) {
- return []
- }
- attrs
- .split(',')
- .map((v) => v.split('-').map((v) => parseInt(v, 10)))
- .forEach(([start, end]) => {
- if (start && end) {
- result.push(...Array.from({ length: end - start + 1 }, (_, i) => start + i))
- } else {
- result.push(start)
- }
- })
- return result.map((v) => ({
- line: v,
- classes: ['highlighted']
- }))
-}
-
-export async function highlight(
- theme: ThemeOptions = 'material-palenight'
-): Promise<(str: string, lang: string, attrs: string) => string> {
- const hasSingleTheme = typeof theme === 'string' || 'name' in theme
- const getThemeName = (themeValue: IThemeRegistration) =>
- typeof themeValue === 'string' ? themeValue : themeValue.name
-
- const highlighter = await getHighlighter({
- themes: hasSingleTheme ? [theme] : [theme.dark, theme.light]
- })
- const preRE = /^