Update to latest monaco-vscode packages (3.1.0). Include build of all…

… verification examples
TypeFox · Mar 12, 2024 · 36c684b · 36c684b
1 parent fa0396a
commit 36c684b
Show file tree

Hide file tree

Showing 26 changed files with 400 additions and 15,995 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -14,18 +14,35 @@ jobs:
   build:
     name: monaco-languageclient
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 10
     steps:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:
         node-version: '20'
-    - name: Build
+    - name: Use pnpm
+      uses: pnpm/action-setup@v3
+      with:
+        version: 8
+    - name: Install
       shell: bash
       run: |
         npm ci
+    - name: Lint
+      shell: bash
+      run: |
         npm run lint
+    - name: Build
+      shell: bash
+      run: |
         npm run build
+    - name: Test
+      shell: bash
+      run: |
         npm run test:run
+    - name: Verify
+      shell: bash
+      run: |
+        bash ./verify/buildAll.sh
diff --git a/README.md b/README.md
@@ -91,10 +91,10 @@ With v7 we decided to use readily treemended version of monaco-editor called [@c
 
 ```yaml
   "overrides": {
-    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.0.0"
+    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.0"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.0.0"
+    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.0"
   }
 ```
 
@@ -336,7 +336,7 @@ loader.config({ monaco });
 If you use pnpm, you have to add `vscode` / `@codingame/monaco-vscode-api` as direct dependency (see the [following table](#monaco-editor--codingamemonaco-vscode-api-compatibility-table)), otherwise the installation will fail.
 
 ```json
-"vscode": "npm:@codingame/monaco-vscode-api@~3.0.0"
+"vscode": "npm:@codingame/monaco-vscode-api@~3.1.0"
 ```
 
 ## Monaco-editor / @codingame/monaco-vscode-api compatibility table

diff --git a/index.html b/index.html
@@ -60,19 +60,19 @@ <h3>Other Examples</h3>
 
         <h2>Verification</h2>
         <h3>Angular</h2>
-        Please start  <b><code>cd verify/angular && npm install</code></b> beforehand:<br>
+        Please start  <b><code>cd verify/angular && npm run verify</code></b> beforehand:<br>
         <a href="http://localhost:4200">Client for JSON Language Server (Angular)</a>
         <h3>Webpack</h3>
-        Please start  <b><code>cd verify/webpack && npm install</code></b> beforehand:<br>
+        Please start  <b><code>cd verify/webpack && npm run verify</code></b> beforehand:<br>
         <a href="http://localhost:8081">Client for JSON Language Server (webpack build)</a>
         <h3>Vite</h3>
-        Please start  <b><code>cd verify/vite && npm install</code></b> beforehand:<br>
+        Please start  <b><code>cd verify/vite && npm run verify</code></b> beforehand:<br>
         <a href="http://localhost:8082">Client for JSON Language Server (vite build)</a>
         <h3>Pnpm/vite</h3>
-        Please start  <b><code>cd verify/pnpm && pnpm install</code></b> beforehand:<br>
+        Please start  <b><code>cd verify/pnpm && pnpm run verify</code></b> beforehand:<br>
         <a href="http://localhost:8083">Client for JSON Language Server (pnpm/vite build)</a>
         <h3>Yarn/vite</h3>
-        Please start  <b><code>cd verify/yarn && yarn install</code></b> beforehand:<br>
+        Please start  <b><code>cd verify/yarn && yarn run verify</code></b> beforehand:<br>
         <a href="http://localhost:8083">Client for JSON Language Server (yarn/vite build)</a>
     </div>
 </body>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,13 +3,13 @@
   "type": "module",
   "devDependencies": {
     "@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
-    "@types/node": "~20.11.25",
-    "@types/react": "~18.2.64",
+    "@types/node": "~20.11.26",
+    "@types/react": "~18.2.65",
     "@types/react-dom": "~18.2.21",
     "@types/shelljs": "~0.8.15",
     "@types/vscode": "~1.87.0",
-    "@typescript-eslint/eslint-plugin": "~7.1.1",
-    "@typescript-eslint/parser": "~7.1.1",
+    "@typescript-eslint/eslint-plugin": "~7.2.0",
+    "@typescript-eslint/parser": "~7.2.0",
     "@vitest/browser": "~1.3.1",
     "editorconfig": "~2.0.0",
     "eslint": "~8.57.0",
@@ -19,7 +19,7 @@
     "http-server": "~14.1.1",
     "shelljs": "~0.8.5",
     "shx": "~0.3.4",
-    "typescript": "~5.3.3",
+    "typescript": "~5.4.2",
     "vite": "~5.1.6",
     "vitest": "~1.3.1",
     "webdriverio": "~8.33.1"

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "8.0.0-next.2",
+  "version": "8.0.0-next.3",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -48,14 +48,14 @@
     "License.txt"
   ],
   "dependencies": {
-    "@codingame/monaco-vscode-languages-service-override": "~3.0.0",
-    "@codingame/monaco-vscode-model-service-override": "~3.0.0",
+    "@codingame/monaco-vscode-languages-service-override": "~3.1.0",
+    "@codingame/monaco-vscode-model-service-override": "~3.1.0",
     "vscode-languageclient": "~9.0.1"
   },
   "peerDependencies": {
-    "@codingame/monaco-vscode-api": "~3.0.0",
-    "@codingame/monaco-vscode-editor-api": "~3.0.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@~3.0.0"
+    "@codingame/monaco-vscode-api": "~3.1.0",
+    "@codingame/monaco-vscode-editor-api": "~3.1.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@~3.1.0"
   },
   "peerDependenciesMeta": {
     "@codingame/monaco-vscode-api": {
@@ -74,4 +74,4 @@
     "build:msg": "echo Building monaco-languageclient:",
     "build": "npm run build:msg && npm run clean && npm run compile"
   }
-}
+}
diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient-examples",
-  "version": "8.0.0-next.2",
+  "version": "8.0.0-next.3",
   "description": "Monaco Language client examples",
   "author": {
     "name": "TypeFox GmbH",
@@ -54,39 +54,38 @@
     }
   },
   "dependencies": {
-    "@codingame/monaco-vscode-api": "~3.0.0",
-    "@codingame/monaco-vscode-editor-api": "~3.0.0",
-    "@codingame/monaco-vscode-configuration-service-override": "~3.0.0",
-    "@codingame/monaco-vscode-editor-service-override": "~3.0.0",
-    "@codingame/monaco-vscode-files-service-override": "~3.0.0",
-    "@codingame/monaco-vscode-groovy-default-extension": "~3.0.0",
-    "@codingame/monaco-vscode-json-default-extension": "~3.0.0",
-    "@codingame/monaco-vscode-keybindings-service-override": "~3.0.0",
-    "@codingame/monaco-vscode-python-default-extension": "~3.0.0",
-    "@codingame/monaco-vscode-textmate-service-override": "~3.0.0",
-    "@codingame/monaco-vscode-theme-defaults-default-extension": "~3.0.0",
-    "@codingame/monaco-vscode-theme-service-override": "~3.0.0",
-    "@codingame/monaco-vscode-typescript-basics-default-extension": "~3.0.0",
-    "@codingame/monaco-vscode-typescript-language-features-default-extension": "~3.0.0",
-    "@codingame/monaco-vscode-language-pack-de": "~3.0.0",
-    "@codingame/monaco-vscode-language-pack-es": "~3.0.0",
-    "@codingame/monaco-vscode-language-pack-fr": "~3.0.0",
-    "@typefox/monaco-editor-react": "~3.0.0-next.2",
+    "@codingame/monaco-vscode-api": "~3.1.0",
+    "@codingame/monaco-vscode-editor-api": "~3.1.0",
+    "@codingame/monaco-vscode-configuration-service-override": "~3.1.0",
+    "@codingame/monaco-vscode-editor-service-override": "~3.1.0",
+    "@codingame/monaco-vscode-files-service-override": "~3.1.0",
+    "@codingame/monaco-vscode-groovy-default-extension": "~3.1.0",
+    "@codingame/monaco-vscode-json-default-extension": "~3.1.0",
+    "@codingame/monaco-vscode-keybindings-service-override": "~3.1.0",
+    "@codingame/monaco-vscode-python-default-extension": "~3.1.0",
+    "@codingame/monaco-vscode-textmate-service-override": "~3.1.0",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "~3.1.0",
+    "@codingame/monaco-vscode-theme-service-override": "~3.1.0",
+    "@codingame/monaco-vscode-typescript-basics-default-extension": "~3.1.0",
+    "@codingame/monaco-vscode-typescript-language-features-default-extension": "~3.1.0",
+    "@codingame/monaco-vscode-language-pack-de": "~3.1.0",
+    "@codingame/monaco-vscode-language-pack-es": "~3.1.0",
+    "@codingame/monaco-vscode-language-pack-fr": "~3.1.0",
+    "@typefox/monaco-editor-react": "~3.0.0-next.3",
     "express": "~4.18.3",
     "langium": "3.0.0",
-    "monaco-languageclient": "~8.0.0-next.2",
-    "monaco-editor-ms": "npm:monaco-editor@~0.46.0",
-    "monaco-editor-wrapper": "~4.0.0-next.2",
+    "monaco-languageclient": "~8.0.0-next.3",
+    "monaco-editor-wrapper": "~4.0.0-next.3",
     "pyright": "~1.1.353",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "request-light": "~0.7.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@~3.0.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@~3.1.0",
     "vscode-json-languageservice": "~5.3.7",
     "vscode-languageclient": "~9.0.1",
     "vscode-languageserver": "~9.0.1",
     "vscode-uri": "~3.0.8",
-    "vscode-ws-jsonrpc": "~3.3.0-next.2",
+    "vscode-ws-jsonrpc": "~3.3.0-next.3",
     "ws": "~8.16.0"
   },
   "devDependencies": {

diff --git a/packages/vscode-ws-jsonrpc/package.json b/packages/vscode-ws-jsonrpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vscode-ws-jsonrpc",
-  "version": "3.3.0-next.2",
+  "version": "3.3.0-next.3",
   "description": "VSCode JSON RPC over WebSocket",
   "author": {
     "name": "TypeFox GmbH",
@@ -70,4 +70,4 @@
     "build:msg": "echo Building vscode-ws-jsonrpc:",
     "build": "npm run build:msg && npm run clean && npm run compile"
   }
-}
+}
diff --git a/packages/wrapper-react/package.json b/packages/wrapper-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typefox/monaco-editor-react",
-  "version": "3.0.0-next.2",
+  "version": "3.0.0-next.3",
   "license": "MIT",
   "description": "React component for Monaco-Editor and Monaco Languageclient",
   "keywords": [
@@ -50,14 +50,14 @@
     "npm": "10.2.4"
   },
   "dependencies": {
-    "@codingame/monaco-vscode-api": "~3.0.0",
-    "@codingame/monaco-vscode-editor-api": "~3.0.0",
-    "monaco-editor-wrapper": "~4.0.0-next.2",
+    "@codingame/monaco-vscode-api": "~3.1.0",
+    "@codingame/monaco-vscode-editor-api": "~3.1.0",
+    "monaco-editor-wrapper": "~4.0.0-next.3",
     "react": "~18.2.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@~3.0.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@~3.1.0"
   },
   "peerDependencies": {
-    "monaco-editor-wrapper": "~4.0.0-next.2"
+    "monaco-editor-wrapper": "~4.0.0-next.3"
   },
   "peerDependenciesMeta": {
     "monaco-editor-wrapper": {
@@ -75,4 +75,4 @@
     "name": "TypeFox",
     "url": "https://www.typefox.io"
   }
-}
+}
diff --git a/packages/wrapper/package.json b/packages/wrapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-editor-wrapper",
-  "version": "4.0.0-next.2",
+  "version": "4.0.0-next.3",
   "license": "MIT",
   "description": "Wrapper for monaco-vscode-editor-api and monaco-languageclient",
   "keywords": [
@@ -101,28 +101,28 @@
     "npm": "10.2.4"
   },
   "dependencies": {
-    "@codingame/monaco-vscode-configuration-service-override": "~3.0.0",
-    "@codingame/monaco-vscode-editor-service-override": "~3.0.0",
-    "@codingame/monaco-vscode-textmate-service-override": "~3.0.0",
-    "@codingame/monaco-vscode-theme-defaults-default-extension": "~3.0.0",
-    "@codingame/monaco-vscode-theme-service-override": "~3.0.0",
-    "@codingame/monaco-vscode-api": "~3.0.0",
-    "@codingame/monaco-vscode-editor-api": "~3.0.0",
+    "@codingame/monaco-vscode-configuration-service-override": "~3.1.0",
+    "@codingame/monaco-vscode-editor-service-override": "~3.1.0",
+    "@codingame/monaco-vscode-textmate-service-override": "~3.1.0",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "~3.1.0",
+    "@codingame/monaco-vscode-theme-service-override": "~3.1.0",
+    "@codingame/monaco-vscode-api": "~3.1.0",
+    "@codingame/monaco-vscode-editor-api": "~3.1.0",
     "esbuild": "~0.20.1",
-    "monaco-languageclient": "~8.0.0-next.2",
-    "vscode": "npm:@codingame/monaco-vscode-api@~3.0.0",
+    "monaco-languageclient": "~8.0.0-next.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@~3.1.0",
     "vscode-languageclient": "~9.0.1",
     "vscode-languageserver-protocol": "~3.17.5",
-    "vscode-ws-jsonrpc": "~3.3.0-next.2"
+    "vscode-ws-jsonrpc": "~3.3.0-next.3"
   },
   "devDependencies": {
-    "monaco-editor-ms": "npm:monaco-editor@~0.46.0"
+    "monaco-editor-ms": "npm:monaco-editor@~0.47.0"
   },
   "peerDependencies": {
-    "@codingame/monaco-vscode-api": "~3.0.0",
-    "@codingame/monaco-vscode-editor-api": "~3.0.0",
-    "monaco-languageclient": "~8.0.0-next.2",
-    "vscode": "npm:@codingame/monaco-vscode-api@~3.0.0"
+    "@codingame/monaco-vscode-api": "~3.1.0",
+    "@codingame/monaco-vscode-editor-api": "~3.1.0",
+    "monaco-languageclient": "~8.0.0-next.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@~3.1.0"
   },
   "peerDependenciesMeta": {
     "@codingame/monaco-vscode-api": {
@@ -149,4 +149,4 @@
     "name": "TypeFox",
     "url": "https://www.typefox.io"
   }
-}
+}
diff --git a/packages/wrapper/src/workerFactory.ts b/packages/wrapper/src/workerFactory.ts
@@ -20,6 +20,8 @@ export interface MonacoEnvironmentEnhanced extends Environment {
     vscodeApiInitialised: boolean;
 }
 
+// export type WorkerLoader = () => Worker;
+
 /**
  * Cross origin workers don't work
  * The workaround used by vscode is to start a worker on a blob url containing a short script calling 'importScripts'

diff --git a/verify/angular/.gitignore b/verify/angular/.gitignore
@@ -0,0 +1 @@
+package-lock.json
diff --git a/verify/angular/angular.json b/verify/angular/angular.json
@@ -35,7 +35,11 @@
             "allowedCommonJsDependencies": [
               "vscode-jsonrpc",
               "vscode-languageclient",
-              "vscode-languageserver-protocol"
+              "vscode-languageserver-protocol",
+              "vscode-semver",
+              "vscode-oniguruma",
+              "vscode-textmate",
+              "vscode-marked"
             ]
           },
           "configurations": {