Skip to content

Commit b3bd5c8

Browse files
akosyakovminyoungyang
authored andcommitted
fix eclipse-theia#7100: remove @theia/languages and monaco-languageclient
It allows to consume Monaco directly without trying to run vscode-languageclient in the browser. One should contributed language smartness via VS Code extensions instead. Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
1 parent 9975829 commit b3bd5c8

File tree

114 files changed

+588
-3851
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+588
-3851
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ cache:
3131
- packages/getting-started/node_modules
3232
- packages/git/node_modules
3333
- packages/keymaps/node_modules
34-
- packages/languages/node_modules
3534
- packages/markers/node_modules
3635
- packages/messages/node_modules
3736
- packages/metrics/node_modules

configs/mocha.opts

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
--require ignore-styles
2-
--require monaco-languageclient/lib/register-vscode
32
--require reflect-metadata/Reflect
43
--reporter spec
54
--watch-extensions js

configs/root-compilation.tsconfig.json

-3
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@
4949
{
5050
"path": "../packages/keymaps/compile.tsconfig.json"
5151
},
52-
{
53-
"path": "../packages/languages/compile.tsconfig.json"
54-
},
5552
{
5653
"path": "../packages/markers/compile.tsconfig.json"
5754
},

dev-packages/application-manager/src/generator/webpack-generator.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ module.exports = {
177177
{
178178
test: /\\.js$/,
179179
// include only es6 dependencies to transpile them to es5 classes
180-
include: /monaco-languageclient|vscode-ws-jsonrpc|vscode-jsonrpc|vscode-languageserver-protocol|vscode-languageserver-types|vscode-languageclient/,
180+
include: /vscode-ws-jsonrpc|vscode-jsonrpc|vscode-languageserver-protocol|vscode-languageserver-types/,
181181
use: {
182182
loader: 'babel-loader',
183183
options: {
@@ -199,8 +199,7 @@ module.exports = {
199199
resolve: {
200200
extensions: ['.js']${this.ifMonaco(() => `,
201201
alias: {
202-
'vs': path.resolve(outputPath, monacoEditorCorePath),
203-
'vscode': require.resolve('monaco-languageclient/lib/vscode-compatibility')
202+
'vs': path.resolve(outputPath, monacoEditorCorePath)
204203
}`)}
205204
},
206205
devtool: 'source-map',

examples/browser/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"@theia/getting-started": "^1.4.0",
2727
"@theia/git": "^1.4.0",
2828
"@theia/keymaps": "^1.4.0",
29-
"@theia/languages": "^1.4.0",
3029
"@theia/markers": "^1.4.0",
3130
"@theia/messages": "^1.4.0",
3231
"@theia/metrics": "^1.4.0",

examples/electron/compile.tsconfig.json

-3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@
4747
{
4848
"path": "../../packages/keymaps/compile.tsconfig.json"
4949
},
50-
{
51-
"path": "../../packages/languages/compile.tsconfig.json"
52-
},
5350
{
5451
"path": "../../packages/markers/compile.tsconfig.json"
5552
},

examples/electron/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"@theia/getting-started": "^1.4.0",
2727
"@theia/git": "^1.4.0",
2828
"@theia/keymaps": "^1.4.0",
29-
"@theia/languages": "^1.4.0",
3029
"@theia/markers": "^1.4.0",
3130
"@theia/messages": "^1.4.0",
3231
"@theia/metrics": "^1.4.0",

packages/callhierarchy/compile.tsconfig.json

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
{
1616
"path": "../editor/compile.tsconfig.json"
1717
},
18-
{
19-
"path": "../languages/compile.tsconfig.json"
20-
},
2118
{
2219
"path": "../monaco/compile.tsconfig.json"
2320
}

packages/callhierarchy/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"dependencies": {
66
"@theia/core": "^1.4.0",
77
"@theia/editor": "^1.4.0",
8-
"@theia/languages": "^1.4.0",
98
"@theia/monaco": "^1.4.0",
109
"ts-md5": "^1.2.2"
1110
},

packages/callhierarchy/src/browser/callhierarchy-context.ts

-108
This file was deleted.

0 commit comments

Comments
 (0)