Skip to content

Upgrade Monaco Language Client to 8.8.3 #2912

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
mengw15 merged 40 commits into from
Oct 12, 2024
Merged

Upgrade Monaco Language Client to 8.8.3 #2912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
d94fcfa
1
mengw15 Oct 3, 2024
737e309
monaco binding and init diff editor
mengw15 Oct 4, 2024
7111ece
Update code-editor.component.ts
mengw15 Oct 6, 2024
17341eb
make diff editor readonly
mengw15 Oct 7, 2024
ab082fc
add import '@codingame/monaco-vscode-python-default-extension';
mengw15 Oct 7, 2024
412499e
add isEditorOpen
mengw15 Oct 7, 2024
cb44aa7
fix for r and java color
mengw15 Oct 8, 2024
09b4429
make editor cannot be opened mutiple times at same time
mengw15 Oct 8, 2024
f4c02b0
Update package.json
mengw15 Oct 8, 2024
8494205
Update package.json
mengw15 Oct 8, 2024
f8d01d4
Update package.json
mengw15 Oct 8, 2024
df4cb02
Update codearea-custom-template.component.ts
mengw15 Oct 8, 2024
2f4170f
Update code-editor.component.ts
mengw15 Oct 8, 2024
d6fe2ee
Merge branch 'master' into meng-monaco-upgrade
mengw15 Oct 8, 2024
472ceb7
Update code-editor.component.ts
mengw15 Oct 9, 2024
78aa243
yarn lock
mengw15 Oct 9, 2024
d55222b
fmt fix
mengw15 Oct 9, 2024
f0fc65f
fmt fix
mengw15 Oct 9, 2024
c7a1050
Update yarn.lock
mengw15 Oct 9, 2024
a125cf7
Update package.json
mengw15 Oct 10, 2024
93368a3
change "monaco-editor": "0.51.0",
mengw15 Oct 10, 2024
1d15538
remove npm:@codingame/monaco-vscode-api@8.0.4
mengw15 Oct 10, 2024
915c148
"vscode": "npm:@codingame/monaco-vscode-api@~8.0.4", "monaco-edit…
mengw15 Oct 10, 2024
6b373be
update
aglinxinyuan Oct 10, 2024
7d3c4da
update
aglinxinyuan Oct 10, 2024
ebcb698
update
aglinxinyuan Oct 10, 2024
15892a7
update
aglinxinyuan Oct 10, 2024
461423c
Merge branch 'master' into meng-monaco-upgrade
mengw15 Oct 10, 2024
36adee5
Merge branch 'master' into meng-monaco-upgrade
aglinxinyuan Oct 11, 2024
a04fdfb
Merge branch 'master' into meng-monaco-upgrade
mengw15 Oct 11, 2024
6d704fd
merge code editor and editor state service
mengw15 Oct 11, 2024
4075f18
fmt fix
mengw15 Oct 11, 2024
179ac93
Merge branch 'master' into meng-monaco-upgrade
mengw15 Oct 12, 2024
cf08da7
use getWebsocketUrl("/python-language-server", "3000")
mengw15 Oct 12, 2024
0e772f5
Merge branch 'meng-monaco-upgrade' of https://github.com/Texera/texer…
mengw15 Oct 12, 2024
8dfc664
remove console.log with startOptions
mengw15 Oct 12, 2024
73dc332
Merge branch 'master' into meng-monaco-upgrade
mengw15 Oct 12, 2024
5b3ba5b
remove console.error("Error during Monaco Editor initialization:", e)…
mengw15 Oct 12, 2024
b041c62
fix bug
mengw15 Oct 12, 2024
55098d2
Merge branch 'master' into meng-monaco-upgrade
mengw15 Oct 12, 2024
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
7 changes: 6 additions & 1 deletion core/gui/custom-webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,10 @@ module.exports = {
include: [require("path").resolve(__dirname, "node_modules/monaco-editor")],
},
],
parser: {
javascript: {
url: true
}
}
Comment on lines +10 to +14
Copy link
Contributor

@Yicong-Huang Yicong-Huang Oct 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mengw15 what's the purpose of this change? I found removing it has no effect.

Copy link
Contributor Author

@mengw15 mengw15 Oct 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was facing an issue with loading vscode.theme-default I remember. And I checked Monaco's example, below are some context:

"
// this is required for loading .wasm (and other) files. For context, see https://stackoverflow.com/a/75252098 and angular/angular-cli#24617
parser: {
javascript: {
url: true
}
}
"

},
};
};
16 changes: 10 additions & 6 deletions core/gui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,13 @@
"jszip": "3.10.1",
"lodash-es": "4.17.21",
"marked": "4.3.0",
"monaco-editor": "0.36.1",
"monaco-languageclient": "5.0.1",
"monaco-languageclient": "8.8.3",
"monaco-editor-wrapper": "5.5.3",
"@codingame/monaco-vscode-python-default-extension": "8.0.4",
"@codingame/monaco-vscode-r-default-extension": "8.0.4",
"@codingame/monaco-vscode-java-default-extension": "8.0.4",
"vscode": "npm:@codingame/monaco-vscode-api@8.0.4",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@8.0.4",
"ng-zorro-antd": "16.2.2",
"ng2-pdf-viewer": "9.1.5",
"ngx-color-picker": "12.0.1",
Expand All @@ -78,8 +83,7 @@
"tslib": "2.3.1",
"uuid": "8.3.2",
"validator": "13.12.0",
"vscode": "npm:@codingame/monaco-vscode-api@~1.76.6",
"vscode-ws-jsonrpc": "3.1.0",
"vscode-ws-jsonrpc": "3.3.2",
"y-monaco": "0.1.5",
"y-protocols": "1.0.5",
"y-quill": "0.1.5",
Expand All @@ -97,7 +101,7 @@
"@angular/compiler-cli": "16.2.12",
"@nrwl/cli": "15.9.7",
"@nrwl/nx-cloud": "18.0.0",
"@nx/angular": "18.1.3",
"@nx/angular": "18.2.0",
"@types/backbone": "1.4.15",
"@types/dagre": "0.7.47",
"@types/file-saver": "2.0.5",
Expand Down Expand Up @@ -131,7 +135,7 @@
"karma-jasmine": "4.0.1",
"karma-jasmine-html-reporter": "1.7.0",
"nodecat": "2.0.0",
"nx": "18.1.3",
"nx": "18.2.0",
Copy link
Contributor

@Yicong-Huang Yicong-Huang Oct 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are you changing nx version here?

Copy link
Contributor Author

@mengw15 mengw15 Oct 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Xinyuan told me his branch passed all the checks before, so he think the issue is caused by nx, so we upgraded the version

"nz-tslint-rules": "0.901.2",
"prettier": "3.2.5",
"prettier-eslint-cli": "8.0.1",
Expand Down
Loading