Prepare release 3.3.0 and 2.3.0

TypeFox · Oct 17, 2023 · f2f9f95 · f2f9f95
1 parent 72c2cb9
commit f2f9f95
Show file tree

Hide file tree

Showing 9 changed files with 176 additions and 209 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,20 +17,20 @@
     "start:example:server:python": "npm run start:server:python --workspace packages/examples"
   },
   "devDependencies": {
-    "@types/node": "~18.18.3",
+    "@types/node": "~18.18.5",
     "@types/shelljs": "~0.8.13",
     "@types/vscode": "~1.83.0",
-    "@typescript-eslint/eslint-plugin": "~6.7.4",
-    "@typescript-eslint/parser": "~6.7.4",
+    "@typescript-eslint/eslint-plugin": "~6.8.0",
+    "@typescript-eslint/parser": "~6.8.0",
     "@vitest/browser": "~0.34.6",
     "editorconfig": "~2.0.0",
-    "eslint": "~8.50.0",
+    "eslint": "~8.51.0",
     "shelljs": "~0.8.5",
     "shx": "~0.3.4",
-    "tslib": "~2.6.2",
     "typescript": "~5.2.2",
     "vite": "~4.4.11",
-    "webdriverio": "~8.16.22"
+    "vitest": "~0.34.6",
+    "webdriverio": "~8.18.2"
   },
   "volta": {
     "node": "18.18.1",

diff --git a/packages/examples/CHANGELOG.md b/packages/examples/CHANGELOG.md
@@ -2,13 +2,15 @@
 
 All notable changes to this npm module are documented in this file.
 
-## 2023-10-1x
+## [3.3.0] - 2023-10-17
 
+- Started to use version even if it is a private package. Aligned version with `monaco-editor-wrapper`.
 - Adjust to underlying api changes (`monaco-vscode-api` and `monaco-languageclient`)
   - Renamed `EditorAppVscodeApi` to `EditorAppExtended` and `EditorAppConfigVscodeApi` to `EditorAppConfigExtended`
   - BREAKING: `$type` of `EditorAppConfigExtended` was changed from `vscodeApi` to `extended`
 - Fix json language server launch
-- Move python language server port to 30001 and json language server port to 30000
+- Move python language server port to 30001 and json language server port to 30000.
+- Include all direct dependencies that the code uses in the `package.json`.
 
 ## 2023-09-21
 

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -1,7 +1,7 @@
 {
   "name": "monaco-editor-wrapper-examples",
   "private": true,
-  "version": "0.0.0",
+  "version": "3.3.0",
   "type": "module",
   "dependencies": {
     "@codingame/monaco-vscode-configuration-service-override": "~1.83.2",
@@ -14,21 +14,21 @@
     "langium": "~2.0.2",
     "langium-statemachine-dsl": "~2.0.0",
     "monaco-editor": "~0.44.0",
-    "monaco-editor-workers": "~0.43.0",
+    "monaco-editor-workers": "~0.44.0",
     "monaco-editor-wrapper": "~3.3.0",
     "monaco-languageclient-examples": "~6.6.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "request-light": "~0.7.0",
     "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.2 <1.84.0",
-    "vscode-uri": "~3.0.7",
+    "vscode-uri": "~3.0.8",
     "vscode-languageclient": "~8.1.0",
     "vscode-languageserver": "~8.1.0",
-    "vscode-json-languageservice": "~5.3.6"
+    "vscode-json-languageservice": "~5.3.7"
   },
   "devDependencies": {
-    "@types/react": "~18.2.23",
-    "@types/react-dom": "~18.2.8",
+    "@types/react": "~18.2.28",
+    "@types/react-dom": "~18.2.13",
     "ts-node": "~10.9.1"
   },
   "volta": {

diff --git a/packages/examples/src/verifyPrepare.ts b/packages/examples/src/verifyPrepare.ts
@@ -1,3 +1,5 @@
 import 'monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution.js';
+import 'monaco-editor/esm/vs/basic-languages/typescript/typescript.contribution.js';
+import 'monaco-editor/esm/vs/language/typescript/monaco.contribution.js';
 export * from 'monaco-editor-wrapper';
 export * from 'monaco-editor-wrapper/styles';
diff --git a/packages/examples/verify_alt.html b/packages/examples/verify_alt.html
@@ -13,9 +13,12 @@
 <body>
     <div id="monaco-editor-root" style="height: 80vh;"></div>
     <script type="module">
+        import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
+        import 'monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution.js';
+        import 'monaco-editor/esm/vs/basic-languages/typescript/typescript.contribution.js';
+        import 'monaco-editor/esm/vs/language/typescript/monaco.contribution.js';
         import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
         import { addMonacoStyles } from 'monaco-editor-wrapper/styles';
-        import 'monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution.js';
 
         import { buildWorkerDefinition } from 'monaco-editor-workers';
         buildWorkerDefinition('../../../node_modules/monaco-editor-workers/dist/workers', import.meta.url, false);
@@ -26,11 +29,12 @@
         const wrapper = new MonacoEditorLanguageClientWrapper();
         const startWrapper = async () => {
             const wrapperConfig = {
-                htmlElement: document.getElementById('monaco-editor-root'),
                 wrapperConfig: {
                     useVscodeConfig: false,
                     serviceConfig: {
-                        enableKeybindingsService: true,
+                        userServices: {
+                            ...getKeybindingsServiceOverride(),
+                        },
                         debugLogging: true
                     },
                     editorAppConfig: {
@@ -47,7 +51,7 @@
                     }
                 }
             };
-            await wrapper.start(wrapperConfig);
+            await wrapper.start(wrapperConfig, document.getElementById('monaco-editor-root'));
             console.log('wrapper was started.');
         };
 

diff --git a/packages/examples/verify_wrapper.html b/packages/examples/verify_wrapper.html
@@ -24,7 +24,6 @@
         const wrapper = new MonacoEditorLanguageClientWrapper();
         const startWrapper = async () => {
             const wrapperConfig = {
-                htmlElement: document.getElementById('monaco-editor-root'),
                 wrapperConfig: {
                     useVscodeConfig: false,
                     serviceConfig: {
@@ -45,7 +44,7 @@
                     }
                 }
             };
-            await wrapper.start(wrapperConfig);
+            await wrapper.start(wrapperConfig, document.getElementById('monaco-editor-root'));
             console.log('wrapper was started.');
         };
 

diff --git a/packages/monaco-editor-react/CHANGELOG.md b/packages/monaco-editor-react/CHANGELOG.md
@@ -2,12 +2,13 @@
 
 All notable changes to npm module [@typefox/monaco-editor-react](https://www.npmjs.com/package/@typefox/monaco-editor-react) are documented in this file.
 
-## [2.3.0] - 2023-10-1y
+## [2.3.0] - 2023-10-17
 
 - Properly separate and define classic and extended editor [#54](https://github.com/TypeFox/monaco-components/pull/54)
   - Renamed `EditorAppVscodeApi` to `EditorAppExtended` and `EditorAppConfigVscodeApi` to `EditorAppConfigExtended`
   - BREAKING: `$type` of `EditorAppConfigExtended` was changed from `vscodeApi` to `extended`
 - Updated to `monaco-editor-wrapper` `3.3.0`
+- Include all direct dependencies that the code uses in the `package.json`.
 
 ## [2.2.5] - 2023-10-13
 

diff --git a/packages/monaco-editor-wrapper/CHANGELOG.md b/packages/monaco-editor-wrapper/CHANGELOG.md
@@ -2,12 +2,13 @@
 
 All notable changes to npm module [monaco-editor-wrapper](https://www.npmjs.com/package/monaco-editor-wrapper) are documented in this file.
 
-## [3.3.0] - 2023-10-1y
+## [3.3.0] - 2023-10-17
 
 - Properly separate and define classic and extended editor [#54](https://github.com/TypeFox/monaco-components/pull/54)
   - Renamed `EditorAppVscodeApi` to `EditorAppExtended` and `EditorAppConfigVscodeApi` to `EditorAppConfigExtended`
   - BREAKING: `$type` of `EditorAppConfigExtended` was changed from `vscodeApi` to `extended`
 - Updated to `[email protected]` and `@codingame/[email protected]` and `[email protected]`
+- Include all direct dependencies that the code uses in the `package.json`.
 
 ## [3.2.5] - 2023-10-13