Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: shikijs/shiki
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.14.4
Choose a base ref
...
head repository: shikijs/shiki
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.14.5
Choose a head ref
  • 9 commits
  • 36 files changed
  • 4 contributors

Commits on Oct 10, 2023

  1. ci: fix actions

    antfu committed Oct 10, 2023
    Copy the full SHA
    2d33320 View commit details
  2. 🤖: update grammars

    octref committed Oct 10, 2023
    Copy the full SHA
    ac960d5 View commit details
  3. 🤖: update themes

    octref committed Oct 10, 2023
    Copy the full SHA
    fef07ba View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2ce1fce View commit details
  5. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7f03951 View commit details
  6. fix: alias c++ to cpp (#518)

    scarf005 authored Oct 10, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2b4db7c View commit details
  7. chore: update docs

    antfu committed Oct 10, 2023
    Copy the full SHA
    bf6a412 View commit details
  8. docs: update changelog

    antfu committed Oct 10, 2023
    Copy the full SHA
    ed91ada View commit details
  9. v0.14.5

    antfu committed Oct 10, 2023
    Copy the full SHA
    7185122 View commit details
Showing with 528 additions and 431 deletions.
  1. +3 −0 .github/workflows/update-grammars.yml
  2. +3 −0 .github/workflows/update-themes.yml
  3. +12 −0 CHANGELOG.md
  4. +3 −3 docs/languages.md
  5. +1 −1 lerna.json
  6. +2 −2 packages/renderer-path/package.json
  7. +2 −2 packages/renderer-svg/package.json
  8. +86 −166 packages/shiki/languages/bibtex.tmLanguage.json
  9. +5 −1 packages/shiki/languages/cobol.tmLanguage.json
  10. +51 −4 packages/shiki/languages/codeql.tmLanguage.json
  11. +227 −158 packages/shiki/languages/csharp.tmLanguage.json
  12. +3 −3 packages/shiki/languages/css.tmLanguage.json
  13. +2 −2 packages/shiki/languages/dart.tmLanguage.json
  14. +1 −1 packages/shiki/languages/java.tmLanguage.json
  15. +6 −3 packages/shiki/languages/julia.tmLanguage.json
  16. +24 −3 packages/shiki/languages/latex.tmLanguage.json
  17. +2 −2 packages/shiki/languages/markdown.tmLanguage.json
  18. +26 −34 packages/shiki/languages/mdc.tmLanguage.json
  19. +6 −6 packages/shiki/languages/mdx.tmLanguage.json
  20. +1 −1 packages/shiki/languages/prisma.tmLanguage.json
  21. +8 −8 packages/shiki/languages/r.tmLanguage.json
  22. +3 −3 packages/shiki/languages/rst.tmLanguage.json
  23. +3 −3 packages/shiki/languages/rust.tmLanguage.json
  24. +3 −3 packages/shiki/languages/shellscript.tmLanguage.json
  25. +8 −2 packages/shiki/languages/tex.tmLanguage.json
  26. +1 −1 packages/shiki/package.json
  27. +9 −6 packages/shiki/src/languages.ts
  28. +1 −0 packages/shiki/themes/dark-plus.json
  29. +1 −0 packages/shiki/themes/hc_light.json
  30. +1 −0 packages/shiki/themes/light-plus.json
  31. +5 −1 packages/shiki/themes/vitesse-dark.json
  32. +5 −1 packages/shiki/themes/vitesse-light.json
  33. +3 −3 packages/site/package.json
  34. +2 −2 packages/vuepress-plugin/package.json
  35. +5 −5 pnpm-lock.yaml
  36. +4 −1 scripts/grammarSources.ts
3 changes: 3 additions & 0 deletions .github/workflows/update-grammars.yml
Original file line number Diff line number Diff line change
@@ -18,6 +18,9 @@ jobs:
- name: pnpm setup
uses: pnpm/action-setup@v2

- name: install
run: pnpm install

- run: pnpm run update:grammars

- run: pnpm run build
3 changes: 3 additions & 0 deletions .github/workflows/update-themes.yml
Original file line number Diff line number Diff line change
@@ -18,6 +18,9 @@ jobs:
- name: pnpm setup
uses: pnpm/action-setup@v2

- name: install
run: pnpm install

- run: pnpm run update:themes

- run: pnpm build
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## 0.14.5 | 2023-10-10

### 🚀 Features & Fixes

- feat: add `gql` as an alias of `graphql`

### 🙌 Contributions

- fix: alias `c++` to `cpp` | [#518](https://github.com/shikijs/shiki/pull/518) | [@scarf005](https://github.com/scarf005)
- fix: add 'kt' and 'kts' alias for kotlin | [#525](https://github.com/shikijs/shiki/pull/525) | [@camina-apps](https://github.com/camina-apps)


## 0.14.4 | 2023-08-31

### 🚀 Features & Fixes
6 changes: 3 additions & 3 deletions docs/languages.md
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ export type Lang =
| 'cobol'
| 'codeql' | 'ql'
| 'coffee'
| 'cpp'
| 'cpp' | 'c++'
| 'crystal'
| 'csharp' | 'c#' | 'cs'
| 'css'
@@ -109,7 +109,7 @@ export type Lang =
| 'glsl'
| 'gnuplot'
| 'go'
| 'graphql'
| 'graphql' | 'gql'
| 'groovy'
| 'hack'
| 'haml'
@@ -134,7 +134,7 @@ export type Lang =
| 'jssm' | 'fsl'
| 'jsx'
| 'julia'
| 'kotlin'
| 'kotlin' | 'kt' | 'kts'
| 'kusto' | 'kql'
| 'latex'
| 'less'
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"packages": ["packages/*"],
"useWorkspaces": true,
"version": "0.14.4",
"version": "0.14.5",
"npmClient": "pnpm"
}
4 changes: 2 additions & 2 deletions packages/renderer-path/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": "true",
"name": "shiki-renderer-path",
"version": "0.14.4",
"version": "0.14.5",
"description": "Path renderer for shiki",
"author": "Pine Wu <octref@gmail.com>",
"homepage": "https://github.com/octref/shiki/tree/main/packages/renderer-path",
@@ -31,6 +31,6 @@
"@types/node": "^18.11.17",
"@types/opentype.js": "^1.3.4",
"opentype.js": "^1.3.4",
"shiki": "^0.14.4"
"shiki": "^0.14.5"
}
}
4 changes: 2 additions & 2 deletions packages/renderer-svg/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "shiki-renderer-svg",
"version": "0.14.4",
"version": "0.14.5",
"description": "SVG renderer for shiki",
"author": "Pine Wu <octref@gmail.com>",
"homepage": "https://github.com/octref/shiki/tree/main/packages/renderer-svg",
@@ -30,6 +30,6 @@
"devDependencies": {
"@types/node": "^18.11.17",
"playwright": "^1.29.0",
"shiki": "^0.14.4"
"shiki": "^0.14.5"
}
}
Loading