Merge pull request #17 from CodinGame/update-monaco-languageclient

Update monaco languageclient

Author: CGNonofr

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-languageclient-wrapper",
-  "version": "2.0.2",
+  "version": "2.1.2",
   "private": false,
   "description": "Enhanced Monaco editor with TextMate grammars and more",
   "scripts": {
@@ -21,19 +21,19 @@
   ],
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@codingame/monaco-editor-wrapper": "^1.9.0",
+    "@codingame/monaco-editor-wrapper": "^1.10.1",
+    "@codingame/monaco-jsonrpc": "^0.3.1",
     "once": "^1.4.0",
-    "sweetalert": "^2.1.2"
+    "sweetalert": "^2.1.2",
+    "vscode-languageserver-protocol": "^3.16.0"
   },
   "devDependencies": {
-    "@babel/core": "7.17.5",
+    "@babel/core": "7.17.7",
     "@babel/plugin-proposal-class-properties": "7.16.7",
     "@babel/plugin-proposal-optional-chaining": "7.16.7",
     "@babel/preset-env": "7.16.11",
     "@babel/preset-typescript": "7.16.7",
-    "@babel/runtime": "7.17.2",
-    "@codingame/monaco-jsonrpc": "^0.3.1",
-    "@codingame/monaco-languageclient": "^0.17.4",
+    "@babel/runtime": "7.17.7",
     "@rollup/plugin-alias": "3.1.9",
     "@rollup/plugin-babel": "5.3.1",
     "@rollup/plugin-commonjs": "21.0.2",
@@ -44,25 +44,28 @@
     "@types/once": "^1.4.0",
     "@types/rollup-plugin-node-builtins": "^2.1.2",
     "@types/vscode": "^1.65.0",
-    "@typescript-eslint/eslint-plugin": "5.14.0",
-    "@typescript-eslint/parser": "5.14.0",
-    "eslint": "8.10.0",
-    "eslint-config-standard": "16.0.3",
-    "eslint-config-standard-jsx": "10.0.0",
+    "@typescript-eslint/eslint-plugin": "5.15.0",
+    "@typescript-eslint/parser": "5.15.0",
+    "eslint": "8.11.0",
+    "eslint-config-standard": "17.0.0-1",
+    "eslint-config-standard-jsx": "11.0.0-1",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "6.0.0",
     "eslint-plugin-unused-imports": "2.0.0",
+    "monaco-languageclient": "^0.18.0",
     "proxy-polyfill": "^0.3.2",
-    "rollup": "2.70.0",
+    "rollup": "2.70.1",
     "rollup-plugin-dts": "^4.2.0",
     "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-postcss": "4.0.2",
     "rollup-plugin-visualizer": "5.6.0",
     "rollup-plugin-web-worker-loader": "1.6.1",
     "tslib": "^2.3.1",
-    "typescript": "4.6.2",
-    "vscode-languageserver-protocol": "^3.16.0"
+    "typescript": "4.6.2"
+  },
+  "resolutions": {
+    "eslint": "8.11.0"
   },
   "browserslist": [
     "defaults",

package.json

@@ -24,10 +24,10 @@ export default rollup.defineConfig({
     if (isResolved) {
       return false
     }
-    if ([/^vscode-/, /@types/].some(reg => reg.test(source))) {
-      return false
+    if (externals.some(external => source.startsWith(external))) {
+      return true
     }
-    return externals.some(external => source.startsWith(external))
+    return false
   },
   output: [{
     chunkFileNames: '[name].js',
@@ -48,7 +48,9 @@ export default rollup.defineConfig({
     nodeResolve({
       extensions
     }),
-    commonjs(),
+    commonjs({
+      esmExternals: (id) => id.match(/^vscode-languageserver-protocol(\/.*)?/) != null // required for monaco-emacs with use import monaco-editor esm code from commonjs code
+    }),
     babel({
       extensions,
       presets: [
@@ -62,7 +64,7 @@ export default rollup.defineConfig({
         '@babel/plugin-proposal-optional-chaining'
       ],
       babelHelpers: 'bundled',
-      exclude: /node_modules\/(?!monaco-languageclient|monaco-jsonrpc|vscode-jsonrpc|vscode-languageserver-protocol|vscode-languageserver-types|vscode-languageclient)/
+      exclude: /node_modules\/(?!monaco-languageclient|vscode-languageserver-types|vscode-languageclient)/
     }),
     visualizer(),
     alias({
@@ -74,7 +76,7 @@ export default rollup.defineConfig({
         replacement: 'monaco-editor/esm/vs/editor/edcore.main'
       }, {
         find: 'vscode',
-        replacement: require.resolve('@codingame/monaco-languageclient/lib/vscode-compatibility')
+        replacement: require.resolve('monaco-languageclient/lib/vscode-compatibility')
       }]
     }),
     {

rollup.config.ts

@@ -19,11 +19,10 @@ export default rollup.defineConfig({
     if (/^proxy-polyfill/.test(source)) {
       return true
     }
-    // Force include all types from vscode-* libs (vscode-languageclient, vscode-languageserver-protocol....)
-    if (/^vscode-/.test(source)) {
-      return false
+    if (externals.some(external => source.startsWith(external))) {
+      return true
     }
-    return externals.some(external => source.startsWith(external))
+    return false
   },
   plugins: [
     removeVscodeDeclareModule(),

rollup.types.config.ts

@@ -3,7 +3,7 @@ import { Uri } from 'monaco-editor'
 import {
   MonacoLanguageClient,
   createConnection, ConnectionErrorHandler, ConnectionCloseHandler, IConnection, Middleware, ErrorHandler, IConnectionProvider, InitializeParams, RegistrationRequest, RegistrationParams, UnregistrationRequest, UnregistrationParams, LanguageClientOptions
-} from '@codingame/monaco-languageclient'
+} from 'monaco-languageclient'
 import once from 'once'
 import { registerExtensionFeatures } from './extensions'
 import { LanguageClientId } from './languageClientOptions'
@@ -20,7 +20,7 @@ async function messageConnectionToConnection (messageConnection: MessageConnecti
       const rootPath = params.rootPath?.replace(/\\/g, '/')
       const fixedParams: InitializeParams = {
         ...params,
-        rootPath: rootPath,
+        rootPath,
         rootUri: rootPath != null ? Uri.from({ scheme: 'file', path: rootPath }).toString() : null
       }
       return connection.initialize(fixedParams)

src/createLanguageClient.ts

@@ -2,7 +2,7 @@ import {
   Disposable,
   ServerCapabilities, DocumentSelector, MonacoLanguageClient, StaticFeature, Services,
   TextDocumentSyncOptions, TextDocument, DidSaveTextDocumentNotification, Emitter
-} from '@codingame/monaco-languageclient'
+} from 'monaco-languageclient'
 import { updateFile, willShutdownNotificationType, WillShutdownParams } from './customRequests'
 import { LanguageClient } from './languageClient'
 

src/extensions.ts

@@ -1,5 +1,6 @@
 import { ConsoleLogger, createWebSocketConnection, toSocket } from '@codingame/monaco-jsonrpc'
-import { MessageConnection, TextDocument, TextDocumentSaveReason } from '@codingame/monaco-languageclient'
+import { MessageConnection } from 'vscode-languageserver-protocol'
+import { TextDocument, TextDocumentSaveReason } from 'monaco-languageclient'
 import * as monaco from 'monaco-editor'
 import type * as vscode from 'vscode'
 import { getFile, updateFile } from './customRequests'

src/infrastructure.ts

@@ -1,7 +1,7 @@
 import * as monaco from 'monaco-editor'
 import {
   CloseAction, ErrorAction, MonacoLanguageClient, Emitter, Event, TextDocument, Services, State, DisposableCollection, CancellationToken, RequestType, NotificationType, Disposable
-} from '@codingame/monaco-languageclient'
+} from 'monaco-languageclient'
 import delay from 'delay'
 import { Uri } from 'monaco-editor'
 import { registerTextModelContentProvider } from '@codingame/monaco-editor-wrapper'

src/languageClient.ts

@@ -1,4 +1,4 @@
-import { Disposable, LanguageClientOptions as MonacoLanguageClientOptions } from '@codingame/monaco-languageclient'
+import { Disposable, LanguageClientOptions as MonacoLanguageClientOptions } from 'monaco-languageclient'
 import staticOptions, { StaticLanguageClientId } from './staticOptions'
 
 export type LanguageClientOptions = Pick<MonacoLanguageClientOptions, 'documentSelector' | 'synchronize' | 'initializationOptions' | 'middleware'> & {

src/languageClientOptions.ts

@@ -2,7 +2,7 @@
 import * as monaco from 'monaco-editor'
 import {
   Services, MonacoToProtocolConverter, ProtocolToMonacoConverter, MonacoLanguages, TextDocumentSaveReason, MonacoCommands
-} from '@codingame/monaco-languageclient'
+} from 'monaco-languageclient'
 import { RenameFile, CreateFile, WorkspaceEdit } from 'vscode-languageserver-protocol'
 import WatchableConsoleWindow from './services/WatchableConsoleWindow'
 import CodinGameMonacoWorkspace from './services/CodinGameMonacoWorkspace'