refactor!: remove all deprecated APIs

packages/core/src/bundle-factory.ts

@@ -116,11 +116,6 @@ export interface ShorthandsBundle<L extends string, T extends string> {
    * @internal
    */
   getSingletonHighlighter: () => Promise<HighlighterGeneric<L, T>>
-
-  /**
-   * @deprecated Use `codeToTokensBase` instead.
-   */
-  codeToThemedTokens: (code: string, options: RequireKeys<CodeToTokensBaseOptions<L, T>, 'theme' | 'lang'>) => Promise<ThemedToken[][]>
 }
 
 export function createSingletonShorthands<L extends string, T extends string >(getHighlighter: GetHighlighterFactory<L, T>): ShorthandsBundle<L, T> {
@@ -178,14 +173,6 @@ export function createSingletonShorthands<L extends string, T extends string >(g
       return shiki.codeToTokensBase(code, options)
     },
 
-    /**
-     * @deprecated Use `codeToTokensBase` instead.
-     */
-    async codeToThemedTokens(code, options) {
-      const shiki = await _getHighlighter(options)
-      return shiki.codeToThemedTokens(code, options)
-    },
-
     async codeToTokensWithThemes(code, options) {
       const shiki = await _getHighlighter({
         lang: options.lang,

packages/core/src/highlighter.ts

@@ -35,8 +35,5 @@ export async function getHighlighterCore(options: HighlighterCoreOptions = {}):
     getLoadedLanguages: internal.getLoadedLanguages,
 
     getInternalContext: () => internal,
-
-    /** @deprecated */
-    codeToThemedTokens: (code, options) => codeToTokensBase(internal, code, options),
   }
 }

packages/core/src/types/highlighter.ts

@@ -69,14 +69,6 @@ export interface HighlighterGeneric<BundledLangKeys extends string, BundledTheme
     options: CodeToTokensWithThemesOptions<ResolveBundleKey<BundledLangKeys>, ResolveBundleKey<BundledThemeKeys>>
   ) => ThemedTokenWithVariants[][]
 
-  /**
-   * @deprecated Renamed to `codeToTokensBase`, or use high-level `codeToTokens` directly.
-   */
-  codeToThemedTokens: (
-    code: string,
-    options: CodeToTokensBaseOptions<ResolveBundleKey<BundledLangKeys>, ResolveBundleKey<BundledThemeKeys>>
-  ) => ThemedToken[][]
-
   /**
    * Load a theme to the highlighter, so later it can be used synchronously.
    */

packages/core/src/types/textmate.ts

@@ -10,13 +10,4 @@ export type {
   RawGrammar,
   RawTheme,
   RawThemeSetting,
-
-  /**
-   * @deprecated Renamed to `Grammar`
-   */
-  Grammar as IGrammar,
-  /**
-   * @deprecated Renamed to `RawGrammar`
-   */
-  RawGrammar as IRawGrammar,
 }

packages/core/src/types/transformers.ts

@@ -85,25 +85,4 @@ export interface ShikiTransformer {
    * This hook will only be called with `codeToHtml`.
    */
   postprocess?: (this: ShikiTransformerContextCommon, html: string, options: CodeToHastOptions) => string | void
-
-  // deprecated
-  /**
-   * @deprecated Use `span` instead
-   */
-  token?: (this: ShikiTransformerContext, hast: Element, line: number, col: number, lineElement: Element) => Element | void
 }
-
-/**
- * @deprecated Rnamed to `ShikiTransformer`
- */
-export interface ShikijiTransformer extends ShikiTransformer {}
-
-/**
- * @deprecated Rnamed to `ShikiTransformerContext`
- */
-export interface ShikijiTransformerContext extends ShikiTransformerContext {}
-
-/**
- * @deprecated Rnamed to `ShikiTransformerContextCommon`
- */
-export interface ShikijiTransformerContextCommon extends ShikiTransformerContextCommon {}

packages/core/src/utils.ts

@@ -150,11 +150,6 @@ export function applyColorReplacements(color: string, replacements?: Record<stri
   return replacements?.[color.toLowerCase()] || color
 }
 
-/**
- * @deprecated Use `isPlainLang` instead.
- */
-export const isPlaintext = isPlainLang
-
 export function getTokenStyleObject(token: TokenStyles) {
   const styles: Record<string, string> = {}
   if (token.color)

packages/markdown-it/src/core.ts

@@ -1,16 +1,7 @@
 import type MarkdownIt from 'markdown-it'
 import type { BuiltinTheme, CodeOptionsMeta, CodeOptionsThemes, CodeToHastOptions, HighlighterGeneric, ShikiTransformer, TransformerOptions } from 'shiki'
-import { transformerMetaHighlight } from '@shikijs/transformers'
 
 export interface MarkdownItShikiExtraOptions {
-  /**
-   * Add `highlighted` class to lines defined in after codeblock
-   *
-   * @deprecated Use [transformerNotationHighlight](https://shiki.style/packages/transformers#transformernotationhighlight) instead
-   * @default false
-   */
-  highlightLines?: boolean | string
-
   /**
    * Custom meta string parser
    * Return an object to merge with `meta`
@@ -34,7 +25,6 @@ export function setupMarkdownIt(
   options: MarkdownItShikiSetupOptions,
 ) {
   const {
-    highlightLines = false,
     parseMetaString,
   } = options
 
@@ -52,16 +42,6 @@ export function setupMarkdownIt(
 
     const builtInTransformer: ShikiTransformer[] = []
 
-    if (highlightLines) {
-      builtInTransformer.push(
-        transformerMetaHighlight({
-          className: highlightLines === true
-            ? 'highlighted'
-            : highlightLines,
-        }),
-      )
-    }
-
     builtInTransformer.push({
       name: '@shikijs/markdown-it:block-class',
       code(node) {

packages/markdown-it/test/index.test.ts

@@ -1,6 +1,7 @@
 import fs from 'node:fs/promises'
 import { expect, it } from 'vitest'
 import MarkdownIt from 'markdown-it'
+import { transformerMetaHighlight } from '@shikijs/transformers'
 import Shiki from '../src'
 
 it('run', async () => {
@@ -10,7 +11,9 @@ it('run', async () => {
       light: 'vitesse-light',
       dark: 'vitesse-dark',
     },
-    highlightLines: true,
+    transformers: [
+      transformerMetaHighlight(),
+    ],
   }))
 
   const result = md.render(await fs.readFile(new URL('./fixtures/a.md', import.meta.url), 'utf-8'))

packages/rehype/src/core.ts

@@ -4,22 +4,13 @@ import type { BuiltinTheme } from 'shiki'
 import type { Plugin } from 'unified'
 import { toString } from 'hast-util-to-string'
 import { visit } from 'unist-util-visit'
-import { transformerMetaHighlight } from '@shikijs/transformers'
 
 export interface MapLike<K = any, V = any> {
   get: (key: K) => V | undefined
   set: (key: K, value: V) => this
 }
 
 export interface RehypeShikiExtraOptions {
-  /**
-   * Add `highlighted` class to lines defined in after codeblock
-   *
-   * @deprecated Use [transformerNotationHighlight](https://shiki.style/packages/transformers#transformernotationhighlight) instead
-   * @default false
-   */
-  highlightLines?: boolean | string
-
   /**
    * Add `language-*` class to code element
    *
@@ -71,7 +62,6 @@ const rehypeShikiFromHighlighter: Plugin<[HighlighterGeneric<any, any>, RehypeSh
   options,
 ) {
   const {
-    highlightLines = false,
     addLanguageClass = false,
     parseMetaString,
     cache,
@@ -140,17 +130,6 @@ const rehypeShikiFromHighlighter: Plugin<[HighlighterGeneric<any, any>, RehypeSh
         })
       }
 
-      if (highlightLines && typeof metaString === 'string') {
-        codeOptions.transformers ||= []
-        codeOptions.transformers.push(
-          transformerMetaHighlight({
-            className: highlightLines === true
-              ? 'highlighted'
-              : highlightLines,
-          }),
-        )
-      }
-
       try {
         const fragment = highlighter.codeToHast(code, codeOptions)
         cache?.set(code, fragment.children)

packages/rehype/test/core.test.ts

@@ -9,6 +9,7 @@ import { expect, it } from 'vitest'
 
 import { getHighlighter } from 'shiki'
 import type { Root } from 'hast'
+import { transformerMetaHighlight } from '../../transformers/src'
 import rehypeShikiFromHighlighter from '../src/core'
 
 it('run', async () => {
@@ -26,7 +27,9 @@ it('run', async () => {
     .use(remarkRehype)
     .use(rehypeShikiFromHighlighter, highlighter, {
       theme: 'vitesse-light',
-      highlightLines: true,
+      transformers: [
+        transformerMetaHighlight(),
+      ],
     })
     .use(rehypeStringify)
     .processSync(await fs.readFile(new URL('./fixtures/a.md', import.meta.url)))
@@ -60,7 +63,9 @@ it('run with rehype-raw', async () => {
     .use(rehypeRaw)
     .use(rehypeShikiFromHighlighter, highlighter, {
       theme: 'vitesse-light',
-      highlightLines: true,
+      transformers: [
+        transformerMetaHighlight(),
+      ],
     })
     .use(rehypeStringify)
     .processSync(await fs.readFile(new URL('./fixtures/a.md', import.meta.url)))

packages/twoslash/src/renderer-rich.ts

@@ -68,11 +68,6 @@ export interface RendererRichOptions {
    */
   lang?: string
 
-  /**
-   * @deprecated Use `processHoverInfo` instead.
-   */
-  formatInfo?: (info: string) => string
-
   /**
    * Custom function to render markdown.
    *
@@ -207,8 +202,7 @@ export function rendererRich(options: RendererRichOptions = {}): TwoslashRendere
   const {
     completionIcons = defaultCompletionIcons,
     customTagIcons = defaultCustomTagIcons,
-    formatInfo,
-    processHoverInfo = formatInfo || defaultHoverInfoProcessor,
+    processHoverInfo = defaultHoverInfoProcessor,
     processHoverDocs = docs => docs,
     classExtra = '',
     jsdoc = true,

packages/twoslash/test/markdown-it.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest'
 import MarkdownIt from 'markdown-it'
 import Shiki from '@shikijs/markdown-it'
 import { rendererRich, transformerTwoslash } from '@shikijs/twoslash'
+import { transformerMetaHighlight } from '@shikijs/transformers'
 
 const styleTag = `
 <link rel="stylesheet" href="../../../style-rich.css" />
@@ -65,13 +66,13 @@ const a = 123
     const md = MarkdownIt()
 
     md.use(await Shiki({
-      highlightLines: true,
       themes: {
         light: 'vitesse-light',
         dark: 'vitesse-dark',
       },
       defaultColor: false,
       transformers: [
+        transformerMetaHighlight(),
         transformerTwoslash({
           explicitTrigger: true,
           renderer: rendererRich(),