fix #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>
eclipse-theia · Jul 2, 2020 · a2a0663 · a2a0663
1 parent 8a029e2
commit a2a0663
Show file tree

Hide file tree

Showing 25 changed files with 11 additions and 85 deletions.
diff --git a/configs/mocha.opts b/configs/mocha.opts
@@ -1,5 +1,4 @@
 --require ignore-styles
---require monaco-languageclient/lib/register-vscode
 --require reflect-metadata/Reflect
 --reporter spec
 --watch-extensions js

diff --git a/dev-packages/application-manager/src/generator/webpack-generator.ts b/dev-packages/application-manager/src/generator/webpack-generator.ts
@@ -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: {

diff --git a/examples/browser/package.json b/examples/browser/package.json
@@ -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",

diff --git a/examples/electron/compile.tsconfig.json b/examples/electron/compile.tsconfig.json
@@ -47,9 +47,6 @@
     {
       "path": "../../packages/keymaps/compile.tsconfig.json"
     },
-    {
-      "path": "../../packages/languages/compile.tsconfig.json"
-    },
     {
       "path": "../../packages/markers/compile.tsconfig.json"
     },

diff --git a/examples/electron/package.json b/examples/electron/package.json
@@ -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",

diff --git a/packages/callhierarchy/compile.tsconfig.json b/packages/callhierarchy/compile.tsconfig.json
@@ -15,9 +15,6 @@
     {
       "path": "../editor/compile.tsconfig.json"
     },
-    {
-      "path": "../languages/compile.tsconfig.json"
-    },
     {
       "path": "../monaco/compile.tsconfig.json"
     }

diff --git a/packages/callhierarchy/package.json b/packages/callhierarchy/package.json
@@ -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"
   },
@@ -46,4 +45,4 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   }
-}
+}
diff --git a/packages/debug/compile.tsconfig.json b/packages/debug/compile.tsconfig.json
@@ -24,9 +24,6 @@
     {
       "path": "../filesystem/compile.tsconfig.json"
     },
-    {
-      "path": "../languages/compile.tsconfig.json"
-    },
     {
       "path": "../markers/compile.tsconfig.json"
     },

diff --git a/packages/debug/package.json b/packages/debug/package.json
@@ -8,7 +8,6 @@
     "@theia/core": "^1.3.0",
     "@theia/editor": "^1.3.0",
     "@theia/filesystem": "^1.3.0",
-    "@theia/languages": "^1.3.0",
     "@theia/markers": "^1.3.0",
     "@theia/monaco": "^1.3.0",
     "@theia/output": "^1.3.0",
@@ -70,4 +69,4 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   }
-}
+}
diff --git a/packages/editor/compile.tsconfig.json b/packages/editor/compile.tsconfig.json
@@ -12,9 +12,6 @@
     {
       "path": "../core/compile.tsconfig.json"
     },
-    {
-      "path": "../languages/compile.tsconfig.json"
-    },
     {
       "path": "../variable-resolver/compile.tsconfig.json"
     }

diff --git a/packages/editor/package.json b/packages/editor/package.json
@@ -4,7 +4,6 @@
   "description": "Theia - Editor Extension",
   "dependencies": {
     "@theia/core": "^1.3.0",
-    "@theia/languages": "^1.3.0",
     "@theia/variable-resolver": "^1.3.0",
     "@types/base64-arraybuffer": "0.1.0",
     "base64-arraybuffer": "^0.1.5"
@@ -46,4 +45,4 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   }
-}
+}
diff --git a/packages/git/compile.tsconfig.json b/packages/git/compile.tsconfig.json
@@ -18,9 +18,6 @@
     {
       "path": "../filesystem/compile.tsconfig.json"
     },
-    {
-      "path": "../languages/compile.tsconfig.json"
-    },
     {
       "path": "../navigator/compile.tsconfig.json"
     },

diff --git a/packages/git/package.json b/packages/git/package.json
@@ -6,7 +6,6 @@
     "@theia/core": "^1.3.0",
     "@theia/editor": "^1.3.0",
     "@theia/filesystem": "^1.3.0",
-    "@theia/languages": "^1.3.0",
     "@theia/navigator": "^1.3.0",
     "@theia/scm": "^1.3.0",
     "@theia/scm-extra": "^1.3.0",
