Skip to content

Commit ebb1fa6

Browse files
author
Loïc Mangeonjean
committed
fix: replace triple-slash references by regular imports
1 parent 6ba4157 commit ebb1fa6

File tree

2 files changed

+23
-13
lines changed

2 files changed

+23
-13
lines changed

rollup/tools/configuredSubpackagePlugin.ts

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -222,20 +222,30 @@ export function configuredSubpackagePlugin(): rollup.Plugin {
222222
]
223223
}
224224

225-
if (packageName === MAIN_PACKAGE_NAME) {
226-
rollupOptions.plugins = [
227-
rollupOptions.plugins,
228-
{
229-
name: 'reference-proposed-types',
230-
async renderChunk(code, chunk) {
231-
if (chunk.fileName.endsWith('extensions.d.ts')) {
232-
return `/// <reference path="./vscode-dts/vscode.proposed.d.ts" />\n/// <reference path="./vscode-dts/vscode.d.ts" />\n${code}`
233-
}
234-
return undefined
225+
rollupOptions.plugins = [
226+
rollupOptions.plugins,
227+
{
228+
name: 'reference-proposed-types',
229+
async renderChunk(code, chunk) {
230+
if (packageName === MAIN_PACKAGE_NAME && chunk.fileName.endsWith('extensions.d.ts')) {
231+
return `
232+
import './vscode-dts/vscode.proposed.d.ts'
233+
import './vscode-dts/vscode.d.ts'
234+
${code}`
235+
}
236+
if (
237+
packageName === EXTENSION_API_PACKAGE_NAME &&
238+
chunk.fileName.endsWith('extension.api.d.ts')
239+
) {
240+
return `
241+
import '@codingame/monaco-vscode-api/vscode-dts/vscode'
242+
import '@codingame/monaco-vscode-api/vscode-dts/vscode.proposed'
243+
${code}`
235244
}
245+
return undefined
236246
}
237-
]
238-
}
247+
}
248+
]
239249

240250
if (packageName === EDITOR_API_PACKAGE_NAME) {
241251
rollupOptions.input = {

scripts/install-vscode

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ cd vscode-dts
6969
echo "" > vscode.proposed.d.ts
7070

7171
for file in vscode.proposed.*.d.ts; do
72-
echo "/// <reference path=\"./$file\" />" >> vscode.proposed.d.ts
72+
echo "import \"./$file\"" >> vscode.proposed.d.ts
7373
done
7474
cd ..
7575

0 commit comments

Comments
 (0)