SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 09:20:10 +01:00
Code Issues Projects Releases Packages Activity

Fixes https://github.com/microsoft/monaco-editor/issues/4981 (#4988)

Browse source
This commit is contained in:
Henning Dieterichs 2025-09-09 17:52:56 +02:00 • committed by GitHub
parent f17ccd3d70
commit cf7739b752
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
build/build-monaco-editor.ts
View file

@ -231,7 +231,7 @@ function releaseDTS() {
let contents = monacodts.contents.toString(); let contents = monacodts.contents.toString();
const additionalDtsFiles: Record<string, string> = { const additionalDtsFiles: Record<string, string> = {
'out/languages/tsc/common/workers.d.ts': 'editor' 'out/languages/tsc/common/workers.d.ts': 'monaco.editor'
}; };
Object.entries(additionalDtsFiles).forEach(([filePath, namespace]) => { Object.entries(additionalDtsFiles).forEach(([filePath, namespace]) => {
try { try {
@ -240,6 +240,7 @@ function releaseDTS() {
// Remove imports // Remove imports
dtsContent = dtsContent.replace(/import .*\n/gm, ''); dtsContent = dtsContent.replace(/import .*\n/gm, '');
dtsContent = dtsContent.replace(/export declare function/gm, 'export function');
// Wrap in namespace if specified // Wrap in namespace if specified
if (namespace) { if (namespace) {
@ -292,12 +293,13 @@ function releaseDTS() {
/** /**
* Transforms a .d.ts which uses internal modules (namespaces) to one which is usable with external modules * Transforms a .d.ts which uses internal modules (namespaces) to one which is usable with external modules
* This function is duplicated in the `vscode` repo. * This function is duplicated in the `vscode` repo.
* @param {string} contents
*/ */
function toExternalDTS(contents: string): string { function toExternalDTS(contents) {
let lines = contents.split(/\r\n|\r|\n/); const lines = contents.split(/\r\n|\r|\n/);
let killNextCloseCurlyBrace = false; let killNextCloseCurlyBrace = false;
for (let i = 0; i < lines.length; i++) { for (let i = 0; i < lines.length; i++) {
let line = lines[i]; const line = lines[i];
if (killNextCloseCurlyBrace) { if (killNextCloseCurlyBrace) {
if ('}' === line) { if ('}' === line) {
@ -325,20 +327,8 @@ function toExternalDTS(contents: string): string {
lines[i] = line.replace('declare namespace monaco.', 'export namespace '); lines[i] = line.replace('declare namespace monaco.', 'export namespace ');
} }
if (line.indexOf('declare let MonacoEnvironment') === 0) { if (line.indexOf('declare var MonacoEnvironment') === 0) {
lines[i] = [ lines[i] = `declare global {\n var MonacoEnvironment: Environment | undefined;\n}`;
'declare global {',
' let MonacoEnvironment: Environment | undefined;',
'',
' interface Window {',
' MonacoEnvironment?: Environment | undefined;',
' }',
'}',
''
].join('\n');
}
if (line.indexOf(' MonacoEnvironment?') === 0) {
lines[i] = ` MonacoEnvironment?: Environment | undefined;`;
} }
} }
return lines.join('\n').replace(/\n\n\n+/g, '\n\n'); return lines.join('\n').replace(/\n\n\n+/g, '\n\n');