Skip to content

Commit

Permalink
feat: new dotenv grammar, new everforest theme
Browse files Browse the repository at this point in the history
  • Loading branch information
antfu committed Aug 1, 2024
1 parent 4a58472 commit 29b1d3a
Show file tree
Hide file tree
Showing 11 changed files with 1,497 additions and 933 deletions.
6 changes: 3 additions & 3 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"@iconify-json/svg-spinners": "^1.1.2",
"@shikijs/transformers": "workspace:*",
"@shikijs/twoslash": "workspace:*",
"@unocss/reset": "^0.61.5",
"@unocss/reset": "^0.61.9",
"@vueuse/core": "^10.11.0",
"floating-vue": "^5.2.2",
"pinia": "^2.2.0",
"shiki": "workspace:*",
"unocss": "^0.61.5",
"unocss": "^0.61.9",
"unplugin-vue-components": "^0.27.3",
"vitepress": "^1.3.1",
"vue": "^3.4.34"
"vue": "^3.4.35"
}
}
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"prepare": "simple-git-hooks"
},
"devDependencies": {
"@antfu/eslint-config": "^2.23.2",
"@antfu/eslint-config": "^2.24.1",
"@antfu/ni": "^0.22.0",
"@antfu/utils": "^0.7.10",
"@rollup/plugin-alias": "^5.1.0",
Expand All @@ -30,11 +30,11 @@
"@shikijs/vitepress-twoslash": "workspace:*",
"@types/fs-extra": "^11.0.4",
"@types/hast": "^3.0.4",
"@types/node": "^20.14.12",
"@vitest/coverage-v8": "^2.0.4",
"@types/node": "^22.0.2",
"@vitest/coverage-v8": "^2.0.5",
"ansi-sequence-parser": "^1.1.1",
"bumpp": "^9.4.1",
"eslint": "^9.7.0",
"eslint": "^9.8.0",
"eslint-plugin-format": "^0.1.2",
"esno": "^4.7.0",
"fast-glob": "^3.3.2",
Expand All @@ -49,22 +49,22 @@
"pnpm": "^9.6.0",
"prettier": "^3.3.3",
"rimraf": "^6.0.1",
"rollup": "^4.19.0",
"rollup": "^4.19.2",
"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.1",
"taze": "^0.16.3",
"typescript": "^5.5.4",
"unbuild": "^2.0.0",
"vite": "^5.3.5",
"vite-tsconfig-paths": "^4.3.2",
"vitepress-plugin-mermaid": "^2.0.16",
"vitest": "^2.0.4",
"vitest": "^2.0.5",
"vue-tsc": "^2.0.29",
"wrangler": "^3.67.1"
"wrangler": "^3.68.0"
},
"resolutions": {
"@shikijs/compat": "workspace:*",
Expand Down
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.15.1",
"tm-themes": "^1.5.7",
"tm-grammars": "^1.16.2",
"tm-themes": "^1.6.0",
"vscode-oniguruma": "^1.7.0"
}
}
6 changes: 6 additions & 0 deletions packages/shiki/src/assets/langs-bundle-full.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,11 @@ export const bundledLanguagesInfo: BundledLanguageInfo[] = [
],
'import': (() => import('./langs/docker')) as DynamicImportLanguageRegistration
},
{
'id': 'dotenv',
'name': 'dotEnv',
'import': (() => import('./langs/dotenv')) as DynamicImportLanguageRegistration
},
{
'id': 'dream-maker',
'name': 'Dream Maker',
Expand Down Expand Up @@ -1321,6 +1326,7 @@ export type BundledLanguage =
| 'diff'
| 'docker'
| 'dockerfile'
| 'dotenv'
| 'dream-maker'
| 'edge'
| 'elisp'
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 @@ -62,6 +62,18 @@ export const bundledThemesInfo: BundledThemeInfo[] = [
"type": "dark",
"import": (() => import('./themes/dracula-soft')) as unknown as DynamicImportThemeRegistration
},
{
"id": "everforest-dark",
"displayName": "Everforest Dark",
"type": "dark",
"import": (() => import('./themes/everforest-dark')) as unknown as DynamicImportThemeRegistration
},
{
"id": "everforest-light",
"displayName": "Everforest Light",
"type": "light",
"import": (() => import('./themes/everforest-light')) as unknown as DynamicImportThemeRegistration
},
{
"id": "github-dark",
"displayName": "GitHub Dark",
Expand Down Expand Up @@ -291,6 +303,8 @@ export type BundledTheme =
| 'dark-plus'
| 'dracula'
| 'dracula-soft'
| 'everforest-dark'
| 'everforest-light'
| 'github-dark'
| 'github-dark-default'
| 'github-dark-dimmed'
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(`306`)
.toMatchInlineSnapshot(`307`)
})

it('bundle-web', async () => {
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.

145 changes: 144 additions & 1 deletion packages/twoslash/test/out/import-vue.ts.json

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

2 changes: 1 addition & 1 deletion packages/vitepress-twoslash/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@
"shiki": "workspace:*",
"twoslash": "^0.2.9",
"twoslash-vue": "^0.2.9",
"vue": "^3.4.34"
"vue": "^3.4.35"
}
}
Loading

0 comments on commit 29b1d3a

Please sign in to comment.