Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs(en): merge docs/main into docs-ru/main @ 79a4d453 #114

Open
wants to merge 127 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
152e0f6
docs: typo in sidebar (#43)
mathieutu Nov 15, 2021
ad008f0
docs: typos in code (#45)
posva Nov 17, 2021
5d92892
docs: typo (#44)
posva Nov 17, 2021
c393c03
chore: typo (#46)
cheesi Dec 3, 2021
fbc97d8
docs: fix typo (#47)
Deckluhm Dec 8, 2021
a261c23
chore: typo (#48)
tkgroot Dec 20, 2021
06ae275
feat: add TOC documentation (#49)
tonai Jan 17, 2022
ce73d58
fix: broken links (#50)
chengpeiquan Jan 18, 2022
4890d42
Minor notation change (#51)
p1atdev Feb 6, 2022
d99ebc3
feat: add ja trans
antfu Feb 7, 2022
e89a81b
docs: add favicon frontmatter configure (#53)
alexanderdavide Feb 14, 2022
871a293
docs: update shiki URL (#54)
ashramwen Feb 16, 2022
5b4af78
Add slidev-theme-academic (#55)
alexanderdavide Mar 7, 2022
61b06f2
Add showcase Git's Most Wanted (#56)
alexanderdavide Mar 7, 2022
e9cccdb
feat: update install.md to fix the missed docker part (#57)
tangramor Mar 16, 2022
1abac97
Update install.md to fix typos about docker section (#58)
tangramor Mar 16, 2022
b18d6f4
docs: add custom-nav-controls documents (#60)
LarchLiu Mar 22, 2022
d68398a
docs: add mention to --dark option when exporting (#61)
ruyadorno Mar 25, 2022
9fa6829
fix: correct typo in the name of the generated pdf (#62)
twitwi Apr 13, 2022
7308799
Document parameter listClass of Toc (#63)
alexanderdavide Apr 14, 2022
0daa359
feat: add doc for Titles and Link components (#64)
tonai Apr 14, 2022
37797ff
feat: update config doc (#65)
tonai Apr 15, 2022
0305762
docs: update previews of slidev-theme-academic (#66)
alexanderdavide Apr 25, 2022
87e46ef
feat: add doc for CLI commands (#67)
tonai May 19, 2022
017f644
doc: propose a new showcase (#68)
webup May 22, 2022
afa4515
docs: typo with NavControls action description (#69)
lirantal May 24, 2022
1821696
feat: addons doc (#71)
tonai May 25, 2022
1f593ab
docs: fix typos in addons/ (#72)
GeopJr May 27, 2022
2f3c88e
docs: markdown code highlighting for none of the lines (#73)
lirantal Jun 9, 2022
448d7d1
docs: update reference to unplugin-icons (#74)
D3SOX Jun 14, 2022
0d7183d
docs: change some references from http to https (#75)
D3SOX Jun 14, 2022
55faf79
Update navigation.md wording (#77)
CodyBontecou Jun 15, 2022
893d0b6
docs: update custom keybindings (#78)
lirantal Jun 18, 2022
c8121c1
docs: align comments (#80)
yjl9903 Jun 24, 2022
af30fcf
chore: update deps
antfu Jun 30, 2022
6cf71f5
fix: update links
antfu Jun 30, 2022
eca0155
fix: remove work in progress note
antfu Jun 30, 2022
8b430ee
chore: upgrade vitepress
antfu Jul 12, 2022
8c6068a
docs: added description and example usage for auto scroll feature (#83)
wolodev Jul 21, 2022
ea87df4
docs: add previews of slidev-theme-eloc (#85)
zthxxx Jul 27, 2022
e385300
fix: dark mode switch (#86)
leonardssh Jul 31, 2022
1798f9b
Update hosting.md (#88)
pagobls Aug 12, 2022
e9156da
docs: fix exportFilename (#89)
YazanShannak Aug 12, 2022
2b46447
feat: migration message and examples for the new setupShortcuts (#90)
twitwi Sep 12, 2022
f3e4a95
docs: update global-layers.md (#93)
godkun Sep 21, 2022
a9706e0
docs: fix typos and tweak grammar (#94)
Oct 5, 2022
550ff2f
chore: update algolia component
antfu Oct 18, 2022
ecd8bf0
docs(search): correct credentials for docsearch (#95)
Haroenv Oct 18, 2022
7fa7d16
doc: add presenter notes export guide (#96)
lomby92 Oct 25, 2022
26a4550
docs: update for advanced navigation features (#79)
lirantal Oct 25, 2022
37da379
docs: Update showcase list (#92)
alstn2468 Oct 25, 2022
e414b8d
docs: add slidev ppt template with naive-ui (#97)
godkun Nov 4, 2022
041453d
Add slidev-theme-mokkapps (#98)
Mokkapps Nov 4, 2022
eb148aa
fix: disable search box auto open, close #99
antfu Nov 8, 2022
35a71a1
docs: add parser customization (preparser, but also link vite config)…
twitwi Nov 24, 2022
2761858
docs: update parameters in definePreparserSetup (#101)
twitwi Dec 13, 2022
5cffe3b
fix: use bold instead of code tag to avoid breaking chars on mobile (…
jdbruxelles Dec 19, 2022
c32272e
chore(typos): fix typos (#102)
stavares843 Dec 21, 2022
a89202a
docs: update syntax.md (#103)
Mokkapps Jan 10, 2023
2236db4
feat: add LightOrDark component doc (#106)
tonai Jan 20, 2023
9477d41
feat: add presenter mode documentation (#105)
tonai Jan 20, 2023
8d6e5c8
Update showcases.ts (#108)
Mokkapps Jan 23, 2023
2e53e8c
feat: page transition
antfu Jan 29, 2023
fcb11d1
docs: fix broken link in faq (#111)
jChapman Feb 3, 2023
e1c823d
docs: added an example of creating custom Mermaid styles (#110)
estruyf Feb 3, 2023
d6bb78b
docs: Added the unnamed theme (#109)
estruyf Feb 3, 2023
4e268b6
docs: add documentation for export range feature Fix #821 (#104)
neilmispelaar Feb 3, 2023
38e076f
docs: improve slide transition explanation
antfu Feb 3, 2023
8ffa1fd
Update syntax.md: Embedded Styles (#113)
yheuhtozr Feb 5, 2023
dbdc820
docs: fix typo in builtin slide transitions (#114)
matteo-azzolini Feb 6, 2023
9cb6406
docs: update Showcases (#107)
alexanderdavide Feb 7, 2023
7f25ea8
docs(themes): added dracula (#115)
jd-solanki Feb 17, 2023
6c48fa7
feat/export-options
tonai Jan 24, 2023
b66a4ce
feat: add built-in components doc and add buil-in menu (#116)
tonai Feb 24, 2023
c6bd8fa
docs: fix typo in output directory (#118)
enzonotario Mar 6, 2023
46f1104
docs: Added pnpm script (#117)
estruyf Mar 6, 2023
1317cbc
docs: updates for 0.40.5 (#119)
tonai Mar 24, 2023
c2931a4
ci: update checkout and setup-node (#120)
imanmalekian31 Apr 3, 2023
6a80cc0
fix: replace commas with underscores in atomic-css (#122)
matttrice Apr 4, 2023
86744c7
docs: grids-cols to grid-cols (#121)
matttrice Apr 4, 2023
7acc339
docs: add pnpm to install.md instructions (#123)
timozander May 18, 2023
d29625c
docs: align theme docs with types (#124)
bru02 May 21, 2023
19d3ad7
feat: configuring UnoCSS
antfu May 26, 2023
e2d97fb
docs: fix incorrect option name (#125)
kaakaa May 29, 2023
44920cd
docs: support setting startLines for codeblocks slidev (#126)
fr0zn May 31, 2023
281e164
fix: IPA correction (#127)
alephpi Jun 14, 2023
c608c01
fix: FAQ page UnoCSS url (#129)
fakelbst Jul 11, 2023
8f99a82
docs(hosting): Update snippet for GitHub pages workflow (#131)
jd-solanki Jul 16, 2023
cd758d9
docs: improve doc about Link and routeAlias
twitwi Jul 27, 2023
8e6b3c0
docs: Document PDF author and keywords (#132)
marshallfWCCI Aug 6, 2023
333d273
docs: fix motion link (#133)
btea Aug 7, 2023
004c016
docs: mention support for scoped packages (#134)
Plumtree3D Aug 7, 2023
e83fcdc
feat: add built-in layout `two-cols-header` (#135)
btea Aug 11, 2023
a6243d6
fix: the third parameter of userIntervalFn is wrong (#136)
btea Aug 14, 2023
0faff2a
chore: upgrade pnpm
antfu Aug 31, 2023
d45ed05
feat: update docs
antfu Aug 31, 2023
8024ec4
docs: about `$clicks` and `$nav` context shorthand
antfu Aug 31, 2023
f03f026
docs: note about `$clicks` context
antfu Sep 1, 2023
2fe32c4
docs: remove unnecessary colons (#140)
kawamataryo Sep 1, 2023
234e7b1
feat: add `$page` and `$renderContext` context
antfu Sep 3, 2023
6e0af1f
feat: view transitions (#141)
Jannchie Sep 3, 2023
4b8e2bb
docs: add monaco editorOptions (#142)
carlosingles Sep 4, 2023
20eef62
docs(layouts): fix typo (#144)
cerinoligutom Sep 5, 2023
c3ab951
docs: update node version
antfu Sep 5, 2023
11d3475
docs: add LaTex line highlighting (#145)
Sep 7, 2023
0c89704
docs: update hosting guide for GitHub Pages (#146)
george-gca Sep 23, 2023
b67d676
docs: call out required leading slash in base path (#148)
adamdehaven Oct 11, 2023
285da45
docs: update showcase (#149)
zyf722 Oct 24, 2023
cbaf809
docs: `at` option in line highlightning (#150)
TechWatching Nov 9, 2023
32ffb9e
feat: add slidev-theme-frankfurt to themes.ts (#152)
MuTsunTsai Nov 10, 2023
5c3b2e7
docs: yaml block as frontmatter
antfu Nov 16, 2023
4e57682
docs: update hosting.md for gh-pages (#155)
george-gca Nov 21, 2023
e041d9f
docs: explain that Slidev adds custom UnoCSS shortcuts (#157)
Hofer-Julian Nov 23, 2023
a6529b6
docs: support shikiji
antfu Dec 13, 2023
7df7697
feat: Add notice to the custom clicks count when using the at directi…
John98Zakaria Jan 22, 2024
9b64ca2
fix: Remove extra space for props to be parsed correctly (#159)
John98Zakaria Jan 22, 2024
145fc07
docs: fix Shikiji link (#161)
jessarcher Jan 25, 2024
0ef9dde
chore: typos in Highlighters documentation (#162)
laymonage Jan 29, 2024
094f9d5
feat: migrate to latest VitePress
antfu Feb 2, 2024
a1ae7cf
docs: update docs with latest features
antfu Feb 2, 2024
6733ad9
chore: update
antfu Feb 2, 2024
0a3ecb1
chore: update
antfu Feb 2, 2024
6e98b89
chore: fix css scope
antfu Feb 2, 2024
36a1b5a
chore: fix netlify
antfu Feb 2, 2024
b41368d
chore: update
antfu Feb 2, 2024
79a4d45
chore: fix demo style
antfu Feb 2, 2024
886d23e
docs(en): merging all conflicts
docschina-bot Feb 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
dist
.vitepress/@slidev
.vitepress/cache
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
shamefully-hoist=true
strict-peer-dependencies=false
197 changes: 184 additions & 13 deletions .vitepress/config.js → .vitepress/config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
// @ts-check
import type { DefaultTheme } from 'vitepress'
import { defineConfig } from 'vitepress'
import { transformerTwoslash } from '@shikijs/vitepress-twoslash'
import vite from '../vite.config'

const Guide = [
const CURRENT_VERSION = '0.47.1'

const Guide: DefaultTheme.NavItemWithLink[] = [
{
text: 'Почему Slidev',
link: '/guide/why',
Expand Down Expand Up @@ -46,10 +51,14 @@ const Guide = [
link: '/guide/presenter-mode',
},
{
<<<<<<< HEAD:.vitepress/config.js
<<<<<<< HEAD
text: 'Интеграции редакторов',
=======
text: 'Drawing & Annonations',
=======
text: 'Drawing & Annotations',
>>>>>>> 79a4d453cf7d626368487ec247f6becebd0a20d5:.vitepress/config.ts
link: '/guide/drawing',
},
{
Expand All @@ -63,7 +72,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',
Expand All @@ -78,8 +98,9 @@ const Theme = [
},
]

const Translations = [
const Addon: DefaultTheme.NavItemWithLink[] = [
{
<<<<<<< HEAD:.vitepress/config.js
text: 'Русский',
},
{
Expand Down Expand Up @@ -113,10 +134,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',
>>>>>>> 79a4d453cf7d626368487ec247f6becebd0a20d5:.vitepress/config.ts
},
]

const Customizations = [
const Customizations: (DefaultTheme.NavItemWithLink | DefaultTheme.NavItemChildren)[] = [
{
text: 'Кастомизация',
link: '/custom/',
Expand All @@ -142,8 +171,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',
>>>>>>> 79a4d453cf7d626368487ec247f6becebd0a20d5:.vitepress/config.ts
},
{
text: 'Конфигурация Monaco',
Expand All @@ -158,7 +192,15 @@ const Customizations = [
link: '/custom/config-mermaid',
},
{
<<<<<<< HEAD:.vitepress/config.js
text: 'Конфигурация горячих клавиш',
=======
text: 'Configure Parser',
link: '/custom/config-parser',
},
{
text: 'Configure Shortcuts',
>>>>>>> 79a4d453cf7d626368487ec247f6becebd0a20d5:.vitepress/config.ts
link: '/custom/config-shortcuts',
},
{
Expand All @@ -168,10 +210,10 @@ const Customizations = [
{
text: 'Глобальные слои',
link: '/custom/global-layers',
}
},
]

const Resources = [
const Resources: DefaultTheme.NavItemWithLink[] = [
{
text: 'Примеры',
link: '/showcases',
Expand All @@ -186,8 +228,9 @@ const Resources = [
},
]

const slidebars = [
const slidebars: DefaultTheme.SidebarItem[] = [
{
<<<<<<< HEAD:.vitepress/config.js
text: 'Руководство',
children: Guide,
},
Expand All @@ -211,13 +254,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,
>>>>>>> 79a4d453cf7d626368487ec247f6becebd0a20d5:.vitepress/config.ts
},
]

/**
* @type {import('vitepress').UserConfig}
*/
module.exports = {
export default defineConfig({
title: 'Slidev',
description: 'Presentation slides for developers',
head: [
Expand All @@ -233,7 +293,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',
Expand All @@ -247,6 +326,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',
>>>>>>> 79a4d453cf7d626368487ec247f6becebd0a20d5:.vitepress/config.ts
},

nav: [
Expand All @@ -255,30 +344,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,
},
],
>>>>>>> 79a4d453cf7d626368487ec247f6becebd0a20d5:.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' },
],
>>>>>>> 79a4d453cf7d626368487ec247f6becebd0a20d5:.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/',
},
},
}
})
8 changes: 4 additions & 4 deletions .vitepress/scripts/prepare.js
Original file line number Diff line number Diff line change
@@ -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()
Loading