Skip to content

upgrade monaco #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 8, 2023
Merged

upgrade monaco #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"matrix-js-sdk": "^19.4.0",
"mobx": "^6.2.0",
"mobx-react-lite": "^3.2.0",
"monaco-editor": "^0.34.1",
"monaco-editor": "^0.35.0",
"penpal": "^6.1.0",
"prettier": "2.4.1",
"probe.gl": "^3.1.4",
Expand Down
19 changes: 5 additions & 14 deletions patches/monaco-editor+0.34.1.patch → patches/monaco-editor+0.35.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/node_modules/monaco-editor/esm/vs/language/typescript/monaco.contribution.js b/node_modules/monaco-editor/esm/vs/language/typescript/monaco.contribution.js
index d130d21..014f6e4 100644
index 00dd322..c3eb512 100644
--- a/node_modules/monaco-editor/esm/vs/language/typescript/monaco.contribution.js
+++ b/node_modules/monaco-editor/esm/vs/language/typescript/monaco.contribution.js
@@ -1,4 +1,5 @@
import '../../editor/editor.api.js';
+import * as monaco_editor_core_star from "../../editor/editor.api.js";
/*!-----------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Version: 0.34.1(547870b6881302c5b4ff32173c16d06009e3588f)
* Version: 0.35.0(71ac097e6155a405f6be52b0b368a04508c31e31)
@@ -26,7 +27,6 @@ var typescriptVersion = "4.5.5";
// src/fillers/monaco-editor-core.ts
var monaco_editor_core_exports = {};
Expand All @@ -17,19 +17,10 @@ index d130d21..014f6e4 100644
// src/language/typescript/monaco.contribution.ts
var ModuleKind = /* @__PURE__ */ ((ModuleKind2) => {
diff --git a/node_modules/monaco-editor/esm/vs/language/typescript/ts.worker.js b/node_modules/monaco-editor/esm/vs/language/typescript/ts.worker.js
index 62336bd..dfef894 100644
index cf1645e..91ca8f9 100644
--- a/node_modules/monaco-editor/esm/vs/language/typescript/ts.worker.js
+++ b/node_modules/monaco-editor/esm/vs/language/typescript/ts.worker.js
@@ -161379,7 +161379,7 @@ var TypeScriptWorker = class {
}
getScriptFileNames() {
const allModels = this._ctx.getMirrorModels().map((model) => model.uri);
- const models = allModels.filter((uri) => !fileNameIsLib(uri)).map((uri) => uri.toString(true));
+ const models = allModels.filter((uri) => !fileNameIsLib(uri)).map((uri) => uri.toString());
return models.concat(Object.keys(this._extraLibs));
}
_getModel(fileName) {
@@ -161668,7 +161668,8 @@ self.onmessage = () => {
@@ -162168,7 +162168,8 @@ self.onmessage = () => {
});
};
export {
Expand All @@ -40,7 +31,7 @@ index 62336bd..dfef894 100644
/*! *****************************************************************************
Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/node_modules/monaco-editor/esm/vs/language/typescript/tsMode.js b/node_modules/monaco-editor/esm/vs/language/typescript/tsMode.js
index 3f7034e..7773468 100644
index 422b1d0..760df84 100644
--- a/node_modules/monaco-editor/esm/vs/language/typescript/tsMode.js
+++ b/node_modules/monaco-editor/esm/vs/language/typescript/tsMode.js
@@ -26,8 +26,8 @@ var __publicField = (obj, key, value) => {
Expand Down