Skip to content

Commit f55d647

Browse files
authored
Replace jiti with require (#505)
We can use this since VSCode 1.100.0.
1 parent 8046e54 commit f55d647

File tree

7 files changed

+19
-9
lines changed

7 files changed

+19
-9
lines changed

.changeset/lemon-hats-shop.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'vscode-mdx': patch
3+
---
4+
5+
Require at least VSCode 1.100.

.changeset/rich-singers-own.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@mdx-js/typescript-plugin': patch
3+
'@mdx-js/language-server': patch
4+
---
5+
6+
Replace jiti with native require.

packages/language-server/lib/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
import assert from 'node:assert'
9+
import {createRequire} from 'node:module'
910
import path from 'node:path'
1011
import process from 'node:process'
1112
import {
@@ -19,7 +20,6 @@ import {
1920
createTypeScriptProject,
2021
loadTsdkByPath
2122
} from '@volar/language-server/node.js'
22-
import {createJiti} from 'jiti'
2323
import remarkFrontmatter from 'remark-frontmatter'
2424
import remarkGfm from 'remark-gfm'
2525
import {create as createMarkdownServicePlugin} from 'volar-service-markdown'
@@ -102,11 +102,12 @@ connection.onInitialize(async (parameters) => {
102102
undefined,
103103
tsconfig
104104
)
105-
const jiti = createJiti(tsconfig)
105+
106+
const require = createRequire(tsconfig)
106107

107108
;[remarkPlugins, virtualCodePlugins] = resolvePlugins(
108109
commandLine.raw?.mdx,
109-
(name) => jiti(name).default
110+
(name) => require(name).default
110111
)
111112
checkMdx = Boolean(commandLine.raw?.mdx?.checkMdx)
112113
jsxImportSource = commandLine.options.jsxImportSource || jsxImportSource

packages/language-server/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"dependencies": {
3434
"@mdx-js/language-service": "0.7.0",
3535
"@volar/language-server": "~2.4.0",
36-
"jiti": "^2.0.0",
3736
"remark-frontmatter": "^5.0.0",
3837
"remark-gfm": "^4.0.0",
3938
"volar-service-markdown": "0.0.64",

packages/typescript-plugin/lib/index.cjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
* @import {TsConfigSourceFile} from 'typescript'
55
*/
66

7+
const {createRequire} = require('node:module')
78
const {
89
createMdxLanguagePlugin,
910
resolvePlugins
1011
} = require('@mdx-js/language-service')
1112
const {
1213
createLanguageServicePlugin
1314
} = require('@volar/typescript/lib/quickstart/createLanguageServicePlugin.js')
14-
const {createJiti} = require('jiti')
1515
const {default: remarkFrontmatter} = require('remark-frontmatter')
1616
const {default: remarkGfm} = require('remark-gfm')
1717

@@ -41,11 +41,11 @@ const plugin = createLanguageServicePlugin((ts, info) => {
4141
configFile.fileName
4242
)
4343

44-
const jiti = createJiti(configFile.fileName)
44+
const require = createRequire(configFile.fileName)
4545

4646
const [remarkPlugins, virtualCodePlugins] = resolvePlugins(
4747
commandLine.raw?.mdx,
48-
(name) => jiti(name).default
48+
(name) => require(name).default
4949
)
5050

5151
return {

packages/typescript-plugin/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"dependencies": {
3737
"@mdx-js/language-service": "0.7.0",
3838
"@volar/typescript": "~2.4.0",
39-
"jiti": "^2.0.0",
4039
"remark-frontmatter": "^5.0.0",
4140
"remark-gfm": "^4.0.0"
4241
},

packages/vscode-mdx/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"license": "MIT",
2121
"private": true,
2222
"engines": {
23-
"vscode": "^1.82.0"
23+
"vscode": "^1.100.0"
2424
},
2525
"main": "out/extension.js",
2626
"keywords": [

0 commit comments

Comments
 (0)