Skip to content

Commit

Permalink
Merge branch 'main' into user-side-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
KermanX authored Mar 3, 2024
2 parents 3052df9 + 99587e1 commit 54c682e
Show file tree
Hide file tree
Showing 19 changed files with 646 additions and 330 deletions.
8 changes: 5 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See the error

**Desktop (please complete the following information):**
- OS:
- Browser:
- Slidev version:

- OS:
- Browser:
- Slidev version:
22 changes: 11 additions & 11 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
- Demonstrating empathy and kindness toward other people
- Being respectful of differing opinions, viewpoints, and experiences
- Giving and gracefully accepting constructive feedback
- Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
- Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
- The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
- Trolling, insulting or derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities
Expand Down Expand Up @@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
Expand Down
2 changes: 1 addition & 1 deletion demo/starter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"@slidev/theme-default": "^0.25.0",
"@slidev/theme-seriph": "^0.25.0",
"nodemon": "^3.1.0",
"vue": "^3.4.20"
"vue": "^3.4.21"
}
}
2 changes: 2 additions & 0 deletions demo/starter/slides.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ const author = reactive({
]
})
```

```ts
export default {
data() {
Expand All @@ -217,6 +218,7 @@ export default {
}
}
```

```ts
export default {
data: () => ({
Expand Down
11 changes: 9 additions & 2 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,16 @@ export default antfu(
},
},
formatters: {
// disable for now, we can enable it after we have the slidev plugin in eslint-config
markdown: false,
markdown: true,
css: true,
slidev: {
files: [
'**/slides.md',
'**/template.md',
'**/example.md',
'test/fixtures/markdown/**/*.md',
],
},
},
},
)
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "module",
"version": "0.48.0-beta.19",
"version": "0.48.0-beta.20",
"private": true,
"packageManager": "[email protected]",
"engines": {
Expand All @@ -23,7 +23,7 @@
"test": "vitest test"
},
"devDependencies": {
"@antfu/eslint-config": "^2.6.4",
"@antfu/eslint-config": "^2.7.0",
"@antfu/ni": "^0.21.12",
"@antfu/utils": "^0.7.7",
"@shikijs/markdown-it": "^1.1.7",
Expand All @@ -39,7 +39,7 @@
"@types/js-yaml": "^4.0.9",
"@types/katex": "^0.16.7",
"@types/markdown-it": "^13.0.7",
"@types/node": "^20.11.20",
"@types/node": "^20.11.24",
"@types/prismjs": "^1.26.3",
"@types/prompts": "^2.4.9",
"@types/recordrtc": "^5.6.14",
Expand All @@ -56,8 +56,9 @@
"katex": "^0.16.9",
"lint-staged": "^15.2.2",
"mermaid": "^10.8.0",
"playwright-chromium": "^1.42.0",
"playwright-chromium": "^1.42.1",
"pnpm": "^8.15.4",
"prettier-plugin-slidev": "^1.0.5",
"rimraf": "^5.0.5",
"shiki": "^1.1.7",
"simple-git-hooks": "^2.9.0",
Expand All @@ -66,7 +67,7 @@
"typescript": "^5.3.3",
"vite": "^5.1.4",
"vitest": "^1.3.1",
"vue-tsc": "^1.8.27",
"vue-tsc": "^2.0.2",
"zx": "^7.2.3"
},
"pnpm": {
Expand Down
4 changes: 2 additions & 2 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@slidev/client",
"type": "module",
"version": "0.48.0-beta.19",
"version": "0.48.0-beta.20",
"description": "Presentation slides for developers",
"author": "antfu <[email protected]>",
"license": "MIT",
Expand Down Expand Up @@ -56,7 +56,7 @@
"shiki-magic-move": "^0.1.0",
"typescript": "^5.3.3",
"unocss": "^0.58.5",
"vue": "^3.4.20",
"vue": "^3.4.21",
"vue-router": "^4.3.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "create-slidev",
"type": "module",
"version": "0.48.0-beta.19",
"version": "0.48.0-beta.20",
"description": "Create starter template for Slidev",
"author": "antfu <[email protected]>",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/create-app/template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"export": "slidev export"
},
"dependencies": {
"@slidev/cli": "^0.48.0-beta.19",
"@slidev/cli": "^0.48.0-beta.20",
"@slidev/theme-default": "latest",
"@slidev/theme-seriph": "latest",
"vue": "^3.4.20"
"vue": "^3.4.21"
}
}
2 changes: 1 addition & 1 deletion packages/create-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "create-slidev-theme",
"type": "module",
"version": "0.48.0-beta.19",
"version": "0.48.0-beta.20",
"description": "Create starter theme template for Slidev",
"author": "antfu <[email protected]>",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/create-theme/template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
"screenshot": "slidev export example.md --format png"
},
"dependencies": {
"@slidev/types": "^0.48.0-beta.19",
"@slidev/types": "^0.48.0-beta.20",
"codemirror-theme-vars": "^0.1.2",
"prism-theme-vars": "^0.2.4"
},
"devDependencies": {
"@slidev/cli": "^0.48.0-beta.19"
"@slidev/cli": "^0.48.0-beta.20"
},
"//": "Learn more: https://sli.dev/themes/write-a-theme.html",
"slidev": {
Expand Down
2 changes: 1 addition & 1 deletion packages/parser/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slidev/parser",
"version": "0.48.0-beta.19",
"version": "0.48.0-beta.20",
"description": "Markdown parser for Slidev",
"author": "antfu <[email protected]>",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/slidev/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slidev/cli",
"version": "0.48.0-beta.19",
"version": "0.48.0-beta.20",
"description": "Presentation slides for developers",
"author": "antfu <[email protected]>",
"license": "MIT",
Expand Down Expand Up @@ -112,7 +112,7 @@
"vite-plugin-static-copy": "^1.0.1",
"vite-plugin-vue-server-ref": "^0.4.2",
"vitefu": "^0.2.5",
"vue": "^3.4.20",
"vue": "^3.4.21",
"yargs": "^17.7.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slidev/types",
"version": "0.48.0-beta.19",
"version": "0.48.0-beta.20",
"description": "Shared types declarations for Slidev",
"author": "antfu <[email protected]>",
"license": "MIT",
Expand Down
12 changes: 6 additions & 6 deletions packages/types/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ export interface CommonArgs {
}

export interface ExportArgs extends CommonArgs {
output?: string
format?: string
timeout?: number
range?: string
dark?: boolean
'output'?: string
'format'?: string
'timeout'?: number
'range'?: string
'dark'?: boolean
'with-clicks'?: boolean
'executable-path'?: string
'with-toc'?: boolean
'per-slide'?: boolean
scale?: number
'scale'?: number
}

export interface BuildArgs extends ExportArgs {
Expand Down
Loading

0 comments on commit 54c682e

Please sign in to comment.