Skip to content

Commit

Permalink
fix #7100: remove @theia/languages and monaco-languageclient
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
akosyakov committed Jul 5, 2020
1 parent 7a88d28 commit d3b5a5a
Show file tree
Hide file tree
Showing 114 changed files with 597 additions and 3,834 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ cache:
- packages/getting-started/node_modules
- packages/git/node_modules
- packages/keymaps/node_modules
- packages/languages/node_modules
- packages/markers/node_modules
- packages/messages/node_modules
- packages/metrics/node_modules
Expand Down
1 change: 0 additions & 1 deletion configs/mocha.opts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
--require ignore-styles
--require monaco-languageclient/lib/register-vscode
--require reflect-metadata/Reflect
--reporter spec
--watch-extensions js
Expand Down
3 changes: 0 additions & 3 deletions configs/root-compilation.tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@
{
"path": "../packages/keymaps/compile.tsconfig.json"
},
{
"path": "../packages/languages/compile.tsconfig.json"
},
{
"path": "../packages/markers/compile.tsconfig.json"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ module.exports = {
{
test: /\\.js$/,
// include only es6 dependencies to transpile them to es5 classes
include: /monaco-languageclient|vscode-ws-jsonrpc|vscode-jsonrpc|vscode-languageserver-protocol|vscode-languageserver-types|vscode-languageclient/,
include: /vscode-ws-jsonrpc|vscode-jsonrpc|vscode-languageserver-protocol|vscode-languageserver-types/,
use: {
loader: 'babel-loader',
options: {
Expand All @@ -199,8 +199,7 @@ module.exports = {
resolve: {
extensions: ['.js']${this.ifMonaco(() => `,
alias: {
'vs': path.resolve(outputPath, monacoEditorCorePath),
'vscode': require.resolve('monaco-languageclient/lib/vscode-compatibility')
'vs': path.resolve(outputPath, monacoEditorCorePath)
}`)}
},
devtool: 'source-map',
Expand Down
1 change: 0 additions & 1 deletion examples/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"@theia/getting-started": "^1.3.0",
"@theia/git": "^1.3.0",
"@theia/keymaps": "^1.3.0",
"@theia/languages": "^1.3.0",
"@theia/markers": "^1.3.0",
"@theia/messages": "^1.3.0",
"@theia/metrics": "^1.3.0",
Expand Down
3 changes: 0 additions & 3 deletions examples/electron/compile.tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
{
"path": "../../packages/keymaps/compile.tsconfig.json"
},
{
"path": "../../packages/languages/compile.tsconfig.json"
},
{
"path": "../../packages/markers/compile.tsconfig.json"
},
Expand Down
1 change: 0 additions & 1 deletion examples/electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"@theia/getting-started": "^1.3.0",
"@theia/git": "^1.3.0",
"@theia/keymaps": "^1.3.0",
"@theia/languages": "^1.3.0",
"@theia/markers": "^1.3.0",
"@theia/messages": "^1.3.0",
"@theia/metrics": "^1.3.0",
Expand Down
3 changes: 0 additions & 3 deletions packages/callhierarchy/compile.tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
{
"path": "../editor/compile.tsconfig.json"
},
{
"path": "../languages/compile.tsconfig.json"
},
{
"path": "../monaco/compile.tsconfig.json"
}
Expand Down
3 changes: 1 addition & 2 deletions packages/callhierarchy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"dependencies": {
"@theia/core": "^1.3.0",
"@theia/editor": "^1.3.0",
"@theia/languages": "^1.3.0",
"@theia/monaco": "^1.3.0",
"ts-md5": "^1.2.2"
},
Expand Down Expand Up @@ -46,4 +45,4 @@
"nyc": {
"extends": "../../configs/nyc.json"
}
}
}
108 changes: 0 additions & 108 deletions packages/callhierarchy/src/browser/callhierarchy-context.ts

This file was deleted.

Loading

0 comments on commit d3b5a5a

Please sign in to comment.