lib: Switch back to last version of official monaco-languageclient

Author: CGNonofr

package-lock.json

@@ -33,7 +33,6 @@
     "@babel/preset-typescript": "7.16.7",
     "@babel/runtime": "7.17.2",
     "@codingame/monaco-jsonrpc": "^0.3.1",
-    "@codingame/monaco-languageclient": "^0.17.4",
     "@rollup/plugin-alias": "3.1.9",
     "@rollup/plugin-babel": "5.3.1",
     "@rollup/plugin-commonjs": "21.0.2",
@@ -53,6 +52,7 @@
     "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-plugin-dts": "^4.2.0",

package.json

@@ -74,7 +74,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

@@ -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'

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,5 @@
 import { ConsoleLogger, createWebSocketConnection, toSocket } from '@codingame/monaco-jsonrpc'
-import { MessageConnection, TextDocument, TextDocumentSaveReason } from '@codingame/monaco-languageclient'
+import { MessageConnection, 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'

src/services.ts

@@ -1,7 +1,7 @@
 import {
   MonacoWorkspace, TextDocument, TextDocumentSaveReason,
   ProtocolToMonacoConverter, MonacoToProtocolConverter, Emitter, Event, TextDocumentWillSaveEvent, Disposable
-} from '@codingame/monaco-languageclient'
+} from 'monaco-languageclient'
 import * as monaco from 'monaco-editor'
 import type * as vscode from 'vscode'
 import Configuration from './Configuration'