Skip to content

Commit d1f1d4e

Browse files
committed
docs(en): merging all conflicts
2 parents c12306b + e805422 commit d1f1d4e

File tree

4 files changed

+617
-380
lines changed

4 files changed

+617
-380
lines changed

components.d.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ declare module 'vue' {
1111
AutoFitText: typeof import('./.vitepress/@slidev/client/builtin/AutoFitText.vue')['default']
1212
'Carbon:chevronLeft': typeof import('~icons/carbon/chevron-left')['default']
1313
'Carbon:chevronRight': typeof import('~icons/carbon/chevron-right')['default']
14+
'Carbon:logoGithub': typeof import('~icons/carbon/logo-github')['default']
15+
'Carbon:logoTwitter': typeof import('~icons/carbon/logo-twitter')['default']
16+
'Carbon:presentationFile': typeof import('~icons/carbon/presentation-file')['default']
17+
'Carbon:video': typeof import('~icons/carbon/video')['default']
1418
CarbonApps: typeof import('~icons/carbon/apps')['default']
1519
CarbonArrowLeft: typeof import('~icons/carbon/arrow-left')['default']
1620
CarbonArrowRight: typeof import('~icons/carbon/arrow-right')['default']
@@ -44,6 +48,8 @@ declare module 'vue' {
4448
RouterView: typeof import('vue-router')['RouterView']
4549
ShowCaseInfo: typeof import('./.vitepress/theme/components/ShowCaseInfo.vue')['default']
4650
ShowCases: typeof import('./.vitepress/theme/components/ShowCases.vue')['default']
51+
SimpleIconsGithub: typeof import('~icons/simple-icons/github')['default']
52+
SimpleIconsNpm: typeof import('~icons/simple-icons/npm')['default']
4753
SlideCurrentNo: typeof import('./.vitepress/@slidev/client/builtin/SlideCurrentNo.vue')['default']
4854
SlidesTotal: typeof import('./.vitepress/@slidev/client/builtin/SlidesTotal.vue')['default']
4955
Starport: typeof import('vue-starport')['Starport']

guide/syntax.md

Lines changed: 84 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -67,32 +67,35 @@ class: 'text-white'
6767

6868
Ανατρέξτε στις [προσαρμογές](/custom/) για περισσότερες πληροφορίες.
6969

70-
> The custom syntax might not be compactible with some formatters like Prettier. To improve that, we also support using a direct `yaml` code block to define the frontmatter:
71-
>
72-
> ~~~markdown
73-
> ---
74-
> layout: cover
75-
> ---
76-
>
77-
> # Slidev
78-
>
79-
> This is the cover page.
80-
>
81-
> ---
82-
>
83-
> ```yaml
84-
> # The first yaml block will be treated as the frontmatter of that slide
85-
> layout: center
86-
> background: './images/background-1.png'
87-
> class: 'text-white'
88-
> ```
89-
>
90-
> # Page 2
91-
>
92-
> This is a page with the layout `center` and a background image.
93-
> ~~~
94-
>
95-
> (Available since v0.44.0)
70+
### Prettier Support
71+
72+
> Available since v0.44
73+
74+
The custom syntax might not be compactible with some formatters like Prettier.
75+
You can either install the [Prettier Plugin](/guide/editors#prettier-plugin) or use a direct `yaml` code block to define the frontmatter instead:
76+
77+
~~~markdown
78+
---
79+
layout: cover
80+
---
81+
82+
# Slidev
83+
84+
This is the cover page.
85+
86+
---
87+
88+
```yaml
89+
# The first yaml block will be treated as the frontmatter of that slide
90+
layout: center
91+
background: './images/background-1.png'
92+
class: 'text-white'
93+
```
94+
95+
# Page 2
96+
97+
This is a page with the layout `center` and a background image.
98+
~~~
9699

97100
## Code Blocks
98101

@@ -183,7 +186,13 @@ const c = add(1, 2)
183186

184187
### Ενσωμάτωση TwoSlash
185188

189+
<<<<<<< HEAD
186190
Αυτή η λειτουργία είναι διαθέσιμη μόνο όταν [θέτετε το `highlighter` σε `shiki`](/custom/highlighters)
191+
=======
192+
> Available since v0.46
193+
194+
This feature is only available when you [set `highlighter` to `shiki`](/custom/highlighters)
195+
>>>>>>> e8054222645741a1f15a6138c2b0b6a091fb43a1
187196
188197
Το [TwoSlash](https://www.typescriptlang.org/dev/twoslash/) είναι ένα ισχυρό εργαλείο για την απεικόνιση μπλοκ κώδικα TypeScript με πληροφορίες τύπων κατά την αιώρηση ή inlined. Είναι αρκετά χρήσιμο για την προετοιμασία διαφανειών για θέματα σχετικά με JavaScript/TypeScript.
189198

@@ -207,6 +216,33 @@ const count = ref(0)
207216
// ^?
208217
```
209218

219+
<!-- For the popup to not to overlap the content below -->
220+
<div class="py-20" />
221+
222+
### Shiki Magic Move
223+
224+
> Available since v0.48
225+
226+
Shiki Magic Move enables you to have granular transition between code changes like Keynote's Magic Move. You can check [this demo](https://shiki-magic-move.netlify.app/) to see how it works.
227+
228+
In Slidev, we bind it to the [clicks system](/guide/animations#click-animations). The syntax is wrap multiple code blocks representing each steps with <code>````md magic-move</code> (mind it's **4** backticks), this will be transformed into one code block, that morphing to each steps as you click.
229+
230+
~~~~md
231+
````md magic-move
232+
```ts
233+
console.log(`Step ${1}`)
234+
```
235+
```ts
236+
console.log(`Step ${1 + 1}`)
237+
```
238+
```ts
239+
console.log(`Step ${3}`)
240+
```
241+
````
242+
~~~~
243+
244+
<!-- TODO: add an inline demo -->
245+
210246
### Monaco Editor
211247

212248
Κάθε φορά που θέλετε να κάνετε κάποια τροποποίηση στην παρουσίαση, απλά προσθέστε `{monaco}` μετά το αναγνωριστικό γλώσσας - αυτό μετατρέπει το block σε έναν πλήρως εξοπλισμένο Monaco editor!
@@ -327,7 +363,21 @@ layout: cover
327363
-->
328364
~~~
329365

366+
<<<<<<< HEAD
330367
## Εικονίδια
368+
=======
369+
Basic Markdown and HTML are also supported in notes on Presenter renderering.
370+
371+
### Click Markers
372+
373+
> Available since v0.48
374+
375+
For some slides you might have longer notes that might be hard to find where you are looking at, we introduced the click markers that allows highlighting and auto-scrolling to the section of notes of your corresponding content. Put `[click]` markers in your notes for the timming you need to go to another [click](/guide/animations#click-animations), Slidev divide the content between the click markers and highlight them in presenter notes, synchronized with your slide progress.
376+
377+
<!-- TODO: add a video -->
378+
379+
## Icons
380+
>>>>>>> e8054222645741a1f15a6138c2b0b6a091fb43a1
331381
332382
Το Slidev σας επιτρέπει να έχετε πρόσβαση σε σχεδόν όλα τα δημοφιλή σύνολα εικονιδίων ανοιχτού κώδικα **απευθείας** στο markdown σας μετά την εγκατάσταση του αντίστοιχου πακέτου. Με την βοήθεια του [`unplugin-icons`](https://github.com/antfu/unplugin-icons) και του [Iconify](https://iconify.design/).
333383

@@ -444,6 +494,7 @@ layout: two-cols
444494
<<< @/snippets/snippet.js
445495
```
446496

497+
<<<<<<< HEAD
447498
:::tip
448499
Η τιμή του `@` αντιστοιχεί στο root directory του πακέτου σας. Συνιστάται να τοποθετείτε τα αποσπάσματα στο `@/snippets`, για λόγους συμβατότητας με τον επεξεργαστή Monaco. Εναλλακτικά, μπορείτε επίσης να εισάγετε από relative paths.
449500
:::
@@ -466,6 +517,13 @@ layout: two-cols
466517
<<< @/snippets/snippet.js {2,3|5}{lines:true}
467518
<<< @/snippets/snippet.js ts {monaco}{height:200px}
468519
```
520+
=======
521+
::: tip
522+
The value of `@` corresponds to the source root, the directory where the `slides.md` is located.
523+
:::
524+
525+
This feature is vendored from VitePress, learn more about it in [VitePress's documentation](https://vitepress.dev/guide/markdown#import-code-snippets).
526+
>>>>>>> e8054222645741a1f15a6138c2b0b6a091fb43a1
469527
470528
## Ρυθμίσεις
471529

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"type": "module",
33
"private": true,
4-
"packageManager": "pnpm@8.15.1",
4+
"packageManager": "pnpm@8.15.4",
55
"scripts": {
66
"dev": "vitepress",
77
"build": "vitepress build",
@@ -10,29 +10,29 @@
1010
},
1111
"dependencies": {
1212
"@antfu/utils": "^0.7.7",
13-
"@vueuse/core": "^10.7.2",
13+
"@vueuse/core": "^10.9.0",
1414
"typeit": "^7.0.4"
1515
},
1616
"devDependencies": {
17-
"@antfu/eslint-config": "^2.6.3",
18-
"@iconify/json": "^2.2.178",
19-
"@shikijs/vitepress-twoslash": "1.0.0-beta.5",
17+
"@antfu/eslint-config": "^2.6.4",
18+
"@iconify/json": "^2.2.188",
19+
"@shikijs/vitepress-twoslash": "^1.1.7",
2020
"@slidev/client": "0.34.3",
2121
"@slidev/parser": "0.34.3",
2222
"@slidev/theme-default": "0.21.2",
2323
"@slidev/types": "0.34.3",
2424
"@types/fs-extra": "^11.0.4",
25-
"@types/node": "^18.19.14",
26-
"@unocss/reset": "^0.58.4",
27-
"eslint": "^8.56.0",
25+
"@types/node": "^20.11.24",
26+
"@unocss/reset": "^0.58.5",
27+
"eslint": "^8.57.0",
2828
"fs-extra": "^11.2.0",
2929
"markdown-it": "^14.0.0",
30-
"shiki": "^1.0.0-beta.5",
30+
"shiki": "^1.1.7",
3131
"typescript": "^5.3.3",
32-
"unocss": "^0.58.4",
33-
"unplugin-icons": "^0.18.3",
32+
"unocss": "^0.58.5",
33+
"unplugin-icons": "^0.18.5",
3434
"unplugin-vue-components": "^0.26.0",
3535
"vite-plugin-inspect": "^0.8.3",
36-
"vitepress": "^1.0.0-rc.41"
36+
"vitepress": "^1.0.0-rc.44"
3737
}
3838
}

0 commit comments

Comments
 (0)