Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-24 17:31:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #226171 from microsoft/joh/crooked-earwig

Browse Source 
support for `export` "dependency" in amdX, also copy for non-source files
This commit is contained in:
Johannes Rieken
2024-08-22 11:05:06 +02:00
committed by GitHub
parent 7af685cb77 24af1f24eb
commit 16bb31f856
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
migrate.mjs
+1 -1
View File
@@ -26,7 +26,7 @@ const srcFolder = fileURLToPath(new URL('src', import.meta.url));
const dstFolder = fileURLToPath(new URL('src2', import.meta.url));
const binaryFileExtensions = new Set([
'.svg', '.ttf', '.png', '.sh', '.html', '.json', '.zsh', '.scpt', '.mp3', '.fish', '.ps1', '.psm1', '.md', '.txt', '.zip', '.pdf', '.qwoff', '.jxs', '.tst', '.wuff', '.less', '.utf16le', '.snap', '.tsx'
'.svg', '.ttf', '.png', '.sh', '.html', '.json', '.zsh', '.scpt', '.mp3', '.fish', '.ps1', '.psm1', '.md', '.txt', '.zip', '.pdf', '.qwoff', '.jxs', '.tst', '.wuff', '.less', '.utf16le', '.snap', '.actual', '.tsx', '.scm'
]);
function migrate() {
src/vs/amdX.ts
+19 -4
View File
@@ -92,12 +92,27 @@ class AMDModuleImporter {
console.warn(`Did not receive a define call from script ${scriptSrc}`);
return <T>undefined;
}
// TODO require, exports, module
if (Array.isArray(defineCall.dependencies) && defineCall.dependencies.length > 0) {
throw new Error(`Cannot resolve dependencies for script ${scriptSrc}. The dependencies are: ${defineCall.dependencies.join(', ')}`);
// TODO require, module
const exports = {};
const dependencyObjs: any[] = [];
const dependencyModules: string[] = [];
if (Array.isArray(defineCall.dependencies)) {
for (const mod of defineCall.dependencies) {
if (mod === 'exports') {
dependencyObjs.push(exports);
} else {
dependencyModules.push(mod);
}
}
}
if (dependencyModules.length > 0) {
throw new Error(`Cannot resolve dependencies for script ${scriptSrc}. The dependencies are: ${dependencyModules.join(', ')}`);
}
if (typeof defineCall.callback === 'function') {
return defineCall.callback([]);
return defineCall.callback(...dependencyObjs) ?? exports;
} else {
return defineCall.callback;
}