@@ -70,4 +69,4 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   }
-}
+}
diff --git a/packages/languages/package.json b/packages/languages/package.json
@@ -9,7 +9,6 @@
     "@theia/process": "^1.3.0",
     "@theia/workspace": "^1.3.0",
     "@types/uuid": "^7.0.3",
-    "monaco-languageclient": "^0.13.0",
     "uuid": "^8.0.0"
   },
   "publishConfig": {
@@ -50,4 +49,4 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   }
-}
+}
diff --git a/packages/monaco/compile.tsconfig.json b/packages/monaco/compile.tsconfig.json
@@ -18,9 +18,6 @@
     {
       "path": "../filesystem/compile.tsconfig.json"
     },
-    {
-      "path": "../languages/compile.tsconfig.json"
-    },
     {
       "path": "../markers/compile.tsconfig.json"
     },

diff --git a/packages/monaco/package.json b/packages/monaco/package.json
@@ -6,7 +6,6 @@
     "@theia/core": "^1.3.0",
     "@theia/editor": "^1.3.0",
     "@theia/filesystem": "^1.3.0",
-    "@theia/languages": "^1.3.0",
     "@theia/markers": "^1.3.0",
     "@theia/outline-view": "^1.3.0",
     "@theia/workspace": "^1.3.0",

diff --git a/packages/plugin-ext/compile.tsconfig.json b/packages/plugin-ext/compile.tsconfig.json
@@ -29,9 +29,6 @@
     {
       "path": "../filesystem/compile.tsconfig.json"
     },
-    {
-      "path": "../languages/compile.tsconfig.json"
-    },
     {
       "path": "../markers/compile.tsconfig.json"
     },

diff --git a/packages/plugin-ext/package.json b/packages/plugin-ext/package.json
@@ -11,7 +11,6 @@
     "@theia/editor": "^1.3.0",
     "@theia/file-search": "^1.3.0",
     "@theia/filesystem": "^1.3.0",
-    "@theia/languages": "^1.3.0",
     "@theia/markers": "^1.3.0",
     "@theia/messages": "^1.3.0",
     "@theia/monaco": "^1.3.0",
@@ -90,4 +89,4 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   }
-}
+}
diff --git a/packages/plugin-metrics/compile.tsconfig.json b/packages/plugin-metrics/compile.tsconfig.json
@@ -12,9 +12,6 @@
     {
       "path": "../core/compile.tsconfig.json"
     },
-    {
-      "path": "../languages/compile.tsconfig.json"
-    },
     {
       "path": "../metrics/compile.tsconfig.json"
     },

diff --git a/packages/plugin-metrics/package.json b/packages/plugin-metrics/package.json
@@ -4,7 +4,6 @@
   "description": "Theia - Plugin Metrics",
   "dependencies": {
     "@theia/core": "^1.3.0",
-    "@theia/languages": "^1.3.0",
     "@theia/metrics": "^1.3.0",
     "@theia/plugin": "^1.3.0",
     "@theia/plugin-ext": "^1.3.0",
@@ -48,4 +47,4 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   }
-}
+}
diff --git a/packages/preview/compile.tsconfig.json b/packages/preview/compile.tsconfig.json
@@ -16,9 +16,6 @@
     {
       "path": "../editor/compile.tsconfig.json"
     },
-    {
-      "path": "../languages/compile.tsconfig.json"
-    },
     {
       "path": "../mini-browser/compile.tsconfig.json"
     }

diff --git a/packages/preview/package.json b/packages/preview/package.json
@@ -5,7 +5,6 @@
   "dependencies": {
     "@theia/core": "^1.3.0",
     "@theia/editor": "^1.3.0",
-    "@theia/languages": "^1.3.0",
     "@theia/mini-browser": "^1.3.0",
     "@types/dompurify": "^2.0.2",
     "@types/highlight.js": "^9.12.2",
@@ -53,4 +52,4 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   }
-}
+}
diff --git a/packages/typehierarchy/compile.tsconfig.json b/packages/typehierarchy/compile.tsconfig.json
@@ -14,9 +14,6 @@
     },
     {
       "path": "../editor/compile.tsconfig.json"
-    },
-    {
-      "path": "../languages/compile.tsconfig.json"
     }
   ]
 }
diff --git a/packages/typehierarchy/package.json b/packages/typehierarchy/package.json
@@ -5,7 +5,6 @@
   "dependencies": {
     "@theia/core": "^1.3.0",
     "@theia/editor": "^1.3.0",
-    "@theia/languages": "^1.3.0",
     "@types/uuid": "^7.0.3",
     "uuid": "^8.0.0"
   },
@@ -46,4 +45,4 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   }
-}
+}
diff --git a/yarn.lock b/yarn.lock
@@ -8739,16 +8739,6 @@ moment@2.24.0, moment@^2.6.0:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
-monaco-languageclient@^0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/monaco-languageclient/-/monaco-languageclient-0.13.0.tgz#59b68b42fb7633171502d6557f597c2752f6c266"
-  integrity sha512-aCwd33dTitwV5QwY56rpYHwzEGXei8TZ+yvZcvP3gEMd6Mizr8m3pOuoknDi2SUfLuNAHS6+ulvLgZlNQB5awg==
-  dependencies:
-    glob-to-regexp "^0.3.0"
-    vscode-jsonrpc "^5.0.0"
-    vscode-languageclient "^6.0.0"
-    vscode-uri "^2.1.1"
-
 moo-server@*, moo-server@1.3.x:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/moo-server/-/moo-server-1.3.0.tgz#5dc79569565a10d6efed5439491e69d2392e58f1"
@@ -12871,19 +12861,11 @@ vscode-debugprotocol@^1.32.0:
   resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.37.0.tgz#e8c4694a078d18ea1a639553a7a241b35c1e6f6d"
   integrity sha512-ppZLEBbFRVNsK0YpfgFi/x2CDyihx0F+UpdKmgeJcvi05UgSXYdO0n9sDVYwoGvvYQPvlpDQeWuY0nloOC4mPA==
 
-vscode-jsonrpc@^5.0.0, vscode-jsonrpc@^5.0.0-next.7, vscode-jsonrpc@^5.0.1:
+vscode-jsonrpc@^5.0.0, vscode-jsonrpc@^5.0.0-next.7:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz#9bab9c330d89f43fc8c1e8702b5c36e058a01794"
   integrity sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==
 
-vscode-languageclient@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-6.1.0.tgz#ee67c0b7818c42ce0281572d05c89adfcc4f5a38"
-  integrity sha512-Tcp0VoOaa0YzxL4nEfK9tsmcy76Eo8jNLvFQZwh2c8oMm02luL8uGYPLQNAiZ3XGgegfcwiQFZMqbW7DNV0vxA==
-  dependencies:
-    semver "^6.3.0"
-    vscode-languageserver-protocol "^3.15.2"
-
 vscode-languageserver-protocol@^3.15.0-next.8, vscode-languageserver-protocol@^3.15.0-next.9:
   version "3.15.0-next.15"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.15.tgz#c67454b83c5f0a1b3f54d29226ab6ea19103e3fe"
@@ -12892,19 +12874,6 @@ vscode-languageserver-protocol@^3.15.0-next.8, vscode-languageserver-protocol@^3
     vscode-jsonrpc "^5.0.0-next.7"
     vscode-languageserver-types "^3.15.0-next.10"
 
-vscode-languageserver-protocol@^3.15.2:
-  version "3.15.2"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.2.tgz#e52c62923140b2655ad2472f6f29cfb83bacf5b8"
-  integrity sha512-GdL05JKOgZ76RDg3suiGCl9enESM7iQgGw4x93ibTh4sldvZmakHmTeZ4iUApPPGKf6O3OVBtrsksBXnHYaxNg==
-  dependencies:
-    vscode-jsonrpc "^5.0.1"
-    vscode-languageserver-types "3.15.1"
-
-vscode-languageserver-types@3.15.1:
-  version "3.15.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de"
-  integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==
-
 vscode-languageserver-types@^3.15.0-next, vscode-languageserver-types@^3.15.0-next.10:
   version "3.15.0-next.10"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.10.tgz#fcd22bb5e8415f52134cf9eb1a5d90778558bc5c"