From dd6c6b02b569301f5a2b823fe4a151e184a0a3a8 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Fri, 21 Jul 2023 16:31:22 +0200 Subject: [PATCH 1/6] Update dependencies --- README.md | 2 +- package-lock.json | 1081 ++++++++++++----------- package.json | 22 +- packages/client/package.json | 12 +- packages/examples/main/package.json | 14 +- packages/verify/pnpm/package.json | 8 +- packages/verify/vite/package.json | 4 +- packages/verify/webpack/package.json | 12 +- packages/verify/yarn/package.json | 4 +- packages/vscode-ws-jsonrpc/package.json | 2 +- 10 files changed, 601 insertions(+), 560 deletions(-) diff --git a/README.md b/README.md index 5616877b..5c9810d4 100644 --- a/README.md +++ b/README.md @@ -250,7 +250,7 @@ loader.config({ monaco }); If you use pnpm, you have to add `vscode` / `monaco-vscode-api` as direct dependency (see the [following table](#monaco-editor--monaco-vscode-api-compatibility-table)), otherwise the installation will fail. ```json -"vscode": "npm:@codingame/monaco-vscode-api@~1.78.8" +"vscode": "npm:@codingame/monaco-vscode-api@~1.80.0" ``` ## Licenses diff --git a/package-lock.json b/package-lock.json index 288ff34a..894b3384 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,22 +12,31 @@ "packages/verify/vite" ], "devDependencies": { - "@types/node": "~18.16.18", - "@types/vscode": "~1.79.1", - "@typescript-eslint/eslint-plugin": "~5.59.11", - "@typescript-eslint/parser": "~5.59.11", - "editorconfig": "~1.0.2", - "eslint": "~8.42.0", + "@types/node": "~18.16.19", + "@types/vscode": "~1.80.0", + "@typescript-eslint/eslint-plugin": "~6.1.0", + "@typescript-eslint/parser": "~6.1.0", + "editorconfig": "~2.0.0", + "eslint": "~8.45.0", "eslint-config-standard": "~17.1.0", "eslint-plugin-header": "~3.1.1", "eslint-plugin-import": "~2.27.5", "eslint-plugin-promise": "~6.1.1", - "eslint-plugin-unused-imports": "~2.0.0", + "eslint-plugin-unused-imports": "~3.0.0", "path-browserify": "~1.0.1", "shx": "~0.3.4", - "tslib": "~2.5.3", - "typescript": "~5.1.3", - "vite": "~4.3.9" + "tslib": "~2.6.0", + "typescript": "~5.1.6", + "vite": "~4.4.6" + } + }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" } }, "node_modules/@chevrotain/cst-dts-gen": { @@ -81,9 +90,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz", - "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.15.tgz", + "integrity": "sha512-wlkQBWb79/jeEEoRmrxt/yhn5T1lU236OCNpnfRzaCJHZ/5gf82uYx1qmADTBWE0AR/v7FiozE1auk2riyQd3w==", "cpu": [ "arm" ], @@ -97,9 +106,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz", - "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.15.tgz", + "integrity": "sha512-NI/gnWcMl2kXt1HJKOn2H69SYn4YNheKo6NZt1hyfKWdMbaGadxjZIkcj4Gjk/WPxnbFXs9/3HjGHaknCqjrww==", "cpu": [ "arm64" ], @@ -113,9 +122,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz", - "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.15.tgz", + "integrity": "sha512-FM9NQamSaEm/IZIhegF76aiLnng1kEsZl2eve/emxDeReVfRuRNmvT28l6hoFD9TsCxpK+i4v8LPpEj74T7yjA==", "cpu": [ "x64" ], @@ -129,9 +138,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz", - "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.15.tgz", + "integrity": "sha512-XmrFwEOYauKte9QjS6hz60FpOCnw4zaPAb7XV7O4lx1r39XjJhTN7ZpXqJh4sN6q60zbP6QwAVVA8N/wUyBH/w==", "cpu": [ "arm64" ], @@ -145,9 +154,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz", - "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.15.tgz", + "integrity": "sha512-bMqBmpw1e//7Fh5GLetSZaeo9zSC4/CMtrVFdj+bqKPGJuKyfNJ5Nf2m3LknKZTS+Q4oyPiON+v3eaJ59sLB5A==", "cpu": [ "x64" ], @@ -161,9 +170,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz", - "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.15.tgz", + "integrity": "sha512-LoTK5N3bOmNI9zVLCeTgnk5Rk0WdUTrr9dyDAQGVMrNTh9EAPuNwSTCgaKOKiDpverOa0htPcO9NwslSE5xuLA==", "cpu": [ "arm64" ], @@ -177,9 +186,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz", - "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.15.tgz", + "integrity": "sha512-62jX5n30VzgrjAjOk5orYeHFq6sqjvsIj1QesXvn5OZtdt5Gdj0vUNJy9NIpjfdNdqr76jjtzBJKf+h2uzYuTQ==", "cpu": [ "x64" ], @@ -193,9 +202,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz", - "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.15.tgz", + "integrity": "sha512-dT4URUv6ir45ZkBqhwZwyFV6cH61k8MttIwhThp2BGiVtagYvCToF+Bggyx2VI57RG4Fbt21f9TmXaYx0DeUJg==", "cpu": [ "arm" ], @@ -209,9 +218,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz", - "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.15.tgz", + "integrity": "sha512-BWncQeuWDgYv0jTNzJjaNgleduV4tMbQjmk/zpPh/lUdMcNEAxy+jvneDJ6RJkrqloG7tB9S9rCrtfk/kuplsQ==", "cpu": [ "arm64" ], @@ -225,9 +234,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz", - "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.15.tgz", + "integrity": "sha512-JPXORvgHRHITqfms1dWT/GbEY89u848dC08o0yK3fNskhp0t2TuNUnsrrSgOdH28ceb1hJuwyr8R/1RnyPwocw==", "cpu": [ "ia32" ], @@ -241,9 +250,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz", - "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.15.tgz", + "integrity": "sha512-kArPI0DopjJCEplsVj/H+2Qgzz7vdFSacHNsgoAKpPS6W/Ndh8Oe24HRDQ5QCu4jHgN6XOtfFfLpRx3TXv/mEg==", "cpu": [ "loong64" ], @@ -257,9 +266,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz", - "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.15.tgz", + "integrity": "sha512-b/tmngUfO02E00c1XnNTw/0DmloKjb6XQeqxaYuzGwHe0fHVgx5/D6CWi+XH1DvkszjBUkK9BX7n1ARTOst59w==", "cpu": [ "mips64el" ], @@ -273,9 +282,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz", - "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.15.tgz", + "integrity": "sha512-KXPY69MWw79QJkyvUYb2ex/OgnN/8N/Aw5UDPlgoRtoEfcBqfeLodPr42UojV3NdkoO4u10NXQdamWm1YEzSKw==", "cpu": [ "ppc64" ], @@ -289,9 +298,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz", - "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.15.tgz", + "integrity": "sha512-komK3NEAeeGRnvFEjX1SfVg6EmkfIi5aKzevdvJqMydYr9N+pRQK0PGJXk+bhoPZwOUgLO4l99FZmLGk/L1jWg==", "cpu": [ "riscv64" ], @@ -305,9 +314,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz", - "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.15.tgz", + "integrity": "sha512-632T5Ts6gQ2WiMLWRRyeflPAm44u2E/s/TJvn+BP6M5mnHSk93cieaypj3VSMYO2ePTCRqAFXtuYi1yv8uZJNA==", "cpu": [ "s390x" ], @@ -321,9 +330,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz", - "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.15.tgz", + "integrity": "sha512-MsHtX0NgvRHsoOtYkuxyk4Vkmvk3PLRWfA4okK7c+6dT0Fu4SUqXAr9y4Q3d8vUf1VWWb6YutpL4XNe400iQ1g==", "cpu": [ "x64" ], @@ -337,9 +346,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz", - "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.15.tgz", + "integrity": "sha512-djST6s+jQiwxMIVQ5rlt24JFIAr4uwUnzceuFL7BQT4CbrRtqBPueS4GjXSiIpmwVri1Icj/9pFRJ7/aScvT+A==", "cpu": [ "x64" ], @@ -353,9 +362,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz", - "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.15.tgz", + "integrity": "sha512-naeRhUIvhsgeounjkF5mvrNAVMGAm6EJWiabskeE5yOeBbLp7T89tAEw0j5Jm/CZAwyLe3c67zyCWH6fsBLCpw==", "cpu": [ "x64" ], @@ -369,9 +378,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz", - "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.15.tgz", + "integrity": "sha512-qkT2+WxyKbNIKV1AEhI8QiSIgTHMcRctzSaa/I3kVgMS5dl3fOeoqkb7pW76KwxHoriImhx7Mg3TwN/auMDsyQ==", "cpu": [ "x64" ], @@ -385,9 +394,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz", - "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.15.tgz", + "integrity": "sha512-HC4/feP+pB2Vb+cMPUjAnFyERs+HJN7E6KaeBlFdBv799MhD+aPJlfi/yk36SED58J9TPwI8MAcVpJgej4ud0A==", "cpu": [ "arm64" ], @@ -401,9 +410,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz", - "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.15.tgz", + "integrity": "sha512-ovjwoRXI+gf52EVF60u9sSDj7myPixPxqzD5CmkEUmvs+W9Xd0iqISVBQn8xcx4ciIaIVlWCuTbYDOXOnOL44Q==", "cpu": [ "ia32" ], @@ -417,9 +426,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz", - "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.15.tgz", + "integrity": "sha512-imUxH9a3WJARyAvrG7srLyiK73XdX83NXQkjKvQ+7vPh3ZxoLrzvPkQKKw2DwZ+RV2ZB6vBfNHP8XScAmQC3aA==", "cpu": [ "x64" ], @@ -457,14 +466,14 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz", - "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz", + "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.2", + "espree": "^9.6.0", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -502,9 +511,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.42.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.42.0.tgz", - "integrity": "sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==", + "version": "8.44.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz", + "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -600,9 +609,9 @@ } }, "node_modules/@jridgewell/source-map": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz", - "integrity": "sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", + "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", "dev": true, "peer": true, "dependencies": { @@ -711,9 +720,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.40.2", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.40.2.tgz", - "integrity": "sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==", + "version": "8.44.0", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.0.tgz", + "integrity": "sha512-gsF+c/0XOguWgaOgvFs+xnnRqt9GwgTvIks36WpE6ueeI4KCEHHd8K/CKHqhOqrJKsYH8m27kRzQEvWXAwXUTw==", "dev": true, "peer": true, "dependencies": { @@ -763,6 +772,12 @@ "@types/send": "*" } }, + "node_modules/@types/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==", + "dev": true + }, "node_modules/@types/json-schema": { "version": "7.0.12", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", @@ -782,9 +797,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.16.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.18.tgz", - "integrity": "sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw==", + "version": "18.16.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.19.tgz", + "integrity": "sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==", "dev": true }, "node_modules/@types/prop-types": { @@ -806,9 +821,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.12", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.12.tgz", - "integrity": "sha512-ndmBMLCgn38v3SntMeoJaIrO6tGHYKMEBohCUmw8HoLLQdRMOIGXfeYaBTLe2lsFaSB3MOK1VXscYFnmLtTSmw==", + "version": "18.2.15", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.15.tgz", + "integrity": "sha512-oEjE7TQt1fFTFSbf8kkNuc798ahTUzn3Le67/PWjE8MAfYAD/qB7O8hSTcromLFqHCt9bcdOg5GXMokzTjJ5SA==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -817,9 +832,9 @@ } }, "node_modules/@types/react-dom": { - "version": "18.2.5", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.5.tgz", - "integrity": "sha512-sRQsOS/sCLnpQhR4DSKGTtWFE3FZjpQa86KPVbhUqdYMRZ9FEFcfAytKhR/vUG2rH1oFbOOej6cuD7MFSobDRQ==", + "version": "18.2.7", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.7.tgz", + "integrity": "sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==", "dev": true, "dependencies": { "@types/react": "*" @@ -848,19 +863,20 @@ } }, "node_modules/@types/serve-static": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz", - "integrity": "sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz", + "integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==", "dev": true, "dependencies": { + "@types/http-errors": "*", "@types/mime": "*", "@types/node": "*" } }, "node_modules/@types/vscode": { - "version": "1.79.1", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.79.1.tgz", - "integrity": "sha512-Ikwc4YbHABzqthrWfeAvItaAIfX9mdjMWxqNgTpGjhgOu0TMRq9LzyZ2yBK0JhYqoSjEubEPawf6zJgnl6Egtw==", + "version": "1.80.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.80.0.tgz", + "integrity": "sha512-qK/CmOdS2o7ry3k6YqU4zD3R2AYlJfbwBoSbKpBoP+GpXNE+0NEgJOli4n0bm0diK5kfBnchgCEj4igQz/44Hg==", "dev": true }, "node_modules/@types/ws": { @@ -873,32 +889,34 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.59.11", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz", - "integrity": "sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.1.0.tgz", + "integrity": "sha512-qg7Bm5TyP/I7iilGyp6DRqqkt8na00lI6HbjWZObgk3FFSzH5ypRwAHXJhJkwiRtTcfn+xYQIMOR5kJgpo6upw==", "dev": true, "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.59.11", - "@typescript-eslint/type-utils": "5.59.11", - "@typescript-eslint/utils": "5.59.11", + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.1.0", + "@typescript-eslint/type-utils": "6.1.0", + "@typescript-eslint/utils": "6.1.0", + "@typescript-eslint/visitor-keys": "6.1.0", "debug": "^4.3.4", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -907,25 +925,26 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.59.11", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.11.tgz", - "integrity": "sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.1.0.tgz", + "integrity": "sha512-hIzCPvX4vDs4qL07SYzyomamcs2/tQYXg5DtdAfj35AyJ5PIUqhsLf4YrEIFzZcND7R2E8tpQIZKayxg8/6Wbw==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.59.11", - "@typescript-eslint/types": "5.59.11", - "@typescript-eslint/typescript-estree": "5.59.11", + "@typescript-eslint/scope-manager": "6.1.0", + "@typescript-eslint/types": "6.1.0", + "@typescript-eslint/typescript-estree": "6.1.0", + "@typescript-eslint/visitor-keys": "6.1.0", "debug": "^4.3.4" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -934,16 +953,16 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.59.11", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz", - "integrity": "sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.1.0.tgz", + "integrity": "sha512-AxjgxDn27hgPpe2rQe19k0tXw84YCOsjDJ2r61cIebq1t+AIxbgiXKvD4999Wk49GVaAcdJ/d49FYel+Pp3jjw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.11", - "@typescript-eslint/visitor-keys": "5.59.11" + "@typescript-eslint/types": "6.1.0", + "@typescript-eslint/visitor-keys": "6.1.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -951,25 +970,25 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.59.11", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz", - "integrity": "sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.1.0.tgz", + "integrity": "sha512-kFXBx6QWS1ZZ5Ni89TyT1X9Ag6RXVIVhqDs0vZE/jUeWlBv/ixq2diua6G7ece6+fXw3TvNRxP77/5mOMusx2w==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.59.11", - "@typescript-eslint/utils": "5.59.11", + "@typescript-eslint/typescript-estree": "6.1.0", + "@typescript-eslint/utils": "6.1.0", "debug": "^4.3.4", - "tsutils": "^3.21.0" + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "*" + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -978,12 +997,12 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.59.11", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.11.tgz", - "integrity": "sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.1.0.tgz", + "integrity": "sha512-+Gfd5NHCpDoHDOaU/yIF3WWRI2PcBRKKpP91ZcVbL0t5tQpqYWBs3z/GGhvU+EV1D0262g9XCnyqQh19prU0JQ==", "dev": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -991,21 +1010,21 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.59.11", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz", - "integrity": "sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.1.0.tgz", + "integrity": "sha512-nUKAPWOaP/tQjU1IQw9sOPCDavs/iU5iYLiY/6u7gxS7oKQoi4aUxXS1nrrVGTyBBaGesjkcwwHkbkiD5eBvcg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.11", - "@typescript-eslint/visitor-keys": "5.59.11", + "@typescript-eslint/types": "6.1.0", + "@typescript-eslint/visitor-keys": "6.1.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -1018,42 +1037,41 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.59.11", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.11.tgz", - "integrity": "sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.1.0.tgz", + "integrity": "sha512-wp652EogZlKmQoMS5hAvWqRKplXvkuOnNzZSE0PVvsKjpexd/XznRVHAtrfHFYmqaJz0DFkjlDsGYC9OXw+OhQ==", "dev": true, "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.59.11", - "@typescript-eslint/types": "5.59.11", - "@typescript-eslint/typescript-estree": "5.59.11", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.1.0", + "@typescript-eslint/types": "6.1.0", + "@typescript-eslint/typescript-estree": "6.1.0", + "semver": "^7.5.4" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^7.0.0 || ^8.0.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.59.11", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz", - "integrity": "sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.1.0.tgz", + "integrity": "sha512-yQeh+EXhquh119Eis4k0kYhj9vmFzNpbhM3LftWQVwqVjipCkwHBQOZutcYW+JVkjtTG9k8nrZU1UoNedPDd1A==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.11", - "eslint-visitor-keys": "^3.3.0" + "@typescript-eslint/types": "6.1.0", + "eslint-visitor-keys": "^3.4.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -1303,9 +1321,9 @@ } }, "node_modules/acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -1485,6 +1503,26 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz", + "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "get-intrinsic": "^1.2.1", + "is-array-buffer": "^3.0.2", + "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/async": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", @@ -1586,9 +1624,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.8.tgz", - "integrity": "sha512-j+7xYe+v+q2Id9qbBeCI8WX5NmZSRe8es1+0xntD/+gaWXznP8tFEkv5IgSaHf5dS1YwVMbX/4W6m937mj+wQw==", + "version": "4.21.9", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz", + "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==", "dev": true, "funding": [ { @@ -1606,8 +1644,8 @@ ], "peer": true, "dependencies": { - "caniuse-lite": "^1.0.30001502", - "electron-to-chromium": "^1.4.428", + "caniuse-lite": "^1.0.30001503", + "electron-to-chromium": "^1.4.431", "node-releases": "^2.0.12", "update-browserslist-db": "^1.0.11" }, @@ -1674,9 +1712,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001502", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001502.tgz", - "integrity": "sha512-AZ+9tFXw1sS0o0jcpJQIXvFTOB/xGiQ4OQ2t98QX3NDn2EZTSRBC801gxrsGgViuq2ak/NLkNgSNEPtCr5lfKg==", + "version": "1.0.30001517", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz", + "integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==", "dev": true, "funding": [ { @@ -1780,11 +1818,12 @@ "dev": true }, "node_modules/commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz", + "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==", + "dev": true, "engines": { - "node": ">=14" + "node": ">=16" } }, "node_modules/concat-map": { @@ -1854,15 +1893,15 @@ } }, "node_modules/css-loader": { - "version": "6.7.4", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.4.tgz", - "integrity": "sha512-0Y5uHtK5BswfaGJ+jrO+4pPg1msFBc0pwPIE1VqfpmVn6YbDfYfXMj8rfd7nt+4goAhJueO+H/I40VWJfcP1mQ==", + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz", + "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==", "dev": true, "dependencies": { "icss-utils": "^5.1.0", "postcss": "^8.4.21", "postcss-modules-extract-imports": "^3.0.0", - "postcss-modules-local-by-default": "^4.0.1", + "postcss-modules-local-by-default": "^4.0.3", "postcss-modules-scope": "^3.0.0", "postcss-modules-values": "^4.0.0", "postcss-value-parser": "^4.2.0", @@ -1987,21 +2026,21 @@ } }, "node_modules/editorconfig": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.2.tgz", - "integrity": "sha512-l8CnaNCz0dgCqJQ3hKqW2qtUavm1WLdJUvlxufaZ6JDkds3UFxgUKnKJz982yJPYko/78LkWAiwJadFnFtUBjw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-2.0.0.tgz", + "integrity": "sha512-s1NQ63WQ7RNXH6Efb2cwuyRlfpbtdZubvfNe4vCuoyGPewNPY7vah8JUSOFBiJ+jr99Qh8t0xKv0oITc1dclgw==", "dev": true, "dependencies": { "@one-ini/wasm": "0.1.1", - "commander": "^10.0.0", - "minimatch": "6.1.6", - "semver": "^7.3.8" + "commander": "^11.0.0", + "minimatch": "9.0.2", + "semver": "^7.5.3" }, "bin": { "editorconfig": "bin/editorconfig" }, "engines": { - "node": ">=14" + "node": ">=16" } }, "node_modules/ee-first": { @@ -2010,9 +2049,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.429", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.429.tgz", - "integrity": "sha512-COua8RvN548KwPFzKMrTjFbmDsQRgdi0zSAhmo70TwC1tfLOSqq8p09n+GkdF5buvzE/NEYn1dP3itbfhun9gg==", + "version": "1.4.467", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.467.tgz", + "integrity": "sha512-2qI70O+rR4poYeF2grcuS/bCps5KJh6y1jtZMDDEteyKJQrzLOEhFyXCLcHW6DTBjKjWkk26JhWoAi+Ux9A0fg==", "dev": true, "peer": true }, @@ -2038,9 +2077,9 @@ } }, "node_modules/envinfo": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", - "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz", + "integrity": "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==", "dev": true, "bin": { "envinfo": "dist/cli.js" @@ -2050,18 +2089,19 @@ } }, "node_modules/es-abstract": { - "version": "1.21.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", - "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", + "version": "1.22.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz", + "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==", "dev": true, "dependencies": { "array-buffer-byte-length": "^1.0.0", + "arraybuffer.prototype.slice": "^1.0.1", "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.0", + "get-intrinsic": "^1.2.1", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", @@ -2081,14 +2121,18 @@ "object-inspect": "^1.12.3", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", + "regexp.prototype.flags": "^1.5.0", + "safe-array-concat": "^1.0.0", "safe-regex-test": "^1.0.0", "string.prototype.trim": "^1.2.7", "string.prototype.trimend": "^1.0.6", "string.prototype.trimstart": "^1.0.6", + "typed-array-buffer": "^1.0.0", + "typed-array-byte-length": "^1.0.0", + "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.9" + "which-typed-array": "^1.1.10" }, "engines": { "node": ">= 0.4" @@ -2145,9 +2189,9 @@ } }, "node_modules/esbuild": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz", - "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==", + "version": "0.18.15", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.15.tgz", + "integrity": "sha512-3WOOLhrvuTGPRzQPU6waSDWrDTnQriia72McWcn6UCi43GhCHrXH4S59hKMeez+IITmdUuUyvbU9JIp+t3xlPQ==", "dev": true, "hasInstallScript": true, "bin": { @@ -2157,28 +2201,28 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.17.19", - "@esbuild/android-arm64": "0.17.19", - "@esbuild/android-x64": "0.17.19", - "@esbuild/darwin-arm64": "0.17.19", - "@esbuild/darwin-x64": "0.17.19", - "@esbuild/freebsd-arm64": "0.17.19", - "@esbuild/freebsd-x64": "0.17.19", - "@esbuild/linux-arm": "0.17.19", - "@esbuild/linux-arm64": "0.17.19", - "@esbuild/linux-ia32": "0.17.19", - "@esbuild/linux-loong64": "0.17.19", - "@esbuild/linux-mips64el": "0.17.19", - "@esbuild/linux-ppc64": "0.17.19", - "@esbuild/linux-riscv64": "0.17.19", - "@esbuild/linux-s390x": "0.17.19", - "@esbuild/linux-x64": "0.17.19", - "@esbuild/netbsd-x64": "0.17.19", - "@esbuild/openbsd-x64": "0.17.19", - "@esbuild/sunos-x64": "0.17.19", - "@esbuild/win32-arm64": "0.17.19", - "@esbuild/win32-ia32": "0.17.19", - "@esbuild/win32-x64": "0.17.19" + "@esbuild/android-arm": "0.18.15", + "@esbuild/android-arm64": "0.18.15", + "@esbuild/android-x64": "0.18.15", + "@esbuild/darwin-arm64": "0.18.15", + "@esbuild/darwin-x64": "0.18.15", + "@esbuild/freebsd-arm64": "0.18.15", + "@esbuild/freebsd-x64": "0.18.15", + "@esbuild/linux-arm": "0.18.15", + "@esbuild/linux-arm64": "0.18.15", + "@esbuild/linux-ia32": "0.18.15", + "@esbuild/linux-loong64": "0.18.15", + "@esbuild/linux-mips64el": "0.18.15", + "@esbuild/linux-ppc64": "0.18.15", + "@esbuild/linux-riscv64": "0.18.15", + "@esbuild/linux-s390x": "0.18.15", + "@esbuild/linux-x64": "0.18.15", + "@esbuild/netbsd-x64": "0.18.15", + "@esbuild/openbsd-x64": "0.18.15", + "@esbuild/sunos-x64": "0.18.15", + "@esbuild/win32-arm64": "0.18.15", + "@esbuild/win32-ia32": "0.18.15", + "@esbuild/win32-x64": "0.18.15" } }, "node_modules/escalade": { @@ -2209,15 +2253,15 @@ } }, "node_modules/eslint": { - "version": "8.42.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.42.0.tgz", - "integrity": "sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==", + "version": "8.45.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz", + "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.3", - "@eslint/js": "8.42.0", + "@eslint/eslintrc": "^2.1.0", + "@eslint/js": "8.44.0", "@humanwhocodes/config-array": "^0.11.10", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -2229,7 +2273,7 @@ "escape-string-regexp": "^4.0.0", "eslint-scope": "^7.2.0", "eslint-visitor-keys": "^3.4.1", - "espree": "^9.5.2", + "espree": "^9.6.0", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -2239,7 +2283,6 @@ "globals": "^13.19.0", "graphemer": "^1.4.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", @@ -2249,9 +2292,8 @@ "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" }, "bin": { @@ -2339,50 +2381,24 @@ "ms": "^2.1.1" } }, - "node_modules/eslint-plugin-es": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", - "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "node_modules/eslint-plugin-es-x": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.1.0.tgz", + "integrity": "sha512-AhiaF31syh4CCQ+C5ccJA0VG6+kJK8+5mXKKE7Qs1xcPRg02CDPOj3mWlQxuWS/AYtg7kxrDNgW9YW3vc0Q+Mw==", "dev": true, "peer": true, "dependencies": { - "eslint-utils": "^2.0.0", - "regexpp": "^3.0.0" + "@eslint-community/eslint-utils": "^4.1.2", + "@eslint-community/regexpp": "^4.5.0" }, "engines": { - "node": ">=8.10.0" + "node": "^14.18.0 || >=16.0.0" }, "funding": { - "url": "https://github.com/sponsors/mysticatea" + "url": "https://github.com/sponsors/ota-meshi" }, "peerDependencies": { - "eslint": ">=4.19.1" - } - }, - "node_modules/eslint-plugin-es/node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", - "dev": true, - "peer": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "peer": true, - "engines": { - "node": ">=4" + "eslint": ">=8" } }, "node_modules/eslint-plugin-header": { @@ -2467,32 +2483,32 @@ } }, "node_modules/eslint-plugin-import/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/eslint-plugin-n": { - "version": "15.7.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", - "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.0.1.tgz", + "integrity": "sha512-CDmHegJN0OF3L5cz5tATH84RPQm9kG+Yx39wIqIwPR2C0uhBGMWfbbOtetR83PQjjidA5aXMu+LEFw1jaSwvTA==", "dev": true, "peer": true, "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", "builtins": "^5.0.1", - "eslint-plugin-es": "^4.1.0", - "eslint-utils": "^3.0.0", - "ignore": "^5.1.1", - "is-core-module": "^2.11.0", + "eslint-plugin-es-x": "^7.1.0", + "ignore": "^5.2.4", + "is-core-module": "^2.12.1", "minimatch": "^3.1.2", - "resolve": "^1.22.1", - "semver": "^7.3.8" + "resolve": "^1.22.2", + "semver": "^7.5.3" }, "engines": { - "node": ">=12.22.0" + "node": ">=16.0.0" }, "funding": { "url": "https://github.com/sponsors/mysticatea" @@ -2538,9 +2554,9 @@ } }, "node_modules/eslint-plugin-unused-imports": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz", - "integrity": "sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.0.0.tgz", + "integrity": "sha512-sduiswLJfZHeeBJ+MQaG+xYzSWdRXoSw61DpU13mzWumCkR0ufD0HmO4kdNokjrkluMHpj/7PJeN35pgbhW3kw==", "dev": true, "dependencies": { "eslint-rule-composer": "^0.3.0" @@ -2549,7 +2565,7 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "peerDependencies": { - "@typescript-eslint/eslint-plugin": "^5.0.0", + "@typescript-eslint/eslint-plugin": "^6.0.0", "eslint": "^8.0.0" }, "peerDependenciesMeta": { @@ -2568,45 +2584,19 @@ } }, "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.1.tgz", + "integrity": "sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "peer": true, - "dependencies": { - "eslint-visitor-keys": "^2.0.0" + "estraverse": "^5.2.0" }, "engines": { - "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { - "url": "https://github.com/sponsors/mysticatea" - }, - "peerDependencies": { - "eslint": ">=5" - } - }, - "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "peer": true, - "engines": { - "node": ">=10" + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint-visitor-keys": { @@ -2631,31 +2621,6 @@ "concat-map": "0.0.1" } }, - "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", - "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/eslint/node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -2669,12 +2634,12 @@ } }, "node_modules/espree": { - "version": "9.5.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz", - "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "dependencies": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.4.1" }, @@ -2697,15 +2662,6 @@ "node": ">=0.10" } }, - "node_modules/esquery/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/esrecurse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", @@ -2718,7 +2674,7 @@ "node": ">=4.0" } }, - "node_modules/esrecurse/node_modules/estraverse": { + "node_modules/estraverse": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", @@ -2727,15 +2683,6 @@ "node": ">=4.0" } }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -2842,9 +2789,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz", + "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -3253,12 +3200,6 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, - "node_modules/grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", - "dev": true - }, "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", @@ -3759,16 +3700,12 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "which-typed-array": "^1.1.11" }, "engines": { "node": ">= 0.4" @@ -3789,6 +3726,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -3898,9 +3841,9 @@ } }, "node_modules/langium": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/langium/-/langium-1.2.0.tgz", - "integrity": "sha512-jFSptpFljYo9ZTHrq/GZflMUXiKo5KBNtsaIJtnIzDm9zC2FxsxejEFAtNL09262RVQt+zFeF/2iLAShFTGitw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/langium/-/langium-1.2.1.tgz", + "integrity": "sha512-tpUa1r47pxuUBNqX5X4GAB08qhWpVwWhxjwOV+948skElHO9OV6emngfY3jOYzchJS4H6UZwyKalsOb8GGPsnQ==", "dependencies": { "chevrotain": "~10.4.2", "chevrotain-allstar": "~0.1.4", @@ -3940,6 +3883,14 @@ "concat-map": "0.0.1" } }, + "node_modules/langium-statemachine-dsl/node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "engines": { + "node": ">=14" + } + }, "node_modules/langium-statemachine-dsl/node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -4188,15 +4139,15 @@ } }, "node_modules/minimatch": { - "version": "6.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-6.1.6.tgz", - "integrity": "sha512-6bR3UIeh/DF8+p6A9Spyuy67ShOq42rOkHWi7eUe3Ua99Zo5lZfGC6lJJWkeoK4k9jQFT3Pl7czhTXimG2XheA==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.2.tgz", + "integrity": "sha512-PZOT9g5v2ojiTL7r1xF6plNHLtOeTpSlDI007As2NlA2aYBMfVom17yqa6QzhmDP8QOhn7LjHTg7DFCVSSa6yg==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -4224,9 +4175,9 @@ } }, "node_modules/monaco-editor": { - "version": "0.39.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.39.0.tgz", - "integrity": "sha512-zhbZ2Nx93tLR8aJmL2zI1mhJpsl87HMebNBM6R8z4pLfs8pj604pIVIVwyF1TivcfNtIPpMXL+nb3DsBmE/x6Q==" + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.40.0.tgz", + "integrity": "sha512-1wymccLEuFSMBvCk/jT1YDW/GuxMLYwnFwF9CDyYCxoTw2Pt379J3FUhwy9c43j51JdcxVPjwk0jm0EVDsBS2g==" }, "node_modules/monaco-editor-workers": { "version": "0.39.1", @@ -4239,6 +4190,11 @@ "monaco-editor": "~0.39.0" } }, + "node_modules/monaco-editor-workers/node_modules/monaco-editor": { + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.39.0.tgz", + "integrity": "sha512-zhbZ2Nx93tLR8aJmL2zI1mhJpsl87HMebNBM6R8z4pLfs8pj604pIVIVwyF1TivcfNtIPpMXL+nb3DsBmE/x6Q==" + }, "node_modules/monaco-languageclient": { "resolved": "packages/client", "link": true @@ -4295,9 +4251,9 @@ "peer": true }, "node_modules/node-releases": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz", - "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", "dev": true, "peer": true }, @@ -4394,17 +4350,17 @@ } }, "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" }, "engines": { "node": ">= 0.8.0" @@ -4634,9 +4590,9 @@ } }, "node_modules/postcss": { - "version": "8.4.24", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz", - "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==", + "version": "8.4.27", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz", + "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==", "dev": true, "funding": [ { @@ -4892,19 +4848,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/regexpp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", - "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", - "dev": true, - "peer": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, "node_modules/request-light": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.7.0.tgz", @@ -4989,9 +4932,9 @@ } }, "node_modules/rollup": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.25.1.tgz", - "integrity": "sha512-tywOR+rwIt5m2ZAWSe5AIJcTat8vGlnPFAv15ycCrw33t6iFsXZ6mzHVFh2psSjxQPmI+xgzMZZizUAukBI4aQ==", + "version": "3.26.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.26.3.tgz", + "integrity": "sha512-7Tin0C8l86TkpcMtXvQu6saWH93nhG3dGQ1/+l5V2TDMceTxO7kDiK6GzbfLWNNxqJXm591PcEZUozZm51ogwQ==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -5027,6 +4970,24 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/safe-array-concat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz", + "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.0", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -5074,9 +5035,9 @@ } }, "node_modules/schema-utils": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.2.0.tgz", - "integrity": "sha512-0zTyLGyDJYd/MBxG1AhJkKa6fpEBds4OQO2ut0w7OYG+ZGhGea09lijvzsqegYSik88zc7cUtIlnnO+/BvD6gQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "peer": true, "dependencies": { @@ -5099,9 +5060,9 @@ "dev": true }, "node_modules/semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -5468,9 +5429,9 @@ } }, "node_modules/terser": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.0.tgz", - "integrity": "sha512-pdL757Ig5a0I+owA42l6tIuEycRuM7FPY4n62h44mRLRfnOxJkkOHd6i89dOpwZlpF6JXBwaAHF6yWzFrt+QyA==", + "version": "5.19.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz", + "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==", "dev": true, "peer": true, "dependencies": { @@ -5582,10 +5543,27 @@ "node": ">=0.6" } }, + "node_modules/toposort": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz", + "integrity": "sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==" + }, + "node_modules/ts-api-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.1.tgz", + "integrity": "sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==", + "dev": true, + "engines": { + "node": ">=16.13.0" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, "node_modules/ts-loader": { - "version": "9.4.3", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.3.tgz", - "integrity": "sha512-n3hBnm6ozJYzwiwt5YRiJZkzktftRpMiBApHaJPoWLA+qetQBAXkHqCLM6nwSdRDimqVtA5ocIkcTRLMTt7yzA==", + "version": "9.4.4", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.4.tgz", + "integrity": "sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==", "dev": true, "dependencies": { "chalk": "^4.1.0", @@ -5657,30 +5635,9 @@ } }, "node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true - }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, - "node_modules/tsutils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", + "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==", "dev": true }, "node_modules/type-check": { @@ -5719,6 +5676,57 @@ "node": ">= 0.6" } }, + "node_modules/typed-array-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", + "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/typed-array-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", @@ -5734,9 +5742,9 @@ } }, "node_modules/typescript": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz", - "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", + "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -5856,14 +5864,14 @@ } }, "node_modules/vite": { - "version": "4.3.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz", - "integrity": "sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==", + "version": "4.4.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.6.tgz", + "integrity": "sha512-EY6Mm8vJ++S3D4tNAckaZfw3JwG3wa794Vt70M6cNJ6NxT87yhq7EC8Rcap3ahyHdo8AhCmV9PTk+vG1HiYn1A==", "dev": true, "dependencies": { - "esbuild": "^0.17.5", - "postcss": "^8.4.23", - "rollup": "^3.21.0" + "esbuild": "^0.18.10", + "postcss": "^8.4.26", + "rollup": "^3.25.2" }, "bin": { "vite": "bin/vite.js" @@ -5871,12 +5879,16 @@ "engines": { "node": "^14.18.0 || >=16.0.0" }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, "optionalDependencies": { "fsevents": "~2.3.2" }, "peerDependencies": { "@types/node": ">= 14", "less": "*", + "lightningcss": "^1.21.0", "sass": "*", "stylus": "*", "sugarss": "*", @@ -5889,6 +5901,9 @@ "less": { "optional": true }, + "lightningcss": { + "optional": true + }, "sass": { "optional": true }, @@ -5905,14 +5920,17 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.79.3", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.79.3.tgz", - "integrity": "sha512-6cKtLozmKCRXFJH2hUaz4hMK/PsSCmYD/E+bgjIaltKMZYIjHclJyeLRmCdq8ogQaRjOzcR8yp2JMqWnP72XEw==", + "version": "1.80.0-next.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.80.0-next.3.tgz", + "integrity": "sha512-V2XpqlEhnnbw6XjIu+NMBj+EazPVnqzGmMS1NjQMid/ZqMciQPfZv1oyIaj+AN6qUGDyPQ0Dg2R4OWV/BCeXzw==", + "dependencies": { + "toposort": "^2.0.2" + }, "bin": { "monaco-treemending": "monaco-treemending.js" }, "peerDependencies": { - "monaco-editor": "0.39.0", + "monaco-editor": "0.40.0", "vscode-oniguruma": "^1.7.0", "vscode-textmate": "^9.0.0", "xterm": "5.2.1", @@ -6035,9 +6053,9 @@ } }, "node_modules/webpack": { - "version": "5.86.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.86.0.tgz", - "integrity": "sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==", + "version": "5.88.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", + "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", "dev": true, "peer": true, "dependencies": { @@ -6050,7 +6068,7 @@ "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.14.1", + "enhanced-resolve": "^5.15.0", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -6060,7 +6078,7 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.2", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.3.7", "watchpack": "^2.4.0", @@ -6083,15 +6101,15 @@ } }, "node_modules/webpack-cli": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.0.2.tgz", - "integrity": "sha512-4y3W5Dawri5+8dXm3+diW6Mn1Ya+Dei6eEVAdIduAmYNLzv1koKVAqsfgrrc9P2mhrYHQphx5htnGkcNwtubyQ==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz", + "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==", "dev": true, "dependencies": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^2.0.1", - "@webpack-cli/info": "^2.0.1", - "@webpack-cli/serve": "^2.0.2", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", "colorette": "^2.0.14", "commander": "^10.0.1", "cross-spawn": "^7.0.3", @@ -6127,6 +6145,15 @@ } } }, + "node_modules/webpack-cli/node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "dev": true, + "engines": { + "node": ">=14" + } + }, "node_modules/webpack-cli/node_modules/interpret": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", @@ -6171,6 +6198,30 @@ "node": ">=10.13.0" } }, + "node_modules/webpack/node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "peer": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/webpack/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "peer": true, + "engines": { + "node": ">=4.0" + } + }, "node_modules/whatwg-encoding": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", @@ -6227,17 +6278,16 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", + "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", "dev": true, "dependencies": { "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -6252,15 +6302,6 @@ "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", "dev": true }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -6385,12 +6426,12 @@ }, "packages/client": { "name": "monaco-languageclient", - "version": "6.2.0", + "version": "6.3.0-next.0", "hasInstallScript": true, "license": "MIT", "dependencies": { - "monaco-editor": "~0.39.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.79.3", + "monaco-editor": "~0.40.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.3", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, @@ -6399,8 +6440,8 @@ "npm": ">=9.0.0" }, "peerDependencies": { - "monaco-editor": "~0.39.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.79.3" + "monaco-editor": "~0.40.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.3" }, "peerDependenciesMeta": { "monaco-editor": { @@ -6416,15 +6457,15 @@ "version": "1.0.0", "dependencies": { "express": "~4.18.2", - "langium": "~1.2.0", + "langium": "~1.2.1", "langium-statemachine-dsl": "~1.2.0", "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.2.0", + "monaco-languageclient": "6.3.0-next.0", "normalize-url": "~8.0.0", "react": "~18.2.0", "react-dom": "~18.2.0", "request-light": "~0.7.0", - "vscode-json-languageservice": "~5.3.4", + "vscode-json-languageservice": "~5.3.5", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0", "vscode-languageserver": "~8.1.0", @@ -6434,9 +6475,9 @@ }, "devDependencies": { "@types/express": "~4.17.17", - "@types/react": "~18.2.4", - "@types/react-dom": "~18.2.3", - "@types/ws": "~8.5.4", + "@types/react": "~18.2.15", + "@types/react-dom": "~18.2.7", + "@types/ws": "~8.5.5", "ts-node": "~10.9.1", "vscode-languageserver-types": "~3.17.3" } @@ -6446,7 +6487,7 @@ "version": "0.0.0", "dependencies": { "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.2.0", + "monaco-languageclient": "6.3.0-next.0", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" }, @@ -6459,17 +6500,17 @@ "version": "0.0.0", "dependencies": { "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.2.0", + "monaco-languageclient": "6.3.0-next.0", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" }, "devDependencies": { - "css-loader": "~6.7.3", + "css-loader": "~6.8.1", "http-server": "~14.1.1", "source-map-loader": "~4.0.1", - "style-loader": "~3.3.2", - "ts-loader": "~9.4.2", - "webpack-cli": "~5.0.2" + "style-loader": "~3.3.3", + "ts-loader": "~9.4.4", + "webpack-cli": "~5.1.4" } }, "packages/vscode-ws-jsonrpc": { diff --git a/package.json b/package.json index 9a328fd4..f6a0aa1b 100644 --- a/package.json +++ b/package.json @@ -2,25 +2,25 @@ "private": true, "type": "module", "devDependencies": { - "@types/node": "~18.16.18", - "@types/vscode": "~1.79.1", - "@typescript-eslint/eslint-plugin": "~5.59.11", - "@typescript-eslint/parser": "~5.59.11", - "editorconfig": "~1.0.2", - "eslint": "~8.42.0", + "@types/node": "~18.16.19", + "@types/vscode": "~1.80.0", + "@typescript-eslint/eslint-plugin": "~6.1.0", + "@typescript-eslint/parser": "~6.1.0", + "editorconfig": "~2.0.0", + "eslint": "~8.45.0", "eslint-config-standard": "~17.1.0", "eslint-plugin-header": "~3.1.1", "eslint-plugin-import": "~2.27.5", "eslint-plugin-promise": "~6.1.1", - "eslint-plugin-unused-imports": "~2.0.0", + "eslint-plugin-unused-imports": "~3.0.0", "path-browserify": "~1.0.1", "shx": "~0.3.4", - "tslib": "~2.5.3", - "typescript": "~5.1.3", - "vite": "~4.3.9" + "tslib": "~2.6.0", + "typescript": "~5.1.6", + "vite": "~4.4.6" }, "volta": { - "node": "18.16.0", + "node": "18.17.0", "npm": "9.6.7" }, "scripts": { diff --git a/packages/client/package.json b/packages/client/package.json index 10b76c62..f20b316b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient", - "version": "6.2.0", + "version": "6.3.0-next.0", "description": "Monaco Language client implementation", "author": { "name": "TypeFox GmbH", @@ -37,7 +37,7 @@ "npm": ">=9.0.0" }, "volta": { - "node": "18.16.0", + "node": "18.17.0", "npm": "9.6.7" }, "files": [ @@ -48,14 +48,14 @@ "License.txt" ], "dependencies": { - "monaco-editor": "~0.39.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.79.3", + "monaco-editor": "~0.40.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.3", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, "peerDependencies": { - "monaco-editor": "~0.39.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.79.3" + "monaco-editor": "~0.40.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.3" }, "peerDependenciesMeta": { "monaco-editor": { diff --git a/packages/examples/main/package.json b/packages/examples/main/package.json index b5d2ad65..763a2c75 100644 --- a/packages/examples/main/package.json +++ b/packages/examples/main/package.json @@ -20,15 +20,15 @@ }, "dependencies": { "express": "~4.18.2", - "langium": "~1.2.0", + "langium": "~1.2.1", "langium-statemachine-dsl": "~1.2.0", "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.2.0", + "monaco-languageclient": "6.3.0-next.0", "normalize-url": "~8.0.0", "react": "~18.2.0", "react-dom": "~18.2.0", "request-light": "~0.7.0", - "vscode-json-languageservice": "~5.3.4", + "vscode-json-languageservice": "~5.3.5", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0", "vscode-languageserver": "~8.1.0", @@ -37,15 +37,15 @@ "ws": "~8.13.0" }, "devDependencies": { - "@types/ws": "~8.5.4", + "@types/ws": "~8.5.5", "@types/express": "~4.17.17", - "@types/react": "~18.2.4", - "@types/react-dom": "~18.2.3", + "@types/react": "~18.2.15", + "@types/react-dom": "~18.2.7", "ts-node": "~10.9.1", "vscode-languageserver-types": "~3.17.3" }, "volta": { - "node": "18.16.0", + "node": "18.17.0", "npm": "9.6.7" }, "scripts": { diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json index 970adb52..d173d201 100644 --- a/packages/verify/pnpm/package.json +++ b/packages/verify/pnpm/package.json @@ -3,9 +3,9 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-languageclient": "6.2.0", - "monaco-editor": "~0.39.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.79.2" + "monaco-languageclient": "6.3.0-next.0", + "monaco-editor": "~0.40.0", + "vscode": "npm:@codingame/monaco-vscode-api@~1.80.0-next.3" }, "devDependencies": { "shx": "~0.3.4" @@ -15,7 +15,7 @@ "test:treemending": "monaco-treemending" }, "volta": { - "node": "18.16.0", + "node": "18.17.0", "npm": "9.6.7" } } \ No newline at end of file diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json index 2c3abe1d..02c4f230 100644 --- a/packages/verify/vite/package.json +++ b/packages/verify/vite/package.json @@ -5,7 +5,7 @@ "type": "module", "dependencies": { "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.2.0", + "monaco-languageclient": "6.3.0-next.0", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" }, @@ -13,7 +13,7 @@ "http-server": "~14.1.1" }, "volta": { - "node": "18.16.0", + "node": "18.17.0", "npm": "9.6.7" }, "scripts": { diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json index 3b2a92c2..51339bc6 100644 --- a/packages/verify/webpack/package.json +++ b/packages/verify/webpack/package.json @@ -5,20 +5,20 @@ "type": "module", "dependencies": { "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.2.0", + "monaco-languageclient": "6.3.0-next.0", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" }, "devDependencies": { - "css-loader": "~6.7.3", + "css-loader": "~6.8.1", "source-map-loader": "~4.0.1", - "style-loader": "~3.3.2", - "ts-loader": "~9.4.2", - "webpack-cli": "~5.0.2", + "style-loader": "~3.3.3", + "ts-loader": "~9.4.4", + "webpack-cli": "~5.1.4", "http-server": "~14.1.1" }, "volta": { - "node": "18.16.0", + "node": "18.17.0", "npm": "9.6.7" }, "scripts": { diff --git a/packages/verify/yarn/package.json b/packages/verify/yarn/package.json index 3249cb3c..267261b5 100644 --- a/packages/verify/yarn/package.json +++ b/packages/verify/yarn/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-languageclient": "6.2.0" + "monaco-languageclient": "6.3.0-next.0" }, "devDependencies": { "shx": "~0.3.4" @@ -13,7 +13,7 @@ "test:treemending": "monaco-treemending" }, "volta": { - "node": "18.16.0", + "node": "18.17.0", "yarn": "1.22.19" } } \ No newline at end of file diff --git a/packages/vscode-ws-jsonrpc/package.json b/packages/vscode-ws-jsonrpc/package.json index 73a4a8fc..013eba6a 100644 --- a/packages/vscode-ws-jsonrpc/package.json +++ b/packages/vscode-ws-jsonrpc/package.json @@ -51,7 +51,7 @@ "npm": ">=8.0.0" }, "volta": { - "node": "18.16.0", + "node": "18.17.0", "npm": "9.6.7" }, "files": [ From b7548e97728d5d0f40e091b67ceb26a406b9c85f Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Wed, 26 Jul 2023 21:32:35 +0200 Subject: [PATCH 2/6] Fix build and examples --- package-lock.json | 258 +++++++++--------- packages/client/package.json | 4 +- .../client/src/monaco-vscode-api-services.ts | 47 +++- packages/examples/main/src/common.ts | 11 +- .../main/src/langium/statemachineClient.ts | 37 ++- packages/examples/main/src/react/app.tsx | 5 +- packages/verify/pnpm/package.json | 2 +- vite.config.ts | 23 +- 8 files changed, 222 insertions(+), 165 deletions(-) diff --git a/package-lock.json b/package-lock.json index 894b3384..a042f6c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,9 +90,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.15.tgz", - "integrity": "sha512-wlkQBWb79/jeEEoRmrxt/yhn5T1lU236OCNpnfRzaCJHZ/5gf82uYx1qmADTBWE0AR/v7FiozE1auk2riyQd3w==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.17.tgz", + "integrity": "sha512-wHsmJG/dnL3OkpAcwbgoBTTMHVi4Uyou3F5mf58ZtmUyIKfcdA7TROav/6tCzET4A3QW2Q2FC+eFneMU+iyOxg==", "cpu": [ "arm" ], @@ -106,9 +106,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.15.tgz", - "integrity": "sha512-NI/gnWcMl2kXt1HJKOn2H69SYn4YNheKo6NZt1hyfKWdMbaGadxjZIkcj4Gjk/WPxnbFXs9/3HjGHaknCqjrww==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.17.tgz", + "integrity": "sha512-9np+YYdNDed5+Jgr1TdWBsozZ85U1Oa3xW0c7TWqH0y2aGghXtZsuT8nYRbzOMcl0bXZXjOGbksoTtVOlWrRZg==", "cpu": [ "arm64" ], @@ -122,9 +122,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.15.tgz", - "integrity": "sha512-FM9NQamSaEm/IZIhegF76aiLnng1kEsZl2eve/emxDeReVfRuRNmvT28l6hoFD9TsCxpK+i4v8LPpEj74T7yjA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.17.tgz", + "integrity": "sha512-O+FeWB/+xya0aLg23hHEM2E3hbfwZzjqumKMSIqcHbNvDa+dza2D0yLuymRBQQnC34CWrsJUXyH2MG5VnLd6uw==", "cpu": [ "x64" ], @@ -138,9 +138,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.15.tgz", - "integrity": "sha512-XmrFwEOYauKte9QjS6hz60FpOCnw4zaPAb7XV7O4lx1r39XjJhTN7ZpXqJh4sN6q60zbP6QwAVVA8N/wUyBH/w==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.17.tgz", + "integrity": "sha512-M9uJ9VSB1oli2BE/dJs3zVr9kcCBBsE883prage1NWz6pBS++1oNn/7soPNS3+1DGj0FrkSvnED4Bmlu1VAE9g==", "cpu": [ "arm64" ], @@ -154,9 +154,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.15.tgz", - "integrity": "sha512-bMqBmpw1e//7Fh5GLetSZaeo9zSC4/CMtrVFdj+bqKPGJuKyfNJ5Nf2m3LknKZTS+Q4oyPiON+v3eaJ59sLB5A==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.17.tgz", + "integrity": "sha512-XDre+J5YeIJDMfp3n0279DFNrGCXlxOuGsWIkRb1NThMZ0BsrWXoTg23Jer7fEXQ9Ye5QjrvXpxnhzl3bHtk0g==", "cpu": [ "x64" ], @@ -170,9 +170,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.15.tgz", - "integrity": "sha512-LoTK5N3bOmNI9zVLCeTgnk5Rk0WdUTrr9dyDAQGVMrNTh9EAPuNwSTCgaKOKiDpverOa0htPcO9NwslSE5xuLA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.17.tgz", + "integrity": "sha512-cjTzGa3QlNfERa0+ptykyxs5A6FEUQQF0MuilYXYBGdBxD3vxJcKnzDlhDCa1VAJCmAxed6mYhA2KaJIbtiNuQ==", "cpu": [ "arm64" ], @@ -186,9 +186,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.15.tgz", - "integrity": "sha512-62jX5n30VzgrjAjOk5orYeHFq6sqjvsIj1QesXvn5OZtdt5Gdj0vUNJy9NIpjfdNdqr76jjtzBJKf+h2uzYuTQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.17.tgz", + "integrity": "sha512-sOxEvR8d7V7Kw8QqzxWc7bFfnWnGdaFBut1dRUYtu+EIRXefBc/eIsiUiShnW0hM3FmQ5Zf27suDuHsKgZ5QrA==", "cpu": [ "x64" ], @@ -202,9 +202,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.15.tgz", - "integrity": "sha512-dT4URUv6ir45ZkBqhwZwyFV6cH61k8MttIwhThp2BGiVtagYvCToF+Bggyx2VI57RG4Fbt21f9TmXaYx0DeUJg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.17.tgz", + "integrity": "sha512-2d3Lw6wkwgSLC2fIvXKoMNGVaeY8qdN0IC3rfuVxJp89CRfA3e3VqWifGDfuakPmp90+ZirmTfye1n4ncjv2lg==", "cpu": [ "arm" ], @@ -218,9 +218,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.15.tgz", - "integrity": "sha512-BWncQeuWDgYv0jTNzJjaNgleduV4tMbQjmk/zpPh/lUdMcNEAxy+jvneDJ6RJkrqloG7tB9S9rCrtfk/kuplsQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.17.tgz", + "integrity": "sha512-c9w3tE7qA3CYWjT+M3BMbwMt+0JYOp3vCMKgVBrCl1nwjAlOMYzEo+gG7QaZ9AtqZFj5MbUc885wuBBmu6aADQ==", "cpu": [ "arm64" ], @@ -234,9 +234,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.15.tgz", - "integrity": "sha512-JPXORvgHRHITqfms1dWT/GbEY89u848dC08o0yK3fNskhp0t2TuNUnsrrSgOdH28ceb1hJuwyr8R/1RnyPwocw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.17.tgz", + "integrity": "sha512-1DS9F966pn5pPnqXYz16dQqWIB0dmDfAQZd6jSSpiT9eX1NzKh07J6VKR3AoXXXEk6CqZMojiVDSZi1SlmKVdg==", "cpu": [ "ia32" ], @@ -250,9 +250,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.15.tgz", - "integrity": "sha512-kArPI0DopjJCEplsVj/H+2Qgzz7vdFSacHNsgoAKpPS6W/Ndh8Oe24HRDQ5QCu4jHgN6XOtfFfLpRx3TXv/mEg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.17.tgz", + "integrity": "sha512-EvLsxCk6ZF0fpCB6w6eOI2Fc8KW5N6sHlIovNe8uOFObL2O+Mr0bflPHyHwLT6rwMg9r77WOAWb2FqCQrVnwFg==", "cpu": [ "loong64" ], @@ -266,9 +266,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.15.tgz", - "integrity": "sha512-b/tmngUfO02E00c1XnNTw/0DmloKjb6XQeqxaYuzGwHe0fHVgx5/D6CWi+XH1DvkszjBUkK9BX7n1ARTOst59w==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.17.tgz", + "integrity": "sha512-e0bIdHA5p6l+lwqTE36NAW5hHtw2tNRmHlGBygZC14QObsA3bD4C6sXLJjvnDIjSKhW1/0S3eDy+QmX/uZWEYQ==", "cpu": [ "mips64el" ], @@ -282,9 +282,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.15.tgz", - "integrity": "sha512-KXPY69MWw79QJkyvUYb2ex/OgnN/8N/Aw5UDPlgoRtoEfcBqfeLodPr42UojV3NdkoO4u10NXQdamWm1YEzSKw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.17.tgz", + "integrity": "sha512-BAAilJ0M5O2uMxHYGjFKn4nJKF6fNCdP1E0o5t5fvMYYzeIqy2JdAP88Az5LHt9qBoUa4tDaRpfWt21ep5/WqQ==", "cpu": [ "ppc64" ], @@ -298,9 +298,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.15.tgz", - "integrity": "sha512-komK3NEAeeGRnvFEjX1SfVg6EmkfIi5aKzevdvJqMydYr9N+pRQK0PGJXk+bhoPZwOUgLO4l99FZmLGk/L1jWg==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.17.tgz", + "integrity": "sha512-Wh/HW2MPnC3b8BqRSIme/9Zhab36PPH+3zam5pqGRH4pE+4xTrVLx2+XdGp6fVS3L2x+DrsIcsbMleex8fbE6g==", "cpu": [ "riscv64" ], @@ -314,9 +314,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.15.tgz", - "integrity": "sha512-632T5Ts6gQ2WiMLWRRyeflPAm44u2E/s/TJvn+BP6M5mnHSk93cieaypj3VSMYO2ePTCRqAFXtuYi1yv8uZJNA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.17.tgz", + "integrity": "sha512-j/34jAl3ul3PNcK3pfI0NSlBANduT2UO5kZ7FCaK33XFv3chDhICLY8wJJWIhiQ+YNdQ9dxqQctRg2bvrMlYgg==", "cpu": [ "s390x" ], @@ -330,9 +330,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.15.tgz", - "integrity": "sha512-MsHtX0NgvRHsoOtYkuxyk4Vkmvk3PLRWfA4okK7c+6dT0Fu4SUqXAr9y4Q3d8vUf1VWWb6YutpL4XNe400iQ1g==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.17.tgz", + "integrity": "sha512-QM50vJ/y+8I60qEmFxMoxIx4de03pGo2HwxdBeFd4nMh364X6TIBZ6VQ5UQmPbQWUVWHWws5MmJXlHAXvJEmpQ==", "cpu": [ "x64" ], @@ -346,9 +346,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.15.tgz", - "integrity": "sha512-djST6s+jQiwxMIVQ5rlt24JFIAr4uwUnzceuFL7BQT4CbrRtqBPueS4GjXSiIpmwVri1Icj/9pFRJ7/aScvT+A==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.17.tgz", + "integrity": "sha512-/jGlhWR7Sj9JPZHzXyyMZ1RFMkNPjC6QIAan0sDOtIo2TYk3tZn5UDrkE0XgsTQCxWTTOcMPf9p6Rh2hXtl5TQ==", "cpu": [ "x64" ], @@ -362,9 +362,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.15.tgz", - "integrity": "sha512-naeRhUIvhsgeounjkF5mvrNAVMGAm6EJWiabskeE5yOeBbLp7T89tAEw0j5Jm/CZAwyLe3c67zyCWH6fsBLCpw==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.17.tgz", + "integrity": "sha512-rSEeYaGgyGGf4qZM2NonMhMOP/5EHp4u9ehFiBrg7stH6BYEEjlkVREuDEcQ0LfIl53OXLxNbfuIj7mr5m29TA==", "cpu": [ "x64" ], @@ -378,9 +378,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.15.tgz", - "integrity": "sha512-qkT2+WxyKbNIKV1AEhI8QiSIgTHMcRctzSaa/I3kVgMS5dl3fOeoqkb7pW76KwxHoriImhx7Mg3TwN/auMDsyQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.17.tgz", + "integrity": "sha512-Y7ZBbkLqlSgn4+zot4KUNYst0bFoO68tRgI6mY2FIM+b7ZbyNVtNbDP5y8qlu4/knZZ73fgJDlXID+ohY5zt5g==", "cpu": [ "x64" ], @@ -394,9 +394,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.15.tgz", - "integrity": "sha512-HC4/feP+pB2Vb+cMPUjAnFyERs+HJN7E6KaeBlFdBv799MhD+aPJlfi/yk36SED58J9TPwI8MAcVpJgej4ud0A==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.17.tgz", + "integrity": "sha512-bwPmTJsEQcbZk26oYpc4c/8PvTY3J5/QK8jM19DVlEsAB41M39aWovWoHtNm78sd6ip6prilxeHosPADXtEJFw==", "cpu": [ "arm64" ], @@ -410,9 +410,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.15.tgz", - "integrity": "sha512-ovjwoRXI+gf52EVF60u9sSDj7myPixPxqzD5CmkEUmvs+W9Xd0iqISVBQn8xcx4ciIaIVlWCuTbYDOXOnOL44Q==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.17.tgz", + "integrity": "sha512-H/XaPtPKli2MhW+3CQueo6Ni3Avggi6hP/YvgkEe1aSaxw+AeO8MFjq8DlgfTd9Iz4Yih3QCZI6YLMoyccnPRg==", "cpu": [ "ia32" ], @@ -426,9 +426,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.15.tgz", - "integrity": "sha512-imUxH9a3WJARyAvrG7srLyiK73XdX83NXQkjKvQ+7vPh3ZxoLrzvPkQKKw2DwZ+RV2ZB6vBfNHP8XScAmQC3aA==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.17.tgz", + "integrity": "sha512-fGEb8f2BSA3CW7riJVurug65ACLuQAzKq0SSqkY2b2yHHH0MzDfbLyKIGzHwOI/gkHcxM/leuSW6D5w/LMNitA==", "cpu": [ "x64" ], @@ -457,9 +457,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz", - "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz", + "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" @@ -720,9 +720,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.44.0", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.0.tgz", - "integrity": "sha512-gsF+c/0XOguWgaOgvFs+xnnRqt9GwgTvIks36WpE6ueeI4KCEHHd8K/CKHqhOqrJKsYH8m27kRzQEvWXAwXUTw==", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.1.tgz", + "integrity": "sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg==", "dev": true, "peer": true, "dependencies": { @@ -797,9 +797,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.16.19", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.19.tgz", - "integrity": "sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==", + "version": "18.16.20", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.20.tgz", + "integrity": "sha512-nL54VfDjThdP2UXJXZao5wp76CDiDw4zSRO8d4Tk7UgDqNKGKVEQB0/t3ti63NS+YNNkIQDvwEAF04BO+WYu7Q==", "dev": true }, "node_modules/@types/prop-types": { @@ -821,9 +821,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.15", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.15.tgz", - "integrity": "sha512-oEjE7TQt1fFTFSbf8kkNuc798ahTUzn3Le67/PWjE8MAfYAD/qB7O8hSTcromLFqHCt9bcdOg5GXMokzTjJ5SA==", + "version": "18.2.16", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.16.tgz", + "integrity": "sha512-LLFWr12ZhBJ4YVw7neWLe6Pk7Ey5R9OCydfuMsz1L8bZxzaawJj2p06Q8/EFEHDeTBQNFLF62X+CG7B2zIyu0Q==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -1083,6 +1083,15 @@ "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.13.tgz", "integrity": "sha512-A3uY356uOU9nGa+TQIT/i3ziWUgJjVMUrGGXSrtRiTwklyCFjGVWIOHoEIHbJpiyhDkJd9kvIWUOfXK1IkK8XQ==" }, + "node_modules/@vscode/vscode-languagedetection": { + "version": "1.0.22", + "resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.22.tgz", + "integrity": "sha512-rQ/BgMyLuIXSmbA0MSkIPHtcOw14QkeDbAq19sjvaS9LTRr905yij0S8lsyqN5JgOsbtIx7pAcyOxFMzPmqhZQ==", + "peer": true, + "bin": { + "vscode-languagedetection": "cli/index.js" + } + }, "node_modules/@webassemblyjs/ast": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", @@ -2049,9 +2058,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.467", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.467.tgz", - "integrity": "sha512-2qI70O+rR4poYeF2grcuS/bCps5KJh6y1jtZMDDEteyKJQrzLOEhFyXCLcHW6DTBjKjWkk26JhWoAi+Ux9A0fg==", + "version": "1.4.471", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.471.tgz", + "integrity": "sha512-GpmGRC1vTl60w/k6YpQ18pSiqnmr0j3un//5TV1idPi6aheNfkT1Ye71tMEabWyNDO6sBMgAR+95Eb0eUUr1tA==", "dev": true, "peer": true }, @@ -2189,9 +2198,9 @@ } }, "node_modules/esbuild": { - "version": "0.18.15", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.15.tgz", - "integrity": "sha512-3WOOLhrvuTGPRzQPU6waSDWrDTnQriia72McWcn6UCi43GhCHrXH4S59hKMeez+IITmdUuUyvbU9JIp+t3xlPQ==", + "version": "0.18.17", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.17.tgz", + "integrity": "sha512-1GJtYnUxsJreHYA0Y+iQz2UEykonY66HNWOb0yXYZi9/kNrORUEHVg87eQsCtqh59PEJ5YVZJO98JHznMJSWjg==", "dev": true, "hasInstallScript": true, "bin": { @@ -2201,28 +2210,28 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.18.15", - "@esbuild/android-arm64": "0.18.15", - "@esbuild/android-x64": "0.18.15", - "@esbuild/darwin-arm64": "0.18.15", - "@esbuild/darwin-x64": "0.18.15", - "@esbuild/freebsd-arm64": "0.18.15", - "@esbuild/freebsd-x64": "0.18.15", - "@esbuild/linux-arm": "0.18.15", - "@esbuild/linux-arm64": "0.18.15", - "@esbuild/linux-ia32": "0.18.15", - "@esbuild/linux-loong64": "0.18.15", - "@esbuild/linux-mips64el": "0.18.15", - "@esbuild/linux-ppc64": "0.18.15", - "@esbuild/linux-riscv64": "0.18.15", - "@esbuild/linux-s390x": "0.18.15", - "@esbuild/linux-x64": "0.18.15", - "@esbuild/netbsd-x64": "0.18.15", - "@esbuild/openbsd-x64": "0.18.15", - "@esbuild/sunos-x64": "0.18.15", - "@esbuild/win32-arm64": "0.18.15", - "@esbuild/win32-ia32": "0.18.15", - "@esbuild/win32-x64": "0.18.15" + "@esbuild/android-arm": "0.18.17", + "@esbuild/android-arm64": "0.18.17", + "@esbuild/android-x64": "0.18.17", + "@esbuild/darwin-arm64": "0.18.17", + "@esbuild/darwin-x64": "0.18.17", + "@esbuild/freebsd-arm64": "0.18.17", + "@esbuild/freebsd-x64": "0.18.17", + "@esbuild/linux-arm": "0.18.17", + "@esbuild/linux-arm64": "0.18.17", + "@esbuild/linux-ia32": "0.18.17", + "@esbuild/linux-loong64": "0.18.17", + "@esbuild/linux-mips64el": "0.18.17", + "@esbuild/linux-ppc64": "0.18.17", + "@esbuild/linux-riscv64": "0.18.17", + "@esbuild/linux-s390x": "0.18.17", + "@esbuild/linux-x64": "0.18.17", + "@esbuild/netbsd-x64": "0.18.17", + "@esbuild/openbsd-x64": "0.18.17", + "@esbuild/sunos-x64": "0.18.17", + "@esbuild/win32-arm64": "0.18.17", + "@esbuild/win32-ia32": "0.18.17", + "@esbuild/win32-x64": "0.18.17" } }, "node_modules/escalade": { @@ -2382,14 +2391,14 @@ } }, "node_modules/eslint-plugin-es-x": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.1.0.tgz", - "integrity": "sha512-AhiaF31syh4CCQ+C5ccJA0VG6+kJK8+5mXKKE7Qs1xcPRg02CDPOj3mWlQxuWS/AYtg7kxrDNgW9YW3vc0Q+Mw==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.2.0.tgz", + "integrity": "sha512-9dvv5CcvNjSJPqnS5uZkqb3xmbeqRLnvXKK7iI5+oK/yTusyc46zbBZKENGsOfojm/mKfszyZb+wNqNPAPeGXA==", "dev": true, "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.1.2", - "@eslint-community/regexpp": "^4.5.0" + "@eslint-community/regexpp": "^4.6.0" }, "engines": { "node": "^14.18.0 || >=16.0.0" @@ -2789,9 +2798,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz", - "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -5635,9 +5644,9 @@ } }, "node_modules/tslib": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", - "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", "dev": true }, "node_modules/type-check": { @@ -5864,9 +5873,9 @@ } }, "node_modules/vite": { - "version": "4.4.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.6.tgz", - "integrity": "sha512-EY6Mm8vJ++S3D4tNAckaZfw3JwG3wa794Vt70M6cNJ6NxT87yhq7EC8Rcap3ahyHdo8AhCmV9PTk+vG1HiYn1A==", + "version": "4.4.7", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.7.tgz", + "integrity": "sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==", "dev": true, "dependencies": { "esbuild": "^0.18.10", @@ -5920,9 +5929,9 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.80.0-next.3", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.80.0-next.3.tgz", - "integrity": "sha512-V2XpqlEhnnbw6XjIu+NMBj+EazPVnqzGmMS1NjQMid/ZqMciQPfZv1oyIaj+AN6qUGDyPQ0Dg2R4OWV/BCeXzw==", + "version": "1.80.0-next.6", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.80.0-next.6.tgz", + "integrity": "sha512-4iaf+cezdyjHOr1yRBpM7CEmCDkO8qQK0sQIdVhREI1qd49xiggxdF+J8gRLBSRAbOX6ZFEpWUZsZv8Uo9k08Q==", "dependencies": { "toposort": "^2.0.2" }, @@ -5930,6 +5939,7 @@ "monaco-treemending": "monaco-treemending.js" }, "peerDependencies": { + "@vscode/vscode-languagedetection": "^1.0.22", "monaco-editor": "0.40.0", "vscode-oniguruma": "^1.7.0", "vscode-textmate": "^9.0.0", @@ -6431,7 +6441,7 @@ "license": "MIT", "dependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.3", + "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, @@ -6441,7 +6451,7 @@ }, "peerDependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.3" + "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6" }, "peerDependenciesMeta": { "monaco-editor": { diff --git a/packages/client/package.json b/packages/client/package.json index f20b316b..9aa74a9f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -49,13 +49,13 @@ ], "dependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.3", + "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, "peerDependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.3" + "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6" }, "peerDependenciesMeta": { "monaco-editor": { diff --git a/packages/client/src/monaco-vscode-api-services.ts b/packages/client/src/monaco-vscode-api-services.ts index 08e54aec..c1e505d5 100644 --- a/packages/client/src/monaco-vscode-api-services.ts +++ b/packages/client/src/monaco-vscode-api-services.ts @@ -15,6 +15,7 @@ interface MonacoEnvironmentEnhanced extends Environment { export type InitializeServiceConfig = { enableFilesService?: boolean; + enableExtensionsService?: boolean; enableDialogService?: boolean; enableNotificationService?: boolean; enableModelService?: boolean; @@ -34,13 +35,19 @@ export type InitializeServiceConfig = { enableDebugService?: boolean; enablePreferencesService?: boolean; enableSnippetsService?: boolean; - enableQuickaccessService?: boolean; + configureQuickaccessService?: { + isKeybindingConfigurationVisible: boolean, + shouldUseGlobalPicker: boolean + }; enableOutputService?: boolean; configureTerminalServiceConfig?: { backendImpl: SimpleTerminalBackend | ITerminalBackend } enableSearchService?: boolean; enableMarkersService?: boolean; + enableAccessibilityService?: boolean; + enableEnvironmentService?: boolean; + enableLayoutService?: boolean; userServices?: editor.IEditorOverrideServices; debugLogging?: boolean; logLevel?: LogLevel @@ -88,6 +95,9 @@ const importAllServices = async (config?: InitializeServiceConfig) => { if (lc.enableFilesService === true) { addService('files', import('vscode/service-override/files')); } + if (lc.enableExtensionsService === true) { + addService('extensions', import('vscode/service-override/extensions')); + } if (lc.enableModelService === true) { addService('model', import('vscode/service-override/model')); } @@ -131,7 +141,7 @@ const importAllServices = async (config?: InitializeServiceConfig) => { if (lc.enableSnippetsService === true) { addService('snippets', import('vscode/service-override/snippets')); } - if (lc.enableQuickaccessService === true) { + if (lc.configureQuickaccessService !== undefined) { addService('quickaccess', import('vscode/service-override/quickaccess')); } if (lc.enableOutputService === true) { @@ -146,11 +156,24 @@ const importAllServices = async (config?: InitializeServiceConfig) => { if (lc.enableMarkersService === true) { addService('markers', import('vscode/service-override/markers')); } + if (lc.enableAccessibilityService === true) { + addService('accessibility', import('vscode/service-override/accessibility')); + } + if (lc.enableEnvironmentService === true) { + addService('environment', import('vscode/service-override/environment')); + } + if (lc.enableLayoutService === true) { + addService('layout', import('vscode/service-override/layout')); + } - const reportServiceLoading = (origin: string, services: editor.IEditorOverrideServices, debugLogging: boolean) => { + const reportServiceLoading = (services: editor.IEditorOverrideServices, debugLogging: boolean, origin?: string) => { for (const serviceName of Object.keys(services)) { if (debugLogging) { - console.log(`Loading ${origin} service: ${serviceName}`); + if (origin) { + console.log(`Loading ${origin} service: ${serviceName}`); + } else { + console.log(`Loading service: ${serviceName}`); + } } } }; @@ -166,13 +189,10 @@ const importAllServices = async (config?: InitializeServiceConfig) => { const overrideServices: editor.IEditorOverrideServices = {}; if (userServices) { mergeServices(userServices, overrideServices); - reportServiceLoading('user', userServices, lc.debugLogging === true); + reportServiceLoading(userServices, lc.debugLogging === true, 'user'); } - // files service is required - if (!serviceNames.includes('files') && !Object.keys(overrideServices).includes('fileService')) { - throw new Error('"files" service was not configured, but it is mandatory. Please add it to the "initServices" config.'); - } + // files service and extension service are loaded automatically by monaco-vscode-api // theme requires textmate if ((serviceNames.includes('theme') || Object.keys(overrideServices).includes('themeService')) && @@ -185,6 +205,8 @@ const importAllServices = async (config?: InitializeServiceConfig) => { !(serviceNames.includes('keybindings') || Object.keys(overrideServices).includes('keybindingService'))) { throw new Error('"quickaccess" requires "keybindings" service. Please add it to the "initServices" config.'); } + + // markers service requires views service if (serviceNames.includes('markers') && !(serviceNames.includes('views') || Object.keys(overrideServices).includes('viewsService'))) { throw new Error('"markers" requires "views" service. Please add it to the "initServices" config.'); @@ -216,12 +238,17 @@ const importAllServices = async (config?: InitializeServiceConfig) => { if (lc.configureTerminalServiceConfig?.backendImpl) { services = loadedImport.default(lc.configureTerminalServiceConfig.backendImpl); } + } else if (serviceName === 'quickaccess') { + services = loadedImport.default({ + isKeybindingConfigurationVisible: lc.configureQuickaccessService?.isKeybindingConfigurationVisible, + shouldUseGlobalPicker: lc.configureQuickaccessService?.shouldUseGlobalPicker + }); } else { services = loadedImport.default(); } mergeServices(services, overrideServices); - reportServiceLoading('user', services, lc.debugLogging === true); + reportServiceLoading(services, lc.debugLogging === true); count++; } diff --git a/packages/examples/main/src/common.ts b/packages/examples/main/src/common.ts index 6bb5b2d8..1b2ab214 100644 --- a/packages/examples/main/src/common.ts +++ b/packages/examples/main/src/common.ts @@ -4,7 +4,6 @@ * ------------------------------------------------------------------------------------------ */ import 'monaco-editor/esm/vs/editor/editor.all.js'; -import 'monaco-editor/esm/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.js'; import 'monaco-editor/esm/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js'; import { editor, languages, Uri } from 'monaco-editor/esm/vs/editor/editor.api.js'; import { createConfiguredEditor, createModelReference, IReference, ITextFileEditorModel } from 'vscode/monaco'; @@ -80,7 +79,6 @@ export const createJsonEditor = async (config: { if (config.init === true) { await initServices({ - enableFilesService: true, enableThemeService: true, enableTextmateService: true, enableModelService: true, @@ -88,9 +86,14 @@ export const createJsonEditor = async (config: { enableViewsService: false, useDefaultOpenEditorFunction: true }, - enableLanguagesService: true, enableKeybindingsService: true, - enableQuickaccessService: true, + enableLanguagesService: true, + configureQuickaccessService: { + isKeybindingConfigurationVisible: true, + shouldUseGlobalPicker: true + }, + enableOutputService: true, + enableAccessibilityService: true, debugLogging: true }); } diff --git a/packages/examples/main/src/langium/statemachineClient.ts b/packages/examples/main/src/langium/statemachineClient.ts index ac57e6c3..bc853448 100644 --- a/packages/examples/main/src/langium/statemachineClient.ts +++ b/packages/examples/main/src/langium/statemachineClient.ts @@ -4,7 +4,6 @@ * ------------------------------------------------------------------------------------------ */ import 'monaco-editor/esm/vs/editor/editor.all.js'; -import 'monaco-editor/esm/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.js'; import 'monaco-editor/esm/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js'; import { editor, Uri } from 'monaco-editor/esm/vs/editor/editor.api.js'; @@ -12,9 +11,9 @@ import { MonacoLanguageClient, initServices } from 'monaco-languageclient'; import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserver-protocol/browser.js'; import { CloseAction, ErrorAction, MessageTransports } from 'vscode-languageclient'; import { createConfiguredEditor } from 'vscode/monaco'; -import { registerExtension } from 'vscode/extensions'; +import { ExtensionHostKind, registerExtension } from 'vscode/extensions'; import { updateUserConfiguration } from 'vscode/service-override/configuration'; -import getFileServiceOverride from 'vscode/service-override/files'; +import getAccessibilityServiceOverride from 'vscode/service-override/accessibility'; import { LogLevel } from 'vscode/services'; // import { renderPanelPart } from 'vscode/service-override/views'; import 'vscode/default-extensions/theme-defaults'; @@ -60,17 +59,11 @@ const setup = async () => { }] } }; - const { registerFile: registerExtensionFile } = registerExtension(extension); + const { registerFileUrl } = registerExtension(extension, ExtensionHostKind.LocalProcess); + // const api = await getApi(); - registerExtensionFile('/statemachine-configuration.json', async () => { - const statemachineLanguageConfig = new URL('../../../node_modules/langium-statemachine-dsl/language-configuration.json', window.location.href).href; - return (await fetch(statemachineLanguageConfig)).text(); - }); - - registerExtensionFile('/statemachine-grammar.json', async () => { - const statemachineTmUrl = new URL('../../../node_modules/langium-statemachine-dsl/syntaxes/statemachine.tmLanguage.json', window.location.href).href; - return (await fetch(statemachineTmUrl)).text(); - }); + registerFileUrl('/statemachine-configuration.json', new URL('../../../node_modules/langium-statemachine-dsl/language-configuration.json', window.location.href).href); + registerFileUrl('/statemachine-grammar.json', new URL('../../../node_modules/langium-statemachine-dsl/syntaxes/statemachine.tmLanguage.json', window.location.href).href); updateUserConfiguration(`{ "editor.fontSize": 14, @@ -124,9 +117,6 @@ const run = async () => { try { // use this to demonstrate all possible services made available by the monaco-vscode-api await initServices({ - // This should demonstrate that you can chose to not use the built-in loading mechanism, - // but do it manually, see below - enableFilesService: false, enableThemeService: true, enableTextmateService: true, enableModelService: true, @@ -145,13 +135,22 @@ try { enableNotificationService: true, enablePreferencesService: true, enableSnippetsService: true, - enableQuickaccessService: true, + configureQuickaccessService: { + isKeybindingConfigurationVisible: true, + shouldUseGlobalPicker: true + }, enableOutputService: true, enableSearchService: true, enableMarkersService: false, + // don't enable files and extensions services. They will be enabled automatically + enableFilesService: false, + enableExtensionsService: false, + // This should demonstrate that you can chose to not use the built-in loading mechanism, + // but do it manually, see below + enableAccessibilityService: false, userServices: { - // manually add the files service - ...getFileServiceOverride() + // manually add the accessibility service + ...getAccessibilityServiceOverride() }, debugLogging: true, logLevel: LogLevel.Info diff --git a/packages/examples/main/src/react/app.tsx b/packages/examples/main/src/react/app.tsx index dd812911..cd5dbda8 100644 --- a/packages/examples/main/src/react/app.tsx +++ b/packages/examples/main/src/react/app.tsx @@ -2,12 +2,9 @@ * Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ -import 'monaco-editor/esm/vs/editor/editor.all.js'; -import 'monaco-editor/esm/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.js'; -import 'monaco-editor/esm/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js'; +import { createJsonEditor, createUrl, createWebSocket } from '../common.js'; import { editor } from 'monaco-editor/esm/vs/editor/editor.api.js'; import React, { createRef, useEffect, useMemo, useRef } from 'react'; -import { createJsonEditor, createUrl, createWebSocket } from '../common.js'; import { buildWorkerDefinition } from 'monaco-editor-workers'; buildWorkerDefinition('../../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false); diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json index d173d201..e3684950 100644 --- a/packages/verify/pnpm/package.json +++ b/packages/verify/pnpm/package.json @@ -5,7 +5,7 @@ "dependencies": { "monaco-languageclient": "6.3.0-next.0", "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.80.0-next.3" + "vscode": "npm:@codingame/monaco-vscode-api@~1.80.0-next.6" }, "devDependencies": { "shx": "~0.3.4" diff --git a/vite.config.ts b/vite.config.ts index 193a385a..370b9da8 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,6 +1,7 @@ /* eslint-disable header/header */ import { defineConfig } from 'vite'; import { resolve } from 'path'; +import { readFileSync } from 'fs'; export default defineConfig(() => { const config = { @@ -24,7 +25,27 @@ export default defineConfig(() => { port: 8080, origin: 'http://localhost:8080' }, - assetsInclude: ['**/*.wasm'] + assetsInclude: ['**/*.wasm'], + optimizeDeps: { + esbuildOptions: { + plugins: [ + // copied from "https://github.com/CodinGame/monaco-vscode-api/blob/run-ext-host-in-worker/demo/vite.config.ts" + { + name: 'import.meta.url', + setup({ onLoad }) { + // Help vite that bundles/move files without touching `import.meta.url` which breaks asset urls + onLoad({ filter: /default-extensions\/.*\.js/, namespace: 'file' }, args => { + let code = readFileSync(args.path, 'utf8'); + code = code.replace( + /\bimport\.meta\.url\b/g, + `new URL('/@fs/${args.path}', window.location.origin)` + ); + return { contents: code }; + }); + } + }] + } + } }; return config; }); From 0186abbbfa972acaef400fd2033307038fc1f8ce Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Thu, 27 Jul 2023 20:18:18 +0200 Subject: [PATCH 3/6] Switch to monaco-vscode-api 1.80.1-next.0 - Simplify enableQuickaccessService --- package-lock.json | 18 +++++++++--------- packages/client/package.json | 6 +++--- .../client/src/monaco-vscode-api-services.ts | 16 ++++++---------- packages/examples/main/package.json | 2 +- packages/examples/main/src/common.ts | 5 +---- .../main/src/langium/statemachineClient.ts | 6 ++---- packages/verify/pnpm/package.json | 4 ++-- packages/verify/vite/package.json | 2 +- packages/verify/vite/vite.config.ts | 3 +-- packages/verify/webpack/package.json | 2 +- packages/verify/yarn/package.json | 2 +- vite.config.ts | 1 - 12 files changed, 28 insertions(+), 39 deletions(-) diff --git a/package-lock.json b/package-lock.json index a042f6c8..fbb0d88c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5929,9 +5929,9 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.80.0-next.6", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.80.0-next.6.tgz", - "integrity": "sha512-4iaf+cezdyjHOr1yRBpM7CEmCDkO8qQK0sQIdVhREI1qd49xiggxdF+J8gRLBSRAbOX6ZFEpWUZsZv8Uo9k08Q==", + "version": "1.80.1-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.80.1-next.0.tgz", + "integrity": "sha512-6RukMMKKidOs6oUWCEOUufnH+k5qgBfsZQgb1aHyZtOg9L+1fK55pdqUrb6PSVZbgh7sB02Zvgy1K3+sdfHvAg==", "dependencies": { "toposort": "^2.0.2" }, @@ -6436,12 +6436,12 @@ }, "packages/client": { "name": "monaco-languageclient", - "version": "6.3.0-next.0", + "version": "6.3.0-next.1", "hasInstallScript": true, "license": "MIT", "dependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6", + "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, @@ -6451,7 +6451,7 @@ }, "peerDependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6" + "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0" }, "peerDependenciesMeta": { "monaco-editor": { @@ -6470,7 +6470,7 @@ "langium": "~1.2.1", "langium-statemachine-dsl": "~1.2.0", "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "react": "~18.2.0", "react-dom": "~18.2.0", @@ -6497,7 +6497,7 @@ "version": "0.0.0", "dependencies": { "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" }, @@ -6510,7 +6510,7 @@ "version": "0.0.0", "dependencies": { "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" }, diff --git a/packages/client/package.json b/packages/client/package.json index 9aa74a9f..a0991029 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient", - "version": "6.3.0-next.0", + "version": "6.3.0-next.1", "description": "Monaco Language client implementation", "author": { "name": "TypeFox GmbH", @@ -49,13 +49,13 @@ ], "dependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6", + "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, "peerDependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6" + "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0" }, "peerDependenciesMeta": { "monaco-editor": { diff --git a/packages/client/src/monaco-vscode-api-services.ts b/packages/client/src/monaco-vscode-api-services.ts index c1e505d5..26465a40 100644 --- a/packages/client/src/monaco-vscode-api-services.ts +++ b/packages/client/src/monaco-vscode-api-services.ts @@ -35,10 +35,7 @@ export type InitializeServiceConfig = { enableDebugService?: boolean; enablePreferencesService?: boolean; enableSnippetsService?: boolean; - configureQuickaccessService?: { - isKeybindingConfigurationVisible: boolean, - shouldUseGlobalPicker: boolean - }; + enableQuickaccessService?: boolean; enableOutputService?: boolean; configureTerminalServiceConfig?: { backendImpl: SimpleTerminalBackend | ITerminalBackend @@ -48,6 +45,7 @@ export type InitializeServiceConfig = { enableAccessibilityService?: boolean; enableEnvironmentService?: boolean; enableLayoutService?: boolean; + enableLanguageDetectionWorkerService?: boolean; userServices?: editor.IEditorOverrideServices; debugLogging?: boolean; logLevel?: LogLevel @@ -141,7 +139,7 @@ const importAllServices = async (config?: InitializeServiceConfig) => { if (lc.enableSnippetsService === true) { addService('snippets', import('vscode/service-override/snippets')); } - if (lc.configureQuickaccessService !== undefined) { + if (lc.enableQuickaccessService === true) { addService('quickaccess', import('vscode/service-override/quickaccess')); } if (lc.enableOutputService === true) { @@ -165,6 +163,9 @@ const importAllServices = async (config?: InitializeServiceConfig) => { if (lc.enableLayoutService === true) { addService('layout', import('vscode/service-override/layout')); } + if (lc.enableLanguageDetectionWorkerService === true) { + addService('languageDetectionWorker', import('vscode/service-override/languageDetectionWorker')); + } const reportServiceLoading = (services: editor.IEditorOverrideServices, debugLogging: boolean, origin?: string) => { for (const serviceName of Object.keys(services)) { @@ -238,11 +239,6 @@ const importAllServices = async (config?: InitializeServiceConfig) => { if (lc.configureTerminalServiceConfig?.backendImpl) { services = loadedImport.default(lc.configureTerminalServiceConfig.backendImpl); } - } else if (serviceName === 'quickaccess') { - services = loadedImport.default({ - isKeybindingConfigurationVisible: lc.configureQuickaccessService?.isKeybindingConfigurationVisible, - shouldUseGlobalPicker: lc.configureQuickaccessService?.shouldUseGlobalPicker - }); } else { services = loadedImport.default(); } diff --git a/packages/examples/main/package.json b/packages/examples/main/package.json index 763a2c75..b1fbdbf4 100644 --- a/packages/examples/main/package.json +++ b/packages/examples/main/package.json @@ -23,7 +23,7 @@ "langium": "~1.2.1", "langium-statemachine-dsl": "~1.2.0", "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "react": "~18.2.0", "react-dom": "~18.2.0", diff --git a/packages/examples/main/src/common.ts b/packages/examples/main/src/common.ts index 1b2ab214..5b61d287 100644 --- a/packages/examples/main/src/common.ts +++ b/packages/examples/main/src/common.ts @@ -88,10 +88,7 @@ export const createJsonEditor = async (config: { }, enableKeybindingsService: true, enableLanguagesService: true, - configureQuickaccessService: { - isKeybindingConfigurationVisible: true, - shouldUseGlobalPicker: true - }, + enableQuickaccessService: true, enableOutputService: true, enableAccessibilityService: true, debugLogging: true diff --git a/packages/examples/main/src/langium/statemachineClient.ts b/packages/examples/main/src/langium/statemachineClient.ts index bc853448..95a1a85e 100644 --- a/packages/examples/main/src/langium/statemachineClient.ts +++ b/packages/examples/main/src/langium/statemachineClient.ts @@ -135,16 +135,14 @@ try { enableNotificationService: true, enablePreferencesService: true, enableSnippetsService: true, - configureQuickaccessService: { - isKeybindingConfigurationVisible: true, - shouldUseGlobalPicker: true - }, + enableQuickaccessService: true, enableOutputService: true, enableSearchService: true, enableMarkersService: false, // don't enable files and extensions services. They will be enabled automatically enableFilesService: false, enableExtensionsService: false, + enableLanguageDetectionWorkerService: true, // This should demonstrate that you can chose to not use the built-in loading mechanism, // but do it manually, see below enableAccessibilityService: false, diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json index e3684950..e53bf92d 100644 --- a/packages/verify/pnpm/package.json +++ b/packages/verify/pnpm/package.json @@ -3,9 +3,9 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.1", "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.80.0-next.6" + "vscode": "npm:@codingame/monaco-vscode-api@~1.80.1-next.0" }, "devDependencies": { "shx": "~0.3.4" diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json index 02c4f230..2124b43d 100644 --- a/packages/verify/vite/package.json +++ b/packages/verify/vite/package.json @@ -5,7 +5,7 @@ "type": "module", "dependencies": { "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.1", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" }, diff --git a/packages/verify/vite/vite.config.ts b/packages/verify/vite/vite.config.ts index ec71e2a5..9cb77ddd 100644 --- a/packages/verify/vite/vite.config.ts +++ b/packages/verify/vite/vite.config.ts @@ -6,6 +6,5 @@ export default defineConfig({ alias: { path: 'path-browserify' } - }, - assetsInclude: ['**/*.wasm'] + } }); diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json index 51339bc6..f18e3f81 100644 --- a/packages/verify/webpack/package.json +++ b/packages/verify/webpack/package.json @@ -5,7 +5,7 @@ "type": "module", "dependencies": { "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.1", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" }, diff --git a/packages/verify/yarn/package.json b/packages/verify/yarn/package.json index 267261b5..48b13c50 100644 --- a/packages/verify/yarn/package.json +++ b/packages/verify/yarn/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-languageclient": "6.3.0-next.0" + "monaco-languageclient": "6.3.0-next.1" }, "devDependencies": { "shx": "~0.3.4" diff --git a/vite.config.ts b/vite.config.ts index 370b9da8..e0936d46 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -25,7 +25,6 @@ export default defineConfig(() => { port: 8080, origin: 'http://localhost:8080' }, - assetsInclude: ['**/*.wasm'], optimizeDeps: { esbuildOptions: { plugins: [ From f8d44100a452d2a0074752abeda0d8569e66ff09 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Fri, 28 Jul 2023 13:41:26 +0200 Subject: [PATCH 4/6] Fix langiumClient and update monaco-editor-workers to 0.40.0 --- package-lock.json | 35 +++++++++---------- packages/examples/main/package.json | 2 +- .../main/src/langium/langiumClient.ts | 16 +++------ .../main/src/langium/statemachineClient.ts | 1 - packages/verify/vite/package.json | 3 +- packages/verify/webpack/package.json | 3 +- packages/verify/webpack/tsconfig.json | 3 ++ 7 files changed, 28 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbb0d88c..9948092d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -821,9 +821,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.16", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.16.tgz", - "integrity": "sha512-LLFWr12ZhBJ4YVw7neWLe6Pk7Ey5R9OCydfuMsz1L8bZxzaawJj2p06Q8/EFEHDeTBQNFLF62X+CG7B2zIyu0Q==", + "version": "18.2.17", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.17.tgz", + "integrity": "sha512-u+e7OlgPPh+aryjOm5UJMX32OvB2E3QASOAqVMY6Ahs90djagxwv2ya0IctglNbNTexC12qCSMZG47KPfy1hAA==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -2058,9 +2058,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.471", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.471.tgz", - "integrity": "sha512-GpmGRC1vTl60w/k6YpQ18pSiqnmr0j3un//5TV1idPi6aheNfkT1Ye71tMEabWyNDO6sBMgAR+95Eb0eUUr1tA==", + "version": "1.4.475", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.475.tgz", + "integrity": "sha512-mTye5u5P98kSJO2n7zYALhpJDmoSQejIGya0iR01GpoRady8eK3bw7YHHnjA1Rfi4ZSLdpuzlAC7Zw+1Zu7Z6A==", "dev": true, "peer": true }, @@ -4189,21 +4189,16 @@ "integrity": "sha512-1wymccLEuFSMBvCk/jT1YDW/GuxMLYwnFwF9CDyYCxoTw2Pt379J3FUhwy9c43j51JdcxVPjwk0jm0EVDsBS2g==" }, "node_modules/monaco-editor-workers": { - "version": "0.39.1", - "resolved": "https://registry.npmjs.org/monaco-editor-workers/-/monaco-editor-workers-0.39.1.tgz", - "integrity": "sha512-QSP2ZCarlYaHGIZqzcz2BtI1mKstwJo4YfYu9m7ZwhkRd8HJEHpclKgE51AXtrncRch5zc05pHk4cQrFEdYsBQ==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/monaco-editor-workers/-/monaco-editor-workers-0.40.0.tgz", + "integrity": "sha512-fE44H8z9ssJqri301tl5kEbC4aVjYPjIGZ+2F68ydrXG1C9eiTus14oo7aFBBnswiCxV8oG9eU3Z7t0vdrorSQ==", "dependencies": { - "monaco-editor": "~0.39.0" + "monaco-editor": "~0.40.0" }, "peerDependencies": { - "monaco-editor": "~0.39.0" + "monaco-editor": "~0.40.0" } }, - "node_modules/monaco-editor-workers/node_modules/monaco-editor": { - "version": "0.39.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.39.0.tgz", - "integrity": "sha512-zhbZ2Nx93tLR8aJmL2zI1mhJpsl87HMebNBM6R8z4pLfs8pj604pIVIVwyF1TivcfNtIPpMXL+nb3DsBmE/x6Q==" - }, "node_modules/monaco-languageclient": { "resolved": "packages/client", "link": true @@ -6469,7 +6464,7 @@ "express": "~4.18.2", "langium": "~1.2.1", "langium-statemachine-dsl": "~1.2.0", - "monaco-editor-workers": "0.39.1", + "monaco-editor-workers": "0.40.0", "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "react": "~18.2.0", @@ -6496,7 +6491,8 @@ "name": "example-client-vite", "version": "0.0.0", "dependencies": { - "monaco-editor-workers": "0.39.1", + "examples-main": "../../examples/main", + "monaco-editor-workers": "0.40.0", "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" @@ -6509,7 +6505,8 @@ "name": "example-client-webpack", "version": "0.0.0", "dependencies": { - "monaco-editor-workers": "0.39.1", + "examples-main": "../../examples/main", + "monaco-editor-workers": "0.40.0", "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" diff --git a/packages/examples/main/package.json b/packages/examples/main/package.json index b1fbdbf4..7600fcc1 100644 --- a/packages/examples/main/package.json +++ b/packages/examples/main/package.json @@ -22,7 +22,7 @@ "express": "~4.18.2", "langium": "~1.2.1", "langium-statemachine-dsl": "~1.2.0", - "monaco-editor-workers": "0.39.1", + "monaco-editor-workers": "0.40.0", "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "react": "~18.2.0", diff --git a/packages/examples/main/src/langium/langiumClient.ts b/packages/examples/main/src/langium/langiumClient.ts index 71b2d7b3..d7917c60 100644 --- a/packages/examples/main/src/langium/langiumClient.ts +++ b/packages/examples/main/src/langium/langiumClient.ts @@ -4,7 +4,6 @@ * ------------------------------------------------------------------------------------------ */ import 'monaco-editor/esm/vs/editor/editor.all.js'; -import 'monaco-editor/esm/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.js'; import 'monaco-editor/esm/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js'; import { editor, Uri } from 'monaco-editor/esm/vs/editor/editor.api.js'; @@ -13,7 +12,7 @@ import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserve import { CloseAction, ErrorAction, MessageTransports } from 'vscode-languageclient'; import { createConfiguredEditor } from 'vscode/monaco'; -import { registerExtension } from 'vscode/extensions'; +import { ExtensionHostKind, registerExtension } from 'vscode/extensions'; import { updateUserConfiguration } from 'vscode/service-override/configuration'; import 'vscode/default-extensions/theme-defaults'; @@ -49,18 +48,11 @@ const setup = async () => { }] } }; - const { registerFile: registerExtensionFile } = registerExtension(extension); + const { registerFileUrl } = registerExtension(extension, ExtensionHostKind.LocalProcess); // these two files are taken from the langium-vscode - registerExtensionFile('/langium-configuration.json', async () => { - const langiumLanguageConfig = new URL('./src/langium/langium.configuration.json', window.location.href).href; - return (await fetch(langiumLanguageConfig)).text(); - }); - - registerExtensionFile('/langium-grammar.json', async () => { - const langiumTmUrl = new URL('./src/langium/langium.tmLanguage.json', window.location.href).href; - return (await fetch(langiumTmUrl)).text(); - }); + registerFileUrl('/langium-configuration.json', new URL('./src/langium/langium.configuration.json', window.location.href).href); + registerFileUrl('/langium-grammar.json', new URL('./src/langium/langium.tmLanguage.json', window.location.href).href); // set vscode configuration parameters updateUserConfiguration(`{ diff --git a/packages/examples/main/src/langium/statemachineClient.ts b/packages/examples/main/src/langium/statemachineClient.ts index 95a1a85e..354dc31d 100644 --- a/packages/examples/main/src/langium/statemachineClient.ts +++ b/packages/examples/main/src/langium/statemachineClient.ts @@ -60,7 +60,6 @@ const setup = async () => { } }; const { registerFileUrl } = registerExtension(extension, ExtensionHostKind.LocalProcess); - // const api = await getApi(); registerFileUrl('/statemachine-configuration.json', new URL('../../../node_modules/langium-statemachine-dsl/language-configuration.json', window.location.href).href); registerFileUrl('/statemachine-grammar.json', new URL('../../../node_modules/langium-statemachine-dsl/syntaxes/statemachine.tmLanguage.json', window.location.href).href); diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json index 2124b43d..3adabe89 100644 --- a/packages/verify/vite/package.json +++ b/packages/verify/vite/package.json @@ -4,8 +4,9 @@ "private": true, "type": "module", "dependencies": { - "monaco-editor-workers": "0.39.1", + "monaco-editor-workers": "0.40.0", "monaco-languageclient": "6.3.0-next.1", + "examples-main": "../../examples/main", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" }, diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json index f18e3f81..f8a6089e 100644 --- a/packages/verify/webpack/package.json +++ b/packages/verify/webpack/package.json @@ -4,8 +4,9 @@ "private": true, "type": "module", "dependencies": { - "monaco-editor-workers": "0.39.1", + "monaco-editor-workers": "0.40.0", "monaco-languageclient": "6.3.0-next.1", + "examples-main": "../../examples/main", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" }, diff --git a/packages/verify/webpack/tsconfig.json b/packages/verify/webpack/tsconfig.json index d66672a5..35013179 100644 --- a/packages/verify/webpack/tsconfig.json +++ b/packages/verify/webpack/tsconfig.json @@ -7,6 +7,9 @@ }, "references": [{ "path": "../../client/tsconfig.src.json" + }, + { + "path": "../../examples/main/tsconfig.src.json" }], "include": [ "src/**/*.ts", From 95e0b694b4336f1d8d38aeff8aa694cb0ab61707 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Fri, 4 Aug 2023 13:37:21 +0200 Subject: [PATCH 5/6] Allow to configure quickaccess if views service is enabled --- .../client/src/monaco-vscode-api-services.ts | 16 ++++++++++++++-- .../main/src/langium/statemachineClient.ts | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/packages/client/src/monaco-vscode-api-services.ts b/packages/client/src/monaco-vscode-api-services.ts index 26465a40..0d1d74dd 100644 --- a/packages/client/src/monaco-vscode-api-services.ts +++ b/packages/client/src/monaco-vscode-api-services.ts @@ -80,14 +80,14 @@ type ModuleWithDefaultExport = { } const importAllServices = async (config?: InitializeServiceConfig) => { - const promises: Promise[] = []; const serviceNames: string[] = []; + const promises: Promise[] = []; const lc: InitializeServiceConfig = config ?? {}; const userServices = lc.userServices ?? {}; const addService = (name: string, promise: Promise) => { - promises.push(promise); serviceNames.push(name); + promises.push(promise); }; if (lc.enableFilesService === true) { @@ -239,6 +239,18 @@ const importAllServices = async (config?: InitializeServiceConfig) => { if (lc.configureTerminalServiceConfig?.backendImpl) { services = loadedImport.default(lc.configureTerminalServiceConfig.backendImpl); } + } else if (serviceName === 'quickaccess') { + if (lc.configureEditorOrViewsServiceConfig?.enableViewsService) { + const { + isEditorPartVisible + } = await import('vscode/service-override/views'); + services = loadedImport.default({ + isKeybindingConfigurationVisible: isEditorPartVisible, + shouldUseGlobalPicker: isEditorPartVisible + }); + } else { + services = loadedImport.default(); + } } else { services = loadedImport.default(); } diff --git a/packages/examples/main/src/langium/statemachineClient.ts b/packages/examples/main/src/langium/statemachineClient.ts index 354dc31d..389afe0b 100644 --- a/packages/examples/main/src/langium/statemachineClient.ts +++ b/packages/examples/main/src/langium/statemachineClient.ts @@ -120,7 +120,7 @@ try { enableTextmateService: true, enableModelService: true, configureEditorOrViewsServiceConfig: { - enableViewsService: false, + enableViewsService: true, useDefaultOpenEditorFunction: true }, configureConfigurationServiceConfig: { From 43c77d1a1113f75ee49e6f0d96c60a10a7717385 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Fri, 4 Aug 2023 15:40:03 +0200 Subject: [PATCH 6/6] Updated to monaco-vscode-api 1.80.2. Clean-up monaco-language-client --- README.md | 3 +- package-lock.json | 18 +-- packages/client/CHANGELOG.md | 4 + packages/client/README.md | 1 - packages/client/package.json | 6 +- packages/client/src/index.ts | 1 + packages/client/src/monaco-language-client.ts | 141 ++---------------- .../client/src/monaco-vscode-api-services.ts | 28 +--- packages/examples/main/package.json | 2 +- .../main/src/langium/langiumClient.ts | 2 +- .../main/src/langium/statemachineClient.ts | 4 - packages/verify/pnpm/package.json | 4 +- packages/verify/vite/package.json | 2 +- packages/verify/webpack/package.json | 2 +- packages/verify/yarn/package.json | 2 +- 15 files changed, 42 insertions(+), 178 deletions(-) diff --git a/README.md b/README.md index 5c9810d4..004ae847 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,7 @@ The following table describes which version of **monaco-languageclient** and **m | monaco-languageclient | monaco-vscode-api | monaco-editor | comment | | :---- | :---- | :--- | :--- | +| 6.3.0 | 1.80.2 | 0.40.0 | Released 2023-08-0x | | 6.2.0 | 1.79.3 | 0.39.0 | Released 2023-06-16 | | 6.1.0 | 1.79.1 | 0.38.0 | Released 2023-06-12 | | 6.0.3 | 1.78.8 | 0.37.1 | Released 2023-05-31 | @@ -250,7 +251,7 @@ loader.config({ monaco }); If you use pnpm, you have to add `vscode` / `monaco-vscode-api` as direct dependency (see the [following table](#monaco-editor--monaco-vscode-api-compatibility-table)), otherwise the installation will fail. ```json -"vscode": "npm:@codingame/monaco-vscode-api@~1.80.0" +"vscode": "npm:@codingame/monaco-vscode-api@~1.80.2" ``` ## Licenses diff --git a/package-lock.json b/package-lock.json index 9948092d..fcd861ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5924,9 +5924,9 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.80.1-next.0", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.80.1-next.0.tgz", - "integrity": "sha512-6RukMMKKidOs6oUWCEOUufnH+k5qgBfsZQgb1aHyZtOg9L+1fK55pdqUrb6PSVZbgh7sB02Zvgy1K3+sdfHvAg==", + "version": "1.80.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.80.2.tgz", + "integrity": "sha512-B8vo78YAhnJNnlXIataVvUiv5ANoKk6foLLeJGmx+rSWx3Qk9MKiGYWJGF+L6UdgwFCRP824yY9Cedu0wEaXmw==", "dependencies": { "toposort": "^2.0.2" }, @@ -6431,12 +6431,12 @@ }, "packages/client": { "name": "monaco-languageclient", - "version": "6.3.0-next.1", + "version": "6.3.0-next.2", "hasInstallScript": true, "license": "MIT", "dependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.80.2", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, @@ -6446,7 +6446,7 @@ }, "peerDependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0" + "vscode": "npm:@codingame/monaco-vscode-api@1.80.2" }, "peerDependenciesMeta": { "monaco-editor": { @@ -6465,7 +6465,7 @@ "langium": "~1.2.1", "langium-statemachine-dsl": "~1.2.0", "monaco-editor-workers": "0.40.0", - "monaco-languageclient": "6.3.0-next.1", + "monaco-languageclient": "6.3.0-next.2", "normalize-url": "~8.0.0", "react": "~18.2.0", "react-dom": "~18.2.0", @@ -6493,7 +6493,7 @@ "dependencies": { "examples-main": "../../examples/main", "monaco-editor-workers": "0.40.0", - "monaco-languageclient": "6.3.0-next.1", + "monaco-languageclient": "6.3.0-next.2", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" }, @@ -6507,7 +6507,7 @@ "dependencies": { "examples-main": "../../examples/main", "monaco-editor-workers": "0.40.0", - "monaco-languageclient": "6.3.0-next.1", + "monaco-languageclient": "6.3.0-next.2", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" }, diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md index fe0ddeae..900e787b 100644 --- a/packages/client/CHANGELOG.md +++ b/packages/client/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this npm module are documented in this file. +## [6.3.0] - 2023-08-0x + +- Update to `monaco-editor` `0.40.0` and `monaco-vscode-api` `1.80.2` [#513](https://github.com/TypeFox/monaco-languageclient/pull/513) + ## [6.2.0] - 2023-06-16 - Updated `monaco-vscode-api` to version `1.79.3`, `monaco-editor` to version `0.39.0` and `monaco-editor-workers` to version `0.39.1` [#503](https://github.com/TypeFox/monaco-languageclient/pull/503) diff --git a/packages/client/README.md b/packages/client/README.md index 892ca950..b0bdf3db 100644 --- a/packages/client/README.md +++ b/packages/client/README.md @@ -12,7 +12,6 @@ See [here](https://github.com/TypeFox/monaco-languageclient/blob/main/README.md) ## History - For the history please see the [README](https://github.com/TypeFox/monaco-languageclient/blob/main/README.md#latest-important-project-changes) and [CHANGELOG](https://github.com/TypeFox/monaco-languageclient/blob/main/CHANGELOG.md). ## License diff --git a/packages/client/package.json b/packages/client/package.json index a0991029..3534aec2 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient", - "version": "6.3.0-next.1", + "version": "6.3.0-next.2", "description": "Monaco Language client implementation", "author": { "name": "TypeFox GmbH", @@ -49,13 +49,13 @@ ], "dependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.80.2", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, "peerDependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0" + "vscode": "npm:@codingame/monaco-vscode-api@1.80.2" }, "peerDependenciesMeta": { "monaco-editor": { diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts index e1ec9371..4e25d561 100644 --- a/packages/client/src/index.ts +++ b/packages/client/src/index.ts @@ -3,5 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ +export type { IConnectionProvider, MonacoLanguageClientOptions } from './monaco-language-client.js'; export * from './monaco-language-client.js'; export * from './monaco-vscode-api-services.js'; diff --git a/packages/client/src/monaco-language-client.ts b/packages/client/src/monaco-language-client.ts index 7698d7cd..14e61a35 100644 --- a/packages/client/src/monaco-language-client.ts +++ b/packages/client/src/monaco-language-client.ts @@ -3,72 +3,25 @@ * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ -/* eslint-disable @typescript-eslint/dot-notation */ - import { BaseLanguageClient, MessageTransports, LanguageClientOptions } from 'vscode-languageclient/lib/common/client.js'; -import { ConfigurationFeature, SyncConfigurationFeature } from 'vscode-languageclient/lib/common/configuration.js'; -import { DidChangeTextDocumentFeature, DidCloseTextDocumentFeature, DidOpenTextDocumentFeature, DidSaveTextDocumentFeature, WillSaveFeature, WillSaveWaitUntilFeature } from 'vscode-languageclient/lib/common/textSynchronization.js'; -import { CompletionItemFeature } from 'vscode-languageclient/lib/common/completion.js'; -import { HoverFeature } from 'vscode-languageclient/lib/common/hover.js'; -import { SignatureHelpFeature } from 'vscode-languageclient/lib/common/signatureHelp.js'; -import { DefinitionFeature } from 'vscode-languageclient/lib/common/definition.js'; -import { ReferencesFeature } from 'vscode-languageclient/lib/common/reference.js'; -import { DocumentHighlightFeature } from 'vscode-languageclient/lib/common/documentHighlight.js'; -import { DocumentSymbolFeature } from 'vscode-languageclient/lib/common/documentSymbol.js'; -import { CodeActionFeature } from 'vscode-languageclient/lib/common/codeAction.js'; -import { CodeLensFeature } from 'vscode-languageclient/lib/common/codeLens.js'; -import { DocumentFormattingFeature, DocumentOnTypeFormattingFeature, DocumentRangeFormattingFeature } from 'vscode-languageclient/lib/common/formatting.js'; -import { RenameFeature } from 'vscode-languageclient/lib/common/rename.js'; -import { DocumentLinkFeature } from 'vscode-languageclient/lib/common/documentLink.js'; -import { ExecuteCommandFeature } from 'vscode-languageclient/lib/common/executeCommand.js'; -import { TypeDefinitionFeature } from 'vscode-languageclient/lib/common/typeDefinition.js'; -import { ImplementationFeature } from 'vscode-languageclient/lib/common/implementation.js'; -import { ColorProviderFeature } from 'vscode-languageclient/lib/common/colorProvider.js'; -import { WorkspaceFoldersFeature } from 'vscode-languageclient/lib/common/workspaceFolder.js'; -import { FoldingRangeFeature } from 'vscode-languageclient/lib/common/foldingRange.js'; -import { DeclarationFeature } from 'vscode-languageclient/lib/common/declaration.js'; -import { SelectionRangeFeature } from 'vscode-languageclient/lib/common/selectionRange.js'; -import { SemanticTokensFeature } from 'vscode-languageclient/lib/common/semanticTokens.js'; -import { LinkedEditingFeature } from 'vscode-languageclient/lib/common/linkedEditingRange.js'; -import { InlayHintsFeature } from 'vscode-languageclient/lib/common/inlayHint.js'; -import { DiagnosticFeature } from 'vscode-languageclient/lib/common/diagnostic.js'; -import { ProgressFeature } from 'vscode-languageclient/lib/common/progress.js'; -import { RegistrationParams, UnregistrationParams } from 'vscode-languageclient'; -import { TextDocument } from 'vscode'; -import { WorkspaceSymbolFeature } from 'vscode-languageclient/lib/common/workspaceSymbol.js'; -import { CallHierarchyFeature } from 'vscode-languageclient/lib/common/callHierarchy.js'; -import { DidCreateFilesFeature, DidDeleteFilesFeature, DidRenameFilesFeature, WillCreateFilesFeature, WillDeleteFilesFeature, WillRenameFilesFeature } from 'vscode-languageclient/lib/common/fileOperations.js'; -import { TypeHierarchyFeature } from 'vscode-languageclient/lib/common/typeHierarchy.js'; -import { InlineValueFeature } from 'vscode-languageclient/lib/common/inlineValue.js'; -import { NotebookDocumentSyncFeature } from 'vscode-languageclient/lib/common/notebook.js'; export interface IConnectionProvider { get(encoding: string): Promise; } +export type MonacoLanguageClientOptions = { + name: string; + id?: string; + clientOptions: LanguageClientOptions; + connectionProvider: IConnectionProvider; +} + export class MonacoLanguageClient extends BaseLanguageClient { protected readonly connectionProvider: IConnectionProvider; - constructor({ id, name, clientOptions, connectionProvider }: MonacoLanguageClient.Options) { + constructor({ id, name, clientOptions, connectionProvider }: MonacoLanguageClientOptions) { super(id || name.toLowerCase(), name, clientOptions); this.connectionProvider = connectionProvider; - - // Hack because vscode-language client rejects the whole registration block if one capability registration has no associated client feature registered - // Some language servers still send the registration even though the client says it doesn't support it - const originalHandleRegistrationRequest: (params: RegistrationParams) => Promise = this['handleRegistrationRequest'].bind(this); - this['handleRegistrationRequest'] = (params: RegistrationParams) => { - originalHandleRegistrationRequest({ - ...params, - registrations: params.registrations.filter(registration => this.getFeature(registration.method) != null) - }); - }; - const originalHandleUnregistrationRequest: (params: UnregistrationParams) => Promise = this['handleUnregistrationRequest'].bind(this); - this['handleUnregistrationRequest'] = (params: UnregistrationParams) => { - originalHandleUnregistrationRequest({ - ...params, - unregisterations: params.unregisterations.filter(unregistration => this.getFeature(unregistration.method) != null) - }); - }; } protected createMessageTransports(encoding: string): Promise { @@ -76,82 +29,6 @@ export class MonacoLanguageClient extends BaseLanguageClient { } protected override getLocale(): string { - return navigator.language || 'en-US'; - } - - protected override registerBuiltinFeatures() { - const pendingFullTextDocumentChanges: Map = new Map(); - this.registerFeature(new ConfigurationFeature(this)); - this.registerFeature(new DidOpenTextDocumentFeature(this, this['_syncedDocuments'])); - this['_didChangeTextDocumentFeature'] = new DidChangeTextDocumentFeature(this, pendingFullTextDocumentChanges); - this['_didChangeTextDocumentFeature'].onPendingChangeAdded(() => { - this['triggerPendingChangeDelivery'](); - }); - this.registerFeature(this['_didChangeTextDocumentFeature']); - this.registerFeature(new DidCloseTextDocumentFeature(this, this['_syncedDocuments'], pendingFullTextDocumentChanges)); - this.registerFeature(new CompletionItemFeature(this)); - this.registerFeature(new HoverFeature(this)); - this.registerFeature(new SignatureHelpFeature(this)); - this.registerFeature(new DefinitionFeature(this)); - this.registerFeature(new ReferencesFeature(this)); - this.registerFeature(new DocumentHighlightFeature(this)); - this.registerFeature(new DocumentSymbolFeature(this)); - this.registerFeature(new CodeActionFeature(this)); - this.registerFeature(new CodeLensFeature(this)); - this.registerFeature(new DocumentFormattingFeature(this)); - this.registerFeature(new DocumentRangeFormattingFeature(this)); - this.registerFeature(new DocumentOnTypeFormattingFeature(this)); - this.registerFeature(new RenameFeature(this)); - this.registerFeature(new DocumentLinkFeature(this)); - this.registerFeature(new ExecuteCommandFeature(this)); - this.registerFeature(new SyncConfigurationFeature(this)); - this.registerFeature(new TypeDefinitionFeature(this)); - this.registerFeature(new ImplementationFeature(this)); - this.registerFeature(new ColorProviderFeature(this)); - // We only register the workspace folder feature if the client is not locked - // to a specific workspace folder. - if (this.clientOptions.workspaceFolder === undefined) { - this.registerFeature(new WorkspaceFoldersFeature(this)); - } - this.registerFeature(new FoldingRangeFeature(this)); - this.registerFeature(new DeclarationFeature(this)); - this.registerFeature(new SelectionRangeFeature(this)); - this.registerFeature(new SemanticTokensFeature(this)); - this.registerFeature(new LinkedEditingFeature(this)); - this.registerFeature(new InlayHintsFeature(this)); - this.registerFeature(new DiagnosticFeature(this)); - // enabled since monaco-vscode-api 1.78.5 (PR https://github.com/CodinGame/monaco-vscode-api/pull/109) - this.registerFeature(new WillSaveFeature(this)); - this.registerFeature(new WillSaveWaitUntilFeature(this)); - this.registerFeature(new DidSaveTextDocumentFeature(this)); - // enabled since monaco-vscode-api 1.79.0 (PR https://github.com/CodinGame/monaco-vscode-api/pull/110) - this.registerFeature(new WorkspaceSymbolFeature(this)); - this.registerFeature(new DidCreateFilesFeature(this)); - this.registerFeature(new DidRenameFilesFeature(this)); - this.registerFeature(new DidDeleteFilesFeature(this)); - this.registerFeature(new WillCreateFilesFeature(this)); - this.registerFeature(new WillRenameFilesFeature(this)); - this.registerFeature(new WillDeleteFilesFeature(this)); - this.registerFeature(new CallHierarchyFeature(this)); - this.registerFeature(new TypeHierarchyFeature(this)); - this.registerFeature(new InlineValueFeature(this)); - } - - /** - * These are all contained in BaseLanguageClient#registerBuiltinFeatures but not registered - * in MonacoLanguageClient. This method is not called! - */ - public registerNotUsedFeatures() { - // these will stay unsupported for now - this.registerFeature(new ProgressFeature(this)); - this.registerFeature(new NotebookDocumentSyncFeature(this)); - } -} -export namespace MonacoLanguageClient { - export interface Options { - name: string; - id?: string; - clientOptions: LanguageClientOptions; - connectionProvider: IConnectionProvider; + return super.getLocale() || 'en-US'; } } diff --git a/packages/client/src/monaco-vscode-api-services.ts b/packages/client/src/monaco-vscode-api-services.ts index 0d1d74dd..f1a05fb0 100644 --- a/packages/client/src/monaco-vscode-api-services.ts +++ b/packages/client/src/monaco-vscode-api-services.ts @@ -14,8 +14,6 @@ interface MonacoEnvironmentEnhanced extends Environment { } export type InitializeServiceConfig = { - enableFilesService?: boolean; - enableExtensionsService?: boolean; enableDialogService?: boolean; enableNotificationService?: boolean; enableModelService?: boolean; @@ -43,8 +41,6 @@ export type InitializeServiceConfig = { enableSearchService?: boolean; enableMarkersService?: boolean; enableAccessibilityService?: boolean; - enableEnvironmentService?: boolean; - enableLayoutService?: boolean; enableLanguageDetectionWorkerService?: boolean; userServices?: editor.IEditorOverrideServices; debugLogging?: boolean; @@ -75,11 +71,14 @@ export const initServices = async (config?: InitializeServiceConfig) => { (window.MonacoEnvironment as MonacoEnvironmentEnhanced).vscodeApiInitialised = true; }; -type ModuleWithDefaultExport = { +export type ModuleWithDefaultExport = { default: (x?: any) => editor.IEditorOverrideServices } -const importAllServices = async (config?: InitializeServiceConfig) => { +/** + * files, extension, environment and layout services are loaded automatically by monaco-vscode-api + */ +export const importAllServices = async (config?: InitializeServiceConfig) => { const serviceNames: string[] = []; const promises: Promise[] = []; const lc: InitializeServiceConfig = config ?? {}; @@ -90,12 +89,6 @@ const importAllServices = async (config?: InitializeServiceConfig) => { promises.push(promise); }; - if (lc.enableFilesService === true) { - addService('files', import('vscode/service-override/files')); - } - if (lc.enableExtensionsService === true) { - addService('extensions', import('vscode/service-override/extensions')); - } if (lc.enableModelService === true) { addService('model', import('vscode/service-override/model')); } @@ -157,12 +150,6 @@ const importAllServices = async (config?: InitializeServiceConfig) => { if (lc.enableAccessibilityService === true) { addService('accessibility', import('vscode/service-override/accessibility')); } - if (lc.enableEnvironmentService === true) { - addService('environment', import('vscode/service-override/environment')); - } - if (lc.enableLayoutService === true) { - addService('layout', import('vscode/service-override/layout')); - } if (lc.enableLanguageDetectionWorkerService === true) { addService('languageDetectionWorker', import('vscode/service-override/languageDetectionWorker')); } @@ -193,8 +180,6 @@ const importAllServices = async (config?: InitializeServiceConfig) => { reportServiceLoading(userServices, lc.debugLogging === true, 'user'); } - // files service and extension service are loaded automatically by monaco-vscode-api - // theme requires textmate if ((serviceNames.includes('theme') || Object.keys(overrideServices).includes('themeService')) && !(serviceNames.includes('textmate') || Object.keys(overrideServices).includes('textMateTokenizationFeature'))) { @@ -240,7 +225,7 @@ const importAllServices = async (config?: InitializeServiceConfig) => { services = loadedImport.default(lc.configureTerminalServiceConfig.backendImpl); } } else if (serviceName === 'quickaccess') { - if (lc.configureEditorOrViewsServiceConfig?.enableViewsService) { + if (lc.configureEditorOrViewsServiceConfig?.enableViewsService === true) { const { isEditorPartVisible } = await import('vscode/service-override/views'); @@ -248,6 +233,7 @@ const importAllServices = async (config?: InitializeServiceConfig) => { isKeybindingConfigurationVisible: isEditorPartVisible, shouldUseGlobalPicker: isEditorPartVisible }); + services = loadedImport.default(); } else { services = loadedImport.default(); } diff --git a/packages/examples/main/package.json b/packages/examples/main/package.json index 7600fcc1..3a68c109 100644 --- a/packages/examples/main/package.json +++ b/packages/examples/main/package.json @@ -23,7 +23,7 @@ "langium": "~1.2.1", "langium-statemachine-dsl": "~1.2.0", "monaco-editor-workers": "0.40.0", - "monaco-languageclient": "6.3.0-next.1", + "monaco-languageclient": "6.3.0-next.2", "normalize-url": "~8.0.0", "react": "~18.2.0", "react-dom": "~18.2.0", diff --git a/packages/examples/main/src/langium/langiumClient.ts b/packages/examples/main/src/langium/langiumClient.ts index d7917c60..e5a8985d 100644 --- a/packages/examples/main/src/langium/langiumClient.ts +++ b/packages/examples/main/src/langium/langiumClient.ts @@ -116,7 +116,6 @@ const run = async () => { try { await initServices({ - enableFilesService: true, enableThemeService: true, enableTextmateService: true, enableModelService: true, @@ -129,6 +128,7 @@ try { }, enableKeybindingsService: true, enableLanguagesService: true, + enableQuickaccessService: true, debugLogging: true }); await setup(); diff --git a/packages/examples/main/src/langium/statemachineClient.ts b/packages/examples/main/src/langium/statemachineClient.ts index 389afe0b..e0a995f9 100644 --- a/packages/examples/main/src/langium/statemachineClient.ts +++ b/packages/examples/main/src/langium/statemachineClient.ts @@ -137,10 +137,6 @@ try { enableQuickaccessService: true, enableOutputService: true, enableSearchService: true, - enableMarkersService: false, - // don't enable files and extensions services. They will be enabled automatically - enableFilesService: false, - enableExtensionsService: false, enableLanguageDetectionWorkerService: true, // This should demonstrate that you can chose to not use the built-in loading mechanism, // but do it manually, see below diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json index e53bf92d..c893fae1 100644 --- a/packages/verify/pnpm/package.json +++ b/packages/verify/pnpm/package.json @@ -3,9 +3,9 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-languageclient": "6.3.0-next.1", + "monaco-languageclient": "6.3.0-next.2", "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.80.1-next.0" + "vscode": "npm:@codingame/monaco-vscode-api@~1.80.2" }, "devDependencies": { "shx": "~0.3.4" diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json index 3adabe89..6198891f 100644 --- a/packages/verify/vite/package.json +++ b/packages/verify/vite/package.json @@ -5,7 +5,7 @@ "type": "module", "dependencies": { "monaco-editor-workers": "0.40.0", - "monaco-languageclient": "6.3.0-next.1", + "monaco-languageclient": "6.3.0-next.2", "examples-main": "../../examples/main", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json index f8a6089e..8a6c6644 100644 --- a/packages/verify/webpack/package.json +++ b/packages/verify/webpack/package.json @@ -5,7 +5,7 @@ "type": "module", "dependencies": { "monaco-editor-workers": "0.40.0", - "monaco-languageclient": "6.3.0-next.1", + "monaco-languageclient": "6.3.0-next.2", "examples-main": "../../examples/main", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" diff --git a/packages/verify/yarn/package.json b/packages/verify/yarn/package.json index 48b13c50..6a3e5f68 100644 --- a/packages/verify/yarn/package.json +++ b/packages/verify/yarn/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-languageclient": "6.3.0-next.1" + "monaco-languageclient": "6.3.0-next.2" }, "devDependencies": { "shx": "~0.3.4"