docs(en): merge docs/main into docs-ru/main @ 15820b06

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 dist
 .vitepress/@slidev
+.vitepress/cache

.npmrc

@@ -1 +1,2 @@
 shamefully-hoist=true
+strict-peer-dependencies=false

.vitepress/config.js → .vitepress/config.ts

@@ -1,6 +1,10 @@
-// @ts-check
+import type { DefaultTheme } from 'vitepress'
+import { defineConfig } from 'vitepress'
+import { transformerTwoslash } from '@shikijs/vitepress-twoslash'
 
-const Guide = [
+const CURRENT_VERSION = '0.48.0-beta.2'
+
+const Guide: DefaultTheme.NavItemWithLink[] = [
  {
  text: 'Почему Slidev',
  link: '/guide/why',
@@ -46,10 +50,14 @@ const Guide = [
  link: '/guide/presenter-mode',
  },
  {
+<<<<<<< HEAD:.vitepress/config.js
 <<<<<<< HEAD
  text: 'Интеграции редакторов',
 =======
  text: 'Drawing & Annonations',
+=======
+ text: 'Drawing & Annotations',
+>>>>>>> 15820b064d1f419ed06cd798ae4b6dfe0c230e94:.vitepress/config.ts
  link: '/guide/drawing',
  },
  {
@@ -63,7 +71,18 @@ const Guide = [
  },
 ]
 
-const Theme = [
+const BuiltIn: DefaultTheme.NavItemWithLink[] = [
+ {
+ text: 'Components',
+ link: '/builtin/components',
+ },
+ {
+ text: 'Layouts',
+ link: '/builtin/layouts',
+ },
+]
+
+const Theme: (DefaultTheme.NavItemWithLink | DefaultTheme.NavItemChildren)[] = [
  {
  text: 'Использование тем',
  link: '/themes/use',
@@ -78,8 +97,9 @@ const Theme = [
  },
 ]
 
-const Translations = [
+const Addon: DefaultTheme.NavItemWithLink[] = [
  {
+<<<<<<< HEAD:.vitepress/config.js
  text: 'Русский',
  },
  {
@@ -113,10 +133,18 @@ const Translations = [
  {
  text: 'Ελληνικά',
  link: 'https://el.sli.dev{{pathname}}',
+=======
+ text: 'Use Addon',
+ link: '/addons/use',
+ },
+ {
+ text: 'Write an Addon',
+ link: '/addons/write-an-addon',
+>>>>>>> 15820b064d1f419ed06cd798ae4b6dfe0c230e94:.vitepress/config.ts
  },
 ]
 
-const Customizations = [
+const Customizations: (DefaultTheme.NavItemWithLink | DefaultTheme.NavItemChildren)[] = [
  {
  text: 'Кастомизация',
  link: '/custom/',
@@ -142,8 +170,13 @@ const Customizations = [
  link: '/custom/config-vite',
  },
  {
+<<<<<<< HEAD:.vitepress/config.js
  text: 'Конфигурация Windi CSS',
  link: '/custom/config-windicss',
+=======
+ text: 'Configure UnoCSS',
+ link: '/custom/config-unocss',
+>>>>>>> 15820b064d1f419ed06cd798ae4b6dfe0c230e94:.vitepress/config.ts
  },
  {
  text: 'Конфигурация Monaco',
@@ -158,7 +191,15 @@ const Customizations = [
  link: '/custom/config-mermaid',
  },
  {
+<<<<<<< HEAD:.vitepress/config.js
  text: 'Конфигурация горячих клавиш',
+=======
+ text: 'Configure Parser',
+ link: '/custom/config-parser',
+ },
+ {
+ text: 'Configure Shortcuts',
+>>>>>>> 15820b064d1f419ed06cd798ae4b6dfe0c230e94:.vitepress/config.ts
  link: '/custom/config-shortcuts',
  },
  {
@@ -168,10 +209,10 @@ const Customizations = [
  {
  text: 'Глобальные слои',
  link: '/custom/global-layers',
- }
+ },
 ]
 
-const Resources = [
+const Resources: DefaultTheme.NavItemWithLink[] = [
  {
  text: 'Примеры',
  link: '/showcases',
@@ -186,8 +227,9 @@ const Resources = [
  },
 ]
 
-const slidebars = [
+const slidebars: DefaultTheme.SidebarItem[] = [
  {
+<<<<<<< HEAD:.vitepress/config.js
  text: 'Руководство',
  children: Guide,
  },
@@ -211,13 +253,30 @@ const slidebars = [
  link: '/builtin/layouts',
  },
  ],
+=======
+ text: 'Guide',
+ items: Guide,
+ },
+ {
+ text: 'Themes',
+ items: Theme,
+ },
+ {
+ text: 'Addons',
+ items: Addon,
+ },
+ {
+ text: 'Customizations',
+ items: Customizations,
+ },
+ {
+ text: 'Built-in',
+ items: BuiltIn,
+>>>>>>> 15820b064d1f419ed06cd798ae4b6dfe0c230e94:.vitepress/config.ts
  },
 ]
 
-/**
- * @type {import('vitepress').UserConfig}
- */
-module.exports = {
+export default defineConfig({
  title: 'Slidev',
  description: 'Presentation slides for developers',
  head: [
@@ -233,7 +292,26 @@ module.exports = {
  ['link', { rel: 'preconnect', crossorigin: 'anonymous', href: 'https://fonts.gstatic.com' }],
  ['link', { href: 'https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@200;400;500&family=Inter:wght@200;400;500;600', rel: 'stylesheet' }],
  ],
+ markdown: {
+ theme: {
+ light: 'vitesse-light',
+ dark: 'vitesse-dark',
+ },
+ async shikiSetup(shiki) {
+ await shiki.loadLanguage(
+ 'html',
+ 'xml',
+ 'vue',
+ 'markdown',
+ )
+ },
+ codeTransformers: [
+ transformerTwoslash(),
+ ],
+ },
+ cleanUrls: true,
  themeConfig: {
+<<<<<<< HEAD:.vitepress/config.js
  repo: 'slidevjs/docs-ru',
  logo: '/logo.svg',
  docsBranch: 'main',
@@ -247,6 +325,16 @@ module.exports = {
  // for translations maintainers: change the filter to your locale code (subdomain name)
  facetFilters: ['language:ru']
  }
+=======
+ logo: '/logo.svg',
+ editLink: {
+ pattern: 'https://github.com/slidevjs/docs/edit/main/:path',
+ text: 'Suggest changes to this page',
+ },
+
+ search: {
+ provider: 'local',
+>>>>>>> 15820b064d1f419ed06cd798ae4b6dfe0c230e94:.vitepress/config.ts
  },
 
  nav: [
@@ -255,30 +343,112 @@ module.exports = {
  items: Guide,
  },
  {
+<<<<<<< HEAD:.vitepress/config.js
  text: 'Темы',
  items: Theme,
  },
  {
  text: 'Кастомизация',
  items: Customizations,
+=======
+ text: 'Theme',
+ items: [
+ ...Theme,
+ {
+ text: 'Built-in',
+ items: BuiltIn,
+ },
+ ],
+ },
+ {
+ text: 'Customize',
+ items: [
+ ...Customizations,
+ {
+ text: 'Addon',
+ items: Addon,
+ },
+ ],
+>>>>>>> 15820b064d1f419ed06cd798ae4b6dfe0c230e94:.vitepress/config.ts
  },
  {
  text: 'Ресурсы',
  items: Resources,
  },
  {
+<<<<<<< HEAD:.vitepress/config.js
  text: 'Русский',
  items: Translations,
+=======
+ text: `v${CURRENT_VERSION}`,
+ items: [
+ { text: 'Release Notes', link: 'https://github.com/slidevjs/slidev/releases' },
+ ],
+>>>>>>> 15820b064d1f419ed06cd798ae4b6dfe0c230e94:.vitepress/config.ts
  },
  ],
 
+ socialLinks: [
+ { icon: 'github', link: 'https://github.com/slidevjs/slidev' },
+ { icon: 'twitter', link: 'https://twitter.com/slidevjs' },
+ { icon: 'discord', link: 'https://chat.sli.dev' },
+ ],
+
  sidebar: {
  '/guide/': slidebars,
  '/themes/': slidebars,
+ '/addons/': slidebars,
  '/custom/': slidebars,
  '/builtin/': slidebars,
  '/resources/': slidebars,
  '/': slidebars,
  },
+
+ footer: {
+ message: 'Released under the MIT License.',
+ copyright: 'Copyright © 2020 Anthony Fu.',
+ },
+ },
+
+ locales: {
+ root: {
+ label: 'English',
+ },
+ zh: {
+ label: '简体中文',
+ link: 'https://cn.sli.dev/',
+ },
+ fr: {
+ label: 'Français',
+ link: 'https://fr.sli.dev/',
+ },
+ es: {
+ label: 'Español',
+ link: 'https://es.sli.dev/',
+ },
+ ru: {
+ label: 'Русский',
+ link: 'https://ru.sli.dev/',
+ },
+ vn: {
+ label: 'Việt Nam',
+ link: 'https://vn.sli.dev/',
+ },
+ de: {
+ label: 'Deutsch',
+ link: 'https://de.sli.dev/',
+ },
+ br: {
+ label: 'Português (BR)',
+ link: 'https://br.sli.dev/',
+ },
+ el: {
+ label: 'Ελληνικά',
+ link: 'https://el.sli.dev/',
+ },
+ ja: {
+ label: '日本語',
+ link: 'https://ja.sli.dev/',
+ },
  },
-}
+})

.vitepress/scripts/prepare.js

@@ -1,8 +1,8 @@
-const fs = require('fs-extra')
+import { copy, remove } from 'fs-extra'
 
-async function main(){
- await fs.remove('.vitepress/@slidev')
- await fs.copy('node_modules/@slidev', '.vitepress/@slidev', { dereference: true })
+async function main() {
+ await remove('.vitepress/@slidev')
+ await copy('node_modules/@slidev', '.vitepress/@slidev', { dereference: true })
 }
 
 main()