diff --git a/package-lock.json b/package-lock.json index 0e45f0d..845f847 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,18 +15,18 @@ "@types/node": "~18.15.11", "@types/shelljs": "~0.8.12", "@types/vscode": "~1.77.0", - "@typescript-eslint/eslint-plugin": "~5.59.0", - "@typescript-eslint/parser": "~5.59.0", + "@typescript-eslint/eslint-plugin": "~5.59.2", + "@typescript-eslint/parser": "~5.59.2", "@vitest/coverage-c8": "~0.30.1", "@vitest/ui": "~0.30.1", "editorconfig": "~1.0.2", - "eslint": "~8.38.0", + "eslint": "~8.39.0", "path-browserify": "~1.0.1", "shelljs": "~0.8.5", "shx": "~0.3.4", "tslib": "~2.5.0", "typescript": "~5.0.4", - "vite": "~4.3.1", + "vite": "~4.3.4", "vite-node": "~0.30.1", "vitest": "~0.30.1" } @@ -488,9 +488,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.38.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz", - "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz", + "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -682,7 +682,8 @@ "node_modules/@types/node": { "version": "18.15.11", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz", - "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==" + "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==", + "dev": true }, "node_modules/@types/prop-types": { "version": "15.7.5", @@ -691,9 +692,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.0.37", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.37.tgz", - "integrity": "sha512-4yaZZtkRN3ZIQD3KSEwkfcik8s0SWV+82dlJot1AbGYHCzJkWP3ENBY6wYeDRmKZ6HkrgoGAmR2HqdwYGp6OEw==", + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.0.tgz", + "integrity": "sha512-0FLj93y5USLHdnhIhABk83rm8XEGA7kH3cr+YUlvxoUGp1xNt/DINUMvqPxLyOQMzLmZe8i4RTHbvb8MC7NmrA==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -702,9 +703,9 @@ } }, "node_modules/@types/react-dom": { - "version": "18.0.11", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.11.tgz", - "integrity": "sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==", + "version": "18.2.1", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.1.tgz", + "integrity": "sha512-8QZEV9+Kwy7tXFmjJrp3XUKQSs9LTnE0KnoUb0YCguWBiNW0Yfb2iBMYZ08WPg35IR6P3Z0s00B15SwZnO26+w==", "dev": true, "dependencies": { "@types/react": "*" @@ -739,15 +740,15 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.0.tgz", - "integrity": "sha512-p0QgrEyrxAWBecR56gyn3wkG15TJdI//eetInP3zYRewDh0XS+DhB3VUAd3QqvziFsfaQIoIuZMxZRB7vXYaYw==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.2.tgz", + "integrity": "sha512-yVrXupeHjRxLDcPKL10sGQ/QlVrA8J5IYOEWVqk0lJaSZP7X5DfnP7Ns3cc74/blmbipQ1htFNVGsHX6wsYm0A==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.59.0", - "@typescript-eslint/type-utils": "5.59.0", - "@typescript-eslint/utils": "5.59.0", + "@typescript-eslint/scope-manager": "5.59.2", + "@typescript-eslint/type-utils": "5.59.2", + "@typescript-eslint/utils": "5.59.2", "debug": "^4.3.4", "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", @@ -773,14 +774,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.0.tgz", - "integrity": "sha512-qK9TZ70eJtjojSUMrrEwA9ZDQ4N0e/AuoOIgXuNBorXYcBDk397D2r5MIe1B3cok/oCtdNC5j+lUUpVB+Dpb+w==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.2.tgz", + "integrity": "sha512-uq0sKyw6ao1iFOZZGk9F8Nro/8+gfB5ezl1cA06SrqbgJAt0SRoFhb9pXaHvkrxUpZaoLxt8KlovHNk8Gp6/HQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.59.0", - "@typescript-eslint/types": "5.59.0", - "@typescript-eslint/typescript-estree": "5.59.0", + "@typescript-eslint/scope-manager": "5.59.2", + "@typescript-eslint/types": "5.59.2", + "@typescript-eslint/typescript-estree": "5.59.2", "debug": "^4.3.4" }, "engines": { @@ -800,13 +801,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.0.tgz", - "integrity": "sha512-tsoldKaMh7izN6BvkK6zRMINj4Z2d6gGhO2UsI8zGZY3XhLq1DndP3Ycjhi1JwdwPRwtLMW4EFPgpuKhbCGOvQ==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.2.tgz", + "integrity": "sha512-dB1v7ROySwQWKqQ8rEWcdbTsFjh2G0vn8KUyvTXdPoyzSL6lLGkiXEV5CvpJsEe9xIdKV+8Zqb7wif2issoOFA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.0", - "@typescript-eslint/visitor-keys": "5.59.0" + "@typescript-eslint/types": "5.59.2", + "@typescript-eslint/visitor-keys": "5.59.2" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -817,13 +818,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.0.tgz", - "integrity": "sha512-d/B6VSWnZwu70kcKQSCqjcXpVH+7ABKH8P1KNn4K7j5PXXuycZTPXF44Nui0TEm6rbWGi8kc78xRgOC4n7xFgA==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.2.tgz", + "integrity": "sha512-b1LS2phBOsEy/T381bxkkywfQXkV1dWda/z0PhnIy3bC5+rQWQDS7fk9CSpcXBccPY27Z6vBEuaPBCKCgYezyQ==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.59.0", - "@typescript-eslint/utils": "5.59.0", + "@typescript-eslint/typescript-estree": "5.59.2", + "@typescript-eslint/utils": "5.59.2", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -844,9 +845,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.0.tgz", - "integrity": "sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.2.tgz", + "integrity": "sha512-LbJ/HqoVs2XTGq5shkiKaNTuVv5tTejdHgfdjqRUGdYhjW1crm/M7og2jhVskMt8/4wS3T1+PfFvL1K3wqYj4w==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -857,13 +858,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.0.tgz", - "integrity": "sha512-sUNnktjmI8DyGzPdZ8dRwW741zopGxltGs/SAPgGL/AAgDpiLsCFLcMNSpbfXfmnNeHmK9h3wGmCkGRGAoUZAg==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.2.tgz", + "integrity": "sha512-+j4SmbwVmZsQ9jEyBMgpuBD0rKwi9RxRpjX71Brr73RsYnEr3Lt5QZ624Bxphp8HUkSKfqGnPJp1kA5nl0Sh7Q==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.0", - "@typescript-eslint/visitor-keys": "5.59.0", + "@typescript-eslint/types": "5.59.2", + "@typescript-eslint/visitor-keys": "5.59.2", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -884,17 +885,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.0.tgz", - "integrity": "sha512-GGLFd+86drlHSvPgN/el6dRQNYYGOvRSDVydsUaQluwIW3HvbXuxyuD5JETvBt/9qGYe+lOrDk6gRrWOHb/FvA==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.2.tgz", + "integrity": "sha512-kSuF6/77TZzyGPhGO4uVp+f0SBoYxCDf+lW3GKhtKru/L8k/Hd7NFQxyWUeY7Z/KGB2C6Fe3yf2vVi4V9TsCSQ==", "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.0", - "@typescript-eslint/types": "5.59.0", - "@typescript-eslint/typescript-estree": "5.59.0", + "@typescript-eslint/scope-manager": "5.59.2", + "@typescript-eslint/types": "5.59.2", + "@typescript-eslint/typescript-estree": "5.59.2", "eslint-scope": "^5.1.1", "semver": "^7.3.7" }, @@ -910,12 +911,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.59.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.0.tgz", - "integrity": "sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA==", + "version": "5.59.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.2.tgz", + "integrity": "sha512-EEpsO8m3RASrKAHI9jpavNv9NlEUebV4qmF1OWxSTtKSFBpC1NCmWazDQHFivRf0O1DV11BA645yrLEVQ0/Lig==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.0", + "@typescript-eslint/types": "5.59.2", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -1040,9 +1041,9 @@ } }, "node_modules/@vscode/l10n": { - "version": "0.0.11", - "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.11.tgz", - "integrity": "sha512-ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA==" + "version": "0.0.13", + "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.13.tgz", + "integrity": "sha512-A3uY356uOU9nGa+TQIT/i3ziWUgJjVMUrGGXSrtRiTwklyCFjGVWIOHoEIHbJpiyhDkJd9kvIWUOfXK1IkK8XQ==" }, "node_modules/acorn": { "version": "8.8.2", @@ -1586,15 +1587,15 @@ } }, "node_modules/eslint": { - "version": "8.38.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.38.0.tgz", - "integrity": "sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz", + "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.4.0", "@eslint/eslintrc": "^2.0.2", - "@eslint/js": "8.38.0", + "@eslint/js": "8.39.0", "@humanwhocodes/config-array": "^0.11.8", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -1604,7 +1605,7 @@ "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.1", + "eslint-scope": "^7.2.0", "eslint-visitor-keys": "^3.4.0", "espree": "^9.5.1", "esquery": "^1.4.2", @@ -1678,9 +1679,9 @@ } }, "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", - "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", + "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", @@ -1688,6 +1689,9 @@ }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint/node_modules/estraverse": { @@ -2422,9 +2426,9 @@ "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==" }, "node_modules/langium": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/langium/-/langium-1.1.0.tgz", - "integrity": "sha512-TsWY/DIOR73se9/YaMQZpvfFWWrhWP0FQS9MrpxWEnMJR0FoKVpMF1thPWXZexLSfyEm1pn2oYzCdW4KUBqXxA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/langium/-/langium-1.2.0.tgz", + "integrity": "sha512-jFSptpFljYo9ZTHrq/GZflMUXiKo5KBNtsaIJtnIzDm9zC2FxsxejEFAtNL09262RVQt+zFeF/2iLAShFTGitw==", "dependencies": { "chevrotain": "~10.4.2", "chevrotain-allstar": "~0.1.4", @@ -2437,13 +2441,13 @@ } }, "node_modules/langium-statemachine-dsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/langium-statemachine-dsl/-/langium-statemachine-dsl-1.1.0.tgz", - "integrity": "sha512-jjqRPogDK0xi86GkwTtijO/LS+NcdtYlSrHTn0aEvY76Bsv6g+3gkFcHHZrtqoLboQAN7OpxolSZh3TB2NkVNQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/langium-statemachine-dsl/-/langium-statemachine-dsl-1.2.0.tgz", + "integrity": "sha512-bOomgWpr5QD3uVhmuBpqLCT1Q1pc6BZypCV3BCRQ7A20MOS0QYjZlkbV7L/QC1pfLCGYR3teKqT+3cUSlXg2jA==", "dependencies": { "chalk": "~4.1.2", "commander": "~10.0.0", - "langium": "~1.1.0", + "langium": "~1.2.0", "lodash": "^4.17.21", "vscode-languageclient": "~8.0.2", "vscode-languageserver": "~8.0.2" @@ -2683,9 +2687,10 @@ "link": true }, "node_modules/monaco-languageclient": { - "version": "5.1.0-next.4", - "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-5.1.0-next.4.tgz", - "integrity": "sha512-jjG80gZnMJx0JX4gQPKyIkPnfwaXW2dqbYnHKbf1Hl1R5jk7OpdkdjCNu/tY5ozl6k7bWYkyTRvAIZkVvCVj8w==", + "version": "6.0.0-next.0", + "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-6.0.0-next.0.tgz", + "integrity": "sha512-EKLrLr/ezjssSVRNiPGR5zINVQ+EytNKUrq6WscZO+iOYKbu7WbYECA6FJQSFzAK51/tYdRdRLYATT3pPLyrhA==", + "hasInstallScript": true, "peer": true, "dependencies": { "vscode-jsonrpc": "~8.1.0", @@ -2696,7 +2701,7 @@ "npm": ">=9.0.0" }, "peerDependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@~1.78.4-next.3" + "vscode": "npm:@codingame/monaco-vscode-api@~1.78.5" } }, "node_modules/monaco-languageclient/node_modules/minimatch": { @@ -3225,9 +3230,9 @@ } }, "node_modules/rollup": { - "version": "3.20.7", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.20.7.tgz", - "integrity": "sha512-P7E2zezKSLhWnTz46XxjSmInrbOCiul1yf+kJccMxT56vxjHwCbDfoLbiqFgu+WQoo9ij2PkraYaBstgB2prBA==", + "version": "3.21.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.21.3.tgz", + "integrity": "sha512-VnPfEG51nIv2xPLnZaekkuN06q9ZbnyDcLkaBdJa/W7UddyhOfMP2yOPziYQfeY7k++fZM8FdQIummFN5y14kA==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -3706,14 +3711,14 @@ } }, "node_modules/vite": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.1.tgz", - "integrity": "sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.4.tgz", + "integrity": "sha512-f90aqGBoxSFxWph2b39ae2uHAxm5jFBBdnfueNxZAT1FTpM13ccFQExCaKbR2xFW5atowjleRniQ7onjJ22QEg==", "dev": true, "dependencies": { "esbuild": "^0.17.5", - "postcss": "^8.4.21", - "rollup": "^3.20.2" + "postcss": "^8.4.23", + "rollup": "^3.21.0" }, "bin": { "vite": "bin/vite.js" @@ -3857,12 +3862,12 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.78.4-next.3", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.78.4-next.3.tgz", - "integrity": "sha512-JWNZgoE9r/HfmsuppGWPXWHVFBfoEgLEZY4LXk1U1KEuWlBaoqkcQRPZfZ9eKDGIhrOmFy4Tws8DXB2xBSegRw==", + "version": "1.78.5", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.78.5.tgz", + "integrity": "sha512-zzglm7Asl4uvdIiQRlLoN22elGOxjvsMcyQnIIbwsKKjkjj6dZYIH7W0KSVYWtA79cVszk9NlpRNw5EBCXojvQ==", "peer": true, - "dependencies": { - "@types/node": "^18.15.11" + "bin": { + "monaco-treemending": "monaco-treemending.js" }, "peerDependencies": { "monaco-editor": "~0.37.1", @@ -3872,11 +3877,11 @@ } }, "node_modules/vscode-json-languageservice": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.2.tgz", - "integrity": "sha512-5td6olfoNdtyxnNA4uocq7V9jdTJt63o9mGEntQb6cbD2HiObZW2XgbSj6nRaebWwBCiYdWpFklNjm6Wz6Xy1Q==", + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.4.tgz", + "integrity": "sha512-GSsHCrv1XBXJDI5DrCi8adEjv+yqZi21TsWs1pJo0cIEmiSVnf3V+v/kiVt0DHvSm9MuRYNjvMfDTW8m5Zpi8Q==", "dependencies": { - "@vscode/l10n": "^0.0.11", + "@vscode/l10n": "^0.0.13", "jsonc-parser": "^3.2.0", "vscode-languageserver-textdocument": "^1.0.8", "vscode-languageserver-types": "^3.17.3", @@ -4183,23 +4188,23 @@ "packages/examples": { "name": "monaco-editor-wrapper-examples", "dependencies": { - "@typefox/monaco-editor-react": "1.0.0-next.9", + "@typefox/monaco-editor-react": "1.0.0-next.10", "http-server": "~14.1.1", - "langium": "~1.1.0", - "langium-statemachine-dsl": "~1.1.0", + "langium": "~1.2.0", + "langium-statemachine-dsl": "~1.2.0", "monaco-editor-workers": "0.37.0", - "monaco-editor-wrapper": "2.0.0-next.2", + "monaco-editor-wrapper": "2.0.0-next.3", "react": "~18.2.0", "react-dom": "~18.2.0", "request-light": "~0.7.0", - "vscode-json-languageservice": "~5.3.2", + "vscode-json-languageservice": "~5.3.4", "vscode-languageclient": "~8.1.0", "vscode-languageserver": "~8.1.0", "vscode-uri": "~3.0.7" }, "devDependencies": { - "@types/react": "~18.0.37", - "@types/react-dom": "~18.0.11" + "@types/react": "~18.2.0", + "@types/react-dom": "~18.2.1" } }, "packages/examples/node_modules/minimatch": { @@ -4268,14 +4273,14 @@ }, "packages/monaco-editor-react": { "name": "@typefox/monaco-editor-react", - "version": "1.0.0-next.9", + "version": "1.0.0-next.10", "license": "MIT", "devDependencies": { - "@types/react": "~18.0.37", - "@types/react-dom": "~18.0.11" + "@types/react": "~18.2.0", + "@types/react-dom": "~18.2.1" }, "peerDependencies": { - "monaco-editor-wrapper": "2.0.0-next.2", + "monaco-editor-wrapper": "2.0.0-next.3", "react": "~18.2.0", "react-dom": "~18.2.0" } @@ -4294,13 +4299,14 @@ "dev": true }, "packages/monaco-editor-wrapper": { - "version": "2.0.0-next.2", + "version": "2.0.0-next.3", + "hasInstallScript": true, "license": "MIT", "dependencies": { "normalize-url": "~8.0.0" }, "peerDependencies": { - "monaco-languageclient": "5.1.0-next.4", + "monaco-languageclient": "6.0.0-next.0", "vscode-ws-jsonrpc": "3.0.0" } }, diff --git a/package.json b/package.json index 7a8ac02..870f8e0 100644 --- a/package.json +++ b/package.json @@ -17,18 +17,18 @@ "@types/node": "~18.15.11", "@types/shelljs": "~0.8.12", "@types/vscode": "~1.77.0", - "@typescript-eslint/eslint-plugin": "~5.59.0", - "@typescript-eslint/parser": "~5.59.0", + "@typescript-eslint/eslint-plugin": "~5.59.2", + "@typescript-eslint/parser": "~5.59.2", "@vitest/coverage-c8": "~0.30.1", "@vitest/ui": "~0.30.1", - "eslint": "~8.38.0", + "eslint": "~8.39.0", "editorconfig": "~1.0.2", "path-browserify": "~1.0.1", "shx": "~0.3.4", "shelljs": "~0.8.5", "tslib": "~2.5.0", "typescript": "~5.0.4", - "vite": "~4.3.1", + "vite": "~4.3.4", "vite-node": "~0.30.1", "vitest": "~0.30.1" }, diff --git a/packages/examples/package.json b/packages/examples/package.json index ac33ff0..b3630ef 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -3,11 +3,11 @@ "private": true, "type": "module", "dependencies": { - "@typefox/monaco-editor-react": "1.0.0-next.9", + "@typefox/monaco-editor-react": "1.0.0-next.10", "http-server": "~14.1.1", - "langium": "~1.1.0", - "langium-statemachine-dsl": "~1.1.0", - "monaco-editor-wrapper": "2.0.0-next.2", + "langium": "~1.2.0", + "langium-statemachine-dsl": "~1.2.0", + "monaco-editor-wrapper": "2.0.0-next.3", "monaco-editor-workers": "0.37.0", "react": "~18.2.0", "react-dom": "~18.2.0", @@ -15,11 +15,11 @@ "vscode-uri": "~3.0.7", "vscode-languageclient": "~8.1.0", "vscode-languageserver": "~8.1.0", - "vscode-json-languageservice": "~5.3.2" + "vscode-json-languageservice": "~5.3.4" }, "devDependencies": { - "@types/react": "~18.0.37", - "@types/react-dom": "~18.0.11" + "@types/react": "~18.2.0", + "@types/react-dom": "~18.2.1" }, "volta": { "node": "18.16.0", diff --git a/packages/examples/react_langium.html b/packages/examples/react_langium.html index 9ba7d36..1916549 100644 --- a/packages/examples/react_langium.html +++ b/packages/examples/react_langium.html @@ -8,7 +8,7 @@ -
+
diff --git a/packages/examples/react_ts.html b/packages/examples/react_ts.html index 5024053..d735035 100644 --- a/packages/examples/react_ts.html +++ b/packages/examples/react_ts.html @@ -8,7 +8,7 @@ -
+
diff --git a/packages/examples/src/langium/reactLangium.tsx b/packages/examples/src/langium/reactLangium.tsx index 0c08f57..bbdbaf4 100644 --- a/packages/examples/src/langium/reactLangium.tsx +++ b/packages/examples/src/langium/reactLangium.tsx @@ -12,6 +12,7 @@ const startEditor = async () => { userConfig={langiumGlobalConfig} style={{ 'paddingTop': '5px', + 'height': '80vh' }} />; diff --git a/packages/examples/src/reactTs.tsx b/packages/examples/src/reactTs.tsx index 07ae96c..bb25076 100644 --- a/packages/examples/src/reactTs.tsx +++ b/packages/examples/src/reactTs.tsx @@ -6,8 +6,9 @@ import ReactDOM from 'react-dom/client'; import { MonacoEditorReactComp } from '@typefox/monaco-editor-react/allLanguages'; import { UserConfig } from 'monaco-editor-wrapper'; +const rootElem = document.getElementById('root')!; const userConfig: UserConfig = { - htmlElement: document.getElementById('root')!, + htmlElement: rootElem, wrapperConfig: { useVscodeConfig: false, monacoEditorConfig: { @@ -35,9 +36,10 @@ const comp = ; -const root = ReactDOM.createRoot(document.getElementById('root')!); +const root = ReactDOM.createRoot(rootElem); root.render(comp); diff --git a/packages/monaco-editor-react/package.json b/packages/monaco-editor-react/package.json index 2f354cb..78bd86b 100644 --- a/packages/monaco-editor-react/package.json +++ b/packages/monaco-editor-react/package.json @@ -1,6 +1,6 @@ { "name": "@typefox/monaco-editor-react", - "version": "1.0.0-next.9", + "version": "1.0.0-next.10", "license": "MIT", "description": "React component for Monaco-Editor and Monaco Languageclient", "keywords": [ @@ -67,13 +67,13 @@ "npm": "9.6.5" }, "peerDependencies": { - "monaco-editor-wrapper": "2.0.0-next.2", + "monaco-editor-wrapper": "2.0.0-next.3", "react": "~18.2.0", "react-dom": "~18.2.0" }, "devDependencies": { - "@types/react": "~18.0.37", - "@types/react-dom": "~18.0.11" + "@types/react": "~18.2.0", + "@types/react-dom": "~18.2.1" }, "repository": { "type": "git", diff --git a/packages/monaco-editor-react/src/index.tsx b/packages/monaco-editor-react/src/index.tsx index af87301..e9b4c51 100644 --- a/packages/monaco-editor-react/src/index.tsx +++ b/packages/monaco-editor-react/src/index.tsx @@ -123,11 +123,12 @@ export class MonacoEditorReactComp extends React.Component { if (this.containerElement) { this.containerElement.className = className ?? ''; + userConfig.htmlElement = this.containerElement; this.isStarting = this.wrapper.start(userConfig); await this.isStarting; onLoading && onLoading(); - onLoad && this.isStarting.then(() => onLoad()); + onLoad && this.isStarting?.then(() => onLoad()); if (onTextChanged) { const model = this.wrapper.getModel(); diff --git a/packages/monaco-editor-react/vite.bundle.config.ts b/packages/monaco-editor-react/vite.bundle.config.ts index 261e197..32ea609 100644 --- a/packages/monaco-editor-react/vite.bundle.config.ts +++ b/packages/monaco-editor-react/vite.bundle.config.ts @@ -28,5 +28,10 @@ export default defineConfig({ } } }, + resolve: { + alias: { + path: 'path-browserify' + } + }, assetsInclude: ['**/*.wasm'] }); diff --git a/packages/monaco-editor-react/vite.languages.config.ts b/packages/monaco-editor-react/vite.languages.config.ts index ad31021..e86b45c 100644 --- a/packages/monaco-editor-react/vite.languages.config.ts +++ b/packages/monaco-editor-react/vite.languages.config.ts @@ -28,5 +28,10 @@ export default defineConfig({ } } }, + resolve: { + alias: { + path: 'path-browserify' + } + }, assetsInclude: ['**/*.wasm'] }); diff --git a/packages/monaco-editor-wrapper/package.json b/packages/monaco-editor-wrapper/package.json index d936263..a5e4c38 100644 --- a/packages/monaco-editor-wrapper/package.json +++ b/packages/monaco-editor-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "monaco-editor-wrapper", - "version": "2.0.0-next.2", + "version": "2.0.0-next.3", "license": "MIT", "description": "Monaco-Editor and Monaco Languageclient Wrapper", "keywords": [ @@ -67,6 +67,7 @@ "README.md" ], "scripts": { + "postinstall": "monaco-treemending", "clean": "npx shx rm -rf ./dist ./bundle ./src/generated ./resources *.tsbuildinfo", "handle:assets": "vite-node ./build/src/buildAssets.mts", "compile": "npm run handle:assets && tsc --build tsconfig.src.json", @@ -83,7 +84,7 @@ "normalize-url": "~8.0.0" }, "peerDependencies": { - "monaco-languageclient": "5.1.0-next.4", + "monaco-languageclient": "6.0.0-next.0", "vscode-ws-jsonrpc": "3.0.0" }, "repository": { diff --git a/packages/monaco-editor-wrapper/vite.bundle.config.ts b/packages/monaco-editor-wrapper/vite.bundle.config.ts index 80d58bd..3c94807 100644 --- a/packages/monaco-editor-wrapper/vite.bundle.config.ts +++ b/packages/monaco-editor-wrapper/vite.bundle.config.ts @@ -28,5 +28,10 @@ export default defineConfig({ } } }, + resolve: { + alias: { + path: 'path-browserify' + } + }, assetsInclude: ['**/*.wasm'] }); diff --git a/packages/monaco-editor-wrapper/vite.languages.config.ts b/packages/monaco-editor-wrapper/vite.languages.config.ts index d3836b1..1b91ceb 100644 --- a/packages/monaco-editor-wrapper/vite.languages.config.ts +++ b/packages/monaco-editor-wrapper/vite.languages.config.ts @@ -28,5 +28,10 @@ export default defineConfig({ } } }, + resolve: { + alias: { + path: 'path-browserify' + } + }, assetsInclude: ['**/*.wasm'] });