Skip to content

Commit

Permalink
feat: new grammar, new themes, update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
antfu committed Aug 14, 2024
1 parent efbb7fb commit b68ee52
Show file tree
Hide file tree
Showing 14 changed files with 1,165 additions and 1,847 deletions.
18 changes: 9 additions & 9 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@
"docs:preview": "vitepress preview"
},
"dependencies": {
"@iconify-json/ph": "^1.1.13",
"@iconify-json/ph": "^1.1.14",
"fuse.js": "^7.0.0"
},
"devDependencies": {
"@iconify-json/svg-spinners": "^1.1.2",
"@iconify-json/svg-spinners": "^1.1.3",
"@shikijs/transformers": "workspace:*",
"@shikijs/twoslash": "workspace:*",
"@unocss/reset": "^0.61.9",
"@vueuse/core": "^10.11.0",
"@unocss/reset": "^0.62.1",
"@vueuse/core": "^10.11.1",
"floating-vue": "^5.2.2",
"pinia": "^2.2.0",
"pinia": "^2.2.1",
"shiki": "workspace:*",
"unocss": "^0.61.9",
"unplugin-vue-components": "^0.27.3",
"vitepress": "^1.3.1",
"vue": "^3.4.35"
"unocss": "^0.62.1",
"unplugin-vue-components": "^0.27.4",
"vitepress": "^1.3.2",
"vue": "^3.4.37"
}
}
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "module",
"version": "1.12.1",
"private": true,
"packageManager": "pnpm@9.6.0",
"packageManager": "pnpm@9.7.1",
"scripts": {
"lint": "eslint . --cache",
"release": "bumpp && pnpm -r publish",
Expand All @@ -14,8 +14,8 @@
"prepare": "simple-git-hooks"
},
"devDependencies": {
"@antfu/eslint-config": "^2.24.1",
"@antfu/ni": "^0.22.0",
"@antfu/eslint-config": "^2.25.1",
"@antfu/ni": "^0.22.4",
"@antfu/utils": "^0.7.10",
"@rollup/plugin-alias": "^5.1.0",
"@rollup/plugin-commonjs": "^26.0.1",
Expand All @@ -30,41 +30,41 @@
"@shikijs/vitepress-twoslash": "workspace:*",
"@types/fs-extra": "^11.0.4",
"@types/hast": "^3.0.4",
"@types/node": "^22.0.2",
"@types/node": "^22.3.0",
"@vitest/coverage-v8": "^2.0.5",
"ansi-sequence-parser": "^1.1.1",
"bumpp": "^9.4.1",
"eslint": "^9.8.0",
"bumpp": "^9.5.1",
"eslint": "^9.9.0",
"eslint-plugin-format": "^0.1.2",
"esno": "^4.7.0",
"fast-glob": "^3.3.2",
"fs-extra": "^11.2.0",
"jsonc-parser": "^3.3.1",
"lint-staged": "^15.2.7",
"lint-staged": "^15.2.9",
"markdown-it": "^14.1.0",
"mdast-util-from-markdown": "^2.0.1",
"mdast-util-gfm": "^3.0.0",
"mdast-util-to-hast": "^13.2.0",
"ofetch": "^1.3.4",
"pnpm": "^9.6.0",
"pnpm": "^9.7.1",
"prettier": "^3.3.3",
"rimraf": "^6.0.1",
"rollup": "^4.19.2",
"rollup": "^4.20.0",
"rollup-plugin-copy": "^3.5.0",
"rollup-plugin-dts": "^6.1.1",
"rollup-plugin-esbuild": "^6.1.1",
"rollup-plugin-typescript2": "^0.36.0",
"shiki": "workspace:*",
"simple-git-hooks": "^2.11.1",
"taze": "^0.16.3",
"taze": "^0.16.6",
"typescript": "^5.5.4",
"unbuild": "^2.0.0",
"vite": "^5.3.5",
"vite-tsconfig-paths": "^4.3.2",
"vite": "^5.4.0",
"vite-tsconfig-paths": "^5.0.1",
"vitepress-plugin-mermaid": "^2.0.16",
"vitest": "^2.0.5",
"vue-tsc": "^2.0.29",
"wrangler": "^3.68.0"
"wrangler": "^3.71.0"
},
"resolutions": {
"@shikijs/compat": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/monaco/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
},
"devDependencies": {
"typescript": "^5.5.4",
"vite": "^5.3.5"
"vite": "^5.4.0"
}
}
4 changes: 2 additions & 2 deletions packages/shiki/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@
"@types/hast": "^3.0.4"
},
"devDependencies": {
"tm-grammars": "^1.16.2",
"tm-themes": "^1.6.0",
"tm-grammars": "^1.17.1",
"tm-themes": "^1.7.0",
"vscode-oniguruma": "^1.7.0"
}
}
10 changes: 10 additions & 0 deletions packages/shiki/src/assets/langs-bundle-full.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@ export const bundledLanguagesInfo: BundledLanguageInfo[] = [
],
'import': (() => import('./langs/common-lisp')) as DynamicImportLanguageRegistration
},
{
'id': 'coq',
'name': 'Coq',
'import': (() => import('./langs/coq')) as DynamicImportLanguageRegistration
},
{
'id': 'cpp',
'name': 'C++',
Expand Down Expand Up @@ -820,6 +825,9 @@ export const bundledLanguagesInfo: BundledLanguageInfo[] = [
{
'id': 'proto',
'name': 'Protocol Buffer 3',
'aliases': [
'protobuf'
],
'import': (() => import('./langs/proto')) as DynamicImportLanguageRegistration
},
{
Expand Down Expand Up @@ -1310,6 +1318,7 @@ export type BundledLanguage =
| 'coffeescript'
| 'common-lisp'
| 'console'
| 'coq'
| 'cpp'
| 'cql'
| 'crystal'
Expand Down Expand Up @@ -1460,6 +1469,7 @@ export type BundledLanguage =
| 'prolog'
| 'properties'
| 'proto'
| 'protobuf'
| 'ps'
| 'ps1'
| 'pug'
Expand Down
14 changes: 14 additions & 0 deletions packages/shiki/src/assets/themes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ export const bundledThemesInfo: BundledThemeInfo[] = [
"type": "dark",
"import": (() => import('./themes/github-dark-dimmed')) as unknown as DynamicImportThemeRegistration
},
{
"id": "github-dark-high-contrast",
"displayName": "GitHub Dark High Contrast",
"type": "dark",
"import": (() => import('./themes/github-dark-high-contrast')) as unknown as DynamicImportThemeRegistration
},
{
"id": "github-light",
"displayName": "GitHub Light",
Expand All @@ -104,6 +110,12 @@ export const bundledThemesInfo: BundledThemeInfo[] = [
"type": "light",
"import": (() => import('./themes/github-light-default')) as unknown as DynamicImportThemeRegistration
},
{
"id": "github-light-high-contrast",
"displayName": "GitHub Light High Contrast",
"type": "light",
"import": (() => import('./themes/github-light-high-contrast')) as unknown as DynamicImportThemeRegistration
},
{
"id": "houston",
"displayName": "Houston",
Expand Down Expand Up @@ -308,8 +320,10 @@ export type BundledTheme =
| 'github-dark'
| 'github-dark-default'
| 'github-dark-dimmed'
| 'github-dark-high-contrast'
| 'github-light'
| 'github-light-default'
| 'github-light-high-contrast'
| 'houston'
| 'laserwave'
| 'light-plus'
Expand Down
2 changes: 1 addition & 1 deletion packages/shiki/test/bundle.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ it('bundle-full', async () => {
}))

expect(highlighter.getLoadedLanguages().length)
.toMatchInlineSnapshot(`307`)
.toMatchInlineSnapshot(`309`)
})

it('bundle-web', async () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/twoslash/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
"twoslash": "^0.2.9"
},
"devDependencies": {
"@iconify-json/carbon": "^1.1.36",
"@iconify-json/codicon": "^1.1.50",
"@iconify-json/carbon": "^1.1.37",
"@iconify-json/codicon": "^1.1.51",
"@shikijs/twoslash": "^3.1.2",
"hast-util-from-html": "^2.0.1",
"typescript": "^5.5.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/twoslash/test/out/import-vue.ts.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b68ee52

Please sign in to comment.