From 2db6b2fa250f94595de334783fd278bc38543a2f Mon Sep 17 00:00:00 2001 From: Mor Date: Tue, 4 Jun 2024 22:11:48 +0300 Subject: [PATCH] upgrade to monaco-editor 0.49.0 (#458) Upgrade to monaco-editor 0.49.0 --- ...monaco-editor-npm-0.49.0-b2e93047b5.patch} | 6 ++-- package.json | 2 +- package/package.json | 4 +-- .../package.json | 2 +- samples/amd-webpack-react/package.json | 2 +- samples/amd/package.json | 2 +- samples/esm-parcel/README.md | 2 +- samples/esm-parcel/package.json | 2 +- samples/esm-vite/package.json | 2 +- samples/esm-webpack-react/package.json | 2 +- yarn.lock | 32 +++++++++---------- 11 files changed, 29 insertions(+), 29 deletions(-) rename .yarn/patches/{monaco-editor-npm-0.46.0-fb69b10c11.patch => monaco-editor-npm-0.49.0-b2e93047b5.patch} (67%) diff --git a/.yarn/patches/monaco-editor-npm-0.46.0-fb69b10c11.patch b/.yarn/patches/monaco-editor-npm-0.49.0-b2e93047b5.patch similarity index 67% rename from .yarn/patches/monaco-editor-npm-0.46.0-fb69b10c11.patch rename to .yarn/patches/monaco-editor-npm-0.49.0-b2e93047b5.patch index 782b8f1d..c8da0c77 100644 --- a/.yarn/patches/monaco-editor-npm-0.46.0-fb69b10c11.patch +++ b/.yarn/patches/monaco-editor-npm-0.49.0-b2e93047b5.patch @@ -1,12 +1,12 @@ diff --git a/esm/vs/base/common/platform.js b/esm/vs/base/common/platform.js -index d507327daec3cdf5027bd886f898c364c5433ecd..9dc769654606b60bc71922dd40f2146db97dcbb9 100644 +index bd06f6f0eb6492f32ff9a6c7319162a55670e421..da2875afe2f74560cdebec8178a39562df42cfbc 100644 --- a/esm/vs/base/common/platform.js +++ b/esm/vs/base/common/platform.js @@ -26,9 +26,11 @@ if (typeof $globalThis.vscode !== 'undefined' && typeof $globalThis.vscode.proce // Native environment (sandboxed) nodeProcess = $globalThis.vscode.process; } --else if (typeof process !== 'undefined') { +-else if (typeof process !== 'undefined' && typeof ((_a = process === null || process === void 0 ? void 0 : process.versions) === null || _a === void 0 ? void 0 : _a.node) === 'string') { +// Work around bug in Parcel causing $globalThis.process !== process +// https://github.com/parcel-bundler/parcel/issues/9549 +else if (typeof $globalThis.process !== 'undefined') { @@ -14,5 +14,5 @@ index d507327daec3cdf5027bd886f898c364c5433ecd..9dc769654606b60bc71922dd40f2146d - nodeProcess = process; + nodeProcess = $globalThis.process; } - const isElectronProcess = typeof ((_a = nodeProcess === null || nodeProcess === void 0 ? void 0 : nodeProcess.versions) === null || _a === void 0 ? void 0 : _a.electron) === 'string'; + const isElectronProcess = typeof ((_b = nodeProcess === null || nodeProcess === void 0 ? void 0 : nodeProcess.versions) === null || _b === void 0 ? void 0 : _b.electron) === 'string'; const isElectronRenderer = isElectronProcess && (nodeProcess === null || nodeProcess === void 0 ? void 0 : nodeProcess.type) === 'renderer'; diff --git a/package.json b/package.json index 140dd8ed..2bdcc11b 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,6 @@ "wait-on": "^7.0.1" }, "resolutions": { - "monaco-editor@^0.46.0": "patch:monaco-editor@npm%3A0.46.0#./.yarn/patches/monaco-editor-npm-0.46.0-fb69b10c11.patch" + "monaco-editor@^0.49.0": "patch:monaco-editor@npm%3A0.49.0#./.yarn/patches/monaco-editor-npm-0.49.0-b2e93047b5.patch" } } diff --git a/package/package.json b/package/package.json index 0f3431bd..3b92d313 100644 --- a/package/package.json +++ b/package/package.json @@ -56,7 +56,7 @@ "browser-sync": "^3.0.2", "concurrently": "^8.2.1", "http-server": "^14.1.1", - "monaco-editor": "^0.46.0", + "monaco-editor": "^0.49.0", "rimraf": "^5.0.1", "rollup": "^3.29.2", "terser": "^5.19.4", @@ -74,6 +74,6 @@ "xregexp": "^5.1.1" }, "peerDependencies": { - "monaco-editor": "^0.46.0" + "monaco-editor": "0.49.0" } } diff --git a/samples/amd-webpack-react-cross-origin/package.json b/samples/amd-webpack-react-cross-origin/package.json index da1cc972..3c912383 100644 --- a/samples/amd-webpack-react-cross-origin/package.json +++ b/samples/amd-webpack-react-cross-origin/package.json @@ -16,7 +16,7 @@ "dependencies": { "@kusto/monaco-kusto": "workspace:*", "express": "^4.18.2", - "monaco-editor": "^0.46.0", + "monaco-editor": "^0.49.0", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/samples/amd-webpack-react/package.json b/samples/amd-webpack-react/package.json index a6b2749f..5da13ee7 100644 --- a/samples/amd-webpack-react/package.json +++ b/samples/amd-webpack-react/package.json @@ -16,7 +16,7 @@ }, "dependencies": { "@kusto/monaco-kusto": "workspace:*", - "monaco-editor": "^0.46.0", + "monaco-editor": "^0.49.0", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/samples/amd/package.json b/samples/amd/package.json index 2ac1a67e..a575ecc1 100644 --- a/samples/amd/package.json +++ b/samples/amd/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@kusto/monaco-kusto": "workspace:*", - "monaco-editor": "^0.46.0" + "monaco-editor": "^0.49.0" }, "scripts": { "build": "copyMonacoFilesAMD .", diff --git a/samples/esm-parcel/README.md b/samples/esm-parcel/README.md index d80b047b..3ead8e12 100644 --- a/samples/esm-parcel/README.md +++ b/samples/esm-parcel/README.md @@ -15,7 +15,7 @@ Parcel docs on shimming globals: https://parceljs.org/features/node-emulation/#s Recent monaco versions use `typeof process` to check if it's running in a node environment. Parcel doesn't have the ability to make this check return `false` so we need to patch monaco to use `globalThis.process` instead. -The yarn patch file this repo uses can be seen at `/.yarn/patches/monaco-editor-npm-0.46.0-fb69b10c11.patch`. +The yarn patch file this repo uses can be seen at `/.yarn/patches/monaco-editor-npm-0.49.0-fb69b10c11.patch`. Yarn docs for patching packages: https://yarnpkg.com/cli/patch diff --git a/samples/esm-parcel/package.json b/samples/esm-parcel/package.json index cc969c7b..68211729 100644 --- a/samples/esm-parcel/package.json +++ b/samples/esm-parcel/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@kusto/monaco-kusto": "workspace:*", - "monaco-editor": "^0.46.0" + "monaco-editor": "^0.49.0" }, "devDependencies": { "@tsconfig/recommended": "^1.0.3", diff --git a/samples/esm-vite/package.json b/samples/esm-vite/package.json index ed189a7c..bd1ca1fb 100644 --- a/samples/esm-vite/package.json +++ b/samples/esm-vite/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@kusto/monaco-kusto": "^10.0.8", - "monaco-editor": "^0.46.0" + "monaco-editor": "^0.49.0" }, "devDependencies": { "vite": "^5.0.0", diff --git a/samples/esm-webpack-react/package.json b/samples/esm-webpack-react/package.json index df6a3f8d..dd5a0b32 100644 --- a/samples/esm-webpack-react/package.json +++ b/samples/esm-webpack-react/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@kusto/monaco-kusto": "workspace:*", - "monaco-editor": "^0.46.0", + "monaco-editor": "^0.49.0", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/yarn.lock b/yarn.lock index ce42d730..356df928 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1919,7 +1919,7 @@ __metadata: concurrently: ^8.2.1 http-server: ^14.1.1 lodash-es: ^4.17.21 - monaco-editor: ^0.46.0 + monaco-editor: ^0.49.0 rimraf: ^5.0.1 rollup: ^3.29.2 terser: ^5.19.4 @@ -1931,7 +1931,7 @@ __metadata: vscode-languageserver-types: ^3.17.4 xregexp: ^5.1.1 peerDependencies: - monaco-editor: ^0.46.0 + monaco-editor: 0.49.0 bin: copyMonacoFilesAMD: copyMonacoFilesAMD.js languageName: unknown @@ -8034,17 +8034,17 @@ __metadata: languageName: node linkType: hard -"monaco-editor@npm:0.46.0": - version: 0.46.0 - resolution: "monaco-editor@npm:0.46.0" - checksum: be7aaa2747b8d3a3537f56c9353ebe779b188eb1480f6453fa1e346d8ccdd27068cb4508c8f6f3b8cc07ac0f792a3d6df36168d54cd6e074742182525115be86 +"monaco-editor@npm:0.49.0": + version: 0.49.0 + resolution: "monaco-editor@npm:0.49.0" + checksum: 133b41b2b32d120ff6bc12d68a72501c90ff6de2e15e915a44c25f3f3ab29d164bd94ba501e13329e855b3000bd035319b01be122e76ab7f3fab6731cf0a323c languageName: node linkType: hard -"monaco-editor@patch:monaco-editor@npm%3A0.46.0#./.yarn/patches/monaco-editor-npm-0.46.0-fb69b10c11.patch::locator=monaco-kusto%40workspace%3A.": - version: 0.46.0 - resolution: "monaco-editor@patch:monaco-editor@npm%3A0.46.0#./.yarn/patches/monaco-editor-npm-0.46.0-fb69b10c11.patch::version=0.46.0&hash=e0292b&locator=monaco-kusto%40workspace%3A." - checksum: 4b1f28cd5e0446cfc0b324ad0413b497132fce3b4487d3b6531a0640138d80033df37353e77650e41e5034a8691ee64d7b29bb6e1ecc8cd22fa42ea9549cea68 +"monaco-editor@patch:monaco-editor@npm%3A0.49.0#./.yarn/patches/monaco-editor-npm-0.49.0-b2e93047b5.patch::locator=monaco-kusto%40workspace%3A.": + version: 0.49.0 + resolution: "monaco-editor@patch:monaco-editor@npm%3A0.49.0#./.yarn/patches/monaco-editor-npm-0.49.0-b2e93047b5.patch::version=0.49.0&hash=a5d05e&locator=monaco-kusto%40workspace%3A." + checksum: 72916ef8a239c1e6b61d3caf5cb44362411b33a75d520916daea04494ade0339c71fa097ab7393694afd7e29ff6f4acadb341bdedcfd649b0b3f5dcaa10e425c languageName: node linkType: hard @@ -8054,7 +8054,7 @@ __metadata: dependencies: "@kusto/monaco-kusto": "workspace:*" http-server: ^14.1.1 - monaco-editor: ^0.46.0 + monaco-editor: ^0.49.0 languageName: unknown linkType: soft @@ -8075,7 +8075,7 @@ __metadata: css-loader: ^6.8.1 express: ^4.18.2 html-webpack-plugin: ^5.5.3 - monaco-editor: ^0.46.0 + monaco-editor: ^0.49.0 react: ^18.2.0 react-dom: ^18.2.0 style-loader: ^3.3.2 @@ -8101,7 +8101,7 @@ __metadata: babel-loader: ^9.1.2 css-loader: ^6.8.1 html-webpack-plugin: ^5.5.3 - monaco-editor: ^0.46.0 + monaco-editor: ^0.49.0 react: ^18.2.0 react-dom: ^18.2.0 style-loader: ^3.3.2 @@ -8118,7 +8118,7 @@ __metadata: dependencies: "@kusto/monaco-kusto": "workspace:*" "@tsconfig/recommended": ^1.0.3 - monaco-editor: ^0.46.0 + monaco-editor: ^0.49.0 parcel: ^2.0.0 typescript: ^5.2.2 languageName: unknown @@ -8129,7 +8129,7 @@ __metadata: resolution: "monaco-kusto--esm-vite-sample@workspace:samples/esm-vite" dependencies: "@kusto/monaco-kusto": ^10.0.8 - monaco-editor: ^0.46.0 + monaco-editor: ^0.49.0 vite: ^5.0.0 vite-plugin-node-polyfills: ^0.17.0 languageName: unknown @@ -8146,7 +8146,7 @@ __metadata: babel-loader: ^9.1.2 css-loader: ^6.8.1 html-webpack-plugin: ^5.5.3 - monaco-editor: ^0.46.0 + monaco-editor: ^0.49.0 react: ^18.2.0 react-dom: ^18.2.0 style-loader: ^3.3.2