From a31b1701bbb2d0410dabc97072b993014f91b5c8 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 17:16:46 +0300 Subject: [PATCH 001/318] [pick pr] fix white strip on buttons --- lib/menus/components/button.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/menus/components/button.js b/lib/menus/components/button.js index 12b0b8ec9..e03b54a10 100644 --- a/lib/menus/components/button.js +++ b/lib/menus/components/button.js @@ -63,7 +63,7 @@ class Button extends LitElement { position: absolute; top: 0; left: 0; - width: 50%; + width: calc(50% + 1px); height: 20px; background: url('textures/1.17.1/gui/widgets.png'); background-size: 256px; From a67d05ae994e879454987f0ccf73d2ad75abcf13 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 18:36:27 +0300 Subject: [PATCH 002/318] speed webpack builds --- build.js | 20 ++++++++++++++++++++ package.json | 4 ++-- webpack.common.js | 32 ++++++++++++-------------------- webpack.dev.js | 15 +++++++++++---- webpack.prod.js | 10 +++++++++- 5 files changed, 54 insertions(+), 27 deletions(-) create mode 100644 build.js diff --git a/build.js b/build.js new file mode 100644 index 000000000..0b9496f0b --- /dev/null +++ b/build.js @@ -0,0 +1,20 @@ +const fsExtra = require('fs-extra') + +exports.copyFiles = () => { + fsExtra.copySync('node_modules/prismarine-viewer/public/blocksStates/', 'public/blocksStates/') + fsExtra.copySync('node_modules/prismarine-viewer/public/textures/', 'public/textures/') + fsExtra.copySync('node_modules/prismarine-viewer/public/worker.js', 'public/worker.js') + fsExtra.copySync('node_modules/prismarine-viewer/public/supportedVersions.json', 'public/supportedVersions.json') + fsExtra.copySync('assets/', 'public/') + fsExtra.copySync('extra-textures/', 'public/extra-textures/') + fsExtra.copySync('config.json', 'public/config.json') +} + +exports.copyFilesDev = () => { + if (fsExtra.existsSync('public/config.json')) return + exports.copyFiles() +} + +const fn = exports[process.argv[2]] + +if (fn) fn() diff --git a/package.json b/package.json index 9700a30ad..338413c2c 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "A minecraft client running in a browser", "main": "index.js", "scripts": { - "build": "webpack --config webpack.prod.js", - "build-dev": "webpack --config webpack.dev.js", + "build": "node build.js copyFiles && webpack --config webpack.prod.js", + "build-dev": "node build.js copyFilesDev && webpack serve --config webpack.dev.js --progress", "start": "node --max-old-space-size=8192 server.js 8080 dev", "prod-start": "node server.js", "build-dev-start": "npm run build-dev && npm run prod-start", diff --git a/webpack.common.js b/webpack.common.js index 98f813c7b..5494e791d 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -2,7 +2,6 @@ const webpack = require('webpack') const path = require('path') const CopyPlugin = require('copy-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin') -const WorkboxPlugin = require('workbox-webpack-plugin') // https://webpack.js.org/guides/production/ const config = { @@ -61,25 +60,18 @@ const config = { /prismarine-viewer[/|\\]viewer[/|\\]lib[/|\\]utils/, './utils.web.js' ), - new WorkboxPlugin.GenerateSW({ - // these options encourage the ServiceWorkers to get in there fast - // and not allow any straggling "old" SWs to hang around - clientsClaim: true, - skipWaiting: true, - include: ['index.html', 'manifest.json'] // not caching a lot as anyway this works only online - }), - new CopyPlugin({ - patterns: [ - { from: path.join(__dirname, '/styles.css'), to: './styles.css' }, - { from: path.join(__dirname, '/node_modules/prismarine-viewer/public/blocksStates/'), to: './blocksStates/' }, - { from: path.join(__dirname, '/node_modules/prismarine-viewer/public/textures/'), to: './textures/' }, - { from: path.join(__dirname, '/node_modules/prismarine-viewer/public/worker.js'), to: './' }, - { from: path.join(__dirname, '/node_modules/prismarine-viewer/public/supportedVersions.json'), to: './' }, - { from: path.join(__dirname, 'assets/'), to: './' }, - { from: path.join(__dirname, 'extra-textures/'), to: './extra-textures/' }, - { from: path.join(__dirname, 'config.json'), to: './config.json' } - ] - }) + // new CopyPlugin({ + // patterns: [ + // { from: path.join(__dirname, '/styles.css'), to: './styles.css' }, + // { from: path.join(__dirname, '/node_modules/prismarine-viewer/public/blocksStates/'), to: './blocksStates/' }, + // { from: path.join(__dirname, '/node_modules/prismarine-viewer/public/textures/'), to: './textures/' }, + // { from: path.join(__dirname, '/node_modules/prismarine-viewer/public/worker.js'), to: './' }, + // { from: path.join(__dirname, '/node_modules/prismarine-viewer/public/supportedVersions.json'), to: './' }, + // { from: path.join(__dirname, 'assets/'), to: './' }, + // { from: path.join(__dirname, 'extra-textures/'), to: './extra-textures/' }, + // { from: path.join(__dirname, 'config.json'), to: './config.json' } + // ] + // }) ] } diff --git a/webpack.dev.js b/webpack.dev.js index c8aa4be07..dbfbae6c5 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -2,15 +2,22 @@ const { merge } = require('webpack-merge') const common = require('./webpack.common.js') const path = require('path') -module.exports = merge(common, { +/** @type {import('webpack-dev-server').Configuration['rel']} */ +module.exports = merge(common, + /** @type {import('webpack').Configuration} */ + { mode: 'development', devtool: 'inline-source-map', cache: true, devServer: { - contentBase: path.resolve(__dirname, './public'), + // contentBase: path.resolve(__dirname, './public'), compress: true, - inline: true, + // inline: true, // open: true, - hot: true + hot: true, + // liveReload: true, + devMiddleware: { + writeToDisk: true, + }, } }) diff --git a/webpack.prod.js b/webpack.prod.js index 5c00efb2d..4f5f6c820 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -3,6 +3,7 @@ const common = require('./webpack.common.js') const LodashModuleReplacementPlugin = require('lodash-webpack-plugin') const { CleanWebpackPlugin } = require('clean-webpack-plugin') +const WorkboxPlugin = require('workbox-webpack-plugin') const webpack = require('webpack') module.exports = merge(common, { @@ -10,6 +11,13 @@ module.exports = merge(common, { plugins: [ new CleanWebpackPlugin(), new webpack.optimize.ModuleConcatenationPlugin(), - new LodashModuleReplacementPlugin() + new LodashModuleReplacementPlugin(), + new WorkboxPlugin.GenerateSW({ + // these options encourage the ServiceWorkers to get in there fast + // and not allow any straggling "old" SWs to hang around + clientsClaim: true, + skipWaiting: true, + include: ['index.html', 'manifest.json'] // not caching a lot as anyway this works only online + }), ] }) From ddf53151083d4a51a2f414d60a5f46cf22460832 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 19:33:24 +0300 Subject: [PATCH 003/318] [pick pr] [wip] mouse raw input. Doesn't work for now for some reason :( --- index.js | 18 +++++++++++++++++- lib/menus/options_screen.js | 12 +++++++++++- styles.css | 3 ++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index 0339782bc..860920d2a 100644 --- a/index.js +++ b/index.js @@ -310,9 +310,25 @@ async function connect (options) { lastTouch = undefined }, { passive: false }) - renderer.domElement.requestPointerLock = renderer.domElement.requestPointerLock || + const requestPointerLock = renderer.domElement.requestPointerLock || renderer.domElement.mozRequestPointerLock || renderer.domElement.webkitRequestPointerLock + renderer.domElement.requestPointerLock = async () => { + // request full keyboard access + // await renderer.domElement.requestFullscreen() + // // navigator.keyboard.lock(['KeyW']) + // const promise = requestPointerLock.apply(renderer.domElement, { + // unadjustedMovement: window.localStorage.getItem('mouseRawInput') === 'true' + // }); + // promise?.catch((error) => { + // if (error.name === "NotSupportedError") { + // // Some platforms may not support unadjusted movement, request again a regular pointer lock. + // requestPointerLock.apply(renderer.domElement) + // } else { + // console.error(error) + // } + // }) + // } document.addEventListener('mousedown', (e) => { if (!chat.inChat && !gameMenu.inMenu) { renderer.domElement.requestPointerLock() diff --git a/lib/menus/options_screen.js b/lib/menus/options_screen.js index a6664d247..117cd1462 100644 --- a/lib/menus/options_screen.js +++ b/lib/menus/options_screen.js @@ -63,6 +63,7 @@ class OptionsScreen extends LitElement { this.fov = getValue('fov', 75, (v) => Number(v)) this.guiScale = getValue('guiScale', 3, (v) => Number(v)) this.forceMobileControls = getValue('forceMobileControls', false, (v) => v === 'true') + this.mouseRawInput = getValue('mouseRawInput', false, (v) => v === 'true') document.documentElement.style.setProperty('--chatScale', `${this.chatScale / 100}`) document.documentElement.style.setProperty('--chatWidth', `${this.chatWidth}px`) @@ -134,7 +135,7 @@ class OptionsScreen extends LitElement { }}> `} - +
{ this.forceMobileControls = !this.forceMobileControls @@ -149,6 +150,15 @@ class OptionsScreen extends LitElement { }>
+
+ { + this.mouseRawInput = !this.mouseRawInput + window.localStorage.setItem('mouseRawInput', `${this.mouseRawInput}`) + this.requestUpdate() + } + }> +
+ displayScreen(this, document.getElementById(this.isInsideWorld ? 'pause-screen' : 'title-screen'))}> ` diff --git a/styles.css b/styles.css index 2bf62eba7..bd8bf6800 100644 --- a/styles.css +++ b/styles.css @@ -15,6 +15,7 @@ html { height: 100vh; overflow: hidden; + touch-action: none; } .dirt-bg { @@ -117,4 +118,4 @@ canvas { width: calc(100% / 1); height: calc(100% / 1); } -} \ No newline at end of file +} From c56c98f50189c9f225ca8e446451bef6fd518af1 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 19:34:09 +0300 Subject: [PATCH 004/318] [pick pr?] fix some bugs? --- index.js | 4 ++-- lib/menus/components/bossbars_overlay.js | 2 +- lib/menus/components/hotbar.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index 860920d2a..b3171ceae 100644 --- a/index.js +++ b/index.js @@ -361,10 +361,10 @@ async function connect (options) { bot.setControlState('jump', true) break case 'KeyD': - bot.setControlState('left', true) + bot.setControlState('right', true) break case 'KeyA': - bot.setControlState('right', true) + bot.setControlState('left', true) break case 'KeyS': bot.setControlState('back', true) diff --git a/lib/menus/components/bossbars_overlay.js b/lib/menus/components/bossbars_overlay.js index ab714bb2b..213fe1409 100644 --- a/lib/menus/components/bossbars_overlay.js +++ b/lib/menus/components/bossbars_overlay.js @@ -69,7 +69,7 @@ class BossBar extends LitElement { setTitle (bar) { if (bar._title.text) this.title = bar._title.text - else this.title = translations[this._title.translate] || 'Unkown Entity' + else this.title = translations[this._title.translate] || 'Unknown Entity' } setColor (bar) { diff --git a/lib/menus/components/hotbar.js b/lib/menus/components/hotbar.js index c148f1642..cd07debf6 100644 --- a/lib/menus/components/hotbar.js +++ b/lib/menus/components/hotbar.js @@ -116,7 +116,7 @@ class Hotbar extends LitElement { }) document.addEventListener('keydown', (e) => { - const numPressed = e.code.substr(5) + const numPressed = +(e.code.match(/Digit(\d)/)?.[1] ?? -1) if (numPressed < 1 || numPressed > 9) return this.reloadHotbarSelected(numPressed - 1) }) From 5bef43031fb72ba2642f92fd0276b99f42e834aa Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 19:36:06 +0300 Subject: [PATCH 005/318] [pick pr] display user gpu in debug overlay. Useful for laptops with iGPU and a dedicated one --- index.js | 8 ++++++++ lib/menus/components/debug_overlay.js | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index b3171ceae..f2474d429 100644 --- a/index.js +++ b/index.js @@ -258,6 +258,14 @@ async function connect (options) { renderer.render(viewer.scene, viewer.camera) } + try { + const gl = renderer.getContext(); + debugMenu.rendererDevice = gl.getParameter(gl.getExtension('WEBGL_debug_renderer_info').UNMASKED_RENDERER_WEBGL) + } catch (err) { + console.error(err) + debugMenu.rendererDevice = '???' + } + // Link WorldView and Viewer viewer.listen(worldView) worldView.listenToBot(bot) diff --git a/lib/menus/components/debug_overlay.js b/lib/menus/components/debug_overlay.js index 463367c4d..aa3755434 100644 --- a/lib/menus/components/debug_overlay.js +++ b/lib/menus/components/debug_overlay.js @@ -19,6 +19,8 @@ class DebugOverlay extends LitElement { .debug-right-side { top: 1px; right: 1px; + /* limit renderer long text width */ + width: 50%; } p { @@ -26,7 +28,7 @@ class DebugOverlay extends LitElement { color: white; font-size: 10px; width: fit-content; - height: 9px; + line-height: 9px; margin: 0; padding: 0; padding-bottom: 1px; @@ -48,6 +50,7 @@ class DebugOverlay extends LitElement { return { showOverlay: { type: Boolean }, cursorBlock: { type: Object }, + rendererDevice: { type: String }, bot: { type: Object }, customEntries: { type: Object } } @@ -134,7 +137,7 @@ class DebugOverlay extends LitElement {
-

Renderer: three.js r${global.THREE.REVISION}

+

Renderer: ${this.rendererDevice} powered by three.js r${global.THREE.REVISION}

${targetDiggable ? html`

${target.name}

${Object.entries(target.getProperties()).map(([n, p], idx, arr) => renderProp(n, p, arr[idx + 1]))}` : ''} ${targetDiggable ? html`

Looking at: ${target.position.x} ${target.position.y} ${target.position.z}

` : ''} From 6f02c10483cdeb9ac494a951090741a264ed05bd Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 19:41:20 +0300 Subject: [PATCH 006/318] actually commit mouse raw input impl --- index.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/index.js b/index.js index f2474d429..28fabf49a 100644 --- a/index.js +++ b/index.js @@ -322,21 +322,21 @@ async function connect (options) { renderer.domElement.mozRequestPointerLock || renderer.domElement.webkitRequestPointerLock renderer.domElement.requestPointerLock = async () => { - // request full keyboard access // await renderer.domElement.requestFullscreen() - // // navigator.keyboard.lock(['KeyW']) - // const promise = requestPointerLock.apply(renderer.domElement, { - // unadjustedMovement: window.localStorage.getItem('mouseRawInput') === 'true' - // }); - // promise?.catch((error) => { - // if (error.name === "NotSupportedError") { - // // Some platforms may not support unadjusted movement, request again a regular pointer lock. - // requestPointerLock.apply(renderer.domElement) - // } else { - // console.error(error) - // } - // }) - // } + // request full keyboard access + // navigator.keyboard.lock(['KeyW']) + const promise = requestPointerLock.apply(renderer.domElement, { + unadjustedMovement: window.localStorage.getItem('mouseRawInput') === 'true' + }); + promise?.catch((error) => { + if (error.name === "NotSupportedError") { + // Some platforms may not support unadjusted movement, request again a regular pointer lock. + requestPointerLock.apply(renderer.domElement) + } else { + console.error(error) + } + }) + } document.addEventListener('mousedown', (e) => { if (!chat.inChat && !gameMenu.inMenu) { renderer.domElement.requestPointerLock() From 45ea9aed1908bbfa88f931098692793b53d5a8e0 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 20:38:03 +0300 Subject: [PATCH 007/318] minor fixes... --- build.js | 1 + index.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.js b/build.js index 0b9496f0b..399476435 100644 --- a/build.js +++ b/build.js @@ -1,6 +1,7 @@ const fsExtra = require('fs-extra') exports.copyFiles = () => { + fsExtra.copySync('styles.css', 'public/styles.css') fsExtra.copySync('node_modules/prismarine-viewer/public/blocksStates/', 'public/blocksStates/') fsExtra.copySync('node_modules/prismarine-viewer/public/textures/', 'public/textures/') fsExtra.copySync('node_modules/prismarine-viewer/public/worker.js', 'public/worker.js') diff --git a/index.js b/index.js index 28fabf49a..f65257b59 100644 --- a/index.js +++ b/index.js @@ -399,10 +399,10 @@ async function connect (options) { bot.setControlState('jump', false) break case 'KeyD': - bot.setControlState('left', false) + bot.setControlState('right', false) break case 'KeyA': - bot.setControlState('right', false) + bot.setControlState('left', false) break case 'KeyS': bot.setControlState('back', false) From f24c04a94ba0a446fe3bcc2bad577e2227650395 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 20:48:12 +0300 Subject: [PATCH 008/318] update deps & use PNPM! --- .npmrc | 1 + package.json | 43 +++++++++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.npmrc b/.npmrc index 43c97e719..8124febb2 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1,2 @@ package-lock=false +public-hoist-pattern=* diff --git a/package.json b/package.json index 338413c2c..20f33d8dd 100644 --- a/package.json +++ b/package.json @@ -35,12 +35,14 @@ "homepage": "https://github.com/PrismarineJS/prismarine-web-client#readme", "dependencies": { "compression": "^1.7.4", - "express": "^4.17.1", + "express": "^4.18.2", + "fs-extra": "^11.1.1", "ismobilejs": "^1.1.1", - "lit": "^2.0.2", - "net-browserify": "PrismarineJS/net-browserify", + "lit": "^2.8.0", + "net-browserify": "github:PrismarineJS/net-browserify", "querystring": "^0.2.1", - "url": "^0.11.0" + "stats.js": "^0.17.0", + "url": "^0.11.1" }, "devDependencies": { "assert": "^2.0.0", @@ -50,29 +52,30 @@ "constants-browserify": "^1.0.0", "copy-webpack-plugin": "^11.0.0", "crypto-browserify": "^3.12.0", - "events": "^3.2.0", - "html-webpack-plugin": "^5.3.1", + "events": "^3.3.0", + "html-webpack-plugin": "^5.5.3", "http-browserify": "^1.7.0", - "http-server": "^14.1.0", + "http-server": "^14.1.1", "https-browserify": "^1.0.0", "lodash-webpack-plugin": "^0.11.6", - "memfs": "^3.2.0", - "mineflayer": "^4.1.0", - "mineflayer-pathfinder": "^2.0.0", - "mocha": "^10.0.0", + "memfs": "^3.5.3", + "mineflayer": "^4.10.1", + "mineflayer-pathfinder": "^2.4.4", + "mocha": "^10.2.0", "os-browserify": "^0.3.0", "path-browserify": "^1.0.1", - "prismarine-viewer": "^1.22.0", - "process": "PrismarineJS/node-process", - "standard": "^17.0.0", + "prismarine-viewer": "github:PrismarineJS/prismarine-viewer", + "process": "github:PrismarineJS/node-process", + "standard": "^17.1.0", "stream-browserify": "^3.0.0", "three": "0.127.0", "timers-browserify": "^2.0.12", - "webpack": "^5.11.0", - "webpack-cli": "^5.0.0", - "webpack-dev-middleware": "^6.0.0", - "webpack-dev-server": "^4.0.0", - "webpack-merge": "^5.7.3", - "workbox-webpack-plugin": "^6.1.2" + "vite": "^4.4.9", + "webpack": "^5.88.2", + "webpack-cli": "^5.1.4", + "webpack-dev-middleware": "^6.1.1", + "webpack-dev-server": "^4.15.1", + "webpack-merge": "^5.9.0", + "workbox-webpack-plugin": "^6.6.0" } } From dd705b466286ac580a1b26a2053a549a136350ae Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 20:58:53 +0300 Subject: [PATCH 009/318] enable vr in chrome [openXR] (to be tested actually) --- lib/vr.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/vr.js b/lib/vr.js index 1f2a1a3fb..72d23cb13 100644 --- a/lib/vr.js +++ b/lib/vr.js @@ -5,9 +5,10 @@ const { GLTFLoader } = require('three/examples/jsm/loaders/GLTFLoader.js') const { XRControllerModelFactory } = require('three/examples/jsm/webxr/XRControllerModelFactory.js') const TWEEN = require('@tweenjs/tween.js') -function initVR (bot, renderer, viewer) { +async function initVR (bot, renderer, viewer) { if (!('xr' in navigator)) return - if (!navigator.userAgent.includes('OculusBrowser')) return + const isSupported = await navigator.xr.isSessionSupported('immersive-vr') + if (!isSupported) return // VR document.body.appendChild(VRButton.createButton(renderer)) From cd3c1f397372dc16e702042b12069c40d40d0acc Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 20:59:02 +0300 Subject: [PATCH 010/318] fix build agan... --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 20f33d8dd..9c583ceeb 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "A minecraft client running in a browser", "main": "index.js", "scripts": { - "build": "node build.js copyFiles && webpack --config webpack.prod.js", + "build": "webpack --config webpack.prod.js --progress && node build.js copyFiles", "build-dev": "node build.js copyFilesDev && webpack serve --config webpack.dev.js --progress", "start": "node --max-old-space-size=8192 server.js 8080 dev", "prod-start": "node server.js", From a9774410469b1a6d61059956b75e385815ecdc31 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 21:00:50 +0300 Subject: [PATCH 011/318] Add debug config! --- .vscode/launch.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..cd96259cd --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,18 @@ +{ + "configurations": [ + { + "type": "msedge", + "name": "https://localhost:8080/", + "request": "launch", + "url": "https://localhost:8080/", + "outFiles": [ + "${workspaceFolder}/public/**/*.js", + "!${workspaceFolder}/public/**/*vendors*", + "!**/node_modules/**" + ], + "skipFiles": [ + "/**/*vendors-*" + ], + }, + ] +} From c6936407b2a889682a97f708e19f4b47471efc46 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 21:01:06 +0300 Subject: [PATCH 012/318] use chunks in dev --- webpack.common.js | 5 +++-- webpack.dev.js | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/webpack.common.js b/webpack.common.js index 5494e791d..7c0392c32 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -8,7 +8,7 @@ const config = { entry: path.resolve(__dirname, './index.js'), output: { path: path.resolve(__dirname, './public'), - filename: './index.js', + filename: './[name]-[chunkhash].js', publicPath: './' }, resolve: { @@ -47,7 +47,8 @@ const config = { new HtmlWebpackPlugin({ template: 'index.html', hash: true, - minify: false + minify: false, + chunks: ['main', 'vendors'], }), // fix "process is not defined" error: new webpack.ProvidePlugin({ diff --git a/webpack.dev.js b/webpack.dev.js index dbfbae6c5..c55939797 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -19,5 +19,19 @@ module.exports = merge(common, devMiddleware: { writeToDisk: true, }, + }, + optimization: { + splitChunks: { + maxAsyncRequests: 10, + maxInitialRequests: 10, + cacheGroups: { + vendors: { + test: /[\\/]node_modules[\\/]/, + name: "vendors", + priority: 10, + chunks: 'all' + } + } + } } }) From 341ce21329f5cdd2a41b4c49e57a907a263d7f6a Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 21:36:39 +0300 Subject: [PATCH 013/318] use temporarily github pages as vercel cant fetch some git repos? --- .github/workflows/publish.yml | 41 +++++++++++------------------------ 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 061457c86..fb0353795 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,33 +1,18 @@ -name: npm-publish +name: Deploy to GitHub pages on: push: - branches: - - master # Change this to your default branch + branches: [main] jobs: - npm-publish: - name: npm-publish + build-and-deploy: runs-on: ubuntu-latest + permissions: write-all steps: - - name: Checkout repository - uses: actions/checkout@master - - name: Set up Node.js - uses: actions/setup-node@master - with: - node-version: 18.0.0 - - run: npm install - - id: publish - uses: JS-DevTools/npm-publish@v1 - with: - token: ${{ secrets.NPM_AUTH_TOKEN }} - - name: Create Release - if: steps.publish.outputs.type != 'none' - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ steps.publish.outputs.version }} - release_name: Release ${{ steps.publish.outputs.version }} - body: ${{ steps.publish.outputs.version }} - draft: false - prerelease: false + - name: Checkout repository + uses: actions/checkout@master + - run: pnpm install + - run: pnpm build + - uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./public + force_orphan: true From b77f00bc6d97bd97e634c0345a6bdd23cdcbaf2b Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 9 Aug 2023 21:37:07 +0300 Subject: [PATCH 014/318] oops. install pnpm first. --- .github/workflows/publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index fb0353795..e3cd5aec4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,6 +9,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@master + - name: Install pnpm + run: npm i -g pnpm - run: pnpm install - run: pnpm build - uses: peaceiris/actions-gh-pages@v3 From e1b1938210b3c0da7d07efb79d8001fdbf51369b Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 10 Aug 2023 14:09:31 +0300 Subject: [PATCH 015/318] some basic type-checking change start script --- globals.d.ts | 9 +++++++++ index.js | 5 +++++ package.json | 2 +- tsconfig.json | 12 ++++++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 globals.d.ts create mode 100644 tsconfig.json diff --git a/globals.d.ts b/globals.d.ts new file mode 100644 index 000000000..34d5ea017 --- /dev/null +++ b/globals.d.ts @@ -0,0 +1,9 @@ +declare const THREE: any; + +declare interface Document { + getElementById(id): any +} + +declare interface Window extends Record { + +} diff --git a/index.js b/index.js index f65257b59..abab009bb 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,4 @@ +//@ts-check /* global THREE */ require('./lib/chat') @@ -29,6 +30,7 @@ const mineflayer = require('mineflayer') const { WorldView, Viewer } = require('prismarine-viewer/viewer') const pathfinder = require('mineflayer-pathfinder') const { Vec3 } = require('vec3') +//@ts-ignore global.THREE = require('three') const { initVR } = require('./lib/vr') @@ -171,6 +173,7 @@ async function connect (options) { if (proxy) { console.log(`using proxy ${proxy} ${proxyport}`) + //@ts-ignore net.setProxy({ hostname: proxy, port: proxyport }) } @@ -291,7 +294,9 @@ async function connect (options) { function changeCallback () { if (document.pointerLockElement === renderer.domElement || + // @ts-ignore document.mozPointerLockElement === renderer.domElement || + // @ts-ignore document.webkitPointerLockElement === renderer.domElement) { document.addEventListener('mousemove', moveCallback, false) } else { diff --git a/package.json b/package.json index 9c583ceeb..98b5a5ea3 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "build": "webpack --config webpack.prod.js --progress && node build.js copyFiles", "build-dev": "node build.js copyFilesDev && webpack serve --config webpack.dev.js --progress", - "start": "node --max-old-space-size=8192 server.js 8080 dev", + "start": "NODE_OPTIONS=--max-old-space-size=8192 pnpm build-dev", "prod-start": "node server.js", "build-dev-start": "npm run build-dev && npm run prod-start", "build-start": "npm run build && npm run prod-start", diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 000000000..ee49561e4 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,12 @@ +{ + "compilerOptions": { + "allowJs": true, + "allowSyntheticDefaultImports": true, + "noEmit": true + }, + "include": [ + "index.js", + "globals.d.ts", + "lib" + ] +} From cdbb551a786ce295f531bfd1efe00430ed3bbc49 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 10 Aug 2023 22:59:28 +0300 Subject: [PATCH 016/318] make all inputs user-friendly. add server history autocomplete (temporary solution) --- index.js | 5 +++++ lib/menus/components/edit_box.js | 23 ++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index abab009bb..55c2a4348 100644 --- a/index.js +++ b/index.js @@ -214,6 +214,11 @@ async function connect (options) { }) bot.once('login', () => { + // server is ok, add it to the history + /** @type {string[]} */ + const serverHistory = JSON.parse(localStorage.getItem('serverHistory') || '[]') + serverHistory.unshift(options.server) + localStorage.setItem('serverHistory', JSON.stringify([...new Set(serverHistory)])) loadingScreen.status = 'Loading world' }) diff --git a/lib/menus/components/edit_box.js b/lib/menus/components/edit_box.js index a8ac38fb1..934f541c4 100644 --- a/lib/menus/components/edit_box.js +++ b/lib/menus/components/edit_box.js @@ -68,6 +68,17 @@ class EditBox extends LitElement { value: { type: String, attribute: 'pmui-value' + }, + autocompleteValues: { + type: Array, + }, + type: { + type: String, + attribute: 'pmui-type' + }, + inputMode: { + type: String, + attribute: 'pmui-inputmode' } } } @@ -79,14 +90,24 @@ class EditBox extends LitElement { style="width: ${this.width};" > + ${this.autocompleteValues ? html` + + ${this.autocompleteValues.map(value => html` + + `)} + + ` : ''} { this.value = e.target.value }} class="edit-box">
From fa5f8568c614bdfeb295b9dd30a4551a21aafa44 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 10 Aug 2023 23:02:07 +0300 Subject: [PATCH 017/318] load click sound on page load as bonus resources num in devtools is more realistic right after page load --- index.js | 1 + lib/menus/components/button.js | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/index.js b/index.js index 55c2a4348..7772d12d2 100644 --- a/index.js +++ b/index.js @@ -219,6 +219,7 @@ async function connect (options) { const serverHistory = JSON.parse(localStorage.getItem('serverHistory') || '[]') serverHistory.unshift(options.server) localStorage.setItem('serverHistory', JSON.stringify([...new Set(serverHistory)])) + loadingScreen.status = 'Loading world' }) diff --git a/lib/menus/components/button.js b/lib/menus/components/button.js index e03b54a10..eae2de7db 100644 --- a/lib/menus/components/button.js +++ b/lib/menus/components/button.js @@ -3,6 +3,14 @@ const { LitElement, html, css } = require('lit') const audioContext = new window.AudioContext() const sounds = {} +// load as many resources on page load as possible instead on demand as user can disable internet connection after he thinks the page is loaded +async function loadSound(path) { + const res = await window.fetch(path) + const data = await res.arrayBuffer() + + sounds[path] = await audioContext.decodeAudioData(data) +} + async function playSound (path) { let volume = 1 const options = document.getElementById('options-screen') @@ -11,14 +19,7 @@ async function playSound (path) { } let soundBuffer = sounds[path] - - if (!soundBuffer) { - const res = await window.fetch(path) - const data = await res.arrayBuffer() - - soundBuffer = await audioContext.decodeAudioData(data) - sounds[path] = soundBuffer - } + if (!soundBuffer) throw new Error(`Sound ${path} not loaded`) const gainNode = audioContext.createGain() const source = audioContext.createBufferSource() @@ -135,6 +136,7 @@ class Button extends LitElement { } } +loadSound('click_stereo.ogg') window.customElements.define('pmui-button', Button) const _playSound = playSound export { _playSound as playSound } From 95a54ef09ca4257fd59041dc452b6958afca52b3 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 10 Aug 2023 23:59:42 +0300 Subject: [PATCH 018/318] [fixup] make all inputs mobile-friendly --- lib/menus/play_screen.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/menus/play_screen.js b/lib/menus/play_screen.js index fb9aa07e2..412151cca 100644 --- a/lib/menus/play_screen.js +++ b/lib/menus/play_screen.js @@ -87,6 +87,8 @@ class PlayScreen extends LitElement { pmui-label="Server IP" pmui-id="serverip" pmui-value="${this.server}" + pmui-type="url" + .autocompleteValues=${JSON.parse(localStorage.getItem('serverHistory') || '[]')} @input=${e => { this.server = e.target.value }} > { this.serverport = e.target.value }} > @@ -103,6 +106,7 @@ class PlayScreen extends LitElement { pmui-label="Proxy" pmui-id="proxy" pmui-value="${this.proxy}" + pmui-type="url" @input=${e => { this.proxy = e.target.value }} > { this.proxyport = e.target.value }} > @@ -126,6 +131,7 @@ class PlayScreen extends LitElement { pmui-label="Bot Version" pmui-id="botversion" pmui-value="${this.version}" + pmui-inputmode="decimal" @input=${e => { this.version = e.target.value }} > From f1f95af918ac87638bad1623be90563595bf9086 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 11 Aug 2023 01:16:25 +0300 Subject: [PATCH 019/318] feat: allow to pass connect config in search params and auto reconnect for faster development! remove old impl, which was duplicating & bloading code a didnt allow to particially pass data to join screen such as username --- index.js | 51 ++-------------------------------------- lib/menus/play_screen.js | 34 ++++++++++++++++++++------- 2 files changed, 28 insertions(+), 57 deletions(-) diff --git a/index.js b/index.js index 7772d12d2..b2f4dbe9a 100644 --- a/index.js +++ b/index.js @@ -439,52 +439,5 @@ async function connect (options) { }) } -/** - * @param {URLSearchParams} params - */ -async function fromTheOutside (params, addr) { - const opts = {} - const dfltConfig = await (await window.fetch('config.json')).json() - - let server, port, proxy, proxyPort - - if (address.includes(':')) { - const s = address.split(':') - server = s[0] - port = Number(s[1]) || 25565 - } else { - server = address - port = Number(params.get('port')) || 25565 - } - - const proxyAddr = params.get('proxy') - if (proxyAddr) { - const s = proxyAddr.split(':') - proxy = s[0] - proxyPort = Number(s[1] ?? 'NaN') || 22 - } else { - proxy = dfltConfig.defaultProxy - proxyPort = !dfltConfig.defaultProxy && !dfltConfig.defaultProxyPort ? '' : dfltConfig.defaultProxyPort ?? 443 - } - - opts.server = `${server}:${port}` - opts.proxy = `${proxy}:${proxyPort}` - opts.username = params.get('username') ?? `pviewer${Math.floor(Math.random() * 1000)}` - opts.password = params.get('password') ?? '' - opts.botVersion = params.get('version') ?? false - - console.log(opts) - - showEl('loading-screen') - removePanorama() - connect(opts) -} - -const params = new URLSearchParams(window.location.search) -let address -if ((address = params.get('address'))) { - fromTheOutside(params, address) -} else { - showEl('title-screen') - main() -} +showEl('title-screen') +main() diff --git a/lib/menus/play_screen.js b/lib/menus/play_screen.js index 412151cca..ac0326445 100644 --- a/lib/menus/play_screen.js +++ b/lib/menus/play_screen.js @@ -63,14 +63,31 @@ class PlayScreen extends LitElement { constructor () { super() - this.username = window.localStorage.getItem('username') ?? 'pviewer' + (Math.floor(Math.random() * 1000)) - this.password = window.localStorage.getItem('password') ?? '' - window.fetch('config.json').then(res => res.json()).then(config => { - this.server = window.localStorage.getItem('server') ?? config.defaultHost - this.serverport = window.localStorage.getItem('serverport') ?? config.defaultHostPort ?? 25565 - this.proxy = window.localStorage.getItem('proxy') ?? config.defaultProxy - this.proxyport = window.localStorage.getItem('proxyport') ?? (!config.defaultProxy && !config.defaultProxyPort ? '' : config.defaultProxyPort ?? 443) - this.version = window.localStorage.getItem('version') ?? config.defaultVersion + window.fetch('config.json').then(res => res.json()).then(c => c, (error) => { + console.error('Failed to load config.json', error) + return {} + }).then(config => { + const params = new URLSearchParams(window.location.search) + + const getParam = (localStorageKey, qs = localStorageKey) => { + const qsValue = qs ? params.get(qs) : undefined + if (qsValue) { + document.getElementById('title-screen').style.display = 'none' + this.style.display = 'block' + } + return qsValue || window.localStorage.getItem(localStorageKey) + } + + this.server = getParam('server', 'ip') ?? config.defaultHost + this.serverport = getParam('serverport', false) ?? config.defaultHostPort ?? 25565 + this.proxy = getParam('proxy') ?? config.defaultProxy + this.proxyport = getParam('proxyport', false) ?? (!config.defaultProxy && !config.defaultProxyPort ? '' : config.defaultProxyPort ?? 443) + this.version = getParam('version') || (window.localStorage.getItem('version') ?? config.defaultVersion) + this.username = getParam('username') || 'pviewer' + (Math.floor(Math.random() * 1000)) + this.password = getParam('password') || '' + if (process.env.NODE_ENV === 'development' && params.get('reconnect') && this.server && this.username) { + this.onConnectPress() + } }) } @@ -146,6 +163,7 @@ class PlayScreen extends LitElement { } onConnectPress () { + document.getElementById('title-screen').style.display = 'none' window.localStorage.setItem('username', this.username) window.localStorage.setItem('password', this.password) window.localStorage.setItem('server', this.server) From c13585509517700a7d6ec1d71a3eb093b9add396 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 11 Aug 2023 04:19:12 +0300 Subject: [PATCH 020/318] NEW escape stack management! Super scalable impl that shouldnt have bugs at all! (already debugged some) remove displayScreen in favor of new fns --- index.js | 64 +++++++++++--------- lib/chat.js | 57 +++++++----------- lib/globalState.js | 49 +++++++++++++++ lib/menus/components/common.js | 10 ---- lib/menus/hud.js | 25 ++++---- lib/menus/keybinds_screen.js | 21 +++---- lib/menus/loading_screen.js | 7 ++- lib/menus/options_screen.js | 105 +++++++++++++++++---------------- lib/menus/pause_screen.js | 51 ++++------------ lib/menus/play_screen.js | 7 ++- lib/menus/title_screen.js | 11 +++- lib/utils.js | 5 ++ 12 files changed, 218 insertions(+), 194 deletions(-) create mode 100644 lib/globalState.js create mode 100644 lib/utils.js diff --git a/index.js b/index.js index b2f4dbe9a..f319cf5b1 100644 --- a/index.js +++ b/index.js @@ -124,6 +124,13 @@ window.addEventListener('resize', () => { renderer.setSize(window.innerWidth, window.innerHeight) }) +const loadingScreen = document.getElementById('loading-screen') + +const hud = document.getElementById('hud') +const optionsScrn = document.getElementById('options-screen') +const keyBindScrn = document.getElementById('keybinds-screen') +const pauseMenu = document.getElementById('pause-screen') + const showEl = (str) => { document.getElementById(str).style = 'display:block' } async function main () { const menu = document.getElementById('play-screen') @@ -131,21 +138,13 @@ async function main () { menu.addEventListener('connect', e => { const options = e.detail menu.style = 'display: none;' - showEl('loading-screen') removePanorama() connect(options) }) } async function connect (options) { - const loadingScreen = document.getElementById('loading-screen') - - const hud = document.getElementById('hud') - const chat = hud.shadowRoot.querySelector('#chat') const debugMenu = hud.shadowRoot.querySelector('#debug-overlay') - const optionsScrn = document.getElementById('options-screen') - const keyBindScrn = document.getElementById('keybinds-screen') - const gameMenu = document.getElementById('pause-screen') const viewDistance = optionsScrn.renderDistance const hostprompt = options.server @@ -194,22 +193,22 @@ async function connect (options) { bot.on('error', (err) => { console.log('Encountered error!', err) + showModal(loadingScreen) loadingScreen.status = `Error encountered. Error message: ${err}. Please reload the page` - loadingScreen.style = 'display: block;' loadingScreen.hasError = true }) bot.on('kicked', (kickReason) => { console.log('User was kicked!', kickReason) + showModal(loadingScreen) loadingScreen.status = `The Minecraft server kicked you. Kick reason: ${kickReason}. Please reload the page to rejoin` - loadingScreen.style = 'display: block;' loadingScreen.hasError = true }) bot.on('end', (endReason) => { console.log('disconnected for', endReason) + showModal(loadingScreen) loadingScreen.status = `You have been disconnected from the server. End reason: ${endReason}. Please reload the page to rejoin` - loadingScreen.style = 'display: block;' loadingScreen.hasError = true }) @@ -234,10 +233,8 @@ async function connect (options) { const center = bot.entity.position - console.log(viewDistance) const worldView = new WorldView(bot.world, viewDistance, center) - gameMenu.init(renderer) optionsScrn.isInsideWorld = true optionsScrn.addEventListener('fov_changed', (e) => { viewer.camera.fov = e.detail.fov @@ -268,7 +265,7 @@ async function connect (options) { } try { - const gl = renderer.getContext(); + const gl = renderer.getContext() debugMenu.rendererDevice = gl.getParameter(gl.getExtension('WEBGL_debug_renderer_info').UNMASKED_RENDERER_WEBGL) } catch (err) { console.error(err) @@ -291,6 +288,7 @@ async function connect (options) { loadingScreen.status = 'Setting callbacks' function moveCallback (e) { + if (!pointerLock.hasPointerLock) return bot.entity.pitch -= e.movementY * optionsScrn.mouseSensitivityY * 0.0001 bot.entity.pitch = Math.max(minPitch, Math.min(maxPitch, bot.entity.pitch)) bot.entity.yaw -= e.movementX * optionsScrn.mouseSensitivityX * 0.0001 @@ -299,17 +297,12 @@ async function connect (options) { } function changeCallback () { - if (document.pointerLockElement === renderer.domElement || - // @ts-ignore - document.mozPointerLockElement === renderer.domElement || - // @ts-ignore - document.webkitPointerLockElement === renderer.domElement) { - document.addEventListener('mousemove', moveCallback, false) - } else { - document.removeEventListener('mousemove', moveCallback, false) + if (!pointerLock.hasPointerLock && activeModalStack.length === 0) { + showModal(pauseMenu) } } + document.addEventListener('mousemove', moveCallback, false) document.addEventListener('pointerlockchange', changeCallback, false) document.addEventListener('mozpointerlockchange', changeCallback, false) document.addEventListener('webkitpointerlockchange', changeCallback, false) @@ -338,7 +331,7 @@ async function connect (options) { // navigator.keyboard.lock(['KeyW']) const promise = requestPointerLock.apply(renderer.domElement, { unadjustedMovement: window.localStorage.getItem('mouseRawInput') === 'true' - }); + }) promise?.catch((error) => { if (error.name === "NotSupportedError") { // Some platforms may not support unadjusted movement, request again a regular pointer lock. @@ -361,8 +354,7 @@ async function connect (options) { }, false) document.addEventListener('keydown', (e) => { - if (chat.inChat) return - if (gameMenu.inMenu) return + if (activeModalStack.length) return keyBindScrn.keymaps.forEach(km => { if (e.code === km.key) { @@ -427,17 +419,35 @@ async function connect (options) { }, false) loadingScreen.status = 'Done!' - console.log(loadingScreen.status) // only do that because it's read in index.html and npm run fix complains. + console.log('Done!') hud.init(renderer, bot, host) hud.style.display = 'block' setTimeout(function () { + if (loadingScreen.hasError) return // remove loading screen, wait a second to make sure a frame has properly rendered - loadingScreen.style = 'display: none;' + hideModal(loadingScreen) }, 2500) }) } +const requestPointerLock = () => { + if (hud.style.display === 'none' || activeModalStack.length) return + renderer.domElement.requestPointerLock() +} + +window.addEventListener('mousedown', (e) => { + requestPointerLock() +}) + +window.addEventListener('keydown', (e) => { + if (e.code === 'Escape') { + hideModal(undefined, { event: e, renderer }, () => { + requestPointerLock() // if no modals left + }) + } +}) + showEl('title-screen') main() diff --git a/lib/chat.js b/lib/chat.js index fb4bc562c..38d94b2ef 100644 --- a/lib/chat.js +++ b/lib/chat.js @@ -1,5 +1,6 @@ const { LitElement, html, css } = require('lit') const { isMobile } = require('./menus/components/common') +const { activeModalStack, hideCurrentModal } = require('./globalState') const styles = { black: 'color:#000000', @@ -93,7 +94,7 @@ class ChatBox extends LitElement { #chatinput:focus { border-color: white; } - + .chat-message { display: block; padding-left: 4px; @@ -148,8 +149,8 @@ class ChatBox extends LitElement { this.shadowRoot.querySelector('#chat-wrapper2').classList.toggle('input-mobile', isMobile()) this.shadowRoot.querySelector('#chat-wrapper').classList.toggle('display-mobile', isMobile()) - // Set inChat value - this.inChat = true + activeModalStack.push(this) + // Exit the pointer lock document.exitPointerLock() // Show chat input @@ -166,31 +167,25 @@ class ChatBox extends LitElement { document.querySelector('#hud').shadowRoot.querySelector('#chat').shadowRoot.querySelectorAll('.chat-message').forEach(e => e.classList.add('chat-message-chat-opened')) } + get inChat () { + return activeModalStack.includes(this) + } + /** - * @param {globalThis.THREE.Renderer} client - * @param {import('minecraft-protocol').Client} renderer + * @param {import('minecraft-protocol').Client} client */ - init (client, renderer) { - this.inChat = false + init (client) { const chat = this.shadowRoot.querySelector('#chat') - const gameMenu = document.getElementById('pause-screen') const chatInput = this.shadowRoot.querySelector('#chatinput') - renderer.domElement.requestPointerLock = renderer.domElement.requestPointerLock || - renderer.domElement.mozRequestPointerLock || - renderer.domElement.webkitRequestPointerLock - // Show chat chat.style.display = 'block' - // Esc event - Doesnt work with onkeypress?! - keypressed is deprecated uk + // Chat events document.addEventListener('keydown', e => { - if (gameMenu.inMenu) return - if (!this.inChat) return + if (activeModalStack.slice(-1)[0] !== this) return e = e || window.event - if (e.code === 'Escape') { - disableChat() - } else if (e.code === 'ArrowUp') { + if (e.code === 'ArrowUp') { if (this.chatHistoryPos === 0) return chatInput.value = this.chatHistory[--this.chatHistoryPos] !== undefined ? this.chatHistory[this.chatHistoryPos] : '' setTimeout(() => { chatInput.setSelectionRange(-1, -1) }, 0) @@ -203,11 +198,9 @@ class ChatBox extends LitElement { const keyBindScrn = document.getElementById('keybinds-screen') - // Chat events document.addEventListener('keypress', e => { - if (gameMenu.inMenu) return e = e || window.event - if (this.inChat === false) { + if (!this.inChat && activeModalStack.length === 0) { keyBindScrn.keymaps.forEach(km => { if (e.code === km.key) { switch (km.defaultKey) { @@ -231,17 +224,11 @@ class ChatBox extends LitElement { if (e.code === 'Enter') { this.chatHistory.push(chatInput.value) client.write('chat', { message: chatInput.value }) - disableChat() + hideCurrentModal() } }) - const disableChat = () => { - this.inChat = false - hideChat() - renderer.domElement.requestPointerLock() - } - - const hideChat = () => { + this.hide = () => { // Clear chat input chatInput.value = '' // Unfocus it @@ -252,7 +239,9 @@ class ChatBox extends LitElement { chat.style.maxHeight = 'var(--chatHeight)' chat.scrollTop = chat.scrollHeight // Stay bottom of the list document.querySelector('#hud').shadowRoot.querySelector('#chat').shadowRoot.querySelectorAll('.chat-message').forEach(e => e.classList.remove('chat-message-chat-opened')) + return 'custom' // custom hide } + this.hide() client.on('chat', (packet) => { // Reading of chat message @@ -330,11 +319,9 @@ class ChatBox extends LitElement { span.appendChild(document.createTextNode(msg.text)) span.setAttribute( 'style', - `${msg.color ? colorF(msg.color.toLowerCase()) + `; text-shadow: 1px 1px 0px ${colorShadow(colorF(msg.color.toLowerCase()).replace('color:', ''))}` : styles.white}; ${ - msg.bold ? styles.bold + ';' : '' - }${msg.italic ? styles.italic + ';' : ''}${ - msg.strikethrough ? styles.strikethrough + ';' : '' - }${msg.underlined ? styles.underlined + ';' : ''}` + `${msg.color ? colorF(msg.color.toLowerCase()) + `; text-shadow: 1px 1px 0px ${colorShadow(colorF(msg.color.toLowerCase()).replace('color:', ''))}` : styles.white}; ${msg.bold ? styles.bold + ';' : '' + }${msg.italic ? styles.italic + ';' : ''}${msg.strikethrough ? styles.strikethrough + ';' : '' + }${msg.underlined ? styles.underlined + ';' : ''}` ) li.appendChild(span) }) @@ -353,8 +340,6 @@ class ChatBox extends LitElement { }, 3000) }, 5000) }) - - hideChat() } } diff --git a/lib/globalState.js b/lib/globalState.js new file mode 100644 index 000000000..046aa78e0 --- /dev/null +++ b/lib/globalState.js @@ -0,0 +1,49 @@ +//@ts-check + +/** + * @typedef {(HTMLElement & Record)} Modal + */ + +/** @type {Modal[]} */ +export const activeModalStack = [] + +window.activeModalStack = activeModalStack + +export const customDisplayManageKeyword = 'custom' + +const showModalInner = (/** @type {Modal} */ modal) => { + const cancel = modal.show?.() + if (cancel && cancel !== customDisplayManageKeyword) return false + if (cancel !== 'custom') modal.style.display = 'block' + return true +} + +export const showModal = (/** @type {Modal} */ modal) => { + const curModal = activeModalStack.slice(-1)[0] + if (modal === curModal || !showModalInner(modal)) return + if (curModal) curModal.style.display = 'none' + activeModalStack.push(modal) +} + +export const hideModal = (modal = activeModalStack.slice(-1)[0], data, postActions) => { + if (modal) { + const cancel = modal.hide?.(data) + if (!cancel || cancel === customDisplayManageKeyword) { + if (cancel !== customDisplayManageKeyword) modal.style.display = 'none' + activeModalStack.pop() + const newModal = activeModalStack.slice(-1)[0] + if (newModal) { + // would be great to ignore cancel I guess? + showModalInner(newModal) + } + postActions?.() + } + } else { + document.exitPointerLock() + } +} + +export const hideCurrentModal = () => { + // todo this might be tricky + window.dispatchEvent(new KeyboardEvent('keydown', { code: 'Escape', })) // trigger handler in index.js +} diff --git a/lib/menus/components/common.js b/lib/menus/components/common.js index 5be48a78c..e84fe4304 100644 --- a/lib/menus/components/common.js +++ b/lib/menus/components/common.js @@ -55,18 +55,8 @@ function openURL (url) { window.open(url, '_blank', 'noopener,noreferrer') } -/** - * @param {HTMLElement} prev - * @param {HTMLElement} next - */ -function displayScreen (prev, next) { - prev.style.display = 'none' - next.style.display = 'block' -} - export { commonCss, isMobile, openURL, - displayScreen } diff --git a/lib/menus/hud.js b/lib/menus/hud.js index 48bcdd1e9..659d22df7 100644 --- a/lib/menus/hud.js +++ b/lib/menus/hud.js @@ -1,5 +1,6 @@ const { LitElement, html, css } = require('lit') const { isMobile } = require('./components/common') +const { showModal } = require('../globalState') class Hud extends LitElement { static get styles () { @@ -222,7 +223,7 @@ class Hud extends LitElement { debugMenu.bot = bot hotbar.init() - chat.init(bot._client, renderer) + chat.init(bot._client) bot.on('spawn', () => playerList.init(bot, host)) bot.on('entityHurt', (entity) => { @@ -300,13 +301,13 @@ class Hud extends LitElement { return html`
+ e.stopPropagation() + this.shadowRoot.querySelector('#chat').enableChat(false) + }}> + e.stopPropagation() + showModal(document.getElementById('pause-screen')) + }}>
+ e.stopPropagation() + const b = e.target.classList.toggle('is-down') + this.bot.setControlState('sneak', b) + }}>
-
`)} @@ -156,7 +157,7 @@ class KeyBindsScreen extends LitElement {
v.key !== v.defaultKey)} @pmui-click=${this.onResetAllPress}> - displayScreen(this, document.getElementById('options-screen'))}> + hideCurrentModal()}>
` } diff --git a/lib/menus/loading_screen.js b/lib/menus/loading_screen.js index 845111b65..d86dbdb3c 100644 --- a/lib/menus/loading_screen.js +++ b/lib/menus/loading_screen.js @@ -50,12 +50,17 @@ class LoadingScreen extends LitElement { load() } + hide () { + // cancel hiding + return true + } + render () { return html`

${this.hasError ? this.status : this.loadingText}

- + ${this.hasError ? html` window.location.reload()}>` : '' diff --git a/lib/menus/options_screen.js b/lib/menus/options_screen.js index 117cd1462..da16dd225 100644 --- a/lib/menus/options_screen.js +++ b/lib/menus/options_screen.js @@ -1,5 +1,6 @@ const { LitElement, html, css } = require('lit') -const { commonCss, displayScreen, isMobile } = require('./components/common') +const { commonCss, isMobile } = require('./components/common') +const { showModal, hideCurrentModal } = require('../globalState') class OptionsScreen extends LitElement { static get styles () { @@ -80,86 +81,86 @@ class OptionsScreen extends LitElement {
{ - this.mouseSensitivityX = Number(e.target.value) - window.localStorage.setItem('mouseSensX', this.mouseSensitivityX * 0.0001) - }}> + this.mouseSensitivityX = Number(e.target.value) + window.localStorage.setItem('mouseSensX', this.mouseSensitivityX * 0.0001) + }}> { - this.mouseSensitivityY = Number(e.target.value) - window.localStorage.setItem('mouseSensY', this.mouseSensitivityY * 0.0001) - }}> + this.mouseSensitivityY = Number(e.target.value) + window.localStorage.setItem('mouseSensY', this.mouseSensitivityY * 0.0001) + }}>
{ - this.chatWidth = Number(e.target.value) - window.localStorage.setItem('chatWidth', `${this.chatWidth}`) - document.documentElement.style.setProperty('--chatWidth', `${this.chatWidth}px`) - }}> + this.chatWidth = Number(e.target.value) + window.localStorage.setItem('chatWidth', `${this.chatWidth}`) + document.documentElement.style.setProperty('--chatWidth', `${this.chatWidth}px`) + }}> { - this.chatHeight = Number(e.target.value) - window.localStorage.setItem('chatHeight', `${this.chatHeight}`) - document.documentElement.style.setProperty('--chatHeight', `${this.chatHeight}px`) - }}> + this.chatHeight = Number(e.target.value) + window.localStorage.setItem('chatHeight', `${this.chatHeight}`) + document.documentElement.style.setProperty('--chatHeight', `${this.chatHeight}px`) + }}>
{ - this.chatScale = Number(e.target.value) - window.localStorage.setItem('chatScale', `${this.chatScale}`) - document.documentElement.style.setProperty('--chatScale', `${this.chatScale / 100}`) - }}> + this.chatScale = Number(e.target.value) + window.localStorage.setItem('chatScale', `${this.chatScale}`) + document.documentElement.style.setProperty('--chatScale', `${this.chatScale / 100}`) + }}> { - this.sound = Number(e.target.value) - window.localStorage.setItem('sound', `${this.sound}`) - }}> + this.sound = Number(e.target.value) + window.localStorage.setItem('sound', `${this.sound}`) + }}>
- displayScreen(this, document.getElementById('keybinds-screen'))}> + showModal(document.getElementById('keybinds-screen'))}> { - this.guiScale = Number(e.target.value) - window.localStorage.setItem('guiScale', `${this.guiScale}`) - document.documentElement.style.setProperty('--guiScale', `${this.guiScale}`) - }}> + this.guiScale = Number(e.target.value) + window.localStorage.setItem('guiScale', `${this.guiScale}`) + document.documentElement.style.setProperty('--guiScale', `${this.guiScale}`) + }}>
${this.isInsideWorld -? '' -: html` + ? '' + : html`
{ - this.renderDistance = Number(e.target.value) - window.localStorage.setItem('renderDistance', `${this.renderDistance}`) - }}> + this.renderDistance = Number(e.target.value) + window.localStorage.setItem('renderDistance', `${this.renderDistance}`) + }}> { - this.fov = Number(e.target.value) - window.localStorage.setItem('fov', `${this.fov}`) + this.fov = Number(e.target.value) + window.localStorage.setItem('fov', `${this.fov}`) - this.dispatchEvent(new window.CustomEvent('fov_changed', { fov: this.fov })) - }}> + this.dispatchEvent(new window.CustomEvent('fov_changed', { fov: this.fov })) + }}>
`}
{ - this.forceMobileControls = !this.forceMobileControls - window.localStorage.setItem('forceMobileControls', `${this.forceMobileControls}`) - if (this.forceMobileControls || isMobile()) { - document.getElementById('hud').showMobileControls(true) - } else { - document.getElementById('hud').showMobileControls(false) - } - this.requestUpdate() - } - }> + this.forceMobileControls = !this.forceMobileControls + window.localStorage.setItem('forceMobileControls', `${this.forceMobileControls}`) + if (this.forceMobileControls || isMobile()) { + document.getElementById('hud').showMobileControls(true) + } else { + document.getElementById('hud').showMobileControls(false) + } + this.requestUpdate() + } + }>
{ - this.mouseRawInput = !this.mouseRawInput - window.localStorage.setItem('mouseRawInput', `${this.mouseRawInput}`) - this.requestUpdate() - } - }> + this.mouseRawInput = !this.mouseRawInput + window.localStorage.setItem('mouseRawInput', `${this.mouseRawInput}`) + this.requestUpdate() + } + }>
- displayScreen(this, document.getElementById(this.isInsideWorld ? 'pause-screen' : 'title-screen'))}> + hideCurrentModal()}>
` } diff --git a/lib/menus/pause_screen.js b/lib/menus/pause_screen.js index 07ad849ab..a4fce77da 100644 --- a/lib/menus/pause_screen.js +++ b/lib/menus/pause_screen.js @@ -1,5 +1,6 @@ const { LitElement, html, css } = require('lit') -const { openURL, displayScreen } = require('./components/common') +const { openURL } = require('./components/common') +const { hideCurrentModal, showModal } = require('../globalState') class PauseScreen extends LitElement { static get styles () { @@ -45,24 +46,6 @@ class PauseScreen extends LitElement { constructor () { super() - this.inMenu = false - } - - init (renderer) { - const chat = document.getElementById('hud').shadowRoot.querySelector('#chat') - const self = this - - document.addEventListener('keydown', e => { - if (chat.inChat) return - e = e || window.event - if (e.keyCode === 27 || e.key === 'Escape' || e.key === 'Esc') { - if (self.inMenu) { - self.disableGameMenu(renderer) - } else { - self.enableGameMenu() - } - } - }) } render () { @@ -70,40 +53,28 @@ class PauseScreen extends LitElement {

Game Menu

- +
openURL('https://github.com/PrismarineJS/prismarine-web-client')}> openURL('https://discord.gg/4Ucm684Fq3')}>
- displayScreen(this, document.getElementById('options-screen'))}> - window.location.reload()}> + showModal(document.getElementById('options-screen'))}> + { + window.location.search = '' + window.location.reload() + }}>
` } - disableGameMenu (renderer = false) { - this.inMenu = false - this.style.display = 'none' - if (renderer) { - renderer.domElement.requestPointerLock() - } - } - - enableGameMenu () { - this.inMenu = true - document.exitPointerLock() - this.style.display = 'block' + show () { this.focus() } - onReturnPress (renderer = false) { - this.inMenu = false - this.style.display = 'none' - if (renderer) { - renderer.domElement.requestPointerLock() - } + onReturnPress () { + hideCurrentModal() } } diff --git a/lib/menus/play_screen.js b/lib/menus/play_screen.js index ac0326445..a0f33fd14 100644 --- a/lib/menus/play_screen.js +++ b/lib/menus/play_screen.js @@ -1,5 +1,6 @@ const { LitElement, html, css } = require('lit') -const { commonCss, displayScreen } = require('./components/common') +const { commonCss } = require('./components/common') +const { hideCurrentModal } = require('../globalState') class PlayScreen extends LitElement { static get styles () { @@ -63,7 +64,7 @@ class PlayScreen extends LitElement { constructor () { super() - window.fetch('config.json').then(res => res.json()).then(c => c, (error) => { + window.fetch('config.json').then(res => res.json()).then(c => c, (error) => { console.error('Failed to load config.json', error) return {} }).then(config => { @@ -157,7 +158,7 @@ class PlayScreen extends LitElement {
- displayScreen(this, document.getElementById('title-screen'))}> + hideCurrentModal()}>
` } diff --git a/lib/menus/title_screen.js b/lib/menus/title_screen.js index 611d5dce4..b95b2b761 100644 --- a/lib/menus/title_screen.js +++ b/lib/menus/title_screen.js @@ -1,4 +1,5 @@ -const { openURL, displayScreen } = require('./components/common') +const { showModal } = require('../globalState') +const { openURL } = require('./components/common') const { LitElement, html, css } = require('lit') class TitleScreen extends LitElement { @@ -105,8 +106,12 @@ class TitleScreen extends LitElement {
- displayScreen(this, document.getElementById('play-screen'))}> - displayScreen(this, document.getElementById('options-screen'))}> + showModal(document.getElementById('play-screen'))}> + { + this.style.display = 'none' + this.dispatchEvent(new window.CustomEvent('singleplayer', {})) + }}> + showModal(document.getElementById('options-screen'))}>
openURL('https://github.com/PrismarineJS/prismarine-web-client')}> openURL('https://discord.gg/4Ucm684Fq3')}> diff --git a/lib/utils.js b/lib/utils.js new file mode 100644 index 000000000..1d5450dec --- /dev/null +++ b/lib/utils.js @@ -0,0 +1,5 @@ +export const pointerLock = { + get hasPointerLock() { + return document.pointerLockElement || document['mozPointerLockElement'] || document['webkitPointerLockElement'] + } +} From 2b363f15158cb6b548e9b647aadbefbc8554eb08 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 11 Aug 2023 04:21:41 +0300 Subject: [PATCH 021/318] include actual github repo when used on github repo --- lib/menus/pause_screen.js | 2 +- lib/menus/title_screen.js | 2 +- webpack.prod.js | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/menus/pause_screen.js b/lib/menus/pause_screen.js index a4fce77da..01ef83d04 100644 --- a/lib/menus/pause_screen.js +++ b/lib/menus/pause_screen.js @@ -57,7 +57,7 @@ class PauseScreen extends LitElement {
- openURL('https://github.com/PrismarineJS/prismarine-web-client')}> + openURL(process.env.GITHUB_URL)}> openURL('https://discord.gg/4Ucm684Fq3')}>
showModal(document.getElementById('options-screen'))}> diff --git a/lib/menus/title_screen.js b/lib/menus/title_screen.js index b95b2b761..e01d8eba0 100644 --- a/lib/menus/title_screen.js +++ b/lib/menus/title_screen.js @@ -113,7 +113,7 @@ class TitleScreen extends LitElement { }}> showModal(document.getElementById('options-screen'))}>
- openURL('https://github.com/PrismarineJS/prismarine-web-client')}> + openURL(process.env.GITHUB_URL)}> openURL('https://discord.gg/4Ucm684Fq3')}>
diff --git a/webpack.prod.js b/webpack.prod.js index 4f5f6c820..3b95ec01d 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -8,6 +8,7 @@ const webpack = require('webpack') module.exports = merge(common, { mode: 'production', + devtool: 'source-map', plugins: [ new CleanWebpackPlugin(), new webpack.optimize.ModuleConcatenationPlugin(), @@ -19,5 +20,11 @@ module.exports = merge(common, { skipWaiting: true, include: ['index.html', 'manifest.json'] // not caching a lot as anyway this works only online }), - ] + new webpack.ProvidePlugin({ + // get from github actions or vercel env + GITHUB_URL: process.env.VERCEL_GIT_REPO_OWNER + ? `https://github.com/${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}` + : process.env.GITHUB_REPOSITORY + }) + ], }) From 6e1eb77a5fccd61398cc8534b61a83e421cd869b Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 11 Aug 2023 11:52:19 +0300 Subject: [PATCH 022/318] fix showing the loading screen + refactor --- index.js | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/index.js b/index.js index f319cf5b1..f7a151847 100644 --- a/index.js +++ b/index.js @@ -131,7 +131,13 @@ const optionsScrn = document.getElementById('options-screen') const keyBindScrn = document.getElementById('keybinds-screen') const pauseMenu = document.getElementById('pause-screen') -const showEl = (str) => { document.getElementById(str).style = 'display:block' } +function setLoadingScreenStatus (status, isError = false) { + showModal(loadingScreen) + if (loadingScreen.hasError) return + loadingScreen.status = status + loadingScreen.hasError = isError +} + async function main () { const menu = document.getElementById('play-screen') @@ -176,7 +182,7 @@ async function connect (options) { net.setProxy({ hostname: proxy, port: proxyport }) } - loadingScreen.status = 'Logging in' + setLoadingScreenStatus('Logging in') const bot = mineflayer.createBot({ host, @@ -193,23 +199,17 @@ async function connect (options) { bot.on('error', (err) => { console.log('Encountered error!', err) - showModal(loadingScreen) - loadingScreen.status = `Error encountered. Error message: ${err}. Please reload the page` - loadingScreen.hasError = true + setLoadingScreenStatus(`Error encountered. Error message: ${err}. Please reload the page`, true) }) bot.on('kicked', (kickReason) => { console.log('User was kicked!', kickReason) - showModal(loadingScreen) - loadingScreen.status = `The Minecraft server kicked you. Kick reason: ${kickReason}. Please reload the page to rejoin` - loadingScreen.hasError = true + setLoadingScreenStatus(`The Minecraft server kicked you. Kick reason: ${kickReason}. Please reload the page to rejoin`, true) }) bot.on('end', (endReason) => { console.log('disconnected for', endReason) - showModal(loadingScreen) - loadingScreen.status = `You have been disconnected from the server. End reason: ${endReason}. Please reload the page to rejoin` - loadingScreen.hasError = true + setLoadingScreenStatus(`You have been disconnected from the server. End reason: ${endReason}. Please reload the page to rejoin`, true) }) bot.once('login', () => { @@ -219,13 +219,13 @@ async function connect (options) { serverHistory.unshift(options.server) localStorage.setItem('serverHistory', JSON.stringify([...new Set(serverHistory)])) - loadingScreen.status = 'Loading world' + setLoadingScreenStatus('Loading world') }) bot.once('spawn', () => { const mcData = require('minecraft-data')(bot.version) - loadingScreen.status = 'Placing blocks (starting viewer)' + setLoadingScreenStatus('Placing blocks (starting viewer)') console.log('bot spawned - starting viewer') @@ -285,7 +285,7 @@ async function connect (options) { bot.on('move', botPosition) botPosition() - loadingScreen.status = 'Setting callbacks' + setLoadingScreenStatus('Setting callbacks') function moveCallback (e) { if (!pointerLock.hasPointerLock) return @@ -418,7 +418,7 @@ async function connect (options) { }) }, false) - loadingScreen.status = 'Done!' + setLoadingScreenStatus('Done!') console.log('Done!') hud.init(renderer, bot, host) @@ -427,7 +427,8 @@ async function connect (options) { setTimeout(function () { if (loadingScreen.hasError) return // remove loading screen, wait a second to make sure a frame has properly rendered - hideModal(loadingScreen) + loadingScreen.style.display = 'none' + activeModalStack.splice(0, activeModalStack.length) }, 2500) }) } @@ -449,5 +450,5 @@ window.addEventListener('keydown', (e) => { } }) -showEl('title-screen') +showModal(document.getElementById('title-screen')) main() From be8df14534ec4d6d7fad7b7eba1cf2f11cb2b04c Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 11 Aug 2023 12:08:02 +0300 Subject: [PATCH 023/318] feat: change fov from options & always show disabled options --- lib/menus/components/slider.js | 34 +++++++++++++++++++++++++++++----- lib/menus/options_screen.js | 30 +++++++++++++----------------- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/lib/menus/components/slider.js b/lib/menus/components/slider.js index 824313a49..2429b2b78 100644 --- a/lib/menus/components/slider.js +++ b/lib/menus/components/slider.js @@ -26,7 +26,7 @@ class Slider extends LitElement { z-index: 3; } - .slider-container:hover .slider-thumb { + .slider-container:hover .slider:not(:disabled)~.slider-thumb { --txrV: -86px; } @@ -74,6 +74,24 @@ class Slider extends LitElement { margin: 0; } + .slider:disabled { + cursor: not-allowed; + } + .slider~.disabled { + display: none; + } + /* .disabled after .slider selector */ + .slider:disabled~.disabled { + display: block; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 10; + background: rgba(0, 0, 0, .5); + } + .slider::-webkit-slider-thumb { -webkit-appearance: none; position: relative; @@ -142,6 +160,10 @@ class Slider extends LitElement { type: String, attribute: 'pmui-max' }, + disabled: { + type: String, + attribute: 'pmui-disabled' + }, ratio: { type: Number } } } @@ -158,11 +180,13 @@ class Slider extends LitElement { min="${this.min}" max="${this.max}" value="${this.value}" + ?disabled=${!!this.disabled} @input=${(e) => { - const range = e.target - this.ratio = (range.value - range.min) / (range.max - range.min) - this.value = range.value - }}> + const range = e.target + this.ratio = (range.value - range.min) / (range.max - range.min) + this.value = range.value + }}> +
showModal(document.getElementById('keybinds-screen'))}> - { + { this.guiScale = Number(e.target.value) window.localStorage.setItem('guiScale', `${this.guiScale}`) document.documentElement.style.setProperty('--guiScale', `${this.guiScale}`) }}>
- ${this.isInsideWorld - ? '' - : html` -
- { - this.renderDistance = Number(e.target.value) - window.localStorage.setItem('renderDistance', `${this.renderDistance}`) - }}> - { - this.fov = Number(e.target.value) - window.localStorage.setItem('fov', `${this.fov}`) - - this.dispatchEvent(new window.CustomEvent('fov_changed', { fov: this.fov })) - }}> -
- `} +
+ { + this.renderDistance = Number(e.target.value) + window.localStorage.setItem('renderDistance', `${this.renderDistance}`) + }}> + { + this.fov = Number(e.target.value) + window.localStorage.setItem('fov', `${this.fov}`) + + this.dispatchEvent(new window.CustomEvent('fov_changed', { detail: { fov: this.fov }, })) + }}> +
{ From 1a57493904a6cdf031ac1461fd4b14fecb98ddce Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 11 Aug 2023 13:17:25 +0300 Subject: [PATCH 024/318] a bit better typechecking --- globals.d.ts | 2 +- package.json | 4 ++-- tsconfig.json | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/globals.d.ts b/globals.d.ts index 34d5ea017..1219eff0c 100644 --- a/globals.d.ts +++ b/globals.d.ts @@ -1,4 +1,4 @@ -declare const THREE: any; +declare const THREE: typeof import('three'); declare interface Document { getElementById(id): any diff --git a/package.json b/package.json index 98b5a5ea3..504e2774d 100644 --- a/package.json +++ b/package.json @@ -66,9 +66,9 @@ "path-browserify": "^1.0.1", "prismarine-viewer": "github:PrismarineJS/prismarine-viewer", "process": "github:PrismarineJS/node-process", - "standard": "^17.1.0", "stream-browserify": "^3.0.0", - "three": "0.127.0", + "@types/three": "0.128.0", + "three": "0.128.0", "timers-browserify": "^2.0.12", "vite": "^4.4.9", "webpack": "^5.88.2", diff --git a/tsconfig.json b/tsconfig.json index ee49561e4..0d6a33e61 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,8 +1,12 @@ { "compilerOptions": { + "target": "ES2022", + "moduleResolution": "Node", + "module": "CommonJS", "allowJs": true, "allowSyntheticDefaultImports": true, - "noEmit": true + "noEmit": true, + // "strictNullChecks": true }, "include": [ "index.js", From 91d603c4db1876d834866a926aa05c67cb32705e Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 11 Aug 2023 15:58:22 +0300 Subject: [PATCH 025/318] feat: manage pointerLock api cleanly introduce fullscreen modes and new settings (also refactor them) fix: apply gui scale after release camera move broken for now... --- index.js | 119 ++++++++++++++++++++++++--------- lib/globalState.js | 37 +++++----- lib/menus/components/button.js | 5 +- lib/menus/components/slider.js | 10 +++ lib/menus/options_screen.js | 88 +++++++++++------------- lib/menus/pause_screen.js | 2 + 6 files changed, 161 insertions(+), 100 deletions(-) diff --git a/index.js b/index.js index f7a151847..be54dacfc 100644 --- a/index.js +++ b/index.js @@ -18,6 +18,8 @@ require('./lib/menus/pause_screen') require('./lib/menus/loading_screen') require('./lib/menus/keybinds_screen') require('./lib/menus/options_screen') +require('./lib/menus/advanced_options_screen') +require('./lib/menus/notification') require('./lib/menus/title_screen') const net = require('net') @@ -33,6 +35,9 @@ const { Vec3 } = require('vec3') //@ts-ignore global.THREE = require('three') const { initVR } = require('./lib/vr') +const { activeModalStack, showModal, hideModal, hideCurrentModal } = require('./lib/globalState') +const { pointerLock } = require('./lib/utils') +const { notification } = require('./lib/menus/notification') if ('serviceWorker' in navigator) { window.addEventListener('load', () => { @@ -44,6 +49,9 @@ if ('serviceWorker' in navigator) { }) } +// ACTUAL CODE + + const maxPitch = 0.5 * Math.PI const minPitch = -0.5 * Math.PI @@ -111,10 +119,14 @@ function removePanorama () { viewer.scene.remove(panoramaCubeMap) } +let postRenderFrameFn = () => { } let animate = () => { + stats.begin() window.requestAnimationFrame(animate) viewer.update() renderer.render(viewer.scene, viewer.camera) + postRenderFrameFn() + stats.end() } animate() @@ -147,6 +159,18 @@ async function main () { removePanorama() connect(options) }) +let justHitEscape = false + +const goFullscreen = async (doToggle = false) => { + if (!document.fullscreenElement) { + // todo display a message or repeat? + await document.documentElement.requestFullscreen().catch(() => { }) + // request full keyboard access + //@ts-ignore + navigator.keyboard?.lock?.(['Escape', 'KeyW']) + } else if (doToggle) { + await document.exitFullscreen().catch(() => { }) + } } async function connect (options) { @@ -199,6 +223,12 @@ async function connect (options) { bot.on('error', (err) => { console.log('Encountered error!', err) + const controller = new AbortController() + window.addEventListener('keydown', (e) => { + if (e.code !== 'KeyR') return + controller.abort() + connect(options) + }) setLoadingScreenStatus(`Error encountered. Error message: ${err}. Please reload the page`, true) }) @@ -289,14 +319,17 @@ async function connect (options) { function moveCallback (e) { if (!pointerLock.hasPointerLock) return - bot.entity.pitch -= e.movementY * optionsScrn.mouseSensitivityY * 0.0001 + let { mouseSensX, mouseSensY } = optionsScrn + if (mouseSensY === true) mouseSensY = mouseSensX + bot.entity.pitch -= e.movementY * mouseSensX bot.entity.pitch = Math.max(minPitch, Math.min(maxPitch, bot.entity.pitch)) - bot.entity.yaw -= e.movementX * optionsScrn.mouseSensitivityX * 0.0001 + bot.entity.yaw -= e.movementX * mouseSensY viewer.setFirstPersonCamera(null, bot.entity.yaw, bot.entity.pitch) } function changeCallback () { + notification.show = false if (!pointerLock.hasPointerLock && activeModalStack.length === 0) { showModal(pauseMenu) } @@ -323,29 +356,40 @@ async function connect (options) { }, { passive: false }) const requestPointerLock = renderer.domElement.requestPointerLock || - renderer.domElement.mozRequestPointerLock || - renderer.domElement.webkitRequestPointerLock + renderer.domElement['mozRequestPointerLock'] || + renderer.domElement['webkitRequestPointerLock'] renderer.domElement.requestPointerLock = async () => { - // await renderer.domElement.requestFullscreen() - // request full keyboard access - // navigator.keyboard.lock(['KeyW']) - const promise = requestPointerLock.apply(renderer.domElement, { - unadjustedMovement: window.localStorage.getItem('mouseRawInput') === 'true' - }) - promise?.catch((error) => { - if (error.name === "NotSupportedError") { - // Some platforms may not support unadjusted movement, request again a regular pointer lock. - requestPointerLock.apply(renderer.domElement) - } else { - console.error(error) - } - }) - } - document.addEventListener('mousedown', (e) => { - if (!chat.inChat && !gameMenu.inMenu) { - renderer.domElement.requestPointerLock() + if (hud.style.display === 'none' || activeModalStack.length) return + const autoFullScreen = window.localStorage.getItem('autoFullscreen') === 'true' + if (autoFullScreen) { + await goFullscreen() } - }) + const displayBrowserProblem = () => { + notification.show = true + // todo use notification stack + notification.autoHide = true + notification.message = navigator['keyboard'] ? 'Browser Limitation: Click on screen, enable Auto Fullscreen or F11' : 'Browser Limitation: Click on screen or use fullscreen in Chrome' + } + if (!(document.fullscreenElement && navigator['keyboard']) && justHitEscape) { + displayBrowserProblem() + } else { + const promise = requestPointerLock.apply(renderer.domElement, { + unadjustedMovement: window.localStorage.getItem('mouseRawInput') === 'true' + }) + promise?.catch((error) => { + if (error.name === "NotSupportedError") { + // Some platforms may not support unadjusted movement, request again a regular pointer lock. + requestPointerLock.apply(renderer.domElement) + } else if (error.name === 'SecurityError') { + // cause: https://discourse.threejs.org/t/how-to-avoid-pointerlockcontrols-error/33017/4 + displayBrowserProblem() + } else { + console.error(error) + } + }) + } + justHitEscape = false + } document.addEventListener('contextmenu', (e) => e.preventDefault(), false) @@ -433,20 +477,33 @@ async function connect (options) { }) } -const requestPointerLock = () => { +window.addEventListener('mousedown', (e) => { + // todo remove this code duplication somehow if (hud.style.display === 'none' || activeModalStack.length) return renderer.domElement.requestPointerLock() -} - -window.addEventListener('mousedown', (e) => { - requestPointerLock() }) window.addEventListener('keydown', (e) => { - if (e.code === 'Escape') { - hideModal(undefined, { event: e, renderer }, () => { - requestPointerLock() // if no modals left + if (e.code !== 'Escape') return + if (activeModalStack.length) { + hideCurrentModal(undefined, () => { + if (!activeModalStack.length) { + justHitEscape = true + } }) + } else { + if (pointerLock.hasPointerLock) { + document.exitPointerLock() + } else { + document.dispatchEvent(new Event('pointerlockchange')) + } + } +}) + +window.addEventListener('keydown', (e) => { + if (e.code === 'F11') { + e.preventDefault() + goFullscreen(true) } }) diff --git a/lib/globalState.js b/lib/globalState.js index 046aa78e0..e77d78d06 100644 --- a/lib/globalState.js +++ b/lib/globalState.js @@ -25,25 +25,28 @@ export const showModal = (/** @type {Modal} */ modal) => { activeModalStack.push(modal) } -export const hideModal = (modal = activeModalStack.slice(-1)[0], data, postActions) => { - if (modal) { - const cancel = modal.hide?.(data) - if (!cancel || cancel === customDisplayManageKeyword) { - if (cancel !== customDisplayManageKeyword) modal.style.display = 'none' - activeModalStack.pop() - const newModal = activeModalStack.slice(-1)[0] - if (newModal) { - // would be great to ignore cancel I guess? - showModalInner(newModal) - } - postActions?.() +export const hideModal = (modal = activeModalStack.slice(-1)[0], data) => { + if (!modal) return + const cancel = modal.hide?.(data) + if (!cancel || cancel === customDisplayManageKeyword) { + if (cancel !== customDisplayManageKeyword) modal.style.display = 'none' + activeModalStack.pop() + const newModal = activeModalStack.slice(-1)[0] + if (newModal) { + // would be great to ignore cancel I guess? + showModalInner(newModal) } - } else { - document.exitPointerLock() + return true } } -export const hideCurrentModal = () => { - // todo this might be tricky - window.dispatchEvent(new KeyboardEvent('keydown', { code: 'Escape', })) // trigger handler in index.js +export const hideCurrentModal = (data, preActions) => { + if (hideModal(undefined, undefined)) { + preActions?.() + if (document.getElementById('hud').style.display === 'none') { + showModal(document.getElementById('title-screen')) + } else { + window.renderer.domElement.requestPointerLock() // will work only if no modals left + } + } } diff --git a/lib/menus/components/button.js b/lib/menus/components/button.js index eae2de7db..d25a884f0 100644 --- a/lib/menus/components/button.js +++ b/lib/menus/components/button.js @@ -4,7 +4,7 @@ const audioContext = new window.AudioContext() const sounds = {} // load as many resources on page load as possible instead on demand as user can disable internet connection after he thinks the page is loaded -async function loadSound(path) { +async function loadSound (path) { const res = await window.fetch(path) const data = await res.arrayBuffer() @@ -101,7 +101,6 @@ class Button extends LitElement { }, disabled: { type: Boolean, - attribute: 'pmui-disabled' }, onPress: { type: Function, @@ -115,7 +114,7 @@ class Button extends LitElement { this.label = '' this.disabled = false this.width = '200px' - this.onPress = () => {} + this.onPress = () => { } } render () { diff --git a/lib/menus/components/slider.js b/lib/menus/components/slider.js index 2429b2b78..2811948c4 100644 --- a/lib/menus/components/slider.js +++ b/lib/menus/components/slider.js @@ -185,6 +185,16 @@ class Slider extends LitElement { const range = e.target this.ratio = (range.value - range.min) / (range.max - range.min) this.value = range.value + }} + @pointerdown=${() => { + window.addEventListener('pointerup', (e) => { + this.dispatchEvent(new InputEvent('change')) + }, { + once: true, + }) + }} + @keyup=${() => { + this.dispatchEvent(new InputEvent('change')) }}>
window.localStorage.getItem(item) ? convertFn(window.localStorage.getItem(item)) : defaultValue - - this.mouseSensitivityX = getValue('mouseSensX', 50, (v) => Math.floor(Number(v) * 10000)) - this.mouseSensitivityY = getValue('mouseSensY', 50, (v) => Math.floor(Number(v) * 10000)) - this.chatWidth = getValue('chatWidth', 320, (v) => Number(v)) - this.chatHeight = getValue('chatHeight', 180, (v) => Number(v)) - this.chatScale = getValue('chatScale', 100, (v) => Number(v)) - this.sound = getValue('sound', 50, (v) => Number(v)) - this.renderDistance = getValue('renderDistance', 6, (v) => Number(v)) - this.fov = getValue('fov', 75, (v) => Number(v)) - this.guiScale = getValue('guiScale', 3, (v) => Number(v)) - this.forceMobileControls = getValue('forceMobileControls', false, (v) => v === 'true') - this.mouseRawInput = getValue('mouseRawInput', false, (v) => v === 'true') + this.defineOptions({ + mouseSensX: { defaultValue: 50, convertFn: (v) => Math.floor(Number(v)) }, + mouseSensY: { defaultValue: 50, convertFn: (v) => Math.floor(Number(v)) }, + chatWidth: { defaultValue: 320, convertFn: (v) => Number(v) }, + chatHeight: { defaultValue: 180, convertFn: (v) => Number(v) }, + chatScale: { defaultValue: 100, convertFn: (v) => Number(v) }, + sound: { defaultValue: 50, convertFn: (v) => Number(v) }, + renderDistance: { defaultValue: 6, convertFn: (v) => Number(v) }, + fov: { defaultValue: 75, convertFn: (v) => Number(v) }, + guiScale: { defaultValue: 3, convertFn: (v) => Number(v) }, + mouseRawInput: { defaultValue: false, convertFn: (v) => v === 'true' }, + autoFullscreen: { defaultValue: false, convertFn: (v) => v === 'true' } + }) document.documentElement.style.setProperty('--chatScale', `${this.chatScale / 100}`) document.documentElement.style.setProperty('--chatWidth', `${this.chatWidth}px`) @@ -80,77 +81,66 @@ class OptionsScreen extends LitElement {
- { - this.mouseSensitivityX = Number(e.target.value) - window.localStorage.setItem('mouseSensX', this.mouseSensitivityX * 0.0001) + { + this.changeOption('mouseSensX', e.target.value) }}> - { - this.mouseSensitivityY = Number(e.target.value) - window.localStorage.setItem('mouseSensY', this.mouseSensitivityY * 0.0001) + { + this.changeOption('mouseSensY', e.target.value) }}>
{ - this.chatWidth = Number(e.target.value) - window.localStorage.setItem('chatWidth', `${this.chatWidth}`) + this.changeOption('chatWidth', e.target.value) document.documentElement.style.setProperty('--chatWidth', `${this.chatWidth}px`) }}> { - this.chatHeight = Number(e.target.value) - window.localStorage.setItem('chatHeight', `${this.chatHeight}`) + this.changeOption('chatHeight', e.target.value) document.documentElement.style.setProperty('--chatHeight', `${this.chatHeight}px`) }}>
{ - this.chatScale = Number(e.target.value) - window.localStorage.setItem('chatScale', `${this.chatScale}`) + this.changeOption('chatScale', e.target.value) document.documentElement.style.setProperty('--chatScale', `${this.chatScale / 100}`) }}> { - this.sound = Number(e.target.value) - window.localStorage.setItem('sound', `${this.sound}`) + this.changeOption('sound', e.target.value) }}>
showModal(document.getElementById('keybinds-screen'))}> { - this.guiScale = Number(e.target.value) - window.localStorage.setItem('guiScale', `${this.guiScale}`) + this.changeOption('guiScale', e.target.value) document.documentElement.style.setProperty('--guiScale', `${this.guiScale}`) }}>
- { - this.renderDistance = Number(e.target.value) - window.localStorage.setItem('renderDistance', `${this.renderDistance}`) + { + this.changeOption('renderDistance', e.target.value) }}> { - this.fov = Number(e.target.value) - window.localStorage.setItem('fov', `${this.fov}`) + this.changeOption('fov', e.target.value) this.dispatchEvent(new window.CustomEvent('fov_changed', { detail: { fov: this.fov }, })) }}>
- { - this.forceMobileControls = !this.forceMobileControls - window.localStorage.setItem('forceMobileControls', `${this.forceMobileControls}`) - if (this.forceMobileControls || isMobile()) { - document.getElementById('hud').showMobileControls(true) - } else { - document.getElementById('hud').showMobileControls(false) - } + { + showModal(document.querySelector('pmui-advanced-optionsscreen')) + } + }> + { + this.changeOption('mouseRawInput', !this.mouseRawInput) + this.requestUpdate() } }>
-
- { - this.mouseRawInput = !this.mouseRawInput - window.localStorage.setItem('mouseRawInput', `${this.mouseRawInput}`) + { + this.changeOption('autoFullscreen', !this.autoFullscreen) + this.requestUpdate() } }> diff --git a/lib/menus/pause_screen.js b/lib/menus/pause_screen.js index 01ef83d04..51d349c57 100644 --- a/lib/menus/pause_screen.js +++ b/lib/menus/pause_screen.js @@ -71,6 +71,8 @@ class PauseScreen extends LitElement { show () { this.focus() + // todo? + notification.show = false } onReturnPress () { From 50606b987ebcead2a07b92d5366f8478527c8172 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 11 Aug 2023 16:27:47 +0300 Subject: [PATCH 026/318] [in-place] try to fix previous commit errors --- index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/index.js b/index.js index be54dacfc..d0fb1b9dc 100644 --- a/index.js +++ b/index.js @@ -121,12 +121,10 @@ function removePanorama () { let postRenderFrameFn = () => { } let animate = () => { - stats.begin() window.requestAnimationFrame(animate) viewer.update() renderer.render(viewer.scene, viewer.camera) postRenderFrameFn() - stats.end() } animate() @@ -159,6 +157,7 @@ async function main () { removePanorama() connect(options) }) +} let justHitEscape = false const goFullscreen = async (doToggle = false) => { From d9449d161790538e8a970548b5e69728e8e31695 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 11 Aug 2023 19:07:23 +0300 Subject: [PATCH 027/318] commit missing files in order to fix build --- .vscode/launch.json | 4 +- lib/menus/advanced_options_screen.js | 71 +++++++++++++++++++++++++++ lib/menus/notification.js | 72 ++++++++++++++++++++++++++++ lib/menus/options_store.js | 31 ++++++++++++ package.json | 2 +- 5 files changed, 177 insertions(+), 3 deletions(-) create mode 100644 lib/menus/advanced_options_screen.js create mode 100644 lib/menus/notification.js create mode 100644 lib/menus/options_store.js diff --git a/.vscode/launch.json b/.vscode/launch.json index cd96259cd..85e26869c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,9 +2,9 @@ "configurations": [ { "type": "msedge", - "name": "https://localhost:8080/", + "name": "http://localhost:8080/", "request": "launch", - "url": "https://localhost:8080/", + "url": "http://localhost:8080/", "outFiles": [ "${workspaceFolder}/public/**/*.js", "!${workspaceFolder}/public/**/*vendors*", diff --git a/lib/menus/advanced_options_screen.js b/lib/menus/advanced_options_screen.js new file mode 100644 index 000000000..ba8530d55 --- /dev/null +++ b/lib/menus/advanced_options_screen.js @@ -0,0 +1,71 @@ +//@ts-check +const { LitElement, html, css } = require('lit') +const { CommonOptionsScreen } = require('./options_store') +const { commonCss, isMobile, openURL } = require('./components/common') +const { hideCurrentModal } = require('../globalState') + +class AdvancedOptionsScreen extends CommonOptionsScreen { + constructor () { + super() + this.defineOptions({ + forceMobileControls: { defaultValue: false, convertFn: (v) => v === 'true' } + }) + } + + static get styles () { + return css` + ${commonCss} + .title { + top: 4px; + } + + main { + display: flex; + flex-direction: column; + position: absolute; + top: calc(100% / 6 - 6px); + left: 50%; + width: 310px; + gap: 4px 0; + place-items: center; + place-content: center; + transform: translate(-50%); + } + + .wrapper { + display: flex; + flex-direction: row; + width: 100%; + gap: 0 10px; + height: 20px; + } + ` + } + + render () { + return html` +
+ +

Advanced Options

+
+
+ { + this.forceMobileControls = !this.forceMobileControls + if (this.forceMobileControls || isMobile()) { + document.getElementById('hud').showMobileControls(true) + } else { + document.getElementById('hud').showMobileControls(false) + } + this.requestUpdate() + } + }> + openURL('https://gist.github.com/zardoy/6e5ce377d2b4c1e322e660973da069cd')}> +
+ + hideCurrentModal()}> +
+ ` + } +} + +window.customElements.define('pmui-advanced-optionsscreen', AdvancedOptionsScreen) diff --git a/lib/menus/notification.js b/lib/menus/notification.js new file mode 100644 index 000000000..f256a54dc --- /dev/null +++ b/lib/menus/notification.js @@ -0,0 +1,72 @@ +//@ts-check + +// create lit element +const { LitElement, html, css } = require('lit') +const { proxy, subscribe } = require('valtio/vanilla') + +// move to globalState? +export const notification = proxy({ + show: false, + autoHide: true, + message: '', + type: 'info', +}) + +window.notification = notification + +class Notification extends LitElement { + render () { + const show = notification.show && notification.message + return html` +
+ ${notification.message} +
+ ` + } + + constructor () { + super() + let timeout + subscribe(notification, () => { + if (timeout) clearTimeout(timeout) + this.requestUpdate() + if (!notification.autoHide) return + timeout = setTimeout(() => { + notification.show = false + }, 3000) + }) + } + + static get styles () { + return css` + .notification { + position: absolute; + bottom: 0; + right: 0; + min-width: 200px; + padding: 10px; + white-space: nowrap; + font-size: 12px; + color: #fff; + text-align: center; + background: #000; + opacity: 0; + transition: opacity 0.3s ease-in-out; + } + + .notification-info { + background: #000; + } + + .notification-error { + background: #d00; + } + + .notification-show { + opacity: 1; + } + ` + } +} + +window.customElements.define('pmui-notification', Notification) diff --git a/lib/menus/options_store.js b/lib/menus/options_store.js new file mode 100644 index 000000000..356958b30 --- /dev/null +++ b/lib/menus/options_store.js @@ -0,0 +1,31 @@ +//@ts-check + +import { LitElement } from 'lit' + +export class CommonOptionsScreen extends LitElement { + options = {} + + defineOptions (props) { + for (const [name, { defaultValue, convertFn }] of Object.entries(props)) { + Object.defineProperty(this.options, name, { + get () { + let value = window.localStorage.getItem(name) ? convertFn(window.localStorage.getItem(name)) : defaultValue + if (isNaN(value)) value = defaultValue + return value + }, + set (value) { + window.localStorage.setItem(name, `${convertFn(value)}`) + } + }) + this[name] = this.options[name] + } + } + /** + * @param {string} name + * @param {any} value + */ + changeOption (name, value) { + this.options[name] = value + this[name] = this.options[name] + } +} diff --git a/package.json b/package.json index 504e2774d..66fca1b92 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "url": "^0.11.1" }, "devDependencies": { + "@types/three": "0.128.0", "assert": "^2.0.0", "browserify-zlib": "^0.2.0", "buffer": "^6.0.3", @@ -67,7 +68,6 @@ "prismarine-viewer": "github:PrismarineJS/prismarine-viewer", "process": "github:PrismarineJS/node-process", "stream-browserify": "^3.0.0", - "@types/three": "0.128.0", "three": "0.128.0", "timers-browserify": "^2.0.12", "vite": "^4.4.9", From 44397fb55b1d9f0da07f085314a83bd69f26983d Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 11 Aug 2023 23:36:41 +0300 Subject: [PATCH 028/318] dx: always show stats for now, clear console on l, rejoin when errored on r, use live reload (though its buggy) instead of slow hot --- index.js | 30 +++++++++++++++++++++-------- webpack.dev.js | 51 +++++++++++++++++++++++++------------------------- 2 files changed, 48 insertions(+), 33 deletions(-) diff --git a/index.js b/index.js index d0fb1b9dc..f654e9bdd 100644 --- a/index.js +++ b/index.js @@ -23,15 +23,17 @@ require('./lib/menus/notification') require('./lib/menus/title_screen') const net = require('net') -const Cursor = require('./lib/cursor') +const Stats = require('stats.js') -// Workaround for process.versions.node not existing in the browser +// workaround for mineflayer process.versions.node = '14.0.0' const mineflayer = require('mineflayer') const { WorldView, Viewer } = require('prismarine-viewer/viewer') const pathfinder = require('mineflayer-pathfinder') const { Vec3 } = require('vec3') + +const Cursor = require('./lib/cursor') //@ts-ignore global.THREE = require('three') const { initVR } = require('./lib/vr') @@ -51,6 +53,13 @@ if ('serviceWorker' in navigator) { // ACTUAL CODE +const stats = new Stats() +const stats2 = new Stats() +stats2.showPanel(2) + +document.body.appendChild(stats.dom) +stats2.dom.style.left = '80px' +document.body.appendChild(stats2.dom) const maxPitch = 0.5 * Math.PI const minPitch = -0.5 * Math.PI @@ -121,10 +130,14 @@ function removePanorama () { let postRenderFrameFn = () => { } let animate = () => { + stats.begin() + stats2.begin() window.requestAnimationFrame(animate) viewer.update() renderer.render(viewer.scene, viewer.camera) postRenderFrameFn() + stats.end() + stats2.end() } animate() @@ -227,7 +240,8 @@ async function connect (options) { if (e.code !== 'KeyR') return controller.abort() connect(options) - }) + loadingScreen.hasError = false + }, { signal: controller.signal }) setLoadingScreenStatus(`Error encountered. Error message: ${err}. Please reload the page`, true) }) @@ -285,12 +299,9 @@ async function connect (options) { initVR(bot, renderer, viewer) const cursor = new Cursor(viewer, renderer, bot) - animate = () => { - window.requestAnimationFrame(animate) - viewer.update() - cursor.update(bot) + postRenderFrameFn = () => { debugMenu.cursorBlock = cursor.cursorBlock - renderer.render(viewer.scene, viewer.camera) + cursor.update(bot) } try { @@ -504,6 +515,9 @@ window.addEventListener('keydown', (e) => { e.preventDefault() goFullscreen(true) } + if (e.code === 'KeyL') { + console.clear() + } }) showModal(document.getElementById('title-screen')) diff --git a/webpack.dev.js b/webpack.dev.js index c55939797..01ec8135c 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -6,32 +6,33 @@ const path = require('path') module.exports = merge(common, /** @type {import('webpack').Configuration} */ { - mode: 'development', - devtool: 'inline-source-map', - cache: true, - devServer: { - // contentBase: path.resolve(__dirname, './public'), - compress: true, - // inline: true, - // open: true, - hot: true, - // liveReload: true, - devMiddleware: { - writeToDisk: true, + mode: 'development', + devtool: 'inline-source-map', + cache: true, + devServer: { + // contentBase: path.resolve(__dirname, './public'), + compress: true, + // inline: true, + // open: true, + // hot: true, + liveReload: true, + devMiddleware: { + writeToDisk: true, + }, + port: 8081, }, - }, - optimization: { - splitChunks: { - maxAsyncRequests: 10, - maxInitialRequests: 10, - cacheGroups: { - vendors: { - test: /[\\/]node_modules[\\/]/, - name: "vendors", - priority: 10, - chunks: 'all' + optimization: { + splitChunks: { + maxAsyncRequests: 10, + maxInitialRequests: 10, + cacheGroups: { + vendors: { + test: /[\\/]node_modules[\\/]/, + name: "vendors", + priority: 10, + chunks: 'all' + } } } } - } -}) + }) From 94ef75f1956ea252a59218ce66f5706d942b1011 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 11 Aug 2023 23:37:18 +0300 Subject: [PATCH 029/318] add valtio dep --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 66fca1b92..b0ac9035d 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,8 @@ "net-browserify": "github:PrismarineJS/net-browserify", "querystring": "^0.2.1", "stats.js": "^0.17.0", - "url": "^0.11.1" + "url": "^0.11.1", + "valtio": "^1.11.1" }, "devDependencies": { "@types/three": "0.128.0", From d6e1b7cce3a0dba7379a5f85b3660092b30a3b13 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 12 Aug 2023 03:30:10 +0300 Subject: [PATCH 030/318] mostly fix bad performance of mouse move (still work to do) Implement Frame Limit. fix boolean settings, refactor pointerlock, making it cleaner --- index.js | 116 +++++++++++++++------------ lib/globalState.js | 4 +- lib/menus/advanced_options_screen.js | 26 +++++- lib/menus/components/slider.js | 5 +- lib/menus/notification.js | 9 ++- lib/menus/options_screen.js | 19 ++--- lib/menus/options_store.js | 6 +- lib/utils.js | 101 ++++++++++++++++++++++- 8 files changed, 213 insertions(+), 73 deletions(-) diff --git a/index.js b/index.js index f654e9bdd..8609ef07d 100644 --- a/index.js +++ b/index.js @@ -29,7 +29,9 @@ const Stats = require('stats.js') process.versions.node = '14.0.0' const mineflayer = require('mineflayer') -const { WorldView, Viewer } = require('prismarine-viewer/viewer') +const { WorldView, Viewer, MapControls } = require('prismarine-viewer/viewer') +const PrismarineWorld = require('prismarine-world') +const nbt = require('prismarine-nbt') const pathfinder = require('mineflayer-pathfinder') const { Vec3 } = require('vec3') @@ -38,7 +40,7 @@ const Cursor = require('./lib/cursor') global.THREE = require('three') const { initVR } = require('./lib/vr') const { activeModalStack, showModal, hideModal, hideCurrentModal } = require('./lib/globalState') -const { pointerLock } = require('./lib/utils') +const { pointerLock, goFullscreen, toNumber } = require('./lib/utils') const { notification } = require('./lib/menus/notification') if ('serviceWorker' in navigator) { @@ -60,6 +62,15 @@ stats2.showPanel(2) document.body.appendChild(stats.dom) stats2.dom.style.left = '80px' document.body.appendChild(stats2.dom) +// const debugPitch = document.createElement('span') +// debugPitch.style.cssText = ` +// position: absolute; +// top: 0; +// right: 0; +// z-index: 100; +// color:white; +// ` +// document.body.appendChild(debugPitch) const maxPitch = 0.5 * Math.PI const minPitch = -0.5 * Math.PI @@ -128,18 +139,38 @@ function removePanorama () { viewer.scene.remove(panoramaCubeMap) } +const frameLimit = toNumber(localStorage.frameLimit) +let interval = frameLimit && 1000 / frameLimit +window.addEventListener('option-change', (/** @type {any} */{ detail }) => { + if (detail.name === 'frameLimit') interval = toNumber(detail.value) && 1000 / toNumber(detail.value) +}) + let postRenderFrameFn = () => { } -let animate = () => { +let delta = 0 +let lastTime = performance.now() +const renderFrame = (/** @type {DOMHighResTimeStamp} */ time) => { + if (window.stopLoop) return + window.requestAnimationFrame(renderFrame) + if (window.stopRender) return + if (interval) { + delta += time - lastTime + lastTime = time + if (delta > interval) { + delta = delta % interval + // continue rendering + } else { + return + } + } stats.begin() stats2.begin() - window.requestAnimationFrame(animate) viewer.update() renderer.render(viewer.scene, viewer.camera) postRenderFrameFn() stats.end() stats2.end() } -animate() +renderFrame(performance.now()) window.addEventListener('resize', () => { viewer.camera.aspect = window.innerWidth / window.innerHeight @@ -182,7 +213,7 @@ const goFullscreen = async (doToggle = false) => { navigator.keyboard?.lock?.(['Escape', 'KeyW']) } else if (doToggle) { await document.exitFullscreen().catch(() => { }) - } + } } async function connect (options) { @@ -301,6 +332,7 @@ async function connect (options) { const cursor = new Cursor(viewer, renderer, bot) postRenderFrameFn = () => { debugMenu.cursorBlock = cursor.cursorBlock + viewer.setFirstPersonCamera(null, bot.entity.yaw, bot.entity.pitch) cursor.update(bot) } @@ -319,6 +351,7 @@ async function connect (options) { // Bot position callback function botPosition () { + // this might cause lag, but not sure viewer.setFirstPersonCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch) worldView.updatePosition(bot.entity.position) } @@ -327,15 +360,29 @@ async function connect (options) { setLoadingScreenStatus('Setting callbacks') + let yaw + let moveCallsPerSec = 0 + setInterval(() => { + console.log('mouse frequency', moveCallsPerSec) + moveCallsPerSec = 0 + }, 1000) + let lastCall function moveCallback (e) { if (!pointerLock.hasPointerLock) return + e.stopPropagation?.() + const now = performance.now() + if (now - lastCall < 5) return + lastCall = now + moveCallsPerSec++ let { mouseSensX, mouseSensY } = optionsScrn if (mouseSensY === true) mouseSensY = mouseSensX - bot.entity.pitch -= e.movementY * mouseSensX + yaw ??= bot.entity.yaw + bot.entity.pitch -= e.movementY * mouseSensX * 0.0001 bot.entity.pitch = Math.max(minPitch, Math.min(maxPitch, bot.entity.pitch)) - bot.entity.yaw -= e.movementX * mouseSensY - - viewer.setFirstPersonCamera(null, bot.entity.yaw, bot.entity.pitch) + const diff = e.movementX * mouseSensY * 0.0001 + bot.entity.yaw -= diff + yaw -= diff + // debugPitch.innerText = +debugPitch.innerText + e.movementX } function changeCallback () { @@ -345,10 +392,8 @@ async function connect (options) { } } - document.addEventListener('mousemove', moveCallback, false) + window.addEventListener('mousemove', moveCallback, { capture: true }) document.addEventListener('pointerlockchange', changeCallback, false) - document.addEventListener('mozpointerlockchange', changeCallback, false) - document.addEventListener('webkitpointerlockchange', changeCallback, false) let lastTouch document.addEventListener('touchmove', (e) => { @@ -365,42 +410,6 @@ async function connect (options) { lastTouch = undefined }, { passive: false }) - const requestPointerLock = renderer.domElement.requestPointerLock || - renderer.domElement['mozRequestPointerLock'] || - renderer.domElement['webkitRequestPointerLock'] - renderer.domElement.requestPointerLock = async () => { - if (hud.style.display === 'none' || activeModalStack.length) return - const autoFullScreen = window.localStorage.getItem('autoFullscreen') === 'true' - if (autoFullScreen) { - await goFullscreen() - } - const displayBrowserProblem = () => { - notification.show = true - // todo use notification stack - notification.autoHide = true - notification.message = navigator['keyboard'] ? 'Browser Limitation: Click on screen, enable Auto Fullscreen or F11' : 'Browser Limitation: Click on screen or use fullscreen in Chrome' - } - if (!(document.fullscreenElement && navigator['keyboard']) && justHitEscape) { - displayBrowserProblem() - } else { - const promise = requestPointerLock.apply(renderer.domElement, { - unadjustedMovement: window.localStorage.getItem('mouseRawInput') === 'true' - }) - promise?.catch((error) => { - if (error.name === "NotSupportedError") { - // Some platforms may not support unadjusted movement, request again a regular pointer lock. - requestPointerLock.apply(renderer.domElement) - } else if (error.name === 'SecurityError') { - // cause: https://discourse.threejs.org/t/how-to-avoid-pointerlockcontrols-error/33017/4 - displayBrowserProblem() - } else { - console.error(error) - } - }) - } - justHitEscape = false - } - document.addEventListener('contextmenu', (e) => e.preventDefault(), false) window.addEventListener('blur', (e) => { @@ -488,9 +497,7 @@ async function connect (options) { } window.addEventListener('mousedown', (e) => { - // todo remove this code duplication somehow - if (hud.style.display === 'none' || activeModalStack.length) return - renderer.domElement.requestPointerLock() + pointerLock.requestPointerLock() }) window.addEventListener('keydown', (e) => { @@ -498,7 +505,7 @@ window.addEventListener('keydown', (e) => { if (activeModalStack.length) { hideCurrentModal(undefined, () => { if (!activeModalStack.length) { - justHitEscape = true + pointerLock.justHitEscape = true } }) } else { @@ -518,6 +525,9 @@ window.addEventListener('keydown', (e) => { if (e.code === 'KeyL') { console.clear() } + // if (e.code === 'KeyD') { + // debugPitch.innerText = '0' + // } }) showModal(document.getElementById('title-screen')) diff --git a/lib/globalState.js b/lib/globalState.js index e77d78d06..2ae42b3cb 100644 --- a/lib/globalState.js +++ b/lib/globalState.js @@ -1,5 +1,7 @@ //@ts-check +import { pointerLock } from './utils' + /** * @typedef {(HTMLElement & Record)} Modal */ @@ -46,7 +48,7 @@ export const hideCurrentModal = (data, preActions) => { if (document.getElementById('hud').style.display === 'none') { showModal(document.getElementById('title-screen')) } else { - window.renderer.domElement.requestPointerLock() // will work only if no modals left + pointerLock.requestPointerLock() // will work only if no modals left } } } diff --git a/lib/menus/advanced_options_screen.js b/lib/menus/advanced_options_screen.js index ba8530d55..3349957b5 100644 --- a/lib/menus/advanced_options_screen.js +++ b/lib/menus/advanced_options_screen.js @@ -3,12 +3,17 @@ const { LitElement, html, css } = require('lit') const { CommonOptionsScreen } = require('./options_store') const { commonCss, isMobile, openURL } = require('./components/common') const { hideCurrentModal } = require('../globalState') +const { toNumber, getScreenRefreshRate } = require('../utils') class AdvancedOptionsScreen extends CommonOptionsScreen { + /** @type {null | number} */ + frameLimitMax = null + constructor () { super() this.defineOptions({ - forceMobileControls: { defaultValue: false, convertFn: (v) => v === 'true' } + forceMobileControls: { defaultValue: false, convertFn: (v) => v === 'true' }, + frameLimit: { defaultValue: false, convertFn: (v) => toNumber(v) ?? false }, }) } @@ -59,10 +64,25 @@ class AdvancedOptionsScreen extends CommonOptionsScreen { this.requestUpdate() } }> - openURL('https://gist.github.com/zardoy/6e5ce377d2b4c1e322e660973da069cd')}> + + openURL('https://gist.github.com/zardoy/6e5ce377d2b4c1e322e660973da069cd')}> +
+
+ { + const newVal = e.target.value + this.changeOption('frameLimit', newVal > this.frameLimitMax ? false : newVal) + this.requestUpdate() + }}> + + { + const rate = await getScreenRefreshRate() + this.frameLimitMax = rate + this.requestUpdate() + }}>
- hideCurrentModal()}> + hideCurrentModal()}>
` } diff --git a/lib/menus/components/slider.js b/lib/menus/components/slider.js index 2811948c4..25ced293b 100644 --- a/lib/menus/components/slider.js +++ b/lib/menus/components/slider.js @@ -152,6 +152,9 @@ class Slider extends LitElement { type: String, attribute: 'pmui-value' }, + valueDisplay: { + type: String, + }, min: { type: String, attribute: 'pmui-min' @@ -201,7 +204,7 @@ class Slider extends LitElement { class="slider-thumb" style="left: calc((100% * ${this.ratio}) - (8px * ${this.ratio}));" >
- +
` } diff --git a/lib/menus/notification.js b/lib/menus/notification.js index f256a54dc..dd149534e 100644 --- a/lib/menus/notification.js +++ b/lib/menus/notification.js @@ -5,12 +5,17 @@ const { LitElement, html, css } = require('lit') const { proxy, subscribe } = require('valtio/vanilla') // move to globalState? -export const notification = proxy({ +const initialNotification = { show: false, autoHide: true, message: '', type: 'info', -}) +} +export const notification = proxy(initialNotification) + +export const showNotification = (/** @type {typeof notification} */newNotification) => { + Object.assign(notification, newNotification, initialNotification) +} window.notification = notification diff --git a/lib/menus/options_screen.js b/lib/menus/options_screen.js index 9bcef5867..6ebbf4117 100644 --- a/lib/menus/options_screen.js +++ b/lib/menus/options_screen.js @@ -2,6 +2,7 @@ const { LitElement, html, css } = require('lit') const { commonCss, isMobile } = require('./components/common') const { showModal, hideCurrentModal } = require('../globalState') const { CommonOptionsScreen } = require('./options_store') +const { toNumber } = require('../utils') class OptionsScreen extends CommonOptionsScreen { static get styles () { @@ -54,15 +55,15 @@ class OptionsScreen extends CommonOptionsScreen { this.isInsideWorld = false this.defineOptions({ - mouseSensX: { defaultValue: 50, convertFn: (v) => Math.floor(Number(v)) }, - mouseSensY: { defaultValue: 50, convertFn: (v) => Math.floor(Number(v)) }, - chatWidth: { defaultValue: 320, convertFn: (v) => Number(v) }, - chatHeight: { defaultValue: 180, convertFn: (v) => Number(v) }, - chatScale: { defaultValue: 100, convertFn: (v) => Number(v) }, - sound: { defaultValue: 50, convertFn: (v) => Number(v) }, - renderDistance: { defaultValue: 6, convertFn: (v) => Number(v) }, - fov: { defaultValue: 75, convertFn: (v) => Number(v) }, - guiScale: { defaultValue: 3, convertFn: (v) => Number(v) }, + mouseSensX: { defaultValue: 50, convertFn: (v) => Math.floor(toNumber(v)) }, + mouseSensY: { defaultValue: 50, convertFn: (v) => Math.floor(toNumber(v)) }, + chatWidth: { defaultValue: 320, convertFn: (v) => toNumber(v) }, + chatHeight: { defaultValue: 180, convertFn: (v) => toNumber(v) }, + chatScale: { defaultValue: 100, convertFn: (v) => toNumber(v) }, + sound: { defaultValue: 50, convertFn: (v) => toNumber(v) }, + renderDistance: { defaultValue: 6, convertFn: (v) => toNumber(v) }, + fov: { defaultValue: 75, convertFn: (v) => toNumber(v) }, + guiScale: { defaultValue: 3, convertFn: (v) => toNumber(v) }, mouseRawInput: { defaultValue: false, convertFn: (v) => v === 'true' }, autoFullscreen: { defaultValue: false, convertFn: (v) => v === 'true' } }) diff --git a/lib/menus/options_store.js b/lib/menus/options_store.js index 356958b30..078d39e3f 100644 --- a/lib/menus/options_store.js +++ b/lib/menus/options_store.js @@ -6,7 +6,7 @@ export class CommonOptionsScreen extends LitElement { options = {} defineOptions (props) { - for (const [name, { defaultValue, convertFn }] of Object.entries(props)) { + for (const [name, { defaultValue, convertValue = (v) => v, convertFn = convertValue }] of Object.entries(props)) { Object.defineProperty(this.options, name, { get () { let value = window.localStorage.getItem(name) ? convertFn(window.localStorage.getItem(name)) : defaultValue @@ -14,7 +14,7 @@ export class CommonOptionsScreen extends LitElement { return value }, set (value) { - window.localStorage.setItem(name, `${convertFn(value)}`) + window.localStorage.setItem(name, `${convertValue(value)}`) } }) this[name] = this.options[name] @@ -27,5 +27,7 @@ export class CommonOptionsScreen extends LitElement { changeOption (name, value) { this.options[name] = value this[name] = this.options[name] + // todo migrate to it + window.dispatchEvent(new CustomEvent('option-change', { detail: { name, value } })) } } diff --git a/lib/utils.js b/lib/utils.js index 1d5450dec..762368fed 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -1,5 +1,102 @@ +//@ts-check +import { activeModalStack } from './globalState' +import { notification } from './menus/notification' + +export const goFullscreen = async (doToggle = false) => { + if (!document.fullscreenElement) { + // todo display a message or repeat? + await document.documentElement.requestFullscreen().catch(() => { }) + // request full keyboard access + //@ts-ignore + navigator.keyboard?.lock?.(['Escape', 'KeyW']) + } else if (doToggle) { + await document.exitFullscreen().catch(() => { }) + } +} + +export const toNumber = (val) => { + const num = Number(val) + return isNaN(num) ? undefined : num +} + export const pointerLock = { - get hasPointerLock() { - return document.pointerLockElement || document['mozPointerLockElement'] || document['webkitPointerLockElement'] + get hasPointerLock () { + return document.pointerLockElement + }, + justHitEscape: false, + async requestPointerLock () { + if (document.getElementById('hud').style.display === 'none' || activeModalStack.length) return + const autoFullScreen = window.localStorage.getItem('autoFullscreen') === 'true' + if (autoFullScreen) { + await goFullscreen() + } + const displayBrowserProblem = () => { + notification.show = true + // todo use notification stack + notification.autoHide = true + notification.message = navigator['keyboard'] ? 'Browser Limitation: Click on screen, enable Auto Fullscreen or F11' : 'Browser Limitation: Click on screen or use fullscreen in Chrome' + } + if (!(document.fullscreenElement && navigator['keyboard']) && this.justHitEscape) { + displayBrowserProblem() + } else { + /** @type {any} */ + //@ts-ignore + const promise = document.documentElement.requestPointerLock({ + unadjustedMovement: window.localStorage.getItem('mouseRawInput') === 'true' + }) + promise?.catch((error) => { + if (error.name === "NotSupportedError") { + // Some platforms may not support unadjusted movement, request again a regular pointer lock. + document.documentElement.requestPointerLock() + } else if (error.name === 'SecurityError') { + // cause: https://discourse.threejs.org/t/how-to-avoid-pointerlockcontrols-error/33017/4 + displayBrowserProblem() + } else { + console.error(error) + } + }) + } + this.justHitEscape = false + } +} + +window.getScreenRefreshRate = getScreenRefreshRate + +/** + * Allows to obtain the estimated Hz of the primary monitor in the system. + */ +export function getScreenRefreshRate () { + let requestId = null + let callbackTriggered = false + let resolve + + const DOMHighResTimeStampCollection = [] + + const triggerAnimation = (DOMHighResTimeStamp) => { + DOMHighResTimeStampCollection.unshift(DOMHighResTimeStamp) + + if (DOMHighResTimeStampCollection.length > 10) { + let t0 = DOMHighResTimeStampCollection.pop() + let fps = Math.floor(1000 * 10 / (DOMHighResTimeStamp - t0)) + + if (!callbackTriggered) { + resolve(fps/* , DOMHighResTimeStampCollection */) + } + + callbackTriggered = true + } + + requestId = window.requestAnimationFrame(triggerAnimation) } + + window.requestAnimationFrame(triggerAnimation) + + window.setTimeout(() => { + window.cancelAnimationFrame(requestId) + requestId = null + }, 500) + + return new Promise(_resolve => { + resolve = _resolve + }) } From 3ee916beed0e0069d7cac58a68d69c094c0d4b7c Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 12 Aug 2023 03:54:19 +0300 Subject: [PATCH 031/318] fix incorrect ranges commited --- index.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/index.js b/index.js index 8609ef07d..d48c26a2a 100644 --- a/index.js +++ b/index.js @@ -202,19 +202,6 @@ async function main () { connect(options) }) } -let justHitEscape = false - -const goFullscreen = async (doToggle = false) => { - if (!document.fullscreenElement) { - // todo display a message or repeat? - await document.documentElement.requestFullscreen().catch(() => { }) - // request full keyboard access - //@ts-ignore - navigator.keyboard?.lock?.(['Escape', 'KeyW']) - } else if (doToggle) { - await document.exitFullscreen().catch(() => { }) - } -} async function connect (options) { const debugMenu = hud.shadowRoot.querySelector('#debug-overlay') From eb811704feeb033989050b0ab73406edd3cde20d Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 12 Aug 2023 04:03:34 +0300 Subject: [PATCH 032/318] add new components to html --- index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.html b/index.html index b25c870a2..251cd346a 100644 --- a/index.html +++ b/index.html @@ -24,7 +24,9 @@ + +
From bac20d5f08131dd6512f02686fb4ac3af2f1fb69 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 12 Aug 2023 17:49:25 +0300 Subject: [PATCH 033/318] add proxy note, improve inputs on mobile & desktop dont crash on block placement error --- index.js | 19 +++++-------------- lib/cursor.js | 15 ++++++++++----- lib/menus/components/edit_box.js | 23 ++++++++++++++++++++--- lib/menus/play_screen.js | 23 +++++++++++++++++++---- styles.css | 4 ++++ webpack.prod.js | 2 +- 6 files changed, 59 insertions(+), 27 deletions(-) diff --git a/index.js b/index.js index d48c26a2a..482629bce 100644 --- a/index.js +++ b/index.js @@ -347,28 +347,19 @@ async function connect (options) { setLoadingScreenStatus('Setting callbacks') - let yaw - let moveCallsPerSec = 0 - setInterval(() => { - console.log('mouse frequency', moveCallsPerSec) - moveCallsPerSec = 0 - }, 1000) - let lastCall + let lastMouseCall function moveCallback (e) { if (!pointerLock.hasPointerLock) return e.stopPropagation?.() const now = performance.now() - if (now - lastCall < 5) return - lastCall = now - moveCallsPerSec++ + // todo: limit camera movement for now to avoid unexpected jumps + if (now - lastMouseCall < 4) return + lastMouseCall = now let { mouseSensX, mouseSensY } = optionsScrn if (mouseSensY === true) mouseSensY = mouseSensX - yaw ??= bot.entity.yaw bot.entity.pitch -= e.movementY * mouseSensX * 0.0001 bot.entity.pitch = Math.max(minPitch, Math.min(maxPitch, bot.entity.pitch)) - const diff = e.movementX * mouseSensY * 0.0001 - bot.entity.yaw -= diff - yaw -= diff + bot.entity.yaw -= e.movementX * mouseSensY * 0.0001 // debugPitch.innerText = +debugPitch.innerText + e.movementX } diff --git a/lib/cursor.js b/lib/cursor.js index c5db2e5a4..5e6e5e0f2 100644 --- a/lib/cursor.js +++ b/lib/cursor.js @@ -80,7 +80,7 @@ class Cursor { bot.on('physicsTick', () => { if (this.lastPlaced < 4) this.lastPlaced++ }) } - update (bot) { + update (/** @type {import('mineflayer').Bot} */bot) { let cursorBlock = bot.blockAtCursor(6) if (!bot.canDigBlock(cursorBlock)) cursorBlock = null @@ -93,8 +93,13 @@ class Cursor { if (cursorBlock && this.buttons[2] && (!this.lastButtons[2] || cursorChanged) && this.lastPlaced >= 4) { const vecArray = [new Vec3(0, -1, 0), new Vec3(0, 1, 0), new Vec3(0, 0, -1), new Vec3(0, 0, 1), new Vec3(-1, 0, 0), new Vec3(1, 0, 0)] const delta = cursorBlock.intersect.minus(cursorBlock.position) - bot._placeBlockWithOptions(cursorBlock, vecArray[cursorBlock.face], { delta, forceLook: 'ignore' }) - bot.lastPlaced = 0 + // check instead? + try { + bot._placeBlockWithOptions(cursorBlock, vecArray[cursorBlock.face], { delta, forceLook: 'ignore' }) + bot.lastPlaced = 0 + } catch (err) { + console.warn(err) + } } // Start break @@ -102,14 +107,14 @@ class Cursor { this.breakStartTime = performance.now() try { bot.dig(cursorBlock, 'ignore') - } catch (e) {} // we don't care if its aborted + } catch (e) { } // we don't care if its aborted } // Stop break if (!this.buttons[0] && this.lastButtons[0]) { try { bot.stopDigging() // this shouldnt throw anything... - } catch (e) {} // to be reworked in mineflayer, then remove the try here + } catch (e) { } // to be reworked in mineflayer, then remove the try here } // Show break animation diff --git a/lib/menus/components/edit_box.js b/lib/menus/components/edit_box.js index 934f541c4..9d6acaafa 100644 --- a/lib/menus/components/edit_box.js +++ b/lib/menus/components/edit_box.js @@ -1,4 +1,5 @@ const { LitElement, html, css } = require('lit') +const { ifDefined } = require('lit/directives/if-defined.js') class EditBox extends LitElement { static get styles () { @@ -40,6 +41,18 @@ class EditBox extends LitElement { color: white; text-shadow: 1px 1px #222; } + + input::-webkit-outer-spin-button, + input::-webkit-inner-spin-button { + -webkit-appearance: none; + margin: 0; + } + + /* Firefox */ + input[type=number] { + appearance: textfield; + -moz-appearance: textfield; + } ` } @@ -79,6 +92,10 @@ class EditBox extends LitElement { inputMode: { type: String, attribute: 'pmui-inputmode' + }, + required: { + type: Boolean, + attribute: 'pmui-required' } } } @@ -106,9 +123,9 @@ class EditBox extends LitElement { autocomplete="off" autocapitalize="off" value="${this.value}" - list="${this.autocompleteValues ? `${this.id}-list` : ''}" - inputmode="${this.inputMode}" - @input=${(e) => { this.value = e.target.value }} + list=${ifDefined(this.autocompleteValues ? `${this.id}-list` : undefined)} + inputmode=${ifDefined(this.inputMode || undefined)} + @input=${({ target: { value } }) => { this.value = this.inputMode === 'decimal' ? value.replaceAll(',', '.') : value }} class="edit-box">
` diff --git a/lib/menus/play_screen.js b/lib/menus/play_screen.js index a0f33fd14..161ffd08b 100644 --- a/lib/menus/play_screen.js +++ b/lib/menus/play_screen.js @@ -39,7 +39,7 @@ class PlayScreen extends LitElement { width: 310px; } - .extra-info-bv { + .extra-info-version { font-size: 10px; color: rgb(206, 206, 206); text-shadow: 1px 1px black; @@ -47,6 +47,18 @@ class PlayScreen extends LitElement { left: calc(50% + 2px); bottom: -34px; } + + .extra-info-proxy { + font-size: 8px; + color: rgb(206, 206, 206); + text-shadow: 1px 1px black; + margin:0; + margin-top:-12px; + } + + a { + color: white; + } ` } @@ -121,7 +133,7 @@ class PlayScreen extends LitElement {
{ this.proxyport = e.target.value }} >
+
+

Enter proxy url you want to use. Learn more.

+
{ this.version = e.target.value }} >
-

Leave blank and it will be chosen automatically

+

Leave blank and it will be chosen automatically

diff --git a/styles.css b/styles.css index bd8bf6800..38efac0ae 100644 --- a/styles.css +++ b/styles.css @@ -12,6 +12,10 @@ box-sizing: border-box; } +a { + color: white; +} + html { height: 100vh; overflow: hidden; diff --git a/webpack.prod.js b/webpack.prod.js index 3b95ec01d..d0a2b1527 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -22,7 +22,7 @@ module.exports = merge(common, { }), new webpack.ProvidePlugin({ // get from github actions or vercel env - GITHUB_URL: process.env.VERCEL_GIT_REPO_OWNER + 'process.env.GITHUB_URL': process.env.VERCEL_GIT_REPO_OWNER ? `https://github.com/${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}` : process.env.GITHUB_REPOSITORY }) From d177ba10a65f920bdcc7df442866275d7b121e45 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 12 Aug 2023 20:55:55 +0300 Subject: [PATCH 034/318] experimental way to handle reconnect without page reload, which doesn't work only when player is joined (though R should work!) --- index.html | 2 +- index.js | 176 ++++++++++++++------------- lib/globalState.js | 30 ++++- lib/menus/components/button.js | 5 + lib/menus/loading_or_error_screen.js | 95 +++++++++++++++ lib/menus/loading_screen.js | 72 ----------- lib/panorama.js | 65 ++++++++++ lib/utilsTs.ts | 33 +++++ 8 files changed, 314 insertions(+), 164 deletions(-) create mode 100644 lib/menus/loading_or_error_screen.js delete mode 100644 lib/menus/loading_screen.js create mode 100644 lib/panorama.js create mode 100644 lib/utilsTs.ts diff --git a/index.html b/index.html index 251cd346a..cac5dc561 100644 --- a/index.html +++ b/index.html @@ -20,7 +20,7 @@
- + diff --git a/index.js b/index.js index 482629bce..638ba05ea 100644 --- a/index.js +++ b/index.js @@ -15,7 +15,7 @@ require('./lib/menus/components/bossbars_overlay') require('./lib/menus/hud') require('./lib/menus/play_screen') require('./lib/menus/pause_screen') -require('./lib/menus/loading_screen') +require('./lib/menus/loading_or_error_screen') require('./lib/menus/keybinds_screen') require('./lib/menus/options_screen') require('./lib/menus/advanced_options_screen') @@ -39,9 +39,10 @@ const Cursor = require('./lib/cursor') //@ts-ignore global.THREE = require('three') const { initVR } = require('./lib/vr') -const { activeModalStack, showModal, hideModal, hideCurrentModal } = require('./lib/globalState') +const { activeModalStack, showModal, hideModal, hideCurrentModal, activeModalStacks, replaceActiveModalStack } = require('./lib/globalState') const { pointerLock, goFullscreen, toNumber } = require('./lib/utils') const { notification } = require('./lib/menus/notification') +const { removePanorama, addPanoramaCubeMap, initPanoramaOptions } = require('./lib/panorama') if ('serviceWorker' in navigator) { window.addEventListener('load', () => { @@ -83,61 +84,7 @@ document.body.appendChild(renderer.domElement) // Create viewer const viewer = new Viewer(renderer) - -// Menu panorama background -function addPanoramaCubeMap () { - let time = 0 - viewer.camera = new THREE.PerspectiveCamera(85, window.innerWidth / window.innerHeight, 0.05, 1000) - viewer.camera.updateProjectionMatrix() - viewer.camera.position.set(0, 0, 0) - viewer.camera.rotation.set(0, 0, 0) - const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000) - - const loader = new THREE.TextureLoader() - const panorMaterials = [ - new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_1.png'), transparent: true, side: THREE.DoubleSide }), // WS - new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_3.png'), transparent: true, side: THREE.DoubleSide }), // ES - new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_4.png'), transparent: true, side: THREE.DoubleSide }), // Up - new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_5.png'), transparent: true, side: THREE.DoubleSide }), // Down - new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_0.png'), transparent: true, side: THREE.DoubleSide }), // NS - new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_2.png'), transparent: true, side: THREE.DoubleSide }) // SS - ] - - const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials) - - panoramaBox.onBeforeRender = () => { - time += 0.01 - panoramaBox.rotation.y = Math.PI + time * 0.01 - panoramaBox.rotation.z = Math.sin(-time * 0.001) * 0.001 - } - - const group = new THREE.Object3D() - group.add(panoramaBox) - - const Entity = require('prismarine-viewer/viewer/lib/entity/Entity') - for (let i = 0; i < 42; i++) { - const m = new Entity('1.16.4', 'squid').mesh - m.position.set(Math.random() * 30 - 15, Math.random() * 20 - 10, Math.random() * 10 - 17) - m.rotation.set(0, Math.PI + Math.random(), -Math.PI / 4, 'ZYX') - const v = Math.random() * 0.01 - m.children[0].onBeforeRender = () => { - m.rotation.y += v - m.rotation.z = Math.cos(panoramaBox.rotation.y * 3) * Math.PI / 4 - Math.PI / 2 - } - group.add(m) - } - - viewer.scene.add(group) - return group -} - -const panoramaCubeMap = addPanoramaCubeMap() - -function removePanorama () { - viewer.camera = new THREE.PerspectiveCamera(document.getElementById('options-screen').fov, window.innerWidth / window.innerHeight, 0.1, 1000) - viewer.camera.updateProjectionMatrix() - viewer.scene.remove(panoramaCubeMap) -} +initPanoramaOptions(viewer) const frameLimit = toNumber(localStorage.frameLimit) let interval = frameLimit && 1000 / frameLimit @@ -178,7 +125,7 @@ window.addEventListener('resize', () => { renderer.setSize(window.innerWidth, window.innerHeight) }) -const loadingScreen = document.getElementById('loading-screen') +const loadingScreen = document.getElementById('loading-error-screen') const hud = document.getElementById('hud') const optionsScrn = document.getElementById('options-screen') @@ -188,8 +135,8 @@ const pauseMenu = document.getElementById('pause-screen') function setLoadingScreenStatus (status, isError = false) { showModal(loadingScreen) if (loadingScreen.hasError) return - loadingScreen.status = status loadingScreen.hasError = isError + loadingScreen.status = status } async function main () { @@ -204,6 +151,21 @@ async function main () { } async function connect (options) { + loadingScreen.maybeRecoverable = true + const oldSetInterval = window.setInterval + // @ts-ignore + window.setInterval = (callback, ms) => { + const id = oldSetInterval.call(window, callback, ms) + timeouts.push(id) + return id + } + const oldSetTimeout = window.setTimeout + //@ts-ignore + window.setTimeout = (callback, ms) => { + const id = oldSetTimeout.call(window, callback, ms) + timeouts.push(id) + return id + } const debugMenu = hud.shadowRoot.querySelector('#debug-overlay') const viewDistance = optionsScrn.renderDistance @@ -238,21 +200,31 @@ async function connect (options) { setLoadingScreenStatus('Logging in') - const bot = mineflayer.createBot({ - host, - port, - version: options.botVersion === '' ? false : options.botVersion, - username, - password, - viewDistance: 'tiny', - checkTimeoutInterval: 240 * 1000, - noPongTimeout: 240 * 1000, - closeTimeout: 240 * 1000 - }) - hud.preload(bot) - - bot.on('error', (err) => { + /** @type {mineflayer.Bot} */ + let bot + const destroy = () => { + // simple variant, still buggy + postRenderFrameFn = () => { } + if (bot) { + bot.removeAllListeners() + bot._client.removeAllListeners() + bot._client = undefined + bot = undefined + } + removeAllListeners() + for (const timeout of timeouts) { + clearTimeout(timeout) + } + timeouts = [] + for (const interval of intervals) { + clearInterval(interval) + } + intervals = [] + } + const handleError = (err) => { console.log('Encountered error!', err) + + // #region rejoin key const controller = new AbortController() window.addEventListener('keydown', (e) => { if (e.code !== 'KeyR') return @@ -260,17 +232,46 @@ async function connect (options) { connect(options) loadingScreen.hasError = false }, { signal: controller.signal }) - setLoadingScreenStatus(`Error encountered. Error message: ${err}. Please reload the page`, true) - }) + // #endregion + + setLoadingScreenStatus(`Error encountered. Error message: ${err}`, true) + destroy() + } + + try { + bot = mineflayer.createBot({ + host, + port, + version: options.botVersion === '' ? false : options.botVersion, + username, + password, + viewDistance: 'tiny', + checkTimeoutInterval: 240 * 1000, + noPongTimeout: 240 * 1000, + closeTimeout: 240 * 1000 + }) + } catch (err) { + handleError(err) + } + if (!bot) return + hud.preload(bot) + + // bot.on('inject_allowed', () => { + // loadingScreen.maybeRecoverable = false + // }) + + bot.on('error', handleError) bot.on('kicked', (kickReason) => { console.log('User was kicked!', kickReason) - setLoadingScreenStatus(`The Minecraft server kicked you. Kick reason: ${kickReason}. Please reload the page to rejoin`, true) + setLoadingScreenStatus(`The Minecraft server kicked you. Kick reason: ${kickReason}`, true) + destroy() }) bot.on('end', (endReason) => { console.log('disconnected for', endReason) - setLoadingScreenStatus(`You have been disconnected from the server. End reason: ${endReason}. Please reload the page to rejoin`, true) + destroy() + setLoadingScreenStatus(`You have been disconnected from the server. End reason: ${endReason}`, true) }) bot.once('login', () => { @@ -370,11 +371,11 @@ async function connect (options) { } } - window.addEventListener('mousemove', moveCallback, { capture: true }) - document.addEventListener('pointerlockchange', changeCallback, false) + registerListener(window, 'mousemove', moveCallback, { capture: true }) + registerListener(document, 'pointerlockchange', changeCallback, false) let lastTouch - document.addEventListener('touchmove', (e) => { + registerListener(document, 'touchmove', (e) => { window.scrollTo(0, 0) e.preventDefault() e.stopPropagation() @@ -384,17 +385,17 @@ async function connect (options) { lastTouch = e.touches[0] }, { passive: false }) - document.addEventListener('touchend', (e) => { + registerListener(document, 'touchend', (e) => { lastTouch = undefined }, { passive: false }) - document.addEventListener('contextmenu', (e) => e.preventDefault(), false) + registerListener(document, 'contextmenu', (e) => e.preventDefault(), false) - window.addEventListener('blur', (e) => { + registerListener(document, 'blur', (e) => { bot.clearControlStates() }, false) - document.addEventListener('keydown', (e) => { + registerListener(document, 'keydown', (e) => { if (activeModalStack.length) return keyBindScrn.keymaps.forEach(km => { @@ -429,7 +430,7 @@ async function connect (options) { }) }, false) - document.addEventListener('keyup', (e) => { + registerListener(document, 'keyup', (e) => { keyBindScrn.keymaps.forEach(km => { if (e.code === km.key) { switch (km.defaultKey) { @@ -468,8 +469,8 @@ async function connect (options) { setTimeout(function () { if (loadingScreen.hasError) return // remove loading screen, wait a second to make sure a frame has properly rendered - loadingScreen.style.display = 'none' - activeModalStack.splice(0, activeModalStack.length) + activeModalStacks['main-menu'] = activeModalStack + replaceActiveModalStack('', []) }, 2500) }) } @@ -508,5 +509,6 @@ window.addEventListener('keydown', (e) => { // } }) +addPanoramaCubeMap() showModal(document.getElementById('title-screen')) main() diff --git a/lib/globalState.js b/lib/globalState.js index 2ae42b3cb..afcf67d74 100644 --- a/lib/globalState.js +++ b/lib/globalState.js @@ -2,6 +2,8 @@ import { pointerLock } from './utils' +// todo: refactor structure with support of hideNext=false + /** * @typedef {(HTMLElement & Record)} Modal */ @@ -9,6 +11,15 @@ import { pointerLock } from './utils' /** @type {Modal[]} */ export const activeModalStack = [] +export const replaceActiveModalStack = (name, newModalStack = activeModalStacks[name]) => { + hideModal(undefined, undefined, { restorePrevious: false, force: true, }) + activeModalStack.splice(0, activeModalStack.length, ...newModalStack) + // todo restore previous +} + +/** @type {Record} */ +export const activeModalStacks = {} + window.activeModalStack = activeModalStack export const customDisplayManageKeyword = 'custom' @@ -27,14 +38,25 @@ export const showModal = (/** @type {Modal} */ modal) => { activeModalStack.push(modal) } -export const hideModal = (modal = activeModalStack.slice(-1)[0], data) => { +/** + * + * @param {*} data + * @param {{ force?: boolean, restorePrevious?: boolean, }} options + * @returns + */ +export const hideModal = (modal = activeModalStack.slice(-1)[0], data = undefined, options = {}) => { + const { force = false, restorePrevious = true } = options if (!modal) return - const cancel = modal.hide?.(data) + let cancel = modal.hide?.(data) + if (force && cancel !== customDisplayManageKeyword) { + cancel = undefined + } + if (!cancel || cancel === customDisplayManageKeyword) { if (cancel !== customDisplayManageKeyword) modal.style.display = 'none' activeModalStack.pop() const newModal = activeModalStack.slice(-1)[0] - if (newModal) { + if (newModal && restorePrevious) { // would be great to ignore cancel I guess? showModalInner(newModal) } @@ -42,7 +64,7 @@ export const hideModal = (modal = activeModalStack.slice(-1)[0], data) => { } } -export const hideCurrentModal = (data, preActions) => { +export const hideCurrentModal = (_data = undefined, preActions = undefined) => { if (hideModal(undefined, undefined)) { preActions?.() if (document.getElementById('hud').style.display === 'none') { diff --git a/lib/menus/components/button.js b/lib/menus/components/button.js index d25a884f0..10e637453 100644 --- a/lib/menus/components/button.js +++ b/lib/menus/components/button.js @@ -4,11 +4,14 @@ const audioContext = new window.AudioContext() const sounds = {} // load as many resources on page load as possible instead on demand as user can disable internet connection after he thinks the page is loaded +let loadingSounds = [] async function loadSound (path) { + loadingSounds.push(path) const res = await window.fetch(path) const data = await res.arrayBuffer() sounds[path] = await audioContext.decodeAudioData(data) + loadingSounds.splice(loadingSounds.indexOf(path), 1) } async function playSound (path) { @@ -18,6 +21,8 @@ async function playSound (path) { volume = options.sound / 100 } + // todo? + if (loadingSounds.includes(path)) return let soundBuffer = sounds[path] if (!soundBuffer) throw new Error(`Sound ${path} not loaded`) diff --git a/lib/menus/loading_or_error_screen.js b/lib/menus/loading_or_error_screen.js new file mode 100644 index 000000000..48c14b68e --- /dev/null +++ b/lib/menus/loading_or_error_screen.js @@ -0,0 +1,95 @@ +//@ts-check +const { LitElement, html, css } = require('lit') +const { commonCss } = require('./components/common') +const { addPanoramaCubeMap } = require('../panorama') +const { hideModal, activeModalStacks, activeModalStack, replaceActiveModalStack } = require('../globalState') + +class LoadingErrorScreen extends LitElement { + static get styles () { + return css` + ${commonCss} + .title { + top: 30px; + } + + .error-buttons { + position: absolute; + top: calc(20% + 50px); + left: 50%; + transform: translate(-50%); + } + ` + } + + static get properties () { + return { + status: { type: String }, + loadingText: { type: String }, + maybeRecoverable: { type: Boolean }, + hasError: { type: Boolean } + } + } + + constructor () { + super() + this.hasError = false + this.maybeRecoverable = false + this.status = 'Waiting for JS load' + } + + firstUpdated () { + this.statusRunner() + } + + async statusRunner () { + const array = ['.', '..', '...', ''] + const timer = ms => new Promise((resolve) => setTimeout(resolve, ms)) + + const load = async () => { + for (let i = 0; true; i = ((i + 1) % array.length)) { + if (!this.hasError) { + this.loadingText = this.status + array[i] + } + await timer(500) + } + } + + load() + } + + hide () { + // cancel hiding + return true + } + + render () { + console.log('render') + return html` +
+ +

${this.hasError ? this.status : this.loadingText}

+ + ${this.hasError + ? html`
{ + if (window.location.search) { + const qs = new URLSearchParams(window.location.search) + // remove reconnect from qs + qs.delete('reconnect') + window.history.replaceState(null, null, qs.toString()) + } + this.hasError = false + if (activeModalStacks['main-menu']) { + replaceActiveModalStack('main-menu') + } else { + hideModal(undefined, undefined, { force: true }) + } + document.getElementById('play-screen').style.display = 'block' + addPanoramaCubeMap() + }}> window.location.reload()} pmui-label="Full Reload" pmui-width="200px">
` + : '' + } + ` + } +} + +window.customElements.define('pmui-loading-error-screen', LoadingErrorScreen) diff --git a/lib/menus/loading_screen.js b/lib/menus/loading_screen.js deleted file mode 100644 index d86dbdb3c..000000000 --- a/lib/menus/loading_screen.js +++ /dev/null @@ -1,72 +0,0 @@ -const { LitElement, html, css } = require('lit') -const { commonCss } = require('./components/common') - -class LoadingScreen extends LitElement { - static get styles () { - return css` - ${commonCss} - .title { - top: 30px; - } - - #cancel-btn { - position: absolute; - top: calc(20% + 50px); - left: 50%; - transform: translate(-50%); - } - ` - } - - static get properties () { - return { - status: { type: String }, - loadingText: { type: String }, - hasError: { type: Number } - } - } - - constructor () { - super() - this.hasError = false - this.status = 'Waiting for JS load' - } - - firstUpdated () { - this.statusRunner() - } - - async statusRunner () { - const array = ['.', '..', '...', ''] - const timer = ms => new Promise((resolve) => setTimeout(resolve, ms)) - - const load = async () => { - for (let i = 0; true; i = ((i + 1) % array.length)) { - this.loadingText = this.status + array[i] - await timer(500) - } - } - - load() - } - - hide () { - // cancel hiding - return true - } - - render () { - return html` -
- -

${this.hasError ? this.status : this.loadingText}

- - ${this.hasError - ? html` window.location.reload()}>` - : '' - } - ` - } -} - -window.customElements.define('pmui-loadingscreen', LoadingScreen) diff --git a/lib/panorama.js b/lib/panorama.js new file mode 100644 index 000000000..f1bf8e191 --- /dev/null +++ b/lib/panorama.js @@ -0,0 +1,65 @@ +//@ts-check + +let panoramaCubeMap +let viewer + +export const initPanoramaOptions = (_viewer) => { + viewer = _viewer +} + +// Menu panorama background +export function addPanoramaCubeMap () { + // remove all existing object in the viewer.scene + // viewer.scene.children = [] + + let time = 0 + viewer.camera = new THREE.PerspectiveCamera(85, window.innerWidth / window.innerHeight, 0.05, 1000) + viewer.camera.updateProjectionMatrix() + viewer.camera.position.set(0, 0, 0) + viewer.camera.rotation.set(0, 0, 0) + const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000) + + const loader = new THREE.TextureLoader() + const panorMaterials = [ + new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_1.png'), transparent: true, side: THREE.DoubleSide }), // WS + new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_3.png'), transparent: true, side: THREE.DoubleSide }), // ES + new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_4.png'), transparent: true, side: THREE.DoubleSide }), // Up + new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_5.png'), transparent: true, side: THREE.DoubleSide }), // Down + new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_0.png'), transparent: true, side: THREE.DoubleSide }), // NS + new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_2.png'), transparent: true, side: THREE.DoubleSide }) // SS + ] + + const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials) + + panoramaBox.onBeforeRender = () => { + time += 0.01 + panoramaBox.rotation.y = Math.PI + time * 0.01 + panoramaBox.rotation.z = Math.sin(-time * 0.001) * 0.001 + } + + const group = new THREE.Object3D() + group.add(panoramaBox) + + const Entity = require('prismarine-viewer/viewer/lib/entity/Entity') + for (let i = 0; i < 42; i++) { + const m = new Entity('1.16.4', 'squid').mesh + m.position.set(Math.random() * 30 - 15, Math.random() * 20 - 10, Math.random() * 10 - 17) + m.rotation.set(0, Math.PI + Math.random(), -Math.PI / 4, 'ZYX') + const v = Math.random() * 0.01 + m.children[0].onBeforeRender = () => { + m.rotation.y += v + m.rotation.z = Math.cos(panoramaBox.rotation.y * 3) * Math.PI / 4 - Math.PI / 2 + } + group.add(m) + } + + viewer.scene.add(group) + panoramaCubeMap = group +} + +export function removePanorama () { + if (!panoramaCubeMap) throw new Error('panorama is not there') + viewer.camera = new THREE.PerspectiveCamera(document.getElementById('options-screen').fov, window.innerWidth / window.innerHeight, 0.1, 1000) + viewer.camera.updateProjectionMatrix() + viewer.scene.remove(panoramaCubeMap) +} diff --git a/lib/utilsTs.ts b/lib/utilsTs.ts new file mode 100644 index 000000000..75cd623a3 --- /dev/null +++ b/lib/utilsTs.ts @@ -0,0 +1,33 @@ +type Options = boolean | Readonly | undefined + +function registerListener( + element: Readonly | null | undefined, + eventType: KD, + // eslint-disable-next-line functional/prefer-immutable-types + listener: (this: Document, evt: DocumentEventMap[KD]) => void, + options?: Options, +): void +function registerListener( + element: Readonly | null | undefined, + eventType: KH, + // eslint-disable-next-line functional/prefer-immutable-types + listener: (this: HTMLElement, evt: HTMLElementEventMap[KH]) => void, + options?: Options, +): void +function registerListener( + element: Readonly | null | undefined, + eventType: KW, + // eslint-disable-next-line functional/prefer-immutable-types + listener: (this: Window, evt: WindowEventMap[KW]) => void, + options?: Options, +): void +//@ts-ignore +function registerListener( + element: Readonly | null | undefined, + eventType: string, + // eslint-disable-next-line functional/prefer-immutable-types + listener: (evt: Event) => void, + options?: Options, +): void + +export type RegisterListener = typeof registerListener From b61294b51dec028cfabf04a047d7dddf3d15169c Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 12 Aug 2023 20:56:34 +0300 Subject: [PATCH 035/318] build should be fixed --- build.js | 16 ++++++++-------- tsconfig.json | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build.js b/build.js index 399476435..7d93053d9 100644 --- a/build.js +++ b/build.js @@ -1,14 +1,14 @@ const fsExtra = require('fs-extra') exports.copyFiles = () => { - fsExtra.copySync('styles.css', 'public/styles.css') - fsExtra.copySync('node_modules/prismarine-viewer/public/blocksStates/', 'public/blocksStates/') - fsExtra.copySync('node_modules/prismarine-viewer/public/textures/', 'public/textures/') - fsExtra.copySync('node_modules/prismarine-viewer/public/worker.js', 'public/worker.js') - fsExtra.copySync('node_modules/prismarine-viewer/public/supportedVersions.json', 'public/supportedVersions.json') - fsExtra.copySync('assets/', 'public/') - fsExtra.copySync('extra-textures/', 'public/extra-textures/') - fsExtra.copySync('config.json', 'public/config.json') + fsExtra.copySync('./node_modules/prismarine-viewer2/public/blocksStates/', 'public/blocksStates/') + fsExtra.copySync('./node_modules/prismarine-viewer2/public/textures/', 'public/textures/') + fsExtra.copySync('./node_modules/prismarine-viewer2/public/worker.js', 'public/worker.js') + fsExtra.copySync('./node_modules/prismarine-viewer2/public/supportedVersions.json', 'public/supportedVersions.json') + fsExtra.copySync('./node_modules/prismarine-viewer2/public/supportedVersions.json', './prismarine-viewer/public/supportedVersions.json') + fsExtra.copySync('./assets/', './public/') + fsExtra.copySync('./extra-textures/', 'public/extra-textures/') + fsExtra.copySync('./config.json', 'public/config.json') } exports.copyFilesDev = () => { diff --git a/tsconfig.json b/tsconfig.json index 0d6a33e61..e8193b544 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,6 +6,7 @@ "allowJs": true, "allowSyntheticDefaultImports": true, "noEmit": true, + "strictFunctionTypes": true // "strictNullChecks": true }, "include": [ From 216a61ddaea94d6a48e9a3568e0db0cd90c90a18 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 12 Aug 2023 20:57:09 +0300 Subject: [PATCH 036/318] dx: watch styles copy, dont slow debugger cause of creating a lot of files --- webpack.common.js | 19 ++++++------------- webpack.prod.js | 3 +++ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/webpack.common.js b/webpack.common.js index 7c0392c32..33341c858 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -8,7 +8,7 @@ const config = { entry: path.resolve(__dirname, './index.js'), output: { path: path.resolve(__dirname, './public'), - filename: './[name]-[chunkhash].js', + filename: './[name].js', publicPath: './' }, resolve: { @@ -61,18 +61,11 @@ const config = { /prismarine-viewer[/|\\]viewer[/|\\]lib[/|\\]utils/, './utils.web.js' ), - // new CopyPlugin({ - // patterns: [ - // { from: path.join(__dirname, '/styles.css'), to: './styles.css' }, - // { from: path.join(__dirname, '/node_modules/prismarine-viewer/public/blocksStates/'), to: './blocksStates/' }, - // { from: path.join(__dirname, '/node_modules/prismarine-viewer/public/textures/'), to: './textures/' }, - // { from: path.join(__dirname, '/node_modules/prismarine-viewer/public/worker.js'), to: './' }, - // { from: path.join(__dirname, '/node_modules/prismarine-viewer/public/supportedVersions.json'), to: './' }, - // { from: path.join(__dirname, 'assets/'), to: './' }, - // { from: path.join(__dirname, 'extra-textures/'), to: './extra-textures/' }, - // { from: path.join(__dirname, 'config.json'), to: './config.json' } - // ] - // }) + new CopyPlugin({ + patterns: [ + { from: path.join(__dirname, '/styles.css'), to: './styles.css' }, + ] + }) ] } diff --git a/webpack.prod.js b/webpack.prod.js index d0a2b1527..2caef9a5a 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -7,6 +7,9 @@ const WorkboxPlugin = require('workbox-webpack-plugin') const webpack = require('webpack') module.exports = merge(common, { + output: { + filename: './[name].js', + }, mode: 'production', devtool: 'source-map', plugins: [ From 75e4349b84ccd2f327d235bb93e9c1fdcb7337be Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 12 Aug 2023 21:25:22 +0300 Subject: [PATCH 037/318] ci: commit possible build fix --- package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package.json b/package.json index b0ac9035d..ab02738db 100644 --- a/package.json +++ b/package.json @@ -78,5 +78,10 @@ "webpack-dev-server": "^4.15.1", "webpack-merge": "^5.9.0", "workbox-webpack-plugin": "^6.6.0" + }, + "pnpm": { + "overrides": { + "minecraft-data": "latest" + } } } From bbb8539af2218e1d61663bd1d4bfde58a442eab6 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 12 Aug 2023 22:24:10 +0300 Subject: [PATCH 038/318] experimental singleplayer support --- index.js | 136 +++++++++++++++++++++++---- lib/menus/hud.js | 9 +- lib/menus/loading_or_error_screen.js | 1 - package.json | 4 +- webpack.prod.js | 4 +- 5 files changed, 128 insertions(+), 26 deletions(-) diff --git a/index.js b/index.js index 638ba05ea..4a225d526 100644 --- a/index.js +++ b/index.js @@ -43,6 +43,7 @@ const { activeModalStack, showModal, hideModal, hideCurrentModal, activeModalSta const { pointerLock, goFullscreen, toNumber } = require('./lib/utils') const { notification } = require('./lib/menus/notification') const { removePanorama, addPanoramaCubeMap, initPanoramaOptions } = require('./lib/panorama') +const { createClient } = require('minecraft-protocol') if ('serviceWorker' in navigator) { window.addEventListener('load', () => { @@ -139,6 +140,31 @@ function setLoadingScreenStatus (status, isError = false) { loadingScreen.status = status } +let mouseMovePostHandle = (e) => { } +let lastMouseCall +function onMouseMove (e) { + if (!pointerLock.hasPointerLock) return + e.stopPropagation?.() + const now = performance.now() + // todo: limit camera movement for now to avoid unexpected jumps + if (now - lastMouseCall < 4) return + lastMouseCall = now + let { mouseSensX, mouseSensY } = optionsScrn + if (mouseSensY === true) mouseSensY = mouseSensX + // debugPitch.innerText = +debugPitch.innerText + e.movementX + mouseMovePostHandle({ + x: e.movementX * mouseSensX * 0.0001, + y: e.movementY * mouseSensY * 0.0001 + }) +} +window.addEventListener('mousemove', onMouseMove, { capture: true }) + + +function hideCurrentScreens () { + activeModalStacks['main-menu'] = activeModalStack + replaceActiveModalStack('', []) +} + async function main () { const menu = document.getElementById('play-screen') @@ -148,6 +174,91 @@ async function main () { removePanorama() connect(options) }) + document.querySelector('#title-screen').addEventListener('singleplayer', (e) => { + menu.style = 'display: none;' + hideCurrentScreens() + removePanorama() + + const version = '1.16.4' + + const viewDistance = 10 + const center = new Vec3(0, 90, 0) + + //@ts-ignore + const World = PrismarineWorld(version) + + // gen + const diamondSquare = require('diamond-square')({ version, seed: Math.floor(Math.random() * Math.pow(2, 31)) }) + + const world = new World(diamondSquare) + const worldView = new WorldView(world, viewDistance, center) + + // Create viewer + const viewer = new Viewer(renderer) + viewer.setVersion(version) + // Attach controls to viewer + const controls = new MapControls(viewer.camera, renderer.domElement) + + // Link WorldView and Viewer + viewer.listen(worldView) + // Initialize viewer, load chunks + worldView.init(center) + + viewer.camera.position.set(center.x, center.y, center.z) + controls.update() + + postRenderFrameFn = () => { + if (controls) controls.update() + worldView.updatePosition(controls.target) + viewer.update() + } + // Browser animation loop + const animate = () => { + window.requestAnimationFrame(animate) + renderer.render(viewer.scene, viewer.camera) + } + animate() + + hud.style.display = 'block' + class FakeBot extends EventTarget { + on (...args) { + //@ts-ignore + super.addEventListener(...args) + } + once (...args) { + //@ts-ignore + super.addEventListener(...args, { once: true }) + } + } + const fakeBot = new FakeBot() + hud.init(renderer, fakeBot) + + let pitch = 0 + let yaw = 0 + mouseMovePostHandle = ({ x, y }) => { + pitch -= y + yaw -= x + pitch = Math.max(minPitch, Math.min(maxPitch, pitch)) + viewer.setFirstPersonCamera(null, pitch, yaw) + } + }) +} + +let listeners = [] +let timeouts = [] +let intervals = [] +// only for dom listeners (no removeAllListeners) +// todo refactor them out of connect fn instead +/** @type {import('./lib/utilsTs').RegisterListener} */ +const registerListener = (target, event, callback) => { + target.addEventListener(event, callback) + listeners.push({ target, event, callback }) +} +const removeAllListeners = () => { + listeners.forEach(({ target, event, callback }) => { + target.removeEventListener(event, callback) + }) + listeners = [] } async function connect (options) { @@ -348,20 +459,10 @@ async function connect (options) { setLoadingScreenStatus('Setting callbacks') - let lastMouseCall - function moveCallback (e) { - if (!pointerLock.hasPointerLock) return - e.stopPropagation?.() - const now = performance.now() - // todo: limit camera movement for now to avoid unexpected jumps - if (now - lastMouseCall < 4) return - lastMouseCall = now - let { mouseSensX, mouseSensY } = optionsScrn - if (mouseSensY === true) mouseSensY = mouseSensX - bot.entity.pitch -= e.movementY * mouseSensX * 0.0001 + mouseMovePostHandle = ({ x, y }) => { + bot.entity.pitch -= y bot.entity.pitch = Math.max(minPitch, Math.min(maxPitch, bot.entity.pitch)) - bot.entity.yaw -= e.movementX * mouseSensY * 0.0001 - // debugPitch.innerText = +debugPitch.innerText + e.movementX + bot.entity.yaw -= x } function changeCallback () { @@ -371,7 +472,6 @@ async function connect (options) { } } - registerListener(window, 'mousemove', moveCallback, { capture: true }) registerListener(document, 'pointerlockchange', changeCallback, false) let lastTouch @@ -380,9 +480,8 @@ async function connect (options) { e.preventDefault() e.stopPropagation() if (lastTouch !== undefined) { - moveCallback({ movementX: e.touches[0].pageX - lastTouch.pageX, movementY: e.touches[0].pageY - lastTouch.pageY }) + onMouseMove({ movementX: e.touches[0].pageX - lastTouch.pageX, movementY: e.touches[0].pageY - lastTouch.pageY }) } - lastTouch = e.touches[0] }, { passive: false }) registerListener(document, 'touchend', (e) => { @@ -463,14 +562,13 @@ async function connect (options) { setLoadingScreenStatus('Done!') console.log('Done!') - hud.init(renderer, bot, host) + // hud.init(renderer, bot, host) hud.style.display = 'block' setTimeout(function () { if (loadingScreen.hasError) return // remove loading screen, wait a second to make sure a frame has properly rendered - activeModalStacks['main-menu'] = activeModalStack - replaceActiveModalStack('', []) + hideCurrentScreens() }, 2500) }) } diff --git a/lib/menus/hud.js b/lib/menus/hud.js index 659d22df7..446a07c41 100644 --- a/lib/menus/hud.js +++ b/lib/menus/hud.js @@ -222,9 +222,11 @@ class Hud extends LitElement { hotbar.bot = bot debugMenu.bot = bot - hotbar.init() - chat.init(bot._client) - bot.on('spawn', () => playerList.init(bot, host)) + if (bot._client) { + hotbar.init() + chat.init(bot._client) + bot.on('spawn', () => playerList.init(bot, host)) + } bot.on('entityHurt', (entity) => { if (entity !== bot.entity) return @@ -271,6 +273,7 @@ class Hud extends LitElement { healthbar.gameModeChanged(bot.player.gamemode, bot.game.hardcore) healthbar.updateHealth(bot.health) foodbar.updateHunger(bot.food) + // TODO // breathbar.updateOxygen(bot.oxygenLevel ?? 20) }) diff --git a/lib/menus/loading_or_error_screen.js b/lib/menus/loading_or_error_screen.js index 48c14b68e..2dcc4308d 100644 --- a/lib/menus/loading_or_error_screen.js +++ b/lib/menus/loading_or_error_screen.js @@ -63,7 +63,6 @@ class LoadingErrorScreen extends LitElement { } render () { - console.log('render') return html`
diff --git a/package.json b/package.json index ab02738db..02a396ee7 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "A minecraft client running in a browser", "main": "index.js", "scripts": { - "build": "webpack --config webpack.prod.js --progress && node build.js copyFiles", + "build": "node build.js copyFiles && webpack --config webpack.prod.js --progress", "build-dev": "node build.js copyFilesDev && webpack serve --config webpack.dev.js --progress", "start": "NODE_OPTIONS=--max-old-space-size=8192 pnpm build-dev", "prod-start": "node server.js", @@ -35,11 +35,13 @@ "homepage": "https://github.com/PrismarineJS/prismarine-web-client#readme", "dependencies": { "compression": "^1.7.4", + "diamond-square": "^1.2.0", "express": "^4.18.2", "fs-extra": "^11.1.1", "ismobilejs": "^1.1.1", "lit": "^2.8.0", "net-browserify": "github:PrismarineJS/net-browserify", + "prismarine-world": "^3.6.2", "querystring": "^0.2.1", "stats.js": "^0.17.0", "url": "^0.11.1", diff --git a/webpack.prod.js b/webpack.prod.js index 2caef9a5a..f78ed679c 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -25,9 +25,9 @@ module.exports = merge(common, { }), new webpack.ProvidePlugin({ // get from github actions or vercel env - 'process.env.GITHUB_URL': process.env.VERCEL_GIT_REPO_OWNER + 'process.env.GITHUB_URL': `"${process.env.VERCEL_GIT_REPO_OWNER ? `https://github.com/${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}` - : process.env.GITHUB_REPOSITORY + : process.env.GITHUB_REPOSITORY}"` }) ], }) From bd44805cc47def9722325cbc14a3cc576d3ef727 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 15 Aug 2023 01:38:52 +0300 Subject: [PATCH 039/318] fix hud init & build should be fixed --- index.js | 2 +- lib/menus/components/edit_box.js | 3 ++- lib/menus/play_screen.js | 2 ++ webpack.prod.js | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index 4a225d526..d783dc437 100644 --- a/index.js +++ b/index.js @@ -562,7 +562,7 @@ async function connect (options) { setLoadingScreenStatus('Done!') console.log('Done!') - // hud.init(renderer, bot, host) + hud.init(renderer, bot, host) hud.style.display = 'block' setTimeout(function () { diff --git a/lib/menus/components/edit_box.js b/lib/menus/components/edit_box.js index 9d6acaafa..aafedeb64 100644 --- a/lib/menus/components/edit_box.js +++ b/lib/menus/components/edit_box.js @@ -62,6 +62,7 @@ class EditBox extends LitElement { this.id = '' this.value = '' this.label = '' + this.required = false } static get properties () { @@ -119,7 +120,7 @@ class EditBox extends LitElement { type="${this.type ?? 'text'}" name="" spellcheck="false" - required="" + ?required=${this.required} autocomplete="off" autocapitalize="off" value="${this.value}" diff --git a/lib/menus/play_screen.js b/lib/menus/play_screen.js index 161ffd08b..40c5c49b9 100644 --- a/lib/menus/play_screen.js +++ b/lib/menus/play_screen.js @@ -118,6 +118,7 @@ class PlayScreen extends LitElement { pmui-id="serverip" pmui-value="${this.server}" pmui-type="url" + pmui-required="true" .autocompleteValues=${JSON.parse(localStorage.getItem('serverHistory') || '[]')} @input=${e => { this.server = e.target.value }} > @@ -136,6 +137,7 @@ class PlayScreen extends LitElement { pmui-label="Proxy IP" pmui-id="proxy" pmui-value="${this.proxy}" + pmui-required=${/* TODO derive from config? */false} pmui-type="url" @input=${e => { this.proxy = e.target.value }} > diff --git a/webpack.prod.js b/webpack.prod.js index f78ed679c..895d2144b 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -23,11 +23,11 @@ module.exports = merge(common, { skipWaiting: true, include: ['index.html', 'manifest.json'] // not caching a lot as anyway this works only online }), - new webpack.ProvidePlugin({ + new webpack.DefinePlugin({ // get from github actions or vercel env - 'process.env.GITHUB_URL': `"${process.env.VERCEL_GIT_REPO_OWNER + 'process.env.GITHUB_URL': JSON.stringify(process.env.VERCEL_GIT_REPO_OWNER ? `https://github.com/${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}` - : process.env.GITHUB_REPOSITORY}"` + : process.env.GITHUB_REPOSITORY) }) ], }) From 2e6da513d736e5ff7be73f6e27c2b31c88f10100 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 15 Aug 2023 14:28:18 +0300 Subject: [PATCH 040/318] increase build size for now --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 02a396ee7..d8be0e479 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "A minecraft client running in a browser", "main": "index.js", "scripts": { - "build": "node build.js copyFiles && webpack --config webpack.prod.js --progress", + "build": "NODE_OPTIONS=--max-old-space-size=8192 node build.js copyFiles && webpack --config webpack.prod.js --progress", "build-dev": "node build.js copyFilesDev && webpack serve --config webpack.dev.js --progress", "start": "NODE_OPTIONS=--max-old-space-size=8192 pnpm build-dev", "prod-start": "node server.js", From a3709c14a92984fb2b07dab822cc816ebdac8e80 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 15 Aug 2023 19:51:57 +0300 Subject: [PATCH 041/318] refactor chat providing scalability and more precise text rendering fix reconnect qs removal --- index.html | 1 + lib/chat.js | 211 ++++++++++++++++++--------- lib/globalState.js | 14 ++ lib/menus/hud.js | 2 +- lib/menus/loading_or_error_screen.js | 2 +- 5 files changed, 158 insertions(+), 72 deletions(-) diff --git a/index.html b/index.html index cac5dc561..9cfa61ff8 100644 --- a/index.html +++ b/index.html @@ -27,6 +27,7 @@ +
diff --git a/lib/chat.js b/lib/chat.js index 38d94b2ef..3b964ac73 100644 --- a/lib/chat.js +++ b/lib/chat.js @@ -1,6 +1,9 @@ +//@ts-check const { LitElement, html, css } = require('lit') const { isMobile } = require('./menus/components/common') const { activeModalStack, hideCurrentModal } = require('./globalState') +import { repeat } from 'lit/directives/repeat.js' +import { classMap } from 'lit/directives/class-map.js' const styles = { black: 'color:#000000', @@ -36,6 +39,11 @@ function colorShadow (hex, dim = 0.25) { return `#${f(r)}${f(g)}${f(b)}` } +/** + * @typedef {{text;color?;italic?;underlined?;strikethrough?;bold?}} MessagePart + * @typedef {{parts: MessagePart[], id, fading?, faded}} Message + */ + class ChatBox extends LitElement { static get styles () { return css` @@ -44,7 +52,7 @@ class ChatBox extends LitElement { z-index: 10; } - .chat-display-wrapper { + .chat-messages-wrapper { bottom: 40px; padding: 4px; padding-left: 0; @@ -96,7 +104,7 @@ class ChatBox extends LitElement { } .chat-message { - display: block; + display: flex; padding-left: 4px; background-color: rgba(0, 0, 0, 0.5); } @@ -114,40 +122,51 @@ class ChatBox extends LitElement { transition: none !important; } - .chat-message-chat-opened { + .chat.opened .chat-message { opacity: 1 !important; transition: none !important; } + + .chat-message-part { + white-space: pre-wrap; + } ` } - render () { - return html` -
-
-
  • Welcome to prismarine-web-client! Chat appears here.
    • -
    -
    -
    -
    - -
    -
    - ` + static get properties () { + return { + messages: { + type: Array + } + } } constructor () { super() this.chatHistoryPos = 0 this.chatHistory = [] + this.messagesLimit = 200 + /** @type {Message[]} */ + this.messages = [{ + parts: [ + { + text: 'Welcome to prismarine-web-client! Chat appears here.', + } + ], + id: 0, + fading: true, + faded: true, + }] } - enableChat (isCommand) { - const chat = this.shadowRoot.querySelector('#chat') - const chatInput = this.shadowRoot.querySelector('#chatinput') + enableChat (initialText = '') { + const chat = this.shadowRoot.getElementById('chat-messages') + /** @type {HTMLInputElement} */ + // @ts-ignore + const chatInput = this.shadowRoot.getElementById('chatinput') - this.shadowRoot.querySelector('#chat-wrapper2').classList.toggle('input-mobile', isMobile()) - this.shadowRoot.querySelector('#chat-wrapper').classList.toggle('display-mobile', isMobile()) + this.shadowRoot.getElementById('chat-wrapper2').classList.toggle('input-mobile', isMobile()) + this.shadowRoot.getElementById('chat-wrapper').classList.toggle('display-mobile', isMobile()) activeModalStack.push(this) @@ -158,13 +177,13 @@ class ChatBox extends LitElement { // Show extended chat history chat.style.maxHeight = 'var(--chatHeight)' chat.scrollTop = chat.scrollHeight // Stay bottom of the list - if (isCommand) { // handle commands - chatInput.value = '/' - } + // handle / and other snippets + chatInput.value = initialText // Focus element chatInput.focus() this.chatHistoryPos = this.chatHistory.length - document.querySelector('#hud').shadowRoot.querySelector('#chat').shadowRoot.querySelectorAll('.chat-message').forEach(e => e.classList.add('chat-message-chat-opened')) + // to show + this.requestUpdate() } get inChat () { @@ -175,8 +194,10 @@ class ChatBox extends LitElement { * @param {import('minecraft-protocol').Client} client */ init (client) { - const chat = this.shadowRoot.querySelector('#chat') - const chatInput = this.shadowRoot.querySelector('#chatinput') + const chat = this.shadowRoot.getElementById('chat-messages') + /** @type {HTMLInputElement} */ + // @ts-ignore + const chatInput = this.shadowRoot.getElementById('chatinput') // Show chat chat.style.display = 'block' @@ -184,7 +205,6 @@ class ChatBox extends LitElement { // Chat events document.addEventListener('keydown', e => { if (activeModalStack.slice(-1)[0] !== this) return - e = e || window.event if (e.code === 'ArrowUp') { if (this.chatHistoryPos === 0) return chatInput.value = this.chatHistory[--this.chatHistoryPos] !== undefined ? this.chatHistory[this.chatHistoryPos] : '' @@ -199,16 +219,15 @@ class ChatBox extends LitElement { const keyBindScrn = document.getElementById('keybinds-screen') document.addEventListener('keypress', e => { - e = e || window.event if (!this.inChat && activeModalStack.length === 0) { keyBindScrn.keymaps.forEach(km => { if (e.code === km.key) { switch (km.defaultKey) { case 'KeyT': - setTimeout(() => this.enableChat(false), 0) + setTimeout(() => this.enableChat(), 0) break case 'Slash': - setTimeout(() => this.enableChat(true), 0) + setTimeout(() => this.enableChat('/'), 0) break } } @@ -238,21 +257,18 @@ class ChatBox extends LitElement { // Hide extended chat history chat.style.maxHeight = 'var(--chatHeight)' chat.scrollTop = chat.scrollHeight // Stay bottom of the list - document.querySelector('#hud').shadowRoot.querySelector('#chat').shadowRoot.querySelectorAll('.chat-message').forEach(e => e.classList.remove('chat-message-chat-opened')) + this.requestUpdate() return 'custom' // custom hide } this.hide() client.on('chat', (packet) => { - // Reading of chat message + // Handle new message const fullmessage = JSON.parse(packet.message.toString()) + /** @type {MessagePart[]} */ const msglist = [] - const colorF = (color) => { - return color.trim().startsWith('#') ? `color:${color}` : styles[color] ?? undefined - } - - const readMsg = (msglist, msg) => { + const readMsg = (msg) => { const styles = { color: msg.color, bold: !!msg.bold, @@ -264,30 +280,29 @@ class ChatBox extends LitElement { if (msg.text) { msglist.push({ + ...msg, text: msg.text, ...styles }) - } - - if (msg.translate) { + } else if (msg.translate) { const tText = window.mcData.language[msg.translate] ?? msg.translate if (msg.with) { - const splited = tText.split(/%s|%\d+\$s/g) + const splitted = tText.split(/%s|%\d+\$s/g) let i = 0 - splited.forEach((spl, j, arr) => { - msglist.push({ text: spl, ...styles }) + splitted.forEach((part, j) => { + msglist.push({ text: part, ...styles }) - if (j + 1 < arr.length) { + if (j + 1 < splitted.length) { if (msg.with[i]) { if (typeof msg.with[i] === 'string') { - readMsg(msglist, { + readMsg({ ...styles, text: msg.with[i] }) } else { - readMsg(msglist, { + readMsg({ ...styles, ...msg.with[i] }) @@ -298,6 +313,7 @@ class ChatBox extends LitElement { }) } else { msglist.push({ + ...msg, text: tText, ...styles }) @@ -306,40 +322,95 @@ class ChatBox extends LitElement { if (msg.extra) { msg.extra.forEach(ex => { - readMsg(msglist, { ...styles, ...ex }) + readMsg({ ...styles, ...ex }) }) } } - readMsg(msglist, fullmessage) - - const li = document.createElement('li') - msglist.forEach(msg => { - const span = document.createElement('span') - span.appendChild(document.createTextNode(msg.text)) - span.setAttribute( - 'style', - `${msg.color ? colorF(msg.color.toLowerCase()) + `; text-shadow: 1px 1px 0px ${colorShadow(colorF(msg.color.toLowerCase()).replace('color:', ''))}` : styles.white}; ${msg.bold ? styles.bold + ';' : '' - }${msg.italic ? styles.italic + ';' : ''}${msg.strikethrough ? styles.strikethrough + ';' : '' - }${msg.underlined ? styles.underlined + ';' : ''}` - ) - li.appendChild(span) - }) - chat.appendChild(li) + readMsg(fullmessage) + + const lastId = this.messages.at(-1)?.id ?? 0 + this.messages = [...this.messages.slice(-this.messagesLimit), { + parts: msglist, + id: lastId + 1, + fading: false, + faded: false + }] + const message = this.messages.at(-1) + chat.scrollTop = chat.scrollHeight // Stay bottom of the list // fading - li.classList.add('chat-message') - if (this.inChat) { - li.classList.add('chat-message-chat-opened') - } setTimeout(() => { - li.classList.add('chat-message-fadeout') - li.classList.add('chat-message-fade') + message.fading = true + this.requestUpdate() setTimeout(() => { - li.classList.add('chat-message-faded') + message.faded = true + this.requestUpdate() }, 3000) }, 5000) }) + // todo support hover content below, {action: 'show_text', contents: {text}}, and some other types + // todo remove + window.dummyMessage = () => { + client.emit('chat', { + message: "{\"color\":\"yellow\",\"translate\":\"multiplayer.player.joined\",\"with\":[{\"insertion\":\"pviewer672\",\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"/tell pviewer672 \"},\"hoverEvent\":{\"action\":\"show_entity\",\"contents\":{\"type\":\"minecraft:player\",\"id\":\"ecd0eeb1-625e-3fea-b16e-cb449dcfa434\",\"name\":{\"text\":\"pviewer672\"}}},\"text\":\"pviewer672\"}]}", + position: 1, + sender: "00000000-0000-0000-0000-000000000000", + }) + } + // window.dummyMessage() + } + + renderMessagePart (/** @type {MessagePart} */{ bold, color, italic, strikethrough, text, underlined }) { + const colorF = (color) => { + return color.trim().startsWith('#') ? `color:${color}` : styles[color] ?? undefined + } + + /** @type {string[]} */ + const applyStyles = [ + color ? colorF(color.toLowerCase()) + `; text-shadow: 1px 1px 0px ${colorShadow(colorF(color.toLowerCase()).replace('color:', ''))}` : styles.white, + italic && styles.italic, + bold && styles.bold, + italic && styles.italic, + underlined && styles.underlined, + strikethrough && styles.strikethrough + ].filter(Boolean) + + return html` + ${text}` + } + + renderMessage (/** @type {Message} */message) { + const classes = { + 'chat-message-fadeout': message.fading, + 'chat-message-fade': message.fading, + 'chat-message-faded': message.faded, + 'chat-message': true + } + + return html` +
  • + ${message.parts.map(msg => this.renderMessagePart(msg))} +
    • + ` + } + + render () { + return html` +
    +
    + ${repeat(this.messages, (m) => m.id, (m) => this.renderMessage(m))} +
    +
    +
    +
    + +
    +
    + ` } } diff --git a/lib/globalState.js b/lib/globalState.js index afcf67d74..8cfa4b732 100644 --- a/lib/globalState.js +++ b/lib/globalState.js @@ -1,11 +1,13 @@ //@ts-check +import { proxy } from 'valtio' import { pointerLock } from './utils' // todo: refactor structure with support of hideNext=false /** * @typedef {(HTMLElement & Record)} Modal + * @typedef {{callback, label}} ContextMenuItem */ /** @type {Modal[]} */ @@ -74,3 +76,15 @@ export const hideCurrentModal = (_data = undefined, preActions = undefined) => { } } } + +// --- + +export const currentContextMenu = proxy({ items: /** @type {ContextMenuItem[] | null} */[], x: 0, y: 0, }) + +export const showContextmenu = (/** @type {ContextMenuItem[]} */items, { clientX, clientY }) => { + Object.assign(currentContextMenu, { + items, + x: clientX, + y: clientY, + }) +} diff --git a/lib/menus/hud.js b/lib/menus/hud.js index 446a07c41..3c896c5ad 100644 --- a/lib/menus/hud.js +++ b/lib/menus/hud.js @@ -305,7 +305,7 @@ class Hud extends LitElement {
    - +
    -
    + diff --git a/src/reactUi.jsx b/src/reactUi.jsx new file mode 100644 index 000000000..8ac6a470c --- /dev/null +++ b/src/reactUi.jsx @@ -0,0 +1,62 @@ +//@ts-check +import { renderToDom } from '@zardoy/react-util' + +import React, { useEffect } from 'react' +import { LeftTouchArea, RightTouchArea, useUsingTouch, useInterfaceState } from '@dimaka/interface' +import { css } from '@emotion/css' + +// todo +useInterfaceState.setState({ + isFlying: false, + updateCoord: ([coord, state]) => { + const coordToAction = [ + ['z', -1, 'forward'], + ['z', 1, 'back'], + ['x', -1, 'left'], + ['x', 1, 'right'], + ['y', 1, 'jump'], + ] + // todo refactor + const actionAndState = state !== 0 ? coordToAction.find(([axis, value]) => axis === coord && value === state) : coordToAction.filter(([axis]) => axis === coord) + console.log(actionAndState) + if (!bot) return + if (state === 0) { + for (const action of actionAndState) { + //@ts-ignore + bot.setControlState(action[2], false) + } + } else { + //@ts-ignore + bot.setControlState(actionAndState[2], true) + } + } +}) + +const App = () => { + const usingTouch = useUsingTouch() + + if (!usingTouch) return null + return ( +
    console.log('test')} + className={css` + position: fixed; + inset: 0; + height: 100%; + display: flex; + width: 100%; + justify-content: space-between; + align-items: flex-end; + `} + > + +
    + +
    + ) +} + +renderToDom(, { + strictMode: false, + selector: '#react-root', +}) diff --git a/tsconfig.json b/tsconfig.json index fca3dc30c..0977d9667 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,6 +4,7 @@ "moduleResolution": "Node", "module": "CommonJS", "allowJs": true, + "jsx": "react-jsx", "allowSyntheticDefaultImports": true, "noEmit": true, "strictFunctionTypes": true diff --git a/webpack.common.js b/webpack.common.js index 012e9567d..f114c47af 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -59,7 +59,7 @@ const config = { module: { rules: [ { - test: /\.tsx?$/, + test: /\.(tsx?)|(jsx)$/, loader: 'esbuild-loader', // options: { // // JavaScript version to compile to From fe149990dbdf838638dc7165e7608a4fe6ebd630 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 21 Aug 2023 21:00:37 +0300 Subject: [PATCH 082/318] fix: notification didn't allow to focus chat --- src/menus/notification.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/menus/notification.js b/src/menus/notification.js index dd149534e..27700cb3b 100644 --- a/src/menus/notification.js +++ b/src/menus/notification.js @@ -20,21 +20,39 @@ export const showNotification = (/** @type {typeof notification} */newNotificati window.notification = notification class Notification extends LitElement { + static get properties () { + return { + renderHtml: { type: Boolean }, + } + } + render () { + if (!this.renderHtml) return const show = notification.show && notification.message return html` -
    +
    ${notification.message}
    ` } + ontransitionend = (event) => { + if (event.propertyName !== 'opacity') return + + if (!notification.show) { + this.renderHtml = false + } + } + constructor () { super() + this.renderHtml = false let timeout subscribe(notification, () => { if (timeout) clearTimeout(timeout) this.requestUpdate() + if (!notification.show) return + this.renderHtml = true if (!notification.autoHide) return timeout = setTimeout(() => { notification.show = false From 331f3bae627879a4503f0d35a4fe80a1f993e692 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 21 Aug 2023 21:01:09 +0300 Subject: [PATCH 083/318] cleanup package.json (if this will be published some day to npm, they will be auto-generated anyway) --- package.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/package.json b/package.json index d03a25f32..9dd6fa117 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,6 @@ "name": "prismarine-web-client", "version": "1.5.0", "description": "A minecraft client running in a browser", - "main": "index.js", "scripts": { "start": "NODE_OPTIONS=--max-old-space-size=8192 run-p watch prod-start", "build": "NODE_OPTIONS=--max-old-space-size=8192 rimraf public && node scripts/build.js copyFiles && webpack --config webpack.prod.js --progress", @@ -14,10 +13,6 @@ "prepublishOnly": "npm run build", "test": "npm run lint && mocha" }, - "repository": { - "type": "git", - "url": "git+https://github.com/PrismarineJS/prismarine-web-client.git" - }, "keywords": [ "prismarine", "web", @@ -25,13 +20,6 @@ ], "author": "PrismarineJS", "license": "MIT", - "bin": { - "prismarine-web-client": "./server.js" - }, - "bugs": { - "url": "https://github.com/PrismarineJS/prismarine-web-client/issues" - }, - "homepage": "https://github.com/PrismarineJS/prismarine-web-client#readme", "dependencies": { "@emotion/css": "^11.11.2", "@types/react": "^18.2.20", From 4537626b1d84a51f5967bcc1221e9eb8af056b92 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Mon, 21 Aug 2023 22:04:53 +0300 Subject: [PATCH 084/318] add autocomplete for versions & supported indicator (wip) --- src/index.js | 6 +++--- src/menus/components/edit_box.js | 22 +++++++++++++++++++++- src/menus/loading_or_error_screen.js | 2 +- src/menus/play_screen.js | 10 ++++++++++ 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/index.js b/src/index.js index 02bf91bfe..b02180f13 100644 --- a/src/index.js +++ b/src/index.js @@ -2,6 +2,9 @@ /* global THREE */ require('./chat') +// workaround for mineflayer +process.versions.node = '14.0.0' + require('./menus/components/button') require('./menus/components/edit_box') require('./menus/components/slider') @@ -64,9 +67,6 @@ _fs.promises.open = async (...args) => { const net = require('net') const Stats = require('stats.js') -// workaround for mineflayer -process.versions.node = '14.0.0' - const mineflayer = require('mineflayer') const { WorldView, Viewer, MapControls } = require('prismarine-viewer/viewer') const PrismarineWorld = require('prismarine-world') diff --git a/src/menus/components/edit_box.js b/src/menus/components/edit_box.js index aafedeb64..0f42527a6 100644 --- a/src/menus/components/edit_box.js +++ b/src/menus/components/edit_box.js @@ -11,6 +11,22 @@ class EditBox extends LitElement { background: black; border: 1px solid grey; } + .edit-container.invalid { + border: 1px solid #c70000; + } + + .edit-container.warning { + border: 1px solid rgb(159, 151, 0); + } + + .edit-container.invalid:hover, + .edit-container.invalid:focus-within { + border-color: red; + } + .edit-container.warning:hover, + .edit-container.warning:focus-within { + border-color: yellow; + } .edit-container:hover, .edit-container:focus-within { @@ -97,6 +113,10 @@ class EditBox extends LitElement { required: { type: Boolean, attribute: 'pmui-required' + }, + state: { + type: String, + attribute: true } } } @@ -104,7 +124,7 @@ class EditBox extends LitElement { render () { return html`
    diff --git a/src/menus/loading_or_error_screen.js b/src/menus/loading_or_error_screen.js index afbf19903..dfbf36609 100644 --- a/src/menus/loading_or_error_screen.js +++ b/src/menus/loading_or_error_screen.js @@ -40,7 +40,7 @@ class LoadingErrorScreen extends LitElement { constructor () { super() this.hasError = false - this.maybeRecoverable = false + this.maybeRecoverable = true this.status = 'Waiting for JS load' this._loadingDots = '' } diff --git a/src/menus/play_screen.js b/src/menus/play_screen.js index 40c5c49b9..81e7d53f8 100644 --- a/src/menus/play_screen.js +++ b/src/menus/play_screen.js @@ -1,6 +1,12 @@ const { LitElement, html, css } = require('lit') const { commonCss } = require('./components/common') const { hideCurrentModal } = require('../globalState') +const mcAssets = require("minecraft-assets") +const data = require('minecraft-data') +const mineflayer = require('mineflayer') + +const fullySupporedVersions = mcAssets.versions +const partialSupportVersions = mineflayer.supportedVersions class PlayScreen extends LitElement { static get styles () { @@ -76,6 +82,8 @@ class PlayScreen extends LitElement { constructor () { super() + this.version = '' + // todo set them sooner add indicator window.fetch('config.json').then(res => res.json()).then(c => c, (error) => { console.error('Failed to load config.json', error) return {} @@ -167,6 +175,8 @@ class PlayScreen extends LitElement { pmui-id="botversion" pmui-value="${this.version}" pmui-inputmode="decimal" + state="${this.version && (fullySupporedVersions.includes(this.version) ? '' : /* TODO improve check: check exact including all */ partialSupportVersions.some(v => this.version.startsWith(v)) ? 'warning' : 'invalid')}" + .autocompleteValues=${mcAssets.versions} @input=${e => { this.version = e.target.value }} >
    From 8d3d5caee9dce82f082ed45192bdb9f50e3003b4 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Mon, 21 Aug 2023 22:06:38 +0300 Subject: [PATCH 085/318] [pnpm] enable shell-emulator for new contributors on windows --- .npmrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.npmrc b/.npmrc index 9a8fccec1..3a58a3dbb 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1,4 @@ package-lock=false public-hoist-pattern=* ignore-workspace-root-check=true +shell-emulator=true From 2a0533c9e5a10bbb25f8cb4ba2235b23fbf768e8 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 22 Aug 2023 04:01:22 +0300 Subject: [PATCH 086/318] simple fov change on sprint (so sprint can be indicated) --- src/index.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/index.js b/src/index.js index b02180f13..ea7b85634 100644 --- a/src/index.js +++ b/src/index.js @@ -450,10 +450,18 @@ async function connect (options) { const worldView = new WorldView(bot.world, viewDistance, center) - optionsScrn.addEventListener('fov_changed', (e) => { - viewer.camera.fov = e.detail.fov + let fovSetting = optionsScrn.fov + const updateFov = () => { + fovSetting = optionsScrn.fov + if (bot.controlState.sprint && !bot.controlState.sneak) { + // todo check value and add transition + fovSetting *= 5 + } + viewer.camera.fov = fovSetting viewer.camera.updateProjectionMatrix() - }) + } + updateFov() + optionsScrn.addEventListener('fov_changed', updateFov) viewer.setVersion(version) @@ -590,6 +598,7 @@ async function connect (options) { break case 'ControlLeft': bot.setControlState('sprint', true) + updateFov() break case 'ShiftLeft': bot.setControlState('sneak', true) @@ -620,6 +629,7 @@ async function connect (options) { switch (km.defaultKey) { case 'ControlLeft': bot.setControlState('sprint', false) + updateFov() break case 'ShiftLeft': bot.setControlState('sneak', false) From aeeb0124d3975071c84ba1560dc631df9c018932 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 22 Aug 2023 05:01:24 +0300 Subject: [PATCH 087/318] refactor modal stacks so they are: 1. watchable for changes 2. can be used along with react --- src/chat.js | 6 +++--- src/globalState.js | 34 ++++++++++++++++++++++------------ 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/chat.js b/src/chat.js index f60c883a2..f4834c0d9 100644 --- a/src/chat.js +++ b/src/chat.js @@ -1,7 +1,7 @@ //@ts-check const { LitElement, html, css } = require('lit') const { isMobile } = require('./menus/components/common') -const { activeModalStack, hideCurrentModal } = require('./globalState') +const { activeModalStack, hideCurrentModal, showModal } = require('./globalState') import { repeat } from 'lit/directives/repeat.js' import { classMap } from 'lit/directives/class-map.js' @@ -168,7 +168,7 @@ class ChatBox extends LitElement { this.shadowRoot.getElementById('chat-wrapper2').classList.toggle('input-mobile', isMobile()) this.shadowRoot.getElementById('chat-wrapper').classList.toggle('display-mobile', isMobile()) - activeModalStack.push(this) + showModal(this) // Exit the pointer lock document.exitPointerLock() @@ -187,7 +187,7 @@ class ChatBox extends LitElement { } get inChat () { - return activeModalStack.includes(this) + return activeModalStack.find(m => m.elem === this) !== undefined } /** diff --git a/src/globalState.js b/src/globalState.js index ca6f360ca..e6b0be15e 100644 --- a/src/globalState.js +++ b/src/globalState.js @@ -1,17 +1,17 @@ //@ts-check -import { proxy } from 'valtio' +import { proxy, ref } from 'valtio' import { pointerLock } from './utils' // todo: refactor structure with support of hideNext=false /** - * @typedef {(HTMLElement & Record)} Modal + * @typedef {({elem?: HTMLElement & Record} & {reactType?: string})} Modal * @typedef {{callback, label}} ContextMenuItem */ /** @type {Modal[]} */ -export const activeModalStack = [] +export const activeModalStack = proxy([]) export const replaceActiveModalStack = (name, newModalStack = activeModalStacks[name]) => { hideModal(undefined, undefined, { restorePrevious: false, force: true, }) @@ -26,18 +26,28 @@ window.activeModalStack = activeModalStack export const customDisplayManageKeyword = 'custom' +const defaultModalActions = { + show (/** @type {Modal} */modal) { + if (modal.elem) modal.elem.style.display = 'block' + }, + hide (/** @type {Modal} */modal) { + if (modal.elem) modal.elem.style.display = 'none' + } +} + const showModalInner = (/** @type {Modal} */ modal) => { - const cancel = modal.show?.() + const cancel = modal.elem?.show?.() if (cancel && cancel !== customDisplayManageKeyword) return false - if (cancel !== 'custom') modal.style.display = 'block' + if (cancel !== 'custom') defaultModalActions.show(modal) return true } -export const showModal = (/** @type {Modal} */ modal) => { +export const showModal = (/** @type {HTMLElement & Record | {reactType: string}} */ elem) => { + const resolved = elem instanceof HTMLElement ? { elem: ref(elem) } : elem const curModal = activeModalStack.slice(-1)[0] - if (modal === curModal || !showModalInner(modal)) return - if (curModal) curModal.style.display = 'none' - activeModalStack.push(modal) + if (elem === curModal?.elem || !showModalInner(resolved)) return + if (curModal) defaultModalActions.hide(curModal) + activeModalStack.push(resolved) } /** @@ -49,13 +59,13 @@ export const showModal = (/** @type {Modal} */ modal) => { export const hideModal = (modal = activeModalStack.slice(-1)[0], data = undefined, options = {}) => { const { force = false, restorePrevious = true } = options if (!modal) return - let cancel = modal.hide?.(data) + let cancel = modal.elem?.hide?.(data) if (force && cancel !== customDisplayManageKeyword) { cancel = undefined } if (!cancel || cancel === customDisplayManageKeyword) { - if (cancel !== customDisplayManageKeyword) modal.style.display = 'none' + if (cancel !== customDisplayManageKeyword) defaultModalActions.hide(modal) activeModalStack.pop() const newModal = activeModalStack.slice(-1)[0] if (newModal && restorePrevious) { @@ -91,7 +101,7 @@ export const showContextmenu = (/** @type {ContextMenuItem[]} */items, { clientX // --- -export const isGameActive = (foregroundCheck = false) => { +export const isGameActive = (foregroundCheck) => { if (foregroundCheck && activeModalStack.length) return false return document.getElementById('hud').style.display !== 'none' } From edf1def2e1abb352dd3cb646495d9bf80a7290bf Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Tue, 22 Aug 2023 21:13:26 +0300 Subject: [PATCH 088/318] feat: display leave confirmation when playing (prevent accidental ctrl+w), but not when paused so can easily close if desired --- src/globalState.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/globalState.js b/src/globalState.js index e6b0be15e..ce881f51d 100644 --- a/src/globalState.js +++ b/src/globalState.js @@ -1,6 +1,6 @@ //@ts-check -import { proxy, ref } from 'valtio' +import { proxy, ref, subscribe } from 'valtio' import { pointerLock } from './utils' // todo: refactor structure with support of hideNext=false @@ -110,4 +110,15 @@ export const miscUiState = proxy({ currentTouch: null }) +window.addEventListener('beforeunload', (event) => { + // todo-low maybe exclude chat? + if (!isGameActive(true) && activeModalStack.at(-1)?.elem.id !== 'chat') return + // For major browsers doning only this is enough + event.preventDefault() + + // Display a confirmation prompt + event.returnValue = '' // Required for some browsers + return 'The game is running. Are you sure you want to close this page?' +}); + window.miscUiState = miscUiState From bb262086c7cfd2a3fc634e07baa0a32fcdb6974d Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 22 Aug 2023 05:03:36 +0300 Subject: [PATCH 089/318] inventories are almost here wip: add mobile button review upstream wip react refresh (thats why migrating to react) to migrate to tsx to impl advanced settings --- package.json | 9 +++- src/index.js | 10 ++++- src/menus/keybinds_screen.js | 4 +- src/reactUi.jsx | 80 ++++++++++++++++++++++++++++++++++-- webpack.dev.js | 11 +++-- 5 files changed, 102 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 9dd6fa117..7a7889082 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,9 @@ "author": "PrismarineJS", "license": "MIT", "dependencies": { + "@dimaka/interface": "0.0.0-dev", "@emotion/css": "^11.11.2", + "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11", "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "@zardoy/react-util": "^0.2.0", @@ -38,9 +40,9 @@ "net-browserify": "github:PrismarineJS/net-browserify", "prismarine-world": "^3.6.2", "querystring": "^0.2.1", - "@dimaka/interface": "0.0.0-dev", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-refresh": "^0.14.0", "space-squid": "github:zardoy/space-squid", "speed-measure-webpack-plugin": "^1.5.0", "stats.js": "^0.17.0", @@ -77,6 +79,7 @@ "stream-browserify": "^3.0.0", "three": "0.128.0", "timers-browserify": "^2.0.12", + "use-typed-event-listener": "^4.0.2", "vite": "^4.4.9", "webpack": "^5.88.2", "webpack-cli": "^5.1.4", @@ -88,7 +91,9 @@ "pnpm": { "overrides": { "minecraft-data": "latest", - "minecraft-protocol": "github:zardoy/minecraft-protocol#custom-client" + "minecraft-protocol": "github:zardoy/minecraft-protocol#custom-client", + "space-squid": "file:../space-squid", + "@dimaka/interface": "file:../interface" } } } diff --git a/src/index.js b/src/index.js index ea7b85634..53c10e3de 100644 --- a/src/index.js +++ b/src/index.js @@ -593,6 +593,12 @@ async function connect (options) { keyBindScrn.keymaps.forEach(km => { if (e.code === km.key) { switch (km.defaultKey) { + case 'KeyE': + showModal({ reactType: 'inventory', }) + // todo seems to be workaround + // avoid calling inner keybinding listener, but should be handled there + e.stopImmediatePropagation() + break case 'KeyQ': if (bot.heldItem) bot.tossStack(bot.heldItem) break @@ -621,7 +627,9 @@ async function connect (options) { } } }) - }, false) + }, { + capture: true, + }) registerListener(document, 'keyup', (e) => { keyBindScrn.keymaps.forEach(km => { diff --git a/src/menus/keybinds_screen.js b/src/menus/keybinds_screen.js index f16a4bbd3..5cdb37640 100644 --- a/src/menus/keybinds_screen.js +++ b/src/menus/keybinds_screen.js @@ -104,7 +104,7 @@ class KeyBindsScreen extends LitElement { { defaultKey: 'Slash', key: 'Slash', name: 'Open Command' }, // { defaultKey: '0', key: '0', name: 'Attack/Destroy' }, // { defaultKey: '1', key: '1', name: 'Place Block' }, - { defaultKey: 'KeyQ', key: 'KeyQ', name: 'Drop Item' } + { defaultKey: 'KeyQ', key: 'KeyQ', name: 'Drop Item' }, // { defaultKey: 'Digit1', key: 'Digit1', name: 'Hotbar Slot 1' }, // { defaultKey: 'Digit2', key: 'Digit2', name: 'Hotbar Slot 2' }, // { defaultKey: 'Digit3', key: 'Digit3', name: 'Hotbar Slot 3' }, @@ -114,7 +114,7 @@ class KeyBindsScreen extends LitElement { // { defaultKey: 'Digit7', key: 'Digit7', name: 'Hotbar Slot 7' }, // { defaultKey: 'Digit8', key: 'Digit8', name: 'Hotbar Slot 8' }, // { defaultKey: 'Digit9', key: 'Digit9', name: 'Hotbar Slot 9' }, - // { defaultKey: 'KeyE', key: 'KeyE', name: 'Open Inventory' } + { defaultKey: 'KeyE', key: 'KeyE', name: 'Open Inventory' }, ] document.addEventListener('keydown', (e) => { diff --git a/src/reactUi.jsx b/src/reactUi.jsx index 8ac6a470c..3bcf2f40c 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -1,9 +1,12 @@ //@ts-check import { renderToDom } from '@zardoy/react-util' -import React, { useEffect } from 'react' -import { LeftTouchArea, RightTouchArea, useUsingTouch, useInterfaceState } from '@dimaka/interface' +import { LeftTouchArea, InventoryNew, RightTouchArea, useUsingTouch, useInterfaceState } from '@dimaka/interface' import { css } from '@emotion/css' +import { activeModalStack, hideCurrentModal, isGameActive } from './globalState' +import { useEffect, useState } from 'react' +import { useProxy } from 'valtio/utils' +import useTypedEventListener from 'use-typed-event-listener' // todo useInterfaceState.setState({ @@ -32,7 +35,8 @@ useInterfaceState.setState({ } }) -const App = () => { +const TouchControls = () => { + // todo setting const usingTouch = useUsingTouch() if (!usingTouch) return null @@ -56,6 +60,76 @@ const App = () => { ) } +const useActivateModal = (/** @type {string} */search, onlyLast = true) => { + const stack = useProxy(activeModalStack) + + return onlyLast ? stack.at(-1)?.reactType === search : stack.some((modal) => modal.reactType === search) +} + +function useIsBotAvailable() { + const stack = useProxy(activeModalStack) + + return isGameActive(false) +} + +function InventoryWrapper() { + const isInventoryOpen = useActivateModal('inventory', false) + const [slots, setSlots] = useState(bot.inventory.slots) + + useEffect(() => { + if (isInventoryOpen) { + document.exitPointerLock() + } + }, [isInventoryOpen]) + + useTypedEventListener(document, 'keydown', (e) => { + // todo use refactored keymap + if (e.code === 'KeyE' && activeModalStack.at(-1)?.reactType === 'inventory') { + hideCurrentModal() + } + }) + + useEffect(() => { + bot.inventory.on('updateSlot', () => { + setSlots(bot.inventory.slots) + }) + // todo need to think of better solution + window['mcData'] = require('minecraft-data')(bot.version) + window['mcAssets'] = require('minecraft-assets')(bot.version) + }, []) + + console.log('isInventoryOpen', isInventoryOpen) + if (!isInventoryOpen) return null + + return
    div { + scale: 0.6; + background: transparent !important; + } + `}> + { + bot.moveSlotItem(oldSlot, newSlotIndex) + // bot.inventory.selectedItem + // bot.inventory.updateSlot(oldSlot, ) + } } /> +
    +} + +const App = () => { + const isBotAvailable = useIsBotAvailable() + if (!isBotAvailable) return null + + return
    + + +
    +} + renderToDom(, { strictMode: false, selector: '#react-root', diff --git a/webpack.dev.js b/webpack.dev.js index 36138e299..4ec0913b7 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -1,6 +1,6 @@ const { merge } = require('webpack-merge') const common = require('./webpack.common.js') -const path = require('path') +const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin') /** @type {import('webpack-dev-server').Configuration['rel']} */ module.exports = merge(common, @@ -17,8 +17,8 @@ module.exports = merge(common, compress: true, // inline: true, // open: true, - // hot: true, - liveReload: true, + hot: true, + // liveReload: true, devMiddleware: { writeToDisk: true, }, @@ -44,5 +44,8 @@ module.exports = merge(common, } } } - } + }, + plugins: [ + new ReactRefreshWebpackPlugin() + ], }) From 7b08d17f079a699557e21575076c300afec8d592 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 22 Aug 2023 05:05:50 +0300 Subject: [PATCH 090/318] rm log --- src/reactUi.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/reactUi.jsx b/src/reactUi.jsx index 3bcf2f40c..d261c0c5e 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -98,7 +98,6 @@ function InventoryWrapper() { window['mcAssets'] = require('minecraft-assets')(bot.version) }, []) - console.log('isInventoryOpen', isInventoryOpen) if (!isInventoryOpen) return null return
    Date: Sat, 26 Aug 2023 06:09:49 +0300 Subject: [PATCH 091/318] add ci.yml --- .github/workflows/ci.yml | 68 +++++++--------------------------------- 1 file changed, 12 insertions(+), 56 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c46e06266..cc357e5a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,61 +1,17 @@ -name: CI - +name: Deploy to GitHub pages on: push: - branches: [ master ] - pull_request: - branches: [ master ] - + branches: [main] jobs: - build: - + build-and-deploy: runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [18.x] - + permissions: write-all steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm install - - run: npm run build - - run: npm test - DeployPages: - runs-on: ubuntu-latest - if: ${{ github.event_name == 'push' }} - steps: - - name: Checkout 🛎️ - uses: actions/checkout@v2.3.1 # If you're using actions/checkout@v2 you must set persist-credentials to false in most cases for the deployment to work correctly. - with: - persist-credentials: false - fetch-depth: 0 - - name: Edit config - run: | - sed -i -E 's/^ "defaultProxy": ""/ "defaultProxy": "pproxy.rom1504.fr"/g' config.json - sed -i -E 's/^ "defaultProxyPort": 0/ "defaultProxyPort": 443/g' config.json - - name: Build - run: | - npm install - npm run build - cp -R public/ ../ - rm -Rf ./* - git checkout gh-pages - rm -Rf ./* - rm -Rf .github .gitignore .gitpod .gitpod.DockerFile .npmignore .npmrc - cp -R ../public/* ./ - - name: Create commits - run: | - git config user.name 'rom1504bot' - git config user.email 'rom1504bot@users.noreply.github.com' - git add --all - git commit --amend -m "Update gh-pages" - - name: Deploy 🚀 - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: gh-pages - force: true + - name: Checkout repository + uses: actions/checkout@master + - name: Install pnpm + run: npm i -g pnpm + - run: pnpm install + - run: pnpm build + # todo use nohup and official action? + # - run: pnpm prod-start & pnpm test:cypress From 714bf3d55b3751ee7b51d3e0dac5e40cef9b97ff Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 23 Aug 2023 02:52:24 +0300 Subject: [PATCH 092/318] make render distance updatable, refactor controls spend some time on adding flying add settings like the one to disable in-game auto-update --- src/botControls.js | 166 ++++++++++++++++++++++++++++++++++++ src/globalState.js | 25 +++++- src/index.js | 138 ++++++++++-------------------- src/menus/options_screen.js | 18 ++-- src/optionsStorage.js | 16 +++- 5 files changed, 260 insertions(+), 103 deletions(-) create mode 100644 src/botControls.js diff --git a/src/botControls.js b/src/botControls.js new file mode 100644 index 000000000..039795b41 --- /dev/null +++ b/src/botControls.js @@ -0,0 +1,166 @@ +//@ts-check + +const { Vec3 } = require('vec3') +const { isGameActive, showModal, gameAdditionalState } = require('./globalState') + +const keyBindScrn = document.getElementById('keybinds-screen') + +// these controls are for gamemode 3 actually + +const makeInterval = (fn, interval) => { + const intervalId = setInterval(fn, interval) + + const cleanup = () => { + clearInterval(intervalId) + cleanup.active = false + } + cleanup.active = true + return cleanup +} + +const flySpeedMult = 0.5 + +const isFlying = () => bot.physics.gravity === 0 +/** @type {ReturnType|undefined} */ +let endFlyLoop + +const currentFlyVector = new Vec3(0, 0, 0) +window.currentFlyVector = currentFlyVector + +const startFlyLoop = () => { + if (!isFlying()) return + endFlyLoop?.() + + endFlyLoop = makeInterval(() => { + if (!window.bot) endFlyLoop() + bot.entity.position.add(currentFlyVector.clone().multiply(new Vec3(flySpeedMult, flySpeedMult, flySpeedMult))) + }, 50) +} + +// todo we will get rid of patching it when refactor controls +let originalSetControlState +const patchedSetControlState = (action, state) => { + if (!isFlying()) { + return originalSetControlState(action, state) + } + + const actionPerFlyVector = { + jump: new Vec3(0, 1, 0), + sneak: new Vec3(0, -1, 0), + } + + const changeVec = actionPerFlyVector[action] + if (!changeVec) { + return originalSetControlState(action, state) + } + const toAddVec = changeVec.scaled(state ? 1 : -1) + for (const coord of ['x', 'y', 'z']) { + if (toAddVec[coord] === 0) continue + if (currentFlyVector[coord] === toAddVec[coord]) return + } + currentFlyVector.add(toAddVec) +} + +const toggleFly = () => { + if (bot.game.gameMode !== 'creative') return + if (bot.setControlState !== patchedSetControlState) { + originalSetControlState = bot.setControlState + bot.setControlState = patchedSetControlState + } + + if (isFlying()) { + bot.creative.stopFlying() + endFlyLoop?.() + } else { + bot.entity.velocity = new Vec3(0, 0, 0) + bot.creative.startFlying() + startFlyLoop() + } + gameAdditionalState.isFlying = isFlying() +} + +let lastJumpUsage = 0 +document.addEventListener('keydown', (e) => { + if (!isGameActive(true)) return + + keyBindScrn.keymaps.forEach(km => { + if (e.code === km.key) { + switch (km.defaultKey) { + case 'KeyE': + showModal({ reactType: 'inventory', }) + // todo seems to be workaround + // avoid calling inner keybinding listener, but should be handled there + e.stopImmediatePropagation() + break + case 'KeyQ': + if (bot.heldItem) bot.tossStack(bot.heldItem) + break + case 'ControlLeft': + bot.setControlState('sprint', true) + gameAdditionalState.isSprinting = true + break + case 'ShiftLeft': + bot.setControlState('sneak', true) + break + case 'Space': + bot.setControlState('jump', true) + break + case 'KeyD': + bot.setControlState('right', true) + break + case 'KeyA': + bot.setControlState('left', true) + break + case 'KeyS': + bot.setControlState('back', true) + break + case 'KeyW': + bot.setControlState('forward', true) + break + } + } + }) + + e.preventDefault() +}, { + capture: true, +}) + +document.addEventListener('keyup', (e) => { + if (!isGameActive(true)) return + + keyBindScrn.keymaps.forEach(km => { + if (e.code === km.key) { + switch (km.defaultKey) { + case 'ControlLeft': + bot.setControlState('sprint', false) + gameAdditionalState.isSprinting = false + break + case 'ShiftLeft': + bot.setControlState('sneak', false) + break + case 'Space': + const toggleFlyAction = Date.now() - lastJumpUsage < 500 + if (toggleFlyAction) { + toggleFly() + } + lastJumpUsage = Date.now() + + bot.setControlState('jump', false) + break + case 'KeyD': + bot.setControlState('right', false) + break + case 'KeyA': + bot.setControlState('left', false) + break + case 'KeyS': + bot.setControlState('back', false) + break + case 'KeyW': + bot.setControlState('forward', false) + break + } + } + }) +}, false) diff --git a/src/globalState.js b/src/globalState.js index ce881f51d..e35e39fad 100644 --- a/src/globalState.js +++ b/src/globalState.js @@ -2,6 +2,7 @@ import { proxy, ref, subscribe } from 'valtio' import { pointerLock } from './utils' +import { options } from './optionsStorage' // todo: refactor structure with support of hideNext=false @@ -107,12 +108,34 @@ export const isGameActive = (foregroundCheck) => { } export const miscUiState = proxy({ - currentTouch: null + currentTouch: null, + singleplayer: false }) +// state that is not possible to get via bot +export const gameAdditionalState = proxy({ + isFlying: false, + isSprinting: false, +}) + +window.gameAdditionalState = gameAdditionalState + +// todo thats weird workaround, probably we can do better? +let forceDisableLeaveWarning = false +const info = console.info +console.info = (...args) => { + const message = args[0] + if (message === '[webpack-dev-server] App updated. Recompiling...') { + forceDisableLeaveWarning = true + } + info.apply(console, args) +} + +// todo move from global state window.addEventListener('beforeunload', (event) => { // todo-low maybe exclude chat? if (!isGameActive(true) && activeModalStack.at(-1)?.elem.id !== 'chat') return + if (forceDisableLeaveWarning && options.preventDevReloadWhilePlaying === false) return // For major browsers doning only this is enough event.preventDefault() diff --git a/src/index.js b/src/index.js index 53c10e3de..8f938cba5 100644 --- a/src/index.js +++ b/src/index.js @@ -26,6 +26,7 @@ require('./menus/notification') require('./menus/title_screen') require('./optionsStorage') require('./reactUi.jsx') +require('./botControls') // @ts-ignore require('crypto').createPublicKey = () => { } @@ -78,7 +79,7 @@ const Cursor = require('./cursor') //@ts-ignore global.THREE = require('three') const { initVR } = require('./vr') -const { activeModalStack, showModal, hideModal, hideCurrentModal, activeModalStacks, replaceActiveModalStack, isGameActive } = require('./globalState') +const { activeModalStack, showModal, hideModal, hideCurrentModal, activeModalStacks, replaceActiveModalStack, isGameActive, miscUiState, gameAdditionalState } = require('./globalState') const { pointerLock, goFullscreen, toNumber } = require('./utils') const { notification } = require('./menus/notification') const { removePanorama, addPanoramaCubeMap, initPanoramaOptions } = require('./panorama') @@ -87,6 +88,9 @@ const { startLocalServer } = require('./createLocalServer') const serverOptions = require('./defaultLocalServerOptions') const { customCommunication } = require('./customServer') const { default: updateTime } = require('./updateTime') +const { options } = require('./optionsStorage') +const { subscribe } = require('valtio') +const { subscribeKey } = require('valtio/utils') if ('serviceWorker' in navigator) { window.addEventListener('load', () => { @@ -189,7 +193,6 @@ const loadingScreen = document.getElementById('loading-error-screen') const hud = document.getElementById('hud') const optionsScrn = document.getElementById('options-screen') -const keyBindScrn = document.getElementById('keybinds-screen') const pauseMenu = document.getElementById('pause-screen') function setLoadingScreenStatus (status, isError = false) { @@ -247,6 +250,7 @@ async function main () { } let listeners = [] +let disposables = [] let timeouts = [] let intervals = [] // only for dom listeners (no removeAllListeners) @@ -261,17 +265,22 @@ const removeAllListeners = () => { target.removeEventListener(event, callback) }) listeners = [] + for (const disposable of disposables) { + disposable() + } + disposables = [] } /** - * @param {{ server: any; port?: string; singleplayer: any; username: any; password: any; proxy: any; botVersion?: any; }} options + * @param {{ server: any; port?: string; singleplayer: any; username: any; password: any; proxy: any; botVersion?: any; }} connectOptions */ -async function connect (options) { +async function connect (connectOptions) { const menu = document.getElementById('play-screen') menu.style = 'display: none;' removePanorama() - const singeplayer = options.singleplayer + const singeplayer = connectOptions.singleplayer + miscUiState.singleplayer = singeplayer const oldSetInterval = window.setInterval // @ts-ignore window.setInterval = (callback, ms) => { @@ -288,11 +297,11 @@ async function connect (options) { } const debugMenu = hud.shadowRoot.querySelector('#debug-overlay') - const viewDistance = optionsScrn.renderDistance - const hostprompt = options.server - const proxyprompt = options.proxy - const username = options.username - const password = options.password + const { renderDistance, maxMultiplayerRenderDistance } = options + const hostprompt = connectOptions.server + const proxyprompt = connectOptions.proxy + const username = connectOptions.username + const password = connectOptions.password let host, port, proxy, proxyport if (!hostprompt.includes(':')) { @@ -349,7 +358,7 @@ async function connect (options) { window.addEventListener('keydown', (e) => { if (e.code !== 'KeyR') return controller.abort() - connect(options) + connect(connectOptions) loadingScreen.hasError = false }, { signal: controller.signal }) // #endregion @@ -364,19 +373,20 @@ async function connect (options) { }, { signal: errorAbortController.signal }) + let singlePlayerServer try { if (singeplayer) { window.serverDataChannel ??= {} window.worldLoaded = false //@ts-ignore TODO Object.assign(serverOptions, _.defaultsDeep(JSON.parse(localStorage.localServerOptions || '{}'), serverOptions)) - const server = startLocalServer() + singlePlayerServer = startLocalServer() // todo need just to call quit if started loadingScreen.maybeRecoverable = false // init world, todo: do it for any async plugins - if (!server.worldsReady) { + if (!singlePlayerServer.worldsReady) { await new Promise(resolve => { - server.once('worldsReady', resolve) + singlePlayerServer.once('worldsReady', resolve) }) } } @@ -384,7 +394,7 @@ async function connect (options) { bot = mineflayer.createBot({ host, port, - version: options.botVersion === '' ? false : options.botVersion, + version: connectOptions.botVersion === '' ? false : connectOptions.botVersion, ...singeplayer ? { version: serverOptions.version, connect () { }, @@ -430,7 +440,7 @@ async function connect (options) { // server is ok, add it to the history /** @type {string[]} */ const serverHistory = JSON.parse(localStorage.getItem('serverHistory') || '[]') - serverHistory.unshift(options.server) + serverHistory.unshift(connectOptions.server) localStorage.setItem('serverHistory', JSON.stringify([...new Set(serverHistory)])) setLoadingScreenStatus('Loading world') @@ -448,19 +458,34 @@ async function connect (options) { const center = bot.entity.position - const worldView = new WorldView(bot.world, viewDistance, center) + const worldView = new WorldView(bot.world, singeplayer ? renderDistance : Math.min(renderDistance, maxMultiplayerRenderDistance), center) + if (singeplayer) { + const d = subscribeKey(options, 'renderDistance', () => { + singlePlayerServer.options['view-distance'] = options.renderDistance + worldView.viewDistance = options.renderDistance + if (miscUiState.singleplayer) { + window.onPlayerChangeRenderDistance?.(options.renderDistance) + } + }) + disposables.push(d) + } let fovSetting = optionsScrn.fov const updateFov = () => { fovSetting = optionsScrn.fov + // todo check values and add transition if (bot.controlState.sprint && !bot.controlState.sneak) { - // todo check value and add transition - fovSetting *= 5 + fovSetting += 5 + } + if (gameAdditionalState.isFlying) { + fovSetting += 5 } viewer.camera.fov = fovSetting viewer.camera.updateProjectionMatrix() } updateFov() + subscribeKey(gameAdditionalState, 'isFlying', updateFov) + subscribeKey(gameAdditionalState, 'isSprinting', updateFov) optionsScrn.addEventListener('fov_changed', updateFov) viewer.setVersion(version) @@ -587,81 +612,6 @@ async function connect (options) { bot.clearControlStates() }, false) - registerListener(document, 'keydown', (e) => { - if (activeModalStack.length) return - - keyBindScrn.keymaps.forEach(km => { - if (e.code === km.key) { - switch (km.defaultKey) { - case 'KeyE': - showModal({ reactType: 'inventory', }) - // todo seems to be workaround - // avoid calling inner keybinding listener, but should be handled there - e.stopImmediatePropagation() - break - case 'KeyQ': - if (bot.heldItem) bot.tossStack(bot.heldItem) - break - case 'ControlLeft': - bot.setControlState('sprint', true) - updateFov() - break - case 'ShiftLeft': - bot.setControlState('sneak', true) - break - case 'Space': - bot.setControlState('jump', true) - break - case 'KeyD': - bot.setControlState('right', true) - break - case 'KeyA': - bot.setControlState('left', true) - break - case 'KeyS': - bot.setControlState('back', true) - break - case 'KeyW': - bot.setControlState('forward', true) - break - } - } - }) - }, { - capture: true, - }) - - registerListener(document, 'keyup', (e) => { - keyBindScrn.keymaps.forEach(km => { - if (e.code === km.key) { - switch (km.defaultKey) { - case 'ControlLeft': - bot.setControlState('sprint', false) - updateFov() - break - case 'ShiftLeft': - bot.setControlState('sneak', false) - break - case 'Space': - bot.setControlState('jump', false) - break - case 'KeyD': - bot.setControlState('right', false) - break - case 'KeyA': - bot.setControlState('left', false) - break - case 'KeyS': - bot.setControlState('back', false) - break - case 'KeyW': - bot.setControlState('forward', false) - break - } - } - }) - }, false) - setLoadingScreenStatus('Done!') console.log('Done!') diff --git a/src/menus/options_screen.js b/src/menus/options_screen.js index d7ef0b12a..9997a187c 100644 --- a/src/menus/options_screen.js +++ b/src/menus/options_screen.js @@ -1,8 +1,11 @@ const { LitElement, html, css } = require('lit') const { commonCss, isMobile } = require('./components/common') -const { showModal, hideCurrentModal, isGameActive } = require('../globalState') +const { showModal, hideCurrentModal, isGameActive, miscUiState } = require('../globalState') const { CommonOptionsScreen } = require('./options_store') const { toNumber } = require('../utils') +const { options } = require('../optionsStorage') +const { subscribe } = require('valtio') +const { subscribeKey } = require('valtio/utils') class OptionsScreen extends CommonOptionsScreen { static get styles () { @@ -43,7 +46,6 @@ class OptionsScreen extends CommonOptionsScreen { chatHeight: { type: Number }, chatScale: { type: Number }, sound: { type: Number }, - renderDistance: { type: Number }, fov: { type: Number }, guiScale: { type: Number } } @@ -59,7 +61,6 @@ class OptionsScreen extends CommonOptionsScreen { chatHeight: { defaultValue: 180, convertFn: (v) => toNumber(v) }, chatScale: { defaultValue: 100, convertFn: (v) => toNumber(v) }, sound: { defaultValue: 50, convertFn: (v) => toNumber(v) }, - renderDistance: { defaultValue: 6, convertFn: (v) => toNumber(v) }, fov: { defaultValue: 75, convertFn: (v) => toNumber(v) }, guiScale: { defaultValue: 3, convertFn: (v) => toNumber(v) }, mouseRawInput: { defaultValue: false, convertFn: (v) => v === 'true' }, @@ -70,6 +71,13 @@ class OptionsScreen extends CommonOptionsScreen { document.documentElement.style.setProperty('--chatWidth', `${this.chatWidth}px`) document.documentElement.style.setProperty('--chatHeight', `${this.chatHeight}px`) document.documentElement.style.setProperty('--guiScale', `${this.guiScale}`) + + subscribe(options, () => { + this.requestUpdate() + }) + subscribeKey(miscUiState, 'singleplayer', () => { + this.requestUpdate() + }) } render () { @@ -114,8 +122,8 @@ class OptionsScreen extends CommonOptionsScreen { }}>
    - { - this.changeOption('renderDistance', e.target.value) + { + options.renderDistance = +e.target.value }}> { this.changeOption('fov', e.target.value) diff --git a/src/optionsStorage.js b/src/optionsStorage.js index 3da40ae0a..bf3dd258a 100644 --- a/src/optionsStorage.js +++ b/src/optionsStorage.js @@ -5,10 +5,16 @@ import { proxy, subscribe } from 'valtio/vanilla' import { subscribeKey } from 'valtio/utils' import { mergeAny } from './optionsStorageTypes' +const defaultOptions = { + renderDistance: 4, + alwaysShowMobileControls: false, + maxMultiplayerRenderDistance: 6, + excludeCommunicationDebugEvents: [], + preventDevReloadWhilePlaying: false +} + export const options = proxy( - mergeAny({ - alwaysShowMobileControls: false - }, JSON.parse(localStorage.options || '{}')) + mergeAny(defaultOptions, JSON.parse(localStorage.options || '{}')) ) window.options = options @@ -33,6 +39,10 @@ export const watchValue = (proxy, callback) => { }) } +watchValue(options, o => { + globalThis.excludeCommunicationDebugEvents = o.excludeCommunicationDebugEvents +}) + export const useOptionValue = (setting, valueCallback) => { valueCallback(setting) subscribe(setting, valueCallback) From e519e69584f93a454145a923433898035b96c03c Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 26 Aug 2023 06:12:47 +0300 Subject: [PATCH 093/318] make new ci.yml run on pulls --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc357e5a2..867fefba8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,6 @@ name: Deploy to GitHub pages on: - push: - branches: [main] + pull_request: jobs: build-and-deploy: runs-on: ubuntu-latest From 2e3f30a9de5d4f04957d14fc5f9ec77500c56ab3 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 23 Aug 2023 02:53:05 +0300 Subject: [PATCH 094/318] replace legacy lib, comment --- package.json | 1 - src/menus/components/common.js | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 7a7889082..c3b718c02 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "esbuild-plugin-polyfill-node": "^0.3.0", "express": "^4.18.2", "fs-extra": "^11.1.1", - "ismobilejs": "^1.1.1", "lit": "^2.8.0", "net-browserify": "github:PrismarineJS/net-browserify", "prismarine-world": "^3.6.2", diff --git a/src/menus/components/common.js b/src/menus/components/common.js index e84fe4304..707e31d81 100644 --- a/src/menus/components/common.js +++ b/src/menus/components/common.js @@ -44,8 +44,7 @@ const commonCss = css` /** @returns {boolean} */ function isMobile () { - const m = require('ismobilejs').default() - return m.any + return window.matchMedia('(pointer: coarse)').matches } /** From 50b5c76c36e2a96d137915fa284488b9526211d0 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 23 Aug 2023 02:53:35 +0300 Subject: [PATCH 095/318] flying check for spectator --- src/botControls.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/botControls.js b/src/botControls.js index 039795b41..1b43c2d7e 100644 --- a/src/botControls.js +++ b/src/botControls.js @@ -62,7 +62,7 @@ const patchedSetControlState = (action, state) => { } const toggleFly = () => { - if (bot.game.gameMode !== 'creative') return + if (bot.game.gameMode !== 'creative' && bot.game.gameMode !== 'spectator') return if (bot.setControlState !== patchedSetControlState) { originalSetControlState = bot.setControlState bot.setControlState = patchedSetControlState From 37a3a7b2645cccfe4579ad3727154f4bae976621 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 23 Aug 2023 02:57:59 +0300 Subject: [PATCH 096/318] play -> connect to server --- src/menus/title_screen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/menus/title_screen.js b/src/menus/title_screen.js index 60bd0d74e..856abb7eb 100644 --- a/src/menus/title_screen.js +++ b/src/menus/title_screen.js @@ -144,7 +144,7 @@ class TitleScreen extends LitElement {
    - showModal(document.getElementById('play-screen'))}> + showModal(document.getElementById('play-screen'))}> { this.style.display = 'none' this.dispatchEvent(new window.CustomEvent('singleplayer', {})) From 860ed437098ca02e555eafaf5c3d8606c0e63f2d Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 23 Aug 2023 02:59:31 +0300 Subject: [PATCH 097/318] fix opening chat --- src/botControls.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/botControls.js b/src/botControls.js index 1b43c2d7e..72f5668cf 100644 --- a/src/botControls.js +++ b/src/botControls.js @@ -107,9 +107,11 @@ document.addEventListener('keydown', (e) => { break case 'KeyD': bot.setControlState('right', true) + e.preventDefault() break case 'KeyA': bot.setControlState('left', true) + e.preventDefault() break case 'KeyS': bot.setControlState('back', true) @@ -120,8 +122,6 @@ document.addEventListener('keydown', (e) => { } } }) - - e.preventDefault() }, { capture: true, }) From 8a563aefae170eda5ae3620f78f004743096f57f Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 23 Aug 2023 03:03:30 +0300 Subject: [PATCH 098/318] [experimental] allow to override num of workers --- src/index.js | 2 +- src/optionsStorage.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index 8f938cba5..c60d2edbf 100644 --- a/src/index.js +++ b/src/index.js @@ -140,7 +140,7 @@ renderer.setSize(window.innerWidth, window.innerHeight) document.body.appendChild(renderer.domElement) // Create viewer -const viewer = new Viewer(renderer) +const viewer = new Viewer(renderer, options.numWorkers) initPanoramaOptions(viewer) const frameLimit = toNumber(localStorage.frameLimit) diff --git a/src/optionsStorage.js b/src/optionsStorage.js index bf3dd258a..1570dd494 100644 --- a/src/optionsStorage.js +++ b/src/optionsStorage.js @@ -10,7 +10,8 @@ const defaultOptions = { alwaysShowMobileControls: false, maxMultiplayerRenderDistance: 6, excludeCommunicationDebugEvents: [], - preventDevReloadWhilePlaying: false + preventDevReloadWhilePlaying: false, + numWorkers: 4 } export const options = proxy( From 0285401f108814e1744124b1fdb1af1d06a93058 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 23 Aug 2023 03:17:33 +0300 Subject: [PATCH 099/318] feat: preserve chat history in sessionstorage --- src/chat.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chat.js b/src/chat.js index f4834c0d9..2b3886095 100644 --- a/src/chat.js +++ b/src/chat.js @@ -144,7 +144,7 @@ class ChatBox extends LitElement { constructor () { super() this.chatHistoryPos = 0 - this.chatHistory = [] + this.chatHistory = JSON.parse(window.sessionStorage.chatHistory || '[]') this.messagesLimit = 200 /** @type {Message[]} */ this.messages = [{ @@ -204,7 +204,7 @@ class ChatBox extends LitElement { // Chat events document.addEventListener('keydown', e => { - if (activeModalStack.slice(-1)[0] !== this) return + if (activeModalStack.slice(-1)[0]?.elem !== this) return if (e.code === 'ArrowUp') { if (this.chatHistoryPos === 0) return chatInput.value = this.chatHistory[--this.chatHistoryPos] !== undefined ? this.chatHistory[this.chatHistoryPos] : '' @@ -242,6 +242,7 @@ class ChatBox extends LitElement { if (e.code === 'Enter') { this.chatHistory.push(chatInput.value) + window.sessionStorage.chatHistory = JSON.stringify(this.chatHistory) client.write('chat', { message: chatInput.value }) hideCurrentModal() } From 8e385c671743b97d9f88489cdefd8e75dca57827 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 23 Aug 2023 06:10:38 +0300 Subject: [PATCH 100/318] support player saving data :rocket: inspect dragndroped nbt data! improve disconnect action (disconnect immediately) --- src/globalState.js | 9 +++++++++ src/globals.d.ts | 1 + src/index.js | 24 +++++++++++++++--------- src/menus/notification.js | 3 ++- src/menus/pause_screen.js | 5 +++-- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/globalState.js b/src/globalState.js index e35e39fad..07067fc7d 100644 --- a/src/globalState.js +++ b/src/globalState.js @@ -131,11 +131,20 @@ console.info = (...args) => { info.apply(console, args) } +window.addEventListener('unload', (e) => { + if (window.singlePlayerServer) { + for (const player of window.singlePlayerServer.players) { + player.save() + } + } +}) + // todo move from global state window.addEventListener('beforeunload', (event) => { // todo-low maybe exclude chat? if (!isGameActive(true) && activeModalStack.at(-1)?.elem.id !== 'chat') return if (forceDisableLeaveWarning && options.preventDevReloadWhilePlaying === false) return + // For major browsers doning only this is enough event.preventDefault() diff --git a/src/globals.d.ts b/src/globals.d.ts index 6ba97cc7a..43875c1eb 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -1,6 +1,7 @@ declare const THREE: typeof import('three'); // todo declare const bot: import('mineflayer').Bot +declare const singlePlayerServer: any declare interface Document { getElementById(id): any diff --git a/src/index.js b/src/index.js index c60d2edbf..35984b44d 100644 --- a/src/index.js +++ b/src/index.js @@ -27,6 +27,7 @@ require('./menus/title_screen') require('./optionsStorage') require('./reactUi.jsx') require('./botControls') +require('./dragndrop') // @ts-ignore require('crypto').createPublicKey = () => { } @@ -45,11 +46,16 @@ browserfs.configure({ }) const _fs = require('fs') //@ts-ignore -_fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat'].map(key => [key, promisify(_fs[key])])), { +_fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat', 'mkdir'].map(key => [key, promisify(_fs[key])])), { get (target, p, receiver) { //@ts-ignore if (!target[p]) throw new Error(`Not implemented fs.promises.${p}`) - return Reflect.get(target, p, receiver) + return (...args) => { + // browser fs bug: if path doesn't start with / dirname will return . which would cause infinite loop, so we need to normalize paths + if (typeof args[0] === 'string' && !args[0].startsWith('/')) args[0] = '/' + args[0] + //@ts-ignore + return target[p](...args) + } } }) //@ts-ignore @@ -83,13 +89,11 @@ const { activeModalStack, showModal, hideModal, hideCurrentModal, activeModalSta const { pointerLock, goFullscreen, toNumber } = require('./utils') const { notification } = require('./menus/notification') const { removePanorama, addPanoramaCubeMap, initPanoramaOptions } = require('./panorama') -const { createClient } = require('minecraft-protocol') const { startLocalServer } = require('./createLocalServer') const serverOptions = require('./defaultLocalServerOptions') const { customCommunication } = require('./customServer') const { default: updateTime } = require('./updateTime') const { options } = require('./optionsStorage') -const { subscribe } = require('valtio') const { subscribeKey } = require('valtio/utils') if ('serviceWorker' in navigator) { @@ -331,7 +335,9 @@ async function connect (connectOptions) { /** @type {mineflayer.Bot} */ let bot - const destroy = () => { + const destroyAll = () => { + window.singlePlayerServer = undefined + // simple variant, still buggy postRenderFrameFn = () => { } if (bot) { @@ -364,7 +370,7 @@ async function connect (connectOptions) { // #endregion setLoadingScreenStatus(`Error encountered. Error message: ${err}`, true) - destroy() + destroyAll() } const errorAbortController = new AbortController() @@ -380,7 +386,7 @@ async function connect (connectOptions) { window.worldLoaded = false //@ts-ignore TODO Object.assign(serverOptions, _.defaultsDeep(JSON.parse(localStorage.localServerOptions || '{}'), serverOptions)) - singlePlayerServer = startLocalServer() + singlePlayerServer = window.singlePlayerServer = startLocalServer() // todo need just to call quit if started loadingScreen.maybeRecoverable = false // init world, todo: do it for any async plugins @@ -427,12 +433,12 @@ async function connect (connectOptions) { bot.on('kicked', (kickReason) => { console.log('User was kicked!', kickReason) setLoadingScreenStatus(`The Minecraft server kicked you. Kick reason: ${kickReason}`, true) - destroy() + destroyAll() }) bot.on('end', (endReason) => { console.log('disconnected for', endReason) - destroy() + destroyAll() setLoadingScreenStatus(`You have been disconnected from the server. End reason: ${endReason}`, true) }) diff --git a/src/menus/notification.js b/src/menus/notification.js index 27700cb3b..ff58ba8d4 100644 --- a/src/menus/notification.js +++ b/src/menus/notification.js @@ -5,6 +5,7 @@ const { LitElement, html, css } = require('lit') const { proxy, subscribe } = require('valtio/vanilla') // move to globalState? +// rename current (non-stackable) notification to one-time (system) notification const initialNotification = { show: false, autoHide: true, @@ -13,7 +14,7 @@ const initialNotification = { } export const notification = proxy(initialNotification) -export const showNotification = (/** @type {typeof notification} */newNotification) => { +export const showNotification = (/** @type {Partial} */newNotification) => { Object.assign(notification, newNotification, initialNotification) } diff --git a/src/menus/pause_screen.js b/src/menus/pause_screen.js index 51d349c57..e52e3977f 100644 --- a/src/menus/pause_screen.js +++ b/src/menus/pause_screen.js @@ -62,8 +62,9 @@ class PauseScreen extends LitElement {
    showModal(document.getElementById('options-screen'))}> { - window.location.search = '' - window.location.reload() + bot._client.emit('end') + // window.location.search = '' + // window.location.reload() }}> ` From 3c8200a6facc6acbbc62de43331d18aef3f5ca61 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 23 Aug 2023 06:52:54 +0300 Subject: [PATCH 101/318] support world saving :rocket: --- src/globalState.js | 4 ++++ src/index.js | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/globalState.js b/src/globalState.js index 07067fc7d..e84bc400a 100644 --- a/src/globalState.js +++ b/src/globalState.js @@ -134,6 +134,10 @@ console.info = (...args) => { window.addEventListener('unload', (e) => { if (window.singlePlayerServer) { for (const player of window.singlePlayerServer.players) { + // const worlds = [singlePlayerServer.overworld] + // for (const world of worlds) { + // world.storageProvider.close() + // } player.save() } } diff --git a/src/index.js b/src/index.js index 35984b44d..bc402b16d 100644 --- a/src/index.js +++ b/src/index.js @@ -65,6 +65,10 @@ _fs.promises.open = async (...args) => { return await new Promise(resolve => { _fs[x](fd, ...args, (err, bytesRead, buffer) => { if (err) throw err + if (x === 'write') { + // flush data, though alternatively we can rely on close in unload + _fs.fsync(fd, () => { }) + } resolve({ buffer, bytesRead }) }) }) From d58867bdc509de195b3c54988113df4b3bf52197 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 23 Aug 2023 21:47:32 +0300 Subject: [PATCH 102/318] refactor: move browserfs to its own file --- src/browserfs.js | 45 +++++++++++++++++++++++++++++++++++++++++++++ src/index.js | 45 ++------------------------------------------- 2 files changed, 47 insertions(+), 43 deletions(-) create mode 100644 src/browserfs.js diff --git a/src/browserfs.js b/src/browserfs.js new file mode 100644 index 000000000..c69a46b84 --- /dev/null +++ b/src/browserfs.js @@ -0,0 +1,45 @@ +//@ts-check +const { promisify } = require('util') +const browserfs = require('browserfs') +const _fs = require('fs') + +browserfs.install(window) +// todo migrate to StorageManager API for localsave as localstorage has only 5mb limit, when localstorage is fallback test limit warning on 4mb +browserfs.configure({ + // todo change to localstorage: mkdir doesnt work for some reason + fs: 'MountableFileSystem', + options: { + "/world": { fs: "LocalStorage" } + }, +}, (e) => { + if (e) throw e +}) +//@ts-ignore +_fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat', 'mkdir'].map(key => [key, promisify(_fs[key])])), { + get (target, p, receiver) { + //@ts-ignore + if (!target[p]) throw new Error(`Not implemented fs.promises.${p}`) + return (...args) => { + // browser fs bug: if path doesn't start with / dirname will return . which would cause infinite loop, so we need to normalize paths + if (typeof args[0] === 'string' && !args[0].startsWith('/')) args[0] = '/' + args[0] + //@ts-ignore + return target[p](...args) + } + } +}) +//@ts-ignore +_fs.promises.open = async (...args) => { + const fd = await promisify(_fs.open)(...args) + return Object.fromEntries(['read', 'write', 'close'].map(x => [x, async (...args) => { + return await new Promise(resolve => { + _fs[x](fd, ...args, (err, bytesRead, buffer) => { + if (err) throw err + if (x === 'write') { + // flush data, though alternatively we can rely on close in unload + _fs.fsync(fd, () => { }) + } + resolve({ buffer, bytesRead }) + }) + }) + }])) +} diff --git a/src/index.js b/src/index.js index bc402b16d..9ed4f6a61 100644 --- a/src/index.js +++ b/src/index.js @@ -24,57 +24,16 @@ require('./menus/options_screen') require('./menus/advanced_options_screen') require('./menus/notification') require('./menus/title_screen') + require('./optionsStorage') require('./reactUi.jsx') require('./botControls') require('./dragndrop') +require('./browserfs') // @ts-ignore require('crypto').createPublicKey = () => { } -const { promisify } = require('util') -const browserfs = require('browserfs') -browserfs.install(window) -browserfs.configure({ - // todo change to localstorage: mkdir doesnt work for some reason - fs: 'MountableFileSystem', - options: { - "/world": { fs: "LocalStorage" } - }, -}, (e) => { - if (e) throw e -}) -const _fs = require('fs') -//@ts-ignore -_fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat', 'mkdir'].map(key => [key, promisify(_fs[key])])), { - get (target, p, receiver) { - //@ts-ignore - if (!target[p]) throw new Error(`Not implemented fs.promises.${p}`) - return (...args) => { - // browser fs bug: if path doesn't start with / dirname will return . which would cause infinite loop, so we need to normalize paths - if (typeof args[0] === 'string' && !args[0].startsWith('/')) args[0] = '/' + args[0] - //@ts-ignore - return target[p](...args) - } - } -}) -//@ts-ignore -_fs.promises.open = async (...args) => { - const fd = await promisify(_fs.open)(...args) - return Object.fromEntries(['read', 'write', 'close'].map(x => [x, async (...args) => { - return await new Promise(resolve => { - _fs[x](fd, ...args, (err, bytesRead, buffer) => { - if (err) throw err - if (x === 'write') { - // flush data, though alternatively we can rely on close in unload - _fs.fsync(fd, () => { }) - } - resolve({ buffer, bytesRead }) - }) - }) - }])) -} - const net = require('net') const Stats = require('stats.js') From b4052892e5660515c2d64a82087f84a1a9349ece Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 23 Aug 2023 23:34:09 +0300 Subject: [PATCH 103/318] temporary fix for block model in inventory gui --- src/styles.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/styles.css b/src/styles.css index 38efac0ae..81fca2dce 100644 --- a/src/styles.css +++ b/src/styles.css @@ -92,6 +92,14 @@ canvas { font-family: minecraft, mojangles, monospace; } +/* todo I guess the best solution would be to render it on canvas */ +.BlockModel { + scale: 0.5; + width: 183%; + height: 190%; + transform: translate(-50%, -50%); +} + @media only screen and (max-width: 971px) { #ui-root { transform: scale(2); From b1b03f07ffd7a056c5556800fb3954763dfc2577 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 24 Aug 2023 01:39:42 +0300 Subject: [PATCH 104/318] add support for icons in button TODO not pixel-perfect --- package.json | 1 + src/index.js | 1 + src/menus/advanced_options_screen.js | 3 +-- src/menus/components/button.js | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c3b718c02..7da3dc1db 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "esbuild-plugin-polyfill-node": "^0.3.0", "express": "^4.18.2", "fs-extra": "^11.1.1", + "iconify-icon": "^1.0.8", "lit": "^2.8.0", "net-browserify": "github:PrismarineJS/net-browserify", "prismarine-world": "^3.6.2", diff --git a/src/index.js b/src/index.js index 9ed4f6a61..61d7ef993 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,6 @@ //@ts-check /* global THREE */ +require('iconify-icon') require('./chat') // workaround for mineflayer diff --git a/src/menus/advanced_options_screen.js b/src/menus/advanced_options_screen.js index 75c1da732..e94fc0c22 100644 --- a/src/menus/advanced_options_screen.js +++ b/src/menus/advanced_options_screen.js @@ -72,8 +72,7 @@ class AdvancedOptionsScreen extends CommonOptionsScreen { this.changeOption('frameLimit', newVal > this.frameLimitMax ? false : newVal) this.requestUpdate() }}> - - { + { const rate = await getScreenRefreshRate() this.frameLimitMax = rate this.requestUpdate() diff --git a/src/menus/components/button.js b/src/menus/components/button.js index dbec5096e..185e75147 100644 --- a/src/menus/components/button.js +++ b/src/menus/components/button.js @@ -50,6 +50,9 @@ class Button extends LitElement { border: none; z-index: 1; outline: none; + display: inline-flex; + justify-content: center; + align-items: center; } .button:hover, @@ -91,6 +94,13 @@ class Button extends LitElement { background-position-y: calc(var(--txrV) * -1); z-index: -1; } + + .icon { + position: absolute; + top: 3px; + left: 3px; + font-size: 14px; + } ` } @@ -110,6 +120,10 @@ class Button extends LitElement { onPress: { type: Function, attribute: 'pmui-click' + }, + icon: { + type: Function, + attribute: 'pmui-icon' } } } @@ -130,6 +144,8 @@ class Button extends LitElement { @click=${this.onBtnClick} style="width: ${this.width};" > + + ${this.icon ? html`` : ''} ${this.label} ` } From 7eb2d5442b70e6c0e91d558b5e945b32ce308d3c Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 26 Aug 2023 06:09:34 +0300 Subject: [PATCH 105/318] feat(big!): implement folder save loading with write access --- package.json | 6 +- src/browserfs.js | 85 +++++++++++++++++--- src/dragndrop.ts | 29 +++++++ src/globalState.js | 4 - src/globals.d.ts | 13 +++ src/index.js | 18 +++-- src/loadFolder.ts | 102 ++++++++++++++++++++++++ src/mcTypes.ts | 164 ++++++++++++++++++++++++++++++++++++++ src/menus/pause_screen.js | 16 +++- src/menus/title_screen.js | 13 ++- src/optionsStorage.js | 2 + webpack.common.js | 11 +-- 12 files changed, 430 insertions(+), 33 deletions(-) create mode 100644 src/dragndrop.ts create mode 100644 src/loadFolder.ts create mode 100644 src/mcTypes.ts diff --git a/package.json b/package.json index 7da3dc1db..23302a0fc 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,10 @@ "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11", "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", + "@types/wicg-file-system-access": "^2020.9.6", "@zardoy/react-util": "^0.2.0", - "browserfs": "^1.4.3", + "@zardoy/utils": "^0.0.11", + "browserfs": "github:zardoy/browserfs#build", "compression": "^1.7.4", "cypress-plugin-snapshots": "^1.4.4", "diamond-square": "^1.2.0", @@ -91,7 +93,7 @@ "pnpm": { "overrides": { "minecraft-data": "latest", - "minecraft-protocol": "github:zardoy/minecraft-protocol#custom-client", + "minecraft-protocol": "github:zardoy/minecraft-protocol#custom-client-extra", "space-squid": "file:../space-squid", "@dimaka/interface": "file:../interface" } diff --git a/src/browserfs.js b/src/browserfs.js index c69a46b84..dfc531f54 100644 --- a/src/browserfs.js +++ b/src/browserfs.js @@ -1,4 +1,6 @@ //@ts-check +import { fsState, loadFolder } from './loadFolder' +import { oneOf } from '@zardoy/utils' const { promisify } = require('util') const browserfs = require('browserfs') const _fs = require('fs') @@ -15,13 +17,16 @@ browserfs.configure({ if (e) throw e }) //@ts-ignore -_fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat', 'mkdir'].map(key => [key, promisify(_fs[key])])), { +_fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat', 'mkdir', 'rename', /* 'copyFile', */'readdir'].map(key => [key, promisify(_fs[key])])), { get (target, p, receiver) { //@ts-ignore if (!target[p]) throw new Error(`Not implemented fs.promises.${p}`) return (...args) => { // browser fs bug: if path doesn't start with / dirname will return . which would cause infinite loop, so we need to normalize paths if (typeof args[0] === 'string' && !args[0].startsWith('/')) args[0] = '/' + args[0] + // Write methods + // todo issue one-time warning (in chat I guess) + if (oneOf(p, 'writeFile', 'mkdir', 'rename') && fsState.isReadonly) return //@ts-ignore return target[p](...args) } @@ -30,16 +35,74 @@ _fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat', 'm //@ts-ignore _fs.promises.open = async (...args) => { const fd = await promisify(_fs.open)(...args) - return Object.fromEntries(['read', 'write', 'close'].map(x => [x, async (...args) => { - return await new Promise(resolve => { - _fs[x](fd, ...args, (err, bytesRead, buffer) => { - if (err) throw err - if (x === 'write') { - // flush data, though alternatively we can rely on close in unload - _fs.fsync(fd, () => { }) - } - resolve({ buffer, bytesRead }) + return { + ...Object.fromEntries(['read', 'write', 'close'].map(x => [x, async (...args) => { + return await new Promise(resolve => { + _fs[x](fd, ...args, (err, bytesRead, buffer) => { + if (err) throw err + // todo if readonly probably there is no need to open at all (return some mocked version - check reload)? + if (x === 'write' && !fsState.isReadonly && fsState.syncFs) { + // flush data, though alternatively we can rely on close in unload + _fs.fsync(fd, () => { }) + } + resolve({ buffer, bytesRead }) + }) + }) + }])), + // for debugging + fd, + filename: args[0], + close: () => { + return new Promise(resolve => { + _fs.close(fd, (err) => { + if (err) { + throw err + } else { + resolve() + } + }) }) + } + } +} + +const SUPPORT_WRITE = true + +export const openWorldDirectory = async (dragndropData) => { + /** @type {FileSystemDirectoryHandle} */ + let _directoryHandle + try { + _directoryHandle = await window.showDirectoryPicker() + } catch (err) { + if (err instanceof DOMException && err.name === 'AbortError') return + throw err + } + const directoryHandle = _directoryHandle + + const requestResult = SUPPORT_WRITE ? await directoryHandle.requestPermission?.({ mode: 'readwrite' }) : undefined + const writeAccess = requestResult === 'granted' + + const doContinue = writeAccess || !SUPPORT_WRITE || confirm('Continue in readonly mode?') + if (!doContinue) return + await new Promise(resolve => { + browserfs.configure({ + // todo + fs: 'MountableFileSystem', + options: { + "/world": { + fs: "FileSystemAccess", + options: { + handle: directoryHandle + } + } + }, + }, (e) => { + if (e) throw e + resolve() }) - }])) + }) + + fsState.isReadonly = !writeAccess + fsState.syncFs = false + loadFolder() } diff --git a/src/dragndrop.ts b/src/dragndrop.ts new file mode 100644 index 000000000..b29ca1c8f --- /dev/null +++ b/src/dragndrop.ts @@ -0,0 +1,29 @@ +import * as nbt from 'prismarine-nbt' +import { promisify } from 'util' +import { showNotification } from './menus/notification' + +const parseNbt = promisify(nbt.parse); + +// todo display drop zone +["drag", "dragstart", "dragend", "dragover", "dragenter", "dragleave", "drop"].forEach(event => { + window.addEventListener(event, (e: any) => { + if (e.dataTransfer && !e.dataTransfer.types.includes("Files")) { + // e.dataTransfer.effectAllowed = "none" + return + } + e.preventDefault() + }) +}) +window.addEventListener("drop", async e => { + if (!e.dataTransfer?.files.length) return + // todo support drop save folder + const { files } = e.dataTransfer + const file = files.item(0)! + const buffer = await file.arrayBuffer() + const parsed = await parseNbt(Buffer.from(buffer)) + showNotification({ + message: `${file.name} data available in browser console`, + }) + console.log('raw', parsed) + console.log('simplified', nbt.simplify(parsed).Data) +}) diff --git a/src/globalState.js b/src/globalState.js index e84bc400a..07067fc7d 100644 --- a/src/globalState.js +++ b/src/globalState.js @@ -134,10 +134,6 @@ console.info = (...args) => { window.addEventListener('unload', (e) => { if (window.singlePlayerServer) { for (const player of window.singlePlayerServer.players) { - // const worlds = [singlePlayerServer.overworld] - // for (const world of worlds) { - // world.storageProvider.close() - // } player.save() } } diff --git a/src/globals.d.ts b/src/globals.d.ts index 43875c1eb..f4719819d 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -1,3 +1,5 @@ +/// + declare const THREE: typeof import('three'); // todo declare const bot: import('mineflayer').Bot @@ -15,3 +17,14 @@ declare interface DocumentFragment { declare interface Window extends Record { } + +type StringKeys = Extract + + +interface ObjectConstructor { + keys(obj: T): StringKeys[] + entries(obj: T): [StringKeys, T[keyof T]][] + // todo review https://stackoverflow.com/questions/57390305/trying-to-get-fromentries-type-right + fromEntries(obj: T): Record + assign, K extends Record>(target: T, source: K): asserts target is T & K +} diff --git a/src/index.js b/src/index.js index 61d7ef993..2696a2502 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,10 @@ //@ts-check /* global THREE */ +// todo cant ignore fs thus doesnt work in browser +// const soureMapSupport = require('source-map-support') +// soureMapSupport.install({ +// environment: 'browser', +// }) require('iconify-icon') require('./chat') @@ -201,12 +206,13 @@ async function main () { const options = e.detail connect(options) }) - const connectSingleplayer = () => { + const connectSingleplayer = (serverOverrides = {}) => { // todo clean - connect({ server: '', port: '', proxy: '', singleplayer: true, username: 'wanderer', password: '' }) + connect({ server: '', port: '', proxy: '', singleplayer: true, username: 'wanderer', password: '', serverOverrides }) } document.querySelector('#title-screen').addEventListener('singleplayer', (e) => { - connectSingleplayer() + //@ts-ignore + connectSingleplayer(e.detail) }) const qs = new URLSearchParams(window.location.search) if (qs.get('singleplayer') === '1') { @@ -240,7 +246,7 @@ const removeAllListeners = () => { } /** - * @param {{ server: any; port?: string; singleplayer: any; username: any; password: any; proxy: any; botVersion?: any; }} connectOptions + * @param {{ server: any; port?: string; singleplayer: any; username: any; password: any; proxy: any; botVersion?: any; serverOverrides? }} connectOptions */ async function connect (connectOptions) { const menu = document.getElementById('play-screen') @@ -349,10 +355,10 @@ async function connect (connectOptions) { window.serverDataChannel ??= {} window.worldLoaded = false //@ts-ignore TODO - Object.assign(serverOptions, _.defaultsDeep(JSON.parse(localStorage.localServerOptions || '{}'), serverOptions)) + Object.assign(serverOptions, _.defaultsDeep(JSON.parse(localStorage.localServerOptions || '{}'), connectOptions.serverOverrides, serverOptions)) singlePlayerServer = window.singlePlayerServer = startLocalServer() // todo need just to call quit if started - loadingScreen.maybeRecoverable = false + // loadingScreen.maybeRecoverable = false // init world, todo: do it for any async plugins if (!singlePlayerServer.worldsReady) { await new Promise(resolve => { diff --git a/src/loadFolder.ts b/src/loadFolder.ts new file mode 100644 index 000000000..e1e739c8f --- /dev/null +++ b/src/loadFolder.ts @@ -0,0 +1,102 @@ +import fs from 'fs' +import { supportedVersions } from 'space-squid/src/lib/version' +import * as nbt from 'prismarine-nbt' +import { promisify } from 'util' +import { options } from './optionsStorage' + +const parseNbt = promisify(nbt.parse) + +// additional fs metadata +export const fsState = { + isReadonly: false, + syncFs: false, +} + +const PROPOSE_BACKUP = true + +export const loadFolder = async () => { + // todo-low cache reading + const warnings: string[] = [] + let levelDatContent + try { + levelDatContent = await fs.promises.readFile('/world/level.dat') + } catch (err) { + if (err.code === 'ENOENT') { + if (!fsState.isReadonly) { + warnings.push('level.dat not found, world in current folder will be created') + } else { + throw new Error('level.dat not found, ensure you are loading world folder') + } + } else { + throw err + } + } + + + let version: string | undefined + if (levelDatContent) { + const parsedRaw = await parseNbt(Buffer.from(levelDatContent)) + const levelDat: import('./mcTypes').LevelDat = nbt.simplify(parsedRaw).Data + version = levelDat.Version?.Name + if (!version) { + const newVersion = prompt(`In 1.8 and before world save doesn\'t contain version info, please enter version you want to use to load the world.\nSupported versions ${supportedVersions.join(', ')}`, '1.8.8') + if (!newVersion) return + version = newVersion + } + if (!supportedVersions.includes(version)) { + warnings.push(`Version ${version} is not supported, supported versions ${supportedVersions.join(', ')}, 1.16.1 will be used`) + version = '1.16.1' + } + let isFlat = false + if (levelDat.WorldGenSettings) { + for (const [key, value] of Object.entries(levelDat.WorldGenSettings.dimensions)) { + if (key.slice(10) === 'overworld') { + if (value.generator.type === 'flat') isFlat = true + break + } + } + } + + if (levelDat.generatorName) { + isFlat = levelDat.generatorName === 'flat' + } + if (!isFlat) { + warnings.push(`Generator ${levelDat.generatorName} is not supported yet`) + } + } + + if (warnings.length) { + const doContinue = confirm(`Continue with following warnings?\n${warnings.join('\n')}`) + if (!doContinue) return + } + + if (PROPOSE_BACKUP) { + // TODO-HIGH! enable after copyFile in browserfs is implemented + + // const doBackup = options.alwaysBackupWorldBeforeLoading ?? confirm('Do you want to backup your world files before loading it?') + // // const doBackup = true + // if (doBackup) { + // // todo do it in flying squid instead + // await fs.promises.copyFile('/world/level.dat', `/world/level.dat_old`) + // try { + // await fs.promises.mkdir('/backups/region.old', { recursive: true }) + // } catch (err) { } + // const files = await fs.promises.readdir('/world/region') + // for (const file of files) { + // await fs.promises.copyFile(`/world/region/${file}`, `/world/region.old/${file}`) + // } + // } + } + + if (!fsState.isReadonly) { + // todo allow also to ctrl+s + alert("Note: the world is saved only when you click disconnect!") + } + + document.querySelector('#title-screen').dispatchEvent(new CustomEvent('singleplayer', { + // todo check gamemode level.dat data etc + detail: { + version + }, + })) +} diff --git a/src/mcTypes.ts b/src/mcTypes.ts new file mode 100644 index 000000000..e7f6c7afd --- /dev/null +++ b/src/mcTypes.ts @@ -0,0 +1,164 @@ +// todo move from here + +//@ts-format-ignore-region +// 1.8.8 +export interface LevelDat { + WorldGenSettings?: WorldGenSettings; + RandomSeed: number[]; + generatorName?: string; + BorderCenterX: number; + BorderCenterZ: number; + Difficulty: number; + DifficultyLocked: number; + BorderSizeLerpTime: number[]; + Version?: { + Name: string + // id, snapshot + } + /** 0,1 */ + raining: number; + Time: number[]; + GameType: number; + MapFeatures: number; + BorderDamagePerBlock: number; + BorderWarningBlocks: number; + BorderSizeLerpTarget: number; + DayTime: number[]; + initialized: number; + allowCommands: number; + SizeOnDisk: number[]; + GameRules: GameRules; + Player: Player; + SpawnY: number; + rainTime: number; + thunderTime: number; + SpawnZ: number; + hardcore: number; + SpawnX: number; + clearWeatherTime: number; + thundering: number; + generatorVersion?: number; + version: number; + BorderSafeZone: number; + generatorOptions?: string; + LastPlayed: number[]; + BorderWarningTime: number; + LevelName: string; + BorderSize: number; +} + +export interface GameRules { + doTileDrops: string; + doFireTick: string; + reducedDebugInfo: string; + naturalRegeneration: string; + doMobLoot: string; + keepInventory: string; + doEntityDrops: string; + mobGriefing: string; + randomTickSpeed: string; + commandBlockOutput: string; + doMobSpawning: string; + logAdminCommands: string; + sendCommandFeedback: string; + doDaylightCycle: string; + showDeathMessages: string; +} + +export interface Player { + HurtByTimestamp: number; + SleepTimer: number; + Attributes: Attribute[]; + Invulnerable: number; + PortalCooldown: number; + AbsorptionAmount: number; + abilities: Abilities; + FallDistance: number; + DeathTime: number; + XpSeed: number; + HealF: number; + XpTotal: number; + playerGameType: number; + SelectedItem: SelectedItem; + Motion: number[]; + UUIDLeast: number[]; + Health: number; + foodSaturationLevel: number; + Air: number; + OnGround: number; + Dimension: number; + Rotation: number[]; + XpLevel: number; + Score: number; + UUIDMost: number[]; + Sleeping: number; + Pos: number[]; + Fire: number; + XpP: number; + EnderItems: any[]; + foodLevel: number; + foodExhaustionLevel: number; + HurtTime: number; + SelectedItemSlot: number; + Inventory: SelectedItem[]; + foodTickTimer: number; +} + +export interface Attribute { + Base: number; + Name: string; +} + +export interface SelectedItem { + Slot?: number; + id: string; + Count: number; + Damage: number; +} + +export interface Abilities { + invulnerable: number; + mayfly: number; + instabuild: number; + walkSpeed: number; + mayBuild: number; + flying: number; + flySpeed: number; +} + +// 1.16+ + +export interface WorldGenSettings { + /** 0,1 */ + bonus_chest: number; + seed: number[]; + /** 0,1 */ + generate_features: number; + dimensions: Dimensions; +} + +export interface Dimensions { + // :overworld, :the_nether, :the_end + [key: string]: WorldGen; +} + +export interface WorldGen { + generator: WorldGenGenerator; + // same as key + type: string; +} + +export interface WorldGenGenerator { + settings: string; + seed: number[]; + biome_source: PurpleBiomeSource; + type: string; +} + +export interface PurpleBiomeSource { + seed: number[]; + /** only for overworld 0,1 */ + large_biomes?: number; + // :noise, :flat, ? + type: string; +} diff --git a/src/menus/pause_screen.js b/src/menus/pause_screen.js index e52e3977f..81e97ce46 100644 --- a/src/menus/pause_screen.js +++ b/src/menus/pause_screen.js @@ -61,10 +61,18 @@ class PauseScreen extends LitElement { openURL('https://discord.gg/4Ucm684Fq3')}>
    showModal(document.getElementById('options-screen'))}> - { - bot._client.emit('end') - // window.location.search = '' - // window.location.reload() + { + if (window.singlePlayerServer) { + for (const player of window.singlePlayerServer.players) { + const worlds = [singlePlayerServer.overworld] + for (const world of worlds) { + await world.storageProvider.close() + } + await player.save() + singlePlayerServer.quit() + } + } + bot._client.emit('end') }}> ` diff --git a/src/menus/title_screen.js b/src/menus/title_screen.js index 856abb7eb..204f0f86c 100644 --- a/src/menus/title_screen.js +++ b/src/menus/title_screen.js @@ -1,4 +1,6 @@ +const { openWorldDirectory } = require('../browserfs') const { showModal } = require('../globalState') +const { fsState } = require('../loadFolder') const { openURL } = require('./components/common') const { LitElement, html, css } = require('lit') @@ -145,10 +147,19 @@ class TitleScreen extends LitElement {
    showModal(document.getElementById('play-screen'))}> - { +
    + { this.style.display = 'none' + Object.assign(fsState, { + isReadonly: false, + syncFs: true, + }) this.dispatchEvent(new window.CustomEvent('singleplayer', {})) }}> + ${window['showDirectoryPicker'] ? html` { + openWorldDirectory() + }}>` : ''} +
    showModal(document.getElementById('options-screen'))}>
    openURL(process.env.GITHUB_URL)}> diff --git a/src/optionsStorage.js b/src/optionsStorage.js index 1570dd494..72d8298df 100644 --- a/src/optionsStorage.js +++ b/src/optionsStorage.js @@ -7,6 +7,8 @@ import { mergeAny } from './optionsStorageTypes' const defaultOptions = { renderDistance: 4, + /** @type {boolean | undefined | null} */ + alwaysBackupWorldBeforeLoading: undefined, alwaysShowMobileControls: false, maxMultiplayerRenderDistance: 6, excludeCommunicationDebugEvents: [], diff --git a/webpack.common.js b/webpack.common.js index f114c47af..56cbad671 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -16,12 +16,12 @@ const config = { }, resolve: { alias: { + 'browserfs$': 'browserfs/dist/browserfs.mjs', + 'bfsGlobal': 'browserfs', 'fs': 'browserfs/dist/shims/fs.js', 'buffer': 'browserfs/dist/shims/buffer.js', 'path': 'browserfs/dist/shims/path.js', - 'processGlobal': 'browserfs/dist/shims/process.js', - 'bufferGlobal': 'browserfs/dist/shims/bufferGlobal.js', - 'bfsGlobal': require.resolve('browserfs'), + buffer: require.resolve('buffer/'), 'minecraft-protocol$': path.resolve( __dirname, @@ -76,9 +76,10 @@ const config = { minify: false, chunks: ['main', 'vendors'], }), - new webpack.ProvidePlugin({ BrowserFS: 'bfsGlobal', /* process: 'processGlobal', */ Buffer: 'bufferGlobal' }), new webpack.ProvidePlugin({ - process: 'process/browser' + process: 'process/browser.js', + BrowserFS: 'bfsGlobal', + Buffer: ['buffer', 'Buffer'] }), // new webpack.ProvidePlugin({ // Buffer: ['buffer', 'Buffer'] From 2ea2f537e36783aeb1ad4023ee7cba9c89ac01ee Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 26 Aug 2023 06:09:49 +0300 Subject: [PATCH 106/318] add ci.yml --- .github/workflows/ci.yml | 68 +++++++--------------------------------- 1 file changed, 12 insertions(+), 56 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c46e06266..cc357e5a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,61 +1,17 @@ -name: CI - +name: Deploy to GitHub pages on: push: - branches: [ master ] - pull_request: - branches: [ master ] - + branches: [main] jobs: - build: - + build-and-deploy: runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [18.x] - + permissions: write-all steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm install - - run: npm run build - - run: npm test - DeployPages: - runs-on: ubuntu-latest - if: ${{ github.event_name == 'push' }} - steps: - - name: Checkout 🛎️ - uses: actions/checkout@v2.3.1 # If you're using actions/checkout@v2 you must set persist-credentials to false in most cases for the deployment to work correctly. - with: - persist-credentials: false - fetch-depth: 0 - - name: Edit config - run: | - sed -i -E 's/^ "defaultProxy": ""/ "defaultProxy": "pproxy.rom1504.fr"/g' config.json - sed -i -E 's/^ "defaultProxyPort": 0/ "defaultProxyPort": 443/g' config.json - - name: Build - run: | - npm install - npm run build - cp -R public/ ../ - rm -Rf ./* - git checkout gh-pages - rm -Rf ./* - rm -Rf .github .gitignore .gitpod .gitpod.DockerFile .npmignore .npmrc - cp -R ../public/* ./ - - name: Create commits - run: | - git config user.name 'rom1504bot' - git config user.email 'rom1504bot@users.noreply.github.com' - git add --all - git commit --amend -m "Update gh-pages" - - name: Deploy 🚀 - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: gh-pages - force: true + - name: Checkout repository + uses: actions/checkout@master + - name: Install pnpm + run: npm i -g pnpm + - run: pnpm install + - run: pnpm build + # todo use nohup and official action? + # - run: pnpm prod-start & pnpm test:cypress From 359930de456c2d7a30edf87395afe3693498f05e Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 26 Aug 2023 23:05:25 +0300 Subject: [PATCH 107/318] build should be fixed (disable inventory for now) --- package.json | 3 +-- src/botControls.js | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 23302a0fc..a45792e6f 100644 --- a/package.json +++ b/package.json @@ -94,8 +94,7 @@ "overrides": { "minecraft-data": "latest", "minecraft-protocol": "github:zardoy/minecraft-protocol#custom-client-extra", - "space-squid": "file:../space-squid", - "@dimaka/interface": "file:../interface" + "space-squid": "file:../space-squid" } } } diff --git a/src/botControls.js b/src/botControls.js index 72f5668cf..5ff0bad3f 100644 --- a/src/botControls.js +++ b/src/botControls.js @@ -87,7 +87,8 @@ document.addEventListener('keydown', (e) => { if (e.code === km.key) { switch (km.defaultKey) { case 'KeyE': - showModal({ reactType: 'inventory', }) + // todo reenable + // showModal({ reactType: 'inventory', }) // todo seems to be workaround // avoid calling inner keybinding listener, but should be handled there e.stopImmediatePropagation() From 6f6f089aa43a74d07059862c41ecac3dbc8ed231 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 27 Aug 2023 01:02:00 +0300 Subject: [PATCH 108/318] Remove linked dep --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index a45792e6f..29af3852e 100644 --- a/package.json +++ b/package.json @@ -93,8 +93,7 @@ "pnpm": { "overrides": { "minecraft-data": "latest", - "minecraft-protocol": "github:zardoy/minecraft-protocol#custom-client-extra", - "space-squid": "file:../space-squid" + "minecraft-protocol": "github:zardoy/minecraft-protocol#custom-client-extra" } } } From 1d895a3357b8c13045568aeea3e8f5c629ffc311 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 27 Aug 2023 08:10:52 +0300 Subject: [PATCH 109/318] wip testing cypress --- .github/workflows/ci.yml | 11 +++++++++-- .../Loads & renders singleplayer #0.png | Bin 0 -> 234643 bytes .../Renders menu (options button) #0.png | Bin 220617 -> 0 bytes cypress/integration/index.spec.ts | 8 ++++---- package.json | 4 +--- src/chat.js | 6 +++--- src/index.js | 7 +++---- src/utils.js | 4 ++++ 8 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 cypress/integration/__image_snapshots__/Loads & renders singleplayer #0.png delete mode 100644 cypress/integration/__image_snapshots__/Renders menu (options button) #0.png diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 867fefba8..cfb51d755 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,5 +12,12 @@ jobs: run: npm i -g pnpm - run: pnpm install - run: pnpm build - # todo use nohup and official action? - # - run: pnpm prod-start & pnpm test:cypress + - uses: cypress-io/github-action@v5 + with: + start: pnpm prod-start + - uses: actions/upload-artifact@v3 + if: failure() + with: + name: cypress-images + path: cypress/integration/__image_snapshots__/ + if-no-files-found: ignore diff --git a/cypress/integration/__image_snapshots__/Loads & renders singleplayer #0.png b/cypress/integration/__image_snapshots__/Loads & renders singleplayer #0.png new file mode 100644 index 0000000000000000000000000000000000000000..ea42d86f3d85a46e8f26d169809480d6aff3dd2d GIT binary patch literal 234643 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 C(pMD# literal 0 HcmV?d00001 diff --git a/cypress/integration/__image_snapshots__/Renders menu (options button) #0.png b/cypress/integration/__image_snapshots__/Renders menu (options button) #0.png deleted file mode 100644 index 93a6c53cc1842fb93a77a6d41dfba612447ca6f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220617 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 u-$$W;_`wJ6NvF~pGJp7heBF6?`@ -it('Renders menu (options button)', () => { +it('Loads & renders singleplayer', () => { // todo use
    showModal(document.getElementById('options-screen'))}> - { + { if (window.singlePlayerServer) { for (const player of window.singlePlayerServer.players) { const worlds = [singlePlayerServer.overworld] From 8504fa52a2a1e0f0192ae7a462a1270ba4b6b83c Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Tue, 29 Aug 2023 07:48:39 +0300 Subject: [PATCH 134/318] small logging of bundled json size :/ --- scripts/esbuildPlugins.mjs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/esbuildPlugins.mjs b/scripts/esbuildPlugins.mjs index 9a11c827c..7bb3b2b20 100644 --- a/scripts/esbuildPlugins.mjs +++ b/scripts/esbuildPlugins.mjs @@ -76,10 +76,19 @@ const plugins = [ } }) build.onEnd(({ metafile, outputFiles }) => { - // top 5 biggest deps - //@ts-ignore + const prod = process.argv.includes('--prod') + if (!prod) return // const deps = Object.entries(metafile.inputs).sort(([, a], [, b]) => b.bytes - a.bytes).map(([x, { bytes }]) => [x, filesize(bytes)]).slice(0, 5) - // console.log(deps) + //@ts-ignore + const sizeByExt = {} + //@ts-ignore + Object.entries(metafile.inputs).sort(([, a], [, b]) => b.bytes - a.bytes).forEach(([x, { bytes }]) => { + const ext = x.slice(x.lastIndexOf('.')) + sizeByExt[ext] ??= 0 + sizeByExt[ext] += bytes + }) + console.log('Input size by ext:') + console.log(Object.fromEntries(Object.entries(sizeByExt).map(x => [x[0], filesize(x[1])]))) }) }, }, @@ -173,6 +182,7 @@ const plugins = [ namespace: 'esbuild-import-glob', }, async ({ pluginData, path }) => { const { resolveDir } = pluginData + //@ts-ignore const [, userPath, skipFiles] = /^esbuild-import-glob\(path:(.+),skipFiles:(.+)\)+$/g.exec(path) const files = (await fs.promises.readdir(join(resolveDir, userPath))).filter(f => !skipFiles.includes(f)) return { From 8fcfcf118dc504d5591a17d0d4e26df1d9f2c951 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Tue, 29 Aug 2023 07:54:50 +0300 Subject: [PATCH 135/318] fix: do not mutate localServerOptions --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index ffe40e6fd..7bd88baf6 100644 --- a/src/index.js +++ b/src/index.js @@ -357,7 +357,7 @@ async function connect (connectOptions) { if (singeplayer) { window.serverDataChannel ??= {} window.worldLoaded = false - Object.assign(serverOptions, _.defaultsDeep(options.localServerOptions, connectOptions.serverOverrides, serverOptions)) + Object.assign(serverOptions, _.defaultsDeep({}, options.localServerOptions, connectOptions.serverOverrides, serverOptions)) singlePlayerServer = window.singlePlayerServer = startLocalServer() // todo need just to call quit if started // loadingScreen.maybeRecoverable = false From 2a9ae33d9a920e9b610a26822c54847dcadb1def Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Tue, 29 Aug 2023 09:20:23 +0300 Subject: [PATCH 136/318] fix chat on mobile --- src/chat.js | 20 ++++++++++++++------ src/reactUi.jsx | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/chat.js b/src/chat.js index d0301808c..195ce54ea 100644 --- a/src/chat.js +++ b/src/chat.js @@ -71,6 +71,7 @@ class ChatBox extends LitElement { box-sizing: border-box; overflow: hidden; background-color: rgba(0, 0, 0, 0); + pointer-events: none; } .input-mobile { @@ -91,6 +92,10 @@ class ChatBox extends LitElement { font-family: mojangles, minecraft, monospace; width: 100%; max-height: var(--chatHeight); + pointer-events: none; + } + .chat.opened { + pointer-events: auto; } input[type=text], #chatinput { @@ -98,6 +103,7 @@ class ChatBox extends LitElement { border: 1px solid rgba(0, 0, 0, 0); display: none; outline: none; + pointer-events: auto; } #chatinput:focus { @@ -161,18 +167,20 @@ class ChatBox extends LitElement { } enableChat (initialText = '') { + if (this.inChat) { + hideCurrentModal() + return + } + const chat = this.shadowRoot.getElementById('chat-messages') /** @type {HTMLInputElement} */ // @ts-ignore const chatInput = this.shadowRoot.getElementById('chatinput') - this.shadowRoot.getElementById('chat-wrapper2').classList.toggle('input-mobile', miscUiState.currentTouch) - this.shadowRoot.getElementById('chat-wrapper').classList.toggle('display-mobile', miscUiState.currentTouch) - showModal(this) // Exit the pointer lock - document.exitPointerLock() + document.exitPointerLock?.() // Show chat input chatInput.style.display = 'block' // Show extended chat history @@ -403,13 +411,13 @@ class ChatBox extends LitElement { render () { return html` -
    +
    ${repeat(isCypress() ? [] : this.messages, (m) => m.id, (m) => this.renderMessage(m))}
    -
    +
    diff --git a/src/reactUi.jsx b/src/reactUi.jsx index da2b3b2d5..662ba5cb9 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -84,7 +84,7 @@ function InventoryWrapper() { useEffect(() => { if (isInventoryOpen) { - document.exitPointerLock() + document.exitPointerLock?.() } }, [isInventoryOpen]) From ae8a2af095059c73190c1c5fab975207da62d59e Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Tue, 29 Aug 2023 10:26:09 +0300 Subject: [PATCH 137/318] feat: world loading on ios (support zip files)! --- .vscode/launch.json | 8 +++- package.json | 1 + src/browserfs.js | 77 ++++++++++++++++++++++++++++++++++ src/dragndrop.ts | 14 ++++--- src/loadFolder.ts | 9 ++-- src/menus/components/button.js | 4 +- src/menus/title_screen.js | 45 ++++++++++++++++---- 7 files changed, 138 insertions(+), 20 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index bdc147891..7b9f4733f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,6 +7,7 @@ "address": "localhost", "name": "Attach Chrome", "request": "attach", + // comment if using webpack "pathMapping": { "/": "${workspaceFolder}/dist" }, @@ -24,10 +25,13 @@ }, { // not recommended as in most cases it will slower as it launches from extension host so it slows down extension host, not sure why - "type": "msedge", - "name": "Launch Edge", + "type": "chrome", + "name": "Launch Chrome", "request": "launch", "url": "http://localhost:8080/", + "pathMapping": { + "/": "${workspaceFolder}/dist" + }, "outFiles": [ "${workspaceFolder}/dist/**/*.js", // "!${workspaceFolder}/dist/**/*vendors*", diff --git a/package.json b/package.json index 153f55007..9852ed0c8 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "express": "^4.18.2", "fs-extra": "^11.1.1", "iconify-icon": "^1.0.8", + "jszip": "^3.10.1", "lit": "^2.8.0", "minecraft-data": "^3.0.0", "net-browserify": "github:PrismarineJS/net-browserify", diff --git a/src/browserfs.js b/src/browserfs.js index ff1baa17d..b2140c0a0 100644 --- a/src/browserfs.js +++ b/src/browserfs.js @@ -1,6 +1,8 @@ //@ts-check import { fsState, loadFolder } from './loadFolder' import { oneOf } from '@zardoy/utils' +import JSZip from 'jszip' + const { promisify } = require('util') const browserfs = require('browserfs') const fs = require('fs') @@ -28,6 +30,9 @@ fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat', 'mk // Write methods // todo issue one-time warning (in chat I guess) if (oneOf(p, 'writeFile', 'mkdir', 'rename') && fsState.isReadonly) return + if (p === 'open' && fsState.isReadonly) { + args[1] = 'r' // read-only, zipfs throw otherwise + } //@ts-ignore return target[p](...args) } @@ -39,6 +44,11 @@ fs.promises.open = async (...args) => { return { ...Object.fromEntries(['read', 'write', 'close'].map(x => [x, async (...args) => { return await new Promise(resolve => { + // todo it results in world corruption on interactions eg block placements + if (x === 'write' && fsState.isReadonly) { + return resolve({ buffer: Buffer.from([]), bytesRead: 0 }) + } + fs[x](fd, ...args, (err, bytesRead, buffer) => { if (err) throw err // todo if readonly probably there is no need to open at all (return some mocked version - check reload)? @@ -111,3 +121,70 @@ export const openWorldDirectory = async (/** @type {FileSystemDirectoryHandle?} fsState.syncFs = false loadFolder() } + +export const openWorldZip = async (/** @type {File} */file) => { + await new Promise(async resolve => { + browserfs.configure({ + // todo + fs: 'MountableFileSystem', + options: { + "/world": { + fs: "ZipFS", + options: { + zipData: Buffer.from(await file.arrayBuffer()), + name: file.name + } + } + }, + }, (e) => { + if (e) throw e + resolve() + }) + }) + + fsState.isReadonly = true + fsState.syncFs = true + + if (fs.existsSync('/world/level.dat')) { + loadFolder() + } else { + const dirs = fs.readdirSync('/world') + let availableWorlds = [] + for (const dir of dirs) { + if (fs.existsSync(`/world/${dir}/level.dat`)) { + availableWorlds.push(dir) + } + } + + if (availableWorlds.length === 0) { + alert('No worlds found in the zip') + return + } + + if (availableWorlds.length === 1) { + loadFolder(`/world/${availableWorlds[0]}`) + } + + alert(`${availableWorlds.length} worlds found in the zip, please select one!`) + // todo prompt picker + // const selectWorld + } +} + +export async function generateZipAndWorld () { + const zip = new JSZip() + + zip.folder('world') + + // Generate the ZIP archive content + const zipContent = await zip.generateAsync({ type: "blob" }) + + // Create a download link and trigger the download + const downloadLink = document.createElement("a") + downloadLink.href = URL.createObjectURL(zipContent) + downloadLink.download = "prismarine-world.zip" + downloadLink.click() + + // Clean up the URL object after download + URL.revokeObjectURL(downloadLink.href) +} diff --git a/src/dragndrop.ts b/src/dragndrop.ts index af2dbf018..37030b504 100644 --- a/src/dragndrop.ts +++ b/src/dragndrop.ts @@ -1,7 +1,7 @@ import * as nbt from 'prismarine-nbt' import { promisify } from 'util' import { showNotification } from './menus/notification' -import { openWorldDirectory } from './browserfs'; +import { openWorldDirectory, openWorldZip } from './browserfs'; import { isGameActive } from './globalState'; const parseNbt = promisify(nbt.parse); @@ -22,12 +22,16 @@ window.addEventListener("drop", async e => { // todo support drop save folder const { items } = e.dataTransfer const item = items[0] - const filehandle = await item.getAsFileSystemHandle() + const filehandle = await item.getAsFileSystemHandle() as FileSystemFileHandle | FileSystemDirectoryHandle if (filehandle.kind === 'file') { - console.log(filehandle) - const file = item.getAsFile(); - const buffer = await file.arrayBuffer() + const file = await filehandle.getFile() + if (file.name.endsWith('.zip')) { + openWorldZip(file) + return + } + + const buffer = await file.arrayBuffer() const parsed = await parseNbt(Buffer.from(buffer)) showNotification({ message: `${file.name} data available in browser console`, diff --git a/src/loadFolder.ts b/src/loadFolder.ts index db48377af..491822f70 100644 --- a/src/loadFolder.ts +++ b/src/loadFolder.ts @@ -15,12 +15,12 @@ export const fsState = proxy({ const PROPOSE_BACKUP = true -export const loadFolder = async () => { +export const loadFolder = async (root = '/world') => { // todo-low cache reading const warnings: string[] = [] let levelDatContent try { - levelDatContent = await fs.promises.readFile('/world/level.dat') + levelDatContent = await fs.promises.readFile(`${root}/level.dat`) } catch (err) { if (err.code === 'ENOENT') { if (!fsState.isReadonly) { @@ -97,7 +97,10 @@ export const loadFolder = async () => { document.querySelector('#title-screen').dispatchEvent(new CustomEvent('singleplayer', { // todo check gamemode level.dat data etc detail: { - version + version, + ...root !== '/world' ? { + 'worldFolder': root + } : {} }, })) } diff --git a/src/menus/components/button.js b/src/menus/components/button.js index 185e75147..dbbb693a5 100644 --- a/src/menus/components/button.js +++ b/src/menus/components/button.js @@ -150,9 +150,9 @@ class Button extends LitElement { ` } - onBtnClick () { + onBtnClick (e) { playSound('click_stereo.mp3') - this.dispatchEvent(new window.CustomEvent('pmui-click')) + this.dispatchEvent(new window.CustomEvent('pmui-click', { detail: e, })) } } diff --git a/src/menus/title_screen.js b/src/menus/title_screen.js index 204f0f86c..fd7bf9637 100644 --- a/src/menus/title_screen.js +++ b/src/menus/title_screen.js @@ -1,9 +1,12 @@ -const { openWorldDirectory } = require('../browserfs') +const { openWorldDirectory, openWorldZip } = require('../browserfs') const { showModal } = require('../globalState') const { fsState } = require('../loadFolder') const { openURL } = require('./components/common') const { LitElement, html, css } = require('lit') +// const SUPPORT_WORLD_LOADING = !!window.showDirectoryPicker +const SUPPORT_WORLD_LOADING = true + class TitleScreen extends LitElement { static get styles () { return css` @@ -148,16 +151,42 @@ class TitleScreen extends LitElement {
    showModal(document.getElementById('play-screen'))}>
    - { + { this.style.display = 'none' - Object.assign(fsState, { - isReadonly: false, - syncFs: true, - }) + Object.assign(fsState, { + isReadonly: false, + syncFs: true, + }) this.dispatchEvent(new window.CustomEvent('singleplayer', {})) }}> - ${window['showDirectoryPicker'] ? html` { - openWorldDirectory() + ${SUPPORT_WORLD_LOADING ? html` { + if (!!window.showDirectoryPicker && !e.shiftKey) { + openWorldDirectory() + } else { + // create and show input picker + /** @type {HTMLInputElement} */ + let picker = document.body.querySelector('input#file-zip-picker') + if (!picker) { + picker = document.createElement('input') + picker.type = 'file' + picker.accept = '.zip' + + picker.addEventListener('change', () => { + const file = picker.files[0] + picker.value = '' + if (!file) return + if (!file.name.endsWith('.zip')) { + const doContinue = confirm(`Are you sure ${file.name.slice(-20)} is .zip file? Only .zip files are supported. Continue?`) + if (!doContinue) return + } + openWorldZip(file) + }) + picker.hidden = true + document.body.appendChild(picker) + } + + picker.click() + } }}>` : ''}
    showModal(document.getElementById('options-screen'))}> From c7a38a7bc3372b42d52c3b46a8cef4712c223083 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 29 Aug 2023 15:32:51 +0300 Subject: [PATCH 138/318] implement /save and /export commands to export singleplayer worlds! - remove warnings --- src/builtinCommands.ts | 97 +++++++++++++++++++++++++++++++++++++++ src/chat.js | 15 ++++-- src/dragndrop.ts | 8 ++-- src/globalState.js | 6 +-- src/index.js | 2 +- src/menus/pause_screen.js | 13 ++---- 6 files changed, 122 insertions(+), 19 deletions(-) create mode 100644 src/builtinCommands.ts diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts new file mode 100644 index 000000000..518e0d14f --- /dev/null +++ b/src/builtinCommands.ts @@ -0,0 +1,97 @@ +import JSZip from 'jszip' +import fs from 'fs' +import { join } from 'path' +import { fsState } from './loadFolder' + +const notImplemented = () => { + return 'Not implemented yet' +} + +async function addFolderToZip(folderPath, zip, relativePath) { + const entries = await fs.promises.readdir(folderPath) + + for (const entry of entries) { + const entryPath = join(folderPath, entry) + const stats = await fs.promises.stat(entryPath) + + const zipEntryPath = join(relativePath, entry) + + if (stats.isDirectory()) { + const subZip = zip.folder(zipEntryPath) + await addFolderToZip(entryPath, subZip, zipEntryPath) + } else { + const fileData = await fs.promises.readFile(entryPath) + zip.file(entry, fileData) + } + } +} + + +// todo include in help +const commands = [ + { + command: ['/download', '/export'], + invoke: async () => { + // todo issue into chat warning if fs is writable! + const zip = new JSZip() + let worldFolder: string = singlePlayerServer.options.worldFolder + if (!worldFolder.startsWith('/')) worldFolder = `/${worldFolder}` + await addFolderToZip(worldFolder, zip, '') + + // Generate the ZIP archive content + const zipContent = await zip.generateAsync({ type: "blob" }) + + // Create a download link and trigger the download + const downloadLink = document.createElement("a") + downloadLink.href = URL.createObjectURL(zipContent) + downloadLink.download = "world-exported.zip" + downloadLink.click() + + // Clean up the URL object after download + URL.revokeObjectURL(downloadLink.href) + } + }, + { + command: ['/publish'], + // todo + invoke: notImplemented + }, + { + command: '/reset-world -y', + invoke: async () => { + if (fsState.isReadonly || !fsState.syncFs) return + // todo for testing purposes + sessionStorage.oldData = localStorage + singlePlayerServer.quit() + // todo browserfs bug + fs.rmdirSync(singlePlayerServer.options.worldFolder, { recursive: true }) + } + }, + { + command: ['/save'], + invoke: () => { + saveWorld() + } + } +] + +export const tryHandleBuiltinCommand = (message) => { + if (!singlePlayerServer) return + + for (const command of commands) { + if (command.command.includes(message)) { + command.invoke() + return true + } + } +} + +export const saveWorld = async () => { + for (const player of window.singlePlayerServer.players) { + await player.save() + } + const worlds = [singlePlayerServer.overworld] + for (const world of worlds) { + await world.storageProvider.close() + } +} diff --git a/src/chat.js b/src/chat.js index 195ce54ea..7ee032d86 100644 --- a/src/chat.js +++ b/src/chat.js @@ -5,6 +5,8 @@ const { activeModalStack, hideCurrentModal, showModal, miscUiState } = require(' import { repeat } from 'lit/directives/repeat.js' import { classMap } from 'lit/directives/class-map.js' import { isCypress } from './utils' +import { tryHandleBuiltinCommand } from './builtinCommands' +import { notification } from './menus/notification' const styles = { black: 'color:#000000', @@ -172,6 +174,7 @@ class ChatBox extends LitElement { return } + notification.show = false const chat = this.shadowRoot.getElementById('chat-messages') /** @type {HTMLInputElement} */ // @ts-ignore @@ -250,9 +253,15 @@ class ChatBox extends LitElement { e.stopPropagation() if (e.code === 'Enter') { - this.chatHistory.push(chatInput.value) - window.sessionStorage.chatHistory = JSON.stringify(this.chatHistory) - client.write('chat', { message: chatInput.value }) + const message = chatInput.value + if (message) { + this.chatHistory.push(message) + window.sessionStorage.chatHistory = JSON.stringify(this.chatHistory) + const builtinHandled = tryHandleBuiltinCommand(message) + if (!builtinHandled) { + client.write('chat', { message }) + } + } hideCurrentModal() } }) diff --git a/src/dragndrop.ts b/src/dragndrop.ts index 37030b504..3b62e307c 100644 --- a/src/dragndrop.ts +++ b/src/dragndrop.ts @@ -1,10 +1,10 @@ import * as nbt from 'prismarine-nbt' import { promisify } from 'util' import { showNotification } from './menus/notification' -import { openWorldDirectory, openWorldZip } from './browserfs'; -import { isGameActive } from './globalState'; +import { openWorldDirectory, openWorldZip } from './browserfs' +import { isGameActive } from './globalState' -const parseNbt = promisify(nbt.parse); +const parseNbt = promisify(nbt.parse) window.nbt = nbt; // todo display drop zone @@ -37,7 +37,7 @@ window.addEventListener("drop", async e => { message: `${file.name} data available in browser console`, }) console.log('raw', parsed) - console.log('simplified', nbt.simplify(parsed).Data) + console.log('simplified', nbt.simplify(parsed)) } else { if (isGameActive(false)) { alert('Exit current world first, before loading a new one.') diff --git a/src/globalState.js b/src/globalState.js index 5de0fc420..498312b5e 100644 --- a/src/globalState.js +++ b/src/globalState.js @@ -112,7 +112,9 @@ export const miscUiState = proxy({ singleplayer: false }) -// state that is not possible to get via bot +window.miscUiState = miscUiState + +// state that is not possible to get via bot and in-game specific export const gameAdditionalState = proxy({ isFlying: false, isSprinting: false, @@ -149,5 +151,3 @@ window.addEventListener('beforeunload', (event) => { event.returnValue = '' // Required for some browsers return 'The game is running. Are you sure you want to close this page?' }) - -window.miscUiState = miscUiState diff --git a/src/index.js b/src/index.js index 7bd88baf6..da3c95f4a 100644 --- a/src/index.js +++ b/src/index.js @@ -10,7 +10,7 @@ require('iconify-icon') require('./chat') // workaround for mineflayer -process.versions.node = '14.0.0' +process.versions.node = '18.0.0' require('./menus/components/button') require('./menus/components/edit_box') diff --git a/src/menus/pause_screen.js b/src/menus/pause_screen.js index 3668a7bb1..a2290d06a 100644 --- a/src/menus/pause_screen.js +++ b/src/menus/pause_screen.js @@ -1,8 +1,11 @@ +//@ts-check const { LitElement, html, css } = require('lit') const { openURL } = require('./components/common') const { hideCurrentModal, showModal } = require('../globalState') const { fsState } = require('../loadFolder') const { subscribe } = require('valtio') +const { saveWorld } = require('../builtinCommands') +const { notification } = require('./notification') class PauseScreen extends LitElement { static get styles () { @@ -69,14 +72,8 @@ class PauseScreen extends LitElement { showModal(document.getElementById('options-screen'))}> { if (window.singlePlayerServer) { - for (const player of window.singlePlayerServer.players) { - const worlds = [singlePlayerServer.overworld] - for (const world of worlds) { - await world.storageProvider.close() - } - await player.save() - singlePlayerServer.quit() - } + await saveWorld() + singlePlayerServer.quit() } bot._client.emit('end') }}> From 3551bedaaa4e7e3b8abdb06e2b3d25dfb5426826 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 29 Aug 2023 15:40:46 +0300 Subject: [PATCH 139/318] first inventory work on servers (left click support for now) allow to override local username next: support level.dat player data --- esbuild.mjs | 3 +++ src/botControls.js | 2 +- src/createLocalServer.js | 4 ++++ src/globalState.js | 2 ++ src/index.js | 18 +++++++++++++----- src/menus/title_screen.js | 4 +++- src/optionsStorage.js | 3 ++- src/reactUi.jsx | 4 +--- 8 files changed, 29 insertions(+), 11 deletions(-) diff --git a/esbuild.mjs b/esbuild.mjs index b664ea129..9487e7c64 100644 --- a/esbuild.mjs +++ b/esbuild.mjs @@ -51,6 +51,8 @@ const ctx = await esbuild.context({ bundle: true, entryPoints: ['src/index.js'], target: ['es2020'], + jsx: 'automatic', + jsxDev: dev, // logLevel: 'debug', logLevel: 'info', platform: 'browser', @@ -85,6 +87,7 @@ const ctx = await esbuild.context({ ], minify: process.argv.includes('--minify'), define: { + 'process.env.NODE_ENV': JSON.stringify(dev ? 'development' : 'production'), 'process.env.BUILD_VERSION': JSON.stringify(!dev ? buildingVersion : 'undefined'), 'process.env.GITHUB_URL': JSON.stringify(`https://github.com/${process.env.GITHUB_REPOSITORY || `${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}`}`) diff --git a/src/botControls.js b/src/botControls.js index 5ff0bad3f..ec7e0ffaa 100644 --- a/src/botControls.js +++ b/src/botControls.js @@ -88,7 +88,7 @@ document.addEventListener('keydown', (e) => { switch (km.defaultKey) { case 'KeyE': // todo reenable - // showModal({ reactType: 'inventory', }) + showModal({ reactType: 'inventory', }) // todo seems to be workaround // avoid calling inner keybinding listener, but should be handled there e.stopImmediatePropagation() diff --git a/src/createLocalServer.js b/src/createLocalServer.js index d98c96519..534d1cf45 100644 --- a/src/createLocalServer.js +++ b/src/createLocalServer.js @@ -6,3 +6,7 @@ export const startLocalServer = () => { const server = mcServer.createMCServer({ ...serverOptions, Server: LocalServer }) return server } + +// features that flying-squid doesn't support at all +// todo move & generate in flying-squid +export const unsupportedLocalServerFeatures = ['transactionPacketExists', 'teleportUsesOwnPacket'] diff --git a/src/globalState.js b/src/globalState.js index 498312b5e..b28083da7 100644 --- a/src/globalState.js +++ b/src/globalState.js @@ -138,6 +138,8 @@ window.addEventListener('unload', (e) => { savePlayers() }) +window.inspectPlayer = () => require('fs').promises.readFile('/world/playerdata/9e487d23-2ffc-365a-b1f8-f38203f59233.dat').then(window.nbt.parse).then(console.log) + // todo move from global state window.addEventListener('beforeunload', (event) => { // todo-low maybe exclude chat? diff --git a/src/index.js b/src/index.js index da3c95f4a..edfa44daa 100644 --- a/src/index.js +++ b/src/index.js @@ -56,7 +56,7 @@ const { activeModalStack, showModal, hideModal, hideCurrentModal, activeModalSta const { pointerLock, goFullscreen, toNumber, isCypress } = require('./utils') const { notification } = require('./menus/notification') const { removePanorama, addPanoramaCubeMap, initPanoramaOptions } = require('./panorama') -const { startLocalServer } = require('./createLocalServer') +const { startLocalServer, unsupportedLocalServerFeatures } = require('./createLocalServer') const serverOptions = require('./defaultLocalServerOptions') const { customCommunication } = require('./customServer') const { default: updateTime } = require('./updateTime') @@ -211,7 +211,7 @@ async function main () { }) const connectSingleplayer = (serverOverrides = {}) => { // todo clean - connect({ server: '', port: '', proxy: '', singleplayer: true, username: 'wanderer', password: '', serverOverrides }) + connect({ server: '', port: '', proxy: '', singleplayer: true, username: options.localUsername, password: '', serverOverrides }) } document.querySelector('#title-screen').addEventListener('singleplayer', (e) => { //@ts-ignore @@ -387,6 +387,14 @@ async function connect (connectOptions) { closeTimeout: 240 * 1000 }) if (singeplayer) { + const _supportFeature = bot.supportFeature + bot.supportFeature = (feature) => { + if (unsupportedLocalServerFeatures.includes(feature)) { + return false + } + return _supportFeature(feature) + } + bot.emit('inject_allowed') bot._client.emit('connect') } @@ -538,7 +546,7 @@ async function connect (connectOptions) { let capturedPointer registerListener(document, 'pointerdown', (e) => { const clickedEl = e.composedPath()[0] - if (!isGameActive(true) || !miscUiState.currentTouch || clickedEl !== cameraControlEl || capturedPointer) { + if (!isGameActive(true) || !miscUiState.currentTouch || clickedEl !== cameraControlEl || capturedPointer || e.pointerId === undefined) { return } cameraControlEl.setPointerCapture(e.pointerId) @@ -557,7 +565,7 @@ async function connect (connectOptions) { }, touchStartBreakingBlockMs) }) registerListener(document, 'pointermove', (e) => { - if (e.pointerId !== capturedPointer?.id) return + if (e.pointerId === undefined || e.pointerId !== capturedPointer?.id) return window.scrollTo(0, 0) e.preventDefault() e.stopPropagation() @@ -576,7 +584,7 @@ async function connect (connectOptions) { }, { passive: false }) registerListener(document, 'lostpointercapture', (e) => { - if (e.pointerId !== capturedPointer?.id) return + if (e.pointerId === undefined || e.pointerId !== capturedPointer?.id) return clearTimeout(virtualClickTimeout) virtualClickTimeout = undefined diff --git a/src/menus/title_screen.js b/src/menus/title_screen.js index fd7bf9637..f1d8a52b5 100644 --- a/src/menus/title_screen.js +++ b/src/menus/title_screen.js @@ -128,7 +128,9 @@ class TitleScreen extends LitElement { this.versionStatus = '' this.versionTitle = '' this.isOutdated = false - if (process.env.NODE_ENV !== 'development') { + if (process.env.NODE_ENV === 'development') { + this.versionStatus = '(dev)' + } else { fetch('./version.txt').then(async (f) => { if (f.status === 404) return const contents = await f.text() diff --git a/src/optionsStorage.js b/src/optionsStorage.js index 5bc671d75..07bb090a1 100644 --- a/src/optionsStorage.js +++ b/src/optionsStorage.js @@ -15,7 +15,8 @@ const defaultOptions = { excludeCommunicationDebugEvents: [], preventDevReloadWhilePlaying: false, numWorkers: 4, - localServerOptions: {} + localServerOptions: {}, + localUsername: 'wanderer', } export const options = proxy( diff --git a/src/reactUi.jsx b/src/reactUi.jsx index 662ba5cb9..4413d7b22 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -97,7 +97,7 @@ function InventoryWrapper() { useEffect(() => { bot.inventory.on('updateSlot', () => { - setSlots(bot.inventory.slots) + setSlots([...bot.inventory.slots]) }) // todo need to think of better solution window['mcData'] = require('minecraft-data')(bot.version) @@ -119,8 +119,6 @@ function InventoryWrapper() { `}> { bot.moveSlotItem(oldSlot, newSlotIndex) - // bot.inventory.selectedItem - // bot.inventory.updateSlot(oldSlot, ) } } />
    } From 3c6af4620b8f8798a3ca39cc7d309dd1e8c59569 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 30 Aug 2023 10:07:03 +0300 Subject: [PATCH 140/318] add a way to reset world when loading errored or disconnected --- src/browserfs.js | 18 ++++++++++++ src/builtinCommands.ts | 42 +++++++++++++++------------- src/index.js | 6 ++-- src/menus/loading_or_error_screen.js | 11 +++++++- 4 files changed, 53 insertions(+), 24 deletions(-) diff --git a/src/browserfs.js b/src/browserfs.js index b2140c0a0..03c73b152 100644 --- a/src/browserfs.js +++ b/src/browserfs.js @@ -2,6 +2,7 @@ import { fsState, loadFolder } from './loadFolder' import { oneOf } from '@zardoy/utils' import JSZip from 'jszip' +import { join } from 'path' const { promisify } = require('util') const browserfs = require('browserfs') @@ -77,6 +78,23 @@ fs.promises.open = async (...args) => { } } +// for testing purposes, todo move it to core patch +const removeFileRecursiveSync = (path) => { + fs.readdirSync(path).forEach((file) => { + const curPath = join(path, file) + if (fs.lstatSync(curPath).isDirectory()) { + // recurse + removeFileRecursiveSync(curPath) + fs.rmdirSync(curPath) + } else { + // delete file + fs.unlinkSync(curPath) + } + }) +} + +window.removeFileRecursiveSync = removeFileRecursiveSync + const SUPPORT_WRITE = true export const openWorldDirectory = async (/** @type {FileSystemDirectoryHandle?} */dragndropHandle = undefined) => { diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts index 518e0d14f..61de33661 100644 --- a/src/builtinCommands.ts +++ b/src/builtinCommands.ts @@ -28,28 +28,32 @@ async function addFolderToZip(folderPath, zip, relativePath) { // todo include in help -const commands = [ - { - command: ['/download', '/export'], - invoke: async () => { - // todo issue into chat warning if fs is writable! - const zip = new JSZip() - let worldFolder: string = singlePlayerServer.options.worldFolder - if (!worldFolder.startsWith('/')) worldFolder = `/${worldFolder}` - await addFolderToZip(worldFolder, zip, '') +const exportWorld = async () => { + // todo issue into chat warning if fs is writable! + const zip = new JSZip() + let worldFolder: string = singlePlayerServer.options.worldFolder + if (!worldFolder.startsWith('/')) worldFolder = `/${worldFolder}` + await addFolderToZip(worldFolder, zip, '') - // Generate the ZIP archive content - const zipContent = await zip.generateAsync({ type: "blob" }) + // Generate the ZIP archive content + const zipContent = await zip.generateAsync({ type: "blob" }) - // Create a download link and trigger the download - const downloadLink = document.createElement("a") - downloadLink.href = URL.createObjectURL(zipContent) - downloadLink.download = "world-exported.zip" - downloadLink.click() + // Create a download link and trigger the download + const downloadLink = document.createElement("a") + downloadLink.href = URL.createObjectURL(zipContent) + downloadLink.download = "world-exported.zip" + downloadLink.click() - // Clean up the URL object after download - URL.revokeObjectURL(downloadLink.href) - } + // Clean up the URL object after download + URL.revokeObjectURL(downloadLink.href) +} + +window.exportWorld = exportWorld + +const commands = [ + { + command: ['/download', '/export'], + invoke: exportWorld }, { command: ['/publish'], diff --git a/src/index.js b/src/index.js index edfa44daa..3060c3706 100644 --- a/src/index.js +++ b/src/index.js @@ -48,7 +48,7 @@ const nbt = require('prismarine-nbt') const pathfinder = require('mineflayer-pathfinder') const { Vec3 } = require('vec3') -const Cursor = require('./cursor') +const Cursor = require('./cursor').default //@ts-ignore global.THREE = require('three') const { initVR } = require('./vr') @@ -449,9 +449,7 @@ async function connect (connectOptions) { const d = subscribeKey(options, 'renderDistance', () => { singlePlayerServer.options['view-distance'] = options.renderDistance worldView.viewDistance = options.renderDistance - if (miscUiState.singleplayer) { - window.onPlayerChangeRenderDistance?.(options.renderDistance) - } + window.onPlayerChangeRenderDistance?.(options.renderDistance) }) disposables.push(d) } diff --git a/src/menus/loading_or_error_screen.js b/src/menus/loading_or_error_screen.js index dfbf36609..9519179ea 100644 --- a/src/menus/loading_or_error_screen.js +++ b/src/menus/loading_or_error_screen.js @@ -2,8 +2,9 @@ const { LitElement, html, css } = require('lit') const { commonCss } = require('./components/common') const { addPanoramaCubeMap } = require('../panorama') -const { hideModal, activeModalStacks, activeModalStack, replaceActiveModalStack } = require('../globalState') +const { hideModal, activeModalStacks, activeModalStack, replaceActiveModalStack, miscUiState } = require('../globalState') const { guessProblem } = require('../guessProblem') +const { fsState } = require('../loadFolder') class LoadingErrorScreen extends LitElement { static get styles () { @@ -84,6 +85,14 @@ class LoadingErrorScreen extends LitElement { } document.getElementById('play-screen').style.display = 'block' addPanoramaCubeMap() + }}> { + if (!confirm('Are you sure you want to delete all local world content?')) return + for (const key of Object.keys(localStorage)) { + if (/^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/g.test(key) || key === '/') { + localStorage.removeItem(key) + } + } + window.location.reload() }}> window.location.reload()} pmui-label="Full Reload" pmui-width="200px">
    ` : '' } From b9c7f1f68b7aca6b51bc2164d55819b16b518c2f Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 30 Aug 2023 10:43:21 +0300 Subject: [PATCH 141/318] use custom mc loader to drop a few mb of bundle & allow to specify allowlist for faster dev builds (will be cached in future) --- .gitignore | 1 + esbuild.mjs | 18 ++++++-- scripts/esbuildPlugins.mjs | 87 ++++++++++++++++++++++++++++++++++---- scripts/patchPackages.js | 27 ------------ 4 files changed, 94 insertions(+), 39 deletions(-) delete mode 100644 scripts/patchPackages.js diff --git a/.gitignore b/.gitignore index 1a3c5c10d..23b666f87 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ public .env.local Thumbs.db build +localSettings.mjs dist .DS_Store .idea/ diff --git a/esbuild.mjs b/esbuild.mjs index 9487e7c64..c6760785b 100644 --- a/esbuild.mjs +++ b/esbuild.mjs @@ -31,11 +31,16 @@ let baseConfig = {} // outdir: undefined, // } +try { + await import('./localSettings.mjs') +} catch { } + fs.copyFileSync('index.html', 'dist/index.html') fs.writeFileSync('dist/index.html', fs.readFileSync('dist/index.html', 'utf8').replace('', ''), 'utf8') -const dev = process.argv.includes('--watch') || process.argv.includes('-w') +const watch = process.argv.includes('--watch') || process.argv.includes('-w') const prod = process.argv.includes('--prod') +const dev = !prod const banner = [ 'window.global = globalThis;', @@ -64,7 +69,7 @@ const ctx = await esbuild.context({ keepNames: true, ...baseConfig, banner: { - js: banner.join('\n') + js: banner.join('\n'), }, alias: { events: 'events', // make explicit @@ -92,10 +97,15 @@ const ctx = await esbuild.context({ 'process.env.GITHUB_URL': JSON.stringify(`https://github.com/${process.env.GITHUB_REPOSITORY || `${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}`}`) }, - // chunkNames: '[name]', + loader: { + '.png': 'dataurl' + }, + write: false, + // todo would be better to enable? + // preserveSymlinks: true, }) -if (dev) { +if (watch) { await ctx.watch() server.app.get('/esbuild', (req, res, next) => { res.writeHead(200, { diff --git a/scripts/esbuildPlugins.mjs b/scripts/esbuildPlugins.mjs index 7bb3b2b20..c415db3d0 100644 --- a/scripts/esbuildPlugins.mjs +++ b/scripts/esbuildPlugins.mjs @@ -5,7 +5,8 @@ import { join, dirname } from 'path' import * as fs from 'fs' import { filesize } from 'filesize' -let clients = [] +const prod = process.argv.includes('--prod') +let connectedClients = [] /** @type {import('esbuild').Plugin[]} */ const plugins = [ @@ -62,11 +63,20 @@ const plugins = [ } }, { - name: 'assets-resolve', + name: 'data-assets', setup (build) { + const customMcDataNs = 'custom-mc-data' + build.onResolve({ filter: /.*/, }, async ({ path, ...rest }) => { + if (join(rest.resolveDir, path).replaceAll('\\', '/').endsWith('minecraft-data/data.js')) { + return { + namespace: customMcDataNs, + path + } + } + if (path.includes('stage')) return if (['.woff', '.woff2', '.ttf', '.png', '.jpg', '.jpeg', '.gif', '.svg'].some(ext => path.endsWith(ext))) { return { path, @@ -75,8 +85,67 @@ const plugins = [ } } }) - build.onEnd(({ metafile, outputFiles }) => { - const prod = process.argv.includes('--prod') + + build.onLoad({ + filter: /.*/, + namespace: customMcDataNs, + }, async ({ path, ...rest }) => { + const resolvedPath = await build.resolve('minecraft-data/minecraft-data/data/dataPaths.json', { kind: 'require-call', resolveDir: process.cwd() }) + const dataPaths = JSON.parse(await fs.promises.readFile(resolvedPath.path, 'utf8')) + + // bedrock unsupported + delete dataPaths.bedrock + + const allowOnlyList = process.env.ONLY_MC_DATA?.split(',') ?? [] + + // skip data for 0.30c, snapshots and pre-releases + const ignoredVersionsRegex = /(^0\.30c$)|w|-pre|-rc/ + + const includedVersions = [] + let contents = 'module.exports =\n{\n' + for (const platform of Object.keys(dataPaths)) { + contents += ` '${platform}': {\n` + for (const version of Object.keys(dataPaths[platform])) { + if (allowOnlyList.length && !allowOnlyList.includes(version)) continue + if (ignoredVersionsRegex.test(version)) continue + + includedVersions.push(version) + contents += ` '${version}': {\n` + for (const dataType of Object.keys(dataPaths[platform][version])) { + const loc = `minecraft-data/data/${dataPaths[platform][version][dataType]}/` + contents += ` get ${dataType} () { return require("./${loc}${dataType}.json") },\n` + } + contents += ' },\n' + } + contents += ' },\n' + } + contents += '}\n' + + if (prod) { + console.log('Included mc-data versions:', includedVersions) + } + return { + contents, + loader: 'js', + resolveDir: join(dirname(resolvedPath.path), '../..'), + } + }) + + build.onEnd(async ({ metafile, outputFiles }) => { + // write outputFiles + for (const file of outputFiles) { + // if (file.path.endsWith('index.js.map')) { + // const map = JSON.parse(file.text) + // map.sourcesContent = map.sourcesContent.map((c, index) => { + // if (map.sources[index].endsWith('.json')) return '' + // return c + // }) + // // data.sources = data.sources.filter(source => !source.endsWith('.json')) + // await fs.promises.writeFile(file.path, JSON.stringify(map), 'utf8') + // } else { + await fs.promises.writeFile(file.path, file.contents) + // } + } if (!prod) return // const deps = Object.entries(metafile.inputs).sort(([, a], [, b]) => b.bytes - a.bytes).map(([x, { bytes }]) => [x, filesize(bytes)]).slice(0, 5) //@ts-ignore @@ -116,22 +185,24 @@ const plugins = [ }) build.onEnd(({ errors, outputFiles, metafile, warnings }) => { const elapsed = Date.now() - time + // write metafile to disk if needed + // fs.writeFileSync('dist/meta.json', JSON.stringify(metafile, null, 2)) console.log(`Done in ${elapsed}ms`) if (count++ === 0) { return } if (errors.length) { - clients.forEach((res) => { + connectedClients.forEach((res) => { res.write(`data: ${JSON.stringify({ errors: errors.map(error => error.text) })}\n\n`) res.flush() }) return } - clients.forEach((res) => { + connectedClients.forEach((res) => { res.write(`data: ${JSON.stringify({ update: { time: elapsed } })}\n\n`) res.flush() }) - clients.length = 0 + connectedClients.length = 0 }) } }, @@ -236,4 +307,4 @@ const plugins = [ }) ] -export { plugins, clients } +export { plugins, connectedClients as clients } diff --git a/scripts/patchPackages.js b/scripts/patchPackages.js deleted file mode 100644 index 9cdd9f09d..000000000 --- a/scripts/patchPackages.js +++ /dev/null @@ -1,27 +0,0 @@ -//@ts-check -const path = require('path') -const dataPath = path.join(require.resolve('minecraft-data'), '../data.js') - -const fs = require('fs') - -const lines = fs.readFileSync(dataPath, 'utf8').split('\n') -if (lines[0] === '//patched') { - console.log('Already patched') - process.exit(0) -} - -function removeLinesBetween (start, end) { - let startIndex = lines.findIndex(line => line === start) - if (startIndex === -1) return - let endIndex = startIndex + lines.slice(startIndex).findIndex(line => line === end) - // insert block comments - lines.splice(startIndex, 0, `/*`) - lines.splice(endIndex + 2, 0, `*/`) -} - -// todo removing bedrock support for now, will optiimze in future instead -removeLinesBetween(" 'bedrock': {", ' }') - -lines.unshift('//patched') -// fs.writeFileSync(path.join(dataPath, '../dataGlobal.js'), newContents, 'utf8') -fs.writeFileSync(dataPath, lines.join('\n'), 'utf8') From 6fcdaedd960442b6f7a9e13b3d42886c26b945fb Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 30 Aug 2023 10:53:58 +0300 Subject: [PATCH 142/318] copy only entity textures, inline others! it reduces copy time and deploy size --- esbuild.mjs | 1 + package.json | 4 ++-- scripts/build.js | 18 +++++++-------- scripts/esbuildPlugins.mjs | 3 +-- src/cursor.js | 35 ++++++++++++++++++++++++++---- src/globals.d.ts | 9 ++++---- src/menus/components/breath_bar.js | 7 +++--- src/menus/components/button.js | 9 +++++--- src/menus/components/food_bar.js | 5 +++-- src/menus/components/health_bar.js | 5 +++-- src/menus/components/hotbar.js | 8 ++++--- src/menus/components/slider.js | 8 ++++--- src/menus/hud.js | 11 ++++++---- src/menus/title_screen.js | 8 ++++--- src/styles.css | 2 +- 15 files changed, 88 insertions(+), 45 deletions(-) diff --git a/esbuild.mjs b/esbuild.mjs index c6760785b..43ee2b1dc 100644 --- a/esbuild.mjs +++ b/esbuild.mjs @@ -98,6 +98,7 @@ const ctx = await esbuild.context({ JSON.stringify(`https://github.com/${process.env.GITHUB_REPOSITORY || `${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}`}`) }, loader: { + // todo use external or resolve issues with duplicating '.png': 'dataurl' }, write: false, diff --git a/package.json b/package.json index 9852ed0c8..d53d7d9d0 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "start-watch-script": "nodemon -w esbuild.mjs esbuild.mjs", "build": "node scripts/build.js copyFiles && node esbuild.mjs --minify --prod", "watch": "node scripts/build.js copyFilesDev && webpack serve --config webpack.dev.js --progress", - "postinstall": "node scripts/patchPackages.js", "test:cypress": "cypress run", "test:e2e": "start-test http-get://localhost:8080 test:cypress", "prod-start": "node server.js", @@ -74,7 +73,7 @@ "https-browserify": "^1.0.0", "lodash-webpack-plugin": "^0.11.6", "memfs": "^3.5.3", - "mineflayer": "^4.11.0", + "mineflayer": "github:zardoy/mineflayer#custom", "mineflayer-pathfinder": "^2.4.4", "npm-run-all": "^4.1.5", "os-browserify": "^0.3.0", @@ -97,6 +96,7 @@ "pnpm": { "overrides": { "minecraft-data": "latest", + "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#chunk-impl-require-fix", "minecraft-protocol": "github:zardoy/minecraft-protocol#custom-client-extra" } } diff --git a/scripts/build.js b/scripts/build.js index ffd1c8dcd..9f30fd36e 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -12,7 +12,7 @@ const filesAlwaysToCopy = [ // these files could be copied at build time eg with copy plugin, but copy plugin slows down the config (2x in my testing, sometimes with too many open files error) is slow so we also copy them there const webpackFilesToCopy = [ { from: './node_modules/prismarine-viewer2/public/blocksStates/', to: 'dist/blocksStates/' }, - { from: './node_modules/prismarine-viewer2/public/textures/', to: 'dist/textures/' }, + // { from: './node_modules/prismarine-viewer2/public/textures/', to: 'dist/textures/' }, { from: './node_modules/prismarine-viewer2/public/worker.js', to: 'dist/worker.js' }, { from: './node_modules/prismarine-viewer2/public/supportedVersions.json', to: 'dist/supportedVersions.json' }, { from: './assets/', to: './dist/' }, @@ -24,6 +24,13 @@ exports.copyFiles = (isDev = false) => { [...filesAlwaysToCopy, ...webpackFilesToCopy].forEach(file => { fsExtra.copySync(file.from, file.to) }) + const cwd = './node_modules/prismarine-viewer2/public/textures/' + const files = glob.sync('{*/entity/**,*.png}', { cwd: cwd, nodir: true, }) + for (const file of files) { + const copyDest = path.join('dist/textures/', file) + fs.mkdirSync(path.dirname(copyDest), { recursive: true, }) + fs.copyFileSync(path.join(cwd, file), copyDest) + } console.timeEnd('copy files') } @@ -48,15 +55,8 @@ exports.getSwAdditionalEntries = () => { '*.png', '*.woff', 'worker.js', - // todo add gui textures (1.17.1) - // todo if we uncomment it it will spam the server with requests for textures on initial page load - // we need to put all textures into on file instead! - // `textures/${singlePlayerVersion}/**`, - `textures/${singlePlayerVersion}/blocks/destroy_stage_0.png.png`, - `textures/${singlePlayerVersion}/blocks/destroy_stage_1.png.png`, + // todo-low preload entity atlas? `textures/${singlePlayerVersion}.png`, - `textures/1.16.4/gui/widgets.png`, - `textures/1.16.4/gui/icons.png`, `textures/1.16.4/entity/squid.png`, ] const filesNeedsCacheKey = [ diff --git a/scripts/esbuildPlugins.mjs b/scripts/esbuildPlugins.mjs index c415db3d0..42ca70b9e 100644 --- a/scripts/esbuildPlugins.mjs +++ b/scripts/esbuildPlugins.mjs @@ -76,8 +76,7 @@ const plugins = [ path } } - if (path.includes('stage')) return - if (['.woff', '.woff2', '.ttf', '.png', '.jpg', '.jpeg', '.gif', '.svg'].some(ext => path.endsWith(ext))) { + if (['.woff', '.woff2', '.ttf'].some(ext => path.endsWith(ext))) { return { path, namespace: 'assets', diff --git a/src/cursor.js b/src/cursor.js index 4c47de7af..bb3c1bbe1 100644 --- a/src/cursor.js +++ b/src/cursor.js @@ -1,7 +1,20 @@ +//@ts-check /* global THREE performance */ -const { Vec3 } = require('vec3') -const { isGameActive } = require('./globalState') +// wouldn't better to create atlas instead? +import destroyStage0 from 'minecraft-assets/minecraft-assets/data/1.10/blocks/destroy_stage_0.png' +import destroyStage1 from 'minecraft-assets/minecraft-assets/data/1.10/blocks/destroy_stage_1.png' +import destroyStage2 from 'minecraft-assets/minecraft-assets/data/1.10/blocks/destroy_stage_2.png' +import destroyStage3 from 'minecraft-assets/minecraft-assets/data/1.10/blocks/destroy_stage_3.png' +import destroyStage4 from 'minecraft-assets/minecraft-assets/data/1.10/blocks/destroy_stage_4.png' +import destroyStage5 from 'minecraft-assets/minecraft-assets/data/1.10/blocks/destroy_stage_5.png' +import destroyStage6 from 'minecraft-assets/minecraft-assets/data/1.10/blocks/destroy_stage_6.png' +import destroyStage7 from 'minecraft-assets/minecraft-assets/data/1.10/blocks/destroy_stage_7.png' +import destroyStage8 from 'minecraft-assets/minecraft-assets/data/1.10/blocks/destroy_stage_8.png' +import destroyStage9 from 'minecraft-assets/minecraft-assets/data/1.10/blocks/destroy_stage_9.png' + +import { Vec3 } from 'vec3' +import { isGameActive } from './globalState' function getViewDirection (pitch, yaw) { const csPitch = Math.cos(pitch) @@ -27,8 +40,20 @@ class Cursor { const loader = new THREE.TextureLoader() this.breakTextures = [] + const destroyStagesImages = [ + destroyStage0, + destroyStage1, + destroyStage2, + destroyStage3, + destroyStage4, + destroyStage5, + destroyStage6, + destroyStage7, + destroyStage8, + destroyStage9 + ] for (let i = 0; i < 10; i++) { - const texture = loader.load('textures/' + viewer.version + '/blocks/destroy_stage_' + i + '.png') + const texture = loader.load(destroyStagesImages[i]) texture.magFilter = THREE.NearestFilter texture.minFilter = THREE.NearestFilter this.breakTextures.push(texture) @@ -96,8 +121,10 @@ class Cursor { // Place if (cursorBlock && this.buttons[2] && (!this.lastButtons[2] || cursorChanged) && this.lastBlockPlaced >= 4) { const vecArray = [new Vec3(0, -1, 0), new Vec3(0, 1, 0), new Vec3(0, 0, -1), new Vec3(0, 0, 1), new Vec3(-1, 0, 0), new Vec3(1, 0, 0)] + //@ts-ignore const delta = cursorBlock.intersect.minus(cursorBlock.position) // check instead? + //@ts-ignore bot._placeBlockWithOptions(cursorBlock, vecArray[cursorBlock.face], { delta, forceLook: 'ignore' }).catch(console.warn) // this.lastBlockPlaced = 0 } @@ -148,4 +175,4 @@ class Cursor { } } -module.exports = Cursor +export default Cursor diff --git a/src/globals.d.ts b/src/globals.d.ts index db486c6a2..cc13b180e 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -1,6 +1,6 @@ /// -declare const THREE: typeof import('three'); +declare const THREE: typeof import('three') // todo declare const bot: import('mineflayer').Bot declare const singlePlayerServer: any @@ -30,9 +30,10 @@ interface ObjectConstructor { } declare module '*.css' { - /** - * @deprecated Use `import style from './style.css?inline'` instead. - */ const css: string export default css } +declare module '*.png' { + const png: string + export default png +} diff --git a/src/menus/components/breath_bar.js b/src/menus/components/breath_bar.js index d0ff1394b..3c03602c3 100644 --- a/src/menus/components/breath_bar.js +++ b/src/menus/components/breath_bar.js @@ -1,4 +1,5 @@ -const { LitElement, html, css } = require('lit') +const { LitElement, html, css, unsafeCSS } = require('lit') +const { guiIcons1_17_1 } = require('../hud') class BreathBar extends LitElement { static get styles () { @@ -22,13 +23,13 @@ class BreathBar extends LitElement { } .breath.full { - background-image: url('textures/1.17.1/gui/icons.png'); + background-image: url('${unsafeCSS(guiIcons1_17_1)}'); background-size: 256px; background-position: var(--offset) var(--bg-y); } .breath.half { - background-image: url('textures/1.17.1/gui/icons.png'); + background-image: url('${unsafeCSS(guiIcons1_17_1)}'); background-size: 256px; background-position: calc(var(--offset) - 9) var(--bg-y); } diff --git a/src/menus/components/button.js b/src/menus/components/button.js index dbbb693a5..0ab402800 100644 --- a/src/menus/components/button.js +++ b/src/menus/components/button.js @@ -1,4 +1,6 @@ -const { LitElement, html, css } = require('lit') +//@ts-check +const widgetsGui = require('minecraft-assets/minecraft-assets/data/1.17.1/gui/widgets.png') +const { LitElement, html, css, unsafeCSS } = require('lit') const audioContext = new window.AudioContext() const sounds = {} @@ -74,7 +76,7 @@ class Button extends LitElement { left: 0; width: calc(50% + 1px); height: 20px; - background: url('textures/1.17.1/gui/widgets.png'); + background: url('${unsafeCSS(widgetsGui)}'); background-size: 256px; background-position-y: calc(var(--txrV) * -1); z-index: -1; @@ -88,7 +90,7 @@ class Button extends LitElement { left: 50%; width: 50%; height: 20px; - background: url('textures/1.17.1/gui/widgets.png'); + background: url('${unsafeCSS(widgetsGui)}'); background-size: 256px; background-position-x: calc(-200px + 100%); background-position-y: calc(var(--txrV) * -1); @@ -131,6 +133,7 @@ class Button extends LitElement { constructor () { super() this.label = '' + this.icon = undefined this.disabled = false this.width = '200px' this.onPress = () => { } diff --git a/src/menus/components/food_bar.js b/src/menus/components/food_bar.js index 17bdcccb8..7f71ad0fa 100644 --- a/src/menus/components/food_bar.js +++ b/src/menus/components/food_bar.js @@ -1,4 +1,5 @@ -const { LitElement, html, css } = require('lit') +const { LitElement, html, css, unsafeCSS } = require('lit') +const { guiIcons1_17_1 } = require('../hud') class FoodBar extends LitElement { static get styles () { @@ -19,7 +20,7 @@ class FoodBar extends LitElement { .food { width: 9px; height: 9px; - background-image: url('textures/1.17.1/gui/icons.png'), url('textures/1.17.1/gui/icons.png'); + background-image: url('${unsafeCSS(guiIcons1_17_1)}'), url('${unsafeCSS(guiIcons1_17_1)}'); background-size: 256px, 256px; background-position: var(--bg-x) var(--bg-y), var(--bg-x) var(--bg-y); margin-left: -1px; diff --git a/src/menus/components/health_bar.js b/src/menus/components/health_bar.js index fdbc3b8c6..a6dacef8b 100644 --- a/src/menus/components/health_bar.js +++ b/src/menus/components/health_bar.js @@ -1,4 +1,5 @@ -const { LitElement, html, css } = require('lit') +const { LitElement, html, css, unsafeCSS } = require('lit') +const { guiIcons1_17_1 } = require('../hud') function getEffectClass (effect) { switch (effect.id) { @@ -49,7 +50,7 @@ class HealthBar extends LitElement { .heart { width: 9px; height: 9px; - background-image: url('textures/1.17.1/gui/icons.png'), url('textures/1.17.1/gui/icons.png'); + background-image: url('${unsafeCSS(guiIcons1_17_1)}'), url('${unsafeCSS(guiIcons1_17_1)}'); background-size: 256px, 256px; background-position: var(--bg-x) var(--bg-y), var(--bg-x) var(--bg-y); margin-left: -1px; diff --git a/src/menus/components/hotbar.js b/src/menus/components/hotbar.js index d347b4f96..32b78606d 100644 --- a/src/menus/components/hotbar.js +++ b/src/menus/components/hotbar.js @@ -1,7 +1,9 @@ -const { LitElement, html, css } = require('lit') +const { LitElement, html, css, unsafeCSS } = require('lit') const invsprite = require('../../invsprite.json') const { isGameActive } = require('../../globalState') +const widgetsTexture = require('minecraft-assets/minecraft-assets/data/1.16.4/gui/widgets.png') + class Hotbar extends LitElement { static get styles () { return css` @@ -12,7 +14,7 @@ class Hotbar extends LitElement { transform: translate(-50%); width: 182px; height: 22px; - background: url("textures/1.16.4/gui/widgets.png"); + background: url("${unsafeCSS(widgetsTexture)}"); background-size: 256px; } @@ -22,7 +24,7 @@ class Hotbar extends LitElement { top: -1px; width: 24px; height: 24px; - background: url("textures/1.16.4/gui/widgets.png"); + background: url("${unsafeCSS(widgetsTexture)}"); background-size: 256px; background-position-y: -22px; } diff --git a/src/menus/components/slider.js b/src/menus/components/slider.js index 25ced293b..bb72f9f29 100644 --- a/src/menus/components/slider.js +++ b/src/menus/components/slider.js @@ -1,4 +1,6 @@ -const { LitElement, html, css } = require('lit') +const { LitElement, html, css, unsafeCSS } = require('lit') + +const widgetsGui = require('minecraft-assets/minecraft-assets/data/1.17.1/gui/widgets.png') class Slider extends LitElement { static get styles () { @@ -39,7 +41,7 @@ class Slider extends LitElement { left: 0; width: 50%; height: 20px; - background: url('textures/1.17.1/gui/widgets.png'); + background: url('${unsafeCSS(widgetsGui)}'); background-size: 256px; background-position-y: var(--txrV); z-index: -1; @@ -54,7 +56,7 @@ class Slider extends LitElement { left: 50%; width: 50%; height: 20px; - background: url('textures/1.17.1/gui/widgets.png'); + background: url('${unsafeCSS(widgetsGui)}'); background-size: 256px; background-position-x: calc(-200px + 100%); background-position-y: var(--txrV); diff --git a/src/menus/hud.js b/src/menus/hud.js index f465b50e5..fa82f86f2 100644 --- a/src/menus/hud.js +++ b/src/menus/hud.js @@ -1,10 +1,13 @@ //@ts-check -const { LitElement, html, css } = require('lit') +const { LitElement, html, css, unsafeCSS } = require('lit') const { isMobile } = require('./components/common') const { showModal, miscUiState } = require('../globalState') const { options, watchValue } = require('../optionsStorage') const { getGamemodeNumber } = require('../utils') +export const guiIcons1_17_1 = require('minecraft-assets/minecraft-assets/data/1.17.1/gui/icons.png') +export const guiIcons1_16_4 = require('minecraft-assets/minecraft-assets/data/1.16.4/gui/icons.png') + class Hud extends LitElement { static get styles () { return css` @@ -21,7 +24,7 @@ class Hud extends LitElement { .crosshair { width: 16px; height: 16px; - background: url('textures/1.17.1/gui/icons.png'); + background: url('${unsafeCSS(guiIcons1_17_1)}'); background-size: 256px; position: absolute; top: 50%; @@ -49,7 +52,7 @@ class Hud extends LitElement { transform: translate(-50%); width: 182px; height: 5px; - background-image: url('textures/1.16.4/gui/icons.png'); + background-image: url('${unsafeCSS(guiIcons1_16_4)}'); background-size: 256px; background-position-y: -64px; } @@ -57,7 +60,7 @@ class Hud extends LitElement { .xp-bar { width: 182px; height: 5px; - background-image: url('textures/1.17.1/gui/icons.png'); + background-image: url('${unsafeCSS(guiIcons1_17_1)}'); background-size: 256px; background-position-y: -69px; } diff --git a/src/menus/title_screen.js b/src/menus/title_screen.js index f1d8a52b5..93c6e1ff7 100644 --- a/src/menus/title_screen.js +++ b/src/menus/title_screen.js @@ -2,7 +2,9 @@ const { openWorldDirectory, openWorldZip } = require('../browserfs') const { showModal } = require('../globalState') const { fsState } = require('../loadFolder') const { openURL } = require('./components/common') -const { LitElement, html, css } = require('lit') +const { LitElement, html, css, unsafeCSS } = require('lit') + +const mcImage = require('minecraft-assets/minecraft-assets/data/1.17.1/gui/title/minecraft.png') // const SUPPORT_WORLD_LOADING = !!window.showDirectoryPicker const SUPPORT_WORLD_LOADING = true @@ -21,7 +23,7 @@ class TitleScreen extends LitElement { position: absolute; top: 0; left: 0; - background-image: url('textures/1.17.1/gui/title/minecraft.png'); + background-image: url('${unsafeCSS(mcImage)}'); background-size: 256px; width: 155px; height: 44px; @@ -32,7 +34,7 @@ class TitleScreen extends LitElement { position: absolute; top: 0; left: 155px; - background-image: url('textures/1.17.1/gui/title/minecraft.png'); + background-image: url('${unsafeCSS(mcImage)}'); background-size: 256px; width: 155px; height: 44px; diff --git a/src/styles.css b/src/styles.css index 7f2b0a591..726d4aefe 100644 --- a/src/styles.css +++ b/src/styles.css @@ -26,7 +26,7 @@ html { position: absolute; top: 0; left: 0; - background: url('textures/1.17.1/gui/options_background.png'), rgba(0, 0, 0, 0.7); + background: url('minecraft-assets/minecraft-assets/data/1.17.1/gui/options_background.png'), rgba(0, 0, 0, 0.7); background-size: 16px; background-repeat: repeat; width: 100%; From a4a6de639718bc9e78135ab697c5f3ca7c865b26 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 30 Aug 2023 12:15:04 +0300 Subject: [PATCH 143/318] almost fix annoying key controls issue --- src/botControls.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/botControls.js b/src/botControls.js index ec7e0ffaa..d901b2f6c 100644 --- a/src/botControls.js +++ b/src/botControls.js @@ -128,7 +128,7 @@ document.addEventListener('keydown', (e) => { }) document.addEventListener('keyup', (e) => { - if (!isGameActive(true)) return + // if (!isGameActive(true)) return keyBindScrn.keymaps.forEach(km => { if (e.code === km.key) { From 039295b018ae84611b8f656ff4897f431123dcbd Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 30 Aug 2023 23:26:01 +0300 Subject: [PATCH 144/318] fix annoying keyboard conflicts (ctrl+s, l) --- src/botControls.js | 1 + src/index.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/botControls.js b/src/botControls.js index d901b2f6c..b4649ac3a 100644 --- a/src/botControls.js +++ b/src/botControls.js @@ -116,6 +116,7 @@ document.addEventListener('keydown', (e) => { break case 'KeyS': bot.setControlState('back', true) + e.preventDefault() break case 'KeyW': bot.setControlState('forward', true) diff --git a/src/index.js b/src/index.js index 3060c3706..cf402cf25 100644 --- a/src/index.js +++ b/src/index.js @@ -111,7 +111,7 @@ const minPitch = -0.5 * Math.PI // Create three.js context, add to page const renderer = new THREE.WebGLRenderer() -renderer.setPixelRatio(window.devicePixelRatio || 1) +renderer.setPixelRatio(window.devicePixelRatio || 1) // todo this value is too high on ios, need to check, probably we should use avg, also need to make it configurable renderer.setSize(window.innerWidth, window.innerHeight) document.body.appendChild(renderer.domElement) @@ -646,7 +646,7 @@ window.addEventListener('keydown', (e) => { e.preventDefault() goFullscreen(true) } - if (e.code === 'KeyL') { + if (e.code === 'KeyL' && e.altKey) { console.clear() } // if (e.code === 'KeyD') { From 6adf25e85d3620d8cacfca709b50b053aca1ffea Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 30 Aug 2023 12:20:29 +0300 Subject: [PATCH 145/318] singleplayer saves: fix loading player data from level.dat (todo: not saving for now) respect superflat world generation 1.8 superflat saves tested: seems stable! --- src/browserfs.js | 16 ++++++++++++++-- src/globalState.js | 2 +- src/loadFolder.ts | 33 ++++++++++++++++++++++++++++++--- src/utils.js | 16 ++++++++++++++++ 4 files changed, 61 insertions(+), 6 deletions(-) diff --git a/src/browserfs.js b/src/browserfs.js index 03c73b152..057926845 100644 --- a/src/browserfs.js +++ b/src/browserfs.js @@ -20,6 +20,8 @@ browserfs.configure({ if (e) throw e }) +export const forceCachedDataPaths = {} + //@ts-ignore fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat', 'mkdir', 'rename', /* 'copyFile', */'readdir'].map(key => [key, promisify(fs[key])])), { get (target, p, receiver) { @@ -30,7 +32,17 @@ fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat', 'mk if (typeof args[0] === 'string' && !args[0].startsWith('/')) args[0] = '/' + args[0] // Write methods // todo issue one-time warning (in chat I guess) - if (oneOf(p, 'writeFile', 'mkdir', 'rename') && fsState.isReadonly) return + if (fsState.isReadonly) { + if (oneOf(p, 'readFile', 'writeFile') && forceCachedDataPaths[args[0]]) { + if (p === 'readFile') { + return Promise.resolve(forceCachedDataPaths[args[0]]) + } else if (p === 'writeFile') { + forceCachedDataPaths[args[0]] = args[1] + return Promise.resolve() + } + } + if (oneOf(p, 'writeFile', 'mkdir', 'rename')) return + } if (p === 'open' && fsState.isReadonly) { args[1] = 'r' // read-only, zipfs throw otherwise } @@ -183,7 +195,7 @@ export const openWorldZip = async (/** @type {File} */file) => { loadFolder(`/world/${availableWorlds[0]}`) } - alert(`${availableWorlds.length} worlds found in the zip, please select one!`) + alert(`Many (${availableWorlds.length}) worlds found in the zip!`) // todo prompt picker // const selectWorld } diff --git a/src/globalState.js b/src/globalState.js index b28083da7..5d27332ef 100644 --- a/src/globalState.js +++ b/src/globalState.js @@ -132,7 +132,7 @@ const savePlayers = () => { setInterval(() => { savePlayers() // todo investigate unload failures instead -}, 1000) +}, 2000) window.addEventListener('unload', (e) => { savePlayers() diff --git a/src/loadFolder.ts b/src/loadFolder.ts index 491822f70..c48bbac9c 100644 --- a/src/loadFolder.ts +++ b/src/loadFolder.ts @@ -4,6 +4,9 @@ import * as nbt from 'prismarine-nbt' import { promisify } from 'util' import { options } from './optionsStorage' import { proxy } from 'valtio' +import { nameToMcOfflineUUID } from './utils' +import { forceCachedDataPaths } from './browserfs' +import { gzip } from 'node-gzip' const parseNbt = promisify(nbt.parse) @@ -16,10 +19,15 @@ export const fsState = proxy({ const PROPOSE_BACKUP = true export const loadFolder = async (root = '/world') => { - // todo-low cache reading + // todo do it in singleplayer as well + for (const key in forceCachedDataPaths) { + delete forceCachedDataPaths[key] + } + const warnings: string[] = [] let levelDatContent try { + // todo-low cache reading levelDatContent = await fs.promises.readFile(`${root}/level.dat`) } catch (err) { if (err.code === 'ENOENT') { @@ -33,11 +41,12 @@ export const loadFolder = async (root = '/world') => { } } - let version: string | undefined + let isFlat = false if (levelDatContent) { const parsedRaw = await parseNbt(Buffer.from(levelDatContent)) const levelDat: import('./mcTypes').LevelDat = nbt.simplify(parsedRaw).Data + version = levelDat.Version?.Name if (!version) { const newVersion = prompt(`In 1.8 and before world save doesn\'t contain version info, please enter version you want to use to load the world.\nSupported versions ${supportedVersions.join(', ')}`, '1.8.8') @@ -48,7 +57,6 @@ export const loadFolder = async (root = '/world') => { warnings.push(`Version ${version} is not supported, supported versions ${supportedVersions.join(', ')}, 1.16.1 will be used`) version = '1.16.1' } - let isFlat = false if (levelDat.WorldGenSettings) { for (const [key, value] of Object.entries(levelDat.WorldGenSettings.dimensions)) { if (key.slice(10) === 'overworld') { @@ -64,6 +72,20 @@ export const loadFolder = async (root = '/world') => { if (!isFlat) { warnings.push(`Generator ${levelDat.generatorName} is not supported yet`) } + + const playerUuid = nameToMcOfflineUUID(options.localUsername) + const playerDatPath = `${root}/playerdata/${playerUuid}.dat` + try { + await fs.promises.stat(playerDatPath) + } catch (err) { + const playerDat = await gzip(nbt.writeUncompressed({ name: '', ...(parsedRaw.value.Data.value as Record).Player })) + if (fsState.isReadonly) { + forceCachedDataPaths[playerDatPath] = playerDat + } else { + await fs.promises.writeFile(playerDatPath, playerDat) + } + } + } if (warnings.length) { @@ -98,6 +120,11 @@ export const loadFolder = async (root = '/world') => { // todo check gamemode level.dat data etc detail: { version, + ...isFlat ? { + generation: { + name: 'superflat' + } + } : {}, ...root !== '/world' ? { 'worldFolder': root } : {} diff --git a/src/utils.js b/src/utils.js index cf129d245..30c0d41cb 100644 --- a/src/utils.js +++ b/src/utils.js @@ -1,6 +1,8 @@ //@ts-check import { activeModalStack, miscUiState } from './globalState' import { notification } from './menus/notification' +import * as crypto from 'crypto' +import UUID from 'uuid-1345' export const goFullscreen = async (doToggle = false) => { if (!document.fullscreenElement) { @@ -116,3 +118,17 @@ export const getGamemodeNumber = (bot) => { export const isCypress = () => { return localStorage.cypress === 'true' } + +// https://github.com/PrismarineJS/node-minecraft-protocol/blob/cf1f67117d586b5e6e21f0d9602da12e9fcf46b6/src/server/login.js#L170 +function javaUUID (s) { + const hash = crypto.createHash('md5') + hash.update(s, 'utf8') + const buffer = hash.digest() + buffer[6] = (buffer[6] & 0x0f) | 0x30 + buffer[8] = (buffer[8] & 0x3f) | 0x80 + return buffer +} + +export function nameToMcOfflineUUID (name) { + return (new UUID(javaUUID('OfflinePlayer:' + name))).toString() +} From 1f8c59324e5476502429eaf9e91c2c4d290eb4ea Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 31 Aug 2023 02:06:18 +0300 Subject: [PATCH 146/318] make process of world loading less annoying, more configurable FIX server version select! --- src/browserfs.js | 1 + src/createLocalServer.js | 2 +- src/index.js | 2 +- src/loadFolder.ts | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/browserfs.js b/src/browserfs.js index 057926845..f5f34c084 100644 --- a/src/browserfs.js +++ b/src/browserfs.js @@ -193,6 +193,7 @@ export const openWorldZip = async (/** @type {File} */file) => { if (availableWorlds.length === 1) { loadFolder(`/world/${availableWorlds[0]}`) + return } alert(`Many (${availableWorlds.length}) worlds found in the zip!`) diff --git a/src/createLocalServer.js b/src/createLocalServer.js index 534d1cf45..d60c49ff7 100644 --- a/src/createLocalServer.js +++ b/src/createLocalServer.js @@ -9,4 +9,4 @@ export const startLocalServer = () => { // features that flying-squid doesn't support at all // todo move & generate in flying-squid -export const unsupportedLocalServerFeatures = ['transactionPacketExists', 'teleportUsesOwnPacket'] +export const unsupportedLocalServerFeatures = ['transactionPacketExists', 'teleportUsesOwnPacket', 'dimensionDataIsAvailable'] diff --git a/src/index.js b/src/index.js index cf402cf25..04751b966 100644 --- a/src/index.js +++ b/src/index.js @@ -357,7 +357,7 @@ async function connect (connectOptions) { if (singeplayer) { window.serverDataChannel ??= {} window.worldLoaded = false - Object.assign(serverOptions, _.defaultsDeep({}, options.localServerOptions, connectOptions.serverOverrides, serverOptions)) + Object.assign(serverOptions, _.defaultsDeep({}, connectOptions.serverOverrides, options.localServerOptions, serverOptions)) singlePlayerServer = window.singlePlayerServer = startLocalServer() // todo need just to call quit if started // loadingScreen.maybeRecoverable = false diff --git a/src/loadFolder.ts b/src/loadFolder.ts index c48bbac9c..14d7f6861 100644 --- a/src/loadFolder.ts +++ b/src/loadFolder.ts @@ -54,8 +54,8 @@ export const loadFolder = async (root = '/world') => { version = newVersion } if (!supportedVersions.includes(version)) { - warnings.push(`Version ${version} is not supported, supported versions ${supportedVersions.join(', ')}, 1.16.1 will be used`) - version = '1.16.1' + version = prompt(`Version ${version} is not supported, supported versions ${supportedVersions.join(', ')}, what try to use instead?`, '1.16.1') + if (!version) return } if (levelDat.WorldGenSettings) { for (const [key, value] of Object.entries(levelDat.WorldGenSettings.dimensions)) { @@ -70,7 +70,7 @@ export const loadFolder = async (root = '/world') => { isFlat = levelDat.generatorName === 'flat' } if (!isFlat) { - warnings.push(`Generator ${levelDat.generatorName} is not supported yet`) + warnings.push(`Generator ${levelDat.generatorName} may not be supported yet`) } const playerUuid = nameToMcOfflineUUID(options.localUsername) @@ -113,7 +113,7 @@ export const loadFolder = async (root = '/world') => { if (!fsState.isReadonly) { // todo allow also to ctrl+s - alert("Note: the world is saved only when you click disconnect!") + alert("Note: the world is saved only on /save or disconnect! ENSURE YOU HAVE BACKUP!") } document.querySelector('#title-screen').dispatchEvent(new CustomEvent('singleplayer', { From 6aefd6406097d49a6d0257470d5d6634a0bf5701 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 31 Aug 2023 18:46:58 +0300 Subject: [PATCH 147/318] fix ui zoom on ctrl+w + wheel scroll --- src/menus/components/hotbar.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/menus/components/hotbar.js b/src/menus/components/hotbar.js index 32b78606d..30a5b3372 100644 --- a/src/menus/components/hotbar.js +++ b/src/menus/components/hotbar.js @@ -115,8 +115,11 @@ class Hotbar extends LitElement { document.addEventListener('wheel', (e) => { if (!isGameActive(true)) return + e.preventDefault() const newSlot = ((this.bot.quickBarSlot + Math.sign(e.deltaY)) % 9 + 9) % 9 this.reloadHotbarSelected(newSlot) + }, { + passive: false, }) document.addEventListener('keydown', (e) => { From ae45bc5286174f8d0304594908772dbc9a819a4a Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 1 Sep 2023 07:18:20 +0300 Subject: [PATCH 148/318] change back for some settings dont wait for fullscreen to not delay request pointerlock timings (bug that led to securityError) --- src/menus/options_screen.js | 14 ++++---------- src/optionsStorage.js | 2 ++ src/utils.js | 8 ++++---- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/menus/options_screen.js b/src/menus/options_screen.js index 9997a187c..a57d7039f 100644 --- a/src/menus/options_screen.js +++ b/src/menus/options_screen.js @@ -63,8 +63,6 @@ class OptionsScreen extends CommonOptionsScreen { sound: { defaultValue: 50, convertFn: (v) => toNumber(v) }, fov: { defaultValue: 75, convertFn: (v) => toNumber(v) }, guiScale: { defaultValue: 3, convertFn: (v) => toNumber(v) }, - mouseRawInput: { defaultValue: false, convertFn: (v) => v === 'true' }, - autoFullscreen: { defaultValue: false, convertFn: (v) => v === 'true' } }) document.documentElement.style.setProperty('--chatScale', `${this.chatScale / 100}`) @@ -137,18 +135,14 @@ class OptionsScreen extends CommonOptionsScreen { showModal(document.querySelector('pmui-advanced-optionsscreen')) } }> - { - this.changeOption('mouseRawInput', !this.mouseRawInput) - - this.requestUpdate() + { + options.mouseRawInput = !options.mouseRawInput } }>
    - { - this.changeOption('autoFullscreen', !this.autoFullscreen) - - this.requestUpdate() + { + options.autoFullScreen = !options.autoFullScreen } }>
    diff --git a/src/optionsStorage.js b/src/optionsStorage.js index 07bb090a1..1fd765b68 100644 --- a/src/optionsStorage.js +++ b/src/optionsStorage.js @@ -14,6 +14,8 @@ const defaultOptions = { maxMultiplayerRenderDistance: 6, excludeCommunicationDebugEvents: [], preventDevReloadWhilePlaying: false, + autoFullScreen: false, + mouseRawInput: false, numWorkers: 4, localServerOptions: {}, localUsername: 'wanderer', diff --git a/src/utils.js b/src/utils.js index 30c0d41cb..aec751cee 100644 --- a/src/utils.js +++ b/src/utils.js @@ -3,6 +3,7 @@ import { activeModalStack, miscUiState } from './globalState' import { notification } from './menus/notification' import * as crypto from 'crypto' import UUID from 'uuid-1345' +import { options } from './optionsStorage' export const goFullscreen = async (doToggle = false) => { if (!document.fullscreenElement) { @@ -30,9 +31,8 @@ export const pointerLock = { if (document.getElementById('hud').style.display === 'none' || activeModalStack.length || !document.documentElement.requestPointerLock || miscUiState.currentTouch) { return } - const autoFullScreen = window.localStorage.getItem('autoFullscreen') === 'true' - if (autoFullScreen) { - await goFullscreen() + if (options.autoFullScreen) { + void goFullscreen() } const displayBrowserProblem = () => { notification.show = true @@ -46,7 +46,7 @@ export const pointerLock = { /** @type {any} */ //@ts-ignore const promise = document.documentElement.requestPointerLock({ - unadjustedMovement: window.localStorage.getItem('mouseRawInput') === 'true' + unadjustedMovement: options.mouseRawInput }) promise?.catch((error) => { if (error.name === "NotSupportedError") { From 31ca9dbb3f6d35388fafcd425ad42cee90695ec1 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 31 Aug 2023 19:33:33 +0300 Subject: [PATCH 149/318] inventory support with sprites (only multiplayer fully supported for now)! true block rendering! add iphone x notch workarounds --- package.json | 3 +- src/globalState.js | 13 +-- src/globals.js | 5 + src/index.js | 11 +++ src/inventory.ts | 136 +++++++++++++++++++++++++++ src/menus/components/common.js | 9 ++ src/menus/components/hotbar.js | 23 ++++- src/menus/loading_or_error_screen.js | 1 + src/menus/pause_screen.js | 3 +- src/reactUi.jsx | 35 +++---- src/styles.css | 10 +- tsconfig.json | 3 +- 12 files changed, 219 insertions(+), 33 deletions(-) create mode 100644 src/globals.js create mode 100644 src/inventory.ts diff --git a/package.json b/package.json index d53d7d9d0..d97aadcce 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,8 @@ "webpack-dev-middleware": "^6.1.1", "webpack-dev-server": "^4.15.1", "webpack-merge": "^5.9.0", - "workbox-webpack-plugin": "^6.6.0" + "workbox-webpack-plugin": "^6.6.0", + "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next" }, "pnpm": { "overrides": { diff --git a/src/globalState.js b/src/globalState.js index 5d27332ef..7a500e4bf 100644 --- a/src/globalState.js +++ b/src/globalState.js @@ -102,16 +102,17 @@ export const showContextmenu = (/** @type {ContextMenuItem[]} */items, { clientX // --- -export const isGameActive = (foregroundCheck) => { - if (foregroundCheck && activeModalStack.length) return false - return document.getElementById('hud').style.display !== 'none' -} - export const miscUiState = proxy({ currentTouch: null, - singleplayer: false + singleplayer: false, + gameLoaded: false, }) +export const isGameActive = (foregroundCheck) => { + if (foregroundCheck && activeModalStack.length) return false + return miscUiState.gameLoaded +} + window.miscUiState = miscUiState // state that is not possible to get via bot and in-game specific diff --git a/src/globals.js b/src/globals.js new file mode 100644 index 000000000..241853564 --- /dev/null +++ b/src/globals.js @@ -0,0 +1,5 @@ +//@ts-nocheck + +window.bot = undefined +window.THREE = undefined +window.singlePlayerServer = undefined diff --git a/src/index.js b/src/index.js index 04751b966..d4dcba6fc 100644 --- a/src/index.js +++ b/src/index.js @@ -8,6 +8,9 @@ require('./styles.css') require('iconify-icon') require('./chat') +require('./inventory') +//@ts-ignore +require('./globals.js') // workaround for mineflayer process.versions.node = '18.0.0' @@ -172,6 +175,8 @@ const optionsScrn = document.getElementById('options-screen') const pauseMenu = document.getElementById('pause-screen') function setLoadingScreenStatus (status, isError = false) { + // todo update in component instead + miscUiState.gameLoaded = false showModal(loadingScreen) if (loadingScreen.hasError) return loadingScreen.hasError = isError @@ -348,6 +353,11 @@ async function connect (connectOptions) { const errorAbortController = new AbortController() window.addEventListener('unhandledrejection', (e) => { + if (e.reason.name === 'ServerPluginLoadFailure') { + if (confirm(`Failed to load server plugin ${e.reason.pluginName} (invoking ${e.reason.pluginMethod}). Continue?`)) { + return + } + } handleError(e.reason) }, { signal: errorAbortController.signal @@ -433,6 +443,7 @@ async function connect (connectOptions) { }) bot.once('spawn', () => { + miscUiState.gameLoaded = true // todo display notification if not critical const mcData = require('minecraft-data')(bot.version) diff --git a/src/inventory.ts b/src/inventory.ts new file mode 100644 index 000000000..407ed0311 --- /dev/null +++ b/src/inventory.ts @@ -0,0 +1,136 @@ +import { subscribe } from 'valtio' +import { activeModalStack, hideCurrentModal, miscUiState } from './globalState' +import { showInventory } from 'minecraft-inventory-gui/web/ext.mjs' +import InventoryGui from 'minecraft-assets/minecraft-assets/data/1.17.1/gui/container/inventory.png' +import Dirt from 'minecraft-assets/minecraft-assets/data/1.17.1/blocks/dirt.png' +import { subscribeKey } from 'valtio/utils' +import MinecraftData from 'minecraft-data' +import invspriteJson from './invsprite.json' +import { getVersion } from 'prismarine-viewer/viewer/lib/version' + +const loadedImages = new Map() +let blockStates: Record }> +let lastInventory +let mcData +let version + +subscribeKey(miscUiState, 'gameLoaded', async () => { + if (!miscUiState.gameLoaded) { + // loadedBlocksAtlas = null + return + } + + // on game load + version = getVersion(bot.version) + blockStates = await fetch(`blocksStates/${version}.json`).then(res => res.json()) + getImage({ path: 'blocks', } as any) + getImage({ path: 'invsprite', } as any) + mcData = MinecraftData(version) +}) + +const findBlockStateTexturesAtlas = (name) => { + const vars = blockStates[name]?.variants + if (!vars) return + const firstVar = Object.values(vars)[0] + if (!firstVar || !Array.isArray(firstVar)) return + return firstVar[0]?.model.textures +} + +const getBlockData = (name) => { + const blocksImg = loadedImages.get('blocks') + if (!blocksImg || !blocksImg.width) return + + const data = findBlockStateTexturesAtlas(name) + if (!data) return + + const getSpriteBlockSide = (side) => { + const d = data[side] + const spriteSide = [d.u * blocksImg.width, d.v * blocksImg.height, d.su * blocksImg.width, d.sv * blocksImg.height] + const blockSideData = { + slice: spriteSide, + path: 'blocks' + } + return blockSideData + } + + return { + top: getSpriteBlockSide('up'), + left: getSpriteBlockSide('east'), + right: getSpriteBlockSide('north'), + } +} + +const getItemSlice = (name) => { + const invspriteImg = loadedImages.get('invsprite') + if (!invspriteImg || !invspriteImg.width) return + + const { x, y } = invspriteJson[name] + const sprite = [x, y, 32, 32] + return sprite +} + +const getImageSrc = (path) => { + switch (path) { + case 'gui/container/inventory': return InventoryGui + case 'blocks': return `textures/${version}.png` + case 'invsprite': return `invsprite.png` + } + return Dirt +} + +const getImage = ({ path, texture, blockData }) => { + const loadPath = blockData ? 'blocks' : path ?? texture + if (!loadedImages.has(loadPath)) { + const image = new Image() + // image.onload(() => {}) + image.src = getImageSrc(loadPath) + loadedImages.set(loadPath, image) + } + return loadedImages.get(loadPath) +} + +const upInventory = () => { + // inv.pwindow.inv.slots[2].displayName = 'test' + // inv.pwindow.inv.slots[2].blockData = getBlockData('dirt') + const customSlots = bot.inventory.slots.map(slot => { + if (!slot) return + // const itemName = slot.name + // const isItem = mcData.itemsByName[itemName] + + // try get block data first, but ideally we should also have atlas from atlas/ folder + const blockData = getBlockData(slot.name) + if (blockData) { + slot['texture'] = 'blocks' + slot['blockData'] = blockData + } else { + slot['texture'] = 'invsprite' + slot['scale'] = 0.5 + slot['slice'] = getItemSlice(slot.name) + } + + return slot + }) + lastInventory.pwindow.setSlots(customSlots) +} + +subscribe(activeModalStack, () => { + const inventoryOpened = activeModalStack.slice(-1)[0]?.reactType === 'inventory' + if (inventoryOpened) { + const inv = showInventory(undefined, getImage, {}, bot) + inv.canvas.style.zIndex = 10 + inv.canvas.style.position = 'fixed' + inv.canvas.style.inset = '0' + // todo scaling + inv.canvasManager.setScale(window.innerHeight < 480 ? 2 : window.innerHeight < 700 ? 3 : 4) + inv.canvasManager.onClose = () => { + hideCurrentModal() + inv.canvasManager.destroy() + } + + lastInventory = inv + upInventory() + } else if (lastInventory) { + lastInventory.destroy() + lastInventory = null + } +}) diff --git a/src/menus/components/common.js b/src/menus/components/common.js index 707e31d81..667d525fd 100644 --- a/src/menus/components/common.js +++ b/src/menus/components/common.js @@ -47,6 +47,14 @@ function isMobile () { return window.matchMedia('(pointer: coarse)').matches } +// todo there are better workarounds and proper way to detect notch +/** @returns {boolean} */ +function isProbablyIphone () { + if (!isMobile()) return false + const smallest = window.innerWidth < window.innerHeight ? window.innerWidth : window.innerHeight + return smallest < 600 +} + /** * @param {string} url */ @@ -55,6 +63,7 @@ function openURL (url) { } export { + isProbablyIphone, commonCss, isMobile, openURL, diff --git a/src/menus/components/hotbar.js b/src/menus/components/hotbar.js index 30a5b3372..637fd4d96 100644 --- a/src/menus/components/hotbar.js +++ b/src/menus/components/hotbar.js @@ -1,15 +1,17 @@ const { LitElement, html, css, unsafeCSS } = require('lit') const invsprite = require('../../invsprite.json') -const { isGameActive } = require('../../globalState') +const { isGameActive, miscUiState, showModal } = require('../../globalState') const widgetsTexture = require('minecraft-assets/minecraft-assets/data/1.16.4/gui/widgets.png') +const { subscribeKey } = require('valtio/utils') +const { isProbablyIphone } = require('./common') class Hotbar extends LitElement { static get styles () { return css` .hotbar { position: absolute; - bottom: 0; + bottom: ${unsafeCSS(isProbablyIphone() ? '40px' : '0')}; left: 50%; transform: translate(-50%); width: 182px; @@ -84,6 +86,16 @@ class Hotbar extends LitElement { transition: visibility 0s, opacity 1s linear; transition-delay: 2s; } + + .hotbar-more { + display:flex; + justify-content: center; + border: 1px solid white; + } + .hotbar-more::before { + content: '...'; + margin-top: -1px; + } ` } @@ -97,6 +109,9 @@ class Hotbar extends LitElement { constructor () { super() + subscribeKey(miscUiState, 'currentTouch', () => { + this.requestUpdate() + }) this.activeItemName = '' } @@ -209,6 +224,10 @@ class Hotbar extends LitElement {
    +
    { + showModal({ reactType: 'inventory', }) + }}> +
    ` diff --git a/src/menus/loading_or_error_screen.js b/src/menus/loading_or_error_screen.js index 9519179ea..891cfdbd1 100644 --- a/src/menus/loading_or_error_screen.js +++ b/src/menus/loading_or_error_screen.js @@ -78,6 +78,7 @@ class LoadingErrorScreen extends LitElement { ${this.hasError ? html`
    { this.hasError = false + miscUiState.gameLoaded = false if (activeModalStacks['main-menu']) { replaceActiveModalStack('main-menu') } else { diff --git a/src/menus/pause_screen.js b/src/menus/pause_screen.js index a2290d06a..aecdf6ccf 100644 --- a/src/menus/pause_screen.js +++ b/src/menus/pause_screen.js @@ -1,7 +1,7 @@ //@ts-check const { LitElement, html, css } = require('lit') const { openURL } = require('./components/common') -const { hideCurrentModal, showModal } = require('../globalState') +const { hideCurrentModal, showModal, miscUiState } = require('../globalState') const { fsState } = require('../loadFolder') const { subscribe } = require('valtio') const { saveWorld } = require('../builtinCommands') @@ -76,6 +76,7 @@ class PauseScreen extends LitElement { singlePlayerServer.quit() } bot._client.emit('end') + miscUiState.gameLoaded = false }}> ` diff --git a/src/reactUi.jsx b/src/reactUi.jsx index 4413d7b22..5a254adb3 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -7,12 +7,13 @@ import { activeModalStack, hideCurrentModal, isGameActive } from './globalState' import { useEffect, useState } from 'react' import { useProxy } from 'valtio/utils' import useTypedEventListener from 'use-typed-event-listener' +import { isProbablyIphone } from './menus/components/common' // todo useInterfaceState.setState({ isFlying: false, uiCustomization: { - touchButtonSize: 40, + touchButtonSize: isProbablyIphone() ? 55 : 40, }, updateCoord: ([coord, state]) => { const coordToAction = [ @@ -106,21 +107,23 @@ function InventoryWrapper() { if (!isInventoryOpen) return null - return
    div { - scale: 0.6; - background: transparent !important; - } - `}> - { - bot.moveSlotItem(oldSlot, newSlotIndex) - } } /> -
    + return null + + // return
    div { + // scale: 0.6; + // background: transparent !important; + // } + // `}> + // { + // bot.moveSlotItem(oldSlot, newSlotIndex) + // } } /> + //
    } const App = () => { diff --git a/src/styles.css b/src/styles.css index 726d4aefe..3fb6fd13a 100644 --- a/src/styles.css +++ b/src/styles.css @@ -92,12 +92,10 @@ canvas { font-family: minecraft, mojangles, monospace; } -/* todo I guess the best solution would be to render it on canvas */ -.BlockModel { - scale: 0.5; - width: 183%; - height: 190%; - transform: translate(-50%, -50%); +/* todo move this fix to lib */ +.TouchMovementArea { + grid-template-columns: "c ." + "d ."; } @media only screen and (max-width: 971px) { diff --git a/tsconfig.json b/tsconfig.json index 0977d9667..883dcf2fc 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,8 @@ "jsx": "react-jsx", "allowSyntheticDefaultImports": true, "noEmit": true, - "strictFunctionTypes": true + "strictFunctionTypes": true, + "resolveJsonModule": true // "strictNullChecks": true }, "include": [ From 5f8d8b6c662457c3a4861b24d4877c249474ae10 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 1 Sep 2023 07:21:23 +0300 Subject: [PATCH 150/318] feat(setting): auto exit fullscreen on esc --- src/index.js | 3 +++ src/menus/options_screen.js | 5 +++++ src/optionsStorage.js | 1 + 3 files changed, 9 insertions(+) diff --git a/src/index.js b/src/index.js index 9a9c08743..c415b4ba1 100644 --- a/src/index.js +++ b/src/index.js @@ -648,6 +648,9 @@ window.addEventListener('keydown', (e) => { } else { if (pointerLock.hasPointerLock) { document.exitPointerLock() + if (options.autoExitFullscreen) { + document.exitFullscreen() + } } else { document.dispatchEvent(new Event('pointerlockchange')) } diff --git a/src/menus/options_screen.js b/src/menus/options_screen.js index a57d7039f..ba0f19e8a 100644 --- a/src/menus/options_screen.js +++ b/src/menus/options_screen.js @@ -144,6 +144,11 @@ class OptionsScreen extends CommonOptionsScreen { { options.autoFullScreen = !options.autoFullScreen } + }> + + { + options.autoExitFullscreen = !options.autoExitFullscreen + } }>
    diff --git a/src/optionsStorage.js b/src/optionsStorage.js index 1fd765b68..360a84cee 100644 --- a/src/optionsStorage.js +++ b/src/optionsStorage.js @@ -16,6 +16,7 @@ const defaultOptions = { preventDevReloadWhilePlaying: false, autoFullScreen: false, mouseRawInput: false, + autoExitFullscreen: false, numWorkers: 4, localServerOptions: {}, localUsername: 'wanderer', From 077c20a1cdf5b29378f6b352e47ca969c59c78b3 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 1 Sep 2023 07:51:16 +0300 Subject: [PATCH 151/318] test vercel preview deploys on ci --- .github/workflows/preview.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/preview.yml diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml new file mode 100644 index 000000000..159d9c2af --- /dev/null +++ b/.github/workflows/preview.yml @@ -0,0 +1,23 @@ +name: CI Deploy Preview +env: + VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} + VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} +on: + workflow_dispatch: + pull_request: +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Install Global Dependencies + run: npm install --global vercel pnpm + - name: Pull Vercel Environment Information + run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} + - name: Build Project Artifacts + run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} + - name: Deploy Project Artifacts to Vercel + run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} From be01da9c964cec05041c42293aa4d63eb43ff033 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Thu, 31 Aug 2023 19:41:43 +0300 Subject: [PATCH 152/318] fix critical gameLoaded bug --- src/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index d4dcba6fc..9a9c08743 100644 --- a/src/index.js +++ b/src/index.js @@ -176,9 +176,11 @@ const pauseMenu = document.getElementById('pause-screen') function setLoadingScreenStatus (status, isError = false) { // todo update in component instead - miscUiState.gameLoaded = false showModal(loadingScreen) - if (loadingScreen.hasError) return + if (loadingScreen.hasError) { + miscUiState.gameLoaded = false + return + } loadingScreen.hasError = isError loadingScreen.status = status } From 6d1a89107bfb0afaeb6f10cd0ae8b417bae4ffbd Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 1 Sep 2023 07:23:09 +0300 Subject: [PATCH 153/318] fix all known annoying mis-keyboard reaction! fix annoying slow creative flying speed (also can be controlled via window for now) --- src/botControls.js | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/botControls.js b/src/botControls.js index b4649ac3a..829a0db77 100644 --- a/src/botControls.js +++ b/src/botControls.js @@ -1,7 +1,8 @@ //@ts-check const { Vec3 } = require('vec3') -const { isGameActive, showModal, gameAdditionalState } = require('./globalState') +const { isGameActive, showModal, gameAdditionalState, activeModalStack } = require('./globalState') +const { subscribe } = require('valtio') const keyBindScrn = document.getElementById('keybinds-screen') @@ -61,6 +62,7 @@ const patchedSetControlState = (action, state) => { currentFlyVector.add(toAddVec) } +const standardAirborneAcceleration = 0.02 const toggleFly = () => { if (bot.game.gameMode !== 'creative' && bot.game.gameMode !== 'spectator') return if (bot.setControlState !== patchedSetControlState) { @@ -69,9 +71,12 @@ const toggleFly = () => { } if (isFlying()) { + bot.physics['airborneAcceleration'] = standardAirborneAcceleration bot.creative.stopFlying() endFlyLoop?.() } else { + // window.flyingSpeed will be removed + bot.physics['airborneAcceleration'] = window.flyingSpeed ?? 0.1 bot.entity.velocity = new Vec3(0, 0, 0) bot.creative.startFlying() startFlyLoop() @@ -79,6 +84,21 @@ const toggleFly = () => { gameAdditionalState.isFlying = isFlying() } +/** @type {Set} */ +const pressedKeys = new Set() +// window.pressedKeys = pressedKeys + +// detect pause open, as ANY keyup event is not fired when you exit pointer lock (esc) +subscribe(activeModalStack, () => { + if (activeModalStack.length) { + // iterate over pressedKeys + for (const key of pressedKeys) { + const e = new KeyboardEvent('keyup', { code: key }) + document.dispatchEvent(e) + } + } +}) + let lastJumpUsage = 0 document.addEventListener('keydown', (e) => { if (!isGameActive(true)) return @@ -124,12 +144,16 @@ document.addEventListener('keydown', (e) => { } } }) + pressedKeys.add(e.code) }, { capture: true, }) document.addEventListener('keyup', (e) => { - // if (!isGameActive(true)) return + // workaround for pause pressed keys, multiple keyboard + if (!isGameActive(false) || !pressedKeys.has(e.code)) { + return + } keyBindScrn.keymaps.forEach(km => { if (e.code === km.key) { @@ -165,4 +189,5 @@ document.addEventListener('keyup', (e) => { } } }) + pressedKeys.delete(e.code) }, false) From 8a948d14ea157dca1a438aa1ebf0991c466fd752 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 1 Sep 2023 08:35:08 +0300 Subject: [PATCH 154/318] oops fix prevuilt target --- .github/workflows/preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 159d9c2af..5235072b4 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -18,6 +18,6 @@ jobs: - name: Pull Vercel Environment Information run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} - name: Build Project Artifacts - run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} + run: vercel build --token=${{ secrets.VERCEL_TOKEN }} - name: Deploy Project Artifacts to Vercel run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} From 9b71088c72925d5b305e765ea92e96ff43156ce6 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 1 Sep 2023 08:55:03 +0300 Subject: [PATCH 155/318] vercel: get correct env --- .github/workflows/preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 5235072b4..ee83ba249 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -16,7 +16,7 @@ jobs: - name: Install Global Dependencies run: npm install --global vercel pnpm - name: Pull Vercel Environment Information - run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} + run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }} - name: Build Project Artifacts run: vercel build --token=${{ secrets.VERCEL_TOKEN }} - name: Deploy Project Artifacts to Vercel From 670c56094047847072d5d3d6acee390d7d55ddff Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 2 Sep 2023 02:33:03 +0300 Subject: [PATCH 156/318] fix dragndrop files in firefox and / action --- src/chat.js | 1 + src/dragndrop.ts | 47 +++++++++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/chat.js b/src/chat.js index 7ee032d86..2497d09d5 100644 --- a/src/chat.js +++ b/src/chat.js @@ -240,6 +240,7 @@ class ChatBox extends LitElement { break case 'Slash': setTimeout(() => this.enableChat('/'), 0) + e.preventDefault() break } } diff --git a/src/dragndrop.ts b/src/dragndrop.ts index 3b62e307c..bcb8d5711 100644 --- a/src/dragndrop.ts +++ b/src/dragndrop.ts @@ -19,30 +19,37 @@ window.nbt = nbt; }) window.addEventListener("drop", async e => { if (!e.dataTransfer?.files.length) return - // todo support drop save folder const { items } = e.dataTransfer const item = items[0] - const filehandle = await item.getAsFileSystemHandle() as FileSystemFileHandle | FileSystemDirectoryHandle - if (filehandle.kind === 'file') { - const file = await filehandle.getFile() + if (item.getAsFileSystemHandle) { + const filehandle = await item.getAsFileSystemHandle() as FileSystemFileHandle | FileSystemDirectoryHandle + if (filehandle.kind === 'file') { + const file = await filehandle.getFile() - if (file.name.endsWith('.zip')) { - openWorldZip(file) - return + await handleDroppedFile(file) + } else { + if (isGameActive(false)) { + alert('Exit current world first, before loading a new one.') + return + } + await openWorldDirectory(filehandle as FileSystemDirectoryHandle) } - - const buffer = await file.arrayBuffer() - const parsed = await parseNbt(Buffer.from(buffer)) - showNotification({ - message: `${file.name} data available in browser console`, - }) - console.log('raw', parsed) - console.log('simplified', nbt.simplify(parsed)) } else { - if (isGameActive(false)) { - alert('Exit current world first, before loading a new one.') - return - } - await openWorldDirectory(filehandle as FileSystemDirectoryHandle) + await handleDroppedFile(item.getAsFile()) } }) + +async function handleDroppedFile(file: File) { + if (file.name.endsWith('.zip')) { + openWorldZip(file) + return + } + + const buffer = await file.arrayBuffer() + const parsed = await parseNbt(Buffer.from(buffer)) + showNotification({ + message: `${file.name} data available in browser console`, + }) + console.log('raw', parsed) + console.log('simplified', nbt.simplify(parsed)) +} From 9976b9a3f67ce30730aab58073c179876601d595 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 2 Sep 2023 03:34:50 +0300 Subject: [PATCH 157/318] download minecraft-data on demand --- package.json | 9 +++-- scripts/esbuildPlugins.mjs | 37 +++++++++--------- scripts/prepareData.mjs | 79 ++++++++++++++++++++++++++++++++++++++ src/index.js | 7 ++++ src/utils.js | 27 +++++++++++++ 5 files changed, 137 insertions(+), 22 deletions(-) create mode 100644 scripts/prepareData.mjs diff --git a/package.json b/package.json index d97aadcce..2d97f03c6 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,9 @@ "version": "1.5.0", "description": "A minecraft client running in a browser", "scripts": { - "start": "node scripts/build.js copyFilesDev && node esbuild.mjs --minify --watch", + "start": "node scripts/build.js copyFilesDev && node scripts/prepareData.mjs && node esbuild.mjs --minify --watch", "start-watch-script": "nodemon -w esbuild.mjs esbuild.mjs", - "build": "node scripts/build.js copyFiles && node esbuild.mjs --minify --prod", + "build": "node scripts/build.js copyFiles && node scripts/prepareData.mjs && node esbuild.mjs --minify --prod", "watch": "node scripts/build.js copyFilesDev && webpack serve --config webpack.dev.js --progress", "test:cypress": "cypress run", "test:e2e": "start-test http-get://localhost:8080 test:cypress", @@ -32,6 +32,7 @@ "compression": "^1.7.4", "cypress-plugin-snapshots": "^1.4.4", "diamond-square": "^1.2.0", + "eruda": "^3.0.1", "esbuild": "^0.19.2", "esbuild-loader": "^4.0.0", "esbuild-plugin-polyfill-node": "^0.3.0", @@ -73,6 +74,7 @@ "https-browserify": "^1.0.0", "lodash-webpack-plugin": "^0.11.6", "memfs": "^3.5.3", + "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next", "mineflayer": "github:zardoy/mineflayer#custom", "mineflayer-pathfinder": "^2.4.4", "npm-run-all": "^4.1.5", @@ -91,8 +93,7 @@ "webpack-dev-middleware": "^6.1.1", "webpack-dev-server": "^4.15.1", "webpack-merge": "^5.9.0", - "workbox-webpack-plugin": "^6.6.0", - "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next" + "workbox-webpack-plugin": "^6.6.0" }, "pnpm": { "overrides": { diff --git a/scripts/esbuildPlugins.mjs b/scripts/esbuildPlugins.mjs index 42ca70b9e..ae4193666 100644 --- a/scripts/esbuildPlugins.mjs +++ b/scripts/esbuildPlugins.mjs @@ -20,24 +20,24 @@ const plugins = [ path: (await build.resolve('minecraft-protocol/src/index.js', { kind, resolveDir })).path, } }) - // build.onResolve({ - // filter: /^\.\/data.js$/, - // }, ({ resolveDir, path }) => { - // if (!resolveDir.endsWith('minecraft-data')) return - // return { - // namespace: 'load-global-minecraft-data', - // path - // } - // }) - // build.onLoad({ - // filter: /.+/, - // namespace: 'load-global-minecraft-data', - // }, () => { - // return { - // contents: 'module.exports = window.minecraftData', - // loader: 'js', - // } - // }) + build.onResolve({ + filter: /^\.\/data.js$/, + }, ({ resolveDir, path }) => { + if (!resolveDir.endsWith('minecraft-data')) return + return { + namespace: 'load-global-minecraft-data', + path + } + }) + build.onLoad({ + filter: /.+/, + namespace: 'load-global-minecraft-data', + }, () => { + return { + contents: 'window.mcData ??= {};module.exports = { pc: window.mcData }', + loader: 'js', + } + }) // build.onResolve({ // filter: /^minecraft-assets$/, // }, ({ resolveDir, path }) => { @@ -89,6 +89,7 @@ const plugins = [ filter: /.*/, namespace: customMcDataNs, }, async ({ path, ...rest }) => { + throw new Error('unreachable') const resolvedPath = await build.resolve('minecraft-data/minecraft-data/data/dataPaths.json', { kind: 'require-call', resolveDir: process.cwd() }) const dataPaths = JSON.parse(await fs.promises.readFile(resolvedPath.path, 'utf8')) diff --git a/scripts/prepareData.mjs b/scripts/prepareData.mjs new file mode 100644 index 000000000..2953736ca --- /dev/null +++ b/scripts/prepareData.mjs @@ -0,0 +1,79 @@ +//@ts-check +import { build } from 'esbuild' +import Module from "node:module" +import { dirname } from 'node:path' + +const require = Module.createRequire(import.meta.url) + +const dataPaths = require('minecraft-data/minecraft-data/data/dataPaths.json') + +function toMajor (version) { + const [a, b] = (version + '').split('.') + return `${a}.${b}` +} + +const ignoredVersionsRegex = /(^0\.30c$)|w|-pre|-rc/ + +const grouped = {} + +for (const [version, data] of Object.entries(dataPaths.pc)) { + if (ignoredVersionsRegex.test(version)) continue + const major = toMajor(version) + grouped[major] ??= {} + grouped[major][version] = data +} + +console.log('preparing data') +for (const [major, versions] of Object.entries(grouped)) { + let contents = 'Object.assign(window.mcData, {\n' + for (const [version, dataSet] of Object.entries(versions)) { + contents += ` '${version}': {\n` + for (const [dataType, dataPath] of Object.entries(dataSet)) { + const loc = `minecraft-data/data/${dataPath}/` + contents += ` get ${dataType} () { return require("./${loc}${dataType}.json") },\n` + } + contents += ' },\n' + } + contents += '})' + + build({ + bundle: true, + outfile: `dist/mc-data/${major}.js`, + // entryPoints: ['mcData.js'], + stdin: { + contents, + + resolveDir: dirname(require.resolve('minecraft-data')), + sourcefile: `mcData${major}.js`, + loader: 'js', + }, + plugins: [ + // { + // name: 'mcData', + // setup (build) { + // build.onResolve({ + // filter: /^mcData\.js$/, + // }, ({ path, pluginData }) => { + // return { + // path, + // namespace: 'mc-data', + // } + // }) + // build.onLoad({ + // filter: /.*/, + // namespace: 'mc-data', + // }, ({ namespace, path }) => { + // const version = path.split('/')[2] + // const data = versions[version] + // if (!data) throw new Error(`No data for ${version}`) + // return { + // contents: `export const data = ${JSON.stringify(data, null, 2)}`, + // loader: 'js', + // } + // }) + // } + // } + ], + }) +} +console.log('data prepared') diff --git a/src/index.js b/src/index.js index c415b4ba1..91d51bff4 100644 --- a/src/index.js +++ b/src/index.js @@ -366,6 +366,13 @@ async function connect (connectOptions) { }) let singlePlayerServer try { + Object.assign(serverOptions, _.defaultsDeep({}, connectOptions.serverOverrides, options.localServerOptions, serverOptions)) + let version = connectOptions.botVersion ?? serverOptions.version + if (version) { + setLoadingScreenStatus(`Downloading data for ${version}`) + await loadScript(`./mc-data/${toMajorVersion(version)}.js`) + } + if (singeplayer) { window.serverDataChannel ??= {} window.worldLoaded = false diff --git a/src/utils.js b/src/utils.js index aec751cee..411e92763 100644 --- a/src/utils.js +++ b/src/utils.js @@ -132,3 +132,30 @@ function javaUUID (s) { export function nameToMcOfflineUUID (name) { return (new UUID(javaUUID('OfflinePlayer:' + name))).toString() } +export const loadScript = async function (/** @type {string} */ scriptSrc) { + if (document.querySelector(`script[src="${scriptSrc}"]`)) { + return + } + + return new Promise((resolve, reject) => { + const scriptElement = document.createElement('script') + scriptElement.src = scriptSrc + scriptElement.async = true + + scriptElement.onload = () => { + resolve(scriptElement) + } + + scriptElement.onerror = (error) => { + reject(error) + } + + document.head.appendChild(scriptElement) + }) +} + +// doesn't support snapshots +export const toMajorVersion = (version) => { + const [a, b] = (version + '').split('.') + return `${a}.${b}` +} From 190c511e544a003b2e7f42599a4ef1e2929c31ae Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 2 Sep 2023 03:37:28 +0300 Subject: [PATCH 158/318] allow to load worlf from ?map= qs url --- src/browserfs.js | 6 +++--- src/downloadAndOpenWorld.ts | 36 ++++++++++++++++++++++++++++++++++++ src/index.js | 18 ++++-------------- src/loadFolder.ts | 6 ++++-- 4 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 src/downloadAndOpenWorld.ts diff --git a/src/browserfs.js b/src/browserfs.js index f5f34c084..ca51aca3d 100644 --- a/src/browserfs.js +++ b/src/browserfs.js @@ -152,7 +152,7 @@ export const openWorldDirectory = async (/** @type {FileSystemDirectoryHandle?} loadFolder() } -export const openWorldZip = async (/** @type {File} */file) => { +export const openWorldZip = async (/** @type {File | ArrayBuffer} */file, name = file['name']) => { await new Promise(async resolve => { browserfs.configure({ // todo @@ -161,8 +161,8 @@ export const openWorldZip = async (/** @type {File} */file) => { "/world": { fs: "ZipFS", options: { - zipData: Buffer.from(await file.arrayBuffer()), - name: file.name + zipData: Buffer.from(file instanceof File ? (await file.arrayBuffer()) : file), + name } } }, diff --git a/src/downloadAndOpenWorld.ts b/src/downloadAndOpenWorld.ts new file mode 100644 index 000000000..e14e4deb1 --- /dev/null +++ b/src/downloadAndOpenWorld.ts @@ -0,0 +1,36 @@ +import { openWorldZip } from './browserfs' +import { setLoadingScreenStatus } from './utils' +import { filesize } from 'filesize' + +window.addEventListener('load', async (e) => { + const qs = new URLSearchParams(window.location.search) + const mapUrl = qs.get('map') + if (!mapUrl) return + + const menu = document.getElementById('play-screen') + menu.style = 'display: none;' + const name = mapUrl.slice(mapUrl.lastIndexOf('/') + 1).slice(-25) + setLoadingScreenStatus(`Downloading world ${name}...`) + + const response = await fetch(mapUrl) + const contentLength = +response.headers.get('Content-Length') + setLoadingScreenStatus(`Downloading world ${name}: have to download ${filesize(contentLength)}...`) + // const reader = response.body!.getReader() + // let doneValue + // while (true) { + // // done is true for the last chunk + // // value is Uint8Array of the chunk bytes + // const { done, value } = await reader.read() + + // if (done) { + // doneValue = value + // break + // } + + // setLoadingScreenStatus(`Downloading world ${name}: ${filesize(value.length)} / ${filesize(contentLength)}MB...`) + // } + await openWorldZip(await response.arrayBuffer()) +}) + +export default async () => { +} diff --git a/src/index.js b/src/index.js index 91d51bff4..659aea6b0 100644 --- a/src/index.js +++ b/src/index.js @@ -40,6 +40,8 @@ require('./reactUi.jsx') require('./botControls') require('./dragndrop') require('./browserfs') +require('./eruda') +require('./downloadAndOpenWorld') const net = require('net') const Stats = require('stats.js') @@ -56,7 +58,7 @@ const Cursor = require('./cursor').default global.THREE = require('three') const { initVR } = require('./vr') const { activeModalStack, showModal, hideModal, hideCurrentModal, activeModalStacks, replaceActiveModalStack, isGameActive, miscUiState, gameAdditionalState } = require('./globalState') -const { pointerLock, goFullscreen, toNumber, isCypress } = require('./utils') +const { pointerLock, goFullscreen, toNumber, isCypress, loadScript, toMajorVersion, setLoadingScreenStatus } = require('./utils') const { notification } = require('./menus/notification') const { removePanorama, addPanoramaCubeMap, initPanoramaOptions } = require('./panorama') const { startLocalServer, unsupportedLocalServerFeatures } = require('./createLocalServer') @@ -174,17 +176,6 @@ const hud = document.getElementById('hud') const optionsScrn = document.getElementById('options-screen') const pauseMenu = document.getElementById('pause-screen') -function setLoadingScreenStatus (status, isError = false) { - // todo update in component instead - showModal(loadingScreen) - if (loadingScreen.hasError) { - miscUiState.gameLoaded = false - return - } - loadingScreen.hasError = isError - loadingScreen.status = status -} - let mouseMovePostHandle = (e) => { } let lastMouseCall function onMouseMove (e) { @@ -366,7 +357,7 @@ async function connect (connectOptions) { }) let singlePlayerServer try { - Object.assign(serverOptions, _.defaultsDeep({}, connectOptions.serverOverrides, options.localServerOptions, serverOptions)) + Object.assign(serverOptions, _.defaultsDeep({}, connectOptions.serverOverrides ?? {}, options.localServerOptions, serverOptions)) let version = connectOptions.botVersion ?? serverOptions.version if (version) { setLoadingScreenStatus(`Downloading data for ${version}`) @@ -376,7 +367,6 @@ async function connect (connectOptions) { if (singeplayer) { window.serverDataChannel ??= {} window.worldLoaded = false - Object.assign(serverOptions, _.defaultsDeep({}, connectOptions.serverOverrides, options.localServerOptions, serverOptions)) singlePlayerServer = window.singlePlayerServer = startLocalServer() // todo need just to call quit if started // loadingScreen.maybeRecoverable = false diff --git a/src/loadFolder.ts b/src/loadFolder.ts index 14d7f6861..6b7a3e5d9 100644 --- a/src/loadFolder.ts +++ b/src/loadFolder.ts @@ -18,6 +18,7 @@ export const fsState = proxy({ const PROPOSE_BACKUP = true +// todo rename to loadWorld export const loadFolder = async (root = '/world') => { // todo do it in singleplayer as well for (const key in forceCachedDataPaths) { @@ -47,7 +48,8 @@ export const loadFolder = async (root = '/world') => { const parsedRaw = await parseNbt(Buffer.from(levelDatContent)) const levelDat: import('./mcTypes').LevelDat = nbt.simplify(parsedRaw).Data - version = levelDat.Version?.Name + const qs = new URLSearchParams(window.location.search) + version = levelDat.Version?.Name ?? qs.get('version') if (!version) { const newVersion = prompt(`In 1.8 and before world save doesn\'t contain version info, please enter version you want to use to load the world.\nSupported versions ${supportedVersions.join(', ')}`, '1.8.8') if (!newVersion) return @@ -69,7 +71,7 @@ export const loadFolder = async (root = '/world') => { if (levelDat.generatorName) { isFlat = levelDat.generatorName === 'flat' } - if (!isFlat) { + if (!isFlat && levelDat.generatorName !== 'default' && levelDat.generatorName !== 'customized') { warnings.push(`Generator ${levelDat.generatorName} may not be supported yet`) } From 9787f798fb0b0ca4ac80b3eec523df766c28b7d8 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 2 Sep 2023 03:37:53 +0300 Subject: [PATCH 159/318] refactor to utils for fixes --- src/menus/pause_screen.js | 8 ++------ src/utils.js | 27 ++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/menus/pause_screen.js b/src/menus/pause_screen.js index aecdf6ccf..a863198b4 100644 --- a/src/menus/pause_screen.js +++ b/src/menus/pause_screen.js @@ -6,6 +6,7 @@ const { fsState } = require('../loadFolder') const { subscribe } = require('valtio') const { saveWorld } = require('../builtinCommands') const { notification } = require('./notification') +const { disconnect } = require('../utils') class PauseScreen extends LitElement { static get styles () { @@ -71,12 +72,7 @@ class PauseScreen extends LitElement {
    showModal(document.getElementById('options-screen'))}> { - if (window.singlePlayerServer) { - await saveWorld() - singlePlayerServer.quit() - } - bot._client.emit('end') - miscUiState.gameLoaded = false + disconnect() }}> ` diff --git a/src/utils.js b/src/utils.js index 411e92763..f48313929 100644 --- a/src/utils.js +++ b/src/utils.js @@ -1,9 +1,10 @@ //@ts-check -import { activeModalStack, miscUiState } from './globalState' +import { activeModalStack, miscUiState, showModal } from './globalState' import { notification } from './menus/notification' import * as crypto from 'crypto' import UUID from 'uuid-1345' import { options } from './optionsStorage' +import { saveWorld } from './builtinCommands' export const goFullscreen = async (doToggle = false) => { if (!document.fullscreenElement) { @@ -132,6 +133,30 @@ function javaUUID (s) { export function nameToMcOfflineUUID (name) { return (new UUID(javaUUID('OfflinePlayer:' + name))).toString() } + +export const setLoadingScreenStatus = function (/** @type {string} */status, isError = false) { + const loadingScreen = document.getElementById('loading-error-screen') + + // todo update in component instead + showModal(loadingScreen) + if (loadingScreen.hasError) { + miscUiState.gameLoaded = false + return + } + loadingScreen.hasError = isError + loadingScreen.status = status +} + + +export const disconnect = async () => { + if (window.singlePlayerServer) { + await saveWorld() + singlePlayerServer.quit() + } + bot._client.emit('end') + miscUiState.gameLoaded = false +} + export const loadScript = async function (/** @type {string} */ scriptSrc) { if (document.querySelector(`script[src="${scriptSrc}"]`)) { return From f92c1f7fc42b21499e6636223a288804262e7c19 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 2 Sep 2023 09:19:48 +0300 Subject: [PATCH 160/318] add eruda --- src/eruda.js | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/eruda.js diff --git a/src/eruda.js b/src/eruda.js new file mode 100644 index 000000000..fd21fde5d --- /dev/null +++ b/src/eruda.js @@ -0,0 +1,4 @@ +if (process.env.NODE_ENV === 'development') { + require('eruda').default.init() + console.log('JS Loaded in', Date.now() - window.startLoad) +} From b9f621de76752008edfe4a987f3b6339c2443aa3 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 2 Sep 2023 09:32:42 +0300 Subject: [PATCH 161/318] cleanup preparedata --- scripts/prepareData.mjs | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/scripts/prepareData.mjs b/scripts/prepareData.mjs index 2953736ca..a8e19ab7c 100644 --- a/scripts/prepareData.mjs +++ b/scripts/prepareData.mjs @@ -36,10 +36,9 @@ for (const [major, versions] of Object.entries(grouped)) { } contents += '})' - build({ + await build({ bundle: true, outfile: `dist/mc-data/${major}.js`, - // entryPoints: ['mcData.js'], stdin: { contents, @@ -47,33 +46,6 @@ for (const [major, versions] of Object.entries(grouped)) { sourcefile: `mcData${major}.js`, loader: 'js', }, - plugins: [ - // { - // name: 'mcData', - // setup (build) { - // build.onResolve({ - // filter: /^mcData\.js$/, - // }, ({ path, pluginData }) => { - // return { - // path, - // namespace: 'mc-data', - // } - // }) - // build.onLoad({ - // filter: /.*/, - // namespace: 'mc-data', - // }, ({ namespace, path }) => { - // const version = path.split('/')[2] - // const data = versions[version] - // if (!data) throw new Error(`No data for ${version}`) - // return { - // contents: `export const data = ${JSON.stringify(data, null, 2)}`, - // loader: 'js', - // } - // }) - // } - // } - ], }) } console.log('data prepared') From fc9fc8b308ab01c836d70d920c5990875675b0e5 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 3 Sep 2023 10:04:26 +0300 Subject: [PATCH 162/318] try to fix with css loading with webpack + new space-squid esbuild require --- package.json | 3 +++ webpack.common.js | 31 +++++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2d97f03c6..a6007b5c2 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "constants-browserify": "^1.0.0", "copy-webpack-plugin": "^11.0.0", "crypto-browserify": "^3.12.0", + "css-loader": "^6.8.1", "cypress": "^9.5.4", "cypress-esbuild-preprocessor": "^1.0.2", "events": "^3.3.0", @@ -84,8 +85,10 @@ "process": "github:PrismarineJS/node-process", "rimraf": "^5.0.1", "stream-browserify": "^3.0.0", + "style-loader": "^3.3.3", "three": "0.128.0", "timers-browserify": "^2.0.12", + "url-loader": "^4.1.1", "use-typed-event-listener": "^4.0.2", "vite": "^4.4.9", "webpack": "^5.88.2", diff --git a/webpack.common.js b/webpack.common.js index 58a6d9949..0d4308685 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -29,7 +29,9 @@ const config = { ), // Hack to allow creating the client in a browser express: false, net: 'net-browserify', - 'valtio/utils$': require.resolve('valtio/vanilla/utils'), + 'valtio$': require.resolve('./valtio.js'), + 'valtio/vanilla$': require.resolve('./valtio.js'), + 'valtio/utils$': require.resolve('./valtio.js'), jose: false }, fallback: { @@ -54,7 +56,9 @@ const config = { extensions: [ '.js', '.ts', - '.json' + '.json', + '.jsx', + '.tsx' ], }, module: { @@ -67,7 +71,30 @@ const config = { // target: 'es2015' // } }, + { + test: /\.(png|jpg|gif|svg)$/i, + use: [ + { + loader: 'url-loader', + options: { + limit: true, + }, + }, + ], + }, + { + test: /\.css$/i, + use: ["style-loader", { + loader: 'css-loader', + options: { url: false } + }], + }, ], + parser: { + javascript: { + commonjsMagicComments: true, + }, + }, }, plugins: [ new HtmlWebpackPlugin({ From 47f86ca86dea05214da496ed20e18c30f56d02af Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 3 Sep 2023 13:19:20 +0300 Subject: [PATCH 163/318] fix inventory & hotbar crash on unknown itme --- src/inventory.ts | 2 +- src/menus/components/hotbar.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/inventory.ts b/src/inventory.ts index 407ed0311..7ec34773c 100644 --- a/src/inventory.ts +++ b/src/inventory.ts @@ -64,7 +64,7 @@ const getItemSlice = (name) => { const invspriteImg = loadedImages.get('invsprite') if (!invspriteImg || !invspriteImg.width) return - const { x, y } = invspriteJson[name] + const { x, y } = invspriteJson[name] ?? /* unknown item */ { x: 0, y: 0 } const sprite = [x, y, 32, 32] return sprite } diff --git a/src/menus/components/hotbar.js b/src/menus/components/hotbar.js index 637fd4d96..948fae11c 100644 --- a/src/menus/components/hotbar.js +++ b/src/menus/components/hotbar.js @@ -148,7 +148,7 @@ class Hotbar extends LitElement { if (slot >= this.bot.inventory.hotbarStart + 9) return if (slot < this.bot.inventory.hotbarStart) return - const sprite = newItem ? invsprite[newItem.name] : invsprite.air + const sprite = newItem ? invsprite[newItem.name] ?? { x: 0, y: 0 } : invsprite.air const slotEl = this.shadowRoot.getElementById('hotbar-' + (slot - this.bot.inventory.hotbarStart)) const slotIcon = slotEl.children[0] const slotStack = slotEl.children[1] @@ -161,7 +161,7 @@ class Hotbar extends LitElement { async reloadHotbar () { for (let i = 0; i < 9; i++) { const item = this.bot.inventory.slots[this.bot.inventory.hotbarStart + i] - const sprite = item ? invsprite[item.name] : invsprite.air + const sprite = item ? invsprite[item.name] ?? { x: 0, y: 0 } : invsprite.air const slotEl = this.shadowRoot.getElementById('hotbar-' + i) const slotIcon = slotEl.children[0] const slotStack = slotEl.children[1] From f897a6e6806613c59282dd38ae3cd981911f2778 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 3 Sep 2023 13:19:47 +0300 Subject: [PATCH 164/318] add firefox attach config that I don't use --- .vscode/launch.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.vscode/launch.json b/.vscode/launch.json index 7b9f4733f..abdc541bc 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -43,5 +43,18 @@ "/**/*minecraftData*" ], }, + { + // to launch "C:\Program Files\Mozilla Firefox\firefox.exe" -start-debugger-server + "type": "firefox", + "name": "Attach Firefox", + "request": "attach", + // comment if using webpack + "url": "http://localhost:8080/", + "webRoot": "${workspaceFolder}/", + "skipFiles": [ + // "/**/*vendors*" + "/**/*minecraftData*" + ], + }, ] } From 0c1607b5505d7c96b9b04b1575b74e10a71e6c88 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 3 Sep 2023 13:20:26 +0300 Subject: [PATCH 165/318] add singleplayer explainer a few load steps --- src/index.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/index.js b/src/index.js index 659aea6b0..c59ea2da7 100644 --- a/src/index.js +++ b/src/index.js @@ -365,6 +365,18 @@ async function connect (connectOptions) { } if (singeplayer) { + // SINGLEPLAYER EXPLAINER: + // Note 1: here we have custom sync communication between server Client (flying-squid) and game client (mineflayer) + // Note 2: custom Server class is used which simplifies communication & Client creation on it's side + // local server started + // mineflayer.createBot (see source def) + // bot._client = bot._client ?? mc.createClient(options) <-- mc-protocol package + // tcpDns() skipped since we define connect option + // in setProtocol: we emit 'connect' here below so in that file we send set_protocol and login_start (onLogin handler) + // Client (class) of flying-squid (in server/login.js of mc-protocol): onLogin handler: skip most logic & go to loginClient() which assigns uuid and sends 'success' back to client (onLogin handler) and emits 'login' on the server (login.js in flying-squid handler) + // flying-squid: 'login' -> player.login -> now sends 'login' event to the client (handled in many plugins in mineflayer) -> then 'update_health' is sent which emits 'spawn' + + setLoadingScreenStatus('Starting local server') window.serverDataChannel ??= {} window.worldLoaded = false singlePlayerServer = window.singlePlayerServer = startLocalServer() @@ -378,6 +390,7 @@ async function connect (connectOptions) { } } + setLoadingScreenStatus('Creating mineflayer bot') bot = mineflayer.createBot({ host, port, From e51e7c2327e647f7e51fbb818d310c357d5943bc Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 3 Sep 2023 17:27:20 +0300 Subject: [PATCH 166/318] do not bundle large assets package, cleanup esbuildPlugins --- scripts/esbuildPlugins.mjs | 78 +++----------------------------------- src/menus/play_screen.js | 12 +++--- 2 files changed, 12 insertions(+), 78 deletions(-) diff --git a/scripts/esbuildPlugins.mjs b/scripts/esbuildPlugins.mjs index ae4193666..eccfd89f3 100644 --- a/scripts/esbuildPlugins.mjs +++ b/scripts/esbuildPlugins.mjs @@ -38,28 +38,11 @@ const plugins = [ loader: 'js', } }) - // build.onResolve({ - // filter: /^minecraft-assets$/, - // }, ({ resolveDir, path }) => { - // // if (!resolveDir.endsWith('minecraft-data')) return - // return { - // namespace: 'load-global-minecraft-assets', - // path - // } - // }) - // build.onLoad({ - // filter: /.+/, - // namespace: 'load-global-minecraft-assets', - // }, async () => { - // const resolvedPath = await build.resolve('minecraft-assets/index.js', { kind: 'require-call', resolveDir: process.cwd() }) - // let contents = (await fs.promises.readFile(resolvedPath.path, 'utf8')) - // contents = contents.slice(0, contents.indexOf('const data = ')) + 'const data = window.minecraftAssets;' + contents.slice(contents.indexOf('module.exports.versions')) - // return { - // contents, - // loader: 'js', - // resolveDir: dirname(resolvedPath.path), - // } - // }) + build.onResolve({ + filter: /^minecraft-assets$/, + }, () => { + throw new Error('hit banned package') + }) } }, { @@ -71,10 +54,7 @@ const plugins = [ filter: /.*/, }, async ({ path, ...rest }) => { if (join(rest.resolveDir, path).replaceAll('\\', '/').endsWith('minecraft-data/data.js')) { - return { - namespace: customMcDataNs, - path - } + throw new Error('Should not hit') } if (['.woff', '.woff2', '.ttf'].some(ext => path.endsWith(ext))) { return { @@ -85,52 +65,6 @@ const plugins = [ } }) - build.onLoad({ - filter: /.*/, - namespace: customMcDataNs, - }, async ({ path, ...rest }) => { - throw new Error('unreachable') - const resolvedPath = await build.resolve('minecraft-data/minecraft-data/data/dataPaths.json', { kind: 'require-call', resolveDir: process.cwd() }) - const dataPaths = JSON.parse(await fs.promises.readFile(resolvedPath.path, 'utf8')) - - // bedrock unsupported - delete dataPaths.bedrock - - const allowOnlyList = process.env.ONLY_MC_DATA?.split(',') ?? [] - - // skip data for 0.30c, snapshots and pre-releases - const ignoredVersionsRegex = /(^0\.30c$)|w|-pre|-rc/ - - const includedVersions = [] - let contents = 'module.exports =\n{\n' - for (const platform of Object.keys(dataPaths)) { - contents += ` '${platform}': {\n` - for (const version of Object.keys(dataPaths[platform])) { - if (allowOnlyList.length && !allowOnlyList.includes(version)) continue - if (ignoredVersionsRegex.test(version)) continue - - includedVersions.push(version) - contents += ` '${version}': {\n` - for (const dataType of Object.keys(dataPaths[platform][version])) { - const loc = `minecraft-data/data/${dataPaths[platform][version][dataType]}/` - contents += ` get ${dataType} () { return require("./${loc}${dataType}.json") },\n` - } - contents += ' },\n' - } - contents += ' },\n' - } - contents += '}\n' - - if (prod) { - console.log('Included mc-data versions:', includedVersions) - } - return { - contents, - loader: 'js', - resolveDir: join(dirname(resolvedPath.path), '../..'), - } - }) - build.onEnd(async ({ metafile, outputFiles }) => { // write outputFiles for (const file of outputFiles) { diff --git a/src/menus/play_screen.js b/src/menus/play_screen.js index 81e7d53f8..0cdcf3cda 100644 --- a/src/menus/play_screen.js +++ b/src/menus/play_screen.js @@ -1,12 +1,12 @@ +//@ts-check const { LitElement, html, css } = require('lit') const { commonCss } = require('./components/common') const { hideCurrentModal } = require('../globalState') -const mcAssets = require("minecraft-assets") -const data = require('minecraft-data') const mineflayer = require('mineflayer') +const viewerSupportedVersions = require('prismarine-viewer/viewer/supportedVersions.json') -const fullySupporedVersions = mcAssets.versions -const partialSupportVersions = mineflayer.supportedVersions +const fullySupporedVersions = viewerSupportedVersions +const partiallySupportVersions = mineflayer.supportedVersions class PlayScreen extends LitElement { static get styles () { @@ -175,8 +175,8 @@ class PlayScreen extends LitElement { pmui-id="botversion" pmui-value="${this.version}" pmui-inputmode="decimal" - state="${this.version && (fullySupporedVersions.includes(this.version) ? '' : /* TODO improve check: check exact including all */ partialSupportVersions.some(v => this.version.startsWith(v)) ? 'warning' : 'invalid')}" - .autocompleteValues=${mcAssets.versions} + state="${this.version && (fullySupporedVersions.includes(/** @type {any} */(this.version)) ? '' : /* TODO improve check: check exact including all */ partiallySupportVersions.some(v => this.version.startsWith(v)) ? 'warning' : 'invalid')}" + .autocompleteValues=${fullySupporedVersions} @input=${e => { this.version = e.target.value }} >
    From 6faa3c63beb0c9757dcd63d76b5bae067743463b Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 3 Sep 2023 18:41:44 +0300 Subject: [PATCH 167/318] speed preparedata --- scripts/prepareData.mjs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/prepareData.mjs b/scripts/prepareData.mjs index a8e19ab7c..f128f3110 100644 --- a/scripts/prepareData.mjs +++ b/scripts/prepareData.mjs @@ -24,6 +24,8 @@ for (const [version, data] of Object.entries(dataPaths.pc)) { } console.log('preparing data') +console.time('data prepared') +let builds = [] for (const [major, versions] of Object.entries(grouped)) { let contents = 'Object.assign(window.mcData, {\n' for (const [version, dataSet] of Object.entries(versions)) { @@ -36,7 +38,7 @@ for (const [major, versions] of Object.entries(grouped)) { } contents += '})' - await build({ + const promise = build({ bundle: true, outfile: `dist/mc-data/${major}.js`, stdin: { @@ -47,5 +49,7 @@ for (const [major, versions] of Object.entries(grouped)) { loader: 'js', }, }) + builds.push(promise) } -console.log('data prepared') +await Promise.all(builds) +console.timeEnd('data prepared') From 734ecdf3f6a9aa34da3aa1c7457245665a3f92c3 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 3 Sep 2023 18:42:29 +0300 Subject: [PATCH 168/318] fix always showing mobile inventory button --- src/menus/components/hotbar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/menus/components/hotbar.js b/src/menus/components/hotbar.js index 948fae11c..216454c37 100644 --- a/src/menus/components/hotbar.js +++ b/src/menus/components/hotbar.js @@ -224,9 +224,9 @@ class Hotbar extends LitElement {
    -
    { + ${miscUiState.currentTouch && html`
    { showModal({ reactType: 'inventory', }) - }}> + }}>`}
    From 54d6598ac91f510d03b7f56900179d4b7af6dde0 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 07:39:16 +0300 Subject: [PATCH 169/318] refactor controls to use contro-max! it allows to use between mobile keyboard & gamepad consistently! fixed double jump! --- .gitignore | 3 +- .vscode/launch.json | 1 + package.json | 1 + src/botControls.js | 193 ------------------------ src/chat.js | 16 -- src/controls.ts | 266 +++++++++++++++++++++++++++++++++ src/index.js | 6 +- src/menus/components/hotbar.js | 4 +- src/menus/options_screen.js | 2 +- src/reactUi.jsx | 83 ++-------- tsconfig.json | 3 +- 11 files changed, 291 insertions(+), 287 deletions(-) delete mode 100644 src/botControls.js create mode 100644 src/controls.ts diff --git a/.gitignore b/.gitignore index 23b666f87..950306c9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ node_modules/ package-lock.json .vscode -public +**/public *.log .env.local Thumbs.db @@ -13,3 +13,4 @@ dist world out *.iml +.vercel diff --git a/.vscode/launch.json b/.vscode/launch.json index abdc541bc..87e66901e 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,5 +1,6 @@ { "configurations": [ + // UPDATED: all configs below are misconfigured and will crash vscode, open dist/index.html and use live preview debug instead // recommended as much faster { // to launch "C:\Program Files\Google\Chrome Beta\Application\chrome.exe" --remote-debugging-port=9222 diff --git a/package.json b/package.json index a6007b5c2..ba7869023 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "buffer": "^6.0.3", "clean-webpack-plugin": "^4.0.0", "constants-browserify": "^1.0.0", + "contro-max": "^0.1.0", "copy-webpack-plugin": "^11.0.0", "crypto-browserify": "^3.12.0", "css-loader": "^6.8.1", diff --git a/src/botControls.js b/src/botControls.js deleted file mode 100644 index 829a0db77..000000000 --- a/src/botControls.js +++ /dev/null @@ -1,193 +0,0 @@ -//@ts-check - -const { Vec3 } = require('vec3') -const { isGameActive, showModal, gameAdditionalState, activeModalStack } = require('./globalState') -const { subscribe } = require('valtio') - -const keyBindScrn = document.getElementById('keybinds-screen') - -// these controls are for gamemode 3 actually - -const makeInterval = (fn, interval) => { - const intervalId = setInterval(fn, interval) - - const cleanup = () => { - clearInterval(intervalId) - cleanup.active = false - } - cleanup.active = true - return cleanup -} - -const flySpeedMult = 0.5 - -const isFlying = () => bot.physics.gravity === 0 -/** @type {ReturnType|undefined} */ -let endFlyLoop - -const currentFlyVector = new Vec3(0, 0, 0) -window.currentFlyVector = currentFlyVector - -const startFlyLoop = () => { - if (!isFlying()) return - endFlyLoop?.() - - endFlyLoop = makeInterval(() => { - if (!window.bot) endFlyLoop() - bot.entity.position.add(currentFlyVector.clone().multiply(new Vec3(flySpeedMult, flySpeedMult, flySpeedMult))) - }, 50) -} - -// todo we will get rid of patching it when refactor controls -let originalSetControlState -const patchedSetControlState = (action, state) => { - if (!isFlying()) { - return originalSetControlState(action, state) - } - - const actionPerFlyVector = { - jump: new Vec3(0, 1, 0), - sneak: new Vec3(0, -1, 0), - } - - const changeVec = actionPerFlyVector[action] - if (!changeVec) { - return originalSetControlState(action, state) - } - const toAddVec = changeVec.scaled(state ? 1 : -1) - for (const coord of ['x', 'y', 'z']) { - if (toAddVec[coord] === 0) continue - if (currentFlyVector[coord] === toAddVec[coord]) return - } - currentFlyVector.add(toAddVec) -} - -const standardAirborneAcceleration = 0.02 -const toggleFly = () => { - if (bot.game.gameMode !== 'creative' && bot.game.gameMode !== 'spectator') return - if (bot.setControlState !== patchedSetControlState) { - originalSetControlState = bot.setControlState - bot.setControlState = patchedSetControlState - } - - if (isFlying()) { - bot.physics['airborneAcceleration'] = standardAirborneAcceleration - bot.creative.stopFlying() - endFlyLoop?.() - } else { - // window.flyingSpeed will be removed - bot.physics['airborneAcceleration'] = window.flyingSpeed ?? 0.1 - bot.entity.velocity = new Vec3(0, 0, 0) - bot.creative.startFlying() - startFlyLoop() - } - gameAdditionalState.isFlying = isFlying() -} - -/** @type {Set} */ -const pressedKeys = new Set() -// window.pressedKeys = pressedKeys - -// detect pause open, as ANY keyup event is not fired when you exit pointer lock (esc) -subscribe(activeModalStack, () => { - if (activeModalStack.length) { - // iterate over pressedKeys - for (const key of pressedKeys) { - const e = new KeyboardEvent('keyup', { code: key }) - document.dispatchEvent(e) - } - } -}) - -let lastJumpUsage = 0 -document.addEventListener('keydown', (e) => { - if (!isGameActive(true)) return - - keyBindScrn.keymaps.forEach(km => { - if (e.code === km.key) { - switch (km.defaultKey) { - case 'KeyE': - // todo reenable - showModal({ reactType: 'inventory', }) - // todo seems to be workaround - // avoid calling inner keybinding listener, but should be handled there - e.stopImmediatePropagation() - break - case 'KeyQ': - if (bot.heldItem) bot.tossStack(bot.heldItem) - break - case 'ControlLeft': - bot.setControlState('sprint', true) - gameAdditionalState.isSprinting = true - break - case 'ShiftLeft': - bot.setControlState('sneak', true) - break - case 'Space': - bot.setControlState('jump', true) - break - case 'KeyD': - bot.setControlState('right', true) - e.preventDefault() - break - case 'KeyA': - bot.setControlState('left', true) - e.preventDefault() - break - case 'KeyS': - bot.setControlState('back', true) - e.preventDefault() - break - case 'KeyW': - bot.setControlState('forward', true) - break - } - } - }) - pressedKeys.add(e.code) -}, { - capture: true, -}) - -document.addEventListener('keyup', (e) => { - // workaround for pause pressed keys, multiple keyboard - if (!isGameActive(false) || !pressedKeys.has(e.code)) { - return - } - - keyBindScrn.keymaps.forEach(km => { - if (e.code === km.key) { - switch (km.defaultKey) { - case 'ControlLeft': - bot.setControlState('sprint', false) - gameAdditionalState.isSprinting = false - break - case 'ShiftLeft': - bot.setControlState('sneak', false) - break - case 'Space': - const toggleFlyAction = Date.now() - lastJumpUsage < 500 - if (toggleFlyAction) { - toggleFly() - } - lastJumpUsage = Date.now() - - bot.setControlState('jump', false) - break - case 'KeyD': - bot.setControlState('right', false) - break - case 'KeyA': - bot.setControlState('left', false) - break - case 'KeyS': - bot.setControlState('back', false) - break - case 'KeyW': - bot.setControlState('forward', false) - break - } - } - }) - pressedKeys.delete(e.code) -}, false) diff --git a/src/chat.js b/src/chat.js index 2497d09d5..bd36b8374 100644 --- a/src/chat.js +++ b/src/chat.js @@ -228,24 +228,8 @@ class ChatBox extends LitElement { } }) - const keyBindScrn = document.getElementById('keybinds-screen') - document.addEventListener('keypress', e => { if (!this.inChat && activeModalStack.length === 0) { - keyBindScrn.keymaps.forEach(km => { - if (e.code === km.key) { - switch (km.defaultKey) { - case 'KeyT': - setTimeout(() => this.enableChat(), 0) - break - case 'Slash': - setTimeout(() => this.enableChat('/'), 0) - e.preventDefault() - break - } - } - }) - return false } diff --git a/src/controls.ts b/src/controls.ts new file mode 100644 index 000000000..c60233337 --- /dev/null +++ b/src/controls.ts @@ -0,0 +1,266 @@ +//@ts-check + +import { Vec3 } from 'vec3' +import { isGameActive, showModal, gameAdditionalState, activeModalStack, hideCurrentModal } from './globalState' +import { proxy, subscribe } from 'valtio' + +import { ControMax } from 'contro-max/build/controMax' +import { CommandEventArgument, SchemaCommandInput } from 'contro-max/build/types' +import { stringStartsWith } from 'contro-max/build/stringUtils' + +// doesnt seem to work for now +const customKeymaps = proxy(JSON.parse(localStorage.keymap || '{}')) +subscribe(customKeymaps, () => { + localStorage.keymap = JSON.parse(customKeymaps) +}) + +export const contro = new ControMax({ + commands: { + general: { + jump: ['Space', 'A'], + inventory: ['KeyE', 'X'], + drop: ['KeyQ', 'B'], + sneak: ['ShiftLeft', 'Right Stick'], + sprint: ['ControlLeft', 'Left Stick'], + nextHotbarSlot: [null, 'Left Bumper'], + prevHotbarSlot: [null, 'Right Bumper'], + attackDestroy: [null, 'Right Trigger'], + interactPlace: [null, 'Left Trigger'], + chat: [['KeyT', 'Enter'], null], + command: ['Slash', null], + }, + // waila: { + // showLookingBlockRecipe: ['Numpad3'], + // showLookingBlockUsages: ['Numpad4'] + // } + } satisfies Record>, + movementKeymap: 'WASD', + movementVector: '2d', + groupedCommands: { + general: { + switchSlot: ['Digits', []] + } + }, +}, { + target: document, + captureEvents() { + return bot && isGameActive(false) + }, + storeProvider: { + load: () => customKeymaps, + save() { }, + } +}) +export type Command = CommandEventArgument['command'] + +const setSprinting = (state: boolean) => { + bot.setControlState('sprint', state) + gameAdditionalState.isSprinting = state +} + +contro.on('movementUpdate', ({ vector, gamepadIndex }) => { + // gamepadIndex will be used for splitscreen in future + const coordToAction = [ + ['z', -1, 'forward'], + ['z', 1, 'back'], + ['x', -1, 'left'], + ['x', 1, 'right'], + ] as const + + const newState: Partial = {} + for (const [coord, v] of Object.entries(vector)) { + if (v === undefined || Math.abs(v) < 0.3) continue + // todo use raw values eg for slow movement + const mappedValue = v < 0 ? -1 : 1 + const foundAction = coordToAction.find(([c, mapV]) => c === coord && mapV === mappedValue)?.[2] + newState[foundAction] = true + } + + for (const key of ['forward', 'back', 'left', 'right'] as const) { + if (newState[key] === bot.controlState[key]) continue + const action = !!newState[key] + if (action && !isGameActive(true)) continue + bot.setControlState(key, action) + + if (key === 'forward') { + // todo workaround: need to refactor + if (action) { + contro.emit('trigger', { command: 'general.forward' } as any) + } else { + setSprinting(false) + } + } + } +}) + +let lastCommandTrigger = null as { command: string, time: number } | null + +const secondActionActivationTimeout = 600 +const secondActionCommands = { + 'general.jump'() { + toggleFly() + }, + 'general.forward'() { + setSprinting(true) + } +} + +// detect pause open, as ANY keyup event is not fired when you exit pointer lock (esc) +subscribe(activeModalStack, () => { + if (activeModalStack.length) { + // iterate over pressedKeys + for (const key of contro.pressedKeys) { + contro.pressedKeyOrButtonChanged({ code: key }, false) + } + } +}) + +const onTriggerOrReleased = (command: Command, pressed: boolean) => { + // always allow release! + if (pressed && !isGameActive(true)) return + if (stringStartsWith(command, 'general')) { + // handle general commands + switch (command) { + case 'general.jump': + bot.setControlState('jump', pressed) + break + case 'general.sneak': + bot.setControlState('sneak', pressed) + break + case 'general.sprint': + setSprinting(pressed) + break + } + } +} + +// im still not sure, maybe need to refactor to handle in inventory instead +const alwaysHandledCommand = (command: Command) => { + if (command === 'general.inventory') { + if (activeModalStack.at(-1)?.reactType === 'inventory') { + hideCurrentModal() + } + } +} + +contro.on('trigger', ({ command }) => { + const willContinue = !isGameActive(true) + alwaysHandledCommand(command) + if (willContinue) return + + const secondActionCommand = secondActionCommands[command] + if (secondActionCommand) { + const commandToTrigger = secondActionCommands[lastCommandTrigger?.command] + if (commandToTrigger && Date.now() - lastCommandTrigger.time < secondActionActivationTimeout) { + commandToTrigger() + lastCommandTrigger = null + } else { + lastCommandTrigger = { + command, + time: Date.now(), + } + } + } + + onTriggerOrReleased(command, true) + + if (stringStartsWith(command, 'general')) { + switch (command) { + case 'general.inventory': + document.exitPointerLock?.() + showModal({ reactType: 'inventory' }) + break + case 'general.drop': + if (bot.heldItem) bot.tossStack(bot.heldItem) + break + case 'general.chat': + document.getElementById('hud').shadowRoot.getElementById('chat').enableChat() + break + case 'general.command': + document.getElementById('hud').shadowRoot.getElementById('chat').enableChat('/') + break + // todo place / destroy + } + } +}) + +contro.on('release', ({ command }) => { + onTriggerOrReleased(command, false) +}) + +// #region creative fly +// these controls are more like for gamemode 3 + +const makeInterval = (fn, interval) => { + const intervalId = setInterval(fn, interval) + + const cleanup = () => { + clearInterval(intervalId) + cleanup.active = false + } + cleanup.active = true + return cleanup +} + +const isFlying = () => bot.physics.gravity === 0 +let endFlyLoop: ReturnType | undefined + +const currentFlyVector = new Vec3(0, 0, 0) +window.currentFlyVector = currentFlyVector + +const startFlyLoop = () => { + if (!isFlying()) return + endFlyLoop?.() + + endFlyLoop = makeInterval(() => { + if (!window.bot) endFlyLoop() + bot.entity.position.add(currentFlyVector.clone().multiply(new Vec3(0, 0.5, 0))) + }, 50) +} + +// todo we will get rid of patching it when refactor controls +let originalSetControlState +const patchedSetControlState = (action, state) => { + if (!isFlying()) { + return originalSetControlState(action, state) + } + + const actionPerFlyVector = { + jump: new Vec3(0, 1, 0), + sneak: new Vec3(0, -1, 0), + } + + const changeVec = actionPerFlyVector[action] + if (!changeVec) { + return originalSetControlState(action, state) + } + const toAddVec = changeVec.scaled(state ? 1 : -1) + for (const coord of ['x', 'y', 'z']) { + if (toAddVec[coord] === 0) continue + if (currentFlyVector[coord] === toAddVec[coord]) return + } + currentFlyVector.add(toAddVec) +} + +const standardAirborneAcceleration = 0.02 +const toggleFly = () => { + if (bot.game.gameMode !== 'creative' && bot.game.gameMode !== 'spectator') return + if (bot.setControlState !== patchedSetControlState) { + originalSetControlState = bot.setControlState + bot.setControlState = patchedSetControlState + } + + if (isFlying()) { + bot.physics['airborneAcceleration'] = standardAirborneAcceleration + bot.creative.stopFlying() + endFlyLoop?.() + } else { + // window.flyingSpeed will be removed + bot.physics['airborneAcceleration'] = window.flyingSpeed ?? 0.1 + bot.entity.velocity = new Vec3(0, 0, 0) + bot.creative.startFlying() + startFlyLoop() + } + gameAdditionalState.isFlying = isFlying() +} +// #endregion diff --git a/src/index.js b/src/index.js index c59ea2da7..a1d66b9f9 100644 --- a/src/index.js +++ b/src/index.js @@ -37,7 +37,7 @@ require('./menus/title_screen') require('./optionsStorage') require('./reactUi.jsx') -require('./botControls') +require('./controls') require('./dragndrop') require('./browserfs') require('./eruda') @@ -47,9 +47,7 @@ const net = require('net') const Stats = require('stats.js') const mineflayer = require('mineflayer') -const { WorldView, Viewer, MapControls } = require('prismarine-viewer/viewer') -const PrismarineWorld = require('prismarine-world') -const nbt = require('prismarine-nbt') +const { WorldView, Viewer } = require('prismarine-viewer/viewer') const pathfinder = require('mineflayer-pathfinder') const { Vec3 } = require('vec3') diff --git a/src/menus/components/hotbar.js b/src/menus/components/hotbar.js index 216454c37..7f65681e5 100644 --- a/src/menus/components/hotbar.js +++ b/src/menus/components/hotbar.js @@ -224,9 +224,9 @@ class Hotbar extends LitElement {
    - ${miscUiState.currentTouch && html`
    { + ${miscUiState.currentTouch ? html`
    { showModal({ reactType: 'inventory', }) - }}>`} + }}>` : undefined}
    diff --git a/src/menus/options_screen.js b/src/menus/options_screen.js index ba0f19e8a..fc2cfce13 100644 --- a/src/menus/options_screen.js +++ b/src/menus/options_screen.js @@ -113,7 +113,7 @@ class OptionsScreen extends CommonOptionsScreen { }}>
    - showModal(document.getElementById('keybinds-screen'))}> + showModal(document.getElementById('keybinds-screen'))}> { this.changeOption('guiScale', e.target.value) document.documentElement.style.setProperty('--guiScale', `${this.guiScale}`) diff --git a/src/reactUi.jsx b/src/reactUi.jsx index 5a254adb3..72751aaf2 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -1,13 +1,13 @@ //@ts-check import { renderToDom } from '@zardoy/react-util' -import { LeftTouchArea, InventoryNew, RightTouchArea, useUsingTouch, useInterfaceState } from '@dimaka/interface' +import { LeftTouchArea, RightTouchArea, useUsingTouch, useInterfaceState } from '@dimaka/interface' import { css } from '@emotion/css' -import { activeModalStack, hideCurrentModal, isGameActive } from './globalState' -import { useEffect, useState } from 'react' -import { useProxy } from 'valtio/utils' -import useTypedEventListener from 'use-typed-event-listener' +import { activeModalStack, isGameActive } from './globalState' import { isProbablyIphone } from './menus/components/common' +// import DeathScreen from './react/DeathScreen' +import { useSnapshot } from 'valtio' +import { contro } from './controls' // todo useInterfaceState.setState({ @@ -17,23 +17,22 @@ useInterfaceState.setState({ }, updateCoord: ([coord, state]) => { const coordToAction = [ - ['z', -1, 'forward'], - ['z', 1, 'back'], - ['x', -1, 'left'], - ['x', 1, 'right'], - ['y', 1, 'jump'], + ['z', -1, 'KeyW'], + ['z', 1, 'KeyS'], + ['x', -1, 'KeyA'], + ['x', 1, 'KeyD'], + ['y', 1, 'Space'], // todo jump ] // todo refactor const actionAndState = state !== 0 ? coordToAction.find(([axis, value]) => axis === coord && value === state) : coordToAction.filter(([axis]) => axis === coord) if (!bot) return if (state === 0) { for (const action of actionAndState) { - //@ts-ignore - bot.setControlState(action[2], false) + contro.pressedKeyOrButtonChanged({code: action[2],}, false) } } else { //@ts-ignore - bot.setControlState(actionAndState[2], true) + contro.pressedKeyOrButtonChanged({code: actionAndState[2],}, true) } } }) @@ -67,71 +66,17 @@ const TouchControls = () => { ) } -const useActivateModal = (/** @type {string} */search, onlyLast = true) => { - const stack = useProxy(activeModalStack) - - return onlyLast ? stack.at(-1)?.reactType === search : stack.some((modal) => modal.reactType === search) -} - function useIsBotAvailable() { - const stack = useProxy(activeModalStack) + const stack = useSnapshot(activeModalStack) return isGameActive(false) } -function InventoryWrapper() { - const isInventoryOpen = useActivateModal('inventory', false) - const [slots, setSlots] = useState(bot.inventory.slots) - - useEffect(() => { - if (isInventoryOpen) { - document.exitPointerLock?.() - } - }, [isInventoryOpen]) - - useTypedEventListener(document, 'keydown', (e) => { - // todo use refactored keymap - if (e.code === 'KeyE' && activeModalStack.at(-1)?.reactType === 'inventory') { - hideCurrentModal() - } - }) - - useEffect(() => { - bot.inventory.on('updateSlot', () => { - setSlots([...bot.inventory.slots]) - }) - // todo need to think of better solution - window['mcData'] = require('minecraft-data')(bot.version) - window['mcAssets'] = require('minecraft-assets')(bot.version) - }, []) - - if (!isInventoryOpen) return null - - return null - - // return
    div { - // scale: 0.6; - // background: transparent !important; - // } - // `}> - // { - // bot.moveSlotItem(oldSlot, newSlotIndex) - // } } /> - //
    -} - const App = () => { const isBotAvailable = useIsBotAvailable() - if (!isBotAvailable) return null + // if (!isBotAvailable) return return
    -
    } diff --git a/tsconfig.json b/tsconfig.json index 883dcf2fc..d6ed70d8f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,7 +8,8 @@ "allowSyntheticDefaultImports": true, "noEmit": true, "strictFunctionTypes": true, - "resolveJsonModule": true + "resolveJsonModule": true, + "noFallthroughCasesInSwitch": true // "strictNullChecks": true }, "include": [ From 70056347ad03daad2ba533dc20a3301a11defea4 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 07:51:28 +0300 Subject: [PATCH 170/318] fix sw error, cache mc-data --- esbuild.mjs | 18 ++---------------- scripts/build.js | 3 +++ 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/esbuild.mjs b/esbuild.mjs index 43ee2b1dc..9c55251c2 100644 --- a/esbuild.mjs +++ b/esbuild.mjs @@ -10,20 +10,6 @@ import { getSwAdditionalEntries } from './scripts/build.js' /** @type {import('esbuild').BuildOptions} */ let baseConfig = {} -// // legacy html config -// baseConfig = { -// entryPoints: ['index.html'], -// assetNames: 'assets/[name]', -// chunkNames: '[ext]/[name]', -// outdir: 'dist', -// outfile: undefined, -// plugins: [ -// htmlPlugin({ -// scriptsTarget: 'esnext', -// }) -// ], -// } - // // testing config // baseConfig = { // entryPoints: ['files/index.js'], @@ -35,8 +21,7 @@ try { await import('./localSettings.mjs') } catch { } -fs.copyFileSync('index.html', 'dist/index.html') -fs.writeFileSync('dist/index.html', fs.readFileSync('dist/index.html', 'utf8').replace('', ''), 'utf8') +fs.writeFileSync('dist/index.html', fs.readFileSync('index.html', 'utf8').replace('', ''), 'utf8') const watch = process.argv.includes('--watch') || process.argv.includes('-w') const prod = process.argv.includes('--prod') @@ -142,6 +127,7 @@ if (watch) { skipWaiting: true, clientsClaim: true, additionalManifestEntries: getSwAdditionalEntries(), + globPatterns: [], swDest: 'dist/service-worker.js', }) } diff --git a/scripts/build.js b/scripts/build.js index 9f30fd36e..e71413b07 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -47,6 +47,7 @@ exports.getSwAdditionalEntries = () => { 'index.js', 'index.css', 'favicon.ico', + `mc-data/${defaultLocalServerOptions.versionMajor}.js`, `blocksStates/${singlePlayerVersion}.json`, 'extra-textures/**', // todo-low copy from assets @@ -60,6 +61,8 @@ exports.getSwAdditionalEntries = () => { `textures/1.16.4/entity/squid.png`, ] const filesNeedsCacheKey = [ + 'index.js', + 'index.css', 'worker.js', ] const output = [] From 7622a153e26062cce8b2274fe06b7c526fb37dcf Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 07:52:26 +0300 Subject: [PATCH 171/318] controls: use ctrl only as activation to match original game behavior --- src/controls.ts | 5 ++++- src/reactUi.jsx | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/controls.ts b/src/controls.ts index c60233337..e4056dd7e 100644 --- a/src/controls.ts +++ b/src/controls.ts @@ -128,7 +128,10 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => { bot.setControlState('sneak', pressed) break case 'general.sprint': - setSprinting(pressed) + // todo add setting to change behavior + if (pressed) { + setSprinting(pressed) + } break } } diff --git a/src/reactUi.jsx b/src/reactUi.jsx index 72751aaf2..e8f6656da 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -74,7 +74,7 @@ function useIsBotAvailable() { const App = () => { const isBotAvailable = useIsBotAvailable() - // if (!isBotAvailable) return + if (!isBotAvailable) return null return
    From e66862dd5c192498225aa83e3fa83d2b3a94a90a Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 07:55:22 +0300 Subject: [PATCH 172/318] dispose world on exit (that should finally allow clean exit) --- src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.js b/src/index.js index a1d66b9f9..71abd0b30 100644 --- a/src/index.js +++ b/src/index.js @@ -305,6 +305,7 @@ async function connect (connectOptions) { /** @type {mineflayer.Bot} */ let bot const destroyAll = () => { + viewer.resetAll() window.singlePlayerServer = undefined // simple variant, still buggy From 342a2f0f70e53ee4f4419ede286c6d8a15b6772a Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 07:57:23 +0300 Subject: [PATCH 173/318] singlePlayerServer -> localServer (intention: will allow other players to connect soon) --- src/builtinCommands.ts | 12 ++++++------ src/globalState.js | 4 ++-- src/globals.d.ts | 2 +- src/globals.js | 2 +- src/index.js | 14 ++++++++------ src/utils.js | 4 ++-- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts index 61de33661..15f2df8a5 100644 --- a/src/builtinCommands.ts +++ b/src/builtinCommands.ts @@ -31,7 +31,7 @@ async function addFolderToZip(folderPath, zip, relativePath) { const exportWorld = async () => { // todo issue into chat warning if fs is writable! const zip = new JSZip() - let worldFolder: string = singlePlayerServer.options.worldFolder + let worldFolder: string = localServer.options.worldFolder if (!worldFolder.startsWith('/')) worldFolder = `/${worldFolder}` await addFolderToZip(worldFolder, zip, '') @@ -66,9 +66,9 @@ const commands = [ if (fsState.isReadonly || !fsState.syncFs) return // todo for testing purposes sessionStorage.oldData = localStorage - singlePlayerServer.quit() + localServer.quit() // todo browserfs bug - fs.rmdirSync(singlePlayerServer.options.worldFolder, { recursive: true }) + fs.rmdirSync(localServer.options.worldFolder, { recursive: true }) } }, { @@ -80,7 +80,7 @@ const commands = [ ] export const tryHandleBuiltinCommand = (message) => { - if (!singlePlayerServer) return + if (!localServer) return for (const command of commands) { if (command.command.includes(message)) { @@ -91,10 +91,10 @@ export const tryHandleBuiltinCommand = (message) => { } export const saveWorld = async () => { - for (const player of window.singlePlayerServer.players) { + for (const player of localServer.players) { await player.save() } - const worlds = [singlePlayerServer.overworld] + const worlds = [localServer.overworld] for (const world of worlds) { await world.storageProvider.close() } diff --git a/src/globalState.js b/src/globalState.js index 7a500e4bf..7d83340b5 100644 --- a/src/globalState.js +++ b/src/globalState.js @@ -124,8 +124,8 @@ export const gameAdditionalState = proxy({ window.gameAdditionalState = gameAdditionalState const savePlayers = () => { - if (!window.singlePlayerServer) return - for (const player of window.singlePlayerServer.players) { + if (!window.localServer) return + for (const player of window.localServer.players) { player.save() } } diff --git a/src/globals.d.ts b/src/globals.d.ts index cc13b180e..ecad16368 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -3,7 +3,7 @@ declare const THREE: typeof import('three') // todo declare const bot: import('mineflayer').Bot -declare const singlePlayerServer: any +declare const localServer: any declare interface Document { getElementById(id): any diff --git a/src/globals.js b/src/globals.js index 241853564..4362604c3 100644 --- a/src/globals.js +++ b/src/globals.js @@ -2,4 +2,4 @@ window.bot = undefined window.THREE = undefined -window.singlePlayerServer = undefined +window.localServer = undefined diff --git a/src/index.js b/src/index.js index 71abd0b30..5ba199193 100644 --- a/src/index.js +++ b/src/index.js @@ -306,7 +306,7 @@ async function connect (connectOptions) { let bot const destroyAll = () => { viewer.resetAll() - window.singlePlayerServer = undefined + window.localServer = undefined // simple variant, still buggy postRenderFrameFn = () => { } @@ -354,7 +354,7 @@ async function connect (connectOptions) { }, { signal: errorAbortController.signal }) - let singlePlayerServer + let localServer try { Object.assign(serverOptions, _.defaultsDeep({}, connectOptions.serverOverrides ?? {}, options.localServerOptions, serverOptions)) let version = connectOptions.botVersion ?? serverOptions.version @@ -378,13 +378,13 @@ async function connect (connectOptions) { setLoadingScreenStatus('Starting local server') window.serverDataChannel ??= {} window.worldLoaded = false - singlePlayerServer = window.singlePlayerServer = startLocalServer() + localServer = window.localServer = startLocalServer() // todo need just to call quit if started // loadingScreen.maybeRecoverable = false // init world, todo: do it for any async plugins - if (!singlePlayerServer.worldsReady) { + if (!localServer.worldsReady) { await new Promise(resolve => { - singlePlayerServer.once('worldsReady', resolve) + localServer.once('worldsReady', resolve) }) } } @@ -466,10 +466,12 @@ async function connect (connectOptions) { const center = bot.entity.position + /** @type {import('../prismarine-viewer/viewer/lib/worldView').WorldView} */ const worldView = new WorldView(bot.world, singeplayer ? renderDistance : Math.min(renderDistance, maxMultiplayerRenderDistance), center) if (singeplayer) { + let prevRenderDistance = renderDistance const d = subscribeKey(options, 'renderDistance', () => { - singlePlayerServer.options['view-distance'] = options.renderDistance + localServer.options['view-distance'] = options.renderDistance worldView.viewDistance = options.renderDistance window.onPlayerChangeRenderDistance?.(options.renderDistance) }) diff --git a/src/utils.js b/src/utils.js index f48313929..ae6ae43c0 100644 --- a/src/utils.js +++ b/src/utils.js @@ -149,9 +149,9 @@ export const setLoadingScreenStatus = function (/** @type {string} */status, isE export const disconnect = async () => { - if (window.singlePlayerServer) { + if (window.localServer) { await saveWorld() - singlePlayerServer.quit() + localServer.quit() } bot._client.emit('end') miscUiState.gameLoaded = false From ce566b02730edb124a0c524f84a5bacd1939d86f Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 07:57:59 +0300 Subject: [PATCH 174/318] upstream fork changes --- package.json | 2 +- src/index.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ba7869023..e7bfbc53c 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-refresh": "^0.14.0", - "space-squid": "github:zardoy/space-squid", + "space-squid": "github:zardoy/space-squid#everything", "speed-measure-webpack-plugin": "^1.5.0", "stats.js": "^0.17.0", "url": "^0.11.1", diff --git a/src/index.js b/src/index.js index 5ba199193..37d52094c 100644 --- a/src/index.js +++ b/src/index.js @@ -473,7 +473,9 @@ async function connect (connectOptions) { const d = subscribeKey(options, 'renderDistance', () => { localServer.options['view-distance'] = options.renderDistance worldView.viewDistance = options.renderDistance - window.onPlayerChangeRenderDistance?.(options.renderDistance) + localServer.players[0].emit('playerChangeRenderDistance', options.renderDistance) + worldView.updatePosition(bot.entity.position) + prevRenderDistance = options.renderDistance }) disposables.push(d) } From bebd65e65b4798eb548f4237d0954b77d538d932 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 08:10:20 +0300 Subject: [PATCH 175/318] display sync error as well! --- src/index.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/index.js b/src/index.js index 37d52094c..7e20ee892 100644 --- a/src/index.js +++ b/src/index.js @@ -354,6 +354,11 @@ async function connect (connectOptions) { }, { signal: errorAbortController.signal }) + window.addEventListener('error', (e) => { + handleError(e.message) + }, { + signal: errorAbortController.signal + }) let localServer try { Object.assign(serverOptions, _.defaultsDeep({}, connectOptions.serverOverrides ?? {}, options.localServerOptions, serverOptions)) From 70681fa519b19fef5bae1dd7768f97c0cb469adf Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 08:29:14 +0300 Subject: [PATCH 176/318] change default singleplayer version to 1.8.8 as it supports more features, preserve for old saves --- src/defaultLocalServerOptions.js | 3 ++- src/menus/title_screen.js | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/defaultLocalServerOptions.js b/src/defaultLocalServerOptions.js index 4df9ddc60..3ad6cebba 100644 --- a/src/defaultLocalServerOptions.js +++ b/src/defaultLocalServerOptions.js @@ -31,5 +31,6 @@ module.exports = { }, 'everybody-op': true, 'max-entities': 100, - 'version': '1.16.1', + 'version': '1.8.8', + versionMajor: '1.8' } diff --git a/src/menus/title_screen.js b/src/menus/title_screen.js index 93c6e1ff7..f11c320f1 100644 --- a/src/menus/title_screen.js +++ b/src/menus/title_screen.js @@ -3,8 +3,11 @@ const { showModal } = require('../globalState') const { fsState } = require('../loadFolder') const { openURL } = require('./components/common') const { LitElement, html, css, unsafeCSS } = require('lit') +const fs = require('fs') const mcImage = require('minecraft-assets/minecraft-assets/data/1.17.1/gui/title/minecraft.png') +const { options } = require('../optionsStorage') +const defaultLocalServerOptions = require('../defaultLocalServerOptions') // const SUPPORT_WORLD_LOADING = !!window.showDirectoryPicker const SUPPORT_WORLD_LOADING = true @@ -161,6 +164,12 @@ class TitleScreen extends LitElement { isReadonly: false, syncFs: true, }) + const notFirstTime = fs.existsSync('./world/level.dat') + if (notFirstTime && !options.localServerOptions.version) { + options.localServerOptions.version = '1.16.1' // legacy version, now we use 1.8.8 + } else { + options.localServerOptions.version ??= defaultLocalServerOptions.version + } this.dispatchEvent(new window.CustomEvent('singleplayer', {})) }}> ${SUPPORT_WORLD_LOADING ? html` { From c4ae6500ac92f1a89d85d4bf0c744949caa4dc53 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 08:42:08 +0300 Subject: [PATCH 177/318] add visual sneaking + touch support --- package.json | 2 +- src/controls.ts | 1 + src/globalState.js | 1 + src/index.js | 14 ++++++-------- src/reactUi.jsx | 1 + 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index e7bfbc53c..c516331e4 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "author": "PrismarineJS", "license": "MIT", "dependencies": { - "@dimaka/interface": "0.0.0-dev", + "@dimaka/interface": "0.0.1", "@emotion/css": "^11.11.2", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11", "@types/react": "^18.2.20", diff --git a/src/controls.ts b/src/controls.ts index e4056dd7e..5db86b39a 100644 --- a/src/controls.ts +++ b/src/controls.ts @@ -125,6 +125,7 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => { bot.setControlState('jump', pressed) break case 'general.sneak': + gameAdditionalState.isSneaking = pressed bot.setControlState('sneak', pressed) break case 'general.sprint': diff --git a/src/globalState.js b/src/globalState.js index 7d83340b5..86d6720f8 100644 --- a/src/globalState.js +++ b/src/globalState.js @@ -119,6 +119,7 @@ window.miscUiState = miscUiState export const gameAdditionalState = proxy({ isFlying: false, isSprinting: false, + isSneaking: false, }) window.gameAdditionalState = gameAdditionalState diff --git a/src/index.js b/src/index.js index 7e20ee892..c67d23e98 100644 --- a/src/index.js +++ b/src/index.js @@ -119,6 +119,7 @@ renderer.setSize(window.innerWidth, window.innerHeight) document.body.appendChild(renderer.domElement) // Create viewer +/** @type {import('../prismarine-viewer/viewer/lib/viewer').Viewer} */ const viewer = new Viewer(renderer, options.numWorkers) initPanoramaOptions(viewer) @@ -501,6 +502,11 @@ async function connect (connectOptions) { updateFov() subscribeKey(gameAdditionalState, 'isFlying', updateFov) subscribeKey(gameAdditionalState, 'isSprinting', updateFov) + const defaultPlayerHeight = viewer.playerHeight + subscribeKey(gameAdditionalState, 'isSneaking', () => { + viewer.playerHeight = gameAdditionalState.isSneaking ? defaultPlayerHeight - 0.3 : defaultPlayerHeight + viewer.setFirstPersonCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch) + }) optionsScrn.addEventListener('fov_changed', updateFov) viewer.setVersion(version) @@ -688,14 +694,6 @@ window.addEventListener('keydown', (e) => { // } }) -window.addEventListener('unhandledrejection', (e) => { - // todo - if (e.reason.message.includes('Unable to decode audio data')) { - console.warn(e.reason) - return - } -}) - addPanoramaCubeMap() showModal(document.getElementById('title-screen')) main() diff --git a/src/reactUi.jsx b/src/reactUi.jsx index e8f6656da..b2730b031 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -22,6 +22,7 @@ useInterfaceState.setState({ ['x', -1, 'KeyA'], ['x', 1, 'KeyD'], ['y', 1, 'Space'], // todo jump + ['y', -1, 'ShiftLeft'], // todo jump ] // todo refactor const actionAndState = state !== 0 ? coordToAction.find(([axis, value]) => axis === coord && value === state) : coordToAction.filter(([axis]) => axis === coord) From 4cf323c541e8489873a01e483a32bd98d57b26a5 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 09:23:05 +0300 Subject: [PATCH 178/318] add force reload chunks (F3+A) --- src/controls.ts | 28 +++++++++++++++++++++++++-- src/globals.d.ts | 8 ++++++++ src/globals.js | 3 +++ src/index.js | 20 +++---------------- src/menus/components/debug_overlay.js | 2 +- src/menus/options_screen.js | 2 +- src/optionsStorage.js | 2 +- src/styles.css | 6 ------ src/utils.js | 10 ++++++++++ src/watchOptions.js | 8 ++++++++ 10 files changed, 61 insertions(+), 28 deletions(-) create mode 100644 src/watchOptions.js diff --git a/src/controls.ts b/src/controls.ts index 5db86b39a..36374ea38 100644 --- a/src/controls.ts +++ b/src/controls.ts @@ -7,6 +7,7 @@ import { proxy, subscribe } from 'valtio' import { ControMax } from 'contro-max/build/controMax' import { CommandEventArgument, SchemaCommandInput } from 'contro-max/build/types' import { stringStartsWith } from 'contro-max/build/stringUtils' +import { reloadChunks } from './utils' // doesnt seem to work for now const customKeymaps = proxy(JSON.parse(localStorage.keymap || '{}')) @@ -154,8 +155,8 @@ contro.on('trigger', ({ command }) => { const secondActionCommand = secondActionCommands[command] if (secondActionCommand) { - const commandToTrigger = secondActionCommands[lastCommandTrigger?.command] - if (commandToTrigger && Date.now() - lastCommandTrigger.time < secondActionActivationTimeout) { + if (command === lastCommandTrigger?.command && Date.now() - lastCommandTrigger.time < secondActionActivationTimeout) { + const commandToTrigger = secondActionCommands[lastCommandTrigger.command] commandToTrigger() lastCommandTrigger = null } else { @@ -192,6 +193,29 @@ contro.on('release', ({ command }) => { onTriggerOrReleased(command, false) }) +// hard-coded keybindings + +const hardcodedPressedKeys = new Set() +document.addEventListener('keydown', (e) => { + if (hardcodedPressedKeys.has('F3')) { + // reload chunks + if (e.code === 'KeyA') { + //@ts-ignore + const loadedChunks = Object.entries(worldView.loadedChunks).filter(([, v]) => v).map(([key]) => key.split(',').map(Number)) + for (const [x, z] of loadedChunks) { + worldView.unloadChunk({ x, z }) + } + reloadChunks() + } + } + + if (hardcodedPressedKeys.has(e.code)) return + hardcodedPressedKeys.add(e.code) +}) +document.addEventListener('keyup', (e) => { + hardcodedPressedKeys.delete(e.code) +}) + // #region creative fly // these controls are more like for gamemode 3 diff --git a/src/globals.d.ts b/src/globals.d.ts index ecad16368..dadeafa72 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -3,12 +3,20 @@ declare const THREE: typeof import('three') // todo declare const bot: import('mineflayer').Bot +declare const viewer: import('../prismarine-viewer/viewer/lib/viewer').Viewer | undefined +declare const worldView: import('../prismarine-viewer/viewer/lib/worldView').WorldView | undefined declare const localServer: any declare interface Document { getElementById(id): any } +declare namespace JSX { + interface IntrinsicElements { + [elemName: string]: any + } +} + declare interface DocumentFragment { getElementById(id): HTMLElement & Record querySelector(id): HTMLElement & Record diff --git a/src/globals.js b/src/globals.js index 4362604c3..ecffcea2d 100644 --- a/src/globals.js +++ b/src/globals.js @@ -3,3 +3,6 @@ window.bot = undefined window.THREE = undefined window.localServer = undefined +window.worldView = undefined +window.viewer = undefined +window.loadedData = undefined diff --git a/src/index.js b/src/index.js index c67d23e98..1bd991b0a 100644 --- a/src/index.js +++ b/src/index.js @@ -11,6 +11,7 @@ require('./chat') require('./inventory') //@ts-ignore require('./globals.js') +require('./watchOptions') // workaround for mineflayer process.versions.node = '18.0.0' @@ -474,17 +475,6 @@ async function connect (connectOptions) { /** @type {import('../prismarine-viewer/viewer/lib/worldView').WorldView} */ const worldView = new WorldView(bot.world, singeplayer ? renderDistance : Math.min(renderDistance, maxMultiplayerRenderDistance), center) - if (singeplayer) { - let prevRenderDistance = renderDistance - const d = subscribeKey(options, 'renderDistance', () => { - localServer.options['view-distance'] = options.renderDistance - worldView.viewDistance = options.renderDistance - localServer.players[0].emit('playerChangeRenderDistance', options.renderDistance) - worldView.updatePosition(bot.entity.position) - prevRenderDistance = options.renderDistance - }) - disposables.push(d) - } let fovSetting = optionsScrn.fov const updateFov = () => { @@ -511,14 +501,13 @@ async function connect (connectOptions) { viewer.setVersion(version) + window.viewer = viewer + window.loadedData = mcData window.worldView = worldView window.bot = bot - window.mcData = mcData - window.viewer = viewer window.Vec3 = Vec3 window.pathfinder = pathfinder window.debugMenu = debugMenu - window.settings = optionsScrn window.renderer = renderer initVR(bot, renderer, viewer) @@ -689,9 +678,6 @@ window.addEventListener('keydown', (e) => { if (e.code === 'KeyL' && e.altKey) { console.clear() } - // if (e.code === 'KeyD') { - // debugPitch.innerText = '0' - // } }) addPanoramaCubeMap() diff --git a/src/menus/components/debug_overlay.js b/src/menus/components/debug_overlay.js index a1146497f..7eb3293ec 100644 --- a/src/menus/components/debug_overlay.js +++ b/src/menus/components/debug_overlay.js @@ -131,7 +131,7 @@ class DebugOverlay extends LitElement {

    Facing (minecraft): ${quadsDescription[minecraftQuad]} (${minecraftYaw.toFixed(1)} ${(rot[1] * -180 / Math.PI).toFixed(1)})

    Light: ${skyL} (${skyL} sky)

    -

    Biome: minecraft:${window.mcData.biomesArray[biomeId]?.name ?? 'unknown biome'}

    +

    Biome: minecraft:${window.loadedData.biomesArray[biomeId]?.name ?? 'unknown biome'}

    Day: ${this.bot.time.day}

    ${Object.entries(this.customEntries).map(([name, value]) => html`

    ${name}: ${value}

    `)} diff --git a/src/menus/options_screen.js b/src/menus/options_screen.js index fc2cfce13..9ace424b0 100644 --- a/src/menus/options_screen.js +++ b/src/menus/options_screen.js @@ -113,7 +113,7 @@ class OptionsScreen extends CommonOptionsScreen { }}>
    - showModal(document.getElementById('keybinds-screen'))}> + showModal(document.getElementById('keybinds-screen'))}> { this.changeOption('guiScale', e.target.value) document.documentElement.style.setProperty('--guiScale', `${this.guiScale}`) diff --git a/src/optionsStorage.js b/src/optionsStorage.js index 360a84cee..3632c54da 100644 --- a/src/optionsStorage.js +++ b/src/optionsStorage.js @@ -26,7 +26,7 @@ export const options = proxy( mergeAny(defaultOptions, JSON.parse(localStorage.options || '{}')) ) -window.options = options +window.options = window.settings = options subscribe(options, () => { localStorage.options = JSON.stringify(options) diff --git a/src/styles.css b/src/styles.css index 3fb6fd13a..b04f4d55b 100644 --- a/src/styles.css +++ b/src/styles.css @@ -92,12 +92,6 @@ canvas { font-family: minecraft, mojangles, monospace; } -/* todo move this fix to lib */ -.TouchMovementArea { - grid-template-columns: "c ." - "d ."; -} - @media only screen and (max-width: 971px) { #ui-root { transform: scale(2); diff --git a/src/utils.js b/src/utils.js index ae6ae43c0..284a883a8 100644 --- a/src/utils.js +++ b/src/utils.js @@ -184,3 +184,13 @@ export const toMajorVersion = (version) => { const [a, b] = (version + '').split('.') return `${a}.${b}` } + +let prevRenderDistance = options.renderDistance +export const reloadChunks = () => { + if (!worldView || !localServer) return + localServer.options['view-distance'] = options.renderDistance + worldView.viewDistance = options.renderDistance + localServer.players[0].emit('playerChangeRenderDistance', options.renderDistance) + worldView.updatePosition(bot.entity.position, true) + prevRenderDistance = options.renderDistance +} diff --git a/src/watchOptions.js b/src/watchOptions.js new file mode 100644 index 000000000..7757208f5 --- /dev/null +++ b/src/watchOptions.js @@ -0,0 +1,8 @@ +//@ts-check +// not all options are watched here + +import { subscribeKey } from 'valtio/utils' +import { options } from './optionsStorage' +import { reloadChunks } from './utils' + +subscribeKey(options, 'renderDistance', reloadChunks) From e04fef0e17d47e097acafcd2eadd06354a05060e Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 09:23:23 +0300 Subject: [PATCH 179/318] enable eruda only on mobile --- src/eruda.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/eruda.js b/src/eruda.js index fd21fde5d..61de59649 100644 --- a/src/eruda.js +++ b/src/eruda.js @@ -1,4 +1,6 @@ -if (process.env.NODE_ENV === 'development') { +import { isMobile } from './menus/components/common' + +if (process.env.NODE_ENV === 'development' && isMobile()) { require('eruda').default.init() console.log('JS Loaded in', Date.now() - window.startLoad) } From c9b2b1c57a9a73b1f96cea69dec5e29a023949d6 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 09:27:20 +0300 Subject: [PATCH 180/318] loadFolder -> loadSave --- src/browserfs.js | 8 ++++---- src/builtinCommands.ts | 2 +- src/{loadFolder.ts => loadSave.ts} | 3 +-- src/menus/loading_or_error_screen.js | 2 +- src/menus/pause_screen.js | 2 +- src/menus/title_screen.js | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) rename src/{loadFolder.ts => loadSave.ts} (98%) diff --git a/src/browserfs.js b/src/browserfs.js index ca51aca3d..44c291420 100644 --- a/src/browserfs.js +++ b/src/browserfs.js @@ -1,5 +1,5 @@ //@ts-check -import { fsState, loadFolder } from './loadFolder' +import { fsState, loadSave } from './loadSave' import { oneOf } from '@zardoy/utils' import JSZip from 'jszip' import { join } from 'path' @@ -149,7 +149,7 @@ export const openWorldDirectory = async (/** @type {FileSystemDirectoryHandle?} fsState.isReadonly = !writeAccess fsState.syncFs = false - loadFolder() + loadSave() } export const openWorldZip = async (/** @type {File | ArrayBuffer} */file, name = file['name']) => { @@ -176,7 +176,7 @@ export const openWorldZip = async (/** @type {File | ArrayBuffer} */file, name = fsState.syncFs = true if (fs.existsSync('/world/level.dat')) { - loadFolder() + loadSave() } else { const dirs = fs.readdirSync('/world') let availableWorlds = [] @@ -192,7 +192,7 @@ export const openWorldZip = async (/** @type {File | ArrayBuffer} */file, name = } if (availableWorlds.length === 1) { - loadFolder(`/world/${availableWorlds[0]}`) + loadSave(`/world/${availableWorlds[0]}`) return } diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts index 15f2df8a5..a3bc13d87 100644 --- a/src/builtinCommands.ts +++ b/src/builtinCommands.ts @@ -1,7 +1,7 @@ import JSZip from 'jszip' import fs from 'fs' import { join } from 'path' -import { fsState } from './loadFolder' +import { fsState } from './loadSave' const notImplemented = () => { return 'Not implemented yet' diff --git a/src/loadFolder.ts b/src/loadSave.ts similarity index 98% rename from src/loadFolder.ts rename to src/loadSave.ts index 6b7a3e5d9..3563328de 100644 --- a/src/loadFolder.ts +++ b/src/loadSave.ts @@ -18,8 +18,7 @@ export const fsState = proxy({ const PROPOSE_BACKUP = true -// todo rename to loadWorld -export const loadFolder = async (root = '/world') => { +export const loadSave = async (root = '/world') => { // todo do it in singleplayer as well for (const key in forceCachedDataPaths) { delete forceCachedDataPaths[key] diff --git a/src/menus/loading_or_error_screen.js b/src/menus/loading_or_error_screen.js index 891cfdbd1..23aa2cd97 100644 --- a/src/menus/loading_or_error_screen.js +++ b/src/menus/loading_or_error_screen.js @@ -4,7 +4,7 @@ const { commonCss } = require('./components/common') const { addPanoramaCubeMap } = require('../panorama') const { hideModal, activeModalStacks, activeModalStack, replaceActiveModalStack, miscUiState } = require('../globalState') const { guessProblem } = require('../guessProblem') -const { fsState } = require('../loadFolder') +const { fsState } = require('../loadSave') class LoadingErrorScreen extends LitElement { static get styles () { diff --git a/src/menus/pause_screen.js b/src/menus/pause_screen.js index a863198b4..d6091b0f1 100644 --- a/src/menus/pause_screen.js +++ b/src/menus/pause_screen.js @@ -2,7 +2,7 @@ const { LitElement, html, css } = require('lit') const { openURL } = require('./components/common') const { hideCurrentModal, showModal, miscUiState } = require('../globalState') -const { fsState } = require('../loadFolder') +const { fsState } = require('../loadSave') const { subscribe } = require('valtio') const { saveWorld } = require('../builtinCommands') const { notification } = require('./notification') diff --git a/src/menus/title_screen.js b/src/menus/title_screen.js index f11c320f1..a3d4effa5 100644 --- a/src/menus/title_screen.js +++ b/src/menus/title_screen.js @@ -1,6 +1,6 @@ const { openWorldDirectory, openWorldZip } = require('../browserfs') const { showModal } = require('../globalState') -const { fsState } = require('../loadFolder') +const { fsState } = require('../loadSave') const { openURL } = require('./components/common') const { LitElement, html, css, unsafeCSS } = require('lit') const fs = require('fs') From aeca97d44d3fbca1fd18f15ae9966be18df2bd77 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 10:46:53 +0300 Subject: [PATCH 181/318] build prismarine-viewer locally which should increase install speed --- package.json | 4 ++++ scripts/build.js | 14 ++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index c516331e4..971fff78c 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,11 @@ "npm-run-all": "^4.1.5", "os-browserify": "^0.3.0", "path-browserify": "^1.0.1", +<<<<<<< HEAD "prismarine-viewer": "github:PrismarineJS/prismarine-viewer", +======= + "prismarine-viewer": "./prismarine-viewer", +>>>>>>> 3daefc2 (build prismarine-viewer locally which should increase install speed) "process": "github:PrismarineJS/node-process", "rimraf": "^5.0.1", "stream-browserify": "^3.0.0", diff --git a/scripts/build.js b/scripts/build.js index e71413b07..53d669bc6 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -7,14 +7,15 @@ const path = require('path') // these files need to be copied before build for now const filesAlwaysToCopy = [ - { from: './node_modules/prismarine-viewer2/public/supportedVersions.json', to: './prismarine-viewer/public/supportedVersions.json' }, + // { from: './node_modules/prismarine-viewer2/public/supportedVersions.json', to: './prismarine-viewer/public/supportedVersions.json' }, ] // these files could be copied at build time eg with copy plugin, but copy plugin slows down the config (2x in my testing, sometimes with too many open files error) is slow so we also copy them there const webpackFilesToCopy = [ - { from: './node_modules/prismarine-viewer2/public/blocksStates/', to: 'dist/blocksStates/' }, - // { from: './node_modules/prismarine-viewer2/public/textures/', to: 'dist/textures/' }, - { from: './node_modules/prismarine-viewer2/public/worker.js', to: 'dist/worker.js' }, - { from: './node_modules/prismarine-viewer2/public/supportedVersions.json', to: 'dist/supportedVersions.json' }, + { from: './prismarine-viewer/public/blocksStates/', to: 'dist/blocksStates/' }, + // { from: './prismarine-viewer/public/textures/', to: 'dist/textures/' }, + // { from: './prismarine-viewer/public/textures/1.17.1/gui', to: 'dist/gui' }, + { from: './prismarine-viewer/public/worker.js', to: 'dist/worker.js' }, + // { from: './prismarine-viewer/public/supportedVersions.json', to: 'dist/supportedVersions.json' }, { from: './assets/', to: './dist/' }, { from: './config.json', to: 'dist/config.json' } ] @@ -24,7 +25,8 @@ exports.copyFiles = (isDev = false) => { [...filesAlwaysToCopy, ...webpackFilesToCopy].forEach(file => { fsExtra.copySync(file.from, file.to) }) - const cwd = './node_modules/prismarine-viewer2/public/textures/' + // todo copy directly only needed + const cwd = './prismarine-viewer/public/textures/' const files = glob.sync('{*/entity/**,*.png}', { cwd: cwd, nodir: true, }) for (const file of files) { const copyDest = path.join('dist/textures/', file) From 2d8d52267c104c6d64d253ee87c6e3a879c1fbff Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 10:47:15 +0300 Subject: [PATCH 182/318] add a way to disable prompts on load --- src/browserfs.js | 5 +++-- src/index.js | 1 - src/loadSave.ts | 6 ++++-- src/optionsStorage.js | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/browserfs.js b/src/browserfs.js index 44c291420..5ea250a1c 100644 --- a/src/browserfs.js +++ b/src/browserfs.js @@ -3,6 +3,7 @@ import { fsState, loadSave } from './loadSave' import { oneOf } from '@zardoy/utils' import JSZip from 'jszip' import { join } from 'path' +import { options } from './optionsStorage' const { promisify } = require('util') const browserfs = require('browserfs') @@ -124,10 +125,10 @@ export const openWorldDirectory = async (/** @type {FileSystemDirectoryHandle?} } const directoryHandle = _directoryHandle - const requestResult = SUPPORT_WRITE ? await directoryHandle.requestPermission?.({ mode: 'readwrite' }) : undefined + const requestResult = SUPPORT_WRITE && !options.preferLoadReadonly ? await directoryHandle.requestPermission?.({ mode: 'readwrite' }) : undefined const writeAccess = requestResult === 'granted' - const doContinue = writeAccess || !SUPPORT_WRITE || confirm('Continue in readonly mode?') + const doContinue = writeAccess || !SUPPORT_WRITE || options.disableLoadPrompts || confirm('Continue in readonly mode?') if (!doContinue) return await new Promise(resolve => { browserfs.configure({ diff --git a/src/index.js b/src/index.js index 1bd991b0a..550b60d76 100644 --- a/src/index.js +++ b/src/index.js @@ -384,7 +384,6 @@ async function connect (connectOptions) { setLoadingScreenStatus('Starting local server') window.serverDataChannel ??= {} - window.worldLoaded = false localServer = window.localServer = startLocalServer() // todo need just to call quit if started // loadingScreen.maybeRecoverable = false diff --git a/src/loadSave.ts b/src/loadSave.ts index 3563328de..5ed8b967c 100644 --- a/src/loadSave.ts +++ b/src/loadSave.ts @@ -19,6 +19,8 @@ export const fsState = proxy({ const PROPOSE_BACKUP = true export const loadSave = async (root = '/world') => { + const disablePrompts = options.disableLoadPrompts + // todo do it in singleplayer as well for (const key in forceCachedDataPaths) { delete forceCachedDataPaths[key] @@ -50,7 +52,7 @@ export const loadSave = async (root = '/world') => { const qs = new URLSearchParams(window.location.search) version = levelDat.Version?.Name ?? qs.get('version') if (!version) { - const newVersion = prompt(`In 1.8 and before world save doesn\'t contain version info, please enter version you want to use to load the world.\nSupported versions ${supportedVersions.join(', ')}`, '1.8.8') + const newVersion = disablePrompts ? '1.8.8' : prompt(`In 1.8 and before world save doesn\'t contain version info, please enter version you want to use to load the world.\nSupported versions ${supportedVersions.join(', ')}`, '1.8.8') if (!newVersion) return version = newVersion } @@ -89,7 +91,7 @@ export const loadSave = async (root = '/world') => { } - if (warnings.length) { + if (warnings.length && !disablePrompts) { const doContinue = confirm(`Continue with following warnings?\n${warnings.join('\n')}`) if (!doContinue) return } diff --git a/src/optionsStorage.js b/src/optionsStorage.js index 3632c54da..8165140ac 100644 --- a/src/optionsStorage.js +++ b/src/optionsStorage.js @@ -20,6 +20,8 @@ const defaultOptions = { numWorkers: 4, localServerOptions: {}, localUsername: 'wanderer', + preferLoadReadonly: false, + disableLoadPrompts: false } export const options = proxy( From f856bc5f5f5c0d277caa8dc0de7e570e4c8d651a Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 10:50:17 +0300 Subject: [PATCH 183/318] add a way to always init eruda --- index.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/index.html b/index.html index f409c4270..4054509a2 100644 --- a/index.html +++ b/index.html @@ -1,6 +1,19 @@ + + Prismarine Web Client From 0dca522d11251cdf3603b65e06635c16eb552072 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 11:24:34 +0300 Subject: [PATCH 184/318] fix autoversion (download data on demand) --- scripts/esbuildPlugins.mjs | 21 ++++++++++++++++++--- src/index.js | 13 ++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/scripts/esbuildPlugins.mjs b/scripts/esbuildPlugins.mjs index eccfd89f3..cbd0edec3 100644 --- a/scripts/esbuildPlugins.mjs +++ b/scripts/esbuildPlugins.mjs @@ -26,15 +26,29 @@ const plugins = [ if (!resolveDir.endsWith('minecraft-data')) return return { namespace: 'load-global-minecraft-data', - path + path, + pluginData: { + resolveDir + }, } }) build.onLoad({ filter: /.+/, namespace: 'load-global-minecraft-data', - }, () => { + }, ({ pluginData: { resolveDir } }) => { + const defaultVersionsObj = { + // default protocol data, needed for auto-select + "1.20.1": { + version: { + "minecraftVersion": "1.20.1", + "version": 763, + "majorVersion": "1.20" + }, + protocol: JSON.parse(fs.readFileSync(join(resolveDir, 'minecraft-data/data/pc/1.20/protocol.json'), 'utf8')), + } + } return { - contents: 'window.mcData ??= {};module.exports = { pc: window.mcData }', + contents: `window.mcData ??= ${JSON.stringify(defaultVersionsObj)};module.exports = { pc: window.mcData }`, loader: 'js', } }) @@ -230,6 +244,7 @@ const plugins = [ polyfillNode({ polyfills: { fs: false, + dns: false, crypto: false, events: false, http: false, diff --git a/src/index.js b/src/index.js index 550b60d76..dc7ebab65 100644 --- a/src/index.js +++ b/src/index.js @@ -364,12 +364,16 @@ async function connect (connectOptions) { let localServer try { Object.assign(serverOptions, _.defaultsDeep({}, connectOptions.serverOverrides ?? {}, options.localServerOptions, serverOptions)) - let version = connectOptions.botVersion ?? serverOptions.version - if (version) { + const downloadMcData = async (version) => { setLoadingScreenStatus(`Downloading data for ${version}`) await loadScript(`./mc-data/${toMajorVersion(version)}.js`) } + const version = connectOptions.botVersion ?? serverOptions.version + if (version) { + downloadMcData(version) + } + if (singeplayer) { // SINGLEPLAYER EXPLAINER: // Note 1: here we have custom sync communication between server Client (flying-squid) and game client (mineflayer) @@ -411,7 +415,10 @@ async function connect (connectOptions) { viewDistance: 'tiny', checkTimeoutInterval: 240 * 1000, noPongTimeout: 240 * 1000, - closeTimeout: 240 * 1000 + closeTimeout: 240 * 1000, + async versionSelectedHook (client) { + await downloadMcData(client.version) + } }) if (singeplayer) { const _supportFeature = bot.supportFeature From bfd827990ddaea6bf7967cbb603c5d26af0dc069 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 11:40:28 +0300 Subject: [PATCH 185/318] fix regression (hopefully have tests) --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index dc7ebab65..82dc8b8ca 100644 --- a/src/index.js +++ b/src/index.js @@ -371,7 +371,7 @@ async function connect (connectOptions) { const version = connectOptions.botVersion ?? serverOptions.version if (version) { - downloadMcData(version) + await downloadMcData(version) } if (singeplayer) { From dfa45a57716dcad05afc477305fc1e212edb11c2 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 11:42:08 +0300 Subject: [PATCH 186/318] not sure how but try to disable automatic deploys on vercel --- vercel.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 vercel.json diff --git a/vercel.json b/vercel.json new file mode 100644 index 000000000..4e1bcc7fa --- /dev/null +++ b/vercel.json @@ -0,0 +1,3 @@ +{ + "github": false +} From 78d4b62d8b3f7b74310986bdfdabd15fc3e1d675 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 11:47:30 +0300 Subject: [PATCH 187/318] rn workflow, fixes --- .github/workflows/preview.yml | 2 +- vercel.json | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index ee83ba249..2294132ea 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -1,4 +1,4 @@ -name: CI Deploy Preview +name: Vercel Deploy Preview env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} diff --git a/vercel.json b/vercel.json index 4e1bcc7fa..1513c3ec8 100644 --- a/vercel.json +++ b/vercel.json @@ -1,3 +1,6 @@ { - "github": false + "github": { + "enabled": false, + "silent": true + } } From bc51c9f674c4274e1fa1f8edd3e1143e7412fbbe Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 11:48:39 +0300 Subject: [PATCH 188/318] disable silent --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 1513c3ec8..5219613ed 100644 --- a/vercel.json +++ b/vercel.json @@ -1,6 +1,6 @@ { "github": { "enabled": false, - "silent": true + "silent": false } } From 29b47fb115c0b36c986db0c4d69bbb7f0271b094 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 11:56:43 +0300 Subject: [PATCH 189/318] try to increaese snapshot timeout --- cypress/integration/index.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/integration/index.spec.ts b/cypress/integration/index.spec.ts index 53505b3c7..d8cac44d0 100644 --- a/cypress/integration/index.spec.ts +++ b/cypress/integration/index.spec.ts @@ -20,7 +20,7 @@ it('Loads & renders singleplayer', () => { // todo replace with data-test cy.get('#title-screen').find('.menu > div:nth-child(2) > pmui-button:nth-child(1)', { includeShadowDom: true, }).click() // todo implement load event - cy.wait(6000) + cy.wait(8000) //@ts-ignore cy.get('body').toMatchImageSnapshot({ // imageConfig: { From 6f2c030f3d6efc3d84d7df07de3de9806adde217 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 12:16:23 +0300 Subject: [PATCH 190/318] better download ui & fix qs conflict --- src/downloadAndOpenWorld.ts | 45 ++++++++++++++++++---------- src/loadSave.ts | 2 +- src/menus/loading_or_error_screen.js | 3 +- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/downloadAndOpenWorld.ts b/src/downloadAndOpenWorld.ts index e14e4deb1..61d7fbc7d 100644 --- a/src/downloadAndOpenWorld.ts +++ b/src/downloadAndOpenWorld.ts @@ -15,21 +15,36 @@ window.addEventListener('load', async (e) => { const response = await fetch(mapUrl) const contentLength = +response.headers.get('Content-Length') setLoadingScreenStatus(`Downloading world ${name}: have to download ${filesize(contentLength)}...`) - // const reader = response.body!.getReader() - // let doneValue - // while (true) { - // // done is true for the last chunk - // // value is Uint8Array of the chunk bytes - // const { done, value } = await reader.read() - - // if (done) { - // doneValue = value - // break - // } - - // setLoadingScreenStatus(`Downloading world ${name}: ${filesize(value.length)} / ${filesize(contentLength)}MB...`) - // } - await openWorldZip(await response.arrayBuffer()) + + let downloadedBytes = 0 + const buffer = await new Response( + new ReadableStream({ + async start(controller) { + const reader = response.body.getReader() + + while (true) { + const { done, value } = await reader.read() + + if (done) { + controller.close() + break + } + + downloadedBytes += value.byteLength + + // Calculate download progress as a percentage + const progress = (downloadedBytes / contentLength) * 100 + + // Update your progress bar or display the progress value as needed + setLoadingScreenStatus(`Download Progress: ${Math.floor(progress)}% (${filesize(downloadedBytes, { round: 2, })} / ${filesize(contentLength, { round: 2, })}))`, false, true) + + // Pass the received data to the controller + controller.enqueue(value) + } + }, + }) + ).arrayBuffer() + await openWorldZip(buffer) }) export default async () => { diff --git a/src/loadSave.ts b/src/loadSave.ts index 5ed8b967c..49ebd05d2 100644 --- a/src/loadSave.ts +++ b/src/loadSave.ts @@ -50,7 +50,7 @@ export const loadSave = async (root = '/world') => { const levelDat: import('./mcTypes').LevelDat = nbt.simplify(parsedRaw).Data const qs = new URLSearchParams(window.location.search) - version = levelDat.Version?.Name ?? qs.get('version') + version = levelDat.Version?.Name ?? qs.get('mapVersion') if (!version) { const newVersion = disablePrompts ? '1.8.8' : prompt(`In 1.8 and before world save doesn\'t contain version info, please enter version you want to use to load the world.\nSupported versions ${supportedVersions.join(', ')}`, '1.8.8') if (!newVersion) return diff --git a/src/menus/loading_or_error_screen.js b/src/menus/loading_or_error_screen.js index 23aa2cd97..ab23be0b3 100644 --- a/src/menus/loading_or_error_screen.js +++ b/src/menus/loading_or_error_screen.js @@ -40,6 +40,7 @@ class LoadingErrorScreen extends LitElement { constructor () { super() + this.hideDots = false this.hasError = false this.maybeRecoverable = true this.status = 'Waiting for JS load' @@ -73,7 +74,7 @@ class LoadingErrorScreen extends LitElement { return html`
    -
    ${this.status}${this.hasError ? '' : this._loadingDots}

    ${this.hasError ? guessProblem(this.status) : ''}

    +
    ${this.status}${this.hasError && !this.hideDots ? '' : this._loadingDots}

    ${this.hasError ? guessProblem(this.status) : ''}

    ${this.hasError ? html`
    { From 5044e4e95b4ed4f486a0efece71247e15e6edec5 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 12:21:22 +0300 Subject: [PATCH 191/318] dont test before publish --- .github/workflows/publish.yml | 18 +++++++++--------- cypress/integration/index.spec.ts | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 17e718ca3..e316c3319 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,15 +13,15 @@ jobs: run: npm i -g pnpm - run: pnpm install - run: pnpm build - - uses: cypress-io/github-action@v5 - with: - install: false - start: pnpm prod-start - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: cypress-images - path: cypress/integration/__image_snapshots__/ + # - uses: cypress-io/github-action@v5 + # with: + # install: false + # start: pnpm prod-start + # - uses: actions/upload-artifact@v3 + # if: failure() + # with: + # name: cypress-images + # path: cypress/integration/__image_snapshots__/ - uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/cypress/integration/index.spec.ts b/cypress/integration/index.spec.ts index d8cac44d0..b215bc285 100644 --- a/cypress/integration/index.spec.ts +++ b/cypress/integration/index.spec.ts @@ -20,7 +20,7 @@ it('Loads & renders singleplayer', () => { // todo replace with data-test cy.get('#title-screen').find('.menu > div:nth-child(2) > pmui-button:nth-child(1)', { includeShadowDom: true, }).click() // todo implement load event - cy.wait(8000) + cy.wait(12000) //@ts-ignore cy.get('body').toMatchImageSnapshot({ // imageConfig: { From f58903231dbcdffdc83afcc5a90e6d1efddc4eec Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 12:54:48 +0300 Subject: [PATCH 192/318] fix: excellent in-game gamepad support speed packages install --- package.json | 2 +- src/controls.ts | 14 ++++++++++++-- src/index.js | 9 +++++++++ src/utils.js | 3 ++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 971fff78c..282838426 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "buffer": "^6.0.3", "clean-webpack-plugin": "^4.0.0", "constants-browserify": "^1.0.0", - "contro-max": "^0.1.0", + "contro-max": "^0.1.1", "copy-webpack-plugin": "^11.0.0", "crypto-browserify": "^3.12.0", "css-loader": "^6.8.1", diff --git a/src/controls.ts b/src/controls.ts index 36374ea38..fe883fbae 100644 --- a/src/controls.ts +++ b/src/controls.ts @@ -50,7 +50,8 @@ export const contro = new ControMax({ storeProvider: { load: () => customKeymaps, save() { }, - } + }, + gamepadPollingInterval: 10 }) export type Command = CommandEventArgument['command'] @@ -135,6 +136,9 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => { setSprinting(pressed) } break + case 'general.attackDestroy': + document.dispatchEvent(new MouseEvent(pressed ? 'mousedown' : 'mouseup', { button: 0 })) + break } } } @@ -184,7 +188,13 @@ contro.on('trigger', ({ command }) => { case 'general.command': document.getElementById('hud').shadowRoot.getElementById('chat').enableChat('/') break - // todo place / destroy + case 'general.interactPlace': + document.dispatchEvent(new MouseEvent('mousedown', { button: 2 })) + setTimeout(() => { + // todo cleanup + document.dispatchEvent(new MouseEvent('mouseup', { button: 2 })) + }) + break } } }) diff --git a/src/index.js b/src/index.js index 82dc8b8ca..67ce54540 100644 --- a/src/index.js +++ b/src/index.js @@ -67,6 +67,7 @@ const { default: updateTime } = require('./updateTime') const { options } = require('./optionsStorage') const { subscribeKey } = require('valtio/utils') const _ = require('lodash') +const { contro } = require('./controls') if ('serviceWorker' in navigator && !isCypress()) { window.addEventListener('load', () => { @@ -613,6 +614,14 @@ async function connect (connectOptions) { capturedPointer.y = e.pageY }, { passive: false }) + contro.on('stickMovement', ({ stick, vector }) => { + if (stick !== 'right') return + let { x, z } = vector + if (Math.abs(x) < 0.18) x = 0 + if (Math.abs(z) < 0.18) z = 0 + onMouseMove({ movementX: x * 10, movementY: z * 10, type: 'touchmove' }) + }) + registerListener(document, 'lostpointercapture', (e) => { if (e.pointerId === undefined || e.pointerId !== capturedPointer?.id) return clearTimeout(virtualClickTimeout) diff --git a/src/utils.js b/src/utils.js index 284a883a8..4d989f598 100644 --- a/src/utils.js +++ b/src/utils.js @@ -134,7 +134,7 @@ export function nameToMcOfflineUUID (name) { return (new UUID(javaUUID('OfflinePlayer:' + name))).toString() } -export const setLoadingScreenStatus = function (/** @type {string} */status, isError = false) { +export const setLoadingScreenStatus = function (/** @type {string} */status, isError = false, hideDots = false) { const loadingScreen = document.getElementById('loading-error-screen') // todo update in component instead @@ -143,6 +143,7 @@ export const setLoadingScreenStatus = function (/** @type {string} */status, isE miscUiState.gameLoaded = false return } + loadingScreen.hideDots = hideDots loadingScreen.hasError = isError loadingScreen.status = status } From c41c010fb05a7291e7fd49676b8a2b6b321a5084 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 7 Sep 2023 06:17:32 +0300 Subject: [PATCH 193/318] forcefully disconnect from server --- src/menus/pause_screen.js | 2 +- src/utils.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/menus/pause_screen.js b/src/menus/pause_screen.js index d6091b0f1..97f8706bd 100644 --- a/src/menus/pause_screen.js +++ b/src/menus/pause_screen.js @@ -71,7 +71,7 @@ class PauseScreen extends LitElement { openURL('https://discord.gg/4Ucm684Fq3')}>
    showModal(document.getElementById('options-screen'))}> - { + { disconnect() }}> diff --git a/src/utils.js b/src/utils.js index 4d989f598..682d40fdb 100644 --- a/src/utils.js +++ b/src/utils.js @@ -153,8 +153,12 @@ export const disconnect = async () => { if (window.localServer) { await saveWorld() localServer.quit() + } else { + // workaround bot.end doesn't end the socket and emit end event + bot.end() + bot._client.socket.end() } - bot._client.emit('end') + bot._client.emit('end', 'You left the server') miscUiState.gameLoaded = false } From 83627a503e8340829cb3c677286ab9cd7b07a3d1 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 7 Sep 2023 06:18:31 +0300 Subject: [PATCH 194/318] small cleanup, don't specify default version --- config.json | 2 +- package.json | 2 +- src/createLocalServer.js | 3 ++- src/index.js | 2 +- src/loadSave.ts | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config.json b/config.json index 05bc6538f..c7e8b61c8 100644 --- a/config.json +++ b/config.json @@ -3,5 +3,5 @@ "defaultHostPort": 25565, "defaultProxy": "", "defaultProxyPort": 0, - "defaultVersion": "1.18.2" + "defaultVersion": "" } diff --git a/package.json b/package.json index 282838426..9c8a965ec 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-refresh": "^0.14.0", - "space-squid": "github:zardoy/space-squid#everything", + "flying-squid": "github:zardoy/space-squid#everything", "speed-measure-webpack-plugin": "^1.5.0", "stats.js": "^0.17.0", "url": "^0.11.1", diff --git a/src/createLocalServer.js b/src/createLocalServer.js index d60c49ff7..931336290 100644 --- a/src/createLocalServer.js +++ b/src/createLocalServer.js @@ -1,4 +1,5 @@ -import mcServer from 'space-squid' +//@ts-check +import mcServer from 'flying-squid' import serverOptions from './defaultLocalServerOptions' import { LocalServer } from './customServer' diff --git a/src/index.js b/src/index.js index c6e70a4b1..8c5038f09 100644 --- a/src/index.js +++ b/src/index.js @@ -385,7 +385,7 @@ async function connect (connectOptions) { // tcpDns() skipped since we define connect option // in setProtocol: we emit 'connect' here below so in that file we send set_protocol and login_start (onLogin handler) // Client (class) of flying-squid (in server/login.js of mc-protocol): onLogin handler: skip most logic & go to loginClient() which assigns uuid and sends 'success' back to client (onLogin handler) and emits 'login' on the server (login.js in flying-squid handler) - // flying-squid: 'login' -> player.login -> now sends 'login' event to the client (handled in many plugins in mineflayer) -> then 'update_health' is sent which emits 'spawn' + // flying-squid: 'login' -> player.login -> now sends 'login' event to the client (handled in many plugins in mineflayer) -> then 'update_health' is sent which emits 'spawn' in mineflayer setLoadingScreenStatus('Starting local server') window.serverDataChannel ??= {} diff --git a/src/loadSave.ts b/src/loadSave.ts index 49ebd05d2..e2c5cab28 100644 --- a/src/loadSave.ts +++ b/src/loadSave.ts @@ -1,5 +1,5 @@ import fs from 'fs' -import { supportedVersions } from 'space-squid/src/lib/version' +import { supportedVersions } from 'flying-squid/src/lib/version' import * as nbt from 'prismarine-nbt' import { promisify } from 'util' import { options } from './optionsStorage' From ffaa52314ba5d7fcbc642ca4d613069799a758ad Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 7 Sep 2023 06:23:11 +0300 Subject: [PATCH 195/318] propose to remove world only for on-device saves --- minecraft-server.mjs | 2 +- src/browserfs.js | 2 ++ src/builtinCommands.ts | 3 ++- src/loadSave.ts | 1 + src/menus/loading_or_error_screen.js | 2 +- src/menus/title_screen.js | 7 +++---- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/minecraft-server.mjs b/minecraft-server.mjs index e2830a8b8..6b07c35f4 100644 --- a/minecraft-server.mjs +++ b/minecraft-server.mjs @@ -1,5 +1,5 @@ //@ts-check -import mcServer from 'space-squid' +import mcServer from 'flying-squid' /** @type {import('minecraft-protocol').ServerOptions & Record} */ const serverOptions = { diff --git a/src/browserfs.js b/src/browserfs.js index 5ea250a1c..a87d1e6a6 100644 --- a/src/browserfs.js +++ b/src/browserfs.js @@ -150,6 +150,7 @@ export const openWorldDirectory = async (/** @type {FileSystemDirectoryHandle?} fsState.isReadonly = !writeAccess fsState.syncFs = false + fsState.inMemorySave = false loadSave() } @@ -175,6 +176,7 @@ export const openWorldZip = async (/** @type {File | ArrayBuffer} */file, name = fsState.isReadonly = true fsState.syncFs = true + fsState.inMemorySave = false if (fs.existsSync('/world/level.dat')) { loadSave() diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts index a3bc13d87..d3cf1a0b5 100644 --- a/src/builtinCommands.ts +++ b/src/builtinCommands.ts @@ -63,9 +63,10 @@ const commands = [ { command: '/reset-world -y', invoke: async () => { - if (fsState.isReadonly || !fsState.syncFs) return + if (fsState.inMemorySave) return // todo for testing purposes sessionStorage.oldData = localStorage + console.log('World removed. Old data saved to sessionStorage.oldData') localServer.quit() // todo browserfs bug fs.rmdirSync(localServer.options.worldFolder, { recursive: true }) diff --git a/src/loadSave.ts b/src/loadSave.ts index e2c5cab28..c523500b1 100644 --- a/src/loadSave.ts +++ b/src/loadSave.ts @@ -14,6 +14,7 @@ const parseNbt = promisify(nbt.parse) export const fsState = proxy({ isReadonly: false, syncFs: false, + inMemorySave: false, }) const PROPOSE_BACKUP = true diff --git a/src/menus/loading_or_error_screen.js b/src/menus/loading_or_error_screen.js index ab23be0b3..f04bad38a 100644 --- a/src/menus/loading_or_error_screen.js +++ b/src/menus/loading_or_error_screen.js @@ -87,7 +87,7 @@ class LoadingErrorScreen extends LitElement { } document.getElementById('play-screen').style.display = 'block' addPanoramaCubeMap() - }}> { + }}> { if (!confirm('Are you sure you want to delete all local world content?')) return for (const key of Object.keys(localStorage)) { if (/^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/g.test(key) || key === '/') { diff --git a/src/menus/title_screen.js b/src/menus/title_screen.js index a3d4effa5..b6d83f4c0 100644 --- a/src/menus/title_screen.js +++ b/src/menus/title_screen.js @@ -160,10 +160,9 @@ class TitleScreen extends LitElement {
    { this.style.display = 'none' - Object.assign(fsState, { - isReadonly: false, - syncFs: true, - }) + fsState.isReadonly = false + fsState.syncFs = true + fsState.inMemorySave = true const notFirstTime = fs.existsSync('./world/level.dat') if (notFirstTime && !options.localServerOptions.version) { options.localServerOptions.version = '1.16.1' // legacy version, now we use 1.8.8 From 33ddfa1239fb2e634b679599439996bbc6f20acc Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 7 Sep 2023 06:24:37 +0300 Subject: [PATCH 196/318] fix modal restore on title screen --- src/globalState.js | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/globalState.js b/src/globalState.js index 86d6720f8..7c5b884fe 100644 --- a/src/globalState.js +++ b/src/globalState.js @@ -36,6 +36,9 @@ const defaultModalActions = { } } +/** + * @returns true if operation was successful + */ const showModalInner = (/** @type {Modal} */ modal) => { const cancel = modal.elem?.show?.() if (cancel && cancel !== customDisplayManageKeyword) return false @@ -54,8 +57,8 @@ export const showModal = (/** @type {HTMLElement & Record | {reactT /** * * @param {*} data - * @param {{ force?: boolean, restorePrevious?: boolean, }} options - * @returns + * @param {{ force?: boolean, restorePrevious?: boolean }} options + * @returns true if previous modal was restored */ export const hideModal = (modal = activeModalStack.slice(-1)[0], data = undefined, options = {}) => { const { force = false, restorePrevious = true } = options @@ -77,13 +80,15 @@ export const hideModal = (modal = activeModalStack.slice(-1)[0], data = undefine } } -export const hideCurrentModal = (_data = undefined, preActions = undefined) => { +export const hideCurrentModal = (_data = undefined, restoredActions = undefined) => { if (hideModal(undefined, undefined)) { - preActions?.() - if (!isGameActive()) { - showModal(document.getElementById('title-screen')) - } else { - pointerLock.requestPointerLock() // will work only if no modals left + restoredActions?.() + if (activeModalStack.length === 0) { + if (!isGameActive()) { + showModal(document.getElementById('title-screen')) + } else { + pointerLock.requestPointerLock() + } } } } From e2670a566aa7b109c95133c6fe40da62edcf682c Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Thu, 7 Sep 2023 15:58:02 +0300 Subject: [PATCH 197/318] refactor: migrate new code to typescript! --- esbuild.mjs | 3 +- src/{browserfs.js => browserfs.ts} | 15 +- ...ateLocalServer.js => createLocalServer.ts} | 0 src/cursor.js | 1 - src/customServer.js | 36 ---- src/customServer.ts | 33 +++ src/{globalState.js => globalState.ts} | 37 ++-- src/{guessProblem.js => guessProblem.ts} | 0 src/importsWorkaround.js | 2 + src/{index.js => index.ts} | 191 +++++++++--------- src/{optionsStorage.js => optionsStorage.ts} | 16 +- src/optionsStorageTypes.ts | 3 - src/{updateTime.js => updateTime.ts} | 3 +- src/{utils.js => utils.ts} | 18 +- src/{watchOptions.js => watchOptions.ts} | 1 - 15 files changed, 177 insertions(+), 182 deletions(-) rename src/{browserfs.js => browserfs.ts} (93%) rename src/{createLocalServer.js => createLocalServer.ts} (100%) delete mode 100644 src/customServer.js create mode 100644 src/customServer.ts rename src/{globalState.js => globalState.ts} (77%) rename src/{guessProblem.js => guessProblem.ts} (100%) create mode 100644 src/importsWorkaround.js rename src/{index.js => index.ts} (83%) rename src/{optionsStorage.js => optionsStorage.ts} (78%) delete mode 100644 src/optionsStorageTypes.ts rename src/{updateTime.js => updateTime.ts} (95%) rename src/{utils.js => utils.ts} (92%) rename src/{watchOptions.js => watchOptions.ts} (94%) diff --git a/esbuild.mjs b/esbuild.mjs index ad0d3e293..7eff754a9 100644 --- a/esbuild.mjs +++ b/esbuild.mjs @@ -18,6 +18,7 @@ let baseConfig = {} // } try { + //@ts-ignore await import('./localSettings.mjs') } catch { } @@ -39,7 +40,7 @@ const buildingVersion = new Date().toISOString().split(':')[0] const ctx = await esbuild.context({ bundle: true, - entryPoints: ['src/index.js'], + entryPoints: ['src/index.ts'], target: ['es2020'], jsx: 'automatic', jsxDev: dev, diff --git a/src/browserfs.js b/src/browserfs.ts similarity index 93% rename from src/browserfs.js rename to src/browserfs.ts index a87d1e6a6..d94cfbb0e 100644 --- a/src/browserfs.js +++ b/src/browserfs.ts @@ -78,7 +78,7 @@ fs.promises.open = async (...args) => { fd, filename: args[0], close: () => { - return new Promise(resolve => { + return new Promise(resolve => { fs.close(fd, (err) => { if (err) { throw err @@ -110,9 +110,8 @@ window.removeFileRecursiveSync = removeFileRecursiveSync const SUPPORT_WRITE = true -export const openWorldDirectory = async (/** @type {FileSystemDirectoryHandle?} */dragndropHandle = undefined) => { - /** @type {FileSystemDirectoryHandle} */ - let _directoryHandle +export const openWorldDirectory = async (dragndropHandle?: FileSystemDirectoryHandle) => { + let _directoryHandle: FileSystemDirectoryHandle if (dragndropHandle) { _directoryHandle = dragndropHandle } else { @@ -130,7 +129,7 @@ export const openWorldDirectory = async (/** @type {FileSystemDirectoryHandle?} const doContinue = writeAccess || !SUPPORT_WRITE || options.disableLoadPrompts || confirm('Continue in readonly mode?') if (!doContinue) return - await new Promise(resolve => { + await new Promise(resolve => { browserfs.configure({ // todo fs: 'MountableFileSystem', @@ -154,8 +153,8 @@ export const openWorldDirectory = async (/** @type {FileSystemDirectoryHandle?} loadSave() } -export const openWorldZip = async (/** @type {File | ArrayBuffer} */file, name = file['name']) => { - await new Promise(async resolve => { +export const openWorldZip = async (file: File | ArrayBuffer, name = file['name']) => { + await new Promise(async resolve => { browserfs.configure({ // todo fs: 'MountableFileSystem', @@ -205,7 +204,7 @@ export const openWorldZip = async (/** @type {File | ArrayBuffer} */file, name = } } -export async function generateZipAndWorld () { +export async function generateZipAndWorld() { const zip = new JSZip() zip.folder('world') diff --git a/src/createLocalServer.js b/src/createLocalServer.ts similarity index 100% rename from src/createLocalServer.js rename to src/createLocalServer.ts diff --git a/src/cursor.js b/src/cursor.js index bb3c1bbe1..65a3d4ed8 100644 --- a/src/cursor.js +++ b/src/cursor.js @@ -1,4 +1,3 @@ -//@ts-check /* global THREE performance */ // wouldn't better to create atlas instead? diff --git a/src/customServer.js b/src/customServer.js deleted file mode 100644 index d4206839d..000000000 --- a/src/customServer.js +++ /dev/null @@ -1,36 +0,0 @@ -//@ts-check -const EventEmitter = require('events').EventEmitter - -const Client = require('minecraft-protocol/src/client') - -const customCommunication = { - sendData: function (data) { - window.serverDataChannel[this.isServer ? 'emitClient' : 'emitServer'](data) - }, - receiverSetup: function (processData) { - window.serverDataChannel[this.isServer ? 'emitServer' : 'emitClient'] = (data) => { - processData(data) - } - } -} - -module.exports.customCommunication = customCommunication - -module.exports.LocalServer = class LocalServer extends EventEmitter { - constructor (version, customPackets, hideErrors = false) { - super() - this.version = version - this.socketServer = null - this.cipher = null - this.decipher = null - this.clients = {} - this.customPackets = customPackets - this.hideErrors = hideErrors - } - - listen () { - this.emit('connection', new Client(true, this.version, this.customPackets, this.hideErrors, customCommunication)) - } - - close () { } -} diff --git a/src/customServer.ts b/src/customServer.ts new file mode 100644 index 000000000..c2a6c8229 --- /dev/null +++ b/src/customServer.ts @@ -0,0 +1,33 @@ +import EventEmitter from 'events' + +import Client from 'minecraft-protocol/src/client' + +export const customCommunication = { + sendData(data) { + //@ts-ignore + window.serverDataChannel[this.isServer ? 'emitClient' : 'emitServer'](data) + }, + receiverSetup(processData) { + //@ts-ignore + window.serverDataChannel[this.isServer ? 'emitServer' : 'emitClient'] = (data) => { + processData(data) + } + } +} + +export class LocalServer extends EventEmitter.EventEmitter { + socketServer = null + cipher = null + decipher = null + clients = {} + + constructor(public version, public customPackets, public hideErrors = false) { + super() + } + + listen() { + this.emit('connection', new Client(true, this.version, this.customPackets, this.hideErrors, customCommunication)) + } + + close() { } +} diff --git a/src/globalState.js b/src/globalState.ts similarity index 77% rename from src/globalState.js rename to src/globalState.ts index 7c5b884fe..e53700df5 100644 --- a/src/globalState.js +++ b/src/globalState.ts @@ -6,32 +6,29 @@ import { options } from './optionsStorage' // todo: refactor structure with support of hideNext=false -/** - * @typedef {({elem?: HTMLElement & Record} & {reactType?: string})} Modal - * @typedef {{callback, label}} ContextMenuItem - */ +type Modal = ({ elem?: HTMLElement & Record } & { reactType?: string }) + +type ContextMenuItem = { callback; label } -/** @type {Modal[]} */ -export const activeModalStack = proxy([]) +export const activeModalStack: Modal[] = proxy([]) -export const replaceActiveModalStack = (name, newModalStack = activeModalStacks[name]) => { +export const replaceActiveModalStack = (name: string, newModalStack = activeModalStacks[name]) => { hideModal(undefined, undefined, { restorePrevious: false, force: true, }) activeModalStack.splice(0, activeModalStack.length, ...newModalStack) // todo restore previous } -/** @type {Record} */ -export const activeModalStacks = {} +export const activeModalStacks: Record = {} window.activeModalStack = activeModalStack export const customDisplayManageKeyword = 'custom' const defaultModalActions = { - show (/** @type {Modal} */modal) { + show(modal: Modal) { if (modal.elem) modal.elem.style.display = 'block' }, - hide (/** @type {Modal} */modal) { + hide(modal: Modal) { if (modal.elem) modal.elem.style.display = 'none' } } @@ -39,14 +36,14 @@ const defaultModalActions = { /** * @returns true if operation was successful */ -const showModalInner = (/** @type {Modal} */ modal) => { +const showModalInner = (modal: Modal) => { const cancel = modal.elem?.show?.() if (cancel && cancel !== customDisplayManageKeyword) return false if (cancel !== 'custom') defaultModalActions.show(modal) return true } -export const showModal = (/** @type {HTMLElement & Record | {reactType: string}} */ elem) => { +export const showModal = (elem: (HTMLElement & Record) | { reactType: string }) => { const resolved = elem instanceof HTMLElement ? { elem: ref(elem) } : elem const curModal = activeModalStack.slice(-1)[0] if (elem === curModal?.elem || !showModalInner(resolved)) return @@ -56,11 +53,9 @@ export const showModal = (/** @type {HTMLElement & Record | {reactT /** * - * @param {*} data - * @param {{ force?: boolean, restorePrevious?: boolean }} options * @returns true if previous modal was restored */ -export const hideModal = (modal = activeModalStack.slice(-1)[0], data = undefined, options = {}) => { +export const hideModal = (modal = activeModalStack.slice(-1)[0], data: any = undefined, options: { force?: boolean; restorePrevious?: boolean } = {}) => { const { force = false, restorePrevious = true } = options if (!modal) return let cancel = modal.elem?.hide?.(data) @@ -84,7 +79,7 @@ export const hideCurrentModal = (_data = undefined, restoredActions = undefined) if (hideModal(undefined, undefined)) { restoredActions?.() if (activeModalStack.length === 0) { - if (!isGameActive()) { + if (!isGameActive(false)) { showModal(document.getElementById('title-screen')) } else { pointerLock.requestPointerLock() @@ -95,9 +90,9 @@ export const hideCurrentModal = (_data = undefined, restoredActions = undefined) // --- -export const currentContextMenu = proxy({ items: /** @type {ContextMenuItem[] | null} */[], x: 0, y: 0, }) +export const currentContextMenu = proxy({ items: [] as ContextMenuItem[] | null, x: 0, y: 0, }) -export const showContextmenu = (/** @type {ContextMenuItem[]} */items, { clientX, clientY }) => { +export const showContextmenu = (items: ContextMenuItem[], { clientX, clientY }) => { Object.assign(currentContextMenu, { items, x: clientX, @@ -108,12 +103,12 @@ export const showContextmenu = (/** @type {ContextMenuItem[]} */items, { clientX // --- export const miscUiState = proxy({ - currentTouch: null, + currentTouch: null as boolean | null, singleplayer: false, gameLoaded: false, }) -export const isGameActive = (foregroundCheck) => { +export const isGameActive = (foregroundCheck: boolean) => { if (foregroundCheck && activeModalStack.length) return false return miscUiState.gameLoaded } diff --git a/src/guessProblem.js b/src/guessProblem.ts similarity index 100% rename from src/guessProblem.js rename to src/guessProblem.ts diff --git a/src/importsWorkaround.js b/src/importsWorkaround.js new file mode 100644 index 000000000..33815d6b2 --- /dev/null +++ b/src/importsWorkaround.js @@ -0,0 +1,2 @@ +// workaround for mineflayer +process.versions.node = '18.0.0' diff --git a/src/index.js b/src/index.ts similarity index 83% rename from src/index.js rename to src/index.ts index 8c5038f09..2ae94c94f 100644 --- a/src/index.js +++ b/src/index.ts @@ -1,73 +1,88 @@ -//@ts-check -/* global THREE */ -// todo cant ignore fs thus doesnt work in browser -// const soureMapSupport = require('source-map-support') -// soureMapSupport.install({ -// environment: 'browser', -// }) -require('./styles.css') -require('iconify-icon') -require('./chat') -require('./inventory') -//@ts-ignore -require('./globals.js') -require('./watchOptions') - -// workaround for mineflayer -process.versions.node = '18.0.0' - -require('./menus/components/button') -require('./menus/components/edit_box') -require('./menus/components/slider') -require('./menus/components/hotbar') -require('./menus/components/health_bar') -require('./menus/components/food_bar') -require('./menus/components/breath_bar') -require('./menus/components/debug_overlay') -require('./menus/components/playerlist_overlay') -require('./menus/components/bossbars_overlay') -require('./menus/hud') -require('./menus/play_screen') -require('./menus/pause_screen') -require('./menus/loading_or_error_screen') -require('./menus/keybinds_screen') -require('./menus/options_screen') -require('./menus/advanced_options_screen') -require('./menus/notification') -require('./menus/title_screen') - -require('./optionsStorage') -require('./reactUi.jsx') -require('./controls') -require('./dragndrop') -require('./browserfs') -require('./eruda') -require('./downloadAndOpenWorld') - -const net = require('net') -const Stats = require('stats.js') - -const mineflayer = require('mineflayer') -const { WorldView, Viewer } = require('prismarine-viewer/viewer') -const pathfinder = require('mineflayer-pathfinder') -const { Vec3 } = require('vec3') - -const Cursor = require('./cursor').default +import './importsWorkaround' +import './styles.css' +import './globals' +import 'iconify-icon' +import './chat' +import './inventory' + +import './menus/components/button' +import './menus/components/edit_box' +import './menus/components/slider' +import './menus/components/hotbar' +import './menus/components/health_bar' +import './menus/components/food_bar' +import './menus/components/breath_bar' +import './menus/components/debug_overlay' +import './menus/components/playerlist_overlay' +import './menus/components/bossbars_overlay' +import './menus/hud' +import './menus/play_screen' +import './menus/pause_screen' +import './menus/loading_or_error_screen' +import './menus/keybinds_screen' +import './menus/options_screen' +import './menus/advanced_options_screen' +import { notification } from './menus/notification' +import './menus/title_screen' + +import './optionsStorage' +import './reactUi.jsx' +import './controls' +import './dragndrop' +import './browserfs' +import './eruda' +import './downloadAndOpenWorld' + +import net from 'net' +import Stats from 'stats.js' +import mineflayer from 'mineflayer' +import { WorldView, Viewer } from 'prismarine-viewer/viewer' +import pathfinder from 'mineflayer-pathfinder' +import { Vec3 } from 'vec3' + +import Cursor from './cursor' + +import * as THREE from 'three' + +import { initVR } from './vr' +import { + activeModalStack, + showModal, + hideCurrentModal, + activeModalStacks, + replaceActiveModalStack, + isGameActive, + miscUiState, + gameAdditionalState +} from './globalState' + +import { + pointerLock, + goFullscreen, + toNumber, + isCypress, + loadScript, + toMajorVersion, + setLoadingScreenStatus +} from './utils' + +import { + removePanorama, + addPanoramaCubeMap, + initPanoramaOptions +} from './panorama' + +import { startLocalServer, unsupportedLocalServerFeatures } from './createLocalServer' +import serverOptions from './defaultLocalServerOptions' +import { customCommunication } from './customServer' +import updateTime from './updateTime' +import { options } from './optionsStorage' +import { subscribeKey } from 'valtio/utils' +import _ from 'lodash' +import { contro } from './controls' + //@ts-ignore -global.THREE = require('three') -const { initVR } = require('./vr') -const { activeModalStack, showModal, hideModal, hideCurrentModal, activeModalStacks, replaceActiveModalStack, isGameActive, miscUiState, gameAdditionalState } = require('./globalState') -const { pointerLock, goFullscreen, toNumber, isCypress, loadScript, toMajorVersion, setLoadingScreenStatus } = require('./utils') -const { notification } = require('./menus/notification') -const { removePanorama, addPanoramaCubeMap, initPanoramaOptions } = require('./panorama') -const { startLocalServer, unsupportedLocalServerFeatures } = require('./createLocalServer') -const serverOptions = require('./defaultLocalServerOptions') -const { customCommunication } = require('./customServer') -const { default: updateTime } = require('./updateTime') -const { options } = require('./optionsStorage') -const { subscribeKey } = require('valtio/utils') -const _ = require('lodash') -const { contro } = require('./controls') +window.THREE = THREE if ('serviceWorker' in navigator && !isCypress()) { window.addEventListener('load', () => { @@ -121,13 +136,12 @@ renderer.setSize(window.innerWidth, window.innerHeight) document.body.appendChild(renderer.domElement) // Create viewer -/** @type {import('../prismarine-viewer/viewer/lib/viewer').Viewer} */ -const viewer = new Viewer(renderer, options.numWorkers) +const viewer: import('../prismarine-viewer/viewer/lib/viewer').Viewer = new Viewer(renderer, options.numWorkers) initPanoramaOptions(viewer) const frameLimit = toNumber(localStorage.frameLimit) let interval = frameLimit && 1000 / frameLimit -window.addEventListener('option-change', (/** @type {any} */{ detail }) => { +window.addEventListener('option-change', ({ detail }: any) => { if (detail.name === 'frameLimit') interval = toNumber(detail.value) && 1000 / toNumber(detail.value) }) @@ -135,7 +149,7 @@ let nextFrameFn = [] let postRenderFrameFn = () => { } let delta = 0 let lastTime = performance.now() -const renderFrame = (/** @type {DOMHighResTimeStamp} */ time) => { +const renderFrame = (time: DOMHighResTimeStamp) => { if (window.stopLoop) return window.requestAnimationFrame(renderFrame) if (window.stopRender) return @@ -179,7 +193,7 @@ const pauseMenu = document.getElementById('pause-screen') let mouseMovePostHandle = (e) => { } let lastMouseCall -function onMouseMove (e) { +function onMouseMove(e) { if (e.type !== 'touchmove' && !pointerLock.hasPointerLock) return e.stopPropagation?.() const now = performance.now() @@ -197,12 +211,12 @@ function onMouseMove (e) { window.addEventListener('mousemove', onMouseMove, { capture: true }) -function hideCurrentScreens () { +function hideCurrentScreens() { activeModalStacks['main-menu'] = activeModalStack replaceActiveModalStack('', []) } -async function main () { +async function main() { const menu = document.getElementById('play-screen') menu.addEventListener('connect', e => { const options = e.detail @@ -231,8 +245,7 @@ let timeouts = [] let intervals = [] // only for dom listeners (no removeAllListeners) // todo refactor them out of connect fn instead -/** @type {import('./utilsTs').RegisterListener} */ -const registerListener = (target, event, callback) => { +const registerListener: import('./utilsTs').RegisterListener = (target, event, callback) => { target.addEventListener(event, callback) listeners.push({ target, event, callback }) } @@ -250,7 +263,7 @@ const removeAllListeners = () => { /** * @param {{ server: any; port?: string; singleplayer: any; username: any; password: any; proxy: any; botVersion?: any; serverOverrides? }} connectOptions */ -async function connect (connectOptions) { +async function connect(connectOptions) { const menu = document.getElementById('play-screen') menu.style = 'display: none;' removePanorama() @@ -305,8 +318,7 @@ async function connect (connectOptions) { setLoadingScreenStatus('Logging in') - /** @type {mineflayer.Bot} */ - let bot + let bot: mineflayer.Bot const destroyAll = () => { viewer.resetAll() window.localServer = undefined @@ -407,7 +419,7 @@ async function connect (connectOptions) { version: connectOptions.botVersion === '' ? false : connectOptions.botVersion, ...singeplayer ? { version: serverOptions.version, - connect () { }, + connect() { }, keepAlive: false, customCommunication } : {}, @@ -417,7 +429,7 @@ async function connect (connectOptions) { checkTimeoutInterval: 240 * 1000, noPongTimeout: 240 * 1000, closeTimeout: 240 * 1000, - async versionSelectedHook (client) { + async versionSelectedHook(client) { await downloadMcData(client.version) } }) @@ -459,8 +471,7 @@ async function connect (connectOptions) { bot.once('login', () => { // server is ok, add it to the history - /** @type {string[]} */ - const serverHistory = JSON.parse(localStorage.getItem('serverHistory') || '[]') + const serverHistory: string[] = JSON.parse(localStorage.getItem('serverHistory') || '[]') serverHistory.unshift(connectOptions.server) localStorage.setItem('serverHistory', JSON.stringify([...new Set(serverHistory)])) @@ -480,8 +491,7 @@ async function connect (connectOptions) { const center = bot.entity.position - /** @type {import('../prismarine-viewer/viewer/lib/worldView').WorldView} */ - const worldView = new WorldView(bot.world, singeplayer ? renderDistance : Math.min(renderDistance, maxMultiplayerRenderDistance), center) + const worldView: import('../prismarine-viewer/viewer/lib/worldView').WorldView = new WorldView(bot.world, singeplayer ? renderDistance : Math.min(renderDistance, maxMultiplayerRenderDistance), center) let fovSetting = optionsScrn.fov const updateFov = () => { @@ -542,7 +552,7 @@ async function connect (connectOptions) { updateTime(bot) // Bot position callback - function botPosition () { + function botPosition() { // this might cause lag, but not sure viewer.setFirstPersonCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch) worldView.updatePosition(bot.entity.position) @@ -558,7 +568,7 @@ async function connect (connectOptions) { bot.entity.yaw -= x } - function changeCallback () { + function changeCallback() { notification.show = false if (!pointerLock.hasPointerLock && activeModalStack.length === 0) { showModal(pauseMenu) @@ -573,8 +583,7 @@ async function connect (connectOptions) { const touchStartBreakingBlockMs = 500 let virtualClickActive = false let virtualClickTimeout - /** @type {{id,x,y,sourceX,sourceY,activateCameraMove,time}?} */ - let capturedPointer + let capturedPointer: { id; x; y; sourceX; sourceY; activateCameraMove; time; } | null registerListener(document, 'pointerdown', (e) => { const clickedEl = e.composedPath()[0] if (!isGameActive(true) || !miscUiState.currentTouch || clickedEl !== cameraControlEl || capturedPointer || e.pointerId === undefined) { diff --git a/src/optionsStorage.js b/src/optionsStorage.ts similarity index 78% rename from src/optionsStorage.js rename to src/optionsStorage.ts index 8165140ac..f344f485b 100644 --- a/src/optionsStorage.js +++ b/src/optionsStorage.ts @@ -1,15 +1,14 @@ -//@ts-check // todo implement async options storage import { proxy, subscribe } from 'valtio/vanilla' -import { mergeAny } from './optionsStorageTypes' // weird webpack configuration bug: it cant import valtio/utils in this file import { subscribeKey } from 'valtio/utils' +const mergeAny: (arg1: T, arg2: any) => T = Object.assign + const defaultOptions = { renderDistance: 4, - /** @type {boolean | undefined | null} */ - alwaysBackupWorldBeforeLoading: undefined, + alwaysBackupWorldBeforeLoading: undefined as boolean | undefined | null, alwaysShowMobileControls: false, maxMultiplayerRenderDistance: 6, excludeCommunicationDebugEvents: [], @@ -34,11 +33,12 @@ subscribe(options, () => { localStorage.options = JSON.stringify(options) }) -/** @type {import('./optionsStorageTypes').WatchValue} */ -export const watchValue = (proxy, callback) => { - const watchedProps = new Set() +type WatchValue = >(proxy: T, callback: (p: T) => void) => void + +export const watchValue: WatchValue = (proxy, callback) => { + const watchedProps = new Set() callback(new Proxy(proxy, { - get (target, p, receiver) { + get(target, p, receiver) { watchedProps.add(p.toString()) return Reflect.get(target, p, receiver) }, diff --git a/src/optionsStorageTypes.ts b/src/optionsStorageTypes.ts deleted file mode 100644 index b554da4d4..000000000 --- a/src/optionsStorageTypes.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const mergeAny: (arg1: T, arg2: any) => T = Object.assign - -export type WatchValue = >(proxy: T, callback: (p: T) => void) => void diff --git a/src/updateTime.js b/src/updateTime.ts similarity index 95% rename from src/updateTime.js rename to src/updateTime.ts index 79d90044a..3d871ff5f 100644 --- a/src/updateTime.js +++ b/src/updateTime.ts @@ -1,5 +1,4 @@ -//@ts-check -export default (/** @type {import('mineflayer').Bot} */bot) => { +export default (bot: import('mineflayer').Bot) => { bot.on('time', () => { // 0 morning const dayTotal = 24_000 diff --git a/src/utils.js b/src/utils.ts similarity index 92% rename from src/utils.js rename to src/utils.ts index 682d40fdb..6ca9b6b09 100644 --- a/src/utils.js +++ b/src/utils.ts @@ -1,4 +1,3 @@ -//@ts-check import { activeModalStack, miscUiState, showModal } from './globalState' import { notification } from './menus/notification' import * as crypto from 'crypto' @@ -24,11 +23,11 @@ export const toNumber = (val) => { } export const pointerLock = { - get hasPointerLock () { + get hasPointerLock() { return document.pointerLockElement }, justHitEscape: false, - async requestPointerLock () { + async requestPointerLock() { if (document.getElementById('hud').style.display === 'none' || activeModalStack.length || !document.documentElement.requestPointerLock || miscUiState.currentTouch) { return } @@ -44,9 +43,8 @@ export const pointerLock = { if (!(document.fullscreenElement && navigator['keyboard']) && this.justHitEscape) { displayBrowserProblem() } else { - /** @type {any} */ //@ts-ignore - const promise = document.documentElement.requestPointerLock({ + const promise: any = document.documentElement.requestPointerLock({ unadjustedMovement: options.mouseRawInput }) promise?.catch((error) => { @@ -70,7 +68,7 @@ window.getScreenRefreshRate = getScreenRefreshRate /** * Allows to obtain the estimated Hz of the primary monitor in the system. */ -export function getScreenRefreshRate () { +export function getScreenRefreshRate() { let requestId = null let callbackTriggered = false let resolve @@ -121,7 +119,7 @@ export const isCypress = () => { } // https://github.com/PrismarineJS/node-minecraft-protocol/blob/cf1f67117d586b5e6e21f0d9602da12e9fcf46b6/src/server/login.js#L170 -function javaUUID (s) { +function javaUUID(s: string) { const hash = crypto.createHash('md5') hash.update(s, 'utf8') const buffer = hash.digest() @@ -130,11 +128,11 @@ function javaUUID (s) { return buffer } -export function nameToMcOfflineUUID (name) { +export function nameToMcOfflineUUID(name) { return (new UUID(javaUUID('OfflinePlayer:' + name))).toString() } -export const setLoadingScreenStatus = function (/** @type {string} */status, isError = false, hideDots = false) { +export const setLoadingScreenStatus = function (status: string, isError = false, hideDots = false) { const loadingScreen = document.getElementById('loading-error-screen') // todo update in component instead @@ -162,7 +160,7 @@ export const disconnect = async () => { miscUiState.gameLoaded = false } -export const loadScript = async function (/** @type {string} */ scriptSrc) { +export const loadScript = async function (scriptSrc: string) { if (document.querySelector(`script[src="${scriptSrc}"]`)) { return } diff --git a/src/watchOptions.js b/src/watchOptions.ts similarity index 94% rename from src/watchOptions.js rename to src/watchOptions.ts index 7757208f5..de5450330 100644 --- a/src/watchOptions.js +++ b/src/watchOptions.ts @@ -1,4 +1,3 @@ -//@ts-check // not all options are watched here import { subscribeKey } from 'valtio/utils' From 6e8e3cabb49eec1e85cb8d6fbe3922486a7850bf Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Thu, 7 Sep 2023 16:46:48 +0300 Subject: [PATCH 198/318] correctly display cursor mesh using collision data --- src/cursor.js | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/src/cursor.js b/src/cursor.js index 65a3d4ed8..b52493528 100644 --- a/src/cursor.js +++ b/src/cursor.js @@ -110,6 +110,7 @@ class Cursor { update (/** @type {import('mineflayer').Bot} */bot) { /** diggable block */ let cursorBlock = bot.blockAtCursor(6) + let cursorBlockOriginal = cursorBlock if (!bot.canDigBlock(cursorBlock)) cursorBlock = null let cursorChanged = !cursorBlock !== !this.cursorBlock @@ -146,26 +147,40 @@ class Cursor { } catch (e) { } // to be reworked in mineflayer, then remove the try here } + // Show cursor + if (!cursorBlock) { + this.cursorMesh.visible = false + } else { + for (const collisionData of cursorBlockOriginal.shapes.slice(0, 1) ?? []) { + const width = collisionData[3] - collisionData[0] + const height = collisionData[4] - collisionData[1] + const depth = collisionData[5] - collisionData[2] + + const initialSize = 1.001 + this.cursorMesh.scale.set(width * initialSize, height * initialSize, depth * initialSize) + this.blockBreakMesh.scale.set(width * initialSize, height * initialSize, depth * initialSize) + // this.cursorMesh.position.set(cursorBlock.position.x + 0.5, cursorBlock.position.y + 0.5, cursorBlock.position.z + 0.5) + const centerX = (collisionData[3] + collisionData[0]) / 2 + const centerY = (collisionData[4] + collisionData[1]) / 2 + const centerZ = (collisionData[5] + collisionData[2]) / 2 + this.cursorMesh.position.set(cursorBlock.position.x + centerX, cursorBlock.position.y + centerY, cursorBlock.position.z + centerZ) + this.blockBreakMesh.position.set(cursorBlock.position.x + centerX, cursorBlock.position.y + centerY, cursorBlock.position.z + centerZ) + } + this.cursorMesh.visible = true + // change + } + // Show break animation if (cursorBlock && this.buttons[0]) { const elapsed = performance.now() - this.breakStartTime const time = bot.digTime(cursorBlock) const state = Math.floor((elapsed / time) * 10) - this.blockBreakMesh.position.set(cursorBlock.position.x + 0.5, cursorBlock.position.y + 0.5, cursorBlock.position.z + 0.5) this.blockBreakMesh.material.map = this.breakTextures[state] this.blockBreakMesh.visible = true } else { this.blockBreakMesh.visible = false } - // Show cursor - if (!cursorBlock) { - this.cursorMesh.visible = false - } else { - this.cursorMesh.visible = true - this.cursorMesh.position.set(cursorBlock.position.x + 0.5, cursorBlock.position.y + 0.5, cursorBlock.position.z + 0.5) - } - // Update state this.cursorBlock = cursorBlock this.lastButtons[0] = this.buttons[0] From b8b8f7bfd8573ee15a2cefa4ed3391fb2e62db11 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Fri, 8 Sep 2023 16:43:40 +0300 Subject: [PATCH 199/318] upstream server changes --- src/createLocalServer.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/createLocalServer.ts b/src/createLocalServer.ts index 931336290..ec5cb073b 100644 --- a/src/createLocalServer.ts +++ b/src/createLocalServer.ts @@ -5,6 +5,8 @@ import { LocalServer } from './customServer' export const startLocalServer = () => { const server = mcServer.createMCServer({ ...serverOptions, Server: LocalServer }) + server.formatMessage = (message) => `[server] ${message}` + server.options = serverOptions return server } From 3decbe3626eec9e047a54b43c7148c55d4e7a5cc Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 8 Sep 2023 15:49:19 +0300 Subject: [PATCH 200/318] up anvil for singleplayer compatibility --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9c8a965ec..c4ce1af6c 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "pnpm": { "overrides": { "minecraft-data": "latest", - "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#chunk-impl-require-fix", + "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything", "minecraft-protocol": "github:zardoy/minecraft-protocol#custom-client-extra" } } From 2895a1fcc03c3a194e04f68ecebe90b5cb186c2a Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 8 Sep 2023 19:39:42 +0300 Subject: [PATCH 201/318] fix too fast block placing --- src/cursor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cursor.js b/src/cursor.js index b52493528..4526e4376 100644 --- a/src/cursor.js +++ b/src/cursor.js @@ -126,7 +126,7 @@ class Cursor { // check instead? //@ts-ignore bot._placeBlockWithOptions(cursorBlock, vecArray[cursorBlock.face], { delta, forceLook: 'ignore' }).catch(console.warn) - // this.lastBlockPlaced = 0 + this.lastBlockPlaced = 0 } // Start break From 898648d849f7a890f7d8b7e956ba6c6ea22df00f Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 8 Sep 2023 19:42:18 +0300 Subject: [PATCH 202/318] fix: display non-breakable blocks allow to break anything in creative --- src/cursor.js | 14 +++++++------- src/index.ts | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cursor.js b/src/cursor.js index 4526e4376..c3166d34d 100644 --- a/src/cursor.js +++ b/src/cursor.js @@ -1,3 +1,4 @@ +//@ts-check /* global THREE performance */ // wouldn't better to create atlas instead? @@ -108,10 +109,9 @@ class Cursor { // todo this shouldnt be done in the render loop, migrate the code to dom events to avoid delays on lags update (/** @type {import('mineflayer').Bot} */bot) { - /** diggable block */ - let cursorBlock = bot.blockAtCursor(6) - let cursorBlockOriginal = cursorBlock - if (!bot.canDigBlock(cursorBlock)) cursorBlock = null + const cursorBlock = bot.blockAtCursor(5) + let cursorBlockDiggable = cursorBlock + if (!bot.canDigBlock(cursorBlock) && bot.game.gameMode !== 'creative') cursorBlockDiggable = null let cursorChanged = !cursorBlock !== !this.cursorBlock if (cursorBlock && this.cursorBlock) { @@ -131,7 +131,7 @@ class Cursor { // Start break // todo last check doesnt work as cursorChanged happens once (after that check is false) - if (cursorBlock && this.buttons[0] && (!this.lastButtons[0] || (cursorChanged && Date.now() - (this.lastDigged ?? 0) > 100))) { + if (cursorBlockDiggable && this.buttons[0] && (!this.lastButtons[0] || (cursorChanged && Date.now() - (this.lastDigged ?? 0) > 100))) { this.breakStartTime = performance.now() bot.dig(cursorBlock, 'ignore').catch((err) => { if (err.message === 'Digging aborted') return @@ -151,7 +151,7 @@ class Cursor { if (!cursorBlock) { this.cursorMesh.visible = false } else { - for (const collisionData of cursorBlockOriginal.shapes.slice(0, 1) ?? []) { + for (const collisionData of cursorBlock.shapes.slice(0, 1) ?? []) { const width = collisionData[3] - collisionData[0] const height = collisionData[4] - collisionData[1] const depth = collisionData[5] - collisionData[2] @@ -171,7 +171,7 @@ class Cursor { } // Show break animation - if (cursorBlock && this.buttons[0]) { + if (cursorBlockDiggable && this.buttons[0]) { const elapsed = performance.now() - this.breakStartTime const time = bot.digTime(cursorBlock) const state = Math.floor((elapsed / time) * 10) diff --git a/src/index.ts b/src/index.ts index 2ae94c94f..42f09d9df 100644 --- a/src/index.ts +++ b/src/index.ts @@ -531,9 +531,9 @@ async function connect(connectOptions) { const cursor = new Cursor(viewer, renderer, bot) postRenderFrameFn = () => { - debugMenu.cursorBlock = cursor.cursorBlock viewer.setFirstPersonCamera(null, bot.entity.yaw, bot.entity.pitch) cursor.update(bot) + debugMenu.cursorBlock = cursor.cursorBlock } try { From 3008be0ca6a151b21ea06f829b3c8a64b6982cec Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Sat, 9 Sep 2023 23:49:49 +0300 Subject: [PATCH 203/318] select hotbar on touch --- src/menus/components/hotbar.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/menus/components/hotbar.js b/src/menus/components/hotbar.js index 7f65681e5..94ead334c 100644 --- a/src/menus/components/hotbar.js +++ b/src/menus/components/hotbar.js @@ -187,7 +187,11 @@ class Hotbar extends LitElement {

    ${this.activeItemName}

    -
    +
    { + if (!e.target.id.startsWith('hotbar')) return + const slot = +e.target.id.split('-')[1] + this.reloadHotbarSelected(slot) + }}>
    From bd98795059dec8b1005fdcd69bd8f0b46af34071 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Sat, 9 Sep 2023 23:58:38 +0300 Subject: [PATCH 204/318] temp fixes for ios scaling & chat issues --- src/controls.ts | 12 ++++++++++++ src/reactUi.jsx | 2 +- src/styles.css | 6 +++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/controls.ts b/src/controls.ts index fe883fbae..7e02b88fe 100644 --- a/src/controls.ts +++ b/src/controls.ts @@ -302,3 +302,15 @@ const toggleFly = () => { gameAdditionalState.isFlying = isFlying() } // #endregion +addEventListener('mousedown', (e) => { + // wheel click + // todo support ctrl+wheel (+nbt) + if (e.button === 1) { + const block = bot.blockAtCursor(/* 6 */5) + if (!block) return + const Item = require('prismarine-item')(bot.version); + const item = new Item(block.type, 1, 0); + bot.creative.setInventorySlot(bot.inventory.hotbarStart + bot.quickBarSlot, item) + bot.updateHeldItem() + } +}) diff --git a/src/reactUi.jsx b/src/reactUi.jsx index b2730b031..e479fb092 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -13,7 +13,7 @@ import { contro } from './controls' useInterfaceState.setState({ isFlying: false, uiCustomization: { - touchButtonSize: isProbablyIphone() ? 55 : 40, + touchButtonSize: isProbablyIphone() ? 30 : 40, }, updateCoord: ([coord, state]) => { const coordToAction = [ diff --git a/src/styles.css b/src/styles.css index b04f4d55b..50070d66f 100644 --- a/src/styles.css +++ b/src/styles.css @@ -118,8 +118,8 @@ canvas { @media only screen and (max-height: 430px) { #ui-root { - transform: scale(1); - width: calc(100% / 1); - height: calc(100% / 1); + transform: scale(1.5); + width: calc(100% / 1.5); + height: calc(100% / 1.5); } } From 0929e600819e2414c451c7d4fac269504528457a Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Sat, 9 Sep 2023 23:58:48 +0300 Subject: [PATCH 205/318] select block on middle mouse --- src/chat.js | 1 + src/menus/hud.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/chat.js b/src/chat.js index bd36b8374..91b60e993 100644 --- a/src/chat.js +++ b/src/chat.js @@ -63,6 +63,7 @@ class ChatBox extends LitElement { width: var(--chatWidth); transform-origin: bottom left; transform: scale(var(--chatScale)); + pointer-events: none; } .chat-input-wrapper { diff --git a/src/menus/hud.js b/src/menus/hud.js index fa82f86f2..42dbb6f36 100644 --- a/src/menus/hud.js +++ b/src/menus/hud.js @@ -314,6 +314,9 @@ class Hud extends LitElement { render () { return html`
    + From 16c42de1f667c1f03fceb4355f5b5999d4f44863 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Sat, 9 Sep 2023 23:59:01 +0300 Subject: [PATCH 206/318] grass issues in inventory --- src/inventory.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/inventory.ts b/src/inventory.ts index 7ec34773c..dc0e7a491 100644 --- a/src/inventory.ts +++ b/src/inventory.ts @@ -45,6 +45,7 @@ const getBlockData = (name) => { const getSpriteBlockSide = (side) => { const d = data[side] + if (!d) return const spriteSide = [d.u * blocksImg.width, d.v * blocksImg.height, d.su * blocksImg.width, d.sv * blocksImg.height] const blockSideData = { slice: spriteSide, @@ -54,9 +55,10 @@ const getBlockData = (name) => { } return { - top: getSpriteBlockSide('up'), - left: getSpriteBlockSide('east'), - right: getSpriteBlockSide('north'), + // todo look at grass bug + top: getSpriteBlockSide('up') || getSpriteBlockSide('top'), + left: getSpriteBlockSide('east') || getSpriteBlockSide('side'), + right: getSpriteBlockSide('north') || getSpriteBlockSide('side'), } } From c3a189d8e1d11ba39d942a633bddae53b2e8a424 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Sat, 9 Sep 2023 23:59:15 +0300 Subject: [PATCH 207/318] fix build --- esbuild.mjs | 1 + scripts/esbuildPlugins.mjs | 1 + 2 files changed, 2 insertions(+) diff --git a/esbuild.mjs b/esbuild.mjs index 7eff754a9..2ae544175 100644 --- a/esbuild.mjs +++ b/esbuild.mjs @@ -66,6 +66,7 @@ const ctx = await esbuild.context({ crypto: './src/crypto.js', stream: 'stream-browserify', net: 'net-browserify', + assert: 'assert', dns: './src/dns.js' }, inject: [ diff --git a/scripts/esbuildPlugins.mjs b/scripts/esbuildPlugins.mjs index cbd0edec3..d12c0a243 100644 --- a/scripts/esbuildPlugins.mjs +++ b/scripts/esbuildPlugins.mjs @@ -252,6 +252,7 @@ const plugins = [ buffer: false, perf_hooks: false, net: false, + assert: false, }, }) ] From 659b089d9cc7e4b62fb6e3242f32102c724dfaa4 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Sun, 10 Sep 2023 17:41:51 +0300 Subject: [PATCH 208/318] more require to import --- src/browserfs.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/browserfs.ts b/src/browserfs.ts index d94cfbb0e..f0cd5fc54 100644 --- a/src/browserfs.ts +++ b/src/browserfs.ts @@ -5,9 +5,9 @@ import JSZip from 'jszip' import { join } from 'path' import { options } from './optionsStorage' -const { promisify } = require('util') -const browserfs = require('browserfs') -const fs = require('fs') +import { promisify } from 'util' +import browserfs from 'browserfs' +import * as fs from 'fs' browserfs.install(window) // todo migrate to StorageManager API for localsave as localstorage has only 5mb limit, when localstorage is fallback test limit warning on 4mb @@ -181,7 +181,7 @@ export const openWorldZip = async (file: File | ArrayBuffer, name = file['name'] loadSave() } else { const dirs = fs.readdirSync('/world') - let availableWorlds = [] + let availableWorlds: string[] = [] for (const dir of dirs) { if (fs.existsSync(`/world/${dir}/level.dat`)) { availableWorlds.push(dir) From 7bd9a5cfeeaa97221d978f189c37e19dea277506 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Tue, 12 Sep 2023 20:10:54 +0300 Subject: [PATCH 209/318] download map improvements --- src/browserfs.ts | 4 ++-- src/downloadAndOpenWorld.ts | 9 +++++---- src/index.ts | 21 +++++++++++++++++++-- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/browserfs.ts b/src/browserfs.ts index f0cd5fc54..4934b51dd 100644 --- a/src/browserfs.ts +++ b/src/browserfs.ts @@ -6,8 +6,8 @@ import { join } from 'path' import { options } from './optionsStorage' import { promisify } from 'util' -import browserfs from 'browserfs' -import * as fs from 'fs' +import * as browserfs from 'browserfs' +import fs from 'fs' browserfs.install(window) // todo migrate to StorageManager API for localsave as localstorage has only 5mb limit, when localstorage is fallback test limit warning on 4mb diff --git a/src/downloadAndOpenWorld.ts b/src/downloadAndOpenWorld.ts index 61d7fbc7d..dbdaef8cb 100644 --- a/src/downloadAndOpenWorld.ts +++ b/src/downloadAndOpenWorld.ts @@ -2,7 +2,7 @@ import { openWorldZip } from './browserfs' import { setLoadingScreenStatus } from './utils' import { filesize } from 'filesize' -window.addEventListener('load', async (e) => { +export default async () => { const qs = new URLSearchParams(window.location.search) const mapUrl = qs.get('map') if (!mapUrl) return @@ -13,6 +13,10 @@ window.addEventListener('load', async (e) => { setLoadingScreenStatus(`Downloading world ${name}...`) const response = await fetch(mapUrl) + const contentType = response.headers.get('Content-Type') + if (!contentType || !contentType.startsWith('application/zip')) { + alert('Invalid map file') + } const contentLength = +response.headers.get('Content-Length') setLoadingScreenStatus(`Downloading world ${name}: have to download ${filesize(contentLength)}...`) @@ -45,7 +49,4 @@ window.addEventListener('load', async (e) => { }) ).arrayBuffer() await openWorldZip(buffer) -}) - -export default async () => { } diff --git a/src/index.ts b/src/index.ts index 42f09d9df..9380de32a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -31,7 +31,7 @@ import './controls' import './dragndrop' import './browserfs' import './eruda' -import './downloadAndOpenWorld' +import downloadAndOpenWorld from './downloadAndOpenWorld' import net from 'net' import Stats from 'stats.js' @@ -583,10 +583,18 @@ async function connect(connectOptions) { const touchStartBreakingBlockMs = 500 let virtualClickActive = false let virtualClickTimeout + let screenTouches = 0 let capturedPointer: { id; x; y; sourceX; sourceY; activateCameraMove; time; } | null registerListener(document, 'pointerdown', (e) => { const clickedEl = e.composedPath()[0] - if (!isGameActive(true) || !miscUiState.currentTouch || clickedEl !== cameraControlEl || capturedPointer || e.pointerId === undefined) { + if (!isGameActive(true) || !miscUiState.currentTouch || clickedEl !== cameraControlEl || e.pointerId === undefined) { + return + } + screenTouches++ + if (screenTouches === 3) { + window.dispatchEvent(new MouseEvent('mousedown', { button: 1, })) + } + if (capturedPointer) { return } cameraControlEl.setPointerCapture(e.pointerId) @@ -649,6 +657,14 @@ async function connect(connectOptions) { capturedPointer = undefined }, { passive: false }) + registerListener(document, 'pointerup', (e) => { + const clickedEl = e.composedPath()[0] + if (!isGameActive(true) || !miscUiState.currentTouch || clickedEl !== cameraControlEl || e.pointerId === undefined) { + return + } + screenTouches-- + }) + registerListener(document, 'contextmenu', (e) => e.preventDefault(), false) registerListener(document, 'blur', (e) => { @@ -707,3 +723,4 @@ window.addEventListener('keydown', (e) => { addPanoramaCubeMap() showModal(document.getElementById('title-screen')) main() +downloadAndOpenWorld() From f2677eea4e5ab63d4bed9995074811ba0a68248e Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Tue, 12 Sep 2023 23:39:35 +0300 Subject: [PATCH 210/318] improve downloading progress reporting --- package.json | 2 +- src/downloadAndOpenWorld.ts | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c4ce1af6c..bc8532f1b 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "lit": "^2.8.0", "minecraft-data": "^3.0.0", "net-browserify": "github:PrismarineJS/net-browserify", + "pretty-bytes": "^6.1.1", "prismarine-world": "^3.6.2", "querystring": "^0.2.1", "react": "^18.2.0", @@ -69,7 +70,6 @@ "cypress": "^9.5.4", "cypress-esbuild-preprocessor": "^1.0.2", "events": "^3.3.0", - "filesize": "^10.0.12", "html-webpack-plugin": "^5.5.3", "http-browserify": "^1.7.0", "http-server": "^14.1.1", diff --git a/src/downloadAndOpenWorld.ts b/src/downloadAndOpenWorld.ts index dbdaef8cb..54c80599e 100644 --- a/src/downloadAndOpenWorld.ts +++ b/src/downloadAndOpenWorld.ts @@ -1,6 +1,10 @@ import { openWorldZip } from './browserfs' import { setLoadingScreenStatus } from './utils' -import { filesize } from 'filesize' +import prettyBytes from 'pretty-bytes' + +const getConstantFilesize = (bytes: number) => { + return prettyBytes(bytes, { minimumFractionDigits: 2, maximumFractionDigits: 2 }) +} export default async () => { const qs = new URLSearchParams(window.location.search) @@ -18,7 +22,7 @@ export default async () => { alert('Invalid map file') } const contentLength = +response.headers.get('Content-Length') - setLoadingScreenStatus(`Downloading world ${name}: have to download ${filesize(contentLength)}...`) + setLoadingScreenStatus(`Downloading world ${name}: have to download ${getConstantFilesize(contentLength)}...`) let downloadedBytes = 0 const buffer = await new Response( @@ -40,7 +44,9 @@ export default async () => { const progress = (downloadedBytes / contentLength) * 100 // Update your progress bar or display the progress value as needed - setLoadingScreenStatus(`Download Progress: ${Math.floor(progress)}% (${filesize(downloadedBytes, { round: 2, })} / ${filesize(contentLength, { round: 2, })}))`, false, true) + if (contentLength) { + setLoadingScreenStatus(`Download Progress: ${Math.floor(progress)}% (${getConstantFilesize(downloadedBytes)} / ${getConstantFilesize(contentLength)}))`, false, true) + } // Pass the received data to the controller controller.enqueue(value) From e99faef044b8946cf87166e67e577c00b346dc47 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 14 Sep 2023 04:15:15 +0300 Subject: [PATCH 211/318] add blockInteractionShape, make cursor singleton --- package.json | 2 ++ src/cursor.js | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index bc8532f1b..3dd8c3f06 100644 --- a/package.json +++ b/package.json @@ -105,6 +105,8 @@ }, "pnpm": { "overrides": { + "prismarine-block": "github:zardoy/prismarine-block#next-era", + "prismarine-world": "github:zardoy/prismarine-world#next-era", "minecraft-data": "latest", "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything", "minecraft-protocol": "github:zardoy/minecraft-protocol#custom-client-extra" diff --git a/src/cursor.js b/src/cursor.js index c3166d34d..25865ae69 100644 --- a/src/cursor.js +++ b/src/cursor.js @@ -25,7 +25,11 @@ function getViewDirection (pitch, yaw) { } class Cursor { + static instance = null + constructor (viewer, renderer, /** @type {import('mineflayer').Bot} */bot) { + if (Cursor.instance) return Cursor.instance + // Init state this.buttons = [false, false, false] this.lastButtons = [false, false, false] @@ -151,7 +155,7 @@ class Cursor { if (!cursorBlock) { this.cursorMesh.visible = false } else { - for (const collisionData of cursorBlock.shapes.slice(0, 1) ?? []) { + for (const collisionData of [...cursorBlock.shapes, ...cursorBlock['interactionShapes'] ?? []].slice(0, 1) ?? []) { const width = collisionData[3] - collisionData[0] const height = collisionData[4] - collisionData[1] const depth = collisionData[5] - collisionData[2] From d414996c719b953239922b598d70283b1e77c9dd Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 14 Sep 2023 18:48:48 +0300 Subject: [PATCH 212/318] always display target, meaningful error on proxy unavailable --- src/index.ts | 23 ++++++++++++++++------- src/menus/components/debug_overlay.js | 5 ++--- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/index.ts b/src/index.ts index 9380de32a..285cde0d6 100644 --- a/src/index.ts +++ b/src/index.ts @@ -310,12 +310,6 @@ async function connect(connectOptions) { } console.log(`connecting to ${host} ${port} with ${username}`) - if (proxy) { - console.log(`using proxy ${proxy} ${proxyport}`) - //@ts-ignore - net.setProxy({ hostname: proxy, port: proxyport }) - } - setLoadingScreenStatus('Logging in') let bot: mineflayer.Bot @@ -374,6 +368,21 @@ async function connect(connectOptions) { }, { signal: errorAbortController.signal }) + + if (proxy) { + console.log(`using proxy ${proxy} ${proxyport}`) + + // check proxy server availability for proper error message + try { + await fetch(`http://${proxy}:${proxyport}/api/vm/net`, { method: 'GET' }) + } catch (err) { + console.error(err) + throw new Error(`Proxy server ${proxy}:${proxyport} is not available`) + } + //@ts-ignore + net.setProxy({ hostname: proxy, port: proxyport }) + } + let localServer try { Object.assign(serverOptions, _.defaultsDeep({}, connectOptions.serverOverrides ?? {}, options.localServerOptions, serverOptions)) @@ -584,7 +593,7 @@ async function connect(connectOptions) { let virtualClickActive = false let virtualClickTimeout let screenTouches = 0 - let capturedPointer: { id; x; y; sourceX; sourceY; activateCameraMove; time; } | null + let capturedPointer: { id; x; y; sourceX; sourceY; activateCameraMove; time } | null registerListener(document, 'pointerdown', (e) => { const clickedEl = e.composedPath()[0] if (!isGameActive(true) || !miscUiState.currentTouch || clickedEl !== cameraControlEl || e.pointerId === undefined) { diff --git a/src/menus/components/debug_overlay.js b/src/menus/components/debug_overlay.js index 7eb3293ec..50b97573e 100644 --- a/src/menus/components/debug_overlay.js +++ b/src/menus/components/debug_overlay.js @@ -95,7 +95,6 @@ class DebugOverlay extends LitElement { } const target = this.cursorBlock - const targetDiggable = (target && this.bot.canDigBlock(target)) const pos = this.bot.entity.position const rot = [this.bot.entity.yaw, this.bot.entity.pitch] @@ -140,8 +139,8 @@ class DebugOverlay extends LitElement {

    Renderer: ${this.rendererDevice} powered by three.js r${global.THREE.REVISION}

    - ${targetDiggable ? html`

    ${target.name}

    ${Object.entries(target.getProperties()).map(([n, p], idx, arr) => renderProp(n, p, arr[idx + 1]))}` : ''} - ${targetDiggable ? html`

    Looking at: ${target.position.x} ${target.position.y} ${target.position.z}

    ` : ''} + ${target ? html`

    ${target.name}

    ${Object.entries(target.getProperties()).map(([n, p], idx, arr) => renderProp(n, p, arr[idx + 1]))}` : ''} + ${target ? html`

    Looking at: ${target.position.x} ${target.position.y} ${target.position.z}

    ` : ''}
    ` } From 2bceab9384983981a63555a058a41a806c81a5a0 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Thu, 14 Sep 2023 19:04:56 +0300 Subject: [PATCH 213/318] adjust seo a bit --- index.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index bf5dc9c4c..dc72ca576 100644 --- a/index.html +++ b/index.html @@ -25,13 +25,14 @@ - + + + - + - From af288d31431bc0b21d09aa91d80c5d93d029dbac Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Mon, 4 Sep 2023 15:36:51 +0300 Subject: [PATCH 214/318] feat: always include source-map on prod --- esbuild.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esbuild.mjs b/esbuild.mjs index 9c55251c2..ad0d3e293 100644 --- a/esbuild.mjs +++ b/esbuild.mjs @@ -46,7 +46,7 @@ const ctx = await esbuild.context({ // logLevel: 'debug', logLevel: 'info', platform: 'browser', - sourcemap: dev, + sourcemap: true, outdir: 'dist', mainFields: [ 'browser', 'module', 'main' From 5e6cd63cc07adff44f9c70e57d7a085cc1810a8a Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Thu, 14 Sep 2023 19:07:18 +0300 Subject: [PATCH 215/318] restore filesize --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3dd8c3f06..ec039e22d 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "esbuild-loader": "^4.0.0", "esbuild-plugin-polyfill-node": "^0.3.0", "express": "^4.18.2", + "flying-squid": "github:zardoy/space-squid#everything", "fs-extra": "^11.1.1", "iconify-icon": "^1.0.8", "jszip": "^3.10.1", @@ -49,7 +50,6 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-refresh": "^0.14.0", - "flying-squid": "github:zardoy/space-squid#everything", "speed-measure-webpack-plugin": "^1.5.0", "stats.js": "^0.17.0", "url": "^0.11.1", @@ -94,6 +94,7 @@ "three": "0.128.0", "timers-browserify": "^2.0.12", "url-loader": "^4.1.1", + "filesize": "^10.0.12", "use-typed-event-listener": "^4.0.2", "vite": "^4.4.9", "webpack": "^5.88.2", From 8adee6aa6e46c885e92ef37e61003bc57c78f4ab Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Mon, 4 Sep 2023 15:56:58 +0300 Subject: [PATCH 216/318] improve eruda check & sw index.html --- index.html | 10 ++++++++-- scripts/build.js | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 4054509a2..bf5dc9c4c 100644 --- a/index.html +++ b/index.html @@ -5,13 +5,19 @@ window.startLoad = Date.now() Prismarine Web Client diff --git a/scripts/build.js b/scripts/build.js index 53d669bc6..15cf4b060 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -46,6 +46,7 @@ exports.getSwAdditionalEntries = () => { // need to be careful with this const singlePlayerVersion = defaultLocalServerOptions.version const filesToCachePatterns = [ + 'index.html', 'index.js', 'index.css', 'favicon.ico', From e6354f681c7d8545e77bfb288915f6165f6ad970 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 4 Sep 2023 13:35:43 +0300 Subject: [PATCH 217/318] [skip ci] upstream changes --- src/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index 67ce54540..c6e70a4b1 100644 --- a/src/index.js +++ b/src/index.js @@ -393,9 +393,9 @@ async function connect (connectOptions) { // todo need just to call quit if started // loadingScreen.maybeRecoverable = false // init world, todo: do it for any async plugins - if (!localServer.worldsReady) { + if (!localServer.pluginsReady) { await new Promise(resolve => { - localServer.once('worldsReady', resolve) + localServer.once('pluginsReady', resolve) }) } } From 8a093b21cdab88a0073492fb2cc307a89ac6414f Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Fri, 15 Sep 2023 03:21:24 +0300 Subject: [PATCH 218/318] initial resource pack support (blocks only)! support custom size --- src/browserfs.ts | 91 ++++++++-- src/globalState.ts | 1 + src/index.ts | 15 +- src/inventory.ts | 19 ++- src/loadSave.ts | 2 + src/menus/loading_or_error_screen.js | 2 +- src/menus/options_screen.js | 30 +++- src/menus/title_screen.js | 25 +-- src/texturePack.ts | 245 +++++++++++++++++++++++++++ src/utils.ts | 40 ++++- 10 files changed, 427 insertions(+), 43 deletions(-) create mode 100644 src/texturePack.ts diff --git a/src/browserfs.ts b/src/browserfs.ts index 4934b51dd..ed2f7eba7 100644 --- a/src/browserfs.ts +++ b/src/browserfs.ts @@ -8,24 +8,27 @@ import { options } from './optionsStorage' import { promisify } from 'util' import * as browserfs from 'browserfs' import fs from 'fs' +import { installTexturePack, updateTexturePackInstalledState } from './texturePack' browserfs.install(window) // todo migrate to StorageManager API for localsave as localstorage has only 5mb limit, when localstorage is fallback test limit warning on 4mb +const deafultMountablePoints = { + "/world": { fs: "LocalStorage" }, + '/userData': { fs: 'IndexedDB' }, +}; browserfs.configure({ - // todo change to localstorage: mkdir doesnt work for some reason fs: 'MountableFileSystem', - options: { - "/world": { fs: "LocalStorage" } - }, + options: deafultMountablePoints, }, (e) => { if (e) throw e + updateTexturePackInstalledState() }) export const forceCachedDataPaths = {} //@ts-ignore -fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat', 'mkdir', 'rename', /* 'copyFile', */'readdir'].map(key => [key, promisify(fs[key])])), { - get (target, p, receiver) { +fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat', 'mkdir', 'rmdir', 'unlink', 'rename', /* 'copyFile', */'readdir'].map(key => [key, promisify(fs[key])])), { + get(target, p, receiver) { //@ts-ignore if (!target[p]) throw new Error(`Not implemented fs.promises.${p}`) return (...args) => { @@ -108,6 +111,28 @@ const removeFileRecursiveSync = (path) => { window.removeFileRecursiveSync = removeFileRecursiveSync +// todo it still doesnt clean the storage, need to debug +export async function removeFileRecursiveAsync(path) { + try { + const files = await fs.promises.readdir(path); + for (const file of files) { + const curPath = join(path, file); + const stats = await fs.promises.stat(curPath); + if (stats.isDirectory()) { + // Recurse + await removeFileRecursiveAsync(curPath); + } else { + // Delete file + await fs.promises.unlink(curPath); + } + } + await fs.promises.rmdir(path); + } catch (error) { + throw error; + } +} + + const SUPPORT_WRITE = true export const openWorldDirectory = async (dragndropHandle?: FileSystemDirectoryHandle) => { @@ -153,12 +178,48 @@ export const openWorldDirectory = async (dragndropHandle?: FileSystemDirectoryHa loadSave() } -export const openWorldZip = async (file: File | ArrayBuffer, name = file['name']) => { +const tryToDetectResourcePack = async (file: File | ArrayBuffer) => { + const askInstall = async () => { + return alert('ATM You can install texturepacks only via options menu. WIll be fixed') + if (confirm('Resource pack detected, do you want to install it?')) { + await installTexturePack(file) + } + } + + if (fs.existsSync('/world/pack.mcmeta')) { + askInstall() + return true + } + // const jszip = new JSZip() + // let loaded = await jszip.loadAsync(file) + // if (loaded.file('pack.mcmeta')) { + // loaded = null + // askInstall() + // return true + // } + // loaded = null +} + +export const possiblyCleanHandle = () => { + if (!fsState.saveLoaded) { + // todo clean handle + browserfs.configure({ + fs: 'MountableFileSystem', + options: deafultMountablePoints, + }, (e) => { + if (e) throw e + }) + } +} + +// todo rename method +const openWorldZipInner = async (file: File | ArrayBuffer, name = file['name']) => { await new Promise(async resolve => { browserfs.configure({ // todo fs: 'MountableFileSystem', options: { + ...deafultMountablePoints, "/world": { fs: "ZipFS", options: { @@ -173,12 +234,13 @@ export const openWorldZip = async (file: File | ArrayBuffer, name = file['name'] }) }) + fsState.saveLoaded = false fsState.isReadonly = true fsState.syncFs = true fsState.inMemorySave = false if (fs.existsSync('/world/level.dat')) { - loadSave() + await loadSave() } else { const dirs = fs.readdirSync('/world') let availableWorlds: string[] = [] @@ -189,12 +251,13 @@ export const openWorldZip = async (file: File | ArrayBuffer, name = file['name'] } if (availableWorlds.length === 0) { + if (await tryToDetectResourcePack(file)) return alert('No worlds found in the zip') return } if (availableWorlds.length === 1) { - loadSave(`/world/${availableWorlds[0]}`) + await loadSave(`/world/${availableWorlds[0]}`) return } @@ -204,7 +267,15 @@ export const openWorldZip = async (file: File | ArrayBuffer, name = file['name'] } } -export async function generateZipAndWorld() { +export const openWorldZip = async (...args: Parameters) => { + try { + return await openWorldZipInner(...args) + } finally { + possiblyCleanHandle() + } +} + +export async function generateAndDownloadWorldZip() { const zip = new JSZip() zip.folder('world') diff --git a/src/globalState.ts b/src/globalState.ts index e53700df5..076cddbb2 100644 --- a/src/globalState.ts +++ b/src/globalState.ts @@ -106,6 +106,7 @@ export const miscUiState = proxy({ currentTouch: null as boolean | null, singleplayer: false, gameLoaded: false, + resourcePackInstalled: false, }) export const isGameActive = (foregroundCheck: boolean) => { diff --git a/src/index.ts b/src/index.ts index 285cde0d6..121266044 100644 --- a/src/index.ts +++ b/src/index.ts @@ -80,11 +80,12 @@ import { options } from './optionsStorage' import { subscribeKey } from 'valtio/utils' import _ from 'lodash' import { contro } from './controls' +import { genTexturePackTextures, watchTexturepackInViewer } from './texturePack' //@ts-ignore window.THREE = THREE -if ('serviceWorker' in navigator && !isCypress()) { +if ('serviceWorker' in navigator && !isCypress() && process.env.NODE_ENV !== 'development') { window.addEventListener('load', () => { navigator.serviceWorker.register('./service-worker.js').then(registration => { console.log('SW registered: ', registration) @@ -138,6 +139,7 @@ document.body.appendChild(renderer.domElement) // Create viewer const viewer: import('../prismarine-viewer/viewer/lib/viewer').Viewer = new Viewer(renderer, options.numWorkers) initPanoramaOptions(viewer) +watchTexturepackInViewer(viewer) const frameLimit = toNumber(localStorage.frameLimit) let interval = frameLimit && 1000 / frameLimit @@ -388,6 +390,15 @@ async function connect(connectOptions) { Object.assign(serverOptions, _.defaultsDeep({}, connectOptions.serverOverrides ?? {}, options.localServerOptions, serverOptions)) const downloadMcData = async (version) => { setLoadingScreenStatus(`Downloading data for ${version}`) + try { + await genTexturePackTextures(version) + } catch (err) { + console.error(err) + const doContinue = prompt('Failed to apply texture pack. See errors in the console. Continue?') + if (!doContinue) { + setLoadingScreenStatus(undefined) + } + } await loadScript(`./mc-data/${toMajorVersion(version)}.js`) } @@ -488,7 +499,6 @@ async function connect(connectOptions) { }) bot.once('spawn', () => { - miscUiState.gameLoaded = true // todo display notification if not critical const mcData = require('minecraft-data')(bot.version) @@ -681,6 +691,7 @@ async function connect(connectOptions) { }, false) setLoadingScreenStatus('Done!') + miscUiState.gameLoaded = true console.log('Done!') hud.init(renderer, bot, host) diff --git a/src/inventory.ts b/src/inventory.ts index dc0e7a491..2efce7fca 100644 --- a/src/inventory.ts +++ b/src/inventory.ts @@ -9,7 +9,22 @@ import invspriteJson from './invsprite.json' import { getVersion } from 'prismarine-viewer/viewer/lib/version' const loadedImages = new Map() -let blockStates: Record }> +export type BlockStates = Record +}> + +let blockStates: BlockStates let lastInventory let mcData let version @@ -74,7 +89,7 @@ const getItemSlice = (name) => { const getImageSrc = (path) => { switch (path) { case 'gui/container/inventory': return InventoryGui - case 'blocks': return `textures/${version}.png` + case 'blocks': return globalThis.texturePackDataUrl || `textures/${version}.png` case 'invsprite': return `invsprite.png` } return Dirt diff --git a/src/loadSave.ts b/src/loadSave.ts index c523500b1..4edcafd44 100644 --- a/src/loadSave.ts +++ b/src/loadSave.ts @@ -15,6 +15,7 @@ export const fsState = proxy({ isReadonly: false, syncFs: false, inMemorySave: false, + saveLoaded: false }) const PROPOSE_BACKUP = true @@ -120,6 +121,7 @@ export const loadSave = async (root = '/world') => { alert("Note: the world is saved only on /save or disconnect! ENSURE YOU HAVE BACKUP!") } + fsState.saveLoaded = true document.querySelector('#title-screen').dispatchEvent(new CustomEvent('singleplayer', { // todo check gamemode level.dat data etc detail: { diff --git a/src/menus/loading_or_error_screen.js b/src/menus/loading_or_error_screen.js index f04bad38a..45ced09ff 100644 --- a/src/menus/loading_or_error_screen.js +++ b/src/menus/loading_or_error_screen.js @@ -74,7 +74,7 @@ class LoadingErrorScreen extends LitElement { return html`
    -
    ${this.status}${this.hasError && !this.hideDots ? '' : this._loadingDots}

    ${this.hasError ? guessProblem(this.status) : ''}

    +
    ${this.status}${this.hasError || this.hideDots ? '' : this._loadingDots}

    ${this.hasError ? guessProblem(this.status) : ''}

    ${this.hasError ? html`
    { diff --git a/src/menus/options_screen.js b/src/menus/options_screen.js index 9ace424b0..81cfd309c 100644 --- a/src/menus/options_screen.js +++ b/src/menus/options_screen.js @@ -2,10 +2,12 @@ const { LitElement, html, css } = require('lit') const { commonCss, isMobile } = require('./components/common') const { showModal, hideCurrentModal, isGameActive, miscUiState } = require('../globalState') const { CommonOptionsScreen } = require('./options_store') -const { toNumber } = require('../utils') +const { toNumber, openFilePicker, setLoadingScreenStatus } = require('../utils') const { options } = require('../optionsStorage') const { subscribe } = require('valtio') const { subscribeKey } = require('valtio/utils') +const { getResourcePackName, uninstallTexturePack } = require('../texturePack') +const { fsState } = require('../loadSave') class OptionsScreen extends CommonOptionsScreen { static get styles () { @@ -76,6 +78,9 @@ class OptionsScreen extends CommonOptionsScreen { subscribeKey(miscUiState, 'singleplayer', () => { this.requestUpdate() }) + subscribeKey(miscUiState, 'resourcePackInstalled', () => { + this.requestUpdate() + }) } render () { @@ -145,12 +150,31 @@ class OptionsScreen extends CommonOptionsScreen { options.autoFullScreen = !options.autoFullScreen } }> - - { + + { options.autoExitFullscreen = !options.autoExitFullscreen } }>
    +
    + { + if (miscUiState.resourcePackInstalled) { + const resourcePackName = await getResourcePackName() + if (confirm(`Uninstall ${resourcePackName} resource pack?`)) { + // todo make hidable + setLoadingScreenStatus('Uninstalling texturepack...') + await uninstallTexturePack() + setLoadingScreenStatus(undefined) + } + } else { + if (!fsState.inMemorySave) { + alert('Unable to install resource pack in loaded save for now') + return + } + openFilePicker('resourcepack') + } + }}> +
    hideCurrentModal()}> diff --git a/src/menus/title_screen.js b/src/menus/title_screen.js index b6d83f4c0..482961bb3 100644 --- a/src/menus/title_screen.js +++ b/src/menus/title_screen.js @@ -8,6 +8,7 @@ const fs = require('fs') const mcImage = require('minecraft-assets/minecraft-assets/data/1.17.1/gui/title/minecraft.png') const { options } = require('../optionsStorage') const defaultLocalServerOptions = require('../defaultLocalServerOptions') +const { openFilePicker } = require('../utils') // const SUPPORT_WORLD_LOADING = !!window.showDirectoryPicker const SUPPORT_WORLD_LOADING = true @@ -175,29 +176,7 @@ class TitleScreen extends LitElement { if (!!window.showDirectoryPicker && !e.shiftKey) { openWorldDirectory() } else { - // create and show input picker - /** @type {HTMLInputElement} */ - let picker = document.body.querySelector('input#file-zip-picker') - if (!picker) { - picker = document.createElement('input') - picker.type = 'file' - picker.accept = '.zip' - - picker.addEventListener('change', () => { - const file = picker.files[0] - picker.value = '' - if (!file) return - if (!file.name.endsWith('.zip')) { - const doContinue = confirm(`Are you sure ${file.name.slice(-20)} is .zip file? Only .zip files are supported. Continue?`) - if (!doContinue) return - } - openWorldZip(file) - }) - picker.hidden = true - document.body.appendChild(picker) - } - - picker.click() + openFilePicker() } }}>` : ''}
    diff --git a/src/texturePack.ts b/src/texturePack.ts new file mode 100644 index 000000000..520e1c2fd --- /dev/null +++ b/src/texturePack.ts @@ -0,0 +1,245 @@ +import { setLoadingScreenStatus } from './utils' +import blocksFileNames from '../generated/blocks.json' +import JSZip from 'jszip' +import { join, dirname } from 'path' +import fs from 'fs' +import type { BlockStates } from './inventory' +import type { Viewer } from 'prismarine-viewer/viewer/lib/viewer' +import { removeFileRecursiveAsync } from './browserfs' +import { miscUiState } from './globalState' +import { subscribeKey } from 'valtio/utils' + +function nextPowerOfTwo(n) { + if (n === 0) return 1 + n-- + n |= n >> 1 + n |= n >> 2 + n |= n >> 4 + n |= n >> 8 + n |= n >> 16 + return n + 1 +} + +const mkdirRecursive = async (path) => { + const parts = path.split('/') + let current = '' + for (const part of parts) { + current += part + '/' + try { + await fs.promises.mkdir(current) + } catch (err) { + } + } +} + +const texturePackBasePath = '/userData/resourcePacks/default' +export const uninstallTexturePack = async () => { + await removeFileRecursiveAsync(texturePackBasePath) + setCustomTexturePackData(undefined, undefined) +} + +export const getResourcePackName = async () => { + // temp + try { + return await fs.promises.readFile(join(texturePackBasePath, 'name.txt'), 'utf8') + } catch (err) { + return '???' + } +} + +export const updateTexturePackInstalledState = async () => { + try { + miscUiState.resourcePackInstalled = await existsAsync(texturePackBasePath) + } catch { + } +} + +export const installTexturePack = async (file: File | ArrayBuffer) => { + try { + await uninstallTexturePack() + } catch (err) { + } + const status = 'Installing resource pack: copying all files'; + setLoadingScreenStatus(status) + // extract the zip and write to fs every file in it + const zip = new JSZip() + const zipFile = await zip.loadAsync(file) + if (!zipFile.file('pack.mcmeta')) throw new Error('Not a resource pack: missing pack.mcmeta') + await mkdirRecursive(texturePackBasePath) + + const allFilesArr = Object.entries(zipFile.files); + let i = 0 + for (const [path, file] of allFilesArr) { + const writePath = join(texturePackBasePath, path); + if (path.endsWith('/')) continue + await mkdirRecursive(dirname(writePath)) + await fs.promises.writeFile(writePath, Buffer.from(await file.async('arraybuffer'))) + setLoadingScreenStatus(`${status} ${Math.round(++i / allFilesArr.length * 100)}%`) + } + await fs.promises.writeFile(join(texturePackBasePath, 'name.txt'), file['name'] ?? '??', 'utf8') + + if (viewer?.world.active) { + await genTexturePackTextures(viewer.version) + } + setLoadingScreenStatus(undefined) +} + +const existsAsync = async (path) => { + try { + await fs.promises.stat(path) + return true + } catch (err) { + return false + } +} + +type TextureResolvedData = { + blockSize: number + // itemsUrlContent: string +} + +const arrEqual = (a: any[], b: any[]) => a.length === b.length && a.every((x) => b.includes(x)) + +const applyTexturePackData = async (version: string, { blockSize }: TextureResolvedData, blocksUrlContent: string) => { + const result = await fetch(`blocksStates/${version}.json`) + const blockStates: BlockStates = await result.json() + const factor = blockSize / 16 + + // this will be refactored with prerender refactor + const processObj = (x) => { + if (typeof x !== 'object' || !x) return + if (Array.isArray(x)) { + for (const v of x) { + processObj(v) + } + return + } else { + const actual = Object.keys(x) + const needed = ['u', 'v', 'su', 'sv'] + + if (!arrEqual(actual, needed)) { + for (const v of Object.values(x)) { + processObj(v) + } + return + } + for (const k of needed) { + x[k] *= factor + } + } + } + processObj(blockStates) + setCustomTexturePackData(blocksUrlContent, blockStates) +} + +const setCustomTexturePackData = (blockTextures, blockStates) => { + globalThis.texturePackDataBlockStates = blockStates + globalThis.texturePackDataUrl = blockTextures + miscUiState.resourcePackInstalled = blockTextures !== undefined +} + +const getSizeFromImage = async (filePath: string) => { + const probeImg = new Image() + const file = await fs.promises.readFile(filePath, 'base64'); + probeImg.src = `data:image/png;base64,${file}` + await new Promise((resolve, reject) => { + probeImg.onload = resolve + }) + if (probeImg.width !== probeImg.height) throw new Error(`Probe texture ${filePath} is not square`) + return probeImg.width +} + +export const genTexturePackTextures = async (version: string) => { + setCustomTexturePackData(undefined, undefined) + const blocksBasePath = '/userData/resourcePacks/default/assets/minecraft/textures/blocks'; + const blocksGenereatedPath = `/userData/resourcePacks/default/${version}.png` + const genereatedPathData = `/userData/resourcePacks/default/${version}.json` + if (await existsAsync(blocksBasePath) === false) { + return + } + if (await existsAsync(blocksGenereatedPath) === true) { + applyTexturePackData(version, JSON.parse(await fs.promises.readFile(genereatedPathData, 'utf8')), await fs.promises.readFile(blocksGenereatedPath, 'utf8')) + return + } + + setLoadingScreenStatus('Generating custom textures') + + const textureFiles = blocksFileNames.indexes[version].map(k => blocksFileNames.blockNames[k]) + textureFiles.unshift('missing_texture.png') + + const texSize = nextPowerOfTwo(Math.ceil(Math.sqrt(textureFiles.length))) + const originalTileSize = 16 + + const firstBlockFile = (await fs.promises.readdir(blocksBasePath)).find(f => f.endsWith('.png')) + if (!firstBlockFile) { + return + } + + // we get the size of image from the first block file, which is not ideal but works in 99% cases + const tileSize = await getSizeFromImage(join(blocksBasePath, firstBlockFile)) + + const imgSize = texSize * tileSize + + const canvas = document.createElement('canvas') + canvas.width = imgSize + canvas.height = imgSize + const src = `textures/${version}.png` + const ctx = canvas.getContext('2d') + ctx.imageSmoothingEnabled = false + const img = new Image() + img.src = src + await new Promise((resolve, reject) => { + img.onerror = reject + img.onload = resolve + }) + for (const [i, fileName] of textureFiles.entries()) { + const x = (i % texSize) * tileSize + const y = Math.floor(i / texSize) * tileSize + const xOrig = (i % texSize) * originalTileSize + const yOrig = Math.floor(i / texSize) * originalTileSize + let imgCustom: HTMLImageElement + try { + const fileBase64 = await fs.promises.readFile(join(blocksBasePath, fileName), 'base64') + const _imgCustom = new Image() + await new Promise(resolve => { + _imgCustom.onload = () => { + imgCustom = _imgCustom + resolve(); + } + _imgCustom.onerror = () => { + console.log('Skipping issued texture', fileName) + resolve() + } + _imgCustom.src = `data:image/png;base64,${fileBase64}` + }) + } catch { + console.log('Skipping not found texture', fileName) + } + + if (imgCustom) { + ctx.drawImage(imgCustom, x, y, tileSize, tileSize) + } else { + ctx.drawImage(img, xOrig, yOrig, originalTileSize, originalTileSize, x, y, tileSize, tileSize) + } + } + const blockDataUrl = canvas.toDataURL('image/png'); + const newData: TextureResolvedData = { + blockSize: tileSize, + }; + await fs.promises.writeFile(genereatedPathData, JSON.stringify(newData), 'utf8') + await fs.promises.writeFile(blocksGenereatedPath, blockDataUrl, 'utf8') + await applyTexturePackData(version, newData, blockDataUrl) + + // const a = document.createElement('a') + // a.href = dataUrl + // a.download = 'pack.png' + // a.click() +} + +export const watchTexturepackInViewer = (viewer: Viewer) => { + subscribeKey(miscUiState, 'resourcePackInstalled', () => { + if (!viewer?.world.active) return + console.log('reloading world data') + viewer.world.updateData() + }) +} diff --git a/src/utils.ts b/src/utils.ts index 6ca9b6b09..d0d093ae6 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,9 +1,11 @@ -import { activeModalStack, miscUiState, showModal } from './globalState' +import { activeModalStack, hideModal, miscUiState, showModal } from './globalState' import { notification } from './menus/notification' import * as crypto from 'crypto' import UUID from 'uuid-1345' import { options } from './optionsStorage' import { saveWorld } from './builtinCommands' +import { openWorldZip } from './browserfs' +import { installTexturePack } from './texturePack' export const goFullscreen = async (doToggle = false) => { if (!document.fullscreenElement) { @@ -132,9 +134,14 @@ export function nameToMcOfflineUUID(name) { return (new UUID(javaUUID('OfflinePlayer:' + name))).toString() } -export const setLoadingScreenStatus = function (status: string, isError = false, hideDots = false) { +export const setLoadingScreenStatus = function (status: string | undefined, isError = false, hideDots = false) { const loadingScreen = document.getElementById('loading-error-screen') + if (status === undefined) { + hideModal({ elem: loadingScreen, }, null, { force: true }) + return + } + // todo update in component instead showModal(loadingScreen) if (loadingScreen.hasError) { @@ -197,3 +204,32 @@ export const reloadChunks = () => { worldView.updatePosition(bot.entity.position, true) prevRenderDistance = options.renderDistance } + +export const openFilePicker = (specificCase?: 'resourcepack') => { + // create and show input picker + let picker: HTMLInputElement = document.body.querySelector('input#file-zip-picker') + if (!picker) { + picker = document.createElement('input') + picker.type = 'file' + picker.accept = '.zip' + + picker.addEventListener('change', () => { + const file = picker.files[0] + picker.value = '' + if (!file) return + if (!file.name.endsWith('.zip')) { + const doContinue = confirm(`Are you sure ${file.name.slice(-20)} is .zip file? Only .zip files are supported. Continue?`) + if (!doContinue) return + } + if (specificCase === 'resourcepack') { + installTexturePack(file) + } else { + openWorldZip(file) + } + }) + picker.hidden = true + document.body.appendChild(picker) + } + + picker.click() +} From 9947c13bd815f74233005023d157c02b935a74a2 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Fri, 15 Sep 2023 04:00:02 +0300 Subject: [PATCH 219/318] support panorama from resourcepack --- src/menus/options_screen.js | 2 +- src/panorama.js | 68 +++++++++++++++++++++++++++++++------ src/texturePack.ts | 5 +++ 3 files changed, 64 insertions(+), 11 deletions(-) diff --git a/src/menus/options_screen.js b/src/menus/options_screen.js index 81cfd309c..333e39b83 100644 --- a/src/menus/options_screen.js +++ b/src/menus/options_screen.js @@ -167,7 +167,7 @@ class OptionsScreen extends CommonOptionsScreen { setLoadingScreenStatus(undefined) } } else { - if (!fsState.inMemorySave) { + if (!fsState.inMemorySave && isGameActive(false)) { alert('Unable to install resource pack in loaded save for now') return } diff --git a/src/panorama.js b/src/panorama.js index f1bf8e191..5bbd1df35 100644 --- a/src/panorama.js +++ b/src/panorama.js @@ -1,14 +1,61 @@ //@ts-check +import { join } from 'path' +import { miscUiState } from './globalState' +import { fromTexturePackPath } from './texturePack' +import fs from 'fs' +import { subscribeKey } from 'valtio/utils' + let panoramaCubeMap +let panoramaUsesResourePack = false let viewer export const initPanoramaOptions = (_viewer) => { viewer = _viewer } +const panoramaFiles = [ + 'panorama_1.png', // WS + 'panorama_3.png', // ES + 'panorama_4.png', // Up + 'panorama_5.png', // Down + 'panorama_0.png', // NS + 'panorama_2.png' // SS +] + +const panoramaResourcePackPath = 'assets/minecraft/textures/gui/title/background' +const possiblyLoadPanoramaFromResourcePack = async (file) => { + let base64Texture + if (panoramaUsesResourePack) { + try { + base64Texture = await fs.promises.readFile(fromTexturePackPath(join(panoramaResourcePackPath, file)), 'base64') + } catch (err) { + panoramaUsesResourePack = false + } + } + if (base64Texture) return `data:image/png;base64,${base64Texture}` + else return join('extra-textures/background', file) +} + +const updateResourecePackSupportPanorama = async () => { + try { + await fs.promises.readFile(fromTexturePackPath(join(panoramaResourcePackPath, panoramaFiles[0])), 'base64') + panoramaUsesResourePack = true + } catch (err) { + panoramaUsesResourePack = false + } +} + +subscribeKey(miscUiState, 'resourcePackInstalled', async () => { + const oldState = panoramaUsesResourePack + const newState = miscUiState.resourcePackInstalled && (await updateResourecePackSupportPanorama(), panoramaUsesResourePack) + if (newState === oldState) return + removePanorama() + addPanoramaCubeMap() +}) + // Menu panorama background -export function addPanoramaCubeMap () { +export async function addPanoramaCubeMap () { // remove all existing object in the viewer.scene // viewer.scene.children = [] @@ -20,14 +67,15 @@ export function addPanoramaCubeMap () { const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000) const loader = new THREE.TextureLoader() - const panorMaterials = [ - new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_1.png'), transparent: true, side: THREE.DoubleSide }), // WS - new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_3.png'), transparent: true, side: THREE.DoubleSide }), // ES - new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_4.png'), transparent: true, side: THREE.DoubleSide }), // Up - new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_5.png'), transparent: true, side: THREE.DoubleSide }), // Down - new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_0.png'), transparent: true, side: THREE.DoubleSide }), // NS - new THREE.MeshBasicMaterial({ map: loader.load('extra-textures/background/panorama_2.png'), transparent: true, side: THREE.DoubleSide }) // SS - ] + let panorMaterials = [] + await updateResourecePackSupportPanorama() + for (const file of panoramaFiles) { + panorMaterials.push(new THREE.MeshBasicMaterial({ + map: loader.load(await possiblyLoadPanoramaFromResourcePack(file)), + transparent: true, + side: THREE.DoubleSide + })) + } const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials) @@ -58,7 +106,7 @@ export function addPanoramaCubeMap () { } export function removePanorama () { - if (!panoramaCubeMap) throw new Error('panorama is not there') + if (!panoramaCubeMap) return viewer.camera = new THREE.PerspectiveCamera(document.getElementById('options-screen').fov, window.innerWidth / window.innerHeight, 0.1, 1000) viewer.camera.updateProjectionMatrix() viewer.scene.remove(panoramaCubeMap) diff --git a/src/texturePack.ts b/src/texturePack.ts index 520e1c2fd..15cec53fa 100644 --- a/src/texturePack.ts +++ b/src/texturePack.ts @@ -47,6 +47,10 @@ export const getResourcePackName = async () => { } } +export const fromTexturePackPath = (path) => { + return join(texturePackBasePath, path) +} + export const updateTexturePackInstalledState = async () => { try { miscUiState.resourcePackInstalled = await existsAsync(texturePackBasePath) @@ -219,6 +223,7 @@ export const genTexturePackTextures = async (version: string) => { if (imgCustom) { ctx.drawImage(imgCustom, x, y, tileSize, tileSize) } else { + // todo this involves incorrect mappings for existing textures when the size is different ctx.drawImage(img, xOrig, yOrig, originalTileSize, originalTileSize, x, y, tileSize, tileSize) } } From 1f14154c6340fab3251621fb42041a005a82f1b3 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Fri, 15 Sep 2023 04:49:20 +0300 Subject: [PATCH 220/318] add blocks generate script for resourcepack --- .gitignore | 1 + package.json | 3 +- scripts/gen-texturepack-files.mjs | 51 ++++++++++++++++++++++++++++++ scripts/test-texturepack-files.mjs | 16 ++++++++++ 4 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 scripts/gen-texturepack-files.mjs create mode 100644 scripts/test-texturepack-files.mjs diff --git a/.gitignore b/.gitignore index 950306c9a..131dc688c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ world out *.iml .vercel +generated diff --git a/package.json b/package.json index ec039e22d..b01f6fce9 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "test:cypress": "cypress run", "test:e2e": "start-test http-get://localhost:8080 test:cypress", "prod-start": "node server.js", + "postinstall": "node scripts/gen-texturepack-files.mjs", "prepublishOnly": "npm run build" }, "keywords": [ @@ -108,7 +109,7 @@ "overrides": { "prismarine-block": "github:zardoy/prismarine-block#next-era", "prismarine-world": "github:zardoy/prismarine-world#next-era", - "minecraft-data": "latest", + "minecraft-data": "3.45.0", "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything", "minecraft-protocol": "github:zardoy/minecraft-protocol#custom-client-extra" } diff --git a/scripts/gen-texturepack-files.mjs b/scripts/gen-texturepack-files.mjs new file mode 100644 index 000000000..ccac9569d --- /dev/null +++ b/scripts/gen-texturepack-files.mjs @@ -0,0 +1,51 @@ +//@ts-check +import fs from 'fs' +import minecraftAssets from 'minecraft-assets' + +// why store another data? +// 1. want to make it compatible (at least for now) +// 2. don't want to read generated blockStates as it might change in future, and the current way was faster to implement + +const blockNames = [] +const indexesPerVersion = {} +/** @type {Map} */ +const allBlocksMap = new Map() +const getBlockIndex = (block) => { + if (allBlocksMap.has(block)) { + return allBlocksMap.get(block) + } + + const index = blockNames.length + allBlocksMap.set(block, index) + blockNames.push(block) + return index +} + +// const blocksFull = [] +// const allBlocks = [] +// // we can even optimize it even futher by doing prev-step resolving +// const blocksDiff = {} + +for (const [i, version] of minecraftAssets.versions.reverse().entries()) { + const assets = minecraftAssets(version) + const blocksDir = assets.directory + '/blocks' + const blocks = fs.readdirSync(blocksDir) + indexesPerVersion[version] = blocks.map(block => { + if (!block.endsWith('.png')) return undefined + return getBlockIndex(block) + }).filter(i => i !== undefined) + + // if (!blocksFull.length) { + // // first iter + // blocksFull.push(...blocks) + // } else { + // const missing = blocksFull.map((b, i) => !blocks.includes(b) ? i : -1).filter(i => i !== -1) + // const added = blocks.filter(b => !blocksFull.includes(b)) + // blocksDiff[version] = { + // missing, + // added + // } + // } +} + +fs.writeFileSync('./generated/blocks.json', JSON.stringify({ blockNames: blockNames, indexes: indexesPerVersion })) diff --git a/scripts/test-texturepack-files.mjs b/scripts/test-texturepack-files.mjs new file mode 100644 index 000000000..0446a2fe8 --- /dev/null +++ b/scripts/test-texturepack-files.mjs @@ -0,0 +1,16 @@ +import fs from 'fs' +import minecraftAssets from 'minecraft-assets' + +const gen = JSON.parse(fs.readFileSync('./blocks.json', 'utf8')) + +const version = '1.8.8' +const { blockNames, indexes } = gen + +const blocksActual = indexes[version].map((i) => blockNames[i]) + +const blocksExpected = fs.readdirSync(minecraftAssets(version).directory + '/blocks') +for (const [i, item] of blocksActual.entries()) { + if (item !== blocksExpected[i]) { + console.log('not equal at', i) + } +} From 6074e187f134947ee49e8dd64d88f2f04b7cf48e Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Fri, 15 Sep 2023 04:59:40 +0300 Subject: [PATCH 221/318] specify default interaction box --- src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.ts b/src/index.ts index 121266044..344c218ea 100644 --- a/src/index.ts +++ b/src/index.ts @@ -84,6 +84,7 @@ import { genTexturePackTextures, watchTexturepackInViewer } from './texturePack' //@ts-ignore window.THREE = THREE +globalThis.emptyShapeReplacer = [[0.0, 0.0, 0.0, 1.0, 1.0, 1.0]] if ('serviceWorker' in navigator && !isCypress() && process.env.NODE_ENV !== 'development') { window.addEventListener('load', () => { From f475364c18033552d5f3f9cc61319d17d3743f89 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Fri, 15 Sep 2023 07:06:26 +0300 Subject: [PATCH 222/318] should fix build --- scripts/gen-texturepack-files.mjs | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/gen-texturepack-files.mjs b/scripts/gen-texturepack-files.mjs index ccac9569d..d996236e3 100644 --- a/scripts/gen-texturepack-files.mjs +++ b/scripts/gen-texturepack-files.mjs @@ -48,4 +48,5 @@ for (const [i, version] of minecraftAssets.versions.reverse().entries()) { // } } +fs.mkdirSync('./generated', { recursive: true, }) fs.writeFileSync('./generated/blocks.json', JSON.stringify({ blockNames: blockNames, indexes: indexesPerVersion })) From 7edddf8a9de4009fc7d3a83aed8906d1b6f61189 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Fri, 15 Sep 2023 07:14:54 +0300 Subject: [PATCH 223/318] add experimental release posting --- .github/workflows/publish.yml | 2 ++ .gitpod | 2 -- package.json | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) delete mode 100644 .gitpod diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e316c3319..42da85208 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,6 +22,8 @@ jobs: # with: # name: cypress-images # path: cypress/integration/__image_snapshots__/ + # todo link vercel deployment + - run: pnpx zardoy-release node - uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitpod b/.gitpod deleted file mode 100644 index 38fc373b5..000000000 --- a/.gitpod +++ /dev/null @@ -1,2 +0,0 @@ -tasks: -- command: npm install diff --git a/package.json b/package.json index b01f6fce9..ad2c79806 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,13 @@ ], "author": "PrismarineJS", "license": "MIT", + "release": { + "initialVersion": { + "version": "0.1.0", + "releaseNotes": "First GH release", + "releaseNotesWithExisting": "The start of something new..." + } + }, "dependencies": { "@dimaka/interface": "0.0.1", "@emotion/css": "^11.11.2", From 38e0c0832cf0beaa3e6d831b77130b30ed1b2252 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Fri, 15 Sep 2023 07:16:40 +0300 Subject: [PATCH 224/318] use 1.14.4 (post-flatenning) as default for stable state rendering --- src/defaultLocalServerOptions.js | 4 ++-- src/menus/title_screen.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/defaultLocalServerOptions.js b/src/defaultLocalServerOptions.js index 3ad6cebba..fbd8bf22c 100644 --- a/src/defaultLocalServerOptions.js +++ b/src/defaultLocalServerOptions.js @@ -31,6 +31,6 @@ module.exports = { }, 'everybody-op': true, 'max-entities': 100, - 'version': '1.8.8', - versionMajor: '1.8' + 'version': '1.14.4', + versionMajor: '1.14' } diff --git a/src/menus/title_screen.js b/src/menus/title_screen.js index 482961bb3..0bcb71e7d 100644 --- a/src/menus/title_screen.js +++ b/src/menus/title_screen.js @@ -166,7 +166,7 @@ class TitleScreen extends LitElement { fsState.inMemorySave = true const notFirstTime = fs.existsSync('./world/level.dat') if (notFirstTime && !options.localServerOptions.version) { - options.localServerOptions.version = '1.16.1' // legacy version, now we use 1.8.8 + options.localServerOptions.version = '1.16.1' // legacy version } else { options.localServerOptions.version ??= defaultLocalServerOptions.version } From 111c97c1d32d1437c93c4404c5d393bacee616d5 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 15 Sep 2023 07:23:34 +0300 Subject: [PATCH 225/318] ci: pass GITHUB_TOKEN --- .github/workflows/publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 42da85208..9c9418bbe 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -24,6 +24,8 @@ jobs: # path: cypress/integration/__image_snapshots__/ # todo link vercel deployment - run: pnpx zardoy-release node + env: + GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} - uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GITHUB_TOKEN }} From 06ea7ddc6da3974b58e1374ab9e74ce36703f47c Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 15 Sep 2023 07:23:47 +0300 Subject: [PATCH 226/318] ci: pass default GITHUB_TOKEN --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9c9418bbe..0a31d6e7a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -25,7 +25,7 @@ jobs: # todo link vercel deployment - run: pnpx zardoy-release node env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GITHUB_TOKEN }} From c6b78c3663460943df0f7c13cb66d881521c758d Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 17 Sep 2023 22:03:26 +0300 Subject: [PATCH 227/318] add contributing, speed start, cleanup esbuild and don't use minify in dev as it breaks breakpoints since minify inlines code --- CONTRIBUTING.md | 14 ++++++++++++++ esbuild.mjs | 23 ++++------------------- package.json | 2 +- scripts/prepareData.mjs | 6 ++++++ 4 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..407fd03fe --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,14 @@ +# Contributing Guide + +After forking the repository, run the following commands to get started: + +0. Ensure you have [Node.js](https://nodejs.org) and `pnpm` installed. To install pnpm run `npm i -g pnpm`. +1. Install dependencies: `pnpm i` +2. Start the project in development mode: `pnpm start` + +A few notes: + +- It's recommended to use debugger for debugging. VSCode has a great debugger built-in. If debugger is slow, you can use `--no-sources` flag that would allow browser to speedup .map file parsing. +- Some data are cached between restarts. If you see something doesn't work after upgrading dependencies, try to clear the by simply removing the `dist` folder. +- The same folder `dist` is used for both development and production builds, so be careful when deploying the project. +- Use `start-prod` script to start the project in production mode after running `build` script to build the project. diff --git a/esbuild.mjs b/esbuild.mjs index 2ae544175..9d9be44ca 100644 --- a/esbuild.mjs +++ b/esbuild.mjs @@ -7,20 +7,8 @@ import { clients, plugins } from './scripts/esbuildPlugins.mjs' import { generateSW } from 'workbox-build' import { getSwAdditionalEntries } from './scripts/build.js' -/** @type {import('esbuild').BuildOptions} */ -let baseConfig = {} - -// // testing config -// baseConfig = { -// entryPoints: ['files/index.js'], -// outfile: 'out.js', -// outdir: undefined, -// } - -try { - //@ts-ignore - await import('./localSettings.mjs') -} catch { } +//@ts-ignore +try { await import('./localSettings.mjs') } catch { } fs.writeFileSync('dist/index.html', fs.readFileSync('index.html', 'utf8').replace('', ''), 'utf8') @@ -53,7 +41,6 @@ const ctx = await esbuild.context({ 'browser', 'module', 'main' ], keepNames: true, - ...baseConfig, banner: { js: banner.join('\n'), }, @@ -73,10 +60,8 @@ const ctx = await esbuild.context({ './src/shims.js' ], metafile: true, - plugins: [ - ...plugins, - ...baseConfig.plugins ?? [], - ], + plugins, + sourcesContent: process.argv.includes('--no-sources'), minify: process.argv.includes('--minify'), define: { 'process.env.NODE_ENV': JSON.stringify(dev ? 'development' : 'production'), diff --git a/package.json b/package.json index b05c52d11..5aff7d1cb 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0-dev", "description": "A minecraft client running in a browser", "scripts": { - "start": "node scripts/build.js copyFilesDev && node scripts/prepareData.mjs && node esbuild.mjs --minify --watch", + "start": "node scripts/build.js copyFilesDev && node scripts/prepareData.mjs && node esbuild.mjs --watch", "start-watch-script": "nodemon -w esbuild.mjs esbuild.mjs", "build": "node scripts/build.js copyFiles && node scripts/prepareData.mjs && node esbuild.mjs --minify --prod", "watch": "node scripts/build.js copyFilesDev && webpack serve --config webpack.dev.js --progress", diff --git a/scripts/prepareData.mjs b/scripts/prepareData.mjs index f128f3110..6d13156cf 100644 --- a/scripts/prepareData.mjs +++ b/scripts/prepareData.mjs @@ -1,8 +1,14 @@ //@ts-check import { build } from 'esbuild' +import { existsSync } from 'node:fs' import Module from "node:module" import { dirname } from 'node:path' +if (existsSync('dist/mc-data')) { + console.log('using cached prepared data') + process.exit(0) +} + const require = Module.createRequire(import.meta.url) const dataPaths = require('minecraft-data/minecraft-data/data/dataPaths.json') From 214ec566290c1b8b2a87fda8a797b5acef937525 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 17 Sep 2023 22:03:43 +0300 Subject: [PATCH 228/318] fix cypress schema --- cypress.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress.json b/cypress.json index bcc9d5837..63bfb3510 100644 --- a/cypress.json +++ b/cypress.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/cypress-io/cypress/develop/cli/schema/cypress.schema.json", + "$schema": "https://raw.githubusercontent.com/cypress-io/cypress/188b9a742ee2ef51102167bfd84b3696a3f72a26/cli/schema/cypress.schema.json", "baseUrl": "http://localhost:8080", "testFiles": "**/*.spec.ts", "video": false, From b7c6a8f3eece6c646dc0d675f65879947aa19ddb Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 17 Sep 2023 23:28:06 +0300 Subject: [PATCH 229/318] all most missing integration cypress tests --- cypress/integration/index.spec.ts | 57 +++++++++++++++++++++++++------ minecraft-server.mjs | 19 +++-------- src/menus/components/button.js | 6 ++++ src/menus/play_screen.js | 2 +- src/menus/title_screen.js | 6 ++-- 5 files changed, 61 insertions(+), 29 deletions(-) diff --git a/cypress/integration/index.spec.ts b/cypress/integration/index.spec.ts index b215bc285..f2aa90c00 100644 --- a/cypress/integration/index.spec.ts +++ b/cypress/integration/index.spec.ts @@ -1,13 +1,16 @@ /// +const setLocalStorageSettings = () => { + window.localStorage.cypress = 'true' + window.localStorage.server = 'localhost' +} + +// todo use ssl + it('Loads & renders singleplayer', () => { // todo use
    - showModal(document.getElementById('play-screen'))}> + showModal(document.getElementById('play-screen'))}>
    - { + { this.style.display = 'none' fsState.isReadonly = false fsState.syncFs = true @@ -172,7 +172,7 @@ class TitleScreen extends LitElement { } this.dispatchEvent(new window.CustomEvent('singleplayer', {})) }}> - ${SUPPORT_WORLD_LOADING ? html` { + ${SUPPORT_WORLD_LOADING ? html` { if (!!window.showDirectoryPicker && !e.shiftKey) { openWorldDirectory() } else { From f33db2c3d386367ca4fa836f21264cb1c4a76537 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 17 Sep 2023 23:28:19 +0300 Subject: [PATCH 230/318] remove using non custom communication variant --- src/index.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/index.ts b/src/index.ts index 7eda32d3e..7effed802 100644 --- a/src/index.ts +++ b/src/index.ts @@ -75,7 +75,7 @@ import { import { startLocalServer, unsupportedLocalServerFeatures } from './createLocalServer' import serverOptions from './defaultLocalServerOptions' -import { clientDuplex, customCommunication } from './customServer' +import { customCommunication } from './customServer' import updateTime from './updateTime' import { options } from './optionsStorage' import { subscribeKey } from 'valtio/utils' @@ -435,9 +435,7 @@ async function connect(connectOptions: { } } - const usingCustomCommunication = true - - const botDuplex = !p2pMultiplayer ? undefined/* clientDuplex */ : await connectToPeer(connectOptions.peerId); + const botDuplex = !p2pMultiplayer ? undefined/* clientDuplex */ : await connectToPeer(connectOptions.peerId) setLoadingScreenStatus('Creating mineflayer bot') bot = mineflayer.createBot({ @@ -451,7 +449,7 @@ async function connect(connectOptions: { ...singeplayer ? { version: serverOptions.version, connect() { }, - customCommunication: usingCustomCommunication ? customCommunication : undefined, + customCommunication, } : {}, username, password, @@ -473,10 +471,8 @@ async function connect(connectOptions: { return _supportFeature(feature) } - if (usingCustomCommunication) { - bot.emit('inject_allowed') - bot._client.emit('connect') - } + bot.emit('inject_allowed') + bot._client.emit('connect') } } catch (err) { handleError(err) From 3a71f439b6cbb4856c92c6940d28d29c91c6b0c4 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Fri, 15 Sep 2023 23:34:53 +0300 Subject: [PATCH 231/318] initial p2p multiplayer support powered by peerJS spend many hours fixing weird bugs... still have to few some --- package.json | 2 +- src/builtinCommands.ts | 22 ++++- src/customServer.ts | 1 + src/defaultLocalServerOptions.js | 1 + src/downloadAndOpenWorld.ts | 6 ++ src/globalState.ts | 3 + src/index.ts | 62 +++++++++---- src/localServerMultiplayer.ts | 145 +++++++++++++++++++++++++++++++ src/menus/hud.js | 4 + src/menus/pause_screen.js | 22 +++++ src/optionsStorage.ts | 1 + src/utils.ts | 12 ++- 12 files changed, 261 insertions(+), 20 deletions(-) create mode 100644 src/localServerMultiplayer.ts diff --git a/package.json b/package.json index c06ef19a0..6914cd5d4 100644 --- a/package.json +++ b/package.json @@ -77,6 +77,7 @@ "cypress": "^9.5.4", "cypress-esbuild-preprocessor": "^1.0.2", "events": "^3.3.0", + "filesize": "^10.0.12", "html-webpack-plugin": "^5.5.3", "http-browserify": "^1.7.0", "http-server": "^14.1.1", @@ -101,7 +102,6 @@ "three": "0.128.0", "timers-browserify": "^2.0.12", "url-loader": "^4.1.1", - "filesize": "^10.0.12", "use-typed-event-listener": "^4.0.2", "vite": "^4.4.9", "webpack": "^5.88.2", diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts index d3cf1a0b5..5190d8d05 100644 --- a/src/builtinCommands.ts +++ b/src/builtinCommands.ts @@ -2,6 +2,7 @@ import JSZip from 'jszip' import fs from 'fs' import { join } from 'path' import { fsState } from './loadSave' +import { closeWan, openToWanAndCopyJoinLink } from './localServerMultiplayer' const notImplemented = () => { return 'Not implemented yet' @@ -50,15 +51,30 @@ const exportWorld = async () => { window.exportWorld = exportWorld +const writeText = (text) => { + bot._client.emit('chat', { + message: JSON.stringify({ text }) + }) +} + const commands = [ { command: ['/download', '/export'], invoke: exportWorld }, { - command: ['/publish'], - // todo - invoke: notImplemented + command: ['/publish', '/share'], + invoke: async () => { + const text = await openToWanAndCopyJoinLink(writeText) + if (text) writeText(text) + } + }, + { + command: ['/close'], + invoke: () => { + const text = closeWan() + if (text) writeText(text) + } }, { command: '/reset-world -y', diff --git a/src/customServer.ts b/src/customServer.ts index c2a6c8229..39941d6a1 100644 --- a/src/customServer.ts +++ b/src/customServer.ts @@ -2,6 +2,7 @@ import EventEmitter from 'events' import Client from 'minecraft-protocol/src/client' +window.serverDataChannel ??= {} export const customCommunication = { sendData(data) { //@ts-ignore diff --git a/src/defaultLocalServerOptions.js b/src/defaultLocalServerOptions.js index fbd8bf22c..2a1e90564 100644 --- a/src/defaultLocalServerOptions.js +++ b/src/defaultLocalServerOptions.js @@ -29,6 +29,7 @@ module.exports = { 'header': 'Flying squid', 'footer': 'Test server' }, + keepAlive: false, 'everybody-op': true, 'max-entities': 100, 'version': '1.14.4', diff --git a/src/downloadAndOpenWorld.ts b/src/downloadAndOpenWorld.ts index 54c80599e..fb0846c5d 100644 --- a/src/downloadAndOpenWorld.ts +++ b/src/downloadAndOpenWorld.ts @@ -6,6 +6,12 @@ const getConstantFilesize = (bytes: number) => { return prettyBytes(bytes, { minimumFractionDigits: 2, maximumFractionDigits: 2 }) } +export const hasMapUrl = () => { + const qs = new URLSearchParams(window.location.search) + const mapUrl = qs.get('map') + return !!mapUrl +} + export default async () => { const qs = new URLSearchParams(window.location.search) const mapUrl = qs.get('map') diff --git a/src/globalState.ts b/src/globalState.ts index 076cddbb2..190d1704a 100644 --- a/src/globalState.ts +++ b/src/globalState.ts @@ -105,6 +105,8 @@ export const showContextmenu = (items: ContextMenuItem[], { clientX, clientY }) export const miscUiState = proxy({ currentTouch: null as boolean | null, singleplayer: false, + flyingSquid: false, + wanOpened: false, gameLoaded: false, resourcePackInstalled: false, }) @@ -148,6 +150,7 @@ window.addEventListener('beforeunload', (event) => { // todo-low maybe exclude chat? if (!isGameActive(true) && activeModalStack.at(-1)?.elem.id !== 'chat') return if (sessionStorage.lastReload && options.preventDevReloadWhilePlaying === false) return + if (options.closeConfirmation === false) return // For major browsers doning only this is enough event.preventDefault() diff --git a/src/index.ts b/src/index.ts index 344c218ea..30e7f9d51 100644 --- a/src/index.ts +++ b/src/index.ts @@ -31,7 +31,7 @@ import './controls' import './dragndrop' import './browserfs' import './eruda' -import downloadAndOpenWorld from './downloadAndOpenWorld' +import downloadAndOpenWorld, { hasMapUrl } from './downloadAndOpenWorld' import net from 'net' import Stats from 'stats.js' @@ -63,7 +63,8 @@ import { isCypress, loadScript, toMajorVersion, - setLoadingScreenStatus + setLoadingScreenStatus, + resolveTimeout } from './utils' import { @@ -74,13 +75,14 @@ import { import { startLocalServer, unsupportedLocalServerFeatures } from './createLocalServer' import serverOptions from './defaultLocalServerOptions' -import { customCommunication } from './customServer' +import { clientDuplex, customCommunication } from './customServer' import updateTime from './updateTime' import { options } from './optionsStorage' import { subscribeKey } from 'valtio/utils' import _ from 'lodash' import { contro } from './controls' import { genTexturePackTextures, watchTexturepackInViewer } from './texturePack' +import { connectToPeer } from './localServerMultiplayer' //@ts-ignore window.THREE = THREE @@ -263,16 +265,17 @@ const removeAllListeners = () => { disposables = [] } -/** - * @param {{ server: any; port?: string; singleplayer: any; username: any; password: any; proxy: any; botVersion?: any; serverOverrides? }} connectOptions - */ -async function connect(connectOptions) { +async function connect(connectOptions: { + server: any; port?: string; singleplayer?: any; username: any; password: any; proxy: any; botVersion?: any; serverOverrides?; peerId?: string +}) { const menu = document.getElementById('play-screen') menu.style = 'display: none;' removePanorama() const singeplayer = connectOptions.singleplayer + const p2pMultiplayer = !!connectOptions.peerId miscUiState.singleplayer = singeplayer + miscUiState.flyingSquid = singeplayer || p2pMultiplayer const oldSetInterval = window.setInterval // @ts-ignore window.setInterval = (callback, ms) => { @@ -421,7 +424,6 @@ async function connect(connectOptions) { // flying-squid: 'login' -> player.login -> now sends 'login' event to the client (handled in many plugins in mineflayer) -> then 'update_health' is sent which emits 'spawn' in mineflayer setLoadingScreenStatus('Starting local server') - window.serverDataChannel ??= {} localServer = window.localServer = startLocalServer() // todo need just to call quit if started // loadingScreen.maybeRecoverable = false @@ -433,16 +435,23 @@ async function connect(connectOptions) { } } + const usingCustomCommunication = true + + const botDuplex = !p2pMultiplayer ? undefined/* clientDuplex */ : await connectToPeer(connectOptions.peerId); + setLoadingScreenStatus('Creating mineflayer bot') bot = mineflayer.createBot({ host, port, version: connectOptions.botVersion === '' ? false : connectOptions.botVersion, - ...singeplayer ? { + ...singeplayer || p2pMultiplayer ? { version: serverOptions.version, - connect() { }, keepAlive: false, - customCommunication + stream: botDuplex, + } : {}, + ...singeplayer ? { + connect() { }, + customCommunication: usingCustomCommunication ? customCommunication : undefined, } : {}, username, password, @@ -454,7 +463,8 @@ async function connect(connectOptions) { await downloadMcData(client.version) } }) - if (singeplayer) { + if (singeplayer || p2pMultiplayer) { + // p2pMultiplayer still uses the same flying-squid server const _supportFeature = bot.supportFeature bot.supportFeature = (feature) => { if (unsupportedLocalServerFeatures.includes(feature)) { @@ -463,13 +473,16 @@ async function connect(connectOptions) { return _supportFeature(feature) } - bot.emit('inject_allowed') - bot._client.emit('connect') + if (usingCustomCommunication) { + bot.emit('inject_allowed') + bot._client.emit('connect') + } } } catch (err) { handleError(err) } if (!bot) return + let p2pConnectTimeout = p2pMultiplayer ? setTimeout(() => { throw new Error('Spawn timeout. There might be error on other side, check console.') }, 20_000) : undefined hud.preload(bot) // bot.on('inject_allowed', () => { @@ -500,6 +513,7 @@ async function connect(connectOptions) { }) bot.once('spawn', () => { + if (p2pConnectTimeout) clearTimeout(p2pConnectTimeout) // todo display notification if not critical const mcData = require('minecraft-data')(bot.version) @@ -702,6 +716,7 @@ async function connect(connectOptions) { errorAbortController.abort() if (loadingScreen.hasError) return // remove loading screen, wait a second to make sure a frame has properly rendered + setLoadingScreenStatus(undefined) hideCurrentScreens() }, singeplayer ? 0 : 2500) }) @@ -744,4 +759,21 @@ window.addEventListener('keydown', (e) => { addPanoramaCubeMap() showModal(document.getElementById('title-screen')) main() -downloadAndOpenWorld() +if (hasMapUrl()) { + downloadAndOpenWorld() +} else { + window.addEventListener('hud-ready', (e) => { + // try to connect to peer + const qs = new URLSearchParams(window.location.search) + const peerId = qs.get('connectPeer') + const version = qs.get('peerVersion') + if (peerId) { + connect({ + server: '', port: '', proxy: '', password: '', + username: 'test', + botVersion: version || undefined, + peerId + }) + } + }) +} diff --git a/src/localServerMultiplayer.ts b/src/localServerMultiplayer.ts new file mode 100644 index 000000000..6924c6b13 --- /dev/null +++ b/src/localServerMultiplayer.ts @@ -0,0 +1,145 @@ +import { Duplex } from 'stream' +import Peer, { DataConnection } from 'peerjs' +import Client from 'minecraft-protocol/src/client' +import { resolveTimeout, setLoadingScreenStatus } from './utils' +import { miscUiState } from './globalState' + +class CustomDuplex extends Duplex { + constructor(options, public writeAction) { + super(options) + } + + // Implement the _read() method for reading data from the stream + _read(size) { + } + + // Implement the _write() method for writing data to the stream + _write(chunk, encoding, callback) { + this.writeAction(chunk) + // this.writeStream.push(chunk) // Push the data chunk to the write queue + // this.writeStream.resume() // Resume the write stream + callback() // Signal that the write operation is complete + } +} + +let peerInstance: Peer | undefined + +const copyJoinLink = async (id) => { + miscUiState.wanOpened = true + const url = new URL(window.location.href) + url.searchParams.set('connectPeer', id) + url.searchParams.set('peerVersion', localServer.options.version) + await navigator.clipboard.writeText(url.toString()) +} + +export const openToWanAndCopyJoinLink = async (writeText: (text) => void) => { + if (!localServer) return + if (peerInstance) { + await copyJoinLink(peerInstance.id) + return 'Already opened to wan. Join link copied' + } + const peer = new Peer({ + debug: 3, + }) + peerInstance = peer + peer.on('connection', (connection) => { + console.log('connection') + const serverDuplex = new CustomDuplex({}, (data) => connection.send(data)) + const client = new Client(true, localServer.options.version, undefined, false, undefined, /* true */); + client.setSocket(serverDuplex) + localServer._server.emit('connection', client) + + connection.on('data', (data: any) => { + serverDuplex.push(Buffer.from(data)) + }) + // our side disconnect + const endConnection = () => { + console.log('connection.close') + serverDuplex.end() + connection.close() + }; + serverDuplex.on('end', endConnection) + serverDuplex.on('force-close', endConnection) + client.on('end', endConnection) + + const disconnected = () => { + serverDuplex.end() + client.end() + } + connection.on('iceStateChanged', (state) => { + console.log('iceStateChanged', state) + if (state === 'disconnected') { + disconnected() + } + }) + connection.on('close', disconnected) + connection.on('error', disconnected) + }) + peer.on('error', (error) => { + console.error(error) + writeText(error.message) + }) + return await new Promise(resolve => { + peer.on('open', async (id) => { + await copyJoinLink(id) + resolve('Copied join link to clipboard') + }) + setTimeout(() => { + resolve('Failed to open to wan (timeout)') + }, 5000) + }) +} + +export const closeWan = () => { + if (!peerInstance) return + peerInstance.destroy() + peerInstance = undefined + miscUiState.wanOpened = false + return 'Closed to wan' +} + +export const connectToPeer = async (peerId: string) => { + setLoadingScreenStatus('Connecting to peer server') + // todo destroy connection on error + const peer = new Peer({ + debug: 3, + }) + await resolveTimeout(new Promise(resolve => { + peer.once('open', resolve) + })) + setLoadingScreenStatus('Connecting to the peer') + const connection = peer.connect(peerId, { + serialization: 'raw', + }) + await resolveTimeout(new Promise((resolve, reject) => { + connection.once('error', (error) => { + console.log(error.type, error.name) + console.log(error) + return reject(error.message); + }) + connection.once('open', resolve) + })) + + const clientDuplex = new CustomDuplex({}, (data) => { + // todo rm debug + console.debug('sending', data.toString()) + connection.send(data); + }) + connection.on('data', (data: any) => { + console.debug('received', Buffer.from(data).toString()) + clientDuplex.push(Buffer.from(data)) + }) + connection.on('close', () => { + console.log('connection closed') + clientDuplex.end() + // bot._client.end() + // bot.end() + bot.emit('end', 'Disconnected.') + }) + connection.on('error', (error) => { + console.error(error) + clientDuplex.end() + }) + + return clientDuplex +} diff --git a/src/menus/hud.js b/src/menus/hud.js index 42dbb6f36..7437d4e17 100644 --- a/src/menus/hud.js +++ b/src/menus/hud.js @@ -9,6 +9,10 @@ export const guiIcons1_17_1 = require('minecraft-assets/minecraft-assets/data/1. export const guiIcons1_16_4 = require('minecraft-assets/minecraft-assets/data/1.16.4/gui/icons.png') class Hud extends LitElement { + firstUpdated () { + window.dispatchEvent(new CustomEvent('hud-ready', { detail: this })) + } + static get styles () { return css` :host { diff --git a/src/menus/pause_screen.js b/src/menus/pause_screen.js index 97f8706bd..b047cbbdb 100644 --- a/src/menus/pause_screen.js +++ b/src/menus/pause_screen.js @@ -7,6 +7,8 @@ const { subscribe } = require('valtio') const { saveWorld } = require('../builtinCommands') const { notification } = require('./notification') const { disconnect } = require('../utils') +const { subscribeKey } = require('valtio/utils') +const { closeWan, openToWanAndCopyJoinLink } = require('../localServerMultiplayer') class PauseScreen extends LitElement { static get styles () { @@ -56,9 +58,14 @@ class PauseScreen extends LitElement { subscribe(fsState, () => { this.requestUpdate() }) + subscribeKey(miscUiState, 'singleplayer', () => this.requestUpdate()) + subscribeKey(miscUiState, 'wanOpened', () => this.requestUpdate()) } render () { + const joinButton = miscUiState.singleplayer + const isOpenedToWan = miscUiState.wanOpened + return html`
    @@ -71,6 +78,12 @@ class PauseScreen extends LitElement { openURL('https://discord.gg/4Ucm684Fq3')}>
    showModal(document.getElementById('options-screen'))}> + + + ${joinButton ? html`
    + this.clickJoinLinkButton()}> + this.clickJoinLinkButton(true)}> +
    ` : ''} { disconnect() }}> @@ -78,6 +91,15 @@ class PauseScreen extends LitElement { ` } + clickJoinLinkButton (qr = false) { + if (!qr && miscUiState.wanOpened) { + closeWan() + return + } + // todo display qr! + openToWanAndCopyJoinLink(() => { }) + } + show () { this.focus() // todo? diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts index f344f485b..f67c39ea6 100644 --- a/src/optionsStorage.ts +++ b/src/optionsStorage.ts @@ -13,6 +13,7 @@ const defaultOptions = { maxMultiplayerRenderDistance: 6, excludeCommunicationDebugEvents: [], preventDevReloadWhilePlaying: false, + closeConfirmation: true, autoFullScreen: false, mouseRawInput: false, autoExitFullscreen: false, diff --git a/src/utils.ts b/src/utils.ts index d0d093ae6..889564bea 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -138,6 +138,7 @@ export const setLoadingScreenStatus = function (status: string | undefined, isEr const loadingScreen = document.getElementById('loading-error-screen') if (status === undefined) { + loadingScreen.status = '' hideModal({ elem: loadingScreen, }, null, { force: true }) return } @@ -150,7 +151,7 @@ export const setLoadingScreenStatus = function (status: string | undefined, isEr } loadingScreen.hideDots = hideDots loadingScreen.hasError = isError - loadingScreen.status = status + loadingScreen.status = isError && loadingScreen.status ? status + `\nLast status: ${loadingScreen.status}` : status } @@ -233,3 +234,12 @@ export const openFilePicker = (specificCase?: 'resourcepack') => { picker.click() } + +export const resolveTimeout = (promise, timeout = 10000) => { + return new Promise((resolve, reject) => { + promise.then(resolve, reject) + setTimeout(() => { + reject(new Error('timeout')) + }, timeout) + }) +} From e95b776c2552870e1d5199967acc6b14666c8bc0 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 17 Sep 2023 23:39:05 +0300 Subject: [PATCH 232/318] improve new tests --- .../Loads & renders singleplayer #0.png | Bin 234643 -> 0 bytes .../__image_snapshots__/superflat-world #0.png | Bin 0 -> 267964 bytes cypress/integration/index.spec.ts | 2 +- cypress/superflat.zip | Bin 0 -> 100058 bytes minecraft-server.mjs | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 cypress/integration/__image_snapshots__/Loads & renders singleplayer #0.png create mode 100644 cypress/integration/__image_snapshots__/superflat-world #0.png create mode 100644 cypress/superflat.zip diff --git a/cypress/integration/__image_snapshots__/Loads & renders singleplayer #0.png b/cypress/integration/__image_snapshots__/Loads & renders singleplayer #0.png deleted file mode 100644 index ea42d86f3d85a46e8f26d169809480d6aff3dd2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234643 zcmeFac|6to_CHRfttfNIJafo=%o#G4$WW2YbCL|P&63QSkExA9L`4w_Aw#B+BuNM% znaMot@7i0P#?v`{?!CX?{o_6!=h3-!UhDOKz1Hx2uC-oEH{_^>3h_?boj5o+#A>RF z+Bi6P?{ILo#UTjbPZC7P-s9lKom5kl*G1w^Jd$-_bN9bGD&|8PO_TJ*!iw@rZ+A;7 zhjo^lr*+5`eG~eV{^9ej`y@sY#0?$UQK!5SG~~gE*@!|t6k{&=^bopF>Gqj(01tcX1q=B?OVTnw+;R< zhRxOm7xQ0ZL`waze@<&ChyC-*`7+~ zYHmqv#4c~HO|O)Aqc@h;jR{pT+hqE>^!uV^(EGQ3CB$w$#@K7T(P=!phjeS}j9pu6 z+yCjwB;{>=GQ`I^Wwtzbj91Qe(w-Awbe-DA18f(t5tkR9FvWG zm)Oyo>#Jq_D{Jc`CBCrNhOfb=9U)n}JR(-Pf#;isS?F20GRX*eAKLL(v%ZgMMFRXA zPJg9;6B5@C=so`|ef`^;{EO*hfNwK;IUmhlRv+U+t3yS6rGv8Mgh4C6#{CCgOd8u1 zNgc_eTXc%uB!~nIGT)XZFU*GbnyX1(<_-&N84K;X$v3)}^Yy6%B%Bu*mHzQs-1K1a zkcJWNo-#UuL_X~~!{+#nDnkDO$|OO&adT zdqTy%l4s>DZN8)zqha2ZZt7e*xOlpGrH)W6VNb1^9~X-TOM!dS;{G69tFSn)6NM!Q zQtx{5s$~mWw%?I3bo4A5ULOp&(!67kO^$+;leAmf(len3r%>ro#Z7(2wwE&TnH`A* zHZM_m_aDA;@^P$g8OC!YV+sw94L*}vQ1YD;b*q$`XXmEPP{g< zm#7pU7@4~uPDr9utETw7W_RDPK-HP(nCa6m>V;h+*~dh(cxivn{_SjjG0GTq$IW>~ z4uv1gGRVeqCHu^@6SYaPYNMOz_z=ynnxXr*Z|(4Ry8Ua_dj6Vjf1=vEdw*58f34bX zsbA9Vxu2=_;lJkMpH+)uB>tOl_`LSVF8+lXsv`d;9KKll(`az`yKwl4$-aq(ZiBxK zhrc%2chS)E({T8y$-cJO%d%fYrN1`A#2;9w`KP-5OVwUrZ247G`iU9-ZILt4`>Uw* z*JkkiRaE+p96p=j-xxVB!~QjL_`(b&|1vpjMS~^(zf2CF&0xm=FOtKTW|-*3ko0Fe z{4FZ|1=18G{3GK1LbrdZ+N#JclKv-a|DL148!#mO3#jxLptQI}(x2_{FL3n3ALmN{ z2QxhUKjlAvq1wg2%zxJB(eHf+`%g$4ps%1;ebL6yIvqt1R1Pm&sLg73h{`yU=}33+ zcIh;wU*jVCja2cI0&~Iw0D8$Jo1dXl)w-a=B(#|N58#gAZEa>#w*{GVj*S=d9sMr&nWeD zY4K>s!ACu9d&Iq@hJwZ;UFr zFjweuZ@<^uiM?sFH47@G#o5!$DfrLSo=lmmExZy+0UhFz#wi{CT~lIhzKtt&AE;(D zl6^-rq3kK&Ogqn2hG%L_DYX*^;^D>}?uYt`T?{q#??J*`D2omsd|*oJYf;2-!zgum z?n+|kmDFo|iENan$l*6vG5^fxZ%gwgo$c--HTEJeOf0$8znkrvndhE1#>2bg$&Fko z?R(pQr#FB8Xkk>)~5kb7Tn z-NQbKKJ!TexzT*!j|3p=UOO;4yRpkS^)_--PdkCH)2?}f$+7}9lPvb!a+l&gd(Eyz zMJ>htMX#lVeP{CzJafZas`MRc?)d%#rDrY#lk9k(%O1+IT0B}-`TCsaLi7TUwdCz2 zjnfCvLS_dXg1IHcZIUuY!<1CW4r#QKy>Qr3v3a)Itk=l}-xyUZ?Tvi9AUeFc)aK=0 zIyg4_$KZoNTm?GSXH|~|0ur)A-xsl`uzlE&tGKCmE316PtaZvBFuH5RjnG~z4nha~y*8C-7leIT-b)VzOW$#*Rzzta2QthO)_ zo}rk4ab~UBRa;32ra+&ob~}PiJQIYII8d8|!P!A4k_(1DukX;McO*kFv!v9jj}jX8 z%+Ky0HTlC4T_bEL7L_HKT`4{|Ht(ri{Ip*v|CZ1RXm-ujAgW4!3myl8R?U@Sw*<`Ue_k+QBvAiQDqQju&yh-jk#94E%yq`uEdsaI)qF0JG(pGWvY?gE5bF^NG)Q3Vy(oMO)X?c|Um5vGE(} z%;pHjc3%m=$p;^BsF_1pV0?z@O19U$wF=bKxi%}y%%eBc^4#5XgZ;Y7O&_FcQxPBQ z)|T#iZh1HuuPyCRATHFkV!p156*nasTI@c+rEX?^WAfc^LX!b&DS=!2dica#_|F#f4kT$Wp+-tqev!=VP~I@kDTH8GyRn~ zq+=phF?AIDqG?mRvI^shCvD&FW(f{nUg3}Iwm+QCHR$F$A6=5hc=QB)&l10!qU7Zy z3&Fa>E!k`Sd6P-4KrI&#EG#~o&E~E>F&P;r-t9a-exdu;U`u<|Qz|T8vk>Kj3Q#C^ zx;#%zD6bY?;LVX(rF&42!-&Qg7LFfCR?t zZ=>p$Bo4}w49dk2{CK@W@JsJoHdj*D7*kgUIfJAt+GtiUknD&NId@KcU^pk;!(NS( z&|5ZYnrBdCX7$v3$9x;ogV%OEVo!-w#d0HatoOmOa^EeEwXGiGk3f1LuX9V~rVnG%3W&wC1_fQZGKCl8 zR-6?; zkia%Pul1<;g%XFC_J7#)4qeN`JubD5Z*HdD2IMgH%cEa*F+S&2kcrG0OHKt>FH1G0ruJL%T~hoL zH|2EBudk=k19SpOK!8SQ#zUkUc93%ldUrW5|2|YR?FtB|Ml1XQ572E^JGMm|6N(3V zE6H%D9a6;)=xdihcR8Yos{LTtHqaBkr?N*7r_T9E%wrI%JACB#!z&QzD=z3m_~n)E z7V8&S~7O4XNYHV*%nb5Dv(kMk{Vv^sr#slyQjPl9=XJBE_Q++>pk@ zp9@9dUe~;G_`bd6PLeBXVs( z-QX}xgDQqS9WUtThvRB8!s{f5R(oZRbPE}4yzD{U23#n8ePeGtlzDFgOo8(GB@2af7$~a@FD_!e_Lv#nL9{@ChYvR-=lKsV4|jj~-Q@wnyY0p!R-Bp!v>uzKIBra(W}Qjm z=RDJT9D>5g@Vu_l;r@jQ(PKMEAvrd1dy=5DxI0paYCL@0ZArwk8KS|tINi?keQpNN z$;H(?>--$a;H!3?uS(4;P)^9WyT53p!mc>J9~fy_>qnRWPaA15H~sqeM)CwJ{fd!1 zx4h{aBSkPO{m4Uq)kqWP?KQtM(nL#w&X0{`p3igg2SzHFB1D$n&XD;FBdZ0hBe{k^Wou6Bz}bqH|YzW+`y~}KkjCy?htL+ zG*|psKl1qQ&XeWyUgmKZaZn3-lTnt+qI)SWo18Cs{2@M?S0}ziwAJID(~TE{Db^No z7ya_TT|}jy75>d4*eLv#YlBcm@~%+jJEaEZ9$_ChQa&l6Yd6~}EYu{A)9Qg)W3Jn> zU5Qn%_qO0erFib<9$IS|%o-Z^FYl&>SwnsM+q)r0R~~ciz!e|A`--_a{Pcb<+DGrt zwlsWzBk?-ep%!e0kKV46YHQ%CKk?0?%VT^6>NI>`Ey8R>qyLoxK5Z2KSpgrF^!Ubi zcf+g^n)~u@aDU|=+-Of^O}N7e_U=n^MGNlI8@rH{HF@v+|)ikO|Si$(^Jg+!4&=SCeJEajuH1 z{tbaPX~xN#8)xw0!8wHbHeJ}w7|qHv2!9-A^3anc%FNj*gZGc!V%$wVEYS1_Cns3& zmDcb6@QTbynEmiEt)@haey@zMu?E*^dFo3j*U(LicM*XbSv7081gc8m?GXi}h@_~{ zL~+7y=^_jF>i1JgPz7l1(kAU-AnKLxpeJ5CQZImmhZJMtAXJvf)z{!L8)UPXe;zYT zXvzB0Ub6MJmqtv+g>u5vG z4FY~{4AVQ5d(~ns1aYH=1%r-6y5XtOGB?MGgz5Pn(0=aUc2jIlO@ZPP5gxv&91c?K zX^My%75Pk>{-nFN_%mLo0Cm;E;Du3ECBEfyj|?f>rW_^>mO$KXRb>~ZGSv#Gtz}9J z-}McqWb3~Lds~s_7MA-+Xtg;p`1WgQYak1SZ;H3H1Uaf!5bVSg zJV?^3Z&Zo8VJ#6^In9;r&$U}kNu4?{z!V4XMxO%7RjKC9B6Dp^eB3x4c{h=Ft#hlx zif&Jz?B|g7ex;+aJtvs32F!q{i4qSHpYqTh6|Y!O&kbktbK((bYA=B>?ir2mt_#T4 z^n@c*LRgX4!MMcWtQoB-|ZkX-|Ww;iCn!0{*uYU z5z0EqR;%AOJ`|l0#HvOc%|_bETYp-G1pmYBI(<#*YRBwEW2$m5iKi$vZBp1fNu7FK zuB^*z<^16o4GdnzqG&WAk(z^OrjoR@iZlpSfKGfBPe9<1jL*!OC;IKz?3xrIn$tw=8hjjqXT zG@5x}l+6iQfPPkhmTHXhhugz*Wr3q@o{Lvfc{Sf@2C`iS-+WXvzX72<77_S}n9Vle zG;x7C1StF`rSRhsb;laBjep0Nm-7_@EKOE|kTC5i^bt3SGe3uy6RdUnk-nw`CG5^& zcF&17@6dsb0%pXv0CfO04sw5--B(fxfsXEh+4hE4c+2nnD1mt+k!d>GoL!<<#WAQTUi^Y_JlaHR#i`3sXn|G zc5j0}QI=SZRr<8lZwU{Jt*yvpVKowb@gdtiw7vRyzKL^l!>Z04f=%sdyrrTDLL(0a* zI%F_v-i@+yb7+?>l`sY@VKKurfyNFc>cCn@)pmr70{|NU>y)U%W4$4X?*P!eXw>Cs zfT=275XEJt(1W|LfHb&$1GSy>=roVdM*Ut_e)<(Qh?GFw@_D4}IZ3W?Cq+laeJ=Wea67U0ItLL zC%Kcu#Y3nG5IEBWrLi21W~c@Hb?f{+D#=O_QNYS~H@)88KlZ#3Rp0MMaYPxV2>2>T zO(5X+o(~_lv@qO=F+wB^mEQUT7=)Vx8!c-R9DR6+NzN^P!>&HFX{J@!K;w(WIl=A# zRH&T*Jpi!iMjS^n$JYxtS{=Q{lXPk1afWqC>X>tjsD}XszQ9bi!bGkJM2(*Sk;I>v zNu-~pH;M4~tN3#@&~-<)3>cSEP>YU~6Rhp@dSOCLCP+*vMp3tr?k2rF$x{r(_IYf< zCV(vX4Ubv6I7=+yMMj&Y zNrE3N4e(Xm2L0BLph-Q6fu0qotNN-RSHEj5@IE_caFBysF*Ry0Hx{*M)~nv^NauQU zUkBB%TP{tPn5s!41Un(Nt;U+Jy?#~_sLlbAZ<~GY1tdxs%-Ey&5n`j1ngHQfEHCg1 ze_Tzb#EhOt&r}L~czL}wKK2XQG=5~uSEvn zN+2s>put6ZK`UbA*rS?yKE_RPYe3=_mZluJrTBEx^4kX0TyF=xm8c1*Cxc^v_*P%s zxzF>3gchBX>#-OM(ghZkKLsotB}|{w6Pv|cl{(x{OLYPY2(X;`W0Wgx=gHQ*Lx8qM zZ}lbtH(C@5JSX)|X;7b6xtPc%E_Ut}H!KG_6Ci4^cw(Eab=%VM7_fiK3jR&{PTp*N zRo8s_!d)Sq3>h-=)Nfu_*=FmVq6C6^b#Y|fP$|A%+E)_J*D#kj;^ps_T4yP*Wes<* z+Dmp*M%mL}z=ZnEJ)KkNr%}U%lk(1+c`VK5sj~FqmE4VC0o|4t+)~q9ZKz^O&L0*f z$Hzx4(tcD^p07>ATmai;uHEuM*(??ONgYSElw}?sN^OwF}=Ch1zH*;xkdE<#CE1q5=i53kSpbUg z_ejpX3Om5Yu<@9&2end>ygJ4F^hznFMb^|+4{-If&ZKFUqir8&QUS1bMtDRQ8kU^$ z?t%<}s*4>==N9jgI{#rzPRm+vl7`^i*{Zb*kBC979LE9^*}zhJC3?;`2g$Z_UkO)B z5iH|Z1Y!b}yotIr1?sbBO+1*p^9&BGJ8E=WsJ{CpO}@gI1(_pnWX_00A2A~7 zj*qyu#`XgBvE8(YFV>4D2vn_G-eT5o?EH_pl)l96-v{mi8MYqrQixH0 z0?o)Sz7zeTh$Mj=;m{m8H!A&1K$99AGqTt$!AW^?W!y<4)63TG1|29(NMl!q113wA zmf~+t?~4&hPu%HZ9j$bz8^N$yIy~roNh_km=(B{gj}9pTZpW@h*WPr`=FTPPqieM| z>slwJs`=x5DZ$AsPkmLgW-ZMMFd{&{>Vv}E+)D5gUKk{O7(L|{s<*Mp<77X~IwPb$ z{Z1oLoRF{@r<0}+En;5GYXWH{)aI_ecklB;Se#B3KJ+ZuidkY()H2r8L&Z&qjfLZo z0)g1M1@D?O`c(kGP!f-7?r3#5q)n>R;;h{2L6xw*ZD~g+M-5Hnd)`)J3n9~UcqjVB zL`KPPxvKMXWU`E`bX=If5~Ev->W!l-kx@#C*3?d&-a~ODP?(`pKM=Pmr;4k2t~g5~ z&7_F6nVjSNn`?T-E*!wPOld!&MO~KbFYvEZ|Wnao}?z=%HEd2+uV~3{StpB zOayryaB?*SPjHVexX+_?n>me5x}Wie)wXGZK{ottb1X{d1M7~-wV`v#ILPu4WOak#)(KWDat_Ye32IUdR?3yVY+fn zIi7o?QGi>=h#^A6S|Y?$syYW0mC#Mmw`>rq<5Cf%1ea+^%EaX6Sr{bdrhPQt5z>7r^9;Tz zwaGo!Lkcd|56W*tagk0+J)CGvDed)oZXnY687~W^;IJ;#RPBhq7kqoCe}gpGVrxC1 zhlRU(I|2a4=h)1QBPKW-71d*uo`(U+b@Gnd_mU|yhcy#sOxcjc2Gkg|4dya6n};ex zMUxaRF)3nwf;}e~KIsu{UX+nMj9N^7wCBlww&R|q8S?66K#rv)ym>nztS04S8xuP; zoB`!SA+4}&1oICwCg6BxJM0+1dOv$=yujM$#+-<8glsjmt!=_4*=pz-wK(7i52H3)2g zx>N`>aP)Qy@YCUehPi_+nTG(5O{rCt)V~5^ExMRc>W|P}{UJgvg_(o!Nyr<1t!{-(6_LtUL8=Cpj6aS(#f2F6jRdtQPK;DstI&PqM&Ho25{2yjaO0Ec1>ekb|NC zmC{MUT}0coQk1B;*N#9D;5=JV%~cOB6&vN64;>1@9AT*Zs+oYY+*iEbzF!OcQ^eAP z!+m)?USKEp6`~Bf?1vm03Z)s3*DheVmv7gXA|hen=>V?DscL}T?BNPc95o*zrYuwy z)!m*WWoI_CX$mcI@#1sQ65 z2hN(6Baos(TPdO^^|Qc0xXSr>NDtK-&>#BO9l{wH8CMcc?oS9$m)#h@Qn|L?=HQ}2 zEDxcHLRIt| zvs0?eEMGH*N#ML zML>+{U%xdSi47BFiL6mF0z|bR5Os_))H#9TA;?WA9ESCVx}{U^Z{9VPn@H?S9m5JI3u4PIM{U0B+dyV5wXmd^72pJ4+844L^+y|$dM-KLC3Zv$wH;N%+ z6(`h6vGmyAUFiy4_TH+w;*q5^G5EO*x99gfk0f&fa(Bu8euhCaJXttID}K`XFs5_` zQ*-U^u3SWl-6_A#o$Viqo~i!eRXtu4EusmX%8jhiLGQYOBkd?P0$CDeT*&mr39&LX z1V~Tm=wU*jHjq&u!H0UqwO1%d82SQJHuqPqaPMJsgRT+v_FA=u)s73@b(l-By`7w` zwatbMwC?;PU{3v1DCHp^%WQoKiU6S+oTbY0yZ84KX80{+;}wPxzCgM-&^(k$ZJ5KK z-cf<>@bBNWy?9HgcpNGp{ZwdeJP$*y8TUc_>eh;nYu#qoP;hY=(+t#d6H#<*Sn@py zIY8S@zJez4Nsj{Qftf6%=UMJ-nys%mzJMkc;JYI&AUKx>E7-9m32KBo2lPGp<23pV zg$5-Qm){HwMK~o7+_Lue1=DjJYg*mJz<5XS;#E=%A89&s5c>Op>C;XaymxOs+bgsT zGYdhHQcbpxVX05Y{8TngtH+Bal|hko85?N2kmA@pwZ= z>u&CNZ063ZIjjH-c6s}_W`YF{rjU`+9%lw^Bpz>o{K|w zo>UBPH86*^P!d!}qRm?pRa~J584gsCvXg>9t4H64$nd~W{D^uw^i!3geo!kwFq2~? zVw4+Lpt~Cgn4v`n^#Z_pe0aOU#bCcR(6^g$}k~73kUaID+>pqJoQn2C-~45@4_kQ%PkMfO1GyFnNrLx zk4KpCAeZl7$CP`}wS^>Za0A+bxrNYKNXFzUz5361IfxEsjmGr*_C+-Y)Em1I)%Y=D zyeGXCB%Y-ab<7hgrOYlq*A}6HR!0j9q>pcyu_8`9%NwJ_(8^<=@PQ_P*Q)zLE$dsd zj7h1QfT~PH;%7WUIao0g%I%27e89HmJ(QK`a?{E&uxn%`WSYw#<^vPjRH(YP8~gOm zZtijR7kG1L%<)ABO08PpszkzsvFEFcR@5dd*USJP0R)amWcRyLPp*I*L}P-n8@_zi zU@luD3v}E@)Zy_$pMjj68A9F^S`~@>oVTX;09|%CNC7MtR*$_-uT-`SrZGDwm^mxf-sEPi=;ZX6>YAt)-P}rA|GNlUe@L=G4Z=_rKW%cHABuxBYQ~FSe)>?Uh(J*7 zWu*%i_x+;?;r;0&SLic1zv6~W5t1b_Sq*F&`+*bu)70z%S=ZMkXI9 zVWGcCzttAggoc)uPe>>jMG) zhl7%#3`LEOmB_e9UzKeBa0&{FwXO&OB3mj6@QQ)^$FRV!=vX^48_*sB*aSC%=p8`S zV_V!B3fK>UA>sKK1N|%DeeeXemm9ig&!oYt9w3dQ;i*DQ3DbClZcj)oiJde!L>=>5 z7xek6xh&ib=4Tm=pv{By7EhPNK)8d){=O4*eH1N87BhIJ6n8dVm^2g$q#tvs#08XN zAUt5${)kZ~ltA#lw1xT(9;F!rBMw z4~|_R%?vHxvQ)K{yO5dAi@|IY7BCITlyN~Oor?_v{r`X~psuVtA5zHBd2*0VaVdV& z0$Mf)DT2Jv+0fltE`P;xGrS{@vza`GcLa<4j_BrnVdG@hGLXYm$dY7}PRa|1b_8RA zAJjDKUZnIJG(Ea+8-yxjU`wI}T3k>9^0USASbFL9X~8DC=sPLgbXvtv+%1qW~iu?-qG$W`yQ z%qB<sXuu@^2>gA?i73r1I#0F7^}qR}+U^jbdQd?3GA#F{LF4sww@*qgLDH{}41 z#d|P2w$3ki(Yr?vVtODz&p=9hx!t3kHV(oIz=aX@xeq-NC8Ok8WV2WngCw8?vThQB zcYOthZfyDiQG^AmjTZh>yinHx^cP;iWQ-89GqabuLXdj)jxT^LF;Z}VUV}lAK`i{k zqgG=8ZzM1j6?chm*_)Nks)5_qA6AEhu|U2dVo6QFaA1my7Sau%7|5Zq_#Z1-Q+5Fd zx{K&#V|4!KtkU0i9=*PF@ie?RRS13@A%K@6M3l_e0%P5P0YyY;QYKfR`Z`A}}2iJ1a$_%yu1s&A$H z@np(bB~S#q8wfjndUXGIGS-hX9$FtS05cvoTNi+nv0~rm@x6w(9`Kbv4j#a}yYiod z2ZGv|feA4hW7xf|!f9*P zA>-qW28<}M{yC%ZY5ZX5CU*XSy7AAs5n-V}XF^ypvn+qkdwembaqr`JiSoCjBX54& znv40u1VS;NW?mwqF_r=oRP6kZT(t9)01svuyB%lwK(KVS6Yz|1Ev`geWv?yElsVm^7%zw4Xk9?hyBr5&4A=bo zs};ryneY^KkrD4{72;~6&S zSIjr#puDHg!p z1=%|dag7`Yd0(nVc!2uyx?^+q`A4cn@lzI12)3g&Y1XHUqj`gU(8mjN%Sx{tDX?tM zQtD1-wIi@@n@D|PTqY)li1NjIdqCa~2Y1RDe=n|oxl$CTn$f^16YIT)iQm$kEa1~W zqJ3nsEjLf2$>C0#rlISpQ~XDxYvC`au%L4CEgPNVsNYu~&80QL_?vVJ7sJ$U_zBYT zyke0*+Bvoba_ZMj%zWJGF5|OkK2y;ac-j%2FXoV zb(9QUk$by#>9TQ$5%4Endfh+upuBPRu_N0dinaQknw+6QWq9z@S$W0CBbHBd()UZ1 zhmCLNiHTFXnD9hl%3y9%5;rw690oMf)wVu%sqN-KtnimSfc&LUySHqwc|hDZdhox)1BnNMqDJgtep*M%@@o_F>hn z7*gGXQTOaQw<-gSy02p_iNvZ~PKhiZqi(Py!}J^ns5@P8V3P4Smvki7lCxNKr|^_x z)qRyEdVR-Y5p#72LHgQ`)>m0 z(h01(b=hXI>i&zsp~%0Iemfiqx;!6^uw@=rMRqre#y1)PGw znfZiMKMkDOZ*b~|fm8l1PW?1+`aa>*&jP15>|31rLEw~si&H-hoW5^y>W6`o{Vh)Y zC~#80!Kohx&Ktfiov(1}r-3sAwD1*9eZe??1`ZNv;VYc_f^q%~oFT)$x8WGZDF<5k zhH<_RoLQiSuW_n*;k&>=ev4CIGR~*K8R*2~6s21EC!G3%alQ+jneT84An?1u89e_r zPJPKZ-v`booce-sz7HHE7N?dg(QW9x(+<9C`_M*}>vOyM-pX!_!e84E&KlsMKz&5q z%kIu&!3b7E^Y)xUM}wGF)^xpRqVd^lti_Bsj3iMPk+e>mu7@aoJ7B-KzTCXe=wXUk z>4l@3ASW&@_TjQ6or+5?wTg{~%$Rh#9j~GJ%G~Vs>m1@cyrpJVd&7~mbGC)qxA}Zm z>Pr&OGCe1MreB-gl3H;$d`}3F(q6Vjyp<)Ya<`OU6JhV#|-LajCdLmd9&)COT9&w{Nb;bROB0)H-v^URK5ALWkYTwG@ zN-b{}kt;rPB0u?D7dPDbO<;5yddz>Qq9*x*3Cr@_+OA^8#I*WE9}^b5)B}HfnDldI z^%k3fDI@(nns7XfAY3utE>$*dc_nRsuvuNRbB*H8iuKLv0fQq##H1JGatZrJ%kao) zp1R?Ai#-*k;>IJ{7Vu`>>=0J!TusATS}W51Y@({X0O=XDy^0WVPNWPAiK^(peD8&d zqHxv^y>eZ8@69zS4wLxLhjB|DL*34j_B}AWnJugfNkv`_hrEYr3Ny5zSU zAwhghx_VZQGql(I2*qK@4yc*~3OnOMh?bYfg~#{odetOA9kh=wXq2F5&+~c)QUrvo zlJ^9S%F__DCB2TK_%U7urIRPsyF}8_Moy-agHa+L{YU1wW zfk0Abd>+)(+1sU&yH^W|fQ&IC)KHyMjOxzE^4Q{8YU#3m>V%8`MyTmFDcQ z;)#9Ldg;}Kg@uX5LhvI1B-<#D+|ZN(q3BFI0+-xG^=;{jj!SKA>+6jBNfZS1f}B|y zeZ8}85@#_YEULP%#1#v<6e%f@Va2@d8mW@=Xn@#>S=FeVK8oq(2}i6^jViCcn49gg z4j{o7Vro=q?aPGFxS^V!PRNsdbn0ZmrL3EL3yoLP3Du~`)VE>1MfTLW*Cj-*wJ!0I zl?PY@uI3PhSyp#np~&GVryy3NVhNB#$m`HhUpqka-n>nu>&Ch2`BC!L%jIih;ozPw z@$js(kzsKsqE6@$WCz!6R0~L$@f8rsO;w16yV(b5vK~D4EJ~hRU#TriYX!#~$a(A% zpYIz7yW3KwvxI0+Xr)6!C=i3u{M)h31{1o4MgbzAdE}PZz=MGeO>4T;(;PhD{Zqa@ zu~y99QjkzfMuOZU@oH7F(~TV)(HlA~CUi9dP!DwLhwtQky)iF5?JIe($*;IrUAJn( z!BbgmFh>=jENecvzy`spc7q*oX|;aWMMt6+?JweoEdzIQ;>Y@d8k}ddx7*tja^SME z@+)2JD#4o-v2aX1N=1CpF|#l@@2=Oz(52PqtjFXG4B``LQg?ECtuG`E9hi}Tq?+$X(V}1 zsJWza%Tbk5z>|_(^I&H3%<#|!6SAkB@p;AficDQt4eiI0acMME3lKRR>zn-BebN1S zwi*PK8t}~xoy)qoIhmhi;5 zE}Rug2ZtqvCF`$RDho8BF)094jbJi~6ouwYbQXr}_g{&^LjnR0yS+>HGPW}@4 zGk4%l20Oa!gNJXhlhe%H=Og6sH>DnRtV_T8*k3? zW$jZPB|S^Ma<98XEdJ<_ou4^e<@a5i%z?_keHG=_M;V9&CA zN(Da>|Mm00B0!*LsdJiBODDR0Z<5Nzai!}C8rp2JrwP66#vB2OxR}}Mg?@CA9D+oF zMDrkUU1Sd#hH^Cx7lA$LmiP)!k+X-6DP-sN#j8Zy$scol z>0{!<5L>B1qk>%3eO7{ZzI*6(LrEK_)dQH_kzf4Wn+8K9&kI^ z$fO3pY)y9lHezq7H&{t&Zae}hA!82py~(`rLpICRZD<#Hirt!q(W)e{Y`HEL2#tbLBP|X6yZIP%zZTtj*||NhF8R6*s-B4hak3DVzrQ5WdKv4b~ZW@MsYa$>+?cxQK-j(L7au4?H%rl1~jkV0HM)UbiVYF!{4TPi5#Sc5RzI%t`NV3h2uFr(vmLszBE^8>IHUU)Y zBH0Z5&7z-|4%v%s$1ZK7t^d3RaN*{i(aan>$ob-Rh>&+ zD35|uL;6D`+nNl+O1?jWjU61*1oban_{R1cb>RMk1%%4v9 zFI@}SlEaA!!++zo{u`|I%h$5LeDHh7_{v(pdaeJswU9S&N_>xmUpwJf*Md$94F(DS z@>>4WO@_@_(EMuYz_I!W3}|j?pq#f0@}rMSBT9NHcrm*|tYCm>YbjEj;2kDnu}fzH z{IFc`li2#oTL1ZLeRbA<)3rDQsxZ9u6=eK>aV_+M@476~cde&?d1-Yx!FYxPJ?mS# z!XM;7JSJ_%f>*wNzS_2*ESuTdA*+0&1J#{0GEgD|?U^K3SZ{qw+4`iNLS;B3PT&_t>8SFp6 zizv#($`TeS2I5+_n|anl3Ck6K!=`#r8X5(XTIw9QknSAt^?F2GKfw!i?)*GHC_Lh(l?Bu*9%exF+pl*G2$*^~) zp?*)g;g^s;uuv8bS=i)2ty2nfjo;D3P3glEM?#%3RkDwuk`no=Smx9~kZtIPzvMH+ z!j&qvmF0Z_YmyR_NDFtZH%#UA@7?=jpk<9ldwal1cz-ymDX>xH!a%Bd@Kx+1V%Axa zw{!KV6AsxR{T9-8Nv-FWDnemg6}pLMO*Tv)l?0J{+quvC1nS~KRiYttEj7x58Pg_G z^%O#m@eYD86u#;fRiK9bQUv2zJ(-qXm|uv4;_=FouuHnCH8WPU`8)wDf;l)lwBl}U zN7T{7edv|&-mcIPB0Ur*YB!&uJyuPvT{;%x*Os+sp{KTTGtq@g+v@ zmQZ$Yb2V#H$z!kA7epab4;PRMlb}DTz!!bG8jdoTUp^kdx+=!H! z_Gyx!mz)#h2G6pxPEHsl=pa@fB~|bv;(TIMNA$vR(dtmlrE>HQ%%FMV*psR8 zkdf!)r`2Y!4}yz9jj*wCiE-1Z6}&ox2)XjYr1SzdD6R6%;1!7t0hN|oLDZ7(fuYS3 znZgsGxQU8XM3Ds@##B?;bj)wYr}@`s5}Y}NC3z_$jap$MKoAvlfp zdb}<@0%fNs8rU_r^kvr)AgKQ7g<=-Qfef& zvbOSPg`ZW-^%Ez4aNh{C)0%^nOS-u9F(}HD?VyNF7!73HoT6-Lhq?;WDZz^kr6kE_KH=+AH&mQ?n@EkSz&F>%u0{l-uI&bUes6@@C%T!^+=e9C?i{=4@0@WV#VakC5*_nVezjo^&mpux$@# zUwInoV={OlG;ecCf!>PhVX&71A3Pk!*WdC<6qb#AfVS6^CT`D3Kj6xQ4?RWfafen0 z6#GwNg<~wJ%%ti;Sp6W>Zi_t7Ow&FBEv@%K67%zk@EQ|l>90WvJ(Q7A!j^XEM!<6_ z1Z_nTAoMoOhc&6yz<@j`lGAEJyBu9>iCML7!3*v=-?D5wUTC{@WXCX(JZU3`#vF9n z;YkFd7KZjsN}s;dHI-5!L2OB@3sqoq=O``$TFd05Pc&9RIz=M3c z9%$cvEqi;%B`en~+ush7Ai!1%azeWR5ugu~&8&R{zB~hM)3NIZ1IbHY!SjqWD^^Wy z(78eD7H&p4FLGF7glpENm2+{Jq3&j_A^a%3+|f4bRVK?)Lpa8Zc_e3nP;)i@t*;!U zp$oV?z(4w=Rir}+f;}m%UX>Dhj*`b9fKM2>z~2a+*5>Y=Gz*PNcsPh@Wr2cK2z6)e zB;*#yWuLfn)4mpf=x>D}vY>)u`I&n_D2L)*#q7|$;&9e?B5yTi(_$@{K{@$-8r`zT zq2{E~c&dPnm@H|*vuIjtnsgNS8x`=e0EHMwZ^Z&h7{A`P!@}MqM*QM8nEIH8)5Je z{2{OSov!2Zad1Xb1n@H^tit94hAJ#Kn5|2nHo#OnEl>stBEXMr7hzEVDTk0rd_4xk z(|-4K$whGZ*Ocr`351^J;r5xD{)dD29UN;KRu4uH;X#|xS){guBxhSW+b+|9iXy<2 z7Gq;!sW9mBT+>m)F!@2DFd$m$0U)EHiaKIehrTwT85b(Yi&29foP!4BT@F=^#nr z>f5w!&2EW+L+nj1u%X7J7EkGjUx-730E}7gF3Z|1`bZJlUM81WQC$o07j6Eg8_XiC+_B+j*$_wq{uF!>)Mgi03DzLfx5G$>yL=O2u zEEBvoG_t*!+~dsP(<5wXqreA@2S(>fp3xRL<)sIar+*KG!KTmQH4TD6jmm5lm+}bk z>b*ahLn$GtDHM;yyfFc1L5J8ralZ&w7)S^Hj@H)8z>z{kTkPAHiEU`XV~D*ab+0PL zZ!Z|B-a2SQUSs+(w=ge#ip?!Xfj0_lAd-OOEvVrT@PEtGmkG}~l9A9_v$uq|2x;O6 z>w=uVv2zQNF_2=oV49(gyy?r@T8y5sua~EI`|&`rX=_zVK;T9;cr=UQwZMu`HiD<= zieoIgm0sK|(Rp8Beka0$O3N!p&sUGBhOnPO12le+b7#&r!2h((AoTX>@vi)J&)dg; zlb)^IbU^p&O`SY`!nyd$HirkTBnofzhp3OQ)b|~-cL``PF z+=Xxe3A9@Xgkkd=5%fkBzd=jOB^O=^_48(LIU*jp{cK-uJQ(jt)`?8`yM488&14e6 z^N8Kw?VD>Jw6|{O&-aBU9D%UO<(iuj^nbH2Gk&UQ#3LfO;9uMftlGI`KC6M$*% z{pG%(-Z}%rmhQ7V%ZDWoA}&~8HW$Ey&ELNqP`azogaea5@FrmS;4y6wiPs6N*?zL` zS7!U^zMst2_SgIVl{?e8 zSKd}z!YpGe7;?@NEw3*u&!FaOi8mTGDNwQ+TS8ZB#{Dt-X2hfI8*}Eu|JW&4(71Sk zO=2}QDWqKY+n;uxKlwJn@wI4juXt{^a-V5zS&_xDKYmL4mb82J+XUm4^Lrvh{aAq| z)djBrcu~g6_f$nSeKZ_;o_u3ne3S}YRe`pe4TT(u>M`bl^|?)mFi(&ZVi*B=*- z9R9~nxo3+Pu$V)U0GxJZd-z^ka+AWT!;r9F8hWG+z2dA7lEQYwpTyWb8~(>wEayG^ zfs_%p&DfTZk-j-jqdPe45bft9Im@i|m4Ea*W4%~pr<~?`ad(3`L+@Y0cHtXFYlg|n z&sXO+;>#+QB@U6LvY(CQSl%yc*%DU=zg=J}msu#~ZV;NTa+nIgesJ}dMHw%f8-0#1c7R%;18>wstln5&* z!%O<;UOW`E&XWoS^<^JE2?bpl-vsriRRod}hi20vp#C3X%l(X@Zm54*#s5B>Uqt_j zwEVB;{x7nkOGBJ|TIn2;mda_@4aQ8ux`G}t*=WnX_QYEA8Rt({NSNAH8|Me#ep#8j zC?osEF9(Bj2ai~4vT44pvSzD2*qw>$eZF6}uF>2*dyg%nOTDOHk=Ysg`SZM8`1ta9 z<*iu}Za)9}@c%|yl0w+&93@s;QV1*heM_{VRHq@QckD64&?@t2ngX>lr}-zJYV+?; zbgm~~^gm~QhEguCM#mWzFy*xfrfzRc7q>qZIlVRdVI=v&XI_;@4?bDc_sG(&3BTDO zdFB3$y^+56P9!;a6w##>{Ew^Tkn1GOu7*askSb@w%Yth==bcX7kk*TH@7N-@CT5j$ z(R|gBkr-l0r1%}7thFo*P&frS=fpWN?jW@Xs!AnW(L2hBOXEjr_$w1WyQpUE=Y zVilb&D6ba;zb5QnkK59raY1?chxn z+oN8UcU^Yl`yQ3{E0HFHrd?VWrjp~;ebnq~>30?YI>*Im3h2B&#{jf*MVR=Vdy>18 zCxb59rs5tHs?$%+_-EO9jpoUqrG8S@yg<{QPfb(!$z}x29gxB5%+AYBgP_3DB1x znObPYxQNuOnHBGS5gE0c~mfhL3D8D$;tZGF(l$Xw{YuS`OdniU-Bl7c8MM(kf5vwfH7kvBT=rz9QGGjF z-b=_#2F>{WbJ%0&95K55$XS~>1@!WWC6H-*bz=an;bJx!^y>>E^*6q3z8ZZy-}ItC z+4d1odJ5>Ut&$3rKxuNFI8a(kiz+X|Y%AC=D;fKl`lPRD< zhhZ8-Q#UC?FI0zK4PN@iME>W1d`67C)N zDWFGwH_thO`^tc#P24Ak+pYBrszX80FF}VIE}+Ba(AB68CxI4j9^;^=F^@^0C!2>L z=(EDjLlE>d<}nUhxOoV3JU;W7-tqX%V|vHK%wt-|<1-Ioj>l&n;MCJN9%>$7(|n-$ z9gp8Uis*cx`5X^351vg=aXdcr0Gs9mjXB;F^AO^A0_GvFHQDj_%>!(jAM}Ld@tFtM z^fZo#=@4w14>X_SVdeog%>&IT<-FzKLdJ%casFvIHaP3%*f6KN>GPpwK3NMwsz;W; z*rM(;biFmLS_liTwBuo_eYFa*TXZjHi9N#QTrq6%7(I zV)!fvbH^fAw^(p`kkd`2&&4i_!2-WMJGI`MeC|Ctx7Tl>Antj(0lECRVX?gSj98gQ z9LK%bZ>;0!RNR6Y#Bb@S{aZ4~k7Sw*3L=?O%Q)3tW7$Jn?q11lI91>pyztF(danNd z9=)-So?9<_5t`)W9vTd2wG;_iRIyumjgL}v&*9I<3OR$E)~2yuj@X~5)`wzUT23Gp zT+<22H3Mxtj124kgDkb_`=B{j9~e}onO=UB+Bh(>T|OHac=Te(>ena(nO)s6u4uw7cUVxiXIoy_ z9cp&f2CF-3BqYFBFy{{;!5H`fBwPl55Q!y^ffGnr*AWKtaxw)8CZTjaAD z>>YEUeAIj;M*0`L@)2%1%bLl;#_O5~luzRH)+B-QF|_Mh)s@jR5mX}v$PDj2dzH?0 zE_9~j-ZprBPY>&#*`0{T;moCJQxL(P`y+^CVD|-^`f)_bUkpq}#2oQ7ZjzYDjphX) zlwfY6e;rP=bYvoB^cc(j2TCX^I3VoK6)G`mOV#=O^MOH4m)_+^mQRDKuc&*_zyWnQ zcDSJRR6g8h2TN7MRC%~%e%dfOlhl!G&0XC*+(cvTd;LoMxOaRQ2_~{>k&Gm9Iyn&| zLv2YTSH=cgB#YkLaNy5AkU)2-Rx;jYNt5s zt=DE)by_c(u3Y(zt0!}~bQh`8q=&r(PV_CV+nDe3%;ZWn;Ar2XLpan}>n-Z%ua^pT z&;A`RCwDzlmo?h5Dh58g?sw+I>C(Q;6&^wMgoqZpW;)GXabKr$yWVkqgM@8A1|<8v zmYN^&xL$E+tna+`eA;lH1vK^s>lbEkP@@&QTgTNgbfSLsj`m70PE4$VDb(nD?cB-e zI2aYk@!fdgBqPY4=-BK&axmO3DHf)XTycP+X!$h9GN%e>W7CGPOj&Q`N{aVd%lweM zrIjYk4e2!XKAqsT=4sU%VG3KJ-w;JS)JWXz>g%s(iBMlsNlq?9FP_+B_#CF-kyLl$ zbf}_XJfW^_X+(?s3icBCO#7`KTACJ2fryw_sKosFwpbagGNqsl_lr!Uk~Yyg*)hfL zk>~s>b)v|-2FP^^Fa;X2ZkdLjJPBohDMTdOhCvw|oAFo~%9?d79^|F_NGXc-D?YjqJT36;3{3-xjRMT|*M233A0k>l!w zF$v00#m^*C{)px?ap;xP#X-Nxrhd`tpC^LY}FNg!x8 zpC?T)2?Tw?U2zJN5J7_{@tA}Nn%|RnOaejI>U&LP5+Z2uBp#EX445Z@puv-POaeg* zcoL6EP=?*ELYM@C22Yw`5|jb;BoK6Bn$`r9ZjLVvm?!a=#9JCBGl{n}U`(32G+<2P zEe)6_@t8ERGzce7HQX<}(W zJ&DVtk!VhFfjR%pqARDnV9C%jIEfr;%yjcF5*M{<6={IB*)lOWc&Vlxhb@SLe_`P* zbGvGbZ&K%ncPhb-7dEi4dJLzOqQ9Q8YCrbtlx98j*N^KT+=cym^6lr2=&wUzhf^#o z_E0IxzpUC%3W&jV=esuRAxEW4>)_Xm`VUgPbN+GrIsTS2wBvq%VvvELIYm*%VQ9MZ zEm1U4m)0>*G%nsbMi?3tJP*w$g9kL^RuKRXXnyYr0PuiD-X8%EXke}Y9?(Fa4Zs5$ z6g;3&MZp6aQxrU)DMrB~Xi)Ier}CrV|8uGQ^WZz?d1U_Q)Jk*YvKFpH;GLj`%Xn*jieC&N>A3@eeI=~=o; z*{k3>RhD|NG_UlEQaraHFJUP7n@Z&}Zhc2p@7tM}%t#%GWsEGpeES*|PIg$7yYLB> zi+L5){LlZe`x@?e;o?QAXm!S_C9pk#D6IC;rJ9D})aGl1N|WTsoaARqGGa=wu#As{voF;q6x`ploe@57!h@I81F61%F4ytb4BXyzJ{s5 zrGpF_1rBECm#sjeu&>Nrk@f|gX<;g?=6;b3EDC&i%i6_@;C&*vwt?5J4n~}Ulh!M% zaEMYivK)RH5+(&vK9n%y`$f(lOql8W!+SoEFo+WVp@czMKA141EFVZ1QkD-U49fDM zgh5&QK9DddOEi`+q%1-b24(pHV;Dq1877c0q%0W2kg{M5<4+irr5t4#l;r`&FoA?2 zJjNIXJT68V#-A{R#~8za$6SU9Bn)^A+c01l@OUoDFoA>tk4rIzAv}JKGK@cAz+*1M zAj)!-VS)(*9%Bpx9-|BsOc?N(j4}-2F(yf&2}5{{NphNmAv{JUDLi3~j^t-O%7r^`-*j=D8>13!eY)^v*uwr-J~7eM&r%xe=GSxV&yH!D zy(@svt{6J7N8O?sjY+}AUD=kwhxcd1<7;+>7G0sH21SUMN^9nB9O`tq#dxf3{H~ym z{Jxwz+FQ+FRo5{F3Jg33QXQlMdT2@U7rI=+-af(iEobg)A{4rxsOZ_sOb@B|ShER! ze@)DoCWSMsl`+Cz!-8nfM%xz`B?d6tQY;|a9dEM!JX&f{`S*(W%-n@YG`mf*6i&dI z;tkG+pw1=0TC*c02;Op$0X zHDVLzT^KhSOpTPQK)B;wbVbVVX%^#qMUC8zw1Tm{5m>ZM@5`m?Ib)F!trDh2@CkYU z+0C}Zr1&LehfiVA65p-TRJ3Gtt$qblBkZW1Etp6o+6NPfL@UP<$>8)Cj2JT93Pwu| zJL()l%=1Eq(mBQDF5X5d5exm&^e*I>9{b(0wOst_yH(!xgj)0PgS{JT^ey~5sassA z*S?#(=_oUEcKr)2t*!7uM(%G z#Y3NQM{OLv@wLnNarC%a^9Lw;yzy(TarE%LR(r?MGnQ+Oqd#`=n>kqS0X=DM5SDvD zuem!Jau4W}v!c-41A6j?jenrI2lS!Z-j-6tr@p1k`OFb6|Vd#+~@hoQ#}t#r)P^~53<$v=Az%)y{jXGi=KR;6s#0Q53*&riUE3RJK#O$zLonk>#R?$iN&y^m0HyU=E5tG*Z)ayEcZN;o`jqIE$hO({V*} z59q;k9-!#KbmWoT19~u>6Ikvs)4_5N=)rWb+yi)weH=ZQ4wic)Z=R1IqPfRR=W02E9!zH(J(!LuntMPGmU(U*Jy>Ss{w54Pzh(ZD ziypB|U=GhRfjJm@5Dzd1LqCmWM&aIK=)p3}K|JG@>5S$cvrJ$PhJHHBtlb5<$1D?< zv=l=>t>N=o=ASbBX)Np1O2Gn5P@`V%*=7&<&iFy2? zL<_v|;@NzeI1$#@x5yNDw{sN;8}gK;;=;&M`>f@F=mtNzD)*cpV;7LSV47jm`4d*L>#;84EB-Vi?82wO!0^%DM?jl;Fy`q zQT-oR$;2H^`wdyt<_0mlLls!v8}AK%VKMSUC`hnqz#t=jwr*DxdBY~DHhU^V-1m!J zBu$Z;-{jhVb_R!Tkkn!}#LiT3C=N4x1NI%(8$dpC78lwGlfYHo!O;|OHhUw?RR3{c z6>NdTO;r4b9ZO&mn)%_z%$AGCtn zw>{GE4dNtNDMA~i%TmRf(Ndt3Fv@uXn;j?xOyX4F@KzjF3Um^ZWrt;$XesVxFD7Zu zVxpx$CqV_X=9U5`(JZMCdjPBy_Z@xASo@BlrMSDToKEF@d>PUf=^Hiem)_k80Qm| z;yfRppcIijJ|U&x=M$7-oKH}Sjr@EAKv@w4g zm-e_naixv<6DI9(f8t7e5c4NY+Aqfa36r)7>Q9)odH%$eb_wcFn6yuf`x95%s6S!S z=JO{^+W*C+0v4-LAO1rYr@3Iv#(t1vofgXIZk#=IGmY9Da3;?$*11}u{^u`A%I0LL zp|Ebn(vA~!l9{y(4oKOu&9d%Wiid&O;a*inwD-w{O$V5jxrzZt7>D801Ita0F)R3p-Sh=g~FnE}aGOwxm8@N6gEBVe6z@Qp8%2kqhODPH}NX?g@c_FyS3W46I*eW>Df zSyeIVv$J8*WDY*U?>-P`CrN9_6=ON?#upDP@nf&H?5e-H3qJY~PQ|gL8+4gF6V$E3 z=p-XZc4?{vtROIpXU{iLRXXRb$gg9>`{+7VM>WE`;#*G4rbYizg@;*KnG}&kV7<}Z z;03}0$@REBpffN>4bVNcIorS6xl`)&qchwXW53|Vf zk!6xRTJ9_ipDfxMm`+>Q z>rs@bl(B0^(UrMk1eKc!rcsaK*I^boO%ad44p>1LO#d*L#UQT~#CKiP#vHwmLe1uDb+etn8p2xQrvV6#b$w)g6iyTVl4xIE;MYs6q?z}1Z)#PIp_Y%A zVuDauDaHwGKBLh)-G zArzmsF+vGw8wj<9U)va=__Pg#`kr6gTtb1(V%p{ss#}q#ZH!PnZF33L3N|Z9sHkym zV}!cGD+Sk~z-D>c#s~#AJFabnP_O}=La46#32om@XxW*-(>6w^k1ZB3i*aqkVgZEO zJ7uxB=~~LSSOB5!lklvNF&n|dmBVN?r@nkjw@qlz1iB7WPrgXAP_SWzHBE#Z+_7%q zq<$N8tR{6$pzk2OUC3*j@HKsqw#n3^JM;^u_N;_<9=PpJm;tY0h@1_lw0(pg-l5+q z*mFa=R#@j`QtyG=@PrxgwG5%@CZzErwBsqXZv~wntYItAeGt}mLmF38n>!3l4q@H&X&h2V9uCij7$bw0IyJGBYN6T{^0GxTq< z8SwWIg?55IAZPwI+y}&fbP@YidWT#&Z>zBz0A3$=awk++KTCKc7h0iH+i}<(0Dl)9 z`p{S}bW%4__$2_e(Wka@h2CNCX29QxMtZqZ`iXFfA*7Kmv>iJ276TK*)NU@;ljH9w zenkb49tN49s_Oyrgo!+Uc+$3FsYf2HFPJnL_aKN{*Es98i^Ug*}+lf@8CI% zUFW<#$!QvT(kx>h;m&r-LtBi|!Isd?I!`)7g(fZB)$}|frd~0(>-Fsp z?8ts|`}NO-M+{<;MdR#Bkyg()Nj{A1-^ei*h<5IHd!;JtDy?evFFnwoCxto$x zuCmqEa%Zk(nxCDMBxju`zuL=m|97Azx=eIOd76E2h@Ae!IU zSKIElT%MZiwkHIuC3x`YNx42QpvTFN28=vC3O?G=Lx~8DW80wT_^FTXR7y{&!7Y(Gs&O?a{WTM_rasXrtv;_^x5gW z4|}vw?}J=tPUn4)>p9a{AK2=2*5{O)2-a6H)XQ;WW;F%3sPuQH7Z9Fv-nentu}KX} z`T|$4y)L8RDhfO2(`TjpcJ6@pIMNN|7HF0^uhxeK;VH8G0&04aGIc;@F{Ap>8Q%?y zaU%}8f%$3l>M`Gb(>S>7c_SlxOc>+ z0Pkz`J#~JFJFDM%pG}3gO-?+VG4#G&#E;|t!^pEIVQro_ZGRk}LYV%IFDdZHX}fQJ zN3~M+eCbC%qGfjfyQ6`lZ;$42ZW{$3K2XGVL<1miQ|O4%LcLFZBuQuhhK?4p`@eYN z<4G!EXa8~IE6PO$Sjb5qO_E{On&u(9gWoLGtP+RY#}6l|*KjpeXq|;5>FBg|o+e3m zh1c1*nPjH?WD&golJ{<>HiHzM{YD?&r7*z$P5Hi4*q)(bd@2BaFJBd%! z8*dWfpQtx%5?~oZs5Dh?m>i0%rlFFc-nepret~c*O_wF%RElX7r>QT&IT#w?_~j7e z?jlf!58K`+>WynkQ+@R#NfPwck0j}Zps#*7NiQb(DzDChdgC;N4D?c)f``w9JW4MZ z3-{$z77V4vsx&FnMvk1&ms`MMv5tA2F|TqB%^PZ2wACbj6Tla5l^8s+M+(9o67?ePOiKJb#D z6uc|~%4fclgu8<*OHzRn9#)6Eygb})XBxX6?>6Rp@=^4%WP?O$NlDwhJ0?Abz0|j{ zczACCdBd(-MRjEGT^KWq$OH$Eja>|XLe*o#dS<0cI`w_uiC;^#nqT50vUV^=+mztl zLNhpXpK6(#Jz6+>sIObP%*~PkD}|bx8o6#KGw=u_-q0T3-y*gz+O??A^pof2%P##g zIanXx-52TW%V_RilN7*9-*)n6Vn9S)ldu^7%Du{HK z-YU1K=GLm3ujMpKh`m*wlx;m!{{z&cGj#JAw9fLSF_qgWyT2yuMNx~}XZz)?pw&B_ zIA?zH*FzE7KblAOF>=|8_2R%5Gm# zZpp*f8Q~8#5H{`oTV^sjh_tglt4H5*?JJ3^S)yWdb^elceIy9AB|-ui0Vrfk!WpN(h2 zl_{ZZ61)DEAeNJbGKpQ23NNfCQ`0qhCR2h;RU?~^U4L7U$&#PUuD@g^lYwSi4v$mP&apjmuljNt`q{{Tg2&%)u_i?#Kn#sjasAZUV?w( z%k1A9TC^`rT-1Q1aFYDnKI(rH)r^}Z#3~(_eqMeTRc8V1-akS~SER14T@X_#1OGZ( z#O=xTCA$8G=7$RwGw!*cg1_9nvqjof5vFhNa0LE%G-J>2rZHQ>zK$0ya}k4oJ$7_m z=k_y-cajKMP4k&AbWD%ojBfOK{kdHIhfsxSNx<~e)z*_Xn^M$YA#(5*_+Df9+;`CQ$@wi1@1IQn%?MRbe2oN-vdz)_a|%4YyU{D{yV5>`)hIaD~)gT zk)__a+_^@(GO&&LF5m}6MOU)aY+&?XL|v~xm#hB}s=rX?f1bKVrGLNq{CQOWlFa`+ zb@l#s^BH?wFt|=&DR}QNX1R*<&B6g%tiu|a;#tX8S2f?TeD5fkJ?ItoEN~UoJrQ>& z_~^6U2E;q|N391!8ElV;3W-x;1FI62_YlEv`l1 z*nf0JcCNpL|D73eJ(9GxS8{Pm;?ljlNa4eb^7JLAn?-6KosY^?ZVxqJHrL`k*uNQ- z_#J!uUc|$vKk}`=h-RY-p}KsP=6ZR;^DOeT@LorwD-@Xu03JCO@uAaEbW6IlNU--Q*MQQB0R6lx1;k$uF;k& z<2D_Vb~UJx3}6(enlf7t{O~F8ye>Q?RQV^XyrV|ggfc4YW-7Fa)pX8bG(Og<`80S5 z@#&vwR>>yUNm6sKyC&Dor?!tt`Pm<))!&oq%Qyc7cyXK47vpM2@vOXOgv{gk=AZ~O zcNM>(?ZhqmMxO%D%Vmyf(Xia<<_#>?b&JcsN40-5zt~SU?7}ZjlAwJGymqs`8TL5Z-=VLs*JGIF{K&Syt8`Qz|j+Xd>G9nP0y=-5#04UKxz5^45oMk&Ll zOuuaNPk^U44b5eWgP5;&ocR=Z2|{Tu=l+B^`b+31!AtnlDx3tb{ZFfK3cS~UT7?28 zVdVN}RXD{Y^!^nU3Ydh_pH?Bihf%Bk6%`72n04yEph7_pOK$nIDxB--l^SJQKgv{sw#%Q#R?vT3W4R=Ouqi9@DDp))mRahCDUa@URhVp<8PA1zZ{cplA20b(F2|4E_020=5IE>`o*iTZjWW2OG z6*x2^TPAtRO8{i(GtP3_SxL{LC87F_hp6qr;o!iqlUKWbVeWQabf}nbNT&ILW2c#OOey`p7-#r>H|#XBZ=3vOy(m=!UvelBZ=Mzm@G(=*V8arfFwV83TLtaNv^P`W3m8A zergfUWI>X=o|egcBuPFyJ(C4U;x!GECy^x8Ss0W5+jiGJJ(DNw?xCP33o?1a?k;KZ zd9omr|8~0z88sYj5;(4Ogp5h<8vFUyAzDgCn1-^SPa-kiBlOWO(`7>YP4?xs<|r?{?-IlFpOpDbnW;{Y~O8! zsbLcMdaMFrE@$c_;Dm;$own<*7f~z5`V(Ouf-`0a3zJwiZI3wt7Qv}uHkQgy(`RkJ z5iw7A7_aH>FwRxw{FC};!gyu)g$obUKHXJ`)iPLvr-ljN%x$tyo=vJ}P_~)yFt4Y( zk% zSe5b&KQ+v2>@sI+7@M|6zbK($!jWx{&@f)l6WSP4!+7!Tj3$TCEAeFt4fB<&(7V5l zsaIDzMOq38qsM>GEKKe6cNAVvZ%dol%vmrzm)3Tr3ah;&89`#5(+NTHSguhTE&#Mt!K6eACFYkkSPhG zoHHk9Uwd64X-PgOPHk}e4B8v8%hg%XPA|b1t~B|!39kN(t-GnI!wV7~k}U4uj*iTj zyJE*8O+!We7R`Tn4*zVF=LQE8XmmR*2^G%_+uXT}6u&I&suIhqz}Vs}eY5-kZHpZK z)ismWP$KCoQAT&xv8Vy0lLi+k)-6;=IsDIV?G*NGjo;vOw2twe4AJqKrG>3os@-GFE8{p6%{ zwZk=yV7gxGH@ZUWW@7K|_%*T@UvKMNCRp zs@4NS@}zWm!5LF9U3w`;7?aZVFis_kDwwVsjWec`(xrFBDsob~jN0Dq`av*V2~V=% zI4O`Wy(=qCCZ%g*scp1ix-L2Ihx64$y23VRU!xAaoXelC1f2!awK^2ObR_^GH7BJ@ zZ;PgpV7gw5XU?6Ju3E8{4VshE^*eL|1=9uR0^Fo@y*_t+-lTNZ!exzMy5PvygqxJE z%d$&nF$K~URiz$5os_Nw^&aBnbSd>B&ExTOU9Ls->%^BX8&_1n0_kc;^~;|wFHFDu z>AI|i>X$!V$2VD{6NW>GI;)-FUhl^6ZY6t`ymEyPHVYKcJ5!m@ZgOxOT@& z*F&D&@zRwl%eA|Sbd6^{8+F1e0CmK)-A-|+pXWpK#!O4_?3*tZ|0|L z&DvfcMEVadZPdmmgy()^54sfHW zo?b_GMfkQ2X=Qrmi47jlRKAJGI}&@kSK8{>u&b-UP?_k{+qKt+cHNTet75ylv<;fx z{oK{S>2n|jy^5k{40jNAyH`tZ+XXW8imFP1{?NW767`2xH7B&CS5)<>zBq$C{fbtF z6D1=Sx#z&1o&XMS>54RXwAWj@X8jiClW3^5zBK-*Aqt*CFJ_=mH)%t`6JXUrpPslm z)01)dfOM~Zh|7^E!@nUl@bvb7H#JCgz5a^SK;q9w{ky55mD!uP{uQj@PmOQOjZ|lZ z1}KwtY+mzdz<5}Xbl`Y2s0JE@9$i=EU$hqX8ycGR8<9(>>>N8n$}QkD^-3nv9<1q7 z%xL(wXnnOqTtdqxjAXDBa%sRN8E_h-0heS-7!B5mxLxe`I*4o=h-dH2hU=h&X$2Km zuRA97ro=Y-4`eHYC?o-H>~_R%EP5n|DFo@BTu3m*6!Ima5SXjw!4_CHxO2tix)By? zY_3F9u0ORTv>|gvD4!U02zDfVl=reeL>s5PO=`U^g-3Z6u3j<9U(y=aE0^-fip`_^ z-Xl@yT*D42f`GVl_3+L%vp&?$Gmm8S>0V$SFjv$(YWd|2<`EP13G$x8VVLVVuxnmj zKULlW90nTbp;iW@JciMr2DP#iiV2&LtH3VB1kB1Rx)fOjoN~^bq0xb+A=lA&4Q}K& zNgPQ|@aH8#@S>j{^0I_semb>abW}cj=)GC0;p;xtxzsV7QH&$mwSVwI{P}h5I%f8D z3lc_f@S@ro*sWa6I#mVl?y#bJzht_F7+M_8-|(eKHm2;Rng8M0R^?ulXLem6!RVX1O&;cJZJgnit?iYh_BX}-M=(alynU=?UDH75< zMav|&>UCa5cGHh`9fy}-YKBS&7O}DlREX;wlBi?wB{KYQj+vXYB z*;N`%@S%(6qhm);Y`J^(-V9lbS)@wE7`6F{T|?#HcTt@hahWan4Eyc!u_wseZ!y}7 zMLawcob%zM9eKl}B4SsLE;}xw8YxP?pi6R))30a8zWf7UoMY@#YD&3tO?|Z(?b<?3lSU9S=R7D7i~{+{z~7BHnqZ=rs3YlE22Uf{@WexWC+{q z38{pNRcxW#YO4xUirROYM|{KO0~l&=g@_nqH#)+wEk=NZ*{n{hv6ePxlJlm^?AOU@_XPjDamoBtiAWn8iXiBDQ&&+Ipv7H*^}$@ zV9?bEa=LePj1H&4A8JxrO!p};#5pc}Ls2(^K~`F!%<^N)0umw8w*MU@BoUBuzU(0> zSLbCfIj)eGJ*bllFXjJl380Z zt6;gDxzTfrQD3fGl4Zc^b2*cIMgDa2j20AJ3`OGXIJo4i`YsqaLV5fe7all9Y5W>h z6kM2_zx6mc@MYPPB%ce6az=|TIf6u&LXD5Q3yDSUuFpxTyujmn+L9M zQ#51_z*%L?l|?fL;4}@EI6>wRa2YubPFUs;a4}I%)(htVxMaIJI+{5EN6y}-zUdVL zZip2a&dnTvvkYu-hRgvt;ugg{XyyPM-b&69%bfO)rQFN`IE!z5c2z*;0NjvoW(k%# z0C%o)$ypTK>9cdU9bSTgBRC}5Xkg$7u4--aP4BqiNa3?0QE=oKUF#Tg3>-CuMdyNB z>Gp&UWyQb|Rp7r+aJc+-jaNAsIJ~=zBa~J9N6QpT(+Vgn7aX(em0}AD&Z1^ZB$O2c zXQdemnFDYu)-6auGlzhqy{cT2nbUxP3v&yoz%mEmiq;vV*wq0zQW?P-%^ZMZy!|c= z$sB-VbR3SD07upf*Vv*6;AkGZozctzIQ*-Wdl)!oIeUc*mN^7m-=S#890JbF{U{F{ z$@T;WuI6iHErTWF;A|TYX<*=(EtN~oMmb^Nwx%7hM!}Ib6RflMalr-pZ7Ak~yLjiK zb6^9KIRHmnE}@QsBU-hpTghSIj4wQJhRh-0GV*Mlp{!hRf$(1#xWSZCC@W+Rz!h1Y zfXo57IOPQz+{^(uT4toK(|Wy2ow+M?af805}h@A1EsZ4(#VH296Y0h-D7If&D<{5O55zp9ye?{Xpgb z9C+h4G;^3YraaRIaNvza6W|bU)X48fz=1c?mrG#az#HkL2mlA(xChG|*Bdps;0ABC zIgHeDl!ji#I>1-DzA2Psyhs|2=8PqBnnLTM8TF49>w5=)?-eZ>$abce^Vsc#njE9g zDe}=zmPgDZtSlwKepp=|r`)Yh+}N?66kkG@Ojn_0Uf0cN>P50sy7vcIU!Ua=UI=e%X0q13?{uu$~={h{1Yo=4VLVxic# zSHhMM2}N%ymcP0&8bY0oQUpFQAyiAuT-)>`WGs}1>kdx}8cIF7d?q)Pu6-m84W-e} zz+<7*SD&V0q1Z3`i5^%eSln1>D0;)XBq|oFe$lEJG*m@qxk57^ z3oOAkuu$1SY%wepefL8G8mdG;_aYt(RhFW`!a|jH4FrJ7Ae8#PRw_5twpe8>6qpwS z3zcc#O~pbvRi(8u&`^%bv7g1bNFbp+^W=%%?X=wwooZ;NpeHPpdgo&aZm8C-{ZUw` zR(D%udkmq}OCvP4qM=lkbYX=-LX|9)&Ok#sZ^#Qa!$Ot9`iq6~9B!5MKtpNdUN*-< z`5nKZ@UahAK`bhGL-#Z<9>0P!$u}f>oG-YRmC(Q=kbJ z%4Nr|WHgjU^=j9!jReY_r;Zu>A_IL#!yuH#@TfA_8y2edUF9++8p;{eh=pQ<8nIBS z@g)pysLZBbumcEn7Y-QQP}aNsDQGCfWwB5d{=b=WLxCEJSSU~<9JQDbs)8qc2*nlt zZPI;A_(&)^CVa$sP~jt??qkA-P;^xINGN$!_(&+O@R3lkQNTh~d{Fp*i^pKX2af@- zMT8F?^AX|0to~w;(clUnJO(&*pi_?;SLrK^{M~=~>{quC~t<{g;n*ocN*P&4OxiEf- z)hP*Ca}n?_m#jn7GJSK{EsD-cyuqFa=d8PV1@<6OF->`KbqJrz$Tpzcdh**$;;plW_og7d-FgZr&fXdqR3<1J%V z_Cg4*Anuz{^(E5gV2}BqR8&)?-`jH(!spy7grDJ?&OmWaU!H*#r-G7500_rLY@Ya? zgyQUZ?vM^E!)z!HgeRlLvA%hgMtQBiWg!kcABq!Ku?-+-%D;*Aw#Oswis8;h;5Ejg z$3*}XK!eh4JGh^uphpUy35LZu+<-gl7Y@+GMMw4~>_D0+EPw_DrJ~SEp`aKvC@4UK zwJ)P#ErXKi1Z={fAqQtJG%a~?DL90sb;D2c&8r$^zvEG8j!;kxnv432GQD(lE;Nrk z`W}D=prAOg{l})Qf^)8_rTzxmv-S==U!}RjBahcgR@T7-!6Z<3Qwi1M}_%I&$zT8Td~RGaXjsm|8h0!SYClrO$bW*b1aA~IqYGNLT@ zGZ}P5ZI}Mm9m=&n2Ab#yM+uu!^0okLCiFm&5wM33iT&#$VC|QcH>C#V0)2~5C z&^P6q!U%fGJ2E=Lx-9_COY$IgY=r9ESeA3)mNCOrfk<#l=(ch>M9~cTFG&Xh97$?cwf2CIqAbo(<64c@dU1-Hx zONoYUG_lTPlXv?i_xe}(o+rQvU411YI)Z-fJ6hEM($>I6s5;1zr9_c_Ejq%wsh{C{ z-f8WS1U5p0HXptwK_j7;hK^8=SnLU%TRKi0X%l6#={YQNQ$M|Lr8zdj`NC5oZNA3# zhXi!Q9y>)GjIhpMNkvD{UD{|lEP8$?4IAOZ5<_nd_M_ zV&DE~bVRXNz9o!scRz}a*mF$X$WF%TLV_ha!nq`KA&jVa*)ETcDEitw!YjWNj)&L? zjiC&qW9oOI-HeWKexGIuBQnc;7}$u@cJRF%5$%D|*a+J^I&moD?rg`S=!nusKU%&| zD~)trk%5hyMnuZZqzl??v3e{UFXM3qIBIT-qOt#dvMXPGi5hcYU z8NM2&ASrAFND4-Pq_7d{AgSc52C5$LjUUJe=oA$di@0DSgb^)#B7_kY{33)ADf}Yj z$rckKPqthU@??vNa6-122zj#QijXH;OoS7%#YD)H?Y|>JkS(20gdkfwzX(CL*8C#m z$rcmgglsVp@??vNa6-122zj#QijXH;OoWJR$5KPaLI?#TtofXOsss;;D2#-1h6;Xb zb7+9G<=k1;7tA3>#XHY4K)Nzjv6@GT1)syQaq!(-c2Bfo-=tgBG;fNy7MZB)^1j+e;HX(H@M->fd_vx@?a1JK|; zIXuX)p?VDzST&vmg%~?b*R3edvSj2MdK9fwa`7%OPqRK;VOhb%+NZ zjKOW{9?ErWRbSksjPD&|Xymt3ACJmq`+FbryWKz-4vq#gT4l}!KGp}PAqG`XGQRMX z?NeCcxH{j!;t*!S| zT%lcHz=^zJV(DOt={EzrDjr{#WxhNd(KT!U^EQ;1zEn)lSPLtGYT8!>IVYAu*nz9!GRf27|1dd1~kY?nKBtqKn9a>0%TJsa}SU; zX;&z=Ha8HNP??f-N*Os#PLO6CRHh=oiHKGPxh{js!1_muC&4;}q?y63Or)D0#k-&w z(rgTsp$8RMf^|WfvC1He(^@NaEX`DIW#pT@7*H7`%}^N)NHbIh(u`FGq4~j>Jy@FY zP#H%^GZCwd;AGCaNW*fSIci5lD}zi1(rgNqxesZ!46Jp8G&4IMi?P1XDuy(}Vy#+9 zfVI?RINJiN3^&b4Wso!vrW8V&8QjW1n*THWr@^Wvoc~NHOvUv4H-S}UGXIgn&_BTc z+oYoD_%Ge$MHj|@C=Bo)S<7mb*nd#9BarO@7!xd2F`HyyUpKaCikMq5%5cTZGUU{87V~c$ z4TsXl5=OsQblzOGjNxX;IUT3uN)9e4ww4Gb2RrP^AM2T$9WbomIaY~pZjfMqpKC6W zFOTdy+8K^({otDhHCma0$41_A*9Ef zVkubn;mn#@hJ1~p283j0C2@)%B&ndu2||(z)YOrX&+d#yA|d+@g+fTe90ze^xq-9$ zCVR(IE%Lg$Nqdlxlp_}%A*80Rq7#H1dY?@e-P+9_l!3up38 z_V6u~kq{DBFgmi#<;X?+(5Rf2t|DP5=m#Vuv!~m&0z!tlt*?NPx`R$(u;+q<+(Fhn zEyYqs+0bluLv;utvqk)DlN+t zt3$|(7j4v$kechO)FEV?q6BRu|8C%DqqN7sJFV7{c+;XRrPh~6A`}BPieO_{Lo0-k z3Q^7#5OS!y%}@hEmi1=QA!J$a{0az(_i;0HhLC1~4UQ0!ac{9H>_?C@v}!th`IrUp zj@}eJCJVfyj|4{m@8~1>MhNdbA*2WJt|Uu|^?hzJgfxTQD|BFhcMy^ZyhB3LfOim* z0lb5dOyHe5ge0~#DME)rT{3GI6L<&PETr9Y7Wp#3f1m1%E}cT4I>ke$2&m2i-qHUe zsw2EZ&Kl6piqC`ZE|vHEYpG5J-rYy2j_?ks4!qO&cd3pv5SZ|Fnx%B0ItzH`1XPb{ za?|*CsgCfj6{yYx-bK2tX9Dm38ma^DN`UI{b%JBETI;K*z`MVg>UiK?1yCJM%t$Zq z><;>$pt|{3ET`20&%cW;<-Cd>PG9Xx&ngHu+YDFGxrZX)5cjrG`RZ5Eu%vaZU7#9n z3a=?uw6j;R#`H?_-nWY*uPXtUxWkGr!nHaKgL4@S+xDX}vJ%2qM1`ALBQGkkSG10L zMlc>Uo>gB(O_&o$Wk zqcXDZJha4mVJN&7_3>eFu!CVKUl<^pq6Tg9!caQ$VidgTFx;t#L_=Q905{0bxrj%i z>B3bkMEjIsrQlmI%<=gcT-(9*a@Va@a44+x2}u6J0NLp_Xu~ZeyoRNb3KyFYjop!| zg}jdSDZ@077qQ^7cA!p|1;Z-fg)A`UKyO`BB$_AOv_mvFP}cYaSa0`7c5hkxsLLfj zKCJ%GE;v=D^u8l+_eb{DS^LztD8g%BPMec#Xb`RSv5hP8`WLJ`5Unt86fW-|+NTVo z!wXGKiMha0||+)=k~CYi~bsSVb9J@i*Lp zz7n~qTVs2>G@Q^HQ;aX`6d~`YZAfx@?$E}7XzK8u8f-b(k6(!+(LOj#H)w-745RNb zOu)l1STR^IjQtMok|7%06iCD2Hot+mynMM|dv|e4_PwxdIEK(a*w*A6bV!X&9`eOc>VM4fobC4BFC! z)e`DKS(evooZ*}U(M~r@K{U_zf#DEMBRyEp6rz37ux;?-6b$nVNg%?o!e@4EuvMto z5v#?7Xd25v9ETg6puH88Rr>W$maut05-$qTJ~|9;9L%A|_5N`5*FTlQ$qI(a79+1| zwZ0u%2+^GFN4-u#G}sFqkyEbq<1`Kloqog(7Du(_T zL>n34ba9OMZ=_V7B&j5k4um{-9J65m2*Y>@VBH~4kz8P z`YQXXXUEqG*ESejZC8D473$?mGrxc1T*&Wte2o5Qi`gBKVwJyVZ?z1?@*V777SJ~{)stCm>)+fR#GgzRmjBPWC(9R zc++#^Eh+pH(_OfL1r?KDY)M8dHfdt)@8JcUM~*#*m1#mI2DcLM()s;lwgyYs#Ike! z%%EZ^y1vN*6LWVz0Tnx2Rmy;h?O6?PbMsHEwWn1YCPr_4K|?DhI5BHI6(Ulx?Aui| zsMt_Cr;)RO&3d(QY>S$G-rd=p=OO)SDnaXTL3Pf7>u|%nj~B_pb+eRJiUh1EF|Wj$ zb46rl>%%2%>xjn>c|pHfoWCwEJ6i<)8Sbj!XMOJyYkha}!jp7L2Nm{;D{a*CKd0he zs1>JJRH-dyH0(G~;qfDUapoR)Jlu5Tf3D6S1QyA&d_g>dv+oK7fnIzIUl63+d_k<> zKDjM+KC}D!8kg(`$aifvEr3fNY4|ysX54%lu7JaUjj&xPW6kbsJSsLb5pExK3+(nh z&;OQKzWtQgu^I5sa18-JyL=X?ChCyFO-ONiur(*2UnbwQ0KNzlxqfArf5v+EcuA(+ zUgV1~dqts94nHe`>u`NVaGmWGbJY~~TNJ-zgNKcd9W4+H0$-QPA4JARQI#(U@-%@U zwrQHyd_gD$2h{n3m}ltU;}3#!bNE>UX2J_Hc=#^Ngck(PCf4Vd@q#dhUd?2~O#ZV$ z;5sm}SClssLfIon*wv2DWEs4Ha?xQmH7orI{nZ!9cf|&-+XEL?@bg`+=;>wfj)4^T zIc!x_%VmpvX35MR`RR{G{~vo_9uM`}#(i3~l7y0-qf!b**|S%NnkkNhlr5b|vQ_p< zMakAWQr3@9u^Fp5-Ls$ZME>`0qN=hQ%H~%7&!W?V=4E6120}k-*L>W=G;R|wSE74PT0+mRenv2nu+E4t9z=aj^gjAD_S364;L{pW+Ok*63-2B|ar>en^mI@8Z**8TJEPu& zP}R5OxiWMidAE0~T_2d%_PZ1BdhW<-)391N+Yc_1TrFx-R|d^#1zj!i%=6Q0on^@# zw0ZlMhU*n=ZnE@(BC-7&F7jJx?L*OXR5W63 z>WZZzmrC^CFZkfUk^7#2Yx9CkQdwjLw0^>L3X7z!-%^KGjN*rBifWtX?-`%G8dDjO z-9so1jqq-=@zxR#vI@ED8fzn*PfTdOw?~IJoBI-vtlNt|i>gFQb)JPr>mP|; zF$9dj7URfxF?lS;EgyVOVKIh)Rk6j`P#IcMj2K5`_dn|MvNmGk{+?gSRzkM z9*c2mnj0C5F$AoNEykq>cGzGsmUfdeV#K)ArpA^d#vn>Yj15ouKfq!f0isM|i*d{E zP6}9zL6i!N80*xPp=kzIj7ve3Rm!3eV-RK1z%+<)@X{ax=$I8_3FlTcmJu%&0ipyQ zqZr=~Edd>~Vq6%iOQy=A7)uMETr3z4F^2vqnLWn3b;Wj)>rsq9_&)$0LyR*>WeT8U zR*azw>+psPVk{1#1RX<+BTGZ&`|pp(7(__`9Yc&?zvfN4r4BI$QLa_nJRajsEd~Vd zCWvuFL0S>$7-DSio?ikwX2lpp2|9)tOMobi>W@H-uQwhhH1dqcI3uUY4s^`e_$4r! zfo*(;J2%H;3>)95n+swL8(#r*jBR||o$9O@qm7?gZ-QbBqQqhh8{eHh#<1}fR*OQ6 zQP&-dF^IB_J;oqPI4dB=u<`A%7{kUVjKz4kl3qa%^rH3tNGA%e*=2n^U?i3vVmP|_ zoB=u?a-2~FpRY2ggHJwfrbd)^$J#UwleA%ytyAkKa({Sb=b-RhIi}Khd(cjQ`nS@J3vh=4B@A}(GkqoZJ5 zh=Ox7P3=6zW_5nRsa%?8AdJ(c(pN=xip5IBHeMz)AJl`e!WRgEj1_n0qZnQ(f}=!p zJ=~&cBWqhK(wD+Op~J}D(>v*(glQk{7YYYSfkfatglH$`IHN;~1C4}>e*>D%12ipz zCG7+Z4V=NY3^Y1r&Vhdy&GrLJ(WYA$5}DoOd*GaEOYhKL!utFJFvwOqSh>)Bq}jct zYG|Pfw;`M<@TtKCaCEn3YlFD2o1fjcw6ZA*($jCCfrHqHfktAVfE{piSmtH{3ba>W z=S&!ngg{HyXlWX1=B-hHK!beYYl(0Y!_tseIhIx$y?Z@OXriU%jP|IsVM~LpNMI~2 z!mZvKTiWf=cK7oXiOWq|x*&mvFq-xv;8H0_KmoWZb=@EdzjeS3s2(H$hpu#mEu7i0 z(bu_ihDVpQVccYlW)?EJ(F-f!h2Iq5=KIk^HXkg+(0~MXFwkteQbfq^8NLR2Hgjp9 zPCMq(kUGhXrGYvhVM_x(WjL1B3+jYU;^g za_c~41n`N*fcs;AbOS!gHwJ!m6AnY$5x!6eJF+$VA)IfUGZzD&?J_rYk)WB}fS?ta z+)R#!P0(cE2F(?Npb|7A2to$d@YpiX%P8l+B6G-!K*(wN)R4wMFH(DnqSVcQe^RC8?4 zZ=m`9!-f_+T25cee%tyO@Ue<__Eh_xqUo;9yln%qTH;#6w{*NIMTf%-=#Hw(;Vo1-&ir`lTGQ zgW-e529P#uz7#06S8nUxU&HSZvrHZH)LbmpGN~uKq>#m*c?w`HuXm_YOrE*CNb#06 zhoM$mD`|ik(GFUQpRXlUI@j?4i2Rp%{_rKF#Zjwmjo@4= za6V?_V5fP<%B)m<+mVISOJ9e~E)F#;?bZs|=>KWoNz7;&w!C5^K?SIr!SbwSG8F>$ z-b;({ig|xoe51f_qXp|lZT#u9X}ty8R<=~#TR2;1)NNppH%iXdo)oMAKN~!EW++C5 z(q102lIT-^wRwRxW+ahMAD%*cb%Vc+VH5+)Dp2$JTXD0wk19j6=%Fmy>5f+NjwmKp2Cx z5vrdoNN{sCVnH%|=Q5Yff)o*cXNJreqzK(-)?<)#Afc*aL5duzpPI>n)Y9yHj0LF$ zw~jCd39kG4b#-=3NG+q;8(+Z1fdxtYvBy~!B&ZVejX{dc{zzc51dt;7;fIsK5`wfz zQN)hH5`t8CvjAfWAYH$u;efG(AlZ-HFT_|vkj@#E5Ev{0BylJaGgv~9_Bn+!SwfJ^ z^VcX~EFnnJRSGf;mH-k|qm39WO$w>y^*v#zS^`T5l3p{+Qz4cB(&?&MYZ)v7q|)Kq z>FyvrCZwECt4pA;he48hwxRITAq*0Hi|P>w4}+u_p!^Vo$AqM}`hK|rlu|HAo7Ta| zmk0(aVne8WGrXdm0f`)IEDyqCLW&IOc7t*m6Vk#^nDOAkAW3hPB5!~fv?G?J`u6gX zL3m7-5F{vKjzj9{I?95yq=XlWD@;f#LylqNkWdki1xe3W&6>dyK+-98J;8#c{p9`? zJB%d+3Ds{|ka(N8QH38`FB?K5T!n2|kRmeE+Xxs-2ohAx+Ax*?QsJFx&`bc90Fu41 zAxauCNG)$uRNMkAtwDH9NU+o8F_r)l>~!e6080P~@@xXe5`qLfodCiEmH?7C>~teV z5nu@*i9_!PIw2S&*y%~PG=L=pNeXtl!^nLmq*B=F=Z#8$C4hw5Ok#>mGxOxMm6(Gi>ha% z%!OfPZWSxOKHpc5Wo7r|evA}{6-sW|tq4bdV6#es@4wnB8;n~O!KDsbXpt-{l#cqn zfiFWctqK7fwD;Jo2*dl&u&fAaOCv&3_|V0gVUc=pwfy`bUS1BXl9&0lk}NA*s6Se*7iU@7Or2`)>34kGO8$K9VwEB9uyHFgbV}K+Pe~>C;Qctx(sJ)5-zvx$IVqOnuDCy|3I*TJ4(n zxRpEIA*5yR4*M~y5|0LGNnR62`8~2CRQJzzUo^qid?ZqERtnK$V_i99f_7Z$Ff4zJx^%sj#R8u3h2`MBnY=CR!13Hq;L$uTmanES#trXn;yy8gJ#Y|uqFwh z$qyId=~K4BqxsCPHMC*Tmq8%|WDGb&FlG01set# zZ}h^P1~x(gg9i)sC1j#hVemkj*{(;eVVLaL2tyZkFh0T>x`1?tMF-a4#|BO~=wJ>v zz~3@P0ysugFap`>kY^_ln>WGe7#{^0o6=y?G2VSfP3bW@tY4pI5eS0{(0Rw`uw%}& zU<9HFj?sY)X1`f82Y5{;rAMq_Af9{T8wQ*F|%U-ggfR(w|2LV2yTG z*Bo^lVa#AcdlqH}n7vkP000`N6TA7)1;twPkexF7>=OnPm_GJxhRb7BDNv_kuTV%rqvC9obS)|h8b zGO%~qnPUl9I~UCuFnY5vl)>4|W_ABrt$b)RbId+qJ>&5PFgBII-pxg09ITlPtd|V~ z797ogXiP&R66-QEM<1YNJYkN3Irsq$^N)1=%z^uE4LnzCn%ZCaJc(LcncePiF6R%q z`kRuLmo_f%oFz0zR(ARFjW}_=KX7lAQ?q~BSG2_>_|(Phqh~H1pE~>Y^U?X-r|mmr zY9cjq!isD9BG#^L@A0`GxO&jfU|H!3|8&9aW&*Q~k6tL5x$l;4uU~}-AFcFt$D-QQ zuwb!I!KbHPU%hJkMFH1ax-(%M#br)Qqwj-jq>N3!PQ9+Kyva%AT(?u9o@T}oRej|Y zsn=YZwy%Gb4$qG7p{BdH%E*lZG2Y&|B1Qux+&X5mtN1}emtOLD=B8KeoZpE zI#SL5FDV)B2-5GHOf3qtxR)3$w9j7=;nO!|4EZUwTb`Tlr}KUp`3bcl<6|$Qc_O}w z{HU6zP2^XRUs03kjr=-t_)qpkeiiv8HPd~(HLCVsMjopca$|>mrmEzZkzZ1apB>Tr zr}$TqH$SmHC;koOhld{+8VQR7@&MX4y34y<|B);CHRYGr%gl;Ki*r29%A?@46mz%Mf(2*4{BHz4rtiJ z`?$03s3>0hE!ce-yiU?Se`OAOrr@#w$a`wDROK#s@hiLz^r5u&@B?@N;!be4Pw6M^ zGy7fK?Nxu`ZQly-WG(eKlY~cVJoiO{_T)7W$K=6#p7YG50yiK3bS&uQP8Z&$fry^K zMYWA>r5=|gpIn3IcHkFX51w$LK9_`uTKl%thQMo-qm^I_1dAPcne%@&2JhZNZ|VPP z3|{t3>P;?e&S4`giuizpI0H(~AxNy}j_abnuc^LVraszE+dIyKlf729*xy z(uZU3tG@Euw7`4QIUzXU+z!1?T`ym%kP`VgHORhmp@Qqt3toX_vCzoY>Y22U_u&2K z70aY&`8`qRnXSXKd3zxIfIQiHwSVSJ6$d57sQ!rkR+8}3py(1oOH|0ntrKtZzXMyH zc4B&bWmLQCvRN9^o9DyNl!}_`i=~TO2-T(bFLX0JPZKt5EX&ny3okD1bqw?!YJius zxA84Jp}99EXnK5*^i6H}G2FZCiTAWX;Y^_@viGL!)#zs~YJKVOv&H7SoFiQFE#VmQ z)j9sOo!l28{vkqIsno%<Lt4Hgy^~JGvQbI>a`7>^XIvd9qko6C2C1}a2D@r6z?;%v-irdre z_8a%M$s=8I?Wl!7Ir(M`S{Kx8uXX{?U_Us81wN3be)*2LE z+GjSmr7CFJYueR@o!t=+Hy8{y!@y6V?@otJE(>~80#fJNuQT4zr*1zS7erVNj~Kp^ z>K(40O8fBY=n>7m>uc2P<-;OJHzck6@A!cUCULRLOP(*)8@{OZVus=s88|u={h#U@ zEfUWke$VSQ>Uhj|@Zd)E*v#lo5yizNn*xNTVDE;P&+C{kso5UxdF*V`Y&g}hY24DRsOudVTuHOD5>MRsD5@Q9d>Vy% zQ>^|=etOG!#3I|%1xj!5aFPClc-Z|E_Nm;6of_Bq4{W*b@WVV2=`otlPmXLJAQpYHX&L*DH*7Z9ImBZ5N_neX*nKfHV?2jzn-c+5} z6mj?nBqR{D`|$E)$q3ZpWA!zOWMrL6Sdv58%6sV4n* zY=YC|dwKtkje*(o@QA--^M+*Qu<3hkHr6mU19#4U%0{n-ebarPpTA{e_4!7HugZM| z4~hD`Hy=L!Qoxa+^v2TfEgMZD%c0BrMN`huidMyh9e^^E+8(u`Z4rI)wK zl%{JnND9K2a9w|WqZk=}_v48RIr?yaFS>8=XgMRn;4v&6f}8*Ap`S=_Wro5Qt@rVC zTK^5pme;Rlt>B&yMK0H_*(=hs-gBo06*0SrI$P@!M=rrzje&hWmWDEFc!A{#YMOl)*fDGj+7M*VfCr1_n zsn!`kW3#Uy>+Rfjr?jYm*J?6kjNA_X?Tg5C&gcdbN^g{Z30Z_-({4#fzpOsvjD-yH z8mq}T!;nR+i8YGY9YFf6lan(HS?CEoq^!C%!;^6~hHSgA5a~0{n8!(lmFxAM843hD%hyk;uBu+K5A%pVq>pDIwHZ^i0TZr=I7pf#SHBLYlVY|DEpRvy- zMRt66uu9IY=b)aM>#v_9V`RPu^=g>=Y*J+6GQGStF>hquCqvd!G;kTp0J>(_KKl&W z_BH`1ODr0?k|sZAQe-XV%lKMqVh`l><-?0fPN}8u&Ts4Phv(tn9idm}e;U|2Y<$u3 z`Ud4q&)0jjnxFLTw?9tUpqJr!?0VuXc2+yZi7T-(GNG> zelm02A939!LOmrSJ;rDOUl7zGB0Ls7>#wi0Z0W6Cq;hTRrmI5s_f#d}&L4e8jpPtA zWqYf@im>_TKFmM2m%q3A{A}CT5o!Ca#5ygoC>>z?ieSXR3=qQqsmBPYT-owh-#^pL0C1X%GaJC?#vbIU|n9VB06{jE3n z7P7$#ORKd#YLcTr0oL`EmV)r9B6!OfC#=XcsQXmZizsr!dNW9UJYB&x*nT1`kD{B} z*(p+x0&u{x+T0}W^|Qo8SU=UYX0C8ky%sS6R$NM%+;-um(i32jp5srz+ZzRPCcq*c zXnYsJ2}{4mY@1B*Xyi+;>)>F^ELqTMLY1b#ff?piTTGGaeuui3QQG=mI#|}%^?D_gl zF{Y&xVLkVx?LTvM>oT~@alm?$>=v@9Waeg0SjW>m7D?ofb= z?s>i7@rxPfCc^S?HZz1ugxdsIBuFmqdn;;>!798KFuHrV`=!^&pi)5kVFle5^nXHa z?+dOXUagBy`Gza|(IZA??5?<%Y~>?;!<8Yd&tnfes!3c)!usGe8%H&%tLs@|Y3!)n z-1B~OVnc;oK`1&@SpfuB=(0j(3*cm~AnNDRSOG++CUJ$LZZ#IbFS&xKC&A%?afMt# z)Sr8faRsO*bA<>dvA6S-p}p|Wa|;dP#_c4B(9Kbt=Lgb<_ctMZ1$_~*Ihx>Ng(!d zSFl4oP8N@&n#>jKkn2v~k>jW)b2Zs!{LIz&Y{t)AjqiIXfmUe^YUT6|_B)O4LPH~A z1F^%20quH*aM-yLBSFjX>FHkeCmF`4QO{(+%n7Nh)k_pU!hYL0+~o-fTdyTko>qum%L9w+0&;fH-ukPwI;iX^Km zn^)CeKGBA0zhq*EdhKa7( z*vbG*d^vMvV_=X_87l)YKV2SM83x9KpSdysGb+tm854}v*vbHmM-g*nOfXQr!Bz%f z2x(Z%FfbljC}!Bo0L(V@n=%IGe_{S#m|+9_C)8Y;Ke(5Eg(Gd~2^eyT-PsudQw|@a zkEgNEx}=TG(~tzV-GH8>9%FvvsVQ@yMj~*tP7T}8&e1fsArTL`n5~f&)ZkCY!U-GV zQkauLiB9a3C?p*|@zy`keZhBk6=a0i5Dst8wAj_-gFc2etih5u$ty!n$ZRaL3%vc} z*+uqgA}hA(719`(sX6P#o|=x2EG4cS8xGo1GX@5RQ96>*bP#|!{&xKgEA|N_$m3bF zJ{QtH0|R4DC(_slimb-KNXhheSTH7v0F0P|>qax?)DjyQm=E$e$pj-oyPs6fJ{n~; zK7l^8xoF0vjE_?pnvD%Ejf2@pee~Rv zZDxzaJ{^UwSH8Oe44Ol-imt}M9HpH6EoE#3%Zh#Ehs0n8z!(^{RAsTvc^yq-o2Vjv zjGhPvhRKXCvyW||0?^oiloiGdfZ0ebd(O|C4I2l8=FdE6NM-;=(sW;k8`}UHM4mP3 z6_)l5FfdQ%(ZDvj<&pIQ10w}9Qlzn=wJ(5yK`f7p%*nV=s1iA`&!Ab2fq@|(kFNDI zCV+uKw=1jJN6O&hf`NhIEfQ;*?kMHrZ!6j6)~r|)VjaEH#Avbf$MhnO0^{4*;XppR zmT|RPo9hb;!^^iUrA3NM-}vjGJyoOCC~3T}V@nXPVt~2#EoAW+xHbPJzuq3Q&Qajb;Y>!|!a`VL^Is zbAl`u4l`IJYO+2Q7}7k4FD5yv^lfmum011)R$yoEp%sq~pH4BC$fVn_$XQWZqEfd! zJ*rJZAPL{u`Dx|X!W8MT_?gld!UPz8GW%+n00XG<3t`fRxc-*%#V|clAB8mR|8|%* zS!H>cej!Z9VHDE}Q`2N&QZcUXT_(EsmS^xSOCaj(*>}re4DYGuNVDAY3&16>RbPo6 zK)jhE0A;AlP9m{YCUOC{~bR)XU0^C%U9p(mP*J3U0v9BZ?Uhdt6H{e^TeG}#RqtME#w(5R0il|Noz>Q_@xisVA-ICgC%i^_<&stl%ZT>lFbgA7 zW#R-2+nv>Mn1wu8cw-jydip1qPX+Km+ozv20!FWD9ih{-26?iFvywfAqx^-fw`w-& zS`FWQbT|3oDwiFUTC*W|bLgT>=R3r$cLGn_it(MWG9j&2(Er&E{_o^1B~91GxQOQ~ z2jm5{(&W<|apm=k;8AeRws$i6&h>IhRbAEze;UrP5j>yvlTlJnjfH@B3;c9cwMYw6P<7lp69kRn9x zRW7>fmlaOBw^^b7P)LV|8gcnY1?@kJu6HgpwO5i6JxRdA@LzNE&3OM)h`#CQ|0iOp z9%=*zvHHJtF5JN&mI%ZegX~m6cJ7$$vT}_Tn6jf}H`rpbGg)v*0h8SsL-@v_NI;Sp z7lEm7T$-aiQ{U8gGDZ6t`i@KZ6TYQ|^lcJZP56F&{|6kM(i$!g7^c4uf;Y3hzwA9a ztP=2kbaeMfgPcP-*I>a9=YQmPQ0z=Rhdy1mIvHLDTX0^Xt+#qkKRg}W_Bu$-sHXe< zl*$4RKOTPg09{t;5to0{%u%t^?u*_`z*|ha4e5T+8Th20g?;Xw)@dU)M<1V?qZHMz z@ECo=PtbI~Bl*?i#qKo6liu)XwtG*3NOI@lBb9yfR!zG4u1C$~6dUV%kB!Pdu-|<0 z3VD!VZ*G13_Yhfl$?tpnvn1cFN9yp*dCsR-+|~VRx$RzrwC;HL6n(0|60tvfcLglA z&bY2)?BHjVu}WV1PksJqA@?JS23GeiY-0R0N_Gw(45AK-H1?^R)C|Da60Cm?Im@%( zD_v`zy!rNcnM_R?a{;3GTU&U1PDOo5;_BVE9^q&dvA_Kgj)=L|bf6#zBPj$bB(IPHF zwPf=&%f?QgX(pFU2#-_4H(#0|JL?{N+tiMGTQRZRY$X{UV^Uaa-5)eX_9t1g{fiRm@~P+y`Qs)&Xqg?kHHE(op0uVE@f;?kHNDcP)b;e^ z;VYWr$Y9$C;$L=d&RRzNH^Qk6U(=;9V+u^Z$O<8mJ9wsA@ zs_IMZn1M`$Ko)q6aErZHH)6y;4&pzM?Hk94|D>@$GfS5=WKqN%;whItRJSLK=ehm{$BzbaTZ+NDW^FO7~qqTC6 z^c>Hp^tD&g0taG80|Q)q28%@7+Ab?mKXt4wuAWbQCtGw@tY0D23I9y|fqLp3lYl=9 z-in3engV=6qsX>os%G^C{I4TON30fsp&KhhQspru*TG3B}=qgyJmXuM4b2 zf1Z(~^)~)vxFMlCKhMC}LBYW@+ScHnABC!1aMk~hAQEj)sER)+#LY7>=iU~DW(;2$`6%DQ3jfJ*~w%s&LSBrBsOR|dPdu9&HuCD<#2|9h*m?`+|NN=sg5(Duf;1?j@D8kzJ2k||tBO+(?4bO5C)~Wjfl#&P zBW`_uszS-O!}zoV@`ue-f>TlpGX8 z@G13+*4A~|{d{K$^+SjTypq6)(o3t^kmZ6Or7a@_@XV)Ni5DH{JJ0xqtgcHBm$kqMh*(V2BH)6pnDDI z%mF%8flgP?KoUkLx~8t1B@c8~V|0>%&P1RylVpqsIzbQdOgf8&wHowuNDp6H{YJ#- zlo6Uv1Ufr-e27428_Yipfeumw8Q9(13Jk-XZ2kHzWGxr7@cIGvmfXr zJYHpR>%a~&&}o6uDGzkwflh_A12`s~`*wz$nK`A+#xxG-bO1UBF*<>b6^^&-OHvQ4 zr2w4-CY{U8))RnEC4WlEx-@-#2A%RiXI6mvBVVA?Q85JASfqr}*#>k{fKD>dc>$wy zi54|csKyrP^!|mP0Cd(d>0BFC1Z8Cgjity3ufQ;63xz&7>UYR0cKV=}RC^yeY{#jg5uaC&t6bp*X3I!YCxJQ4M ze9#fg@*>KczQU>b_>mv>a67n0#a&vzqU}xQin40Cwyr(L&&<>~+teAiv)Wd9^XWOw zKkyZ6CJ7D_D|AoZoD)=6+iAxgb{H2@K0PycGu|-P7+Au)tl=|S_a=UL7guw#K<4Hx zCX2ZU@*nYePfPZT%9@yNAV1k9=6NtT(0r#1vDNsD%HaMpuAU*@K2g>Q+B~fTs*BCC zh{oG(A8pup@{jP2lbViwIGf~0HiteA5(Aq>$gdS4UD!^3ws*&c6iae_`E>sI-iz~V zv~!Y+_McnGUpz(Tte?@E5BTVyIXn2dvodQ+goV4~1TN2Z@H(FmrWp+mzl~roWDSn=a#p5o9G=MUaM|GOg>1smZwSm>j+ooT_aq1^dk2UwTqgm0{tHq zAL<2)mUVkVa)gh*UU<4nH6{&Ve3bK8usgmWqJ{Drmy6IG73hSHBd$c%8IMys6g52nHm?G zI<0qBCje!$n}6VEP(}dClIH}~)^;WWW%58-R_$~-&9Vr_+Y=sbcyQv6aOz1- zhdx|9Mi~Jpqr6sx{Bt`6C_9^CNde0E=6f&CuX%VkS>O5GLcZcDvJA=;fHG5l?##>@ zLlNO_YoN^0>%1*cmawzI7APZPlogxGIi9~jkmttPytM<$>eNjL$p?u*SsPH6b=OE9 zDD%W9>-(svtsf{_-0cbXeTC@jdM90v&bAY)p6f?$i`Ow_P^JKs5rH!E#_L3&Y_ZuL zB2XqH^Z^HyxtfO5F(@-yJVe~}#ttY;mKAmY%2YQrK3p|%m*HTS0cBs`Wsa^ zto0^=>2zVjdDPt?6OQzLQjaO;|1E;6fXyM98_UB^%zbqx91>&|gTV$nPrA_3Pb#iblKF zgb#G(Y38zm#Kal`(l03nt99IPS|0y4@zR|oZHZM1)WKm<^cRt)i_@FqHNBJzhKC!v zi4X4v^#rbl%tRgn;vE?dt5v$H2Pr7NynbHavyR1{e*WR;FG^+4*7V?F)uV0vN8cT$ zSidazq%8=k2?|JFX$h=WXse{rq9J0d^C{XJkFzAr{1W&JQ+xj6&Lc#iPae_dDF4m| z$bsAh1>`IAt;m?u>Zwi!`iO|WwTlOE{!feGPA$7_rO}#RyqARy(8ph->EIO|5A@jq zeR%kbMdl}aRYlu?J_@35$yuM}T5oKDzKb{blLTo*^;@WUfFp^Z|WTps!?JvBm{44+WsFtZGhGh%XY`D`_45Kf=u$9f&|50q8@2q5pF{&_@IM z`hh+>ps$RF1o??}>%Nm6`kJs>^1+4ikZ7-RSxW)>$UqNLTkG1=H(np5^ zD#Ui>9(lN%O6zMMemIl@k1M&*oI*mB9K7W>-ny*faIYaD`K1k&q%WcoW&PaqG-Suc z1-ccLGK9X%F6gQzW8Q{toT{JDuh%b$NnF#&-cgC!P~IpLNlvpQKRZ8L*6K23o{8$} zM10e9c!4vIiw==S|R?k17Sx81Qx1(Kd`xcineCw2EF zWlrkuZ*2soyYJfwobJABBaH34Z)}9o_xZz_^l*-=`tIRom+WCRxRq#(dK{mvBX)6> zyHReH?#Ra~HOjNvMVSo;(5j= zv7%v-ng)DzJ5N{SnlZk$g`>M1B8g_~O6r>fbqv!KF8 z#`kRH>960`EpNDY2j$ScBDe{A-zkN2kPASyM5PM8`GL?>~B)}9Wu!q4b80HWs8$2?*ILF~J z#mQig6CP8Xz#a!YrZ|DUiSRISBKDZ@jM&9F4o`tooa6AUImF2Z?;Cp$vBv>#Z10VB z1keIFOZ1Ie!)o;fRSL4^{KOCUACTLm(EZe5T__I9bb+qHn=h%r7NU4)74OXR54uue zhziMY(;SWqR8bd6JZE}rbN5`>=sM`uZcsG~$|P$S2NCU~5@Dko4cJktI}a0UeNRAX z9j-*hJgP*@8R5hIjTLQD=r-lZa0WN1;4KViWDhL^D{vN7VMt^+g9~S%s=A0BINQQ- z_6S{4z!{X-lo-zJVA~mE&IsTP>d0_?F2kJ3a3BL`@)$C32J&J<2F}nOdK?)zgD@gw z&{Qsd_W`AQhSEs*greuqH562^)9>@$IY z8VkfmZv^zxdpSC5XxmzjUVFAqCx@i(CEERC%2eoj802|n6~Y$2(C&pQIY|d_P%Np{ zJw0b=O4)!KDz-vy8Jffkm6x)MK8>+!_uY z2u@517n~}n^V67Xk>JqBTimA(bvlzB>k+QE@p>mmerO&NfwLFoXK>`enp?ecFQ?8y zy{Z1T>V<2g!*Ma~C^}b2+Cau0o*!l2axHJ_hVtN1$mW!;7{GtEys~-PE^Oa z4sIN?n!Q9}(aATLLXFAfBQD{Q|Ir>uj-faW30>m86R_r9^~RrmozGeU>ZOXl3+w?Cu+La-TV+sgu122Yv{zYC9E=;M#18UIa zL22~A$SeA^xxyv2CAYe1u)B|AD@F(Oh&e;jyMA`tdylhq z*_M=Q_yHZYKTh)Y3-|tTBp6lUp>vgSkO<8h!iy|o=k6M!+YY$R6msm5c_U_ouA!C?bo0_YnDL0Bk1UqJ&H$742znCv;eEbGUHHMZ?qItLWo7t(>;%< z7Q++)x^F85C_dboci&LMTU`(JaiF_mz5(@zj5;kS{pn67IXCgU{oPMMX({W-`8e)v zB?RYt`c~JP65F=P5K?Leh=$=osHXy*4%xXus8{1?6_PXR87jM8iCXRwhJJhmTozJZ zbu32HJm_*c{CK*1|Db69o1O*z(5`~6!=6_-)CRldq)?NehHp(W@S|1mq9ft8@o{wC zW_JmAdisZ7(Ta*o+tp+zsv(*Ht)paDxujLXsKc1-Dc3ewqm=xTLR^!t@(Ai#7P*_z zh!UFXK{u(sWqfcO@gXOc=t3K3BlOBHoYaMGpMF+a(M~$a;9|5;f9rZfR1X6(sTi4L zAk&darWZyg>RVxC5?^EyFftRFWIFW7Xp3NEGA@0wMmQi-fk`I(9PPl!tj5UPalny+ zk@;v0GATeNv{->m{fj3HP_Hj5P2UP5vk%CG!xWMEg`J7oos6AH zp!WxSqSH8L)BegI;<*!??12>*4Zs657fhaZTDNUWB34W4dXhv?m)!In4wUO$Wee5J z{@=^+_kwgyOjWVMFlxg=1zz@zC$4YV4vJ%>4Gj9gAO%tOFdPSj?0tAN9rsHsv7rFX z`#@O{s=}y04xI)552~=ESHLI??%Dw^7^5(`sAgoo!KD5+DnqNMx>4S}T3~vSn^9A& zMlhgbGRIqlJp6c3mW4eUnM0E{P(@oMoa}6YikPB5t2hoEgvmKZ#kkZFw1GN7)AP7N z;b&l;!stf5HcVcawsOOnQ>82i1!(A*3upOkC^Y#E)f-_@4I1Lm;fg=Liwlm8BA8}L zuIh?|xtCtuuGI1Z`y(C{QTyjAVAbBiL23uGZCMne+rFOiNA${Vtm;n zo4O=@Xd6&%E+!u034+l%pb1L&KvNNF+db`!1Dart1HEMG!Ymy5iy#)Fq&W*5G&q8qZHA^htUKxEQlsF$aYZ;Hk=WICLIlorX38L zU`7ia9T-h;03w>u?BE;*O>l|LX6o+*PS7(0V=5j7$)n)G4l1!zL!Nk9|qYM=>KnSrJ{4PlsyL^R1VXhPjO zpb1V{L{k-mCVkVK0yrvxCg>0VO(ky`G(kNd(FBJ+&_u*&Qov|Jqe%>!;xU@qFq&Wx zj$=0&VKhPGXvB=ZjH7YXO|Nch=&b=}uu;;w@!`|t)xxr@;Zqn_h2c}!e~fX}X`*7k z?hJ7=4TQN($GvM%V~N^deuqFhNIXK(MF%td(3sZ7m4yPD@}{KKOB>-H+-w2!nI`IU z6x4ipk>t~N-`B4`Sx}fLihcw@hRJ0!p@Nd+Y%!|rS^Itpb0!u|xWcl=CS1R{ELYP& znCtuYvSM$RpW-><8|NxlW;$OM=0dOK%|e^1W=&H9^^whMJP-VKqw~mgPvDC6+#rB} zXwv>qM@xJ_k}w9_vs|z1tv>2@OLwY6B99EE3TP$s&;>S};Wmjn%Pe*-{_H zb4H6Ux91?A5g1N+g@#M)nHz2TGdb`U*%E7RTRIM=ggU94+DdJcw+*& zG*VZl1gEL<92Ygg@gBC}U6a7IZI}An-ryrwqZ`Qc*6ye>)v!|P-?il068%%Zo3mdo@r)lw66|eiN5H zz?EvcC$!9r-!W?y-qW(>4B*EF#j&eClh1YRNGOHETQoW9y%&_9SNH!zx$3tCs zkKFEyzF}g267$lP@nZgAzpU(=qm;J^w{7=<_ybS)ASWY+)!J0dU3H=B3eo<)&YlpM zE?fp7(D>$J?J*q(>*5c3d!b{-67mA>-haOdO!B@%UUi1 zY$0W4KgKq5DLZzj7*m2`rCvY`jMprrR9&_tM)ysJWXVY+Gq88++&%YXWTVn?wF%a8 zv#d<+%hH6ke#iUlcFy?ts(ls&+tE8RF6RDAorbH+APfGblOS?I@R#NFO8CdVC(8t8 zATD}MAGd!x7Fsvtcs`3q%aEv;j;jip-v6OhfZC>RbL-|(lajY_xes(|(@t+`TlpeG z{}_;dF@1|>3D15?qgiyS-zOCvkiwN+(!?8U?%>w9&vt?gP}PB}b%sFMA!8H8-G5w? zn*-`1`kMBt_*-XYk4K&IK~h`8FQ=%E74_w7e#d1yC7h$3$znuZzcuAtWzV$eEN0Yk zdv?V$sd~YRx;BHV^I5E@%VJceGNXP%mPOSchZs@U_9SzcF{nz#qK@4{&1M+?fBsPs`*Zzd*jaEo0%Q#PC58C@%6q_X#dO2rF?8Wnsq*KR{wDH zY-+)_^~^3 zo8F%C<5}apecfA_P?+Bf_DFu!+skL~m$CDPPQ@>JTVAF3OW&AEFl@-1iF(B^nPa?- zdDHg$)Nx9QjW>kt<+Fo9O_}DF-zzRS1|8(STUzV7X)s!H%LJ`<(<1#jO^ zH+>*{l$uU!sfb=bj8ET{_nNP{iMEDLI~73vaIo0I<*x+NG{M#x%2cYf0Zk*QGHTln zlYkc2Ae-Nn@3trIFVV~M@j2<;<9(c@@)OP=NNp?6USi_|eNV2{PP?oV)3(}PXmbB_ zm9|d5-%#}M;+c*IEB96$GNRnOV@4EAUq+11oW957Zu5tOr>OIHnjHQs0ixG6(N)~c z0pAN<1mab*g?f9C3B zwS)Na^|`lIEvgptf~`P&s3EpTO@`V~zmgJC!$+wwKdz`c{J7)Qyy~TQiSHihdmRfU zsh-CBSH5BzA^OJGhg-928*csH*=27ImS9Gy5Q_2j#jcG_B94|e!|^r$9WAvs?6mj5 z$2tA4`=@)lUy3`+efX;A6I|Z05Gwc17r74%tgaO<&u@RP(zovnHC+9j{5;BEG2s~^ z=d&ObpSv1gpLw4TH>a!R^$Pgz#$EBda$|l!G||-s!9R&9=NGpQ2#<15Wyra{-yJ4U z#kRgO3x+Db7>cu5m?|afaHH6Iqj}c5Hp^-rXNS6}cbS?fAjLTX{6Au;` z>I=@LjMhXG`v%-8?=t6`n46?FT$Mpv60ZGaopr?e<+?NtuB@!33I4bm`8W!|7AKpuR zwPB;a;B2Syz~bAx+ldW(mlD6uh@CSdu*c`D_cihOV`Eo9-f7h@Gg5p73oNyy`w6bV z_2`+^3r)VkNM;)&u<^q&fpvBB@!w(u?x~ExnwY*=p6--*AaNdS;V&|BK5IO%#OSK& z=z#n>BYWkr!0KJgk4-!j>l{~>09nEp89AGU1y=Uud;GJasaf=X8S2*=N&TYKCuOAK z$`_-QovO>rJL1Z64dj~n%jWOD zu=JPZC0X!@uJFaZKPKmQB);qZh`+o{!O=S=?$CX>peMlGZ{hOv&bU=K0%iMzvd)?< zU;jJ)fOWiZjgFj)yGhJNNS^&DBMq9=UTFj4NwbGX>7x(?GA(en3%TB_Ck#(?oyTZMXykc z;*}Sc{+XI{?4;YyxiA)t_xc%9Xie(q0WnXng^5Y+vmM*Zd6QQ;Qu^VSlEhu+rV42s zzWm5Zw`ogTX9|?L%E9omVXOIRs>>j82%bc0-F)^+%rfG&HHNS)nDIz8-^yj$rsTLJ z9e2Pw@#O;@m9&!T8{4DxgFil!h(OwMRw7B&vqE zCs!xuSg6~yxvh5vVB$HkH&u@_9xuK#jKtBTa8iD~p;b&FvBT?l9nI~8Y>1Gj-$FRj z0yD01CzG8hio4=pJ}{UV52x=6BhZEmbBe!oM@6=Bi%CG0VM9|_;_7X-ln?6KUA~aY z>W7jvPs7QgJs}>p72g%ce_2)q7T*)be_d9;to*((ewVDGv*dO;+mLn z#s!8njcZS>4BVTE>mK97_Qr!Tlzbpfr+lzI=KZ_Y#%m%KxJ%9n8Tw(0sxzq}?RJdI z=DP>l@P8@Z;+8dbyU=WojPv4ypgN+I_e-4UTOQnA!?my+;{M3Qvth>uU(*)%zw6?M zYa;r;j8Xz&b*)DPz!;UjpweNyMu5mQG>uaGY#uB}*0N=JqFvnmBbo;2KKwsu|6}bx zFUYG|0Us_0a9k_tgH5!(LZdgk4E-oQQ2C&BaihWs+%CP}Lld7~pyb$z7rQ7kqwJ6> zk>rT0&Co+7I~Vs0tpwtJ^SErWetZcRuk)Jx2JLIYdg%7V13moifV&3H8q~z+*EiO} z`ENE~*76c65Oz3+We8)%k3>!CCvly;;X_=gPyp8ojU(!MdGuF8S^dQDE$5Fb*LTEG zlePDhFGMw+ybAm!yM&BA$LipLPZ2Ra;^n4yaa*}1;UYuif;fas_;C#ztp&urQ2Al2Yz+7`Kdz7p~8gK8I1eqLV6|p7Ca4nWzq6~E~J|+Q6&l< zXZ`0wTGvQF7+U8|G5iNZTDPhMDm_!P{;`lIbv=YZlM$X8;`fI1{bTq{#YnnuZ(GIE zQKDJ;uAb99E+Zo~^Xaik`(Ugf;Y@--m--T@P0xX%VBNfVl$MSKo*zb((51L%oj&9* zo^-sJC(R~IsG&On6&}{jm)-VL9f#e8W5=$jizI~I&o@BnO-vF>nBIYOS8I{+i9=R( zEISiCg?Me5E)>w?VLK_xw?I=(kxsn8r1)Y{XBb3!=9}Lxc zRD_&4)0x9=5y~S*K=G|XDvlocAy=U4Q?-t$E{E60S7o!?Ire%4s}7C|p~UaVl>|s! zNOWR2X;|Jc^xa{6-@YxDV|Iy$V&*Yg3YTV-J=ka*!;Lp=+MS3p&22j%1^x9Nhus;+ zD>EEGjVc?%=s(g^QZSqIktDqf{g=78KtCr1}ZA`?4}3P?2ij= z^Cnhj==~Nl71byp2N2a1P1s+f1A8I+i?$ul&Sv*q53-Q^$%M2V2lWET_o%O$CCU!T zA=b5<;=2ZRYb6|t3B!TBAgl1p-3gUfgKMG{xaQ5_*^@h5#Q#C0Zt}%;Je#K!^Wj&^ zFFMp78SONz`+`Fr=w;rX1R-)r>CX4R?)+JFFo)2dJ-tP6hVvu{84f8=s(76zL5Lg@ zJ@8Lab%H&lV-EGY)J2}X;Gl!UA=GYePYfx`A=-HpL&|g*mz!o>|0RdXgD2G3QBbA7%H9IA@q=p>%ZU-ZgBdR43$pe5S25F=zS|QA1(&LG5JTOv^}}6 z0|qPUYbJEx1}%*h%R$q@s%lr_A4LWwmtDz*s&`STq8;kI#wm2+tW;YY67P*Ul5MbLnv&1hmqkYGIzWDAa9UPj>|ga$WCB*T^nn8|End4)aVDAnGA$uA=-~4DIX4_y z(`4uQ_Nr2Ud19?|c?Oy2?^fiV_3Dt09$P*|76WHbs>yQ6x@E`Y6vmijc)$W5(|DGnp#RmxELC?_Zw3{X)HDlC7(!isfOGn8soh%qS2*`J3 z+CG!2TQ-9X<-b-g$Le7)Vw#Mc7RxIt;0EEob;lH0wC2GDw2vRwfqAT<`Nbf^)sHUH z6R;v5zWPim@*Il{-*6@f&MUi2+Zkl|AZZBxLQ*@~?WW11!I~(q_gfd53CRV64BRaB zn3!^e5O^-I>NJ^+htKK2*cDg)+J->DAme~iFlyfP?6?IRjY*~sR<-%D4U&56v`%&w z83MtRkR$1S>sVwOwRimZ>=vg3Hx?QGYJ-YhHwVs<`0VOm+n8izhc_sZf&L9T8yRHe z%EC}&Rf*;snLZzcCoN~~pZduHrJAR|zTtvt6*TJMP^iXbq)`uZ3$y_fl)u=&BfZ6I z*B2Y`Krw+f6t*eh4nO2P>GvK4i}o(#I>(Mi0kWH(861WJw!8{q6pMxoy!<3>#`G+x67vmOv$9urH2N_!+J$BPGYtOS19^zzs>87Wm7 zP+XCnunJ7*@JBkob0RhnP0RS&(EKy$5<)LwFRtN1P^!u0OuB@DbuVZ!0u`!)liP0H zrb~#a$---xMxT8ejfOq4o1)>WI+_=;Zv-!u|H(_NtXv)fHe7#-sCdkifn`Zn}V=n~>!An968w8YB~ zObPX}y1{eZyv;Amln_&rhAYX}wNC6{N~rf6njSi4OJhoiMp_c;U96$0%#aYzf6xR9 zP3fRRhJ<{rBT@-}iq)Nc%9Iekf&ha$=Q8aZnG)Iv-699y#@azuiy@&3B<@aL*E4^) z%a9Oy9YXL8ggP|SLYGjTpvEQ{`fDBNkSQUa&;SEZapnDX3<+^CX7gxeXeM0sXGn;$ z+MH;$dU5~{f4K}b_@wAJ>t}! z&HMCBcBa!MC!0{|Wq$UH8gka*E+_q^z=9 z3*9N3x`Y^1T|Myf4(`s0$|FXCsJjK84$dOcplecvuS3B7qnU}G0%9g?L|%VrF!AYg zaoIsZoI6Vl42mhEp-2S|8nlBcF>&Qvve$)dg8_~22%cLsz*pG$n?ox@Q(wam{$^%T z*D^2-B~=!BD3wm$bb!^Q-*-g47epJQv#lbn#Lw{Akqbl zyDch;x&sUW?XFg-K=v=y!#$97FH861IKFuQK$mr>_UJ)(7c&j}=e!g?1!5Vd#42vsyd0 z(vcXQIk*HW1V}*Z?JJbGX)F{WV3$)jNSFk z&VEi)z(5fJ*B5~?`C4gs*P=H-R#{odYd0t~fP*G4ipTT~Vo)!R zmZ}*sE){Q=Ar9^DZd61!5h_VXrxMujT{ucLUQEc@(!Hs`*y;?SdP2AQ4M0RiobAat8^KzkVlG6$_h=nZeIZ5;?4 zYf!cjrYunPzYYXOqoi`eX7N2@1 z23Z^$eRi3ZD!U^u;-0mh%?znkftUg6GXUK>T7o8;DV9Pp$NT7B{R^qbFK5EoDZmqY zx^+;W28%?;lr6S{aZFTeju){5TUO}@(^jI5_dGMDL9I2B6WT;}wK2+QFTHx34s~=% zw{5B#kQ2fbtX1yYNgdw%elLC>@-Usa-{z9nVca&>@js{HpFb7M`BU@MHT$RhcZ+(8 z&EIPBYBpg0{Hy4}ZwrbPOfjy?tIUglTf9{>QSasw)YUgp7ph z9$_Gm>ZT#ThhUPYNzB;8LYU4p0Pt1G zm%yB`?PSj?TcOuxkO(PgsfcmOY@m)k`*au zpBB~m$g6{hhIiU57XKCiBHBh=F(l~6f{3y4j~JdpG^AcRLX!b z2mbPPk*gi|3{~F1ZO6w4j*1wVRFR+jRD5mkuSvmq?4o92hTgBuq4)so8E!b|F~elw=~4{(1jK$Yp@N9jZ;o7Gm<&p_ zDGZY(Y(JmEG#RBvw+$+WEN7gNjDHuG|$%>Q4aIP;Q239yP54-jw@~v~zwmII*2>;P$c~ z4Su^qzR7RVr9iU;8cGdUwYxs-2e`V>5x7^{6Rs{K!TkNMosVdC#mG*wUNVnFQ#r-j z{mFS+UI5w@Sk8gFXy*;zurTTQF<`HrRWJ4t`!uuVasb3m>5Aq?`QF3{6``z$6Vr z)77tH(R|w+O@Fo4(DjwO2slj$I4Lkd55R%tSi)AKF_r_2V*og;<$!a9D=&m1EdfQi z@?!A&ez2cvzmz5Tm15AeDqMNFa!QQ~qJakkU!i(?Kibo9<>k)M`9dvF3j+j6lkb&A zl!jiTuZrO-A{AN|wVjwOYCJY1X8r~SUml|=y2aS)o>KPe;l!`2sBe6vGJ$X;h$+g-Z(ofOzQdOxz45d`&o z#0qlwZzucLFNL~7(w1Ia-{=ali=Ig^ode)>I};?USX&_LBZ<&S?2s`Gi+91)5Ryj@ zF0F1j=ErBh(Gar7M}HPxYdmWBEm9UFbS#-AC8!27Tgp~Y1 zZG|t{C}#-U3LVhQZPl8?Zr~%P(hzK5SlIPF6y6Nhx*5W@;?h(!h`fT1-}?_W1fx0+ zMdb4#w?gR`NGhw8BX-Cdj^F;Cu=9ZV%BAV_x39U2pBMAq?g*7S}O!m<=rs zq6i3?<}NOomZJhVm&~sKYS!YCS}qGx!Dpaj$+%($&ga;M=`&ci`NU^17KeNW4i=XP zmA;vaLkHvihehBsRAw(u9EJ{IaUJ&X)zi6)vw%YjEH`&?$;LG*V7a8+XUo8Hti>fi zf=@p}cnOui<;F7>XL%2r$?|!HP9|*N5a%pz4)CTH#{wSHAu<=oa)>a9$yyw8i0J6O z+95**%dr;s2pl35#y~tZupCgsNac*hb&OT5Me*OAHWI*c#^P+VBS^HIf@SMCz;dj` zUFFFpgXNO?_FL*5T{U-cNlngY!H;(2Pq0lAIU<#Oo(T7M)^1mHn0R95S##*(T^>UO z&#e8+Axj6YG0l%lAo$7%zmozHE(#$YV25uQaFT?)^DYo3%D#sazk1014D$Ioc?TeU zEI{Gw9#1`p=!4q%P=E`kZZDy@)6LLTwJ`Ayej-G#j?J+U z&>zsPfp}jT&QOS~J@<$$#c|}ndMrC>br!D9*?Q(FqkYg|DggzELl7ATt`>%1nQD|ieg$i7NaAOHehoG@^K2p^3pvh5S56tg}DS2vq7Gr z7=Pt^a)8+hi-^f>FzV_j`M{I}2Vk=OU2dp4BpX*~6kP~~)WK$}i6unR5P?C+&?|F$ z{X_R5G=dzq6pnFnPya$XCOtA9LK2R`gmd z<+f5!aDX7I#Dy7y$)N`27Jg#ZVBz+lY@+~MS)ZWZjqeR15sW%E^smI# zq^oHHw#f~u<;A>^T$7LMAL>%*jK!MnO^)==3YGPNk0yDBg-Wwi`UI1tm*Rj<*m_7k zarGgIqcS$h4Uet`Z%13WHbEKaEKTl5k`NtX0>0`rj1_hiAhyXFI&zXAt5bab;ex@& zhXc>iXF0v$?UfetAY3{ij-N&`b&{ohe&>oB{)jqf4(zZAN|Gp1^3 zGALB?g}pf_RP;Qg;QFKip@9@oC~j|leaZipLYt%kH>BqE4ixvKYC zWa*{Jugw0!-QM$On{LS_gA;4}U>^V(w4*SjniFKJyJ7C&eRWHy8A z5Nf+OA0ZoTd~-6cWliGFi)c~(SqI<)sL6fb8cI(JN3B6VBh9^w#Yk7^1D^_>qE~YpR|JmBEkWd+#TsQs$?8(2?2>C>Q zW66J1BM{XbfLhAGs}U+J?drd)5nPw|x&I$Df;{597#WM79GHB>RuQGt7V19G$tx@k zcX9^q?pO=aXtVQa$*9ACEA=h`=M?XW9zmPrh(o*Y@Q~kYE|3h*h?2$w4E-B`&ZNzXzH_5Tlbz`#JmHUEiIQn6;1E zw4dJ)U3S~dL!K~L4wW9gm+Z-JFR!Sgog+sSVyi2Z9;mI%T%A)o-c>iJ^CwJWFC+-!A`8B&NP`Kl6#i_y9Az zL+CPLo-uuYLUqki?jcC5m$=&E6N&X)V*P-7jF4B_1*BsnF362Y(M#%=R?n6g zzyCzMA?O&o&5uCGNMh&`89K@-mv7`XNL)QrV%+79#Rjt_))4g0ID;-TPD`v=)b*XM zVkvm!^Ppq8#1jENAANcX(3@4UkqREgY)=};`jl)}Im$imRpUXIwImN(YV0~4$SDj- zE7X`#^@(PeiOYq)V0qCBTh9z-LFg$_Vv6}p{=)qS$kh9#4jO)roBD8c(ELLFXUSq? z)<2x7l9}8j9~?L|OC>BJzm7~Z7<&Y)JRceAL!f(aES0dheH9seXicaZ>^3hM+&Z+C zJjfD~#qB>zrmO)8n5N>q+(_(^D^g(Ef~AsaA-|H0oGoYpC}EKG6~Nak$CTzY60S}E zPZ`&4r^KvBe;Z0us51ox7x(KDNuW2{TMK_aGl^sn2@j(NnhK!(S2 zl42mMUMCFQ5xCQs0%X+p&{96RwGhZ~Y|xBPC8q!xoC$dEcNXa0WqCCjvoty8u@)3) zQQrrOt$F3#Hqa9WGPPjHQGGY6f$zY_2Jwp82N-(4i-8-Zw~yE+VV2_X&9RUEECDho zNswP1S#FD3$@jvei}x>20x~rH@vLZtn0)|7=@c|REP+gq_&piZlLAE()T^t|P6DzF z)C)HLD;dbB1($z@IgcbD zYe`&8dtJIJ5iW$fE7BN60-@ z3p;=e&2pUDS_otm4imWMX$WLoA`3*dJyFdB8fb8VH8HDJwF^cVc7n!%jPT*`c^KQV zJ+)P>sB2Yg0M-DmHC7!D4!rc8n6@Vr$xv$$-FvM+9_`HGVF+Z@A)7O@uG=01nPg6Q zbhGn$AVc>&Z8D32j7vlj)jg}^={H#IGLwOfd_9QQ#xvs~kg3Di33#_;AY(YiYMV?= zhEs$BIrYm<@$a|tjLkIz?kwE?Gf0-RO^z##DGkr*A&fm#b9)eU1?vQlT9HrvhPpFQ z*P#x2UTJ}Z^ev`@ko>?kC)mBOSs|f;1KN0qPMb#t9)C(=&~a^4gd!20 z&fUd1beaxlCf`uZq{Bmpa+*#r=TFqx0XiGcyvK+iqN8^s5kEu+pK$IGN^IZ&x@h^v zA_hO8Lsel0ow|Z6wS-A`MdGCR47#fKutgA^#;qU$v5Q_zIw&SVg$dDV<;mri06(B3 zw#XVz@dG;4>}Ak#6)PGr_yHZ1i!7LQTJ**)qJ#US_V8U@*H8u>F0$JK_yL`$$s5#E zW6;G2$AEKjNmAN{D&Sp?eT?p3_2)!qyRsl1M8z!H-ipt>Gh{D z=+vyr1j-n6@R{cOCDU~H_FqaEbg2BuqQiGTd5@3*bgkL!)xZzYX=RLp7jOlBK&J(- z!XdOl!5NBsTEmUKDgL>3)KfQ@R|DZv8trw@chFeCLyb{J+HkZ4?zzLaBXXZX&2m#h)zTE_ zP}gpK8CA&V4bvP0A(f=QhtG_jRMY@=hL!M}=^KT>uG%6; z6AEyxuSo-;Y=%eS8y6@c=Z~is7litg?VrSxo9y`|p;#7Yoy@oyDC;V(Om9qxCJP9_ zYq;ML2As}8ehL-fK$L4Yz{ghKdIs{n&rAU$Fz$7tt8>1vAXJYxSWGEU=@N!-4ZxgB zLon0<_uwIst5cwvgAwqB4N^9;dl(lOAH)63|EA4>UB@@s9ByqT(XWHXeuK^P$8smn z%_{Q;Prf#Tkq9PC=^83v!W8$78bSu?VC{+-24U`sZ!rj5Q=r@5cFG{=Mk(0;;q)e) zVgF>|S?uUtu$lH}!p)Fj|0#B#fg6sUy?Qp>P@#kcH^h#CZUY9~fZf-l zn{hF;n1ya&$J|VhnCND0rXuF*KEIjB%)QInOjCQ8u{!2GROa4A2lX^Nw0Ft1(nTzG zXzwyz1@ksA%T+M;?i9Pvxe7E1H_KIkXR>9v3Sc+onV7EPTRc+?(-BrXWR;suH2BP} zTQ>Rh-IZFKKj|JID=mbaDgYT0$Wpy4*{u*ImB1W8kW{AM=j(BQ$H zXuJPR8#L?2v6ZMHcL#atd;6m-^9fT=Yb{m**YfpWM>Q|8NPke0sj!Rt;`IB9n z)#2)>V0A&yDg;37h17;}PE-)??G(z$Yb=1dFufdcsPZU7DoKrcAV50%rxtj1(RM$> z*^=hu8pS|=%_OqHa+ahhPaCNWTco#Y82Q=Rl0qtsbJ?kbs=Ko!Rff71O0a!KoKDY{ z6yE$j4`70Xv3i!IDlk_iYQhaU6bZ7|>RFPK8-3vUGyx9qm4`s5EJhE7?MlFQOOr~}??XacZ3b*7}tei23}zR6>Objp&H_WsC) zz{}qe+?+!}r?Vxc?KNYE{$nio1hIC%8IqEqCehF!j(6ld1Uj7|DJo4vHagy3w!mQ3 z@C-@e?d6}r&!U7s_qqsbkFX>qpE4praT%%)hDfK=lE%P=V|IdrygD4Npwk(W*1hT` z!Gzxx>~g4iAf3*T^vXw7xH$YOnmr`I5bpm@OG?64yoY-Mf>fA5yj6CVW1`2Ww_?^z zo7v>xM3Ty>fUPi?rU#8CwCwYqRELddmJKe9}tCsW8#h^4Nr*JJ4jT0I|k?Wm97Yi9u?;;*FLwarZwj>6> z*>vd0Mml@B3kO4Rh75kQ>8Q<$a6QR|p5`=|UxdM;#D>t>bg&b#&^<<(&hVKa81gIu zesk$iCk^no__t8L_v_Kn-5fft@(sK;j!|@dxf~rdWbgyJF&|<_y9JV_AnE!-3-x1PqbuPJ2-X`Nk z%pzo<LB^64C>pm-F(6U%|8-_-ZFk``!UESk8o{rAW#hVH4?i8L^KD~|O9;3(C#vZW5 z=gF(y=7vWk3GlLW;I*j6=;E}CckK)$Z4OqG_q>aZ+bClLSG1gr;P)#C{oWTS{#z3y zxvR?7QEgH*{P1j&H*S)LhXrlq%W&8A%WE>Nf@$XzZQL)#8o({LFfR1_{oP^Y&oWz) zVN^x7GwRFuW@f>4S0xixk9gXBGqYIP=+JACZ#?b3eq~H%rY9yv6ow)HsWoA78~bYSpNSS=ry&Y(8dcCV6Htspfyx%nuNz z&E{n$%3n;bHhfS$KS2J5*+rXRjsD*AcW0roC&OoW@8qS;Po6v(y0vHT-r+~1cPDzT zEBIKQ7$hHG6MHQ|qro(c{3`7SF3klAVFdhO5x3;EkGO_x-<+}Wg;rfcReV8#msV9# zB}B_}$axL1srZXF3ETt^lNk4kU-Z^4CYx4kH1Hgx9(&$m`%kFU2rV#SJh+^g;Q?+! zR9jVVUlw^sN6dh8C`EH?!XF2yU4#oXg&>^y8j`ya55ep>K6V#JRj?entZ_50`aSYw zn5FP8S8<#pJX6rl7R6 z?cRS>R_=T7VdB-~M2W{lU2E=QU1bdXyxz~wCGvAZWe?tQvpSq}aL5p? z#o-yg!{CzI9YboJ*5dHC4gAFZ0~(vOSJ7Z`f~=zGdq429v8m=4w*|wa zhoMP<%On+^;KRDP!MCWv^KPYIX~@|;F>q|a!9v*q4+P4mii%P{N^6-s zI7k9#*$Qv{?cj!oTHt4fQ8y0H86ztw%r&S=h4UIt^xunPAGMlN$%j)DMq zybyj3&*#8TsSZK3DdSsWn@!Kdi2?ozQ)y`Y4`|?dz(3*8t!xn>4BMXp--@1!tTcpI zrQj#^NS>O;uJg20o_a5rqhlHlaw|S~hET|e3tqao5sPh<&Fi1>j)+0nIenhWnJp_s=@`#~LSYE12=lkUcy6 zb2|Fl^%~Ew*T1D<>PY7kTYL=-=+$_p{l1b0Y~fftW%IA60s9q;&~frjG|1*Wm4@F; z15gP1N7%aYt*~c^=J5NsY?ax|Df_DJHJb*uim`k}OOVp&<^0z({bS|i#EEW4=`nrb z46G=eo;Le=sn5!Or0@mhj1(%^3_c~9<_)7rG~4sOaWo1=;m{f$6|oucJbf){Gd>`n z7F(_12Z2MEsBhW4l<@T{vIbk2rp5z@wPiG`>#ljIg~i9%~}{+ zaT<+dkldi=TLwJmQj%-?7T9<{P#2s?2tB~Vg{AZSgwnnLZ4Gklil%pPknw~ucz!|& z0eeQ`3fjBYAFP5kOvamp!hq)|lo?s@u;e(Wq=%w%c|{nx(5&Clh=*$qWroKw+}&4W zD9M5^pmAYQmNkbG-w~qQmmF?i0Rj7~}+ zCn~*!N9tD6s;-;G!XZ%xJZDov^1(?MN>sEl(Sx{?dS_d<0M!2HQo`r6R8emC>OH=1 zP{$Z}&Y>j7hOHw?aufOkJgD!ZRr1{XY>k2EY)We9@OP3*X1y7cqdpTZvz+V1MxXSy zyYfl4dN2C%X>DqHJ&wM;i(vX`0k*%I1lp*rjv4V?n}N+FKT8iya9I+zXDumVw=dvV z;ZvfpEz5B85b5M?C(lD<92m+^6ozq$IYikPz}NkM4wCn@dzsl*wH+50MUldmbW(KeCnp6e)9wUjJ&x2QFX^QT93f>4bTSvQItw zPJbRE)6g=LCtv)qgkn#@QPP&;|g3=T){0# z?*8OEc=H-9@RoQ6k?|vpa@9fKI{hV92ZLxF7RJ>m&lv+pDB1leE@F$a{`Do0rn(!} zWS=t;1`n*xCA<@cO7L`|0;~PJL_3KDrStd>iy*$;quEqBU)s3^33WS=!z;|u^fM6- z1N$ZnWvdLI30)TZo&JfHaFiM!x5baETs(l1+d8c(IbR*ReO16S3sp;semy80{-E1; zHYl)k`~E#B%*KLzdQS{DcXnPhqka5H+U+pU|f znUt*)3QaF=wtz>`kNilhRk;Wdr4Dy1wmjEca^;8#3IH;Sn}6*-Kz&~Tuy+eQQq%mV z=U=ws6qKO;LQV5si|ijU`F?xCA1k0zkgZFXE8$fJxxp9wcCTLfoz@>iwEz%t_Kv&K ze(3M~NfYcygOxa1)8#_P68v-jog%BjL$F2VHPUPydtGlza$8M{r30JbiO(Q!)s$Ez zu-Wvd#Y#9*(|f*T-R%_2zO3wr(w@0v!oyxe&N6WPgzqk8*z z^{x>de}~wm+E6dg7N5)J8)PT3_gUuwp&qmn9#q>1!d0+az;XeKn|fL5Vi>;2YD!&m3?D?7i#)^dI&`^EMVDcCEXb8gH+;}# zq%J6NcKD3UK8$0WFM*&G1%$sq>-lBwe+HAfu`9( zK-7(6u?uUG)-d{CXBYO)7|!t|%6 z7^{QxSq)Xf8LJD+t>A!%ahR(M>rYiBOeyof$qohAtkq?IWZMeUWX#oJhs^_XrdMa2 zgFk&>YIU!{Q7vPw4(;#h)iqrbjw3TyH(nbxw%F`OL`08HL}X;I-=NDxfpFKbn994E zc4uj3CaqC!$u0iHWQJz21S@oEGDLN_=bEbwUI;`re%t1PX&l6XsAUapY*dFEG0><7 zQOn$oqI2-@@%$xWu%}mz(4RjG%35v=js>PJZM?k$g1SA(V_P&Dyu6iHmTba8O|k)_ zd^?N_+d%eB5QFfvNaP1E`mt_1)VczpO&=3?xQt#ErcKujx6!4N zLzl7pNZ40c2Z&JS?!M1#htC3Lh6RloYGGLL^{@NU$qNK8 zE5dQvFBxi~)F~wJFV0R1<4WKs;0RU@*1;N!qeIaXbY%>+ps`c1LiW&u01C%GDpa`{-n6=%8ooK#n@3&O8u|IM%5^RITHduLj`?9JAQ|Cm+`A z;%jyqD_=lsE?EetTv*ZW3-mYn^01Dz^$IB1yy5Jy6atc0-6*mYDgOm>5qbSf{^XVu z>^L4J?(Fa!4GDW~1TJIyyE-U4^M2jJ883*U)L!oZ9S9Pwxua*2>@*#~3g5*cKi-ZEs`;F0%Q=!no{iti;`jw6{6K}sG^jMyOfTFB9 zP913;dIs5@T`;YzD7r@uWf-E}E)YS#zI5bAh=U_Vcd1c(cCwL!gqIuZHpFo66rrCX zP?LuO1enY5LM1y21KsiqZ$T6WCnD%VZx>%oNWRR&R)#JzvNt)pp+^Jruy~K$k|Me; zpb7B$SGq1#ZW*0}kXByfl7F@UEGuUyMfvxfA}hyzG04QA3u9Oo${yndQSg0bP!0lS z2Z%f%(A<0F=FhaD>x-zM3v8S{KIl3p@~>g_9h{JiLn4^{*qRMBMD8~>p|t9n1_YX} z3F}wlOBw~>Orz`Kz)NEGeTFWeQqh7U+dXoSK{{-r>w@%L{LwAY#V@ICS!&q z-G=7W>`n9|0Ca)%K=a9=ftBnix}}T?LPUz9mIN37cO6Yi}KAM;Y96an&lh!hIsv=VbwZVE`qFw~U!kq7CFch7J~r@g3_5 zMCedL+bZl!Q2L5(<#3MD+s3n(g|-!h zYt-hr$8S!%|rx(LHLY z>LOIz_pj$1j=s^d=%XREqUefY?#sNKgodc?mAEirL3v(Ct105Xi9zn}w6+>Nxuqq{LMb_ta zdK?Sac?j(q`5Aj%KbY_0YGZ?-WoQ||5%oVfx|bPy_to>lfhz$dZ9i71Ef(YmlU|9^ z_&sz&7IrYT!d4&@eK#cSCM5dKl`Or|ag(CG>*3IS z&pGg4$*@p_PRL@&l=N#Dg4;r+0~W)wLpMmXR+#PSx}P+Ag`Z={RLzVPPOD~mg`Z=H z_Ax`H(+nYlKt=?WG8r;dQ?YKB(qpT%1iY`~*)kh^G`MPgj+Izw67@HkoGAmHs+ru+ zD-wA(B;V{tCbcwi#-l{Nz#0*%!<+>c2oFezA|DTg&?#!^1;UZ?6GyX+@8@YO7L3x8 z58XU5ws(?iZv3eIyt`L#Fi3({yQLV=HEe!X=fz5#lGo(Yu>B{Fkn0mUc`Dj|g9>Sw zw@@_9lmu3;3fn7eK)%`7`p0{ogT|37ErojIje85f=W<>|-P`E%sI}@kFKr;SFt!*^j(4<^sK_aE^u>(al_ z>nQ~Fb;tI$A7Nq!sdwa~xt|V8%(qB?O1e1noex{%yOp9%^L}q~^3acw7mf!pt18wR zGsNs~FI*PJ6qA}}e(`b}WM1EgCG(TKMukTk@nHO+4tSIt2LNj$#zu?g*tWi$G#t6{>8X?hq~8D zvZ}~9b}u3SMRV`*wSDK?AaLJ6PUe5zTR9j7h4Q~}ASE`kVjZ*&u;cQo{k=b+-58~q z$O(Xm$^ zBEQ$14AZIRxo75_69xZ!r?m+foVoJl@fxOQU&gx^cC z<~x`AWHSGSzd+6NoCxiFM zUe7>$40w+l@{l8K$UfKbT|WTc!414XPM)Y^&lkMFS2-&tyJ=@N5jEMmc^3XAea3ns z^E07$_`JJ$n+ye~Pdu^StONOyc5l(eGm*ER02dbbN`YeSOh zxcRY_i5^;wjT5n{x6oxjxj?$;76iDpn1Wl`wWK`{6dtyYw0WSOBsR_(pVh~STpm;s zIbr-Dhm5u`^$n)5HK6;B1MkIsdXSS`3g*;vOe<)8Q@@DXUol8;M(I{IJIQUvBkv4J z+3n~_t2 zyb(I!s1LXc9>x-|${zdBz-6;#kK-nLZ9OS%hfVfU**82rPUlPv3x%Ohmh}N+`!*5e z{~%R`Sq_+v0)+8|mE!$JnsUV;?pUJ_Il$rA@AY3EcaRw#_>M5%r+|gdWOjI*M#B>w zbS^-4tOElL9WjqY+FkIMV^@R;Kgd;GS-c4gF+D|dDYmG538A-Z0k%e|F*d|B#9{01 zpqz*>&g)jAyc=aolGnRwqY<^J~|E`Xyy3 z4#S{+2p5}wg&g8I@%68ts2@|Ap8fKP4)X0#UizZ?!!DoTz=8T(oIX08+qOHXtn0oy za`3lP=+ih@QRBI6=d=3Pvel8&#(~x6Vfz@J?DMkyH^BDDYReuxfNeguLDn!{cYiM1 ze*@!=zr#B-fbn_QI^2V;MF1twVf*>571n&jR~EKbSVvShe!i`Ry6g~F&BGS$XfoJ# z9=2cH(SO4hl>uQa2H2X7etM!$_WF!*O!y4Eeyee5te|^TZd=Qy?b~|)kn4!vo|_XF zHL&F`+(zr)e_UcY`D3cVMqaav$y-xhYJL44EhA(6#aCHTEJszxI%MewN3av z-SSgUPF3j<_SYPSneW4zhvnT*)*i6QA1y6>c*1D;Xn#Ubl4`B`L0!{&m7Y4Oz>eB* zsl*i`I?Ht%HcAi++f0b{i9b|!s$JaXw*8^r8!k$N{<&s0?1p+f(i$T_>(zGn`aB0;EfZPz~$^cfC;F`4Y$Ah3$Zp}ZRMNt?{57mM$Aq8;j(ZxCbRyb-eE4v zhPoJ6JGRR;nRw%h;&dY`jL`wosi^cVf{NWSFHJQtX&hVQO0O@_{%wEw`#Zm^QF6c^ z&pPwRpQ6Ow=|yic1lQcPi_MM)rz@(EU5IG z)jAQTG_ue6Nkzr*ZI~;5kuni9IniA`=C?Z?NfB6+x%FOTaH^42cxpP5B3eMP+af0~ z5O+k_f(WRHgJ*FVsMuO-zv$N2qk<)V%nSQP`+n0$;x}gq0{S%_75FO|sCe%6{Lv{u zg_8$Y^k0gP!vPf-2Asmj9%`h_4<~cV^M$uQ3n$#z!=l42Ojj zeZFuXz^V0v8&B(i=%XE@t73Iut-uA|e{{-)D|(2ILtS`3>3EF9hPz!PS2_-Luj~6? z`YaBeT)52P9t_|RqhVlPr+#qF-L6Bu^zDrS!c98MiSI9SQvkqmu)VDYe%Ac`KJOuT zh^mzV;LBZ7xWJ@G=@&9#zaYP`p(YLgS-+sXsdriBEWf}4@S2*mt#$^y0ALI_6kYHO zn5_LjQox~D1AyVdEaXs1IgHoT+Z_^3U1r5_D5bXbn9n+tze9eJZGE_L1wuYiTw)6$ zDjmlj<$?!Kqzev(0-k8!Z~GDQ1BJ8Yhs@yHlR*)EeJ8yWVPx1jDSvYB#Gc^SBT{ke zpWtM@go{qphaVBH!IZ=+5U;l{yxg?||D51&At|mK<)x@P+;e>|Mx~Wr90c#B$}I# zboTv732pRLUFr^w+d5`P*Ai{cqv7xz5eR*&a&YUg9lzCpW3ZEFUE!(iCZrd8R*RS% z4Nvm->#c2DM-!>8 zgLcl7Ek-Msx29ESVU)c4mhO9c5)Yz0Pv;MZ6*_wHgV4l1jU{ig?1;4`l9V26j>_^= zXDmRAry|T#`M4=Zqe5}sV{cc-k=kNFlv~z2w}?3UH;+gmp&4euq=nk*GR;y1T5Ojs zJS-_rtWXq=9vdp(sH;+;fkdgaKcwBfq6nTE0-*_Xv*5v?;Y_mxG7MU3V~CkDXgHV! zi4xcFkocH4kZw?O+DET7`F62?Dc;#C7&U;ik6XT`-r7Q&ZWbIeXgkv^NE9&WrVHEG z&<$EhZ6C!j3~DK>*cJVfZqUa>x>=$88cpIbjJ42h-vipeR1&S*Lc70g6o~M==J4s>4iBJX-S+Hs9ZZ0#Ro? zK-7h;mQ4p@+@40Qo-YCsD8m^*giUG=4>d7>h$!QjKx}0|IPO$Lv>^k+;RuM@^FUZP z;z4Nhd=N&Il~WJ~%B`R{fG~~${(YQBF)YfsmP#QC1N^$}vT7+`06(HEJyDOqPh?Ue z7s8;7n*u+Pv2FHM+LORBz_wv|voCBL=ZUWTF^s}VzeVnD-S!PyGP3P4#-@Ma zAB?%5ZKqj;{L0Nm=_ymB>}_l?mz8dhS??IqoV}8mkhJyI^@T+}*D$4`YAFpH;!a(T z6^J;6$8LU$G4obXxt9}eDH^n_b;wE>N}KO-?0a&+>1a8=T%rxn612xXeB-*Cc=$^6 z3;Wd~4R69j_T*r~cuo>G=SPx^P5#;npF?ySOAYOFRx{6x{Kw3zzJjh_RQkab-a=lrXcsxI5Ul7%RNFtaq)}aC@#C(f2Y|o3kxkAnVMp zS0uG_HsJ*BUbqCISZ2NYuAMTJXS;Y>do4oR%kFN(><8}fZ9!1**71)Gf|P${slPHtPZhC#t`i9s^jMtYc%&7&Bk;Pz?T z;Na_q#A(|UIbRQF*(TO=xc~b~mTibp4|3IHq}wgD>9)bZ7j|x5UwC=iHpEkxEoEoe z#)+`CM2}^gXn`B2wu(&I1~71@*>$%r!#3JErFc+q_zc^`5;gqVXV?bzp{3K5ZIm7F zZ-`^qrZQ@*Cn|M@KjfHvH`oDCni3b`q12I|DJ}yKg@<$D1et}0f>VU8TATg`4>NcI z9xz&9b1-Tg6AySwjH(RNsJaY1;HQncMaFcs2&646qgJ*S3AFyLQAzL^%cg0g1~PU{ z`wXKpca83pQNLl=%wrjdC`#VYcMa1r0Dbe+1~{SVmYIV7p`4s>WSN=J2j3bi{dwq9 zV5yZX=tm3WcgBtZe&ZO>$Ar`?!!tU7-*5)>A-J2uZ#zK0x3y+9k%iyz*}i2CelhJE zN=`9+3mw0$3 z{{Fsy<&jC^~{%LisLE7%w5&LoW1HSNbYw{q{BMM!jb zp?cxS(l~>XnS{hvag{$h_(XJ;>AIOt5h6%)b5n*0!j-_0NvNIJ5+e|K3UA-IdFx8{ zMJz(1{9W9JyCaw$r=U&KgjOS6g4)u@qt(;C-^U`vF9}#cak@&P5`s7BESo_Ho^j3c z<(0s32H~wLM?Cx9986YsSU8LDlE`B1$o-hh`@M95BZJUtEGKl^_yD_zK;{;WwC`sS zVtfm~vy#!-Qbh=65fWYRX@Elw^z*Z35#nNu&OWDQV*)ms=mJM3A&!=#S$b)qNQIa# zaAXl~^KQ`k-Pgi;!49s6#9;Kb?9*Bz&5XSemG)eg7rG@nt{18HAW;;wshz zV_o1lgAhY7i9NjQ%%%#l8H7cTRC)8?$Li+i6|P}F$Rs2dUdD!wS1Jv;%shF0mBw-< z&wf3lOKn_~H~PZ+7!tA=sVxnVARfC)N|(jP0V7J+s0iit7GB$m^JUX!q%=VQG0Pg^v&;zYa)vdw_{}t9nbNqgPsx+v zVVV4@+FD+@YM)W1$u>!!=sUJhAt1eMyaNdXJX>LMh%Zr8lB!-U`CH{4}I8w4tVtrO0{%~^uPj`oFCJKmFy?_8{%`UF4rPz4pwDoh9P z0u`Fz@3eC}V#az46)11|zXKS}7M66eSWx#Xg+;}luM-y2btkC(>xCsA-8>rpmBJFc z;vN#eLbD(&akO4?!3974CbDJa8XjEc>lLs}dZI^70RLz`WtkdOVgZNW5NEF8+W8VGpr z;U*!gUiZ^~%(pFO>!-KVO1P-!IQ=}x#ZorI%|2aI4sim)%CmjxXzHw%eEqZggtRHc9V^iK6_YGXu3T4xg;I72hjxpkpZHXzU91 zI!sOXd%R}LDl0)NRHA#aXHo0B^Z?HCeMHyaVlEc{jIwY}c2AUyosERwb0V8AVY4H4 zxD0|vJD(b|4bnlVshx2;Ri}30?I!K}|3ZHcRScH0DWXhFr9urH6>^cjzEYI_To2+i zX>}tlUZ`3@=}cKhwkuk_Z;goQP4xFrUF6&%VU!}1+E93f%u=Aj-#XHuKshE5lN7rG z$`eqRAqhkb;9}eYIXC}`{vN8~JUSB!`LXuXJ{0Q!f+(*^!A|4vg{*e4{D z5H4ho2j-c)#s!{D=TS<(q6w=9RQ%E#FJsFc0> zRcJ4`O0bDkXcL{^#ZdKwIoZ94@cm8i@l~@6n$Lml z@;?lj9NQtDkWfrb=ZB-s`uZD?_Hv6y?eH{VeCDqTaMvyvs3?E3;qLO95=(-(?JGv6Yd3o4wn)H|b4Exu|8lV2=C|NpWX*eK@5`-fE-3i2U0j_}BEuA3tUn z-W9gc?Kr0Mw0}!${UyN?+uj%MS5iQEq5b|6&R6@+mAs9r?u4B$RQCL=U`>`==bORE zzq*)@5$laQ-K zK#4$B>7K|d@|i|f^2Y+O97+B~zBvhQ$=BlLe+W?I5Xdj}m6ve)0ITl4)E_!g+n6}K z{i;sP z?1^rritwML{m}nzCB1N7RKy{G!nj9gD$wr@xqpR-CB*b24!ijXipngExJN(bhRJL= zBs`ZJF_uSR;8SiFpr1WD54TYC`>*Au+_Naa>yx#8mK()A!%Fy*wSATwsH$_{OijYt zfEyb`ngcU6iMT-_oOg7lCehkH$1Tt*W&a#aek(T!Q&U5y?8fA#(Q|-(bf(?V+5)Y9 z*61U8vF!Gzug`enc+?D^c<`zpnvL1E84uGuMt5O~q0C&k-kt;rCTd(mWEyziLbyyd z@a-nbvmha;XRm;0x3(lz9416?l>6#1(O{JaBT5nhUdMCKKp_J~@hE`q4fGOUz6kYNa4qDrY! zP;6WbIk{^IG&@_^*rA?`+M!impd08|`ofq`m82oJ&u*7@tIPN43O8MZIu$e5ND=&j+(gm(I! zlVcAHsI=_P^^V1siKF0eUiXDF|9{#wrK3h;k`2*&ckJEj<(dEHod!o`Y5m4dP?c-v zd-tLz#{_x}O=>y~uNGNmRvwD~Q%rYv{I1`_prc!`=ePax+~yLbe2Bq0e&VYKX4bvtzGYXUnJv2Y|}e0anQY9zi}k*RitPzNIp4Y2?y9l#iTDxJSd+kI3j=k?WRz);sU@S$DUV;O$Dt* z7ui6;-eJclRKdAfnZ|&AQ%zyg?rNdp^p1tJEN$e8m1|s zXcMhz1wBJE(jQW`PD>+h)x=OA;5LS<^x&c-p5 z%!vpQ5%0Qfg@*H-=Y5|)-p{A!^Lw6O-S@iITHp0u>sssD_oV^B3JAOK+GGLtMk(hq zh31IE)E&g++j2#Qb|2z>?7+!CMRGF@%7SBm9NXv$DjjM?LDIhM7jIngfJ63Hy8T5O zlp#tj9b+I+X^T1JNQuc2n)4f`T7V?k$3)NB$xb!z4xVsWdKc0Z{?s)n36S@p}z=d$|~rq z)?xNkc6u|ueVN>CGA=XMqJYPP+x0V=V0XPOb&yDR%WU+?MRr-iF+Vz7GTBQ^#O1|B z_Mt5*i*GhenGD_b8O1ejg zZvCXo+{GJ5w{ESZRBMF46R?O8DIy|7X?KY&4)(%L$?0bo+Q_ph!FHd|Kb1Qi<9Ou6 z_!j7~Og1O|UO5hTV!_7)&wChTS6>WEa2u^(jZj`|)eU!~SK_Fh0Nv{$agTb{e2=^X zE}zo8vWdw<$6(rxft3_<#UEELlar7a(Ru)rc>fH6p|Dc6%6DehkcQA-sYG|AuQ-}2 z2c4haE9)${CUu~>w4n7jd% zGP%~=1Ix6YY(8%nzNB?lH8fA|e$~2Ku5pA}kfwFGJG5Swv~KF}>*udr(t0w#FkqoW z*oGX?Z5TXw9Y;Zt+XYrXWC{TD=leVE|(Xv327OD z)|2_s!bj%v<_G4@mo@(w=iYxjH+SgkOPXR< zeE!PV2OT=IeTSQqp(|&t8!PK6qx6@bpF1EX-U<$Guo&W+b}S%fEi?}+^|u} zxePI|U(c%kkBIqqwlj_)#YDguX2EuoK;FHRVh6!?S%+aikF?IGw7H>Uc-0*OB{mJ3 zk~+tSa&YUz`)zy#wP6{wKvA9UN?kXz6evgDrkKYd^Ok=Mlz$1CGcn24(t3w0sL(E} z=wgo>ly_-LQuB?QttR0j8Xb&=mFCv$ji$BD6C4c(U=pGM{r_|KL1 z+gs^XE3e~aB#kwkIo7l0?q3{M*&YED2RHxh`w>RRnAdQ?mo3IzuH&rPt(fbW_}A*g zYHWn!C^GF}U_KVG}0d15?bTdxabB3T?o^{a#@(ylz1^2_^Ak zpj9*^|Ekp7O|GJRLN6RH6W?jGparquslZ@G)1ity!PA%6FlI)X@M#kMn3GL^Cp|S6 z-2+?pGV}RSfyybjpuoZWrq!W7M_;j9`L&&?`^gh(xrzSmDToo0;N(ub z66r>J%eUT+IfIelo4RK8+d(!u5^|)h`w>~f0dC-3lN5IO_orBFR`-niIYy7vrr=5n zayMt+zLl0*>Al?nXyDTe@OOjt{-!f-au)i>By#nt&GfbZUL9Iduy+(t!GvUJUiPMM_;;hw%Ue~I75T*{=Yoh<8+US?)>V zA56)PgS+ukHG|~pT09?oO9A#<0XyRP#2 zQ@yUj_ma+^l6dse((LnX?WlX#8XVlJQovLV4F=@}d&ewqUN^e=*I8YU*IBz>t$hge zaKfcXBNaoRTC0gYC%Q*R`zF29RjOG%xyC{lT&{C};*6I}_qdc3v7j?(Fh4EDk9cCE zOWGfsV`O^ob!u*zX#=C~YP8P>GH?Q2ow7Y%M7=!mEDF4)-JQec1VJ-=Ewnl+dvBX4 zTy5}r_Ga-Yokl}q)J8LeVIgkAl>?6g#&PWz47IiRq)x#%Zpy>=skiuM4lo!aA!Pqy znCWgMJ;riJDZjSq(QLabp94BdxntKNA0cqPB6eXU91l2n1o&A4IkcK4h$%$IwG9)mz@{k;=u*- zhG&j4@57Wm0}d#0*H#X^=>=c8*mA6)DKTp8U6~tM2=Z$lX;`JSoe8^mFuYK8zZHD5 z1k}N0?G*%dxEIw?fTiJDe2>7=NGsG)f~A!}E>YL{yJ<-sEW-)-U=M9+%hXYVrQurE zX(4&#J9P-i(mAp^5+Vntq6wFD71znB^w^#{0`m{EhcZ z3h!k16%}~ho{@HS^2Occ7(O?m6+E-cpEz^&t#`-t$FRYC#I&nJRki209M?Zvmnj?|t81o}BdqT3cikvzFh3VUId7}dwtFdmLUVRjhQTwa z|4}adL%1YTHz`dg?>2K{)D6clEzMM!8#?=FT;doUGeQNu$tl|>Ew%HFU@f)kGCZj- zJ?s?`Gb~bN%HA>jO=U`o;6y$kAQh;({%`u?d)vqG+RBuetey_rDSO$DyV@jgZI3rK zVrG<-vfS62ExxDrvGwMHX|;ivWpw1t>%049a=}#DyKcA-AI~?cUlLam1;`wBE~<)Z zL8tw}7c66@Wxqq+eR#|IFFaHn_*Gu&g}F~1(ABdmNqsz0v0Gri7&5I zfG-mT?mQQsyVYs?ch>~}{}Q7jMFT46XPg7tAe9H)W$kwzslX6zP;{vf zu1RTGppClIMiZofM9_3RUqMZV2Lsv&0<(hA?w(?W5(+Vzid`lc&A5`Cl)E|3fld^o zBme)47~T1);!iBOuO7RUxEH!j6K=t$H3kfI#*%|Nf{`-CZ&0c!lG9zqR-caa>Z0G+ zwA~d-pQc|eS|fb#SmqsrenF!ilVg2rkOX7!I$qW#%bzkjvk9qjZTHjl_Pi1I8sm~ zp?CA5jK@J}c7B*~-EyG`;ZPG}=>1q8HX%aoW<9P!%?YK})4r8L!zoc)NJ%>J*Ft?L zAEZ^+@o|&HBoG&UBectv0Ruv{^ctTgn*lPz20+)e2DJz_O(U3*T)afu@MiyOy__K&V*Z%PbIj_XRx$QqBoTnnN+=tw^cocgtdpBSXsp$6ViO4E50JG2q3W#DO*ElhzYAkPXgp^z zw-I0t3g=8jXjcIP288yG_x?s&AyfT8Zh`y)_XnRFL0sN2Yxwa>rLn|IQ+dG)xn z$e_qgtxDcQ{uxpgr1zh(xBI|W=ExNeprQ0v{ay*6!PN=Dq7(r%V3**deQS`sXYks1 zyr)dKawTXm>4UNV1e*WKf8UvM(SJWM<;RH?SbLbUcPu}n1>M#d#`4Gwm)?KDFn#d7 z%)G}rB7gee1#XhePOzTa9y2X~^hYgbZ}{i54CU@NJMsGhMy4E|fNn@l3sjl(SH#2U z5_j-#qhn@%zAm*@QztJ!Y$2?`O7Olxy~a2IPPj6T)g^84gNbh4V5Fm&(OSM3N28&- zUG^nV@*<^-{yyg`RRzJtMX!;-VTfUn^pH1hACgYKIbqVUZ-S}O{#4$)b65kQt6?7^ z?v#`L{n&b%yxLE0`Df}u;5|xIxMTVt^(>J;wK6_wtID=P>Cd+tK1f^W>##n1ZlTXQ zlUv!A2}x1+zU3+Hlk|H;F6ew5ZDh%fe%xeM-&yzTJpfe$CEZ>ZGLZH$5zGAOk^$^+3NdfOPpM}9mF>D_P@Yc`>u5jUT44U&JcNs;3X9_ehBebn$qm3xf_!D z*|+>odeuhtu+PwiFxII@YYab3FG(S#{_f=3y3^2qym9^|xA63_^#1tLzk-piV-B2X zgxxGsnF?+Acr)?WO3Zd?#+k!mUD(Sa^smD@ zyjyKmcuDfA@a~v$B*n2sQ8JNO>wW9soo#gs*@`nI%V89H;$FaEPd5W2q;`h7{v=_I zpwD5tCeC@Z3Y5BH(j=pWFsL8cVAd=I+{wbP>23wrd*6Wro70b<3A|GhG&6dbfue_> z_A+Ej%~=LOJ~4B^lq}FmY8_i;wvKVPtFU_HC#2mV24|6x<^Yt?mCr61s$%lh!#AVEN*p+!c+#m4ao^)A8vN>SS->SfIJm`y|ajbJ|N{L{iJUy zS=0|weogZR(hiY}TIre=O+qAozrlP#+qWj0m9|w5B^`hrEK=d_TwmhOZ+Y2n%Hc8v zObKvAR{1- zgSN&Ia2#g7u47)_ve0GRd&YHojDJtZg6djVpO=`^ROf%E)C8(WU~7LNE&BC8F6JLm zM9UO36d~OX8j29radH_)mQ??LkoM7R0Setk;26OwbFzEcU)7D_)w@0Vt2i5tnuVry zQ{utgMYqawx4%}1~UP_(8_`S zRnL0G$WLjhNG~Ci?79iDzcb(Vn3HLz53L6cAYXvV)^46@FO?!n)MlHRDNZrAz}o571(HR`pO9VpE!-DcNGrlU7S>k|Z2=_Q z$AB|2V1jUH&;AE;ITGZ_o^U(6+}r`9_=UcuHfbA+~Qp8cDj-kBt{Miq}IAr$REYee@@u-||TcBsX24=`@+ydggn;OKIbZ z!MApvJ3&7wrVF$-C^z@%Y6CE7TI-xZf+OJh=2tvZ?e<4FPCuji9gES{hV2$Kp3Dkw zGz=x3(SN*&TG_uf6)-Jhxx-kSbvn25+56T4{o`$FwU@QOK+FjsrVFH|)9bU%=^Kbq zUBP(Tpky1c<1&cFK{qRP?0To>3W((b^BH=LbI&KwKOJjMb%*Nnq+s+2uM`6&dL*{g z^0Js*jLCf^_3U5FBta-5 z4(S-@E{e+<7(oes6_?p8GZeR6Twwnr?1DIqEqg4qeX)qR%sYqG!{;=wiY^DVb$!3Yzq%7_}2Ym2Gh2) zzTu|7R=ORH|KP+FP8M7!7TvVshPWn=cypJ-Po>@^z+=zK$MsPa3Zrgx{FuvM&qOJ;1EjVjNr)_bHN~g2RnyA!US)4pusg9BoLO8b?SucvrG~R zr^AQM19~K(RkS&L`-dZPMTKw##Fe}EZQX`4+fdD*^eiYmD^)}e0z!I?B^A`NLkzpj z9sF@l;wpBW&}O*GbZuK@MIMV_wc$vDo;%T~`yqCRD*R?w0M3;2n)|6&1)etarGKIq{~s@bFd-}>>Z zwm&oN7i}>sO#8hs40neCoO&q?wwti@?)m{}nov5=MQp_jln2h2LoxCLKU#6J4E)HC zUxbxI{JXZUQ{U(+_(NgO%oAARAn)3VM#la~7}U$O;L}Q%qa68>FcND0H2-;(Ji&Gf zD=_H~gavl+!0!V?HAaDG>vY1qRtx2K}Fy4kZW+0o8{QqYW3*gdG6M(Ws-3-mBJ276`ARSoa9Iaum% z*pXHcb+Zk)v*UzK2(^H%J^TEaRC0ZLz_k4>4S0=FJEeZly;m2X6{MtD{vKCRu){M` zV-UdCP&gB@BNtp_(LOn1mJ2XEb>C{rQ%cyg9Q1SoL&DT+=fkiG-V+p?KZYSIoapuU zld)ybJo_=WD$2j}nl||01aQ6Q(`mZ-4;ex_?4NeiMs%38^wRd?5cliTSpQqRKzJ9c4%dvXFlRLx_?t%dh|Esk}lDav8Si}GK&t|!N`20)nhklN5 zuaO5w4#9cKs22;be|7a64m<>%h7gIy9F(J>c{y0_ZQ4Ws%$el`Dc=9+xQ+#U0&%KP#w=IoQu;hZ&K{$q@3t|V8 zx=-uEu^7kGm*6ywg?+>4KEpu#{!boH3T!-zRR=+I1HF8JC6`-XnY8?S{GAl@_DK(w z!MCR61*Fu|(D}di;RO zTGMlfSv{PmPP?voSLAFe0*sCX`DV4)Ncdc z@YnWuZCi1CU+RO8;=>S&ryT7atD=C?c2zs&AA=$K^y98`wsS2Vb1>r8dYb^FC^)I) zrgnz|PBkdFT%amTacdq?fmWGM$NBi%DGK?Vnh;PM%NX^y9K#6ut6gEb`>T5RCm4Jt zz!^dHug~>ry!6=|UNf+vw=<6xkN|u+I?#jVPPY@1> z!Tjs44ED%2P6w@(&rK1kpa^`mR%@23ENbSJeS3?b7JIA`%q&#oDvfpHVH`NXz!XkL zryoAvx!TM@TG3_doq*q8?BQRZ>(w~a94jR7yL$KYkKV@fnN`9k$2Gg`kb5E4^;f`Ok?;{75^*K6q)`=#sAJUMLl+soiF95 zZRTy3)wve9|Ey!D#=mjn6ycxTv9#9r{Qu4!of`iNaU#;o5jp#^(X4Wfyh9cs?ii*i zvHeC_;*+FP$CWIf7@B(7hykXp=6ZtV#^1N%tl-PM$LTRLbo!tk93xeGyvf+)#}8kI zqgjAH95N8BfCC%3aHN*BcXFq_7sb>;!ztv9y6t zext$oXlDAU~9h2&7XJJ3K$!kzp)uH@(UI5Dx8?6hwIm->d4pmhp7@ zoaYQ<#5ZogCi0I&Q&jpx!tfUP$H1RvS{}eF0)L9|PuvzF@?(x7NBk4lTod`0GnPdD zoKF8Kp4`a)L~lq8e@9awa-9ELCSFccWBfm7V#9xARKx!pW-RKVk^iZW9dMNw$Fjr6 zvpeReJs+CFA(d%@CYB23wuPX55ULop(WO< zao&PoopnYqFNXQizP+H!J@?$kq`{~HDCILM?H5tHp_1h)#xh(eweUDwcRDqA!6!a$-wykb7xLv;&298GZ7)t>IZgP~x;OaN zXNAamh$)PHn%;qaN>%P+jO)7aT)FVi_u6}vI~jUMv{2fJB0)YvVsX+hU}M#I(-8>{7c)_DsfHnU3hLiviJ z(?_l{k zD2*iuDt3KhAfPIzj;=K7sC}k1GXZ4HimJs2$WPD2wK^gHg_$vE6}-L0ZOQ{#oBTfc z3u@f~7)NarN1>L-pWktTHSqSMBt=+aX@uYyD3=Q#18N{48YLS)YwiQ2Jlk{AJJt)hvn@-p=vL-40Y+8^q zDX+M&8|-H->|y^LP>tW5A-F)bz7*InvC|bGwN*{TDcPYYWITu1ZAf|*yK@r8)@DFx)>Q%-+yC^+t?RR45=g`9> zhtsb=a(bL)tX2gdNbB6j|+{EEKdsLewb*hLMljs zn6gI1lmi1y>d*FtlrLiHYMcg%SHv~|2d7aNU8}*jfT^$Y5^%ZdmSEeNT5E-p5vid| z7dWZ6Jp(Mq!LQ(;DYEsh&PQ?S)8FiG|FjxXr z`nr!wCv4iFKe^RKtwa_Z!j&&jacIfD3DY^byVm zE)4q_>Emgnk8t4v>EphVK3XlDXNmL!e@6P$FQktG(g&VgB7NiqG}7=bdSwx{rXc}{>3m*&!iIkG@O^_%U_*c9zo z9xLhn4X1M)tNBtD`^v+~r|-ShWt6WSs{Gw{_}nz)s}R;|6+)W@p0g2FVUMb?ScN_r zu^!docFC{Dr|NfN_MahH$y#|{u%z`bNp4>uVgqN6U@kmK=$GOb3a}i2%eudmz!?a4qO2xlrx4tL{DEh#BKcDP9itF1b&NcXD4@XeDaYD%Ew|A6kG|S=jqh68^E+z z%AGNU9y!IXhZv#*iBC$7V|#vqUhH&V>oJtPo^S~K_Pwvi?OM+}CnqdJ^%~%QRpT}W zLP{E#_BY>AD-_w?yWG|qHGomIbHg04cg#O9M#)RYdOXyNg$z$7Pp>7njtqx@gQ?)) z(gg=6fP{Au#~pI?uQtH11Vu~ zf!mPj#-SU?~Z5QthpU;-czMMEGF5J&(762Bl&P3JiN3j%upfdbzmFs#i2OG6+U z5QzGMz&=1AfrdaTfWar{3tr?Av%z?A<+Se1pyz9799XS;)>{qh3HrS9}*o@hzX@v9w1x1Qz z-`rZVP2f z6SKC?IRBVFL{yPd=uOFV97nMQHc!g1Yv?2$m=X`Crl842FjVdepv*`SDBaAXS~@`5|=`#5A@1 zqBOcP-nhf3*{_^DeFGCbKY9&9pr)^`-n+cB`7%_xaiL05)?;b$AbEx+c@jzym4ZF^ zun~3k@|@;IdVO}Xy9$YSx20q{MXuNapV%7d&Ygil1L$(4X6kBeMImcwer~2AU|_*J~7%LfcnCqjb|NW0Uk5HS}kuRUP>DH&pl5? zOzsbATK_siL3#~*MjchX8=Y(z9HKPHg^*-cX2>BC6}-8~aL6?}eKg7CYGSKX4QCX6 zNL$hA1UBy9u?_Gx{YE@|7#qH*O{~jM#l}xCAl!WF6h4WC50%5>gni~EOr*#v)V_O! z4|=%||4oEue;HJ#0t>}F zdOH-iXjKUDypaZcx$3Wk30Z|>jr#~fJ44{(=zSjsHxclKieZq6n3;(KWoyYpWn9Gf zvHqswheM!dAtnH`v^t$bcPIQpc8!jOZw9N~+JcAAquYI&SgV%%Dh?7L)B5$4560I_ zC%YJM&Q#^>J3H_N?kwaQNU850?IVtAT{hi+m*lVa2gNSg`UuFr;cb4g8Ql(N58ps0pKNERObH&yj^2TXkN?7#&WW-aA(0;Y4{pBa zgrxh@X9vX#S$XahK2+Si%^}pPZyoVGoM&=?{4#Ss(9~_qcAe_YXh(fM_^3WE`XpAf zcw3xrgA9^{OpJK$7zBiXTjRj3Sa2)3cqVmTX&JS^-{Zx(OR%QO5SM@WniOc;F@(*C60@$zs zwyC2emuC^u(j4#ag0~G*($CHH9QIKE9H*N5YLx%%Ss|gK(&-r7?ZSuM8XLAbfWeDO z-_?7Ao2`S2*pW4wx^RFjyto_HZ2#eqQ@51$8*^I&w=c%xA=)PCVSWy#w5H4XNCoG=Xi*JRjkV^ zRmhqE{Oa2%j=z;B%3f>{qE~$aFHk2(Xn$}ZtW=6gelPw3iHiukb5yxK6`___Pn5^! z>Y2y`Wvn>;M(pEgg`CHM(317)aeZ)5{LWBH(L}@;F1al8`|`R|X%@ zza63W!YlrLpHuk>b^fBng7i@5{a)rS9MG>^Lz%F;ZZ7tYui1J%S}l@qbd{I+qh=mx zfgCiEr6Ze1#}3fzp+^k&ghmcE#NA>napP|8LC|`TD$C(iD8G5D9dcbGIf9JC}#An8` zbPJUS&1W^>vrzC^`5+q#d=|LEXWPMNfj{zDJmRyS6+Xj*&+PV}jsu@zX+FcxKG_aF z!-LOYTdk0@(q|~RV`9l?LAl0JNjv6084+_8(gAd$ccotr82n)RvNRYS?8aZe80-~kmv1cLT zx6*}NPB~8km_ovO0+9p#4#=UD4{oJkfSzG#W3hL2<%3e_i>+5N?N35VrJ#v8x=NAs z>PbRY`w-q<{PZaFT}f^yse7XpNl(3mAvc&VthWV(9qI;HTE8kb03u2XG}A#t=>X#D z-n)8ZAh-8gA0j!x|GMOjsTO#2)0b;~v3b&3f-UgXle?4wkqR`Bb@s^TLH?L1 zgMelW9p=D-^ya+QKDWM!4Kt8AVxYQ!c73FGhxqJq&N=u$KPD-p$H&wyg}Ch-l0q9) zZwHb>0RKah`U&8dk<_xh1Axau-sz_0okhSe%RBLqclaRh09=r~WBAtfL03Oqp(q~# zj`k2Pyiyf2+a5CVM?n93d&$qew}F9XIWM+yW>`!~9jaCZzH?ib(Vq!Y3a;<~?OR56 z(|KbGuT(&mgAp6J@EWRPD=YLkX_a7hyD36sb%sFzR5jAaj0l7vXmw_@wLQB*H5JO_ zuQ0@m@8_<07<~_K@5Chv8O?dWPy2&doWx!9)dIbLG%|+?L)J<) ze;=!1B7PX3({74(T@`^zF6M+(Nx+O4idcd`OZb#1_{}n>wabYdNg>W+_WV*u+bh5iPU;Qzm~*r@ls|1bU9Sz^gDgGR4$wBo7yHCUScNJ2+wGG zN+pdhlZ)UbrrwcK)Q(B+oY-IucnO3exX6Jtek^OQOJx3WQrT3dPv0jB6UCIB*H?lK zW-wIAB(J_H7_gd$#`~VwNhB`}FXPr#$U(c1x>}JDNs&mBaBEVu`)uxOE=FHdO4@*o zTRH0#>}T;e%yY1zN~v4mmGLmZp0H{-3ZYVC_BS%U6jyJXo=PdvO z#h`)hQXXif9GygbytW^_G87Dqf0h*tQ!?nZDzdjJsF}`tP_9dkRp0iKoRPE z_6i3or#yRnv(Qmg%`RnlB_0_jb~dR(JB)bdO&pX0NC6YTcnP20AryKjiHGPM76)^q zKoemr!l*2c+gf(t5eiesrVFEvSt);vSQc32(V5 z7rFwbmKgsnFjuKTUJ0X5HOa{u=)MTBx+0YTQonSUY$FazXh6kqL*SJuGNkId%|Psi z!7NGHPeAuBr0$Ir7-I`?&LADp%^UV3B@dDzMvWLL6C{4b_DnWn&;W|FJw!(tg&8Y_ zS9$ZjqiA>~GN|1gCr{OYr^rj5f_5_E zDcF%Cg~=CBiGf-Fg{NQ;u87n!G*3~%QwwGVPr*P2JQcF&DKyPf$k-SC)l)o3(e^Jq zg*YD>;V*g$xAy~5>42y3%RHs_m<-L`|L7@%4t>Atm*{@l+ppis`GT5H>`LmVXm?kd=_YgDxo&cu?n1r}E}M$=5nh4zU$yBp;5c zy)ebG2s32y05fPeD=sendzdXQ9@+N*%)Tt105IG9GngTZ2be*-AAuRNc&L(*#rM!y zBYufBdVn=3Us<_cVlFq!Y zy&=JdO#4-s%wVSb2Vm80)&q$+>os(8ffU}mIM1HC8z**J52ueju1HQ8TO@atGtg(=Sb%TvUrmAA8_OrS&?iOu@hK@PFsx$F zI7jW#@l9eWz{6KxH*cH5j^!$icl)fx?R^iSuL7T&Bu?-u*ufQtFcziMS4k05QV@bG zA7n?tl@kNkg^2|zHP`6mh_ZWXW~X@I=#4DQxoY4Oj^>3}DktX}tkNs)z>_$G%h1 z{sQav?^Hy)oZ$Ul#myUJQQxU(4=N^pt0Ei$L4BtpTHy`vN);1mDq>fth;x3OGcrHL zGS9eT8}OarAKDfKBeq4Yuq_B)X4??3?V{j+VcRe8fpbk?-~+Z@f{)u@@1LlKCG!)x z<(2SPulT_D&QmabBsSkws{ioZ)CR_aG?sOqEbj=M8RtS+8wIM>QLQrp25-iE-us8i zf&W8FNnGGb!iYLdI(8%6K)xk|6n1$8z z!f^~o?YcgX(Au?(ZY``GNukO7)*iOC$)nvqH!!2-5RA@1I{ftA&AFfyyTY4n8|YAG z8K81?-25ydJaWmkSH0mxh}6u)Ds~9W+yMt6c5UstF9Qu>^7M;A_DQzJz8u-z&3T2@ z_z$q`6BY4VC-+$ov+N9f|D->;=e;4@La@S5Clvt6-v=uod0DU$7K0U#{C%(@NTvlV z&r+~10%~QjE&~)C&qIRsM}Q*Aho5;3O`t&d1TA_{`D)+my{|`77vh-c`6qLXF$2RY z)WSh4Pi~!m_Fgxm(dbTi{s7_b?{NAIv01vo%TNbtW^HZcY#Gekn)#&+8n=t41Ib_? zd}J%6-VLnJ!oxuZ(u}gY^J_lQB3$$>EV!t@f^ieUIR_ksU6^m7M%`6_L%iwq8~m?f z{11x;dX-#;17Oq(?mifcVvhseZ+jy#Q9;THDQ8<2rez^ROK5Jf0`IOA#wYvU(!`CV z5`8Oox=bym9Js0lKpuGJbq&nA&;b^80!7vM)p1otok%Y_lxjY@Gs*S>D;17xz-cUM z-%ukX{y*W+9dKCf8doKkYBH(=--&-@m^d5G2{UYnpBw`e9&8Ke^pG%AJ*K@6sokCR zy&(F~g;eEZC-)I)QA=2gTHelO{;oIQr7~RltebMx& zVrj?8#YFU#Nyss?Mv)a*kgCe>!_vt>5iA98pix=BJ~!Vm5&djc z45mB}@(5W(^V34|vbhLpNUdl$GS@AtUVD&*{64nIHFP@!tCZx15K~JyOoe^v@%b{S zhXO2U*CX>z82#aMH0;<78mZ+EF@dtXEpvVpr^$h%*6c32wS6o*+}VNh@SANeqOV?2 zg?2;j-e??YN)GN!Y5}T5|2qV#=p4@lxYK8x!<*;<&Ti&5zp_BP#%XZCc`dlUD8_$+ zWxh)OuV%Puf;i>j134QVRHp#ja@eLVY^$E{M&G)AHV0e7>A6qI-cd>w**U>26vzW& zA~kTqhCopV!UBQa4pi9oLIJ-}aF6{FXcpHZbQE1-NMEC;{}S2#uvcYM;en(V8fduj z!gs_8$tvBFT+pUMig4K8;NiL#6P-U{!$cW9sR(CK?2&2}CNRhYaJK|5^d!D(h6_n5 zlA3f#j}Epx$c~dYgL;ZN1vWkQv-KM(^}U?PrZP)tJ@NqDO7s7w9#WC~kJTgp->VnW zF;P74?|FFHT(Glv*VrF8w_?R^M|$>(fmmqXA)94n%ha=#y{c=z5vpyexwALm97qtd z4~N@lpo&Dpl_gNa{`|p%_hFwMR1Dkmg2)79;|rHcArIV%KpeHXV+5g!a$9L=dB(y{ z83#LC@Naqc5o_2hcV~FRF^v9Mh*J5IGUH+AoPwRb zwOrBZI?1`SSW=GR{#aW_spKzZG>kCNLRIn51wi{fjt{i9VmC9Wg`GXSvOx{p9>hNS zIp|B?_luA3l;rx-i-Ao-H9-(YaALhV7lv}GMWOtLOOPBX^HteX^Q?}No5%(i+M0;_;X*7V>`Fh%AiQrI$-oYy zAh0mfYk&(*D$f5C&b;QIZJYh@AhgflW4_^-rw*^OAHnK@W!|+=qkx*sn&&Cqzv%SR zn{vPAB?)D#UA7VqN&C$-6c_S~%PN;&n}1ihrL)hxIZO0NNhUjCzk|jtrBGg-H2K5( zZ>IL>y>44yKjOrI|M($tw0|=c(i*73sB0N>MSITMp%m~TX!`hfMpt`gt%7=5EgoTo zcdSR@>b9>t2!?i_Yj7;sL@2`rq1Mt9k`!|H9}0<#p@h24Sh0|MO|K+cvLkPpiVH^m z{+>ZV;;EC^G)L^1wsKJlzHUIpp2w#V$$JJ2<*3v8B@!dXh9&hSs|2?PPzxi!h?#_m-Wd-qp z_ZiM{HAoMKW$gObvidhtjqeMFltyh-+sKL{pSWRKC=~kPA`|L?9afgH<{es9O!`fN z%lsredG4W4>9{QN7qG`O-tA-h^*QuUp5y!ST=|cmTP6?F>vH3KvJ|04ftx&&*NC00 z*pG_t=gGRMc=Y5x&k?KM5a(_2t(GrOlCl~$t@g%Dr|>raVF|`ei{SUHCMG={mu*=c z_w+;%#^VhXB-U4{XLhTS?isu|t3^#Zb+R-n1k)gW^$AtLP#blchjgl~2b5fV0=Ft! zHT9j*vv=rZ3fR6zA!fn+pIgth=xH(!1z*awB(A9*$8Wy2=CoAHR24=q!ep$0c=Xy_BY6Z5T ziiun{a~hRUB1b6ShZQJ(K@A9AgB92zj=B_FfMu@ZRI}zH@aAEoWjW$)8+fLjrB#ob zZY8i}Y~w>hiDkqlG=O0S&)&HG&a9ZCm>m1|JCQF!hW5YZ)j4F3zVC?jYvXkpv$|2L zu|M=PJ;aT$FpN|?x2vKyUaCcnuHPPC;bkVVAd?9Z1lp|I5SjpG)N%KX!OlbCnd2_B4lpy1BLuooNY_ ziaIIo!~MBCv;BBe1+)DyA_n{Wz}>mvvW6-G29(Hm_S7KN7{$OJOyD`Zo+1g%2<}I$ z0e^DAi?<_R;K3PHU{h=6y2vtgGR~T7g@QRj7!czo8&#L|e3xHZJjMTH@DDr$?-!po zEANS5BaGJkLhdp3HXYGoAsZ9<{<@d&AP8=8S?TC6dK15QbWv`hsy@o!GAQu@gIeh6 zxfZ{)gJWIwCUXse!E0vk&Ah)@*--$$v*weMj~Z{p037o_JyfdY5P+1H`4^*2GWO7! z5Lp17Z{0>RiF^KPVqG9rcJ?9%d3u1;*FqN6Ex#e;kfu2tuUG|tTJ+rY>?Uk|6D1CX zKsn2_<5vRh9ec0DQ6Of58D?^Q>p~>yLmy9%ieRPN*OE(Y^5Eyw80(jZ`y*psT6VKB zRy*gi%^N+LVqAp^3!|B!zJmWGcSP<0{btvaYZ#9+?_s1Ux$Z{TWeoQ#&FS|S{YqD_ z+05Dk3mt!xd6*v9&3fGm3Z;KwC;(QTiq1Ylhc%h-D zuX`X8BBy1Gj&i7WF5;U14H6auO!>U!_z!T0U33a+(2VS=Q`^_|dC&J@vsaFtYHlZH z0ujG50Q#09{wF{nv2)WeIB9a5W2jJ)lwk`fjCv_O*Rn`wMV}%%DZ!o!wF4@%_XFqm z9uSkdGkSNzdmWrl!FHiuYg}?@Qe{f!AxOy2{jQeG5r=q;FkUCcRPBr{_hdylY=H;U z<%B~&e0glU=5H--&N96vtvi`Ev!cNF*eRbNJK)a${h_*?PhNYnBRM5tSSHl!kv&n2hKwr1Z)A^6oDx; zdS*<7U(RfBIy;EpyyI5{>7DPw5r!4L@>EBar0U~748&(2BT1is%yg^utJx_Q;Q2!& zO$p;dA^0^`tMxG0zE`e48A<)i#J+wBMEDU91|ObazYsH8b6Ex!@ew5VyhNxL7(vG0 z@+I6ec_H~h&`hb?lPKQ2wthgJ6C~l<^3~olFQtcp7pkMcU&EV|d7S*xy5taMaDo-Q za0hzuJXa``UkwD2Z$CPBYX*oYUmUn3-(|kJc#e@{E^zN;X!tq*r008>PRgL#6|S0! z>L;)T6<{l$@vb|_jVnqC0c4Pw`H6eQfC^>c4BKv0xdi@Mlj_m*Jx~we_1=ZR57-H1 z4uR&9Z+UmF_eZUDM@^?3Ja*a#bvhjT>^V$b-)+BRkQTz)5xWjH5cv;~Qo#1UVjUL> z>WY1Y&OiN=goFs&KZN$A{sEbVV5P;oj?c@~E!WH3HS3_Un-?m;9o^f)3(29ho&o0+ zvR&s;Bi0)-e0C=ODpi$`u?zAoK3mxr6#(ZqY8c>f@E^XT^n|@IQa$Gn1;CTw(;X_r;ZARq#^4RX+cevhzesSQ4*aZvSpH`A#0Y-k$omiNm;Ut z5XnJVvK1L2YsnIcu~f2e+5h)n%p-FMMFTKE^gN?_Un%61yC z3qbM?u)|iS9VlQ2GQ$o(I{ClY0d92v=w#~@MJSjhUXaz}<;Aa?u}*=Qn=LWj0KZrC z(B5Xc;j#DC^rD&an^{qV!kwCdT~{*ycE@|3O-`e0MnttqE4Ri~4|npu4B8M0UmGPo zd7j&GS>+=OZkk+fYyCNeDtP$-y3oY0?2=aGhiSlrW~2m%#2QV0gT^+tLou=y`Z(A| z!A*_UeXR+F{)#Q}30ivlN}fa5urK{g@RKd|GiU>Z5$INaBkVTtvR{%%t6KCG#hzCC z7{=mPqNQ6#m+}LrHkqP0E%=fdHnW)7e~j8j zd_-5SI#m-5hEaw!Dh7Rsm_1S(?!L>Hx2F|2WE0qS9On1HDYv!LN&~(wC{7Va$h!4_ z1@ThQAPbXiYcwN;$C;RYesY72Rey3CRV!P9iQTKAagaj#0q_xr1Mq2b4`DJ)Y6JQ~ zv%oT`n~_&FWPa@#$OE7eXR;Lly_LaM1kkZewgRBP^?~|#dC0iOq>pvw=aqQAS?iSN zJB?dSANOjmITVw=;H9TCc6U?9@LjFiaO+C_y%h89=DO#l4jm7>ro}E~D*{~6-LRLE z%q<*neF*~Ao*kCDFUPh}Bsl7tQ?L|kAIR8Z@t4}cJhFerym|cW4r_l8GA}%%Gt_Igx@vT9)%j<1Y8g#-q zD!RLUD=OG+phG_8ws>;t<_AtVctyCR6#|}Q?z*ko%ev49Kz{&K0PUU~Nm_QzadMyP z_?=}_c)m@tdkg;LBqa7}qICpf zGxW&lmep{b_bKOE%EOH!_YV7+17EwlS5|-)fFgsqo=_*FKdyjG3{olxD>#OgH5&Mx zLVzOhJPhc%BEbPpL~sDRc=&WFQjhx4iH!bWHV=u9Ng7#ZO(R=nm=mB*C*3ScpHI?z$aV!+M|=<`z8tiniP zkTZ<9-LB9RdFt0EMUgFaMC(4d0YTli8v@uhE%^4b=c;-Je$Q_1jd-|GtmUm%9TGyX z%Y_qC+C%~B5%nfQNUX?AuIIT8jxSGyulnf`Nl8;Rt3tu*>#c{j;^2)-6%~=17(Lt2 zgu>sekv(uW2Yjy@F7O2eATwR~zO&JFjj!V};6r!=WrS>JZX~|mVTTn){ak2nYsS5l(OxdCFaucKA=sr;@1?22 zcX36CW-+|4_bORQ4GdxpA9B4cLm6mafy8G8SBHSa%AMf$xJ{cUVFw=vUt5F^J%xGT zL|ABoZ{H;LCB=Al#q`e(7580(%^%DgypZsGhx$3DRw01`na&lB)Yg5BDba53wP`Rq z(i#*BtB2!;M+@28B&@^=w;S!5AlvJ?@SzFHOu;f0_um)$+kVNrcSO z8ovEc*229s5weI^v7^hq(f;n3miPnqm!qktYV6S(Qj_&p@mG-Ch`BRFF1&M<%oQM>*tZH4Hut?RQ>I9>{SMp3 zmiTWy!fPZ}!u}?{Sv=6A_1XCYQ7ah&*{Qjwjk?3CGCol&^i<%B1(91AJ^!+K%_|vPcNlVp0OxKrnn9 z_yUqUCj6ElTmnl2o+wN_0i=*91du}Dj!S8aN0c4lj^us+4er$dceI{uJ>&okhlpm) z?Q*exadU5E>szhnSM@<2vSB+9%l54D)havxWav;S?XTw=*LSW)=QJrq^z6{EA2$`! zy0rpHkb37XF+MIJF&PT4<)nS~)$+**PCnQJ;<9dfMQAYEfCp!r?f?(E>eRJvurv5A zl<7B+N=A`Dh!2hr0!)SQQ7fU3XRJP!qSTn%c;QhtQ6Wf^p7Z`@^R=rQ`-v|Oc?x?2q_={Ku!0H>woRF3>kyh)>fD0Omsm3r+31J#~QwcN4CeR{G>6S zWY>HG5`;?5wZ%Sf`lGZq7dBh!!s;E6Z897#@*o@O17~BkwAFbh~5>a&!;OP9yIZwuv7SbT6tc5s6mJy^Z7zOtBLggYWCZ716L7xGkBTlkt=s;JWqy|)H>po30nt9qjYm%pwGl(n$U+f#h{Wn%U< zX$)?zE+k>8&6oaKl1Sk5zi6KYiCj>+XcLy9slM#ctiKOioalKTvI9FsVzPe6IR$oh zsGS}<-g|Sp5ryYNp*;!ktuz%c!#V4sHXDl}@r&6(EVF~qHp6oSr%7E*&0bIyjjUTe zP%mCxJ!eJUx|W@S)~ZwTm|jxRGO`y57hJx|w5bq7EnWg?q;7obI6755;2bQai?I|; z(5Y+Yh4(}5hi|a34ZRu%zrNm+@XrpAy*83%&|Gjcm$y+Q*mCn;)P4Gtgp0aRrjiyBE3nCcp!2jvrGH7K`T1?3ItgbzD~cDUlu}zg|uFc3m(}IiNKR+urA6>2|ZtU zLsp0DV&BhRORAo8tB#i7Ab{I$2lGQUPx9bFCYHjME z=hSs*PVba&8g4A^e>c6W*atQk#XiyVH?%g0J{}HP9JR~}Lr}9JDYBTiykocg}LAuS1k&F7u(p>oHA|HnC zB1mQ0)CQ0a54vWrd=uzMpwj};tOYpZ1D%(UM3+nP)se-`)_nrW8LVoZS zX-I@gKL7*XOX_ZMxM*G;oQ8Z#VnX=h10>`}lEeUV zoQn>(Gwwk&9bd^78Aw?I7b0XQz}T2owa)dB0dt*{BYZP629Sw#kAQ;N1}Uq6Ss{zS zpHaYoMGt`~!@c1fOqlsOI10{ako_hT(cmjI6X8s}BV9o-N74a!7c@T_DJBI_u1K&! z=^WV%Jhp!oMy<|oigB5m;if>p0`TPyuzQ24*%-FJ``SAa_JClwpn{-~7YAy~6a$b) zCMK|v07lTY00(x4Fd^v=q{R<;Z z-8t!(k$okT$#H-Lob9eX@E}V<^`X!@pO~s{36cY3O?2$pzm@OnECD zCx;{G^4^5{Ks;Lb@G|&tjQNpZvW*ZRS@BJF1Cx~8WlJMrvqksw?N~#< zJZA(yo-+bu6>oIx`CNF>v2>`c#jl}dwo<672UF|;Q|SKaDF!7F zMn-&R*E*0v#H47jr2>4n3#9f)bEYM|pXIG&IGi-C$4Cb385R^_gc#P|Mh+JOg#{=u zO0fA;mcS=UAtk-H-LD(wQgC^mt>Wp}8Bjt|R?73h_97yLP~&#u6B-!Kb6G4~92Sy$ z_(#neq^b!yI>y3eT43LK|6b5!N>)q~?CYp`%Es{sb0SiW!{N9yR;K9S^@OER#;f1a z_Z!7sFAg$JSd=?QG)Bz<(cG3=T}<}#Wzd1IkpUn zuXT`FYMuH+*-snp@WA4GKlN>cjW^*zZ8(A9_m53m;AoaWva3U%zXCNqOqJ`OP(6XY zD+vn5F{^KZDAKL)ql0tfFOSYScr4CO zwaK)ZDM*25TA^Cxt{0jv3AN8#P%eO4;Hf`k8}X_zA0%`Fbk2hbZosr~)~BFAP%$x0 zfi)q63?qre$>LqeSa3oPOGD#PkTF7KoVmWgqc*}V6(88`5h_bE?`fkN@TyHC zKwqJl2ard2Z^bXin0$gQ?Hbvzuef<`_w<`VhjWm+eU>sdgmrir~yD>aP$Sm z@}^YTFz3y&zj_MJDo7CkQeZl$tpJW0>Buka$K3qddlYrgxCeB9s9MFylz|WrJkN-p zH&ms=4O67n_X9DY!V8rXqymFfe*YDCzr=b36YEGRiiPzr;Hw-egK;rmhdiakM4+eWv09?20B17=Xt)-lTyjJ)=WR$5lzKi!(C_z@n_|3-}3 zGI;;cK&r3o9X}eU66j|LowLQ&nlf1B|9?ZJ6RuV(?R*pcfPZZ6X zkN`ugAwfOyf6|cfKQ|2ham4?<;ZIZjFAXdHb&da};lCT_pAA8}|0k<1*UHFGg;U6MaS61pI@i%<%#p&m4NqxgrakjYhY_WIu zJfRyxsd;dAbS;-NkHhE$}w z4rO0tesK8?bMy{-{oM3XZrBS=)j?g_3Wa%O6ViQ3{f-`vc@T7{d#PajM5ZYeDXeWY z;K7{>zW@(X4oAwDjA|*K;){mx%ecBJPyx42;6#3O%ccdH+U2#X@a}8RcOv+P5Hx$} z5h;Cm{86z7Uw!bs^jL(_XoG-dck_^R^N=ub0v-VAQNCH+=zY;zNi=W+9^`frTrp7} zZRa#Yzz#WZU>1ElGZlY6_GApUQhq`%I0^>*32%piml^#(wEZ`y^`*j|(jE+R%rzM) z`Mh?zdd?{iIpv6jnz0temrzsNOF-@fPLIWGMM6y+?2H>R1gkgjnUB@TsjnnwquZ&t zmey-^FLpH{#}F7j9V)(I9dhw`&Zk60P8 z5^uwA^+uQpLpXMoanJR6zFbMI-=fUzlnC_O+A!zkUF z(k_C?zg#NA!|-_xh8J1qWUrR6$7{tG(pgi^Td+NEWf?0HjR0c}&6w3{+ z`cOX|hbNSE1t?+&z5oz{;UU;BhxGv?I1#hJ(fA4WI^mC(R6zp4iV_}AR{>c*?k|6h>k z3xZ<7WgIBmC!dc!AMz?YE}K031=q>ioq% z?ud=)Gy>dst9M!12zN9S-vm!5HGeFhEB^G3P>k?G-1)zQ%~tFr>upQq&$Po1uyL)9KmycR)yYlyxawv|hzfA=o( z=~ei_t9}xp2PiS)q4E!Wx@W@nV+7^%uXLYPJV3#Twz~DN!^_4TqEsY>xSU@_E@Km-Qs8y8+3X}yp>lIHe4&QF>ma6M+c;^+(s zjC<_@7>a6GoLN4x{W59vNy~4r?k5tf-YkWOil&6%b~n5>@Ut#-^hZY?6{+afg(+c2 z8aRwvO>Pt(z7CJh-2I?$)(~?pF-uTe#>Iw(5x!g9mr24rNfg|nf4C9x2FoEFUmbGR zP@w6M{d}b$g=L%E$joUT$`NHBKup0KjMZi|K&69>%-LAaB){C5+B>kW{^Ile>i%?V zsMXerZsN#IJx$(4`MX_p_n8`z4=dKwDN@t8h#Xb5QV|O6;3~Y-M=^!zcNlS@DD3FW zb_3kjzAT*Ya#2|<;SRWc2cOAzYbsAuY9*@Qh`*C*= zr4Ng;1)$^8ayUZG$F_k{sNk2~@ISz()PQhHDkk*vsc<6U)jlv17BKTXdU)LyF5KvK z_%sys8>I8VxP=Zl{|>I}Z3-QqgR^npY>coHGk3pAo@HwKcML&Vo;Bpcs~OmB7Om*j zZPQ}S#MWCFmN;=%TvG5$;8ttX`oVnl^56#w*zM46 zg&6hS0>Yh6ewqh=!R)RqcM0#>PErN9rfC0<+dd@1oJF9s1h8h=h-I*XM)E^wc#k4*+ zU{hJ`W0nta_Toxv0V~j4B(NXw0^WQ471qPRIW&-sqQ+IvGX9Smg<`29B5q+ns3KoD zLlG;^gfWE4&p8sCR@#0eX52Lgbi^eG05q9t5}s3TCh;bOR1RNLFrubjSUng4}NDlg2Hsc z(V}j#^ItoFKCr+8H=P(AZDslD@4LD_b_%yR}{5@#kVgPveCG=%-m?|AhoVERb!42Z-9mg);S?CEMTm z^2FB;NL4KHB~`JU=ls&>ZbiP<;MMZ>?p)rfwlmSfUA9(lIlw1??k_~3H&|T?g$2`p z>4Bpx+I;1Lnf!r=7mb(V>)wkpRRe93?`O_*AWM%Zy#pceg!-!TafD(x_Tj(-Mz1Vy z01q5SpPt9ExWK>wxRttgm9&6#18{+NaJw+b5t^ZLRT3uo8qI?;m6sIC<*oX4vXd~J| zda|JCNY*aOhtURE&8;qkFKj(z=9+fZ+%oIW1osqwY+JvWLi1`Q zd}3xsmIQ>Mb&>9o#Af(sd+I3Vo&&idaTyg@1FNDuJNz4#lrS3#mUD$$F zjAX}DCI#ZUjD#wl>R-V^cG3{M3Rgh#rs?cQ!ZRkZiW~Rf%vF_D5KxK;C zBOlu6X|{@*bIbA5C)Sg5n>6hI-XIJjKp3Yl<&vTcE2Q`lKA+lHamjTV`9gS3C{JPo z?qlN;azK1=f{~5LDWmOi8Cfj{jw|b_aZSw-1gw8URNQ%#UuAajY{6vf1@}}zxA!6> z^x~O9)UouHq}@8>FmJFq7CZ*C$3hnw1^S0Fvs%ttW<8Yv>%%%o&>47;;+=K{9v$eC zX%69$-5f?VlN(gG=geh+;P=8!V_h^ zX=FJoT(ABpPO{$-9(1;u$Zf;th(>ISny1@8GwS)h;)7pbsK8*3 zLYv*5!$et4qHIui^4o*QqpFWZRZCYww{0#|Uvt|nwQYy*=rDW7W^7)=oF0s^`!GFL zl^$E_d??e19e|BxdI?Y(*nb&b8`kWPN^+>d0y5nm1c{yTr z*0O;oRKPQfdeitAotcpLsNL579_NmzhK6cno> zh%gWJqYyYt4(e4Uy@`VFQb79QfzB@x#!N7Dd?m5G2A2-u_X#9I= zcQcJNOci-iU{5sJn}f~;u+|j!5Ba2btxo-oXcNxV%9CKe&e|B58LH#nN`mFX_^8 z9)ImWNY$5IfECbL87_k$XL+RP?-eW9*kQMOjkWkKPldL#&nFHSh8y7vj%gUSB#DAW8@6k=`ZuHd$s@*u*|Mfk0Q4v+z6Nc`n>|=p8S%tRt&VBsuNW$s*vJb_eH5_ZHEQ%7KPgXS**U3y~|-@ zXe4ZbW|4rPy^RYiE!AqlwQ8(K>F|kFgt=qRRl@snw`-vvMK2+j%^npFxV#)Qxm^oWKni;1 zbe-_5ehEImMO`e+DI}pm7G+zBrF!s)1eEZR4J$Nu>(<0&7@UvSdBYa6#5X!l`d)SeyzO8a4Ma;x?g zTGzaI$g{$ws97lDNYUd>^6{81!j**fPw}CL6=CB1>~a=j=Y`Y>Y9=J?gKn|g+u)76 zX_(MgPRlU7Ln?n_+xUfB(lPbJyLWND(TZQMu^iJ{y^C_9^`KZ-c4+Q4e)6QwRV)t; zXTL>=eA}L*!uD-NP8}X6@A&eD7 zg5|pstTq{$(6*JdA5hPyu!5x7#(y!V#g>x4Gt3FXwj%i6*&t`LLr&hE>RgyC z0aizHpp-3v31auoto=eZLr?iU|)EbZO~&GXM?QQ z2hDOC%nboh7zUVbOZL_MZm=E&y_Itv+G2|EM0T23a z-VRjG+XDDnQcANnSH%ehKWuYg$g}z@@+e{OF<^{Rb2kJW_;^5&Vyl?Q0Qz^VY03%( zlt(~~f(6=d{X*AB2o5M=*(DDuk06CiHDp;QmL=qrTsh%E_7I2z@W9>_G84q;An43^ zpb5%MIjl$kW#*Ezp#NuiiOu+dF^E>8m}Eh;5_RukY3?_n{3Xkm1+i4ebE%hWn0)Zr3Ap26VFk z&d>e^FA8qDCD|8pHO>F;4I+RkWNu(&APNqQ%=DO8z+)L5IV|PQMGzDq3~j<1U442L zqRPNzb0&D1Dm5Byx-rq+s*%^X2ffL{Rw0-+NfUW$@?0X@EN*?a=-R5oP;|ZhB>62t zy0Y@aHgr?^C#VqR6PmC2_*#g=Mh`FUKP+yDMI=yroe893RP!~0-cQ#Bgl7}?3*pmR zOYA9-XGLk4U8aY;lU74gbCc~QnNStPZIw=uLyZes`wYgq{E%r29{vm4 zo;kLS0sSqIn)t(x3fgf=+0fmTDW@O#^q@mu?Ch&|>7UpS2?H|G9ozpzhaNdrSbu=g zU3XFr&iZ**ea*k1lYAO63bYX5u z4^i9wr+Lpf4=Uf-E9#?Q*oTLr*>W66dKzG{CFGN}04%ZY4~6|c=JD@{NI_qXOGicUEUZM_!lVTc<)1ii zHA3zkGP0{E(GRwMstViEf`?@2)AWXZR*+0il;sWW?WULM>)2sOZEn8}kRzeU@5dKl zzN`ZA2lsDCnK0yGu;^~raM++Nft6s1$9cgyo64%>A+2L)E}ROk!Dhdcfo-%jjF6yj zBXc;lrR4LRk#r^A^^D4o?3{CS54v_Z6?gM01#N7}V zA-IC`Vl(~;1Pp9_fk8-mO16Fq+6G$~m=gxfoCh~NR-m>gCDkFtYUfn#b;R2J&evlc zU2|5ykwM*US&LGXL$%o$(bUc4`QkHNZDNS$_ljbml0}AHY$;UiAao*yyA^&SC=*32 z6%%>TtPi`qV$SN%>BeOgC|Z?5X1I2hDmt=hvZWw9xVzi?Wt96x6h3u*+0M$nIT6G>a%}ESR5~ zQAqUn9r%NhVu;>8V1|J2N1BCxb0ezdFF)V#?D}Lq0|G*U=C|@JN*xmWUreZ43Qka- zs`7e9RGI7?D*Y^1JZ~&N_@P#b7VX~qK~rGr&!mo^5j&MJamF93h>(!ay-g}AA$kpM z>ycb*~L}&g{T-oWS;&h3)QD^R&+WmneU1P>w$e${s z4d=#%9NMl6xeC$BjxNfS&p#`#u@^V~{A~L_<``Y@c`jUju*4zQ)O|2~(Vy>^H4H_q4CLl6cf(eBOO~(Qp7v z4w;c%8Dq%()1gyDLmpc0o$8prH8Czebmigk%bT{yudU!!D(WojD}F}Yc<1sByRzcx zfyEMrMd=13x09rZZL98hN&$q*opz8qW?wB@m0O&?&R6|~gFmx>SHz35O zErSy>*5#(K{roz{pR6^9u!iEh+vqQiCN&?E=_(YB4WrA3^)QtR7xi`I|P7^ z$SZVd4oVm>@CN}jhzvqa1NFhcnVzcHb!VpRiX$SAdSFSdXA{L_{>I5JW#dpQX8;;Z zgEPgpvFa~>XZ!*VY4ZA{wpy2yUVm{ns)gh!d14bi7c?O-~=x*&M4)`X7^nol_8=(s5zMk-d-hex|u7)pcViW}a zDn+6pSGHM+6Da``83*E%=|KIHHfOaI%Aed*Gi~evLbJnD?9)SFQ36Y!A$0zO=ST#E zX!4^}B0ML&O4*6|FO69N_n(a!B5_q_N0|IBom7*xnp>`EzOv#w>eVYls#Wq}Gy6l5 zXc(_w%6IdyKzMSaG(wDw%|Qs%rG4*mm2a`yOES6lj2Lj5oj$biV(RQ1@G$V_?u4d4 zahkc$sCxPT{1dOfq~cX{PUS_tFWr0@@pC|MblGQ6jHh45{xY7p%BV6aC}zRze{b?d zb4q^hD`tA4H~_E*HK(r%4X6WYS#&Ti%YB^fo1v3#rlgZ*I)`W;buQm)+F0hngESNC zSN(iPPo(lO)`lEnMeGfoBV!rgcV_4^sDpJKnU*p! zJY!JWoZKXHCs|+S&fN3a&nug7mzlyj*UaC7H^wY-(HbA^C6V1W(*vwF z&_NBm?%FIU#mx4olzczNT(e(su*wBng<3g8@%c_Ry_S~!=tvSz(Iasx%^P8-b7H2s zNvRhu@bORVqj5J%(mH0#rpDNRfjtC1rJ2`}_zZal5~m$T!EFt>A9cqRVkzr5n-jlvh*FUc zIm&kvW{AZvA}W#&B0K(Hgkz}8vsU|EV^_JX%|VxuQriOw(xxOJwiruRyf(phgmzI{ z%?yGM3b}4UZS=46hqE}y)!32hspo5TG5NLizkkbF2rtrk8Nc$Mo5rt)vKF+4zyKKx z1O{%{*+O7|hZ4=t4v7bR@R0YG@lL2!c|g&2=<2hh9$j91qI~0igsTI5?BW)2^$LM? zf1g=HhKnL*PTTxw)f4+rmV&3$s8B>lwC|R|&e#lBMM{`x;P zr@BvuFNo3pKG9_(Rru^pO^k*ZQ&`?kHfR9 z_j;zZk^2IZAiHDcgt7g%H%i;?cU(zt%i0K}^qC^Im37RRF{pC;sOLKB#EUh2Id}GX z69-#@_*7=bhI(=r`<)k7&_A}Ku)WuXo)PwsEu*C+)trsGJSj@6_4w!~KWIGHwdjY) zgVT>s}%l*c1go)cr{?=JfP%RE3#?AwBBz1aR` zB`PzIgx=*Y&c`f>|C==yws!<~ChWlMgPLmg1=zD)CcN0yQs0yh zSb#D(8*QQpSpY8ThR^lPkW1G@VTN399sw=zj4Lv5W!nDVX8JEf{mV@IdfhgY_XO{V z*Ey9=tq)#Bc#+0i*Ie*8m^Oa=8X_Neimh)(cT1JNt={UjVf?WN2DZRt`H$32xbc@F z7fIL=Eg3)ZNUGxy70#Psi&x*=A`g4kb>y(ABXJqdSpmK=j&<+Vmt!dU%OLZi*7r}= z!|oi@l^pCF?o^lj);d1pQi?yVsmOf|8BPjNH>1_eSnV@L?`%U~mW%w0{55GH(n3tR!@m$KQzA?qyto|7R~+Leb=9eCnQ@?k%p???M|oP!+M?}({U z%JfH$G~sA3Rwn240kg4>%BNpyDnN$8$zHA%FY~QA^`Ffj{;D|&nlBuxiRpV|zo67{ zbF6PVJ4&TCr)SQ!XlGyTn2mzh9lNUOF?R#juXt@nVsL70!4+cvy*+#e`LlddUUPVo zL#@#>m(h)H%ZW%_`}l=MuLqTBRYG1|3|4!N_jOeL+s~zpo_)?cI=`;m=GXnJxUv{) z3xWO*kKW%%21lcxHn+ByyG+xMnldxPC%F@^Hj&cW zJxJjy3up%4-QUZ3h5Uz~BMHQ{H;^~z$FOuH+i6P1XyNm9zP>w!{v*Mj1FPi!!}Nj| zE2m!ePeKKO%d6zB0~}#cm9sC1z}-i1a)Mh{1^Bt5;hv~mQ$Ma~vd19G)qFi%@d&MS z+YBdpu${m-$#UE_*eQITQp!A4H2>XCyDw(d^5Lga3(zd ze#L(Dwa8~b1dqD+0_p_l727-*CzF3el@9Dr`xo|ekhSaRcbF1z=RdLa!hdHwXa-(j z0{jNI^4|T6a3I$dqRFb@tI+!emVqE2A}#qXU^wKC?{F3e#RwC-k-ZLgnyu)i^};Lg z)^_W1g8a5M-4fN!+vVsPwL=htj>qg}xb&<;fY3@@u2#+LAo|0VQ`nw>SOs zr%JQw3$iqBB!K_iGRC3>?>QGPM04qCk}@-tKX3A)*p1!Hk%%(8;2fhkeYZBI)TJxQ z_!rZO>zF$T)A^uc`j2LL|GvP*_f4Kl=mB0cG5?$=1RIEd&tfiq5Kt#w4|hT?J2pmY zLFmKX)ZUN>K^mc77q9>a*Qg*?<8~+_*T^!mh|m8!^?-6vyfwQza7)LnT^SOqkk8z^ zqN%?FPBYG|fxC-84krV!*wk~uxX6dt8>)_6NiqF8qHqg@JljWC%zO6h@`1o?vH;Km z3(Mi4{V4zru3;`;TduYHaKquV5ZjC3oeYfR0ZERvD@*XFa1h>M=zxLKKXUVXrn9a| zAvroZuW=a)#%V!>1%?@iIHz5w`eUAW@i;FE`ec9es18IR_@KgKAsz}<>C7ymKMl09t~tL& zt+aOE=TmSW990*z5=YVhDr`kN^lV{;lxSr0vXA=glt->W~O6Nr!Tuu@D z_^e>Mbr;15j_bQTe#88Q4Tpne-~KlQG_DRlcy>zulyKxx6ZdiFS`(!OT`4p7j1wg; zBt=9W(i^2c$AuQzN#%>vseHye!lVW1HHds%*h^X*>04Myqc3*pk)&=O<_jiThP#y0 zVH2XEJX^{a?Dd{grsxkz6R3=y>DnCJWW}elPzCR8S%5_Qr@tS`$b#SR+VE39Dxbxn zV)|KSw)Uryg{Je0{~Y;T?6QF#beD@}*4DD+?TAa7@5os3e2%o>;;`3~&!+dTj_^4< z1vo1irJ5*B)K9_4{Kijz{QJ52VC5Gj70Xck=|j}LI^)Qmbl`OoR@Dzu=*elJ?? zu!PvoD5a-Fq#ltqJF!w~Va9^ACU|#4oBbX7!ie4cPLkKcn#HB`5-RCc!RAqRpL>|a zcQK6ipH$2YU2cTFb+-wpFC=k#3DJU}Tr9mysS>9_-i0`W6tg%0FVj&JTHxf{C}@$; zs{MqxIF_y)IN~+;F`V(65A0qx4-K<>EmAqn3O@6P%OK5l*POaG`+n$7>1T3`+a|`? zL!1hX5-w8AWi*64#F2RrLCanM=Ky;lE=AP=x7VWJlM--MHKOyPe|P_48unE{{ricP zgdJ~B9-zJ%1n9x-g%}9paO-62!DVEh>#&~y%psR~A*}&e*N0w_kiW8A(_f8kok+hrSJllSi8pLw$94E(h$dZyZ=&fOPLsCh zvXhb)_4QO5^(wMbxv}AS10B!v<0WeP9CnwF3?CbxYE7OrRz4Vd$xP4>WoM>@+r)WX zKcHz@*P|t6y-sV&>Z8|dIAiZOv{=KFSxE@ljY^P6Nja2(Tf=+)spRXMe;C9!x7tu| zU9;zDX`@u{Om%^OBxWw#@XSiZ#Nr;y;N`F~f(a6=4jZAvz?yU1WrUFUgF$M#mBQ@Ltv?aWwO)T{69_YBjO1YraT`m9o%;&R(>BJwb|Wj zbJ;L~29IQa;jIZHQpuPS&%sYr=|o?dz502VXG!@vwa4zK`ANk4idgaK-%CzT{-bC3 z^(McZnq!{|oR^n%V|s|g$_rD<$A~p9A@TlA%T7eT*~tU;k=Pfhb%J^@Fg`_+C+Oh; z3!4Db3pr%deU&<27e#ILnqHyaK-M9x+Lq$7^FT&k`yt{b%d06_Eow4Mn?Ay=;dy;i zBHQUraw1hgT{cHTN$JFVp=|Kzw9tH?ywtdxyiix%M%VY#PnYzqQkfUfZXhcRg?oOy z@YByqW8AI<&0RPCytQUcpm9E*SBbEmVmoQ*245N;sWo7nTN(_IM3D?y?_FOMhow+$R<_ zm9x-k-21-9U(RFNviPYwN72NFsDUZ>t7FRZKAiS%!#(Fx4ZGhN7(Z?CtksYoGEj3OESbq$z*sV1OoEBAWF;jYz*yjX_)(V|UUO4ktNQMS8+B#g z@t8anh4MPfPz0Wl(^pI#@<9=T^sWt(wQBnC5451nA4*zfobis zfgdC^LaTSSw8alIG)4keZL-+I&BGLfj%e$ifNviX zjox)kU^7YKn*jKl7H-UX8>HiM$4}JXgNODC_}>LG!*iiu1fEnicGXwX5|WZUKzsQD zN1CMKQ2W`wLVhLuTR)WvLmvsFHOH)NbB=9p-xT-WT2_a&a$8DD%CQ{{%fh~`J*;}? zYEDi)uXM60Yt?(164=Pn)PJtJ^{a@+kABr<22!Fny6ul*P-kx3p(-7)fQQBqGJN~(={G~=Ep4_V5-L*_9W;b#t_%%`aS^gh%4+G>GM*Vp zXRwpe%gh=fa}4fOPq^2NGea8g2(7)SJb8VnPc-P^y8`3It|9uDA?NBWi-ay{>Q7gH z(HMq;c#L=(n(wPr7}}^ZwfE~pf;}gt;yypBT@+-<2lAVoUXvaLU(9pjTZ91f1j)^} ziF@%U9k%Oq84;}MnDO(vO;r@rpB}CCT>j;6lZuBA?t(}ZHC3fDpD(ZHwx&F2iZNM@ zk?ksDj!}|@KJ>E7@+#xEhx*d)?{rONDA9=zI|ZcPmQH6#d9Ev~_3BOi+Hxe1b6CHn zZB(BjKKB|7%c`>R1nC>u6~x1X|nb zxVR*LiJONX%LI-Ht8YmEO#<{<0yuZfQ8rQn>&>I5rzgRC{?C$DuEy84{AHJJP%C?R zef<35i<_{I7Dw6o=IO9uhxN3j+}lX2|B{+3;1gqR&(z9SLy{a z5$yA5%j=u>GatP<$BJI&4w{T8geU|{B#xom`5ONj{r(|NR?IG3+nD;20tSPox5{@K zt;roFyuPVq`%Tp*@E%@sFmvQk53nb=D_GF+t`SxM2XXde0tvkee`#ULVqEjPoJyAU(MqF9{Ms! ztY=8Z9|oMKzNkigylEJWF7S4rYR1@GcE}%|(z`u?ReA+vP|-&}M(Tg6sNUB|ji~6c zE$w_|V4y&zbf5S!Jzz;U%Q~#|fF<2mb7sg=9^8!3-iP!eHUFyVqVn9mzCX4Yt#L_} zTJ%n*&pq$(RIzJqvyGd{JGvmt2-_|2oid6o&ki$L5s+A8qNI@0D`DKDO`?VqFU;;OFUD z_pmW#gpN*`c|B>K17pSIu1H=`0@>=^$G+mH%sBd{#cP^ruj^x;!!K(gfjvau!}4Gx8z?Fr?Qo+42aVR#ChJ!8}^MjfeHLn6z6dy)LA*?`*Z{|Q4hJtT481EDZ_qS+omHzGL=U$pGq4$NI@U9`tZ$+7ss`SYSML=@o_es7 z`l4JRg(RW!t2ZnIq-_6VL(G4c2&KMhG7EsGWAa+sr8$+OqQLw zATjFtbiR}=@X|RQHLX%eo^J&^@W?r}CLeiE<>Nelf~!_@HV^!kf#gaF9UhXu0S%x%1NM@yb)R< z`Mkp^gQ3Au2~bVyxNM~ShgS`R-wa>B_pGEs|1eR0Hf=q8cBzH+XTv73%f+qu z7UU~4yF{~yHCQk9GV@!M+BN$3X7@JSRwrJP-fD&786#f%NYm!`Ve>cv9ZNDgm7r)p zYd`5Hkv+K&_-h(weU6QPWm*2h+{#kwrod#AW0>n#O6T|J-zGaC#@2 zt}6d}RF@mYvrV3xf6P{y6Ym~droJyLVNaE$&dYUs*#oELEtP9@+M3T(rQ?FxJb37^ zQ>$N1c({zm*?4n&YioaOataaxud;iax?s#)FskeKu1x_v@bJ&?JuzKy0ATRpMLfKM zr_nu%nw#+wYjH>j(Rize%T6F&G(#6DDXZ0+rIUR%_6X)c)1vDQw|j_@!43=e^JYJW zZ10F19EcgQtZp|@70hwBo!0(1^w71f#5Y*d7RA%@0=hcHGc{Rztfk;U9)YXJGo`ud5AA#pP##FeNG2+S|sK2 ztfhpt(OED+>PG6V;EgZJ*YE(xVskHFcn(8D;@s&fnA+{2shp#PUjPQFD@z@_yC+EU z8*##z7D}mKeXJdzZ3@s%fqkt>X)H>x`j|Sqch|+mwT;kJ51J-0nw|j8bphv~sbCIE z(*i-$Qc_Y}+Q1?;vyD=7{0|tZe2lWnaQzTnN1G$b8Z`1MdyKo$u)M_{%~u!+R9Xo5 zDhw8ZIO}iMKcT;*X_tf44YAE`&VKpn98eNS69JKfh3EiV+-*U5^dR|wL7@J?wRdgm zxO1yKh~|BJdwB~44%VN$$NtjmN_>j9ys4LYdy5rH|NO&4Q9qBPe}2L=YDCx~j4|Bb zm9O&^<-xU?m0-0fSW2qP9SuFb`;^+9+Rf5RwtH862Mgci^T$Bg13}nrKRwjBRaegB zHc$m~dTAg`8z8W*?6uJu{Y0(#PB3)`1_+g>rAVGIDZL20q3tJ&rlJJ2UE8`64~A9m2!2yIzvqOk)Uk(dGAYw8 ze_HjoZ-y*~UB~r~pJa>yPjvNGBw|fCw@QH3p`p%Ib|Jksj0Bh?@)QqQ-@oha!X^ZL z%>_?-e+$%?!paCq0eU2|-?p24=?r#EkVuW@ZHX}u6pzt(-uD|4jnuWgt$yMSPCH&#TZ*iSt}_^%2Jl>%5!~iw(s}%{r#Tj|NQ^Yb6%Z}!+h@h z{@kDIy@kmQIRd7y5AP9K5IC&Z)bwGOLHs?Xc0Q@dagPio zW>QTyY?zh&48yyX`%RZ-^j@5KbP6JKU(Sg+o@y!|IGgXZj&aP14pq*!n0py#+8~299gMWLY8TPg%XhuuVsk0y(z5QqEbpoTvz=v_5=M-cb;t7NkvR|LPsx;}* zBm?1zFt6?8TJHJm*F)7xh`3LVuLT)4bAT8HB|LGXtT;po*ui96mGeF#$Aj@T)fIv6 z^R92Bj&@M>9i-mGtOr51#{J1corFl9PYt#uXD8ZQY}|B%(nYcV|IT7Ci{ zAsV=buPq$a`BKDv9a>4}9L*gdzHhyfyuDRQr9%J$914WfT!X)!NoTqK;LfG0zQ?EK$FiN z#6yX6wa}r4tY7)*L40A0Awl*gZ@8y-{k#z?sENp1rw-|^jQV^C6n3982qV@Qumzr!wVL`4zXoHz2gk1S6+Q`;Qr@F zR8VvW;)LXj!KA2*LC%WSX?piJk;afWklD8gij zvLw4~CWRJ{jk8D|8&vX*&t%Qys(BkUDbdGfkl5rg zA*+kh5dqu|9%FJR?Mv?KH;)#L)C6=l-Hw!0I;B!mS0Jd3xe6SRw4dMb%~l-%W0KHm8%DB0}EW6J}4a^}OoEaW*QBkcd1nf_O9`DR)}yD zVsi*mWGPpQyR+1X+3B!h!-tbfIfY`#gO00W+xC+M5gkMY^h5ZMNZQ>fwXrv+N;zgG zefA5>Xp4Z(z$(L>9<=-*V{I?GgKmmm0bl1)+7PZFULZ1V0al z0bRj<8Egf_viG!(9ot+zb-#lcWw@8;O+n;Wb1=xMj{qkyMjuF6_#N(a3qC9z77P_) zWWf?YaOp7_XLBwO0Z`j?)HM{gfoXZO9)iAdzXE9$`GjN5@}zA)gKOlz;%V{P6ne?_ z49Epn3=8jI|Cu0q7dxTaWevR&3Ku!2gPn7P(p8j`(n^7m6!;xs;hWoBshQ4Gc8Cmb zjv17Ky@5YGlA+uNTadl^jSMNXj4P!#%00#hHiakWG(Kxvx|xe^cA*&ZG9oFVp-Zi^m&d*Y8J}sks7DCkfIF8DE;5>Ri>wva6HgY zsBLzimcqdX0&pP-9<$H;zwUH9_7qkL^iFZtsy?3e^pA{tj25)_7u>dWRUVa<)tGP+ zCK{&}9rcGgCJ74niRZA?V1#R!e~6<&bc_e|g6$(??EC)EM#-8QB{;Z)W7gz({Gs4+ zefCLrZhQnm?tJoxfY*)V3|{M<0X=rLTGj8t{#lIVzb_lBd|;(#5{=;|v0C1-&X zA=!;RCyFGyNe;yPdROWjAbGHSkj_+oUJn%oj+nu7xeA1TOk;Mpi~Wpa-})@50vf0s zf23!7RIsPjYyiR#A?$FI{dOQG5Qh5A@+Qj4Ngn}uCM9`qm?g!5Oqn>_5D=8rDJPz^ zas3sJJb;}+M2g=LwFfdU_la*1dhEV@CkjNe{NNu6gGJpwJKcydCh;22vVB)+g&5F2+x9kuJq8r zZ2>wkaHc@2BMlf4G&yJp7>xcGgMpVe9|&B$yA+D_LQ5v@H-|1Y%uL*CD%?P?dZz_^ z#nJ}kcw@yJc>Vn9MS|zh1{MZ!4&Cq6wQigfC9Qe^*g_tn%2Z9f&nNA$r z+_uW8q&EeS*r{uH{VBlLm%e@fwJGVQwI8LyZ@SCL!`bS0Me99(=TO9$z}yJQLnPtU z8VL|dh^BzcfUyvhh$N-g4e%i8vJuxEh#4nyL%~lWX*d)?=>Mztvl0@`A)m$t$$`aJ zhW^3QG*CEJG7zkVi!Kcqn1&=~$3pn&r8Zg$+XiS*Fuu{ai3CbU|8;s}TiquX?E>Cc zuIr&seFxi3xsRwzN=F;NnE<@P#~gZZ*3?NOwS*iq=QEHrw)=8bb=Bt^@N(xrJG zash9KysZ#5Wx>nsT$4DCenJQ0|50T?}!D?l&+h3{Q6;Bg5a)~ap6S^gu4h2~H z!b3x%f~ANIcRNub?otCL`5vvbBasFlKks$s>?OMFPUOk+GB?~fE=yFn{u`NW0)5lq zddH)r8JpA$=ORs#M0TdL#2R|bsc`y*9EwbsKWXFsjkNmwWkIoZC3IDz$zp5-vcpxG zuR2yCjq$W^6>8dTu2*ULX1Z2sa$AI-65zm7Qt%5m>qo zI*ne>PJSIl=yIhD{Tem~%!SnldyyK&4=Jb|BYHhlAg+&%8T$D7H?p}2f)|;{%`#>CnCY+v4t7nIX`{7a)`)#?rE_B<^j{CI49IhK|!?eUBmz>WfW(--oWUz}0 zx4mdwL(k7%Hk_DkB=0w+X3h5xH(-!K2)JcwF{gh$czTP(D{LX{}=UNB9jfxQiqovV4D46o3$p_9RS zqcL8!K5(gLaku~e1*G4<^QQgQqa=7n_2=(vn?N!ZKI-Hr_+IeLKpl=KbX$)2v@hA^ zePBSionq6eB26Ae8@o!C@U9aY5Z-WyFd=e>5ai`=oE2hV)4}OLq{2<@QABQPSG?5c zxb;!uhd#Bb0#0zsjmQJ!Zi5F{4SU9fhbZOPCwRY$-MsqqQ9%g*mlB)caoRoGwiiMq zX?yb*c&KJ4)&qt*FW#$xM;mU@m?^uH2Xe6jSv`|F;|OkM2pOizi@;{Rl-!i0gB}xa z|eV+?7{|($$I)B20L^e;?D@EP3{Z}sft?kRc0r|gfY?X`pkHB{S#R@*}y_Xgh zk}P)%f1)~2;s%wYO=r%0yLHXsicFQ8{THS<@8*Ya35X3Fg3iF?B#`Bg_s zpH$;`l;^w8pa4Rh2~lT(M6Nd81PIwFn!nOt%QM`KaXOcnU;lNS<33QST`VvB-b}lN zTibz9rT&carhF-Ltf8C%W}694L+H;y|LE~xToKj>@keBdHH0MsnJWFA{k1ULc)ar% zfDC~nhyG+_nrjgQmIX`lT$+-mJMP3gRI1Qd0?gdScwoC5*ze3)m@ojr3M~oI|QlF=T2O%&+@fm_V3ej$bb(Ne0mnLo}|qDIrQz_ z2n_#k$Cy4r7ndrVV92MsMa{kCSv#H=uXYo8EGxS8PwonD00xi&X6Xi2fjq2)V_EZ% zIMZ%>*4{7wm*%BV{}fqO=~barwd_U0#^z_v(&Y$QzD-FxW_z9-CX_^V4pzNCAOozM)Fm{(A)YpeI_<%neuBhCrgK{quoHq(Bag zZ}5iKozelBOrS+Kg5?-*Qb1%Dw{1`f1hew~azl2-%@Kdcqi0Xf$ zxRt4{t4k~VIy7Suw_->TVmpI`zwFLGh5k?B{7db{mx=#xdSCMo;Vy~%lOn?#%pl)h z-u1dTqZ_>RJKNIpyRNS|)@M$NO}<8dMFlf1AH%smDnh`X;&2} zrNn)H8Q`sFz*+y!TQC2~d_e4>fMB35@Z}*ghH}2n#DuhHwxPu%W6cJigY!O}@e8R0 zb<3kRmGId?3{5|1lp8RrJ zk;qeoFMNE|)dVv3BP!-;3CBE1wysJ^Dd`hG1?aR>aP)6=OugkX;dAmcLSmf3{%#wP z%2h9n9{PA=jnm8^Qst6qo@C8Xi9T-8v|wuUvqQ^1FDua77=|5Y6j-G4F34RGdOIsq+;;QdQfyZIO}~I z2GI9`7h8wDk_J5Mv@LS@ntW70Ki#(f^v9$m$mQJJJ|Q1>n&cGuBCoxd;Sp)fvwqOr z#Um1@#Ka`2HhaW3V54yxYAhNuf50iD7r$Sc%su~X(_mqTb)V?U;FD5QenL(qR-Uo& z^2$AoRW|Mz{=~6iT~c@V@g!4g-}T5U5SaNrYg%5#870Ppj$x}4C04z#xLtP3^Z)x4 zt3z8q?5N`B*q~Yun*f(d2}Esx#;;OG?(wRwo}L=yTd+{L@tWn?=Vn@lr_OAEgG6N? zrgkNDSYOy&y?SM@67$F#o*K**`3V zP>q3h&)qlc!z~DsU-4EtwnuqvNBVqgArHR!M>s9lSfJDi$5+UmXzh}0v$xprg6!wg zuHg3Sh)KyW+3c$vW-o4rvnkNecewLreO7CbiUFiZkdvaAYSDw^j8<@PV?PDTZM1ly zZG5hD2c*f^WLC26QBumrlu%d5+e?47s&u4U=z5IRU%FztVKv^yR5_6s9WBF?kvs;p zUyzL1wySCx5E_s$TIsAzG~jDh4@Ds_06_{BGSK=-)s>ppOi}5B%!y-Bk|0?045^Yx zXfGn=uev>b@{sV6$+Z^UVGTZgO{{IxGgE|QK?5jNAT7`v?#{HKdj{RDL`aV5w}SV@ zacQSmfJv4KN0Su`PC&a5@@`1PpeO~^JTiHlG0W-?7BXZRu6y)o!ZW4H9=U%9P@6-++ifJYLZxB)WRGf=eDgd3K0Slt--$k+PcAfNrz zqsxO&GL6SJRVX>^fldEq>ep=(=oAzz;dH%=C(50jbFHx2R2JbFS_IO%D=v7P> z28MG7t3Ilo)3SaRLjOE|*ei8o{CZBXt8heS{uIQ_);ZIjSvkmD2FDMP$8}o+wwv)S ziuAPl#Qp6Xss!>PDy3#!VBf=^$CCCPE2*uRXS$DjvzPUc`fTSU@p1xN$>(>i9n@W7 z243BZ;W$&D&!A+m4i;N4N+#3}%B$`O_ubL#lSY3+F!vN`?zpulHV>*Vb>8Hpg&suj)m*;&Kv{Aj zV~(L4$bm3K6ZasdeYbX&jxK&4wxkAT67iO8uYyb;1&+_z8p_bmRqe_03-)| zKQ1F2YBo7%S2Y6x`3k`UX#3^ky(#oZ*qgZ9{YVZBLh&bXKgwS>2u6PPX?YC8`WHLb zrSLRQ`q6^2hDkqQ`{4wz^qv>g)yEJAAqKnO|d_4|C}<%n{l*BfB_fX_-I!2tMIFdgv6u0TWQNhB1pWL)bUe75J0pJF;#1v(40 z!7cByhoT}-$^NBCX#dy;kzK zo`zl5btQVUX+O_Gy>j`vH1^q&V~;h*M}7h4E*^0kBc8ZhzPmi;J|C1dz5m{v9(KB* zp83UB@wjHA<)@C)soyqzvMbsHmywkjd4#1vNoK0h$U1hba~LqO>zfoy}(ftqezD- z$J;HYQMR7bW}P>TH19I-c!D&R8g@A9Y~)jT_wKS_)_I{&P7BZF>!PWLf?aj* z%k6K77IgnLdeA9QMWSY_jT-*h{AVZ6MW4dnf=Mk;Scs_R7E}I3Or7n{2zL7&p;;Uk zBm0$4$@A-a@^cEdJ3tXRQ7*$y&)#nN_2;2(QOCa+yZr>v(xwOJ&_gY`FmeH zybF~c47XK@k@{3~ICqMEAHO%Nb|5Joe}NF|a^V1>cTA%p0QKoZ($B963lm*)B7t~m z?6(NBD#=v;i8}YYJ<;!P=1soeYRdmDB8y{Y`TtKJ^t6G+={>2xwi6pJm|WEFH|hRe zdc683XWdj^TR2)83mZhJG>Ny$m8Zgu*0#Cp&W|46^Ht5ab zuDd)Nl5T;`Q+ASS*-q+z`(X=J$^Vs6C9)qpCFb7!DhqFLSnGhvy))YQ*$eH%3JZ@5 zA2mPaC55A~qO=zmBr3%rg8E7{u2MU9;>>eQM)ai9?IK46p6cGE?!e-Mk0W9BC?+f| z+e=D4npTAN7HX1dZDeMK*nYIfC%BddCl*(#*|V7PucdIZn#)K+;F*1MEw&`VL1=pp znc(MYqLsNA?y|QQoeDYQKof9`W2fMdi2WXCW_5Gtz^=Uod0g6;Jn%q+z(Z#b{UFq9gar zUSgLfieje$+*jD+q#bxzG?<)uw z{Ggk(w|}TzY*a%#x+}x+!hvfpQ@MR(8b^0610xn4c5U>_;{nI6*uKV!XM-b#HU0Cw z4WUo}4y3zOE|lk!`m|*r9mT9uwsIh>0Lkp3pXb!OSVxoCs)aDmrfZp&F^@O$Dmz99 z6h0HG&GYN>UruA3UV zo$5Q)*xWxqvUm+Gs<}&DM=uz6tsw@buH%_wdJvmvuDxrJ1N-($xD^ls8dw2|$)mxd zKnDvGaJBR}z^Mcu+!H}XS8Uap?T<6`W^m0tlMhm@ih7DY;26J6;GI6w^O+z>v~hp?VkpBi8DnO}P_hZOMFN?NF&$ z&E!@?>AYt`QsdKYn@gHfgp5V287*HUtxS8YC#TD{c_!H;jSVjS;xEbF^$FqBPdKQ1qOoVUI7# zlMP_dBX8LnTzlvH1#g98aNv;LAuF*lXYk7!TR(;tHZ&zF}zs+8fEN{HfaEjlW73ecS9ShLw#Utgw5 zoEgS0@+ih@15k{c+~V6;zA{e4z1s-GjUfTfo4kf+wfBp+w!F`C8M_QO>J4L$KGiHd ztI_@5kJQI9z|HN#(k2<>oOD+?o6Uq!nS9Ik^=39N(kAD~M{oUPZ0)pX6K2%ieSe(L z$ff5&7?cFXP`?~7++}L6wlqPtYSGnudT}nrs*3B&ezB623Libn=;)!`;)kcDJf=qy ztZHID-$|(Tni^FoNi?sXt7gMO0Mt!=sSC0q+ndWB&|?vH8*YhPk2PtCwtAuaR|I2Cf5d(fE3vNdH>6zL>uCc+VPU9G z<#!UKJYcai149#u=$I7QC;NdWLm1z+D}?5rg^5hmNzUB8MfRUqXm1k4Ui1rS2*_(9 zWSkP3saDdWNH#~8?6wJ39Cj+xS$pqr)b^Fc+A! zh*mc>8zHtm(1YRLIF9=1c!vSFs{@`}#vOJAclg{a_lMFR7d9`8ztCyNIH* zhbiTg)Y-)bV^3{i>GAo23wl3p$D*5URIwe?-f4_?ru(T%7rgazdAPB;<Mw6s=?Tz(+|>SE%7Y8s)0Aq*AlWr!{|wA z*|v5l(vG|a0Z>;2j2G@wI~{TyOv&UCdu_tyV0P&|!yV~JMB5u3Xh@Dd4%nFbNZjjG z8;g#kqRa3sUS-E<)%t{E1B5CJ$mh4&=W5;82zH13GdwEQ0(vs-BBfAVYf!cweyoUJ z2W^6y4(X#QI*!Q(FY|5K zxRy=9#ZuyUO>U7}7h+;1B_*X$06p5hT;l%Q+uM}VPYY=c5(^8Y8j?r32#8zm1lAGo z|7cIA_u2#6g@iSWr{16Dc5Y#pxx>hPu~B0C+gp8Gn=m9x-D$MMKJ~$U~zdupV8Nyf@i4J&_ zV9O>BIyFbvVRa7UVuu%-C9MK39E*mCXxeR1>vhqivTZ=21c_kacTd5TB3fI%Sg2RX zN3oK`_LlQ0f;|BR_yEA9a^zmx7cu1&)dQcW8fK7?{OKrO10fmX_p4X>51k!{xI_R{ zY}c9D6A5u;1#vZiEDLdFJ_|!3R-_;yz*=pgg*TN|%_!r$ zY6(Ivpfm_h(V#T<@fG~ih;$*i*L%7uUGH!HJ<>1kH_E_sPDf;*Ya8F77qz{ri5PVLzl}?J^i3y!|Q_O6d%EAlU5(%?WmeBT^{; zJNO=7PvijrDN=oa6tO^m6rjKB%hr7~Ynxuu!2|bz@)kV*f%O+J)(H36% zLG7MA7dOX;N!%4qsZ)Z_3>P!pEWPhif$PCI>O&T1f5NVW`|t?2k)}C{3PJ+L@2z?3 z$946XDz!eP{033lq23O=Fvw+s_MjkF1Apo~b~$|#{B)LgG-XCgSWJc)me}YxB36mV zcajf8SiD?Yc3N?JTYF`0{iBXi#dL!$vh*306U)w^p@o!yNF0qi`y6wNC6z#y13#LP zv=_#>fR*S@0FfLqJ`hSD7Erj|h``yqttq4Q3urRQa+CAB^R#2Bgh`W5GQY%SMy?*1 zaJ=55F4s;kAD>z^(V(!gO~PXJk{aa7JKNCoob|yK6Ve&@;3K`!dwiEB!>f;Mss!^8 zVtWW`QYuPHhklM#al%p#sdLbnY{G~2HwY7eD=c2Jv~AXZoA}H~PYPw5>LECna8VF4 z-pgi@J`$DIg=b+?OLOigD^p`)17xbKaXJ@|0*z-m={ zo+=x_D8e2Pl7E+3LhncyuEa=xRkT4&Q17YlTngGQ7(E!MwhWvSU^S%*C6Nxp zhwgJuedAMEt4;SUj|{7pm=%Tr<~8sz*gK88&i zcSL`~_pY{uU}rd_DT30<$hjII8^kW&I;seXtSo3}AuV^9@NP8zxac+X(k>6(1X9Qm z<2KsNaLUC4Xt6loog)I8nq54EXNHVxCzH~afd;nuy4bbOoom?q(XAS8#48ZjXh7+a zwdfuC%MSB-&HE1@@(rQJf>DbD#)A403z+|%D@^I^+yE6&Og<4Q{2|Nhl6(SR4s1y`7RJ- z%q>#kBf~I#9mMfU?F>pR)`#R3ymo16shz3b2v$@|*X}w?n+fEnT*j3(Vao+3XE7-p zh~)2Mmu<{kIu)YDoS#`|!W-gD_lqOQj|8iG=ajQJe`&d{oMR9@S^I835e&f%ZcP@K zgdbvYnI&4AKV&|g8Ifl`YEY4A!n8h(qWN03xE(AkpbcBbBo+sic16*+~B8R_?{fLJV}1&kx; znrE_2(itz`W4RE{6X13Qfgqdp8tIm<~cRfX%V_LBAT5Y4=xWMT2Nhk>g>g>&uvdt#+PM7w<_x=V|^s!;7 z@$UUc^)OCSewxuL{uNfre zkE8E-_0NC1js5T8y3h~axJ8Qwz8>wdH$M+tf)jDL`&N&`~yoQP?O6htkYTDzA z7X|WJd1gqxQ{+RaVU>xIw$%+HG!Y-1= z^uR;fIC)iz9F@kb?N9TjO_e&ORxvX|aNq~*g@K4bKAlHyJ$)z9>Lj^$T3JO!^XKAZ zGwq|8jE@GtOK00=SWTrkj#9}`s@heR%t&Sk*>gA-3=y||^ZDN8b>_^a`A?z3gg!0; zpGMTWxDS%8Cs`D>Sd!TFuZxqms+Ku7BvUcPVy%1w;^{%0FmAnaD69<1bwkB#3P(lb zpeR7F)H;ls`uHlnJpeEF8Oev6E(wdF6T%QaQ{b9a5Yv3KZ^S-w%%x$!i(=MgG}%oG zKI`QYx}n&`Q?4glny3(uF7VZ6vk$gf8Vvk(h$9vq5f^VY^%A0>ZpwXWSkj=GkBad_ zaB;uw)=j->W4GUor8BP&&wh%u9j?RO zHl>wM_Rp#>O>QKu4BnIY>3f)nk)6kDBfG-)M!i2=H7MybP}aGNFWxQ4ON-}pCf1x%At@T~{lgv@d>4Qc{hT7Kl(sJTD{90IvN`{mjyW)@vFT8>q$l9 zB=9Vtv~;<+B0dQU1*aKFv01L$2E9FJIjyXu^t1UNrFU6%hHweK;TIn_po~6!gpPFn| z&%`I}Ge9~OQ(`bFL>^Xj1afD$QaKqrfN%cxwR8n=0(@X^2{;{UA)i9@>Wy5P@qY=X z+Z<|P`7Yl$WbOpBQ|jy_pzPaO*nOIa)A6R9ksQBl{wBk5bKLnXIqz#7QQBOHsTUnVio@S8ko5cyC$OL^ zxKN7r@E-3+S@Qln%)>-tHSuhfe^j>vnTwAc3j}Hvw#3pE`%6pxYaqBilhxFIhfvJL zh%yB{qXN>LWlM%`*?0P_8sA6-23MWeh3-71Q*~ZGD)xo%ue(5~y(w5(U^RvGd`j<)Qa-bZtMQS=X zlG@BXTla4bGSi-UpSO36NeL z()2nGk&z~T$XI#4B@;R#fI}w^83rpGo`rm%K@C1NBP%%%F?=DEupMg)&%PfAoI;`X zv_36Zl8HA~mT>$1X4s=ZEP|DQX(Q6sQUZqRai|z}wG6Pj{%X1bGu`JA zdpQrEDMOGRPe(e0$8K~&ljp5+>&Js-e!|2;9PO~?RVk^eyR0@xIPufN3n|A%cdX^p$fwcl{nVaq3J;K+@Tfp^#u_mror=dKfXJ5mj^$eEwpknaGA|=rRSi{SAkU zvH#C8hyEw#py;ZgjtG`#l-3>kX0VJsh!R=>=Yuth+Zhs;7h(m%PPVTjHVZlfwD;v` zO(jc)=565B>KCpa3#|SNXmy1ar_KLO2%y)O`%w&(5xm!b9g!5?JUP|0pJ8)|Oyf8Y3VQbJ*(wNC?5uzkH-G7&FJYg37S8p?XnK4z)4dm6;Jp z*0B0eK>%<`LDd44+BrTOQQ9?05u0nMcW-v&_g6v z?Sa%*YB+&IEe%cqO!{h8$JRaN^?Y2oV=ZK>On8SBS_UKWVk0RMg&ZgFn;jEbfC`bD z9HTbyW2D9$hA0ZjBCCvqL_8-sg!852-c~4el^Ly7*I66nyi-FN$>^YCnt)LOl>s%9% zKsi=+9t;rV3H>So{?8{yk&GZxpqroS{$)f#T`P3K@7dW7viBL z-u<*Pc%h8bf?D69hkYqawgmcv;1C;Bw8mnsAVwRVcXTM>q1ogK8UZz(HAu8Q0);c> zK!FG`)d&iR-AoV3k%Vpl#Ed7uOPGjfD#tB|Ib*iK2vi~D4_hqJ3)Iv_2d5( zfhF#L+OCNU#vq4{PkUo_F&Vga()*nP+MZ} z*f|}_z->#twy4Zt;dMwK6y46R_mb1)zmPE4D0|_5SkOp?_gi&C{zbv+$?@nF&>Q^= zU))_$FyISmXchfk!IJ+}u=m9u#jq=;e%5ln+{yHKhrhn%CT?51xU|v_lb0Fd*9cH9 z00H~7q<04R{r0g#jh2Y!t(5yWA|;qU)ZqL3y3gTDjA_+i3hIuRYW1Z zh}(@Jg2-5k0m6dpsFB>_;5H znaTJx=N_^%Wxag7xVV@GVXE#20-0avFtRQX`~Jv#lp2I`^i~D>@CCiFJ*Qkg+51P1 zyxGh~J|Ka#Jn3i&`x8d|(-R-!GIIs#!nyzr!#7Hmm?OAx94!CKI>Qzd3`rB*6z>kP8^8$VZV=;4T1cs<1 zHw#v^$7P)o0&j1dEfR7#_uX(bJlou=H~bKUC>@m9K=mfL?dtU;upV!Gm2MKRKi zCjK<(tO?(91nRffW)DHhnN2M{2>53MFE-sypN6UHmAT@1BTY64jh4YaTGS;c6UdF= zRZN00+!9zwPk1%R8c-1Lf7FzbZ7(W%NE9F5SwDtb4moIDvZ`eSZ6)>Y4u<#;&D+Vw z06Uwpwo*+*9=E|re~~O2fzhC#rcqV+$h5b|!_fzu#R z(7wK-nqk9s9)7a)+^lLhK7o-y0BME86;{|0J&Nq*V7ef8L>dR>NUwpN5x)dZ+|$gd zMC?!o*js6dZ{ojFK8o#t?wM{ll4OV@89ID*SR5@)6u%1P2*x!6j#b#WEncvO(@F54 z>$2*3%}vEnF;F(0vpq%$UGhBi0Pq^3M#$*#(E|&Q)LL-oQt~)?xbvd|cFZ1TQ)kg@ zdq@LvQcO^ADHm1LN&uFrqVV zBkQVzMM05gMF`FpI|;pCY>y(2`9Z_OK*(r)5vI~hM!F|su|`_LQZ4R?>wjMi^P|Go z3rl|rJp>D_3b0Ii?63c3ABf`6^fVv1zvaFN$ZMODMEAABxR&-H@M>U;+u7>Ff6snV z6IMF9mQKGK0H0@C=+=-6t%V&>@6Bd~WDX3TiW<)}zgGXcN+6?%TaSjpRW7HDL#2+w zDBGI~{yXjjgOI^N9`Jm*IQa)0!dxJoC^bhx-Dz-&+*eAwHni4dXhNk^Q~wT26t}lI z3-4i?wq@pN#e>ok0+RZ{&!92tB3HItZfq735r2r3gDQ~vYR#1 zq_7He9ZExbC08k9mvQpuj}@2#^Puijf-Qz{jGVsVJCTV|lfX_x#kJd26<#NJnXxhW z2-g3(nMer!%|1v^AvK-OV_jw#{-q-GvC3)v6W6`F5`$K?48D*ebYl}Aln z{^F+HW+7_VvThxikGda>kig7cXIXn;sq4Rq++OZoTDcJ~vO;mr?{nzplG7KzDfx9? zAD%ANk~6UIJg&MF2>~E(+NQ#6igPItAb`SIL2Ysn>3L-D1y@Yo&!_O?vQ^`Ih=`SZ zvcw&R7rjIfUx~?=oZDbzZ1nb`d~J4XF*-w(vY) zlbTT_=j8?OACCrRB&wk;`Ta1(P;IW?6hGTtGFQ@9jx1}T2x=xi(6OD#IW3D#EXkzi zg)ER1;_WD+psOWsA#EL!_Lw}Y`vAxly%i}lw5ibBiAXj(4xJ-tbv%M|2+P;@LANpD z?;u!V!etOV01!|R5VZccAm9#X5iW6`tO`K`)9Jz9{Yn||qn< zM`^x0p+f-?aKp$h6+YpNQ&{ap#WF~iU*WA#IEI6|;#>Kzx)N^KI|;0ncXC}??ecci zU`padoj%Ls?d+nivAj(L(Z#aTw{Z{6rfJN1Fz{79@;=StxUSR10F#gau9 zM7s&CXba*eWbWc4*-}}c{b+x}lW+h@FTrd;!Wyua4GKLIM+gNH=>Yd@1d~prZ)#_{ zBhPU8IH0ica#5;=)SiJX@bK@?Z3)H44;2=US(ZW+070$lCM9Ap)dSeFpKejp>HF;s zoFGBk=F6=`z1Ap)FY8JmK7ckch&QyMGv%i*i?VU$BPRunD%<$fSs>*)2+z)HzxsI^ zXkW<+s!DdH1co5->PgPAA5kpL%14eFxvrZz|5G+lvYJs86@ah)ZNm)=TEI3e zSR|uGUuNGH1Lw!nG0yvTS=*#5c&~|aG|GUJLLve<@y8)*87;+YqIkI9DNdsluIO>F z=fdB*jfU3;FJ_Grt=!F3kGJ>6-a zo@!@h3ks0?TJoFnk7*AO8fZ%HEfaUOGLvUcb{ibn$5*f==e|vH2C;Q}l(*Werj7g5 z%F8sWd?P0LqVhc#b7x`tegByLYWs^LQOsY&sP^jNo%@)((%SU(_H93?jNcg&%zUN$ zcwTYr%I}?}d+KAwR>KEEXRSx(8z-zcb)v*lW*+RCJ|s=$D1qnvAW0&8|l5T!Bmwd%$YRxC(Xed zxNs6CL$7ztdwe{A!)F(S!As)}mF&5obaWctxs`fPF-+|Q9<{;qbH_xxsHPt4l^4Gi zDuf-@;fcQ?!gBG3SI99hEuB_us+871~jk$PRY=1DVfxRVW-SE@G>}@ru zSR*@bWhX|y)7=LgqK+onwhk@YjEkdOA`&JXsVB8W@4wXOLurLA+LtAJ3nsO?zIpS| zpu{JjTCs5QvZGP{u_jBq!>-0{KJdT-j7VE>)3H$w&mZ9i<=`aAJ^!z)S|^N0pX%<5 z3qJ;d0&%KXnBW!mGc)nn!Jk9ahz?U%I_;p{$lBY^gXGfq)-}fVaSj?}LDED_)bc67alN zEI8Pr_TV2U9=Xbdh-?2vY%Cg}&WRkBE+{CNta8e>eHVE-sf+IY;f=mb(J9<;r#ijG zXTD8(>%)hgB;o~#%$BB&iAU=0K}3IQiPPGbRLr>6NitW4d58)r<(pmWRgQ*J+;+;; zbm}U`uelOF8IM8Vp13QaMw3?tRc%^fOanvx{8D zDS_a^_~uh(k+g`&J=y$I;6X6?7tWRt}c)r zD6Cbr5|OrdcWqv>k&rM!_sGcZ1oR|uWbAq0fVpyVVa+GmRI_sks*VFo6c^V#lizvu zEUU33e*X!^GLo`4N$1&_dBDymprVRl^B4)8;qOk>AbbeC8%QcRraj7E_FOT*|9n-Z zWavpHcZx{fgM3ep0DPviYQVNms#iQjw+SgaFUD1N-3H!4IS847qq-PTfzhY;Z;@Pw zyx)qfLTv;{e(0;|{jgQ2*>8OXtp1;nR#7)Mr@Y&yyx%lAHTA4;gL*y^LC;s?4rJxO z5S#ymy;!#hk#ydW+9IK(R)1l@oYoDy&z$6@k&%(b4a`SgzzW0OZ}Z#?D^wiby`8(% zUUPoGtEIW}V>&a_HhJKDI!#c9Utv&Ap#0p)!pZG9?@oon{-h)D*%$uScv)%ErpCKB z3p80K6`!Quu;&J-WFJshAM6-!sD2)>MOg8ql}+JEp;X0_cd0E>J44(3+hgnCl};s? zuGUxU8IAjoD)MS&NXZK1K5C6}GH$j`N}u}GNbPcnK%^Y*vxKb?gQ*Tnnc3IWk(F6$fZarA5T-?!ccn!z$+8mw0V+ z93Xf>F;MLm!83>=C=I@n3ST=u@Jkr90LULOi6`=e1*q>vA;pgPo*a;+WK zWQ8^LPE4T3KfYMU=<4F{HC$>7>{n~IfRmjl&EJz}QWjtqvt2jgbu(-tJD$#DUl{wi zrgvn7V_f*xsLc)-;rqc<`yA~%R5O?^bnJr|D7YD{+sp;^;R0h1N0=>!3*L*Y>+ibIRo-r_ht-R2z z&VbwNeQ{-DSiUSG``LwIRP;<0=7X>@uA_re$YEZDdsy<_v z7GN3hhMlw118aJ2HLE<1k3dBY*q!*YR$wXxP6pfy&tUNK>k(4pAw4 z?@3bOU{$q(K)b+WB)F)BgY$IlzS+kbJMTuCm@Du5TmZlF^6T~d30LP53`%QjC+XQB zMI;^G4VnAsmNN}DyZhFjU1cY4j>Uo%7_4LfsV;rzG(h4yoe%#wWSAtE+3+at*x&>kv_3Uv=?l3I{7ScueQq)O{YrbN_%L8 z%j0Z?lS2Qvw7_lBJk-S8_i@Osv3Iq~1>cr_rJ9D_JH^$}(Ggafi&A!K_c|Ur+Z(Z) z%k7=$a+J+baH2_P!!Tl%B^3~ETue;+RW2@J^^16jczh%ZM1x2BGCX?tf`KvLilDC( z4_Za1o1MRKAtJ%xe%RM@^#S1-zaNL_w(nPKQpQKdE?8Mxi`qr94hkX@oOX9dK`qhW zfXD-$DRyCGbW{W}jCPT*D)VA9S;UrogGvW3*#M0_>9lu$_#k@kjkKM+J134~ohUO5_y89zb{qbaw=!Cja%kAX2%4XVh5<4vY=O$4peXbI+6gtVr}y(dmzh07=IWVr+1nx4<}Ks~ z*Fp;gkGE*+-2U?8C+GY7KF|h@Nzj>y^cz?D=gED3_(%#^G+vW3$=jD{2};Q|w+d>n zZd&tb`u1fVskydsC2$C8s{7(Kw!m~!a8JlNDY(#wBRs$j__pu+eg#HO29lCCKNvrXM}o%-h=5)T85;$B2i3^erAsX&x8*8yA}=yVt<3j^DI zz~Y>3Ex-8njL7T@Ry8*^N}L<Ao&X3yC=PzxtZhaIe1@qRrWEX`j1`dG&Gt88&?x!oe z!(@b|^5bJa0evCWKY#uQpf9AlBagqIWRH}+rv|wJJ5^DT1aH!&w?Nd{=`>y^FDL~D zW-i#t3r**j*2o{7@Z;S7fARLNf1c$3V}A`y!oW6NM%`Aa!4oGZ+ zJ@V$LB-kUsx-r+wFnO-yV|V}lpTIK5%}X+ySIYc8a5GrW1q-`eU@36(%Gc1-A2XZV zwzf?%0ve~O-G1!JiZr{|7bJc;L{^%GUXwE{X#_TOaoOOjn4|G zT4*@G6qp{RQlDyS_aD2!x&_!B*m-EtSD@pfK*Spsswew4F z0mTw9wzjQ>hc&Qp*#K<(1A%Yq+lxi_7Kx%1iEgife!B=P#!5f?c3%T}?D)k?i#N?P~8Wpn@?Q*nu$n{PlV~xY(^@sQYz! z{-@t>Ua#MumJS8azhCyR`y~8tp$@RujST)j`6tiy?@Mo#-TW^MK;Y@>=d#Wzp$P!W C(pMD# diff --git a/cypress/integration/__image_snapshots__/superflat-world #0.png b/cypress/integration/__image_snapshots__/superflat-world #0.png new file mode 100644 index 0000000000000000000000000000000000000000..58f2bd21d2117b08d1b2c41c787a6aa75b7e3bf5 GIT binary patch literal 267964 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

    @v0i!YrlD3J>?(qNEsui8A4&no01 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 literal 0 HcmV?d00001 diff --git a/cypress/integration/index.spec.ts b/cypress/integration/index.spec.ts index f2aa90c00..68944b2e8 100644 --- a/cypress/integration/index.spec.ts +++ b/cypress/integration/index.spec.ts @@ -49,7 +49,7 @@ it('Loads & renders zip world', () => { setLocalStorageSettings() // todo replace with data-test cy.get('#title-screen').find('[data-test-id="select-file-folder"]', { includeShadowDom: true, }).click({ shiftKey: true }) - cy.get('input[type="file"]').selectFile('cypress/fixtures/superflat.zip', { force: true }) + cy.get('input[type="file"]').selectFile('cypress/superflat.zip', { force: true }) // todo implement load event cy.wait(12000) cy.get('body').toMatchImageSnapshot({ diff --git a/cypress/superflat.zip b/cypress/superflat.zip new file mode 100644 index 0000000000000000000000000000000000000000..10fc9f464db531f95b5577bdeb6e2512f9451c5e GIT binary patch literal 100058 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 sAMMop)zkwt{f_meDh*BU)QbP#` Date: Fri, 15 Sep 2023 18:30:47 +0300 Subject: [PATCH 233/318] ci: remove prepublish scripts --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index ad2c79806..c06ef19a0 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,7 @@ "test:cypress": "cypress run", "test:e2e": "start-test http-get://localhost:8080 test:cypress", "prod-start": "node server.js", - "postinstall": "node scripts/gen-texturepack-files.mjs", - "prepublishOnly": "npm run build" + "postinstall": "node scripts/gen-texturepack-files.mjs" }, "keywords": [ "prismarine", From 4f3375874c1dfcef2c6446b508f9b145027e941b Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 17 Sep 2023 23:39:21 +0300 Subject: [PATCH 234/318] temp fix for connect --- src/index.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/index.ts b/src/index.ts index 7effed802..ebef84c0f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -379,12 +379,13 @@ async function connect(connectOptions: { console.log(`using proxy ${proxy} ${proxyport}`) // check proxy server availability for proper error message - try { - await fetch(`http://${proxy}:${proxyport}/api/vm/net`, { method: 'GET' }) - } catch (err) { - console.error(err) - throw new Error(`Proxy server ${proxy}:${proxyport} is not available`) - } + // todo fix correctly + // try { + // await fetch(`http://${proxy}:${proxyport}/api/vm/net`, { method: 'GET' }) + // } catch (err) { + // console.error(err) + // throw new Error(`Proxy server ${proxy}:${proxyport} is not available`) + // } //@ts-ignore net.setProxy({ hostname: proxy, port: proxyport }) } From 2a854977e43fb6beeb9f338a4c4d1123ac9a2854 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Sat, 16 Sep 2023 04:38:57 +0300 Subject: [PATCH 235/318] ci: draft a release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c06ef19a0..01bd952c5 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "release": { "initialVersion": { "version": "0.1.0", - "releaseNotes": "First GH release", + "releaseNotes": "The start of something new...", "releaseNotesWithExisting": "The start of something new..." } }, From d8feab79a7850b1e816fec5136302a7709d3c3fb Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 17 Sep 2023 23:42:53 +0300 Subject: [PATCH 236/318] restore old working preview pipeline --- .github/workflows/preview.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 384e198ba..2294132ea 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -8,7 +8,6 @@ on: jobs: deploy: runs-on: ubuntu-latest - permissions: write-all steps: - name: Checkout uses: actions/checkout@v2 @@ -16,12 +15,9 @@ jobs: fetch-depth: 0 - name: Install Global Dependencies run: npm install --global vercel pnpm - - run: pnpm install - - run: pnpm run build - - uses: amondnet/vercel-action@v25 - with: - vercel-token: ${{ secrets.VERCEL_TOKEN }} - github-token: ${{ secrets.GITHUB_TOKEN }} - vercel-org-id: ${{ secrets.VERCEL_ORG_ID}} - vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}} - alias-domains: ${{ secrets.TEST_PREVIEW_DOMAIN}} + - name: Pull Vercel Environment Information + run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }} + - name: Build Project Artifacts + run: vercel build --token=${{ secrets.VERCEL_TOKEN }} + - name: Deploy Project Artifacts to Vercel + run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} From d5f4853ea28ea534b47581a7c1a00a4f161bf95a Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Sat, 16 Sep 2023 05:46:15 +0300 Subject: [PATCH 237/318] allow to specify guest name --- src/index.ts | 5 ++++- src/optionsStorage.ts | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index 30e7f9d51..8f004d3fb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -768,9 +768,12 @@ if (hasMapUrl()) { const peerId = qs.get('connectPeer') const version = qs.get('peerVersion') if (peerId) { + let username = options.guestUsername + if (!options.askGuestName) username = prompt('Enter your username', username) + options.guestUsername = username connect({ server: '', port: '', proxy: '', password: '', - username: 'test', + username, botVersion: version || undefined, peerId }) diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts index f67c39ea6..c6715093c 100644 --- a/src/optionsStorage.ts +++ b/src/optionsStorage.ts @@ -21,7 +21,9 @@ const defaultOptions = { localServerOptions: {}, localUsername: 'wanderer', preferLoadReadonly: false, - disableLoadPrompts: false + disableLoadPrompts: false, + guestUsername: 'guest', + askGuestName: true } export const options = proxy( From a6da82ea99b497120d239d7c410e17dc027ed784 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 16 Sep 2023 04:45:02 +0300 Subject: [PATCH 238/318] ci: oops, use specified version actually --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 01bd952c5..893691e58 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "prismarine-web-client", - "version": "1.5.0", + "version": "0.0.0-dev", "description": "A minecraft client running in a browser", "scripts": { "start": "node scripts/build.js copyFilesDev && node scripts/prepareData.mjs && node esbuild.mjs --minify --watch", From 9cd3b9566efad7308099266344d6901e174d47d4 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 17 Sep 2023 23:43:40 +0300 Subject: [PATCH 239/318] restore default versin select for default host --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index c7e8b61c8..05bc6538f 100644 --- a/config.json +++ b/config.json @@ -3,5 +3,5 @@ "defaultHostPort": 25565, "defaultProxy": "", "defaultProxyPort": 0, - "defaultVersion": "" + "defaultVersion": "1.18.2" } From 3b97408d7d7678d331720dab2ce2805775a9ca38 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Sat, 16 Sep 2023 06:15:22 +0300 Subject: [PATCH 240/318] implement qr display --- package.json | 9 ++------- src/globalState.ts | 1 + src/localServerMultiplayer.ts | 35 ++++++++++++++++++++--------------- src/menus/pause_screen.js | 14 ++++++++++---- src/reactUi.jsx | 31 ++++++++++++++++++++++++++++++- 5 files changed, 63 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 8da7e75f7..b05c52d11 100644 --- a/package.json +++ b/package.json @@ -19,13 +19,6 @@ ], "author": "PrismarineJS", "license": "MIT", - "release": { - "initialVersion": { - "version": "0.1.0", - "releaseNotes": "The start of something new...", - "releaseNotesWithExisting": "The start of something new..." - } - }, "dependencies": { "@dimaka/interface": "0.0.1", "@emotion/css": "^11.11.2", @@ -51,8 +44,10 @@ "lit": "^2.8.0", "minecraft-data": "^3.0.0", "net-browserify": "github:PrismarineJS/net-browserify", + "peerjs": "^1.5.0", "pretty-bytes": "^6.1.1", "prismarine-world": "^3.6.2", + "qrcode.react": "^3.1.0", "querystring": "^0.2.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/src/globalState.ts b/src/globalState.ts index 190d1704a..df754b4cf 100644 --- a/src/globalState.ts +++ b/src/globalState.ts @@ -103,6 +103,7 @@ export const showContextmenu = (items: ContextMenuItem[], { clientX, clientY }) // --- export const miscUiState = proxy({ + currentDisplayQr: null as string | null, currentTouch: null as boolean | null, singleplayer: false, flyingSquid: false, diff --git a/src/localServerMultiplayer.ts b/src/localServerMultiplayer.ts index 6924c6b13..1268b55f5 100644 --- a/src/localServerMultiplayer.ts +++ b/src/localServerMultiplayer.ts @@ -9,33 +9,38 @@ class CustomDuplex extends Duplex { super(options) } - // Implement the _read() method for reading data from the stream - _read(size) { - } + _read() { } - // Implement the _write() method for writing data to the stream _write(chunk, encoding, callback) { this.writeAction(chunk) - // this.writeStream.push(chunk) // Push the data chunk to the write queue - // this.writeStream.resume() // Resume the write stream - callback() // Signal that the write operation is complete + callback() } } let peerInstance: Peer | undefined -const copyJoinLink = async (id) => { - miscUiState.wanOpened = true +export const getJoinLink = () => { + if (!peerInstance) return const url = new URL(window.location.href) - url.searchParams.set('connectPeer', id) + url.searchParams.set('connectPeer', peerInstance.id) url.searchParams.set('peerVersion', localServer.options.version) - await navigator.clipboard.writeText(url.toString()) + return url.toString() +} + +const copyJoinLink = async () => { + miscUiState.wanOpened = true + const joinLink = getJoinLink() + if (navigator.clipboard) { + await navigator.clipboard.writeText(joinLink) + } else { + window.prompt('Copy to clipboard: Ctrl+C, Enter', joinLink) + } } -export const openToWanAndCopyJoinLink = async (writeText: (text) => void) => { +export const openToWanAndCopyJoinLink = async (writeText: (text) => void, doCopy = true) => { if (!localServer) return if (peerInstance) { - await copyJoinLink(peerInstance.id) + if (doCopy) await copyJoinLink() return 'Already opened to wan. Join link copied' } const peer = new Peer({ @@ -80,8 +85,8 @@ export const openToWanAndCopyJoinLink = async (writeText: (text) => void) => { writeText(error.message) }) return await new Promise(resolve => { - peer.on('open', async (id) => { - await copyJoinLink(id) + peer.on('open', async () => { + await copyJoinLink() resolve('Copied join link to clipboard') }) setTimeout(() => { diff --git a/src/menus/pause_screen.js b/src/menus/pause_screen.js index b047cbbdb..5d1a6f9d0 100644 --- a/src/menus/pause_screen.js +++ b/src/menus/pause_screen.js @@ -8,7 +8,7 @@ const { saveWorld } = require('../builtinCommands') const { notification } = require('./notification') const { disconnect } = require('../utils') const { subscribeKey } = require('valtio/utils') -const { closeWan, openToWanAndCopyJoinLink } = require('../localServerMultiplayer') +const { closeWan, openToWanAndCopyJoinLink, getJoinLink } = require('../localServerMultiplayer') class PauseScreen extends LitElement { static get styles () { @@ -91,13 +91,19 @@ class PauseScreen extends LitElement { ` } - clickJoinLinkButton (qr = false) { + async clickJoinLinkButton (qr = false) { if (!qr && miscUiState.wanOpened) { closeWan() return } - // todo display qr! - openToWanAndCopyJoinLink(() => { }) + if (!miscUiState.wanOpened || !qr) { + await openToWanAndCopyJoinLink(() => { }, !qr) + } + if (qr) { + const joinLink = getJoinLink() + miscUiState.currentDisplayQr = joinLink + return + } } show () { diff --git a/src/reactUi.jsx b/src/reactUi.jsx index e479fb092..63af67759 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -3,11 +3,13 @@ import { renderToDom } from '@zardoy/react-util' import { LeftTouchArea, RightTouchArea, useUsingTouch, useInterfaceState } from '@dimaka/interface' import { css } from '@emotion/css' -import { activeModalStack, isGameActive } from './globalState' +import { activeModalStack, isGameActive, miscUiState } from './globalState' import { isProbablyIphone } from './menus/components/common' // import DeathScreen from './react/DeathScreen' import { useSnapshot } from 'valtio' import { contro } from './controls' +import { QRCodeSVG } from 'qrcode.react' +import { createPortal } from 'react-dom' // todo useInterfaceState.setState({ @@ -73,11 +75,38 @@ function useIsBotAvailable() { return isGameActive(false) } +const DisplayQr = () => { + const { currentDisplayQr } = useSnapshot(miscUiState) + + if (!currentDisplayQr) return null + + return createPortal(
    { + miscUiState.currentDisplayQr = null + }} + > + +
    , document.body) + +} + const App = () => { const isBotAvailable = useIsBotAvailable() if (!isBotAvailable) return null return
    +
    } From e1020d5103161304f36d623f958befb128af538f Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 16 Sep 2023 04:59:47 +0300 Subject: [PATCH 241/318] deploy also to vercel prod --- .github/workflows/publish.yml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0a31d6e7a..8c5a79b4a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,24 +10,18 @@ jobs: - name: Checkout repository uses: actions/checkout@master - name: Install pnpm - run: npm i -g pnpm - - run: pnpm install - - run: pnpm build - # - uses: cypress-io/github-action@v5 - # with: - # install: false - # start: pnpm prod-start - # - uses: actions/upload-artifact@v3 - # if: failure() - # with: - # name: cypress-images - # path: cypress/integration/__image_snapshots__/ - # todo link vercel deployment + run: npm i -g vercel pnpm + # - run: pnpm install + # - run: pnpm build + - run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} + # will install + build to .vercel/output/static + - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod + - run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} --prod - run: pnpx zardoy-release node env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./dist + publish_dir: .vercel/output/static force_orphan: true From df411291ec468d56c0731e01e642d9d610bae519 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 17 Sep 2023 23:45:37 +0300 Subject: [PATCH 242/318] should fix ci --- .github/workflows/ci.yml | 2 +- minecraft-server.mjs => cypress/minecraft-server.mjs | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename minecraft-server.mjs => cypress/minecraft-server.mjs (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4704ce9c..2a820614b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - uses: cypress-io/github-action@v5 with: install: false - start: pnpm prod-start + start: pnpm prod-start & node cypress/minecraft-server.mjs - uses: actions/upload-artifact@v3 if: failure() with: diff --git a/minecraft-server.mjs b/cypress/minecraft-server.mjs similarity index 100% rename from minecraft-server.mjs rename to cypress/minecraft-server.mjs From 95a55989f29d027bbd53748272131fc7fcf57882 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Sat, 16 Sep 2023 06:29:47 +0300 Subject: [PATCH 243/318] fix bot version select --- src/index.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/index.ts b/src/index.ts index 8f004d3fb..da0dfe4e2 100644 --- a/src/index.ts +++ b/src/index.ts @@ -406,9 +406,9 @@ async function connect(connectOptions: { await loadScript(`./mc-data/${toMajorVersion(version)}.js`) } - const version = connectOptions.botVersion ?? serverOptions.version - if (version) { - await downloadMcData(version) + const downloadVersion = connectOptions.botVersion || singeplayer ? serverOptions.version : undefined + if (downloadVersion) { + await downloadMcData(downloadVersion) } if (singeplayer) { @@ -443,13 +443,13 @@ async function connect(connectOptions: { bot = mineflayer.createBot({ host, port, - version: connectOptions.botVersion === '' ? false : connectOptions.botVersion, + version: !connectOptions.botVersion ? false : connectOptions.botVersion, ...singeplayer || p2pMultiplayer ? { - version: serverOptions.version, keepAlive: false, stream: botDuplex, } : {}, ...singeplayer ? { + version: serverOptions.version, connect() { }, customCommunication: usingCustomCommunication ? customCommunication : undefined, } : {}, From f2fff9fabb35dfe8873956825ba7030fc834946f Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 16 Sep 2023 05:17:32 +0300 Subject: [PATCH 244/318] ci: trigger fresh build to pull new secrets From 60ea5b9a9500e3ca01233bfee1af5c2b1c92af80 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 17 Sep 2023 23:53:30 +0300 Subject: [PATCH 245/318] fix silly parens mistake --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index ebef84c0f..c7ecef5a5 100644 --- a/src/index.ts +++ b/src/index.ts @@ -407,7 +407,7 @@ async function connect(connectOptions: { await loadScript(`./mc-data/${toMajorVersion(version)}.js`) } - const downloadVersion = connectOptions.botVersion || singeplayer ? serverOptions.version : undefined + const downloadVersion = (connectOptions.botVersion) || singeplayer ? serverOptions.version : undefined if (downloadVersion) { await downloadMcData(downloadVersion) } From ecab69f2837d4943131624272afab658742f5559 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Sat, 16 Sep 2023 06:47:29 +0300 Subject: [PATCH 246/318] ci: specify build commands? --- .github/workflows/preview.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index a7778e331..384e198ba 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -16,6 +16,8 @@ jobs: fetch-depth: 0 - name: Install Global Dependencies run: npm install --global vercel pnpm + - run: pnpm install + - run: pnpm run build - uses: amondnet/vercel-action@v25 with: vercel-token: ${{ secrets.VERCEL_TOKEN }} From b720d45ec68e0dc8a8b2287e5b42c090d34ed5e8 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 16 Sep 2023 05:39:24 +0300 Subject: [PATCH 247/318] ci: update vercel pipelines preview: comment prod: should be fixed --- .github/workflows/preview.yml | 14 ++++++++------ .github/workflows/publish.yml | 3 +++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 2294132ea..a7778e331 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -8,6 +8,7 @@ on: jobs: deploy: runs-on: ubuntu-latest + permissions: write-all steps: - name: Checkout uses: actions/checkout@v2 @@ -15,9 +16,10 @@ jobs: fetch-depth: 0 - name: Install Global Dependencies run: npm install --global vercel pnpm - - name: Pull Vercel Environment Information - run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }} - - name: Build Project Artifacts - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} - - name: Deploy Project Artifacts to Vercel - run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} + - uses: amondnet/vercel-action@v25 + with: + vercel-token: ${{ secrets.VERCEL_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} + vercel-org-id: ${{ secrets.VERCEL_ORG_ID}} + vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}} + alias-domains: ${{ secrets.TEST_PREVIEW_DOMAIN}} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8c5a79b4a..512dc55bd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,7 @@ name: Deploy to GitHub pages +env: + VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} + VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} on: push: branches: [main] From d9988c3904abe252dd197c09444e622a00bdf257 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 17 Sep 2023 23:54:09 +0300 Subject: [PATCH 248/318] dont create world folder --- cypress/minecraft-server.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/minecraft-server.mjs b/cypress/minecraft-server.mjs index 840346b83..972469c03 100644 --- a/cypress/minecraft-server.mjs +++ b/cypress/minecraft-server.mjs @@ -9,7 +9,7 @@ const serverOptions = { 'logging': false, 'gameMode': 0, 'difficulty': 0, - 'worldFolder': false, + 'worldFolder': undefined, // todo set sid, disable entities auto-spawn 'generation': { 'name': 'superflat', From 31768930c8541c6dd147e501c63a62b6f77f700f Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 18 Sep 2023 00:00:50 +0300 Subject: [PATCH 249/318] skip join to server test for now --- .github/workflows/ci.yml | 3 ++- cypress/integration/index.spec.ts | 2 +- src/index.ts | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a820614b..c6d5a0c2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,8 @@ jobs: - uses: cypress-io/github-action@v5 with: install: false - start: pnpm prod-start & node cypress/minecraft-server.mjs + # start: pnpm prod-start & node cypress/minecraft-server.mjs + start: pnpm prod-start - uses: actions/upload-artifact@v3 if: failure() with: diff --git a/cypress/integration/index.spec.ts b/cypress/integration/index.spec.ts index 68944b2e8..a060d2fb6 100644 --- a/cypress/integration/index.spec.ts +++ b/cypress/integration/index.spec.ts @@ -30,7 +30,7 @@ it('Loads & renders singleplayer', () => { }) }) -it('Joins to server', () => { +it.skip('Joins to server', () => { cy.visit('/') setLocalStorageSettings() // todo replace with data-test diff --git a/src/index.ts b/src/index.ts index c7ecef5a5..f45ad0f32 100644 --- a/src/index.ts +++ b/src/index.ts @@ -407,7 +407,7 @@ async function connect(connectOptions: { await loadScript(`./mc-data/${toMajorVersion(version)}.js`) } - const downloadVersion = (connectOptions.botVersion) || singeplayer ? serverOptions.version : undefined + const downloadVersion = connectOptions.botVersion || (singeplayer ? serverOptions.version : undefined) if (downloadVersion) { await downloadMcData(downloadVersion) } From 962b6899fd51ef091ba4bc2abf9b493389317c77 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sat, 16 Sep 2023 15:58:10 +0300 Subject: [PATCH 250/318] fix: ask for guest username --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index da0dfe4e2..7eda32d3e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -769,7 +769,7 @@ if (hasMapUrl()) { const version = qs.get('peerVersion') if (peerId) { let username = options.guestUsername - if (!options.askGuestName) username = prompt('Enter your username', username) + if (options.askGuestName) username = prompt('Enter your username', username) options.guestUsername = username connect({ server: '', port: '', proxy: '', password: '', From 44515c932f27383126aa53cab66b20a3575b685d Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 18 Sep 2023 01:19:30 +0300 Subject: [PATCH 251/318] feat: texturepack install via qs fix: fix slow texturepack install fix: fix compatibility with most texturepack block format todo: plan to do support for huge textures soon (i hope) --- ...AndOpenWorld.ts => downloadAndOpenFile.ts} | 33 ++++++++------- src/index.ts | 16 +++---- src/texturePack.ts | 42 ++++++++++++------- 3 files changed, 56 insertions(+), 35 deletions(-) rename src/{downloadAndOpenWorld.ts => downloadAndOpenFile.ts} (62%) diff --git a/src/downloadAndOpenWorld.ts b/src/downloadAndOpenFile.ts similarity index 62% rename from src/downloadAndOpenWorld.ts rename to src/downloadAndOpenFile.ts index fb0846c5d..6d2a47f9d 100644 --- a/src/downloadAndOpenWorld.ts +++ b/src/downloadAndOpenFile.ts @@ -1,4 +1,5 @@ import { openWorldZip } from './browserfs' +import { installTexturePack } from './texturePack' import { setLoadingScreenStatus } from './utils' import prettyBytes from 'pretty-bytes' @@ -6,21 +7,21 @@ const getConstantFilesize = (bytes: number) => { return prettyBytes(bytes, { minimumFractionDigits: 2, maximumFractionDigits: 2 }) } -export const hasMapUrl = () => { - const qs = new URLSearchParams(window.location.search) - const mapUrl = qs.get('map') - return !!mapUrl -} - export default async () => { const qs = new URLSearchParams(window.location.search) - const mapUrl = qs.get('map') - if (!mapUrl) return + let mapUrl = qs.get('map') + const texturepack = qs.get('texturepack') + // fixme + if (texturepack) mapUrl = texturepack + if (!mapUrl) return false - const menu = document.getElementById('play-screen') - menu.style = 'display: none;' + if (!texturepack) { + const menu = document.getElementById('play-screen') + menu.style = 'display: none;' + } const name = mapUrl.slice(mapUrl.lastIndexOf('/') + 1).slice(-25) - setLoadingScreenStatus(`Downloading world ${name}...`) + const downloadThing = texturepack ? 'texturepack' : 'world' + setLoadingScreenStatus(`Downloading ${downloadThing} ${name}...`) const response = await fetch(mapUrl) const contentType = response.headers.get('Content-Type') @@ -28,7 +29,7 @@ export default async () => { alert('Invalid map file') } const contentLength = +response.headers.get('Content-Length') - setLoadingScreenStatus(`Downloading world ${name}: have to download ${getConstantFilesize(contentLength)}...`) + setLoadingScreenStatus(`Downloading ${downloadThing} ${name}: have to download ${getConstantFilesize(contentLength)}...`) let downloadedBytes = 0 const buffer = await new Response( @@ -51,7 +52,7 @@ export default async () => { // Update your progress bar or display the progress value as needed if (contentLength) { - setLoadingScreenStatus(`Download Progress: ${Math.floor(progress)}% (${getConstantFilesize(downloadedBytes)} / ${getConstantFilesize(contentLength)}))`, false, true) + setLoadingScreenStatus(`Download ${downloadThing} progress: ${Math.floor(progress)}% (${getConstantFilesize(downloadedBytes)} / ${getConstantFilesize(contentLength)}))`, false, true) } // Pass the received data to the controller @@ -60,5 +61,9 @@ export default async () => { }, }) ).arrayBuffer() - await openWorldZip(buffer) + if (texturepack) { + await installTexturePack(buffer) + } else { + await openWorldZip(buffer) + } } diff --git a/src/index.ts b/src/index.ts index f45ad0f32..b7d6ade4d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -31,7 +31,7 @@ import './controls' import './dragndrop' import './browserfs' import './eruda' -import downloadAndOpenWorld, { hasMapUrl } from './downloadAndOpenWorld' +import downloadAndOpenFile from './downloadAndOpenFile' import net from 'net' import Stats from 'stats.js' @@ -63,8 +63,7 @@ import { isCypress, loadScript, toMajorVersion, - setLoadingScreenStatus, - resolveTimeout + setLoadingScreenStatus } from './utils' import { @@ -756,9 +755,9 @@ window.addEventListener('keydown', (e) => { addPanoramaCubeMap() showModal(document.getElementById('title-screen')) main() -if (hasMapUrl()) { - downloadAndOpenWorld() -} else { +downloadAndOpenFile().then((downloadAction) => { + if (downloadAction !== false) return + window.addEventListener('hud-ready', (e) => { // try to connect to peer const qs = new URLSearchParams(window.location.search) @@ -776,4 +775,7 @@ if (hasMapUrl()) { }) } }) -} +}, (err) => { + console.error(err) + alert(`Failed to download file: ${err}`) +}) diff --git a/src/texturePack.ts b/src/texturePack.ts index 15cec53fa..39e39e5c3 100644 --- a/src/texturePack.ts +++ b/src/texturePack.ts @@ -8,6 +8,7 @@ import type { Viewer } from 'prismarine-viewer/viewer/lib/viewer' import { removeFileRecursiveAsync } from './browserfs' import { miscUiState } from './globalState' import { subscribeKey } from 'valtio/utils' +import { showNotification } from './menus/notification' function nextPowerOfTwo(n) { if (n === 0) return 1 @@ -63,7 +64,7 @@ export const installTexturePack = async (file: File | ArrayBuffer) => { await uninstallTexturePack() } catch (err) { } - const status = 'Installing resource pack: copying all files'; + const status = 'Installing resource pack: copying all files' setLoadingScreenStatus(status) // extract the zip and write to fs every file in it const zip = new JSZip() @@ -71,21 +72,28 @@ export const installTexturePack = async (file: File | ArrayBuffer) => { if (!zipFile.file('pack.mcmeta')) throw new Error('Not a resource pack: missing pack.mcmeta') await mkdirRecursive(texturePackBasePath) - const allFilesArr = Object.entries(zipFile.files); - let i = 0 - for (const [path, file] of allFilesArr) { - const writePath = join(texturePackBasePath, path); - if (path.endsWith('/')) continue + const allFilesArr = Object.entries(zipFile.files) + let done = 0 + const upStatus = () => { + setLoadingScreenStatus(`${status} ${Math.round(++done / allFilesArr.length * 100)}%`) + } + await Promise.all(allFilesArr.map(async ([path, file]) => { + const writePath = join(texturePackBasePath, path) + if (path.endsWith('/')) return await mkdirRecursive(dirname(writePath)) await fs.promises.writeFile(writePath, Buffer.from(await file.async('arraybuffer'))) - setLoadingScreenStatus(`${status} ${Math.round(++i / allFilesArr.length * 100)}%`) - } + done++ + upStatus() + })) await fs.promises.writeFile(join(texturePackBasePath, 'name.txt'), file['name'] ?? '??', 'utf8') if (viewer?.world.active) { await genTexturePackTextures(viewer.version) } setLoadingScreenStatus(undefined) + showNotification({ + message: 'Texturepack installed!', + }) } const existsAsync = async (path) => { @@ -144,7 +152,7 @@ const setCustomTexturePackData = (blockTextures, blockStates) => { const getSizeFromImage = async (filePath: string) => { const probeImg = new Image() - const file = await fs.promises.readFile(filePath, 'base64'); + const file = await fs.promises.readFile(filePath, 'base64') probeImg.src = `data:image/png;base64,${file}` await new Promise((resolve, reject) => { probeImg.onload = resolve @@ -155,11 +163,17 @@ const getSizeFromImage = async (filePath: string) => { export const genTexturePackTextures = async (version: string) => { setCustomTexturePackData(undefined, undefined) - const blocksBasePath = '/userData/resourcePacks/default/assets/minecraft/textures/blocks'; + let blocksBasePath = '/userData/resourcePacks/default/assets/minecraft/textures/block' + // todo not clear why this is needed + const blocksBasePathAlt = '/userData/resourcePacks/default/assets/minecraft/textures/blocks' const blocksGenereatedPath = `/userData/resourcePacks/default/${version}.png` const genereatedPathData = `/userData/resourcePacks/default/${version}.json` if (await existsAsync(blocksBasePath) === false) { - return + if (await existsAsync(blocksBasePathAlt) === false) { + return + } else { + blocksBasePath = blocksBasePathAlt + } } if (await existsAsync(blocksGenereatedPath) === true) { applyTexturePackData(version, JSON.parse(await fs.promises.readFile(genereatedPathData, 'utf8')), await fs.promises.readFile(blocksGenereatedPath, 'utf8')) @@ -208,7 +222,7 @@ export const genTexturePackTextures = async (version: string) => { await new Promise(resolve => { _imgCustom.onload = () => { imgCustom = _imgCustom - resolve(); + resolve() } _imgCustom.onerror = () => { console.log('Skipping issued texture', fileName) @@ -227,10 +241,10 @@ export const genTexturePackTextures = async (version: string) => { ctx.drawImage(img, xOrig, yOrig, originalTileSize, originalTileSize, x, y, tileSize, tileSize) } } - const blockDataUrl = canvas.toDataURL('image/png'); + const blockDataUrl = canvas.toDataURL('image/png') const newData: TextureResolvedData = { blockSize: tileSize, - }; + } await fs.promises.writeFile(genereatedPathData, JSON.stringify(newData), 'utf8') await fs.promises.writeFile(blocksGenereatedPath, blockDataUrl, 'utf8') await applyTexturePackData(version, newData, blockDataUrl) From 1afdf5bae722bd79281032a33745ac24cc87908a Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 19 Sep 2023 03:18:01 +0300 Subject: [PATCH 252/318] a few fixes (#20) fix: ios improvements: always display full ui & no magnifier on double tap anymore fix: regression: connect to p2p peers --- .github/workflows/ci.yml | 3 +- .github/workflows/preview.yml | 10 +- .npmrc | 1 - cypress/integration/index.spec.ts | 2 +- esbuild.mjs | 2 +- index.html | 2 +- package.json | 7 +- pnpm-lock.yaml | 12974 +++++++++++++++++++++++++++ scripts/updateGitPackages.mjs | 26 + src/cursor.js | 2 +- src/customServer.ts | 4 +- src/index.ts | 40 +- src/localServerMultiplayer.ts | 8 +- src/menus/components/health_bar.js | 2 +- src/menus/components/hotbar.js | 2 +- src/menus/hud.js | 21 +- src/menus/play_screen.js | 2 +- src/reactUi.jsx | 2 +- src/styles.css | 13 +- 19 files changed, 13073 insertions(+), 50 deletions(-) create mode 100644 pnpm-lock.yaml create mode 100644 scripts/updateGitPackages.mjs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6d5a0c2a..b793e1ff3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,11 +12,10 @@ jobs: run: npm i -g pnpm - run: pnpm install - run: pnpm build + - run: nohup pnpm prod-start & node cypress/minecraft-server.mjs & - uses: cypress-io/github-action@v5 with: install: false - # start: pnpm prod-start & node cypress/minecraft-server.mjs - start: pnpm prod-start - uses: actions/upload-artifact@v3 if: failure() with: diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 2294132ea..9ba981108 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -3,11 +3,17 @@ env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} on: - workflow_dispatch: - pull_request: + issue_comment: + types: [created] jobs: deploy: runs-on: ubuntu-latest + # todo skip already created deploys on that commit + if: >- + github.event.issue.pull_request != '' && + ( + contains(github.event.comment.body, '/deploy') + ) steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.npmrc b/.npmrc index 3a58a3dbb..b602bc2e8 100644 --- a/.npmrc +++ b/.npmrc @@ -1,4 +1,3 @@ -package-lock=false public-hoist-pattern=* ignore-workspace-root-check=true shell-emulator=true diff --git a/cypress/integration/index.spec.ts b/cypress/integration/index.spec.ts index a060d2fb6..68944b2e8 100644 --- a/cypress/integration/index.spec.ts +++ b/cypress/integration/index.spec.ts @@ -30,7 +30,7 @@ it('Loads & renders singleplayer', () => { }) }) -it.skip('Joins to server', () => { +it('Joins to server', () => { cy.visit('/') setLocalStorageSettings() // todo replace with data-test diff --git a/esbuild.mjs b/esbuild.mjs index 9d9be44ca..5ca3a3d9b 100644 --- a/esbuild.mjs +++ b/esbuild.mjs @@ -61,7 +61,7 @@ const ctx = await esbuild.context({ ], metafile: true, plugins, - sourcesContent: process.argv.includes('--no-sources'), + sourcesContent: !process.argv.includes('--no-sources'), minify: process.argv.includes('--minify'), define: { 'process.env.NODE_ENV': JSON.stringify(dev ? 'development' : 'production'), diff --git a/index.html b/index.html index dc72ca576..b1e108c95 100644 --- a/index.html +++ b/index.html @@ -37,8 +37,8 @@ +
    -
    diff --git a/package.json b/package.json index 5aff7d1cb..2a35c61c5 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "author": "PrismarineJS", "license": "MIT", "dependencies": { - "@dimaka/interface": "0.0.1", + "@dimaka/interface": "0.0.3-alpha.0", "@emotion/css": "^11.11.2", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11", "@types/react": "^18.2.20", @@ -46,9 +46,7 @@ "net-browserify": "github:PrismarineJS/net-browserify", "peerjs": "^1.5.0", "pretty-bytes": "^6.1.1", - "prismarine-world": "^3.6.2", "qrcode.react": "^3.1.0", - "querystring": "^0.2.1", "react": "^18.2.0", "react-dom": "^18.2.0", "react-refresh": "^0.14.0", @@ -104,7 +102,8 @@ "webpack-dev-middleware": "^6.1.1", "webpack-dev-server": "^4.15.1", "webpack-merge": "^5.9.0", - "workbox-webpack-plugin": "^6.6.0" + "workbox-webpack-plugin": "^6.6.0", + "yaml": "^2.3.2" }, "pnpm": { "overrides": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml new file mode 100644 index 000000000..0f87d30bb --- /dev/null +++ b/pnpm-lock.yaml @@ -0,0 +1,12974 @@ +lockfileVersion: '6.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +overrides: + prismarine-block: github:zardoy/prismarine-block#next-era + prismarine-world: github:zardoy/prismarine-world#next-era + minecraft-data: 3.45.0 + prismarine-provider-anvil: github:zardoy/prismarine-provider-anvil#everything + minecraft-protocol: github:zardoy/minecraft-protocol#custom-client-extra + +importers: + + .: + dependencies: + '@dimaka/interface': + specifier: 0.0.3-alpha.0 + version: 0.0.3-alpha.0(@babel/core@7.22.11)(@popperjs/core@2.11.8)(@types/react@18.2.20)(react-dom@18.2.0)(react@18.2.0) + '@emotion/css': + specifier: ^11.11.2 + version: 11.11.2 + '@pmmmwh/react-refresh-webpack-plugin': + specifier: ^0.5.11 + version: 0.5.11(react-refresh@0.14.0)(webpack-dev-server@4.15.1)(webpack@5.88.2) + '@types/react': + specifier: ^18.2.20 + version: 18.2.20 + '@types/react-dom': + specifier: ^18.2.7 + version: 18.2.7 + '@types/wicg-file-system-access': + specifier: ^2020.9.6 + version: 2020.9.6 + '@zardoy/react-util': + specifier: ^0.2.0 + version: 0.2.0(react-dom@18.2.0)(react@18.2.0) + '@zardoy/utils': + specifier: ^0.0.11 + version: 0.0.11 + browserfs: + specifier: github:zardoy/browserfs#build + version: github.com/zardoy/browserfs/0ff5df5c4e67f54b5f032b87dc650e8b78626bc7 + compression: + specifier: ^1.7.4 + version: 1.7.4 + cypress-plugin-snapshots: + specifier: ^1.4.4 + version: 1.4.4(cypress@9.5.4) + diamond-square: + specifier: ^1.2.0 + version: 1.2.0 + eruda: + specifier: ^3.0.1 + version: 3.0.1 + esbuild: + specifier: ^0.19.2 + version: 0.19.2 + esbuild-loader: + specifier: ^4.0.0 + version: 4.0.0(webpack@5.88.2) + esbuild-plugin-polyfill-node: + specifier: ^0.3.0 + version: 0.3.0(esbuild@0.19.2) + express: + specifier: ^4.18.2 + version: 4.18.2 + flying-squid: + specifier: github:zardoy/space-squid#everything + version: github.com/zardoy/space-squid/eec886b7a881eb40dd8efc6d48fa52e638e07693 + fs-extra: + specifier: ^11.1.1 + version: 11.1.1 + iconify-icon: + specifier: ^1.0.8 + version: 1.0.8 + jszip: + specifier: ^3.10.1 + version: 3.10.1 + lit: + specifier: ^2.8.0 + version: 2.8.0 + minecraft-data: + specifier: 3.45.0 + version: 3.45.0 + net-browserify: + specifier: github:PrismarineJS/net-browserify + version: github.com/PrismarineJS/net-browserify/0acebf76d5a14991e6b2586f83f707be5171579c + peerjs: + specifier: ^1.5.0 + version: 1.5.0 + pretty-bytes: + specifier: ^6.1.1 + version: 6.1.1 + qrcode.react: + specifier: ^3.1.0 + version: 3.1.0(react@18.2.0) + react: + specifier: ^18.2.0 + version: 18.2.0 + react-dom: + specifier: ^18.2.0 + version: 18.2.0(react@18.2.0) + react-refresh: + specifier: ^0.14.0 + version: 0.14.0 + speed-measure-webpack-plugin: + specifier: ^1.5.0 + version: 1.5.0(webpack@5.88.2) + stats.js: + specifier: ^0.17.0 + version: 0.17.0 + url: + specifier: ^0.11.1 + version: 0.11.1 + valtio: + specifier: ^1.11.1 + version: 1.11.1(react@18.2.0) + workbox-build: + specifier: ^7.0.0 + version: 7.0.0 + devDependencies: + '@types/three': + specifier: 0.128.0 + version: 0.128.0 + assert: + specifier: ^2.0.0 + version: 2.0.0 + browserify-zlib: + specifier: ^0.2.0 + version: 0.2.0 + buffer: + specifier: ^6.0.3 + version: 6.0.3 + clean-webpack-plugin: + specifier: ^4.0.0 + version: 4.0.0(webpack@5.88.2) + constants-browserify: + specifier: ^1.0.0 + version: 1.0.0 + contro-max: + specifier: ^0.1.1 + version: 0.1.1 + copy-webpack-plugin: + specifier: ^11.0.0 + version: 11.0.0(webpack@5.88.2) + crypto-browserify: + specifier: ^3.12.0 + version: 3.12.0 + css-loader: + specifier: ^6.8.1 + version: 6.8.1(webpack@5.88.2) + cypress: + specifier: ^9.5.4 + version: 9.5.4 + cypress-esbuild-preprocessor: + specifier: ^1.0.2 + version: 1.0.2 + events: + specifier: ^3.3.0 + version: 3.3.0 + filesize: + specifier: ^10.0.12 + version: 10.0.12 + html-webpack-plugin: + specifier: ^5.5.3 + version: 5.5.3(webpack@5.88.2) + http-browserify: + specifier: ^1.7.0 + version: 1.7.0 + http-server: + specifier: ^14.1.1 + version: 14.1.1 + https-browserify: + specifier: ^1.0.0 + version: 1.0.0 + lodash-webpack-plugin: + specifier: ^0.11.6 + version: 0.11.6(webpack@5.88.2) + memfs: + specifier: ^3.5.3 + version: 3.5.3 + minecraft-inventory-gui: + specifier: github:zardoy/minecraft-inventory-gui#next + version: github.com/zardoy/minecraft-inventory-gui/c1331c91fb39bd562dc48eeb33321240d4870edd(@types/react@18.2.20)(react@18.2.0) + mineflayer: + specifier: github:zardoy/mineflayer#custom + version: github.com/zardoy/mineflayer/08a79e7affa1ce82e1ac7aad177745665ed54572 + mineflayer-pathfinder: + specifier: ^2.4.4 + version: 2.4.4 + npm-run-all: + specifier: ^4.1.5 + version: 4.1.5 + os-browserify: + specifier: ^0.3.0 + version: 0.3.0 + path-browserify: + specifier: ^1.0.1 + version: 1.0.1 + prismarine-viewer: + specifier: ./prismarine-viewer + version: link:prismarine-viewer + process: + specifier: github:PrismarineJS/node-process + version: github.com/PrismarineJS/node-process/380d0b4f4c86f1b65b216c311bf00431f314e88e + rimraf: + specifier: ^5.0.1 + version: 5.0.1 + stream-browserify: + specifier: ^3.0.0 + version: 3.0.0 + style-loader: + specifier: ^3.3.3 + version: 3.3.3(webpack@5.88.2) + three: + specifier: 0.128.0 + version: 0.128.0 + timers-browserify: + specifier: ^2.0.12 + version: 2.0.12 + url-loader: + specifier: ^4.1.1 + version: 4.1.1(webpack@5.88.2) + use-typed-event-listener: + specifier: ^4.0.2 + version: 4.0.2(react@18.2.0) + vite: + specifier: ^4.4.9 + version: 4.4.9 + webpack: + specifier: ^5.88.2 + version: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack-cli: + specifier: ^5.1.4 + version: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) + webpack-dev-middleware: + specifier: ^6.1.1 + version: 6.1.1(webpack@5.88.2) + webpack-dev-server: + specifier: ^4.15.1 + version: 4.15.1(webpack-cli@5.1.4)(webpack@5.88.2) + webpack-merge: + specifier: ^5.9.0 + version: 5.9.0 + workbox-webpack-plugin: + specifier: ^6.6.0 + version: 6.6.0(webpack@5.88.2) + yaml: + specifier: ^2.3.2 + version: 2.3.2 + + prismarine-viewer: + dependencies: + '@tweenjs/tween.js': + specifier: ^20.0.3 + version: 20.0.3 + compression: + specifier: ^1.7.4 + version: 1.7.4 + express: + specifier: ^4.17.1 + version: 4.18.2 + minecraft-data: + specifier: 3.45.0 + version: 3.45.0 + prismarine-block: + specifier: github:zardoy/prismarine-block#next-era + version: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-chunk: + specifier: ^1.22.0 + version: 1.35.0(minecraft-data@3.45.0) + prismarine-world: + specifier: github:zardoy/prismarine-world#next-era + version: github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786 + socket.io: + specifier: ^4.0.0 + version: 4.7.2 + socket.io-client: + specifier: ^4.0.0 + version: 4.7.2 + three: + specifier: 0.128.0 + version: 0.128.0 + three.meshline: + specifier: ^1.3.0 + version: 1.4.0 + vec3: + specifier: ^0.1.7 + version: 0.1.8 + devDependencies: + assert: + specifier: ^2.0.0 + version: 2.0.0 + buffer: + specifier: ^6.0.3 + version: 6.0.3 + canvas: + specifier: ^2.11.2 + version: 2.11.2 + filesize: + specifier: ^10.0.12 + version: 10.0.12 + fs-extra: + specifier: ^11.0.0 + version: 11.1.1 + jest: + specifier: ^27.0.4 + version: 27.0.4(canvas@2.11.2) + jest-puppeteer: + specifier: ^6.0.0 + version: 6.0.0(puppeteer@16.0.0) + minecraft-assets: + specifier: ^1.9.0 + version: 1.9.0 + minecraft-wrap: + specifier: ^1.3.0 + version: 1.3.0 + minecrafthawkeye: + specifier: ^1.2.5 + version: 1.2.5(prismarine-registry@1.7.0) + mineflayer: + specifier: ^4.0.0 + version: 4.0.0(prismarine-registry@1.7.0) + mineflayer-pathfinder: + specifier: ^2.0.0 + version: 2.4.4 + prismarine-schematic: + specifier: ^1.2.0 + version: 1.2.0 + prismarine-viewer: + specifier: file:./ + version: file:prismarine-viewer + process: + specifier: ^0.11.10 + version: 0.11.10 + puppeteer: + specifier: ^16.0.0 + version: 16.0.0 + standard: + specifier: ^17.0.0 + version: 17.0.0 + webpack: + specifier: ^5.10.2 + version: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack-cli: + specifier: ^5.1.1 + version: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) + +packages: + + /@aashutoshrathi/word-wrap@1.2.6: + resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==} + engines: {node: '>=0.10.0'} + dev: true + + /@ampproject/remapping@2.2.1: + resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} + engines: {node: '>=6.0.0'} + dependencies: + '@jridgewell/gen-mapping': 0.3.3 + '@jridgewell/trace-mapping': 0.3.19 + + /@apideck/better-ajv-errors@0.3.6(ajv@8.12.0): + resolution: {integrity: sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==} + engines: {node: '>=10'} + peerDependencies: + ajv: '>=8' + dependencies: + ajv: 8.12.0 + json-schema: 0.4.0 + jsonpointer: 5.0.1 + leven: 3.1.0 + + /@azure/msal-common@13.3.0: + resolution: {integrity: sha512-/VFWTicjcJbrGp3yQP7A24xU95NiDMe23vxIU1U6qdRPFsprMDNUohMudclnd+WSHE4/McqkZs/nUU3sAKkVjg==} + engines: {node: '>=0.8.0'} + + /@azure/msal-node@1.18.3: + resolution: {integrity: sha512-lI1OsxNbS/gxRD4548Wyj22Dk8kS7eGMwD9GlBZvQmFV8FJUXoXySL1BiNzDsHUE96/DS/DHmA+F73p1Dkcktg==} + engines: {node: 10 || 12 || 14 || 16 || 18} + dependencies: + '@azure/msal-common': 13.3.0 + jsonwebtoken: 9.0.2 + uuid: 8.3.2 + + /@babel/code-frame@7.22.13: + resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/highlight': 7.22.13 + chalk: 2.4.2 + + /@babel/compat-data@7.22.9: + resolution: {integrity: sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==} + engines: {node: '>=6.9.0'} + + /@babel/core@7.22.11: + resolution: {integrity: sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@ampproject/remapping': 2.2.1 + '@babel/code-frame': 7.22.13 + '@babel/generator': 7.22.10 + '@babel/helper-compilation-targets': 7.22.10 + '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11) + '@babel/helpers': 7.22.11 + '@babel/parser': 7.22.13 + '@babel/template': 7.22.5 + '@babel/traverse': 7.22.11 + '@babel/types': 7.22.11 + convert-source-map: 1.9.0 + debug: 4.3.4(supports-color@8.1.1) + gensync: 1.0.0-beta.2 + json5: 2.2.3 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + + /@babel/generator@7.22.10: + resolution: {integrity: sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.22.11 + '@jridgewell/gen-mapping': 0.3.3 + '@jridgewell/trace-mapping': 0.3.19 + jsesc: 2.5.2 + + /@babel/helper-annotate-as-pure@7.22.5: + resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.22.11 + + /@babel/helper-builder-binary-assignment-operator-visitor@7.22.10: + resolution: {integrity: sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.22.11 + + /@babel/helper-compilation-targets@7.22.10: + resolution: {integrity: sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/compat-data': 7.22.9 + '@babel/helper-validator-option': 7.22.5 + browserslist: 4.21.10 + lru-cache: 5.1.1 + semver: 6.3.1 + + /@babel/helper-create-class-features-plugin@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-function-name': 7.22.5 + '@babel/helper-member-expression-to-functions': 7.22.5 + '@babel/helper-optimise-call-expression': 7.22.5 + '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.11) + '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + semver: 6.3.1 + + /@babel/helper-create-regexp-features-plugin@7.22.9(@babel/core@7.22.11): + resolution: {integrity: sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-annotate-as-pure': 7.22.5 + regexpu-core: 5.3.2 + semver: 6.3.1 + + /@babel/helper-define-polyfill-provider@0.4.2(@babel/core@7.22.11): + resolution: {integrity: sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==} + peerDependencies: + '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-compilation-targets': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + debug: 4.3.4(supports-color@8.1.1) + lodash.debounce: 4.0.8 + resolve: 1.22.4 + transitivePeerDependencies: + - supports-color + + /@babel/helper-environment-visitor@7.22.5: + resolution: {integrity: sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==} + engines: {node: '>=6.9.0'} + + /@babel/helper-function-name@7.22.5: + resolution: {integrity: sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/template': 7.22.5 + '@babel/types': 7.22.11 + + /@babel/helper-hoist-variables@7.22.5: + resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.22.11 + + /@babel/helper-member-expression-to-functions@7.22.5: + resolution: {integrity: sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.22.11 + + /@babel/helper-module-imports@7.22.5: + resolution: {integrity: sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.22.11 + + /@babel/helper-module-transforms@7.22.9(@babel/core@7.22.11): + resolution: {integrity: sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-module-imports': 7.22.5 + '@babel/helper-simple-access': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/helper-validator-identifier': 7.22.5 + + /@babel/helper-optimise-call-expression@7.22.5: + resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.22.11 + + /@babel/helper-plugin-utils@7.22.5: + resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==} + engines: {node: '>=6.9.0'} + + /@babel/helper-remap-async-to-generator@7.22.9(@babel/core@7.22.11): + resolution: {integrity: sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-wrap-function': 7.22.10 + + /@babel/helper-replace-supers@7.22.9(@babel/core@7.22.11): + resolution: {integrity: sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-member-expression-to-functions': 7.22.5 + '@babel/helper-optimise-call-expression': 7.22.5 + + /@babel/helper-simple-access@7.22.5: + resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.22.11 + + /@babel/helper-skip-transparent-expression-wrappers@7.22.5: + resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.22.11 + + /@babel/helper-split-export-declaration@7.22.6: + resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.22.11 + + /@babel/helper-string-parser@7.22.5: + resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==} + engines: {node: '>=6.9.0'} + + /@babel/helper-validator-identifier@7.22.5: + resolution: {integrity: sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==} + engines: {node: '>=6.9.0'} + + /@babel/helper-validator-option@7.22.5: + resolution: {integrity: sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==} + engines: {node: '>=6.9.0'} + + /@babel/helper-wrap-function@7.22.10: + resolution: {integrity: sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-function-name': 7.22.5 + '@babel/template': 7.22.5 + '@babel/types': 7.22.11 + + /@babel/helpers@7.22.11: + resolution: {integrity: sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/template': 7.22.5 + '@babel/traverse': 7.22.11 + '@babel/types': 7.22.11 + transitivePeerDependencies: + - supports-color + + /@babel/highlight@7.22.13: + resolution: {integrity: sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-validator-identifier': 7.22.5 + chalk: 2.4.2 + js-tokens: 4.0.0 + + /@babel/parser@7.22.13: + resolution: {integrity: sha512-3l6+4YOvc9wx7VlCSw4yQfcBo01ECA8TicQfbnCPuCEpRQrf+gTUyGdxNw+pyTUyywp6JRD1w0YQs9TpBXYlkw==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.22.11 + + /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.13.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 + '@babel/plugin-transform-optional-chaining': 7.22.12(@babel/core@7.22.11) + + /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.22.11): + resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + + /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.22.11): + resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.22.11): + resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + dev: true + + /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.22.11): + resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.22.11): + resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.22.11): + resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.22.11): + resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-import-attributes@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.22.11): + resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.22.11): + resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.11): + resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.22.11): + resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.22.11): + resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.22.11): + resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.22.11): + resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.22.11): + resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.22.11): + resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.22.11): + resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + dev: true + + /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.22.11): + resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-arrow-functions@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-async-generator-functions@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-0pAlmeRJn6wU84zzZsEOx1JV1Jf8fqO9ok7wofIJwUnplYo247dcd24P+cMJht7ts9xkzdtB0EPHmOb7F+KzXw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.22.11) + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.11) + + /@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-module-imports': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.22.11) + + /@babel/plugin-transform-block-scoped-functions@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-block-scoping@7.22.10(@babel/core@7.22.11): + resolution: {integrity: sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-class-static-block@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.12.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.22.11) + + /@babel/plugin-transform-classes@7.22.6(@babel/core@7.22.11): + resolution: {integrity: sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-compilation-targets': 7.22.10 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-function-name': 7.22.5 + '@babel/helper-optimise-call-expression': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.11) + '@babel/helper-split-export-declaration': 7.22.6 + globals: 11.12.0 + + /@babel/plugin-transform-computed-properties@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/template': 7.22.5 + + /@babel/plugin-transform-destructuring@7.22.10(@babel/core@7.22.11): + resolution: {integrity: sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-dotall-regex@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-duplicate-keys@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-dynamic-import@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.11) + + /@babel/plugin-transform-exponentiation-operator@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-export-namespace-from@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.22.11) + + /@babel/plugin-transform-for-of@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-function-name@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-compilation-targets': 7.22.10 + '@babel/helper-function-name': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-json-strings@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.11) + + /@babel/plugin-transform-literals@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-logical-assignment-operators@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.11) + + /@babel/plugin-transform-member-expression-literals@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-modules-amd@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-modules-commonjs@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-o2+bg7GDS60cJMgz9jWqRUsWkMzLCxp+jFDeDUT5sjRlAxcJWZ2ylNdI7QQ2+CH5hWu7OnN+Cv3htt7AkSf96g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-simple-access': 7.22.5 + + /@babel/plugin-transform-modules-systemjs@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-hoist-variables': 7.22.5 + '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-validator-identifier': 7.22.5 + + /@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-new-target@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-nullish-coalescing-operator@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.11) + + /@babel/plugin-transform-numeric-separator@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.11) + + /@babel/plugin-transform-object-rest-spread@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-nX8cPFa6+UmbepISvlf5jhQyaC7ASs/7UxHmMkuJ/k5xSHvDPPaibMo+v3TXwU/Pjqhep/nFNpd3zn4YR59pnw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/compat-data': 7.22.9 + '@babel/core': 7.22.11 + '@babel/helper-compilation-targets': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.22.11) + + /@babel/plugin-transform-object-super@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.11) + + /@babel/plugin-transform-optional-catch-binding@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.11) + + /@babel/plugin-transform-optional-chaining@7.22.12(@babel/core@7.22.11): + resolution: {integrity: sha512-7XXCVqZtyFWqjDsYDY4T45w4mlx1rf7aOgkc/Ww76xkgBiOlmjPkx36PBLHa1k1rwWvVgYMPsbuVnIamx2ZQJw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.11) + + /@babel/plugin-transform-parameters@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-private-property-in-object@7.22.11(@babel/core@7.22.11): + resolution: {integrity: sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.22.11) + + /@babel/plugin-transform-property-literals@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-regenerator@7.22.10(@babel/core@7.22.11): + resolution: {integrity: sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + regenerator-transform: 0.15.2 + + /@babel/plugin-transform-reserved-words@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-shorthand-properties@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-spread@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 + + /@babel/plugin-transform-sticky-regex@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-template-literals@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-typeof-symbol@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-unicode-escapes@7.22.10(@babel/core@7.22.11): + resolution: {integrity: sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-unicode-property-regex@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-unicode-regex@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/plugin-transform-unicode-sets-regex@7.22.5(@babel/core@7.22.11): + resolution: {integrity: sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11) + '@babel/helper-plugin-utils': 7.22.5 + + /@babel/preset-env@7.22.10(@babel/core@7.22.11): + resolution: {integrity: sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/compat-data': 7.22.9 + '@babel/core': 7.22.11 + '@babel/helper-compilation-targets': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-validator-option': 7.22.5 + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.22.11) + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.11) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.22.11) + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.22.11) + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-import-assertions': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-syntax-import-attributes': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.22.11) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.11) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.11) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.22.11) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.22.11) + '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.22.11) + '@babel/plugin-transform-arrow-functions': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-async-generator-functions': 7.22.11(@babel/core@7.22.11) + '@babel/plugin-transform-async-to-generator': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-block-scoped-functions': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-block-scoping': 7.22.10(@babel/core@7.22.11) + '@babel/plugin-transform-class-properties': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-class-static-block': 7.22.11(@babel/core@7.22.11) + '@babel/plugin-transform-classes': 7.22.6(@babel/core@7.22.11) + '@babel/plugin-transform-computed-properties': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-destructuring': 7.22.10(@babel/core@7.22.11) + '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-duplicate-keys': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-dynamic-import': 7.22.11(@babel/core@7.22.11) + '@babel/plugin-transform-exponentiation-operator': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-export-namespace-from': 7.22.11(@babel/core@7.22.11) + '@babel/plugin-transform-for-of': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-function-name': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-json-strings': 7.22.11(@babel/core@7.22.11) + '@babel/plugin-transform-literals': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-logical-assignment-operators': 7.22.11(@babel/core@7.22.11) + '@babel/plugin-transform-member-expression-literals': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-modules-amd': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-modules-commonjs': 7.22.11(@babel/core@7.22.11) + '@babel/plugin-transform-modules-systemjs': 7.22.11(@babel/core@7.22.11) + '@babel/plugin-transform-modules-umd': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-new-target': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-nullish-coalescing-operator': 7.22.11(@babel/core@7.22.11) + '@babel/plugin-transform-numeric-separator': 7.22.11(@babel/core@7.22.11) + '@babel/plugin-transform-object-rest-spread': 7.22.11(@babel/core@7.22.11) + '@babel/plugin-transform-object-super': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-optional-catch-binding': 7.22.11(@babel/core@7.22.11) + '@babel/plugin-transform-optional-chaining': 7.22.12(@babel/core@7.22.11) + '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-private-methods': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-private-property-in-object': 7.22.11(@babel/core@7.22.11) + '@babel/plugin-transform-property-literals': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-regenerator': 7.22.10(@babel/core@7.22.11) + '@babel/plugin-transform-reserved-words': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-shorthand-properties': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-spread': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-sticky-regex': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-template-literals': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-typeof-symbol': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-unicode-escapes': 7.22.10(@babel/core@7.22.11) + '@babel/plugin-transform-unicode-property-regex': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-unicode-regex': 7.22.5(@babel/core@7.22.11) + '@babel/plugin-transform-unicode-sets-regex': 7.22.5(@babel/core@7.22.11) + '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.22.11) + '@babel/types': 7.22.11 + babel-plugin-polyfill-corejs2: 0.4.5(@babel/core@7.22.11) + babel-plugin-polyfill-corejs3: 0.8.3(@babel/core@7.22.11) + babel-plugin-polyfill-regenerator: 0.5.2(@babel/core@7.22.11) + core-js-compat: 3.32.1 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + + /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.22.11): + resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==} + peerDependencies: + '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/types': 7.22.11 + esutils: 2.0.3 + + /@babel/regjsgen@0.8.0: + resolution: {integrity: sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==} + + /@babel/runtime@7.22.11: + resolution: {integrity: sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==} + engines: {node: '>=6.9.0'} + dependencies: + regenerator-runtime: 0.14.0 + + /@babel/template@7.22.5: + resolution: {integrity: sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.22.13 + '@babel/parser': 7.22.13 + '@babel/types': 7.22.11 + + /@babel/traverse@7.22.11: + resolution: {integrity: sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.22.13 + '@babel/generator': 7.22.10 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-function-name': 7.22.5 + '@babel/helper-hoist-variables': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/parser': 7.22.13 + '@babel/types': 7.22.11 + debug: 4.3.4(supports-color@8.1.1) + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + + /@babel/types@7.22.11: + resolution: {integrity: sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-string-parser': 7.22.5 + '@babel/helper-validator-identifier': 7.22.5 + to-fast-properties: 2.0.0 + + /@bcoe/v8-coverage@0.2.3: + resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} + dev: true + + /@cbor-extract/cbor-extract-darwin-arm64@2.1.1: + resolution: {integrity: sha512-blVBy5MXz6m36Vx0DfLd7PChOQKEs8lK2bD1WJn/vVgG4FXZiZmZb2GECHFvVPA5T7OnODd9xZiL3nMCv6QUhA==} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: false + optional: true + + /@cbor-extract/cbor-extract-darwin-x64@2.1.1: + resolution: {integrity: sha512-h6KFOzqk8jXTvkOftyRIWGrd7sKQzQv2jVdTL9nKSf3D2drCvQB/LHUxAOpPXo3pv2clDtKs3xnHalpEh3rDsw==} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: false + optional: true + + /@cbor-extract/cbor-extract-linux-arm64@2.1.1: + resolution: {integrity: sha512-SxAaRcYf8S0QHaMc7gvRSiTSr7nUYMqbUdErBEu+HYA4Q6UNydx1VwFE68hGcp1qvxcy9yT5U7gA+a5XikfwSQ==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@cbor-extract/cbor-extract-linux-arm@2.1.1: + resolution: {integrity: sha512-ds0uikdcIGUjPyraV4oJqyVE5gl/qYBpa/Wnh6l6xLE2lj/hwnjT2XcZCChdXwW/YFZ1LUHs6waoYN8PmK0nKQ==} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@cbor-extract/cbor-extract-linux-x64@2.1.1: + resolution: {integrity: sha512-GVK+8fNIE9lJQHAlhOROYiI0Yd4bAZ4u++C2ZjlkS3YmO6hi+FUxe6Dqm+OKWTcMpL/l71N6CQAmaRcb4zyJuA==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@cbor-extract/cbor-extract-win32-x64@2.1.1: + resolution: {integrity: sha512-2Niq1C41dCRIDeD8LddiH+mxGlO7HJ612Ll3D/E73ZWBmycued+8ghTr/Ho3CMOWPUEr08XtyBMVXAjqF+TcKw==} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: false + optional: true + + /@colors/colors@1.5.0: + resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} + engines: {node: '>=0.1.90'} + requiresBuild: true + optional: true + + /@cypress/request@2.88.12: + resolution: {integrity: sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==} + engines: {node: '>= 6'} + dependencies: + aws-sign2: 0.7.0 + aws4: 1.12.0 + caseless: 0.12.0 + combined-stream: 1.0.8 + extend: 3.0.2 + forever-agent: 0.6.1 + form-data: 2.3.3 + http-signature: 1.3.6 + is-typedarray: 1.0.0 + isstream: 0.1.2 + json-stringify-safe: 5.0.1 + mime-types: 2.1.35 + performance-now: 2.1.0 + qs: 6.10.4 + safe-buffer: 5.2.1 + tough-cookie: 4.1.3 + tunnel-agent: 0.6.0 + uuid: 8.3.2 + + /@cypress/xvfb@1.2.4(supports-color@8.1.1): + resolution: {integrity: sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==} + dependencies: + debug: 3.2.7(supports-color@8.1.1) + lodash.once: 4.1.1 + transitivePeerDependencies: + - supports-color + + /@dimaka/interface@0.0.3-alpha.0(@babel/core@7.22.11)(@popperjs/core@2.11.8)(@types/react@18.2.20)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-BzRUaLk+jhC1uvcix4SXRGhw7k39pldlvwtRT0NGFsuQt1uMV9vOhGMzm3rLorVXQ7vAmqcZk3Hy8oYlXKQoDw==} + peerDependencies: + react: ^17.0.2 + dependencies: + '@emotion/css': 11.5.0(@babel/core@7.22.11) + '@juggle/resize-observer': 3.3.1 + animejs: 3.2.1 + clsx: 1.1.1 + react: 18.2.0 + react-popper: 2.3.0(@popperjs/core@2.11.8)(react-dom@18.2.0)(react@18.2.0) + react-portal: 4.2.1(react-dom@18.2.0)(react@18.2.0) + react-use: 17.3.1(react-dom@18.2.0)(react@18.2.0) + react-use-measure: 2.1.1(react-dom@18.2.0)(react@18.2.0) + valtio: 1.11.2(@types/react@18.2.20)(react@18.2.0) + zustand: 3.6.5(react@18.2.0) + transitivePeerDependencies: + - '@babel/core' + - '@popperjs/core' + - '@types/react' + - react-dom + dev: false + + /@discoveryjs/json-ext@0.5.7: + resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==} + engines: {node: '>=10.0.0'} + + /@emotion/babel-plugin@11.11.0: + resolution: {integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==} + dependencies: + '@babel/helper-module-imports': 7.22.5 + '@babel/runtime': 7.22.11 + '@emotion/hash': 0.9.1 + '@emotion/memoize': 0.8.1 + '@emotion/serialize': 1.1.2 + babel-plugin-macros: 3.1.0 + convert-source-map: 1.9.0 + escape-string-regexp: 4.0.0 + find-root: 1.1.0 + source-map: 0.5.7 + stylis: 4.2.0 + dev: false + + /@emotion/cache@11.11.0: + resolution: {integrity: sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==} + dependencies: + '@emotion/memoize': 0.8.1 + '@emotion/sheet': 1.2.2 + '@emotion/utils': 1.2.1 + '@emotion/weak-memoize': 0.3.1 + stylis: 4.2.0 + dev: false + + /@emotion/css@11.11.2: + resolution: {integrity: sha512-VJxe1ucoMYMS7DkiMdC2T7PWNbrEI0a39YRiyDvK2qq4lXwjRbVP/z4lpG+odCsRzadlR+1ywwrTzhdm5HNdew==} + dependencies: + '@emotion/babel-plugin': 11.11.0 + '@emotion/cache': 11.11.0 + '@emotion/serialize': 1.1.2 + '@emotion/sheet': 1.2.2 + '@emotion/utils': 1.2.1 + dev: false + + /@emotion/css@11.5.0(@babel/core@7.22.11): + resolution: {integrity: sha512-mqjz/3aqR9rp40M+pvwdKYWxlQK4Nj3cnNjo3Tx6SM14dSsEn7q/4W2/I7PlgG+mb27iITHugXuBIHH/QwUBVQ==} + peerDependencies: + '@babel/core': ^7.0.0 + peerDependenciesMeta: + '@babel/core': + optional: true + dependencies: + '@babel/core': 7.22.11 + '@emotion/babel-plugin': 11.11.0 + '@emotion/cache': 11.11.0 + '@emotion/serialize': 1.1.2 + '@emotion/sheet': 1.2.2 + '@emotion/utils': 1.2.1 + dev: false + + /@emotion/hash@0.9.1: + resolution: {integrity: sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==} + dev: false + + /@emotion/memoize@0.8.1: + resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==} + dev: false + + /@emotion/serialize@1.1.2: + resolution: {integrity: sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==} + dependencies: + '@emotion/hash': 0.9.1 + '@emotion/memoize': 0.8.1 + '@emotion/unitless': 0.8.1 + '@emotion/utils': 1.2.1 + csstype: 3.1.2 + dev: false + + /@emotion/sheet@1.2.2: + resolution: {integrity: sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==} + dev: false + + /@emotion/unitless@0.8.1: + resolution: {integrity: sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==} + dev: false + + /@emotion/utils@1.2.1: + resolution: {integrity: sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==} + dev: false + + /@emotion/weak-memoize@0.3.1: + resolution: {integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==} + dev: false + + /@esbuild/android-arm64@0.18.20: + resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm64@0.19.2: + resolution: {integrity: sha512-lsB65vAbe90I/Qe10OjkmrdxSX4UJDjosDgb8sZUKcg3oefEuW2OT2Vozz8ef7wrJbMcmhvCC+hciF8jY/uAkw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + optional: true + + /@esbuild/android-arm@0.18.20: + resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm@0.19.2: + resolution: {integrity: sha512-tM8yLeYVe7pRyAu9VMi/Q7aunpLwD139EY1S99xbQkT4/q2qa6eA4ige/WJQYdJ8GBL1K33pPFhPfPdJ/WzT8Q==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + optional: true + + /@esbuild/android-x64@0.18.20: + resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-x64@0.19.2: + resolution: {integrity: sha512-qK/TpmHt2M/Hg82WXHRc/W/2SGo/l1thtDHZWqFq7oi24AjZ4O/CpPSu6ZuYKFkEgmZlFoa7CooAyYmuvnaG8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + optional: true + + /@esbuild/darwin-arm64@0.18.20: + resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-arm64@0.19.2: + resolution: {integrity: sha512-Ora8JokrvrzEPEpZO18ZYXkH4asCdc1DLdcVy8TGf5eWtPO1Ie4WroEJzwI52ZGtpODy3+m0a2yEX9l+KUn0tA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + optional: true + + /@esbuild/darwin-x64@0.18.20: + resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-x64@0.19.2: + resolution: {integrity: sha512-tP+B5UuIbbFMj2hQaUr6EALlHOIOmlLM2FK7jeFBobPy2ERdohI4Ka6ZFjZ1ZYsrHE/hZimGuU90jusRE0pwDw==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + optional: true + + /@esbuild/freebsd-arm64@0.18.20: + resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-arm64@0.19.2: + resolution: {integrity: sha512-YbPY2kc0acfzL1VPVK6EnAlig4f+l8xmq36OZkU0jzBVHcOTyQDhnKQaLzZudNJQyymd9OqQezeaBgkTGdTGeQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + optional: true + + /@esbuild/freebsd-x64@0.18.20: + resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-x64@0.19.2: + resolution: {integrity: sha512-nSO5uZT2clM6hosjWHAsS15hLrwCvIWx+b2e3lZ3MwbYSaXwvfO528OF+dLjas1g3bZonciivI8qKR/Hm7IWGw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + optional: true + + /@esbuild/linux-arm64@0.18.20: + resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm64@0.19.2: + resolution: {integrity: sha512-ig2P7GeG//zWlU0AggA3pV1h5gdix0MA3wgB+NsnBXViwiGgY77fuN9Wr5uoCrs2YzaYfogXgsWZbm+HGr09xg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + optional: true + + /@esbuild/linux-arm@0.18.20: + resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm@0.19.2: + resolution: {integrity: sha512-Odalh8hICg7SOD7XCj0YLpYCEc+6mkoq63UnExDCiRA2wXEmGlK5JVrW50vZR9Qz4qkvqnHcpH+OFEggO3PgTg==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + optional: true + + /@esbuild/linux-ia32@0.18.20: + resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ia32@0.19.2: + resolution: {integrity: sha512-mLfp0ziRPOLSTek0Gd9T5B8AtzKAkoZE70fneiiyPlSnUKKI4lp+mGEnQXcQEHLJAcIYDPSyBvsUbKUG2ri/XQ==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + optional: true + + /@esbuild/linux-loong64@0.18.20: + resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64@0.19.2: + resolution: {integrity: sha512-hn28+JNDTxxCpnYjdDYVMNTR3SKavyLlCHHkufHV91fkewpIyQchS1d8wSbmXhs1fiYDpNww8KTFlJ1dHsxeSw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + optional: true + + /@esbuild/linux-mips64el@0.18.20: + resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-mips64el@0.19.2: + resolution: {integrity: sha512-KbXaC0Sejt7vD2fEgPoIKb6nxkfYW9OmFUK9XQE4//PvGIxNIfPk1NmlHmMg6f25x57rpmEFrn1OotASYIAaTg==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + optional: true + + /@esbuild/linux-ppc64@0.18.20: + resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ppc64@0.19.2: + resolution: {integrity: sha512-dJ0kE8KTqbiHtA3Fc/zn7lCd7pqVr4JcT0JqOnbj4LLzYnp+7h8Qi4yjfq42ZlHfhOCM42rBh0EwHYLL6LEzcw==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + optional: true + + /@esbuild/linux-riscv64@0.18.20: + resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-riscv64@0.19.2: + resolution: {integrity: sha512-7Z/jKNFufZ/bbu4INqqCN6DDlrmOTmdw6D0gH+6Y7auok2r02Ur661qPuXidPOJ+FSgbEeQnnAGgsVynfLuOEw==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + optional: true + + /@esbuild/linux-s390x@0.18.20: + resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-s390x@0.19.2: + resolution: {integrity: sha512-U+RinR6aXXABFCcAY4gSlv4CL1oOVvSSCdseQmGO66H+XyuQGZIUdhG56SZaDJQcLmrSfRmx5XZOWyCJPRqS7g==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + optional: true + + /@esbuild/linux-x64@0.18.20: + resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-x64@0.19.2: + resolution: {integrity: sha512-oxzHTEv6VPm3XXNaHPyUTTte+3wGv7qVQtqaZCrgstI16gCuhNOtBXLEBkBREP57YTd68P0VgDgG73jSD8bwXQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + optional: true + + /@esbuild/netbsd-x64@0.18.20: + resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/netbsd-x64@0.19.2: + resolution: {integrity: sha512-WNa5zZk1XpTTwMDompZmvQLHszDDDN7lYjEHCUmAGB83Bgs20EMs7ICD+oKeT6xt4phV4NDdSi/8OfjPbSbZfQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + optional: true + + /@esbuild/openbsd-x64@0.18.20: + resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/openbsd-x64@0.19.2: + resolution: {integrity: sha512-S6kI1aT3S++Dedb7vxIuUOb3oAxqxk2Rh5rOXOTYnzN8JzW1VzBd+IqPiSpgitu45042SYD3HCoEyhLKQcDFDw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + optional: true + + /@esbuild/sunos-x64@0.18.20: + resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /@esbuild/sunos-x64@0.19.2: + resolution: {integrity: sha512-VXSSMsmb+Z8LbsQGcBMiM+fYObDNRm8p7tkUDMPG/g4fhFX5DEFmjxIEa3N8Zr96SjsJ1woAhF0DUnS3MF3ARw==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + optional: true + + /@esbuild/win32-arm64@0.18.20: + resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-arm64@0.19.2: + resolution: {integrity: sha512-5NayUlSAyb5PQYFAU9x3bHdsqB88RC3aM9lKDAz4X1mo/EchMIT1Q+pSeBXNgkfNmRecLXA0O8xP+x8V+g/LKg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + optional: true + + /@esbuild/win32-ia32@0.18.20: + resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-ia32@0.19.2: + resolution: {integrity: sha512-47gL/ek1v36iN0wL9L4Q2MFdujR0poLZMJwhO2/N3gA89jgHp4MR8DKCmwYtGNksbfJb9JoTtbkoe6sDhg2QTA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + optional: true + + /@esbuild/win32-x64@0.18.20: + resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-x64@0.19.2: + resolution: {integrity: sha512-tcuhV7ncXBqbt/Ybf0IyrMcwVOAPDckMK9rXNHtF17UTK18OKLpg08glminN06pt2WCoALhXdLfSPbVvK/6fxw==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + optional: true + + /@eslint-community/eslint-utils@4.4.0(eslint@8.48.0): + resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + dependencies: + eslint: 8.48.0 + eslint-visitor-keys: 3.4.3 + dev: true + + /@eslint-community/regexpp@4.8.0: + resolution: {integrity: sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + dev: true + + /@eslint/eslintrc@2.1.2: + resolution: {integrity: sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + ajv: 6.12.6 + debug: 4.3.4(supports-color@8.1.1) + espree: 9.6.1 + globals: 13.21.0 + ignore: 5.2.4 + import-fresh: 3.3.0 + js-yaml: 4.1.0 + minimatch: 3.1.2 + strip-json-comments: 3.1.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@eslint/js@8.48.0: + resolution: {integrity: sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true + + /@hapi/hoek@9.3.0: + resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==} + dev: true + + /@hapi/topo@5.1.0: + resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==} + dependencies: + '@hapi/hoek': 9.3.0 + dev: true + + /@humanwhocodes/config-array@0.11.10: + resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==} + engines: {node: '>=10.10.0'} + dependencies: + '@humanwhocodes/object-schema': 1.2.1 + debug: 4.3.4(supports-color@8.1.1) + minimatch: 3.1.2 + transitivePeerDependencies: + - supports-color + dev: true + + /@humanwhocodes/module-importer@1.0.1: + resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} + engines: {node: '>=12.22'} + dev: true + + /@humanwhocodes/object-schema@1.2.1: + resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} + dev: true + + /@iconify/types@2.0.0: + resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} + dev: false + + /@isaacs/cliui@8.0.2: + resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} + engines: {node: '>=12'} + dependencies: + string-width: 5.1.2 + string-width-cjs: /string-width@4.2.3 + strip-ansi: 7.1.0 + strip-ansi-cjs: /strip-ansi@6.0.1 + wrap-ansi: 8.1.0 + wrap-ansi-cjs: /wrap-ansi@7.0.0 + dev: true + + /@istanbuljs/load-nyc-config@1.1.0: + resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==} + engines: {node: '>=8'} + dependencies: + camelcase: 5.3.1 + find-up: 4.1.0 + get-package-type: 0.1.0 + js-yaml: 3.14.1 + resolve-from: 5.0.0 + dev: true + + /@istanbuljs/schema@0.1.3: + resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==} + engines: {node: '>=8'} + dev: true + + /@jest/console@27.5.1: + resolution: {integrity: sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.5.1 + '@types/node': 20.5.7 + chalk: 4.1.2 + jest-message-util: 27.5.1 + jest-util: 27.5.1 + slash: 3.0.0 + dev: true + + /@jest/core@27.5.1(canvas@2.11.2): + resolution: {integrity: sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/console': 27.5.1 + '@jest/reporters': 27.5.1 + '@jest/test-result': 27.5.1 + '@jest/transform': 27.5.1 + '@jest/types': 27.5.1 + '@types/node': 20.5.7 + ansi-escapes: 4.3.2 + chalk: 4.1.2 + emittery: 0.8.1 + exit: 0.1.2 + graceful-fs: 4.2.11 + jest-changed-files: 27.5.1 + jest-config: 27.5.1(canvas@2.11.2) + jest-haste-map: 27.5.1 + jest-message-util: 27.5.1 + jest-regex-util: 27.5.1 + jest-resolve: 27.5.1 + jest-resolve-dependencies: 27.5.1 + jest-runner: 27.5.1(canvas@2.11.2) + jest-runtime: 27.5.1 + jest-snapshot: 27.5.1 + jest-util: 27.5.1 + jest-validate: 27.5.1 + jest-watcher: 27.5.1 + micromatch: 4.0.5 + rimraf: 3.0.2 + slash: 3.0.0 + strip-ansi: 6.0.1 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + dev: true + + /@jest/environment@27.5.1: + resolution: {integrity: sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/fake-timers': 27.5.1 + '@jest/types': 27.5.1 + '@types/node': 20.5.7 + jest-mock: 27.5.1 + dev: true + + /@jest/fake-timers@27.5.1: + resolution: {integrity: sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.5.1 + '@sinonjs/fake-timers': 8.1.0 + '@types/node': 20.5.7 + jest-message-util: 27.5.1 + jest-mock: 27.5.1 + jest-util: 27.5.1 + dev: true + + /@jest/globals@27.5.1: + resolution: {integrity: sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/environment': 27.5.1 + '@jest/types': 27.5.1 + expect: 27.5.1 + dev: true + + /@jest/reporters@27.5.1: + resolution: {integrity: sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@bcoe/v8-coverage': 0.2.3 + '@jest/console': 27.5.1 + '@jest/test-result': 27.5.1 + '@jest/transform': 27.5.1 + '@jest/types': 27.5.1 + '@types/node': 20.5.7 + chalk: 4.1.2 + collect-v8-coverage: 1.0.2 + exit: 0.1.2 + glob: 7.2.3 + graceful-fs: 4.2.11 + istanbul-lib-coverage: 3.2.0 + istanbul-lib-instrument: 5.2.1 + istanbul-lib-report: 3.0.1 + istanbul-lib-source-maps: 4.0.1 + istanbul-reports: 3.1.6 + jest-haste-map: 27.5.1 + jest-resolve: 27.5.1 + jest-util: 27.5.1 + jest-worker: 27.5.1 + slash: 3.0.0 + source-map: 0.6.1 + string-length: 4.0.2 + terminal-link: 2.1.1 + v8-to-istanbul: 8.1.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@jest/source-map@27.5.1: + resolution: {integrity: sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + callsites: 3.1.0 + graceful-fs: 4.2.11 + source-map: 0.6.1 + dev: true + + /@jest/test-result@27.5.1: + resolution: {integrity: sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/console': 27.5.1 + '@jest/types': 27.5.1 + '@types/istanbul-lib-coverage': 2.0.4 + collect-v8-coverage: 1.0.2 + dev: true + + /@jest/test-sequencer@27.5.1: + resolution: {integrity: sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/test-result': 27.5.1 + graceful-fs: 4.2.11 + jest-haste-map: 27.5.1 + jest-runtime: 27.5.1 + transitivePeerDependencies: + - supports-color + dev: true + + /@jest/transform@27.5.1: + resolution: {integrity: sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@babel/core': 7.22.11 + '@jest/types': 27.5.1 + babel-plugin-istanbul: 6.1.1 + chalk: 4.1.2 + convert-source-map: 1.9.0 + fast-json-stable-stringify: 2.1.0 + graceful-fs: 4.2.11 + jest-haste-map: 27.5.1 + jest-regex-util: 27.5.1 + jest-util: 27.5.1 + micromatch: 4.0.5 + pirates: 4.0.6 + slash: 3.0.0 + source-map: 0.6.1 + write-file-atomic: 3.0.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@jest/types@27.5.1: + resolution: {integrity: sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@types/istanbul-lib-coverage': 2.0.4 + '@types/istanbul-reports': 3.0.1 + '@types/node': 20.5.7 + '@types/yargs': 16.0.5 + chalk: 4.1.2 + dev: true + + /@jimp/bmp@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-keMOc5woiDmONXsB/6aXLR4Z5Q+v8lFq3EY2rcj2FmstbDMhRuGbmcBxlEgOqfRjwvtf/wOtJ3Of37oAWtVfLg==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + bmp-js: 0.1.0 + core-js: 3.32.1 + dev: false + + /@jimp/core@0.10.3: + resolution: {integrity: sha512-Gd5IpL3U2bFIO57Fh/OA3HCpWm4uW/pU01E75rI03BXfTdz3T+J7TwvyG1XaqsQ7/DSlS99GXtLQPlfFIe28UA==} + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/utils': 0.10.3 + any-base: 1.1.0 + buffer: 5.7.1 + core-js: 3.32.1 + exif-parser: 0.1.12 + file-type: 9.0.0 + load-bmfont: 1.4.1 + mkdirp: 0.5.6 + phin: 2.9.3 + pixelmatch: 4.0.2 + tinycolor2: 1.6.0 + dev: false + + /@jimp/custom@0.10.3: + resolution: {integrity: sha512-nZmSI+jwTi5IRyNLbKSXQovoeqsw+D0Jn0SxW08wYQvdkiWA8bTlDQFgQ7HVwCAKBm8oKkDB/ZEo9qvHJ+1gAQ==} + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/core': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/gif@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-vjlRodSfz1CrUvvrnUuD/DsLK1GHB/yDZXHthVdZu23zYJIW7/WrIiD1IgQ5wOMV7NocfrvPn2iqUfBP81/WWA==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + omggif: 1.0.10 + dev: false + + /@jimp/jpeg@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-AAANwgUZOt6f6P7LZxY9lyJ9xclqutYJlsxt3JbriXUGJgrrFAIkcKcqv1nObgmQASSAQKYaMV9KdHjMlWFKlQ==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + jpeg-js: 0.3.7 + dev: false + + /@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-5zlKlCfx4JWw9qUVC7GI4DzXyxDWyFvgZLaoGFoT00mlXlN75SarlDwc9iZ/2e2kp4bJWxz3cGgG4G/WXrbg3Q==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-blur@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-cTOK3rjh1Yjh23jSfA6EHCHjsPJDEGLC8K2y9gM7dnTUK1y9NNmkFS23uHpyjgsWFIoH9oRh2SpEs3INjCpZhQ==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-circle@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-51GAPIVelqAcfuUpaM5JWJ0iWl4vEjNXB7p4P7SX5udugK5bxXUjO6KA2qgWmdpHuCKtoNgkzWU9fNSuYp7tCA==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-color@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-RgeHUElmlTH7vpI4WyQrz6u59spiKfVQbsG/XUzfWGamFSixa24ZDwX/yV/Ts+eNaz7pZeIuv533qmKPvw2ujg==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + tinycolor2: 1.6.0 + dev: false + + /@jimp/plugin-contain@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3)(@jimp/plugin-resize@0.10.3)(@jimp/plugin-scale@0.10.3): + resolution: {integrity: sha512-bYJKW9dqzcB0Ihc6u7jSyKa3juStzbLs2LFr6fu8TzA2WkMS/R8h+ddkiO36+F9ILTWHP0CIA3HFe5OdOGcigw==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + '@jimp/plugin-blit': '>=0.3.5' + '@jimp/plugin-resize': '>=0.3.5' + '@jimp/plugin-scale': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/plugin-blit': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-scale': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-resize@0.10.3) + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-cover@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-crop@0.10.3)(@jimp/plugin-resize@0.10.3)(@jimp/plugin-scale@0.10.3): + resolution: {integrity: sha512-pOxu0cM0BRPzdV468n4dMocJXoMbTnARDY/EpC3ZW15SpMuc/dr1KhWQHgoQX5kVW1Wt8zgqREAJJCQ5KuPKDA==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + '@jimp/plugin-crop': '>=0.3.5' + '@jimp/plugin-resize': '>=0.3.5' + '@jimp/plugin-scale': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/plugin-crop': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-scale': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-resize@0.10.3) + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-nB7HgOjjl9PgdHr076xZ3Sr6qHYzeBYBs9qvs3tfEEUeYMNnvzgCCGtUl6eMakazZFCMk3mhKmcB9zQuHFOvkg==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-displace@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-8t3fVKCH5IVqI4lewe4lFFjpxxr69SQCz5/tlpDLQZsrNScNJivHdQ09zljTrVTCSgeCqQJIKgH2Q7Sk/pAZ0w==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-dither@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-JCX/oNSnEg1kGQ8ffZ66bEgQOLCY3Rn+lrd6v1jjLy/mn9YVZTMsxLtGCXpiCDC2wG/KTmi4862ysmP9do9dAQ==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-fisheye@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-RRZb1wqe+xdocGcFtj2xHU7sF7xmEZmIa6BmrfSchjyA2b32TGPWKnP3qyj7p6LWEsXn+19hRYbjfyzyebPElQ==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-flip@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-rotate@0.10.3): + resolution: {integrity: sha512-0epbi8XEzp0wmSjoW9IB0iMu0yNF17aZOxLdURCN3Zr+8nWPs5VNIMqSVa1Y62GSyiMDpVpKF/ITiXre+EqrPg==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + '@jimp/plugin-rotate': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/plugin-rotate': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3)(@jimp/plugin-crop@0.10.3)(@jimp/plugin-resize@0.10.3) + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-gaussian@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-25eHlFbHUDnMMGpgRBBeQ2AMI4wsqCg46sue0KklI+c2BaZ+dGXmJA5uT8RTOrt64/K9Wz5E+2n7eBnny4dfpQ==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-invert@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-effYSApWY/FbtlzqsKXlTLkgloKUiHBKjkQnqh5RL4oQxh/33j6aX+HFdDyQKtsXb8CMd4xd7wyiD2YYabTa0g==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-mask@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-twrg8q8TIhM9Z6Jcu9/5f+OCAPaECb0eKrrbbIajJqJ3bCUlj5zbfgIhiQIzjPJ6KjpnFPSqHQfHkU1Vvk/nVw==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-normalize@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-xkb5eZI/mMlbwKkDN79+1/t/+DBo8bBXZUMsT4gkFgMRKNRZ6NQPxlv1d3QpRzlocsl6UMxrHnhgnXdLAcgrXw==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-print@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3): + resolution: {integrity: sha512-wjRiI6yjXsAgMe6kVjizP+RgleUCLkH256dskjoNvJzmzbEfO7xQw9g6M02VET+emnbY0CO83IkrGm2q43VRyg==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + '@jimp/plugin-blit': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/plugin-blit': 0.10.3(@jimp/custom@0.10.3) + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + load-bmfont: 1.4.1 + dev: false + + /@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-rf8YmEB1d7Sg+g4LpqF0Mp+dfXfb6JFJkwlAIWPUOR7lGsPWALavEwTW91c0etEdnp0+JB9AFpy6zqq7Lwkq6w==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-rotate@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3)(@jimp/plugin-crop@0.10.3)(@jimp/plugin-resize@0.10.3): + resolution: {integrity: sha512-YXLlRjm18fkW9MOHUaVAxWjvgZM851ofOipytz5FyKp4KZWDLk+dZK1JNmVmK7MyVmAzZ5jsgSLhIgj+GgN0Eg==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + '@jimp/plugin-blit': '>=0.3.5' + '@jimp/plugin-crop': '>=0.3.5' + '@jimp/plugin-resize': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/plugin-blit': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-crop': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3) + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-scale@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-resize@0.10.3): + resolution: {integrity: sha512-5DXD7x7WVcX1gUgnlFXQa8F+Q3ThRYwJm+aesgrYvDOY+xzRoRSdQvhmdd4JEEue3lyX44DvBSgCIHPtGcEPaw==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + '@jimp/plugin-resize': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3) + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-shadow@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blur@0.10.3)(@jimp/plugin-resize@0.10.3): + resolution: {integrity: sha512-/nkFXpt2zVcdP4ETdkAUL0fSzyrC5ZFxdcphbYBodqD7fXNqChS/Un1eD4xCXWEpW8cnG9dixZgQgStjywH0Mg==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + '@jimp/plugin-blur': '>=0.3.5' + '@jimp/plugin-resize': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/plugin-blur': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3) + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugin-threshold@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-color@0.10.3)(@jimp/plugin-resize@0.10.3): + resolution: {integrity: sha512-Dzh0Yq2wXP2SOnxcbbiyA4LJ2luwrdf1MghNIt9H+NX7B+IWw/N8qA2GuSm9n4BPGSLluuhdAWJqHcTiREriVA==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + '@jimp/plugin-color': '>=0.8.0' + '@jimp/plugin-resize': '>=0.8.0' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/plugin-color': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3) + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + dev: false + + /@jimp/plugins@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-jTT3/7hOScf0EIKiAXmxwayHhryhc1wWuIe3FrchjDjr9wgIGNN2a7XwCgPl3fML17DXK1x8EzDneCdh261bkw==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/plugin-blit': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-blur': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-circle': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-color': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-contain': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3)(@jimp/plugin-resize@0.10.3)(@jimp/plugin-scale@0.10.3) + '@jimp/plugin-cover': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-crop@0.10.3)(@jimp/plugin-resize@0.10.3)(@jimp/plugin-scale@0.10.3) + '@jimp/plugin-crop': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-displace': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-dither': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-fisheye': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-flip': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-rotate@0.10.3) + '@jimp/plugin-gaussian': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-invert': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-mask': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-normalize': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-print': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3) + '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3) + '@jimp/plugin-rotate': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3)(@jimp/plugin-crop@0.10.3)(@jimp/plugin-resize@0.10.3) + '@jimp/plugin-scale': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-resize@0.10.3) + '@jimp/plugin-shadow': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blur@0.10.3)(@jimp/plugin-resize@0.10.3) + '@jimp/plugin-threshold': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-color@0.10.3)(@jimp/plugin-resize@0.10.3) + core-js: 3.32.1 + timm: 1.7.1 + dev: false + + /@jimp/png@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-YKqk/dkl+nGZxSYIDQrqhmaP8tC3IK8H7dFPnnzFVvbhDnyYunqBZZO3SaZUKTichClRw8k/CjBhbc+hifSGWg==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/utils': 0.10.3 + core-js: 3.32.1 + pngjs: 3.4.0 + dev: false + + /@jimp/tiff@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-7EsJzZ5Y/EtinkBGuwX3Bi4S+zgbKouxjt9c82VJTRJOQgLWsE/RHqcyRCOQBhHAZ9QexYmDz34medfLKdoX0g==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + core-js: 3.32.1 + utif: 2.0.1 + dev: false + + /@jimp/types@0.10.3(@jimp/custom@0.10.3): + resolution: {integrity: sha512-XGmBakiHZqseSWr/puGN+CHzx0IKBSpsKlmEmsNV96HKDiP6eu8NSnwdGCEq2mmIHe0JNcg1hqg59hpwtQ7Tiw==} + peerDependencies: + '@jimp/custom': '>=0.3.5' + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/bmp': 0.10.3(@jimp/custom@0.10.3) + '@jimp/custom': 0.10.3 + '@jimp/gif': 0.10.3(@jimp/custom@0.10.3) + '@jimp/jpeg': 0.10.3(@jimp/custom@0.10.3) + '@jimp/png': 0.10.3(@jimp/custom@0.10.3) + '@jimp/tiff': 0.10.3(@jimp/custom@0.10.3) + core-js: 3.32.1 + timm: 1.7.1 + dev: false + + /@jimp/utils@0.10.3: + resolution: {integrity: sha512-VcSlQhkil4ReYmg1KkN+WqHyYfZ2XfZxDsKAHSfST1GEz/RQHxKZbX+KhFKtKflnL0F4e6DlNQj3vznMNXCR2w==} + dependencies: + '@babel/runtime': 7.22.11 + core-js: 3.32.1 + regenerator-runtime: 0.13.11 + dev: false + + /@jridgewell/gen-mapping@0.3.3: + resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} + engines: {node: '>=6.0.0'} + dependencies: + '@jridgewell/set-array': 1.1.2 + '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/trace-mapping': 0.3.19 + + /@jridgewell/resolve-uri@3.1.1: + resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} + engines: {node: '>=6.0.0'} + + /@jridgewell/set-array@1.1.2: + resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} + engines: {node: '>=6.0.0'} + + /@jridgewell/source-map@0.3.5: + resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==} + dependencies: + '@jridgewell/gen-mapping': 0.3.3 + '@jridgewell/trace-mapping': 0.3.19 + + /@jridgewell/sourcemap-codec@1.4.15: + resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + + /@jridgewell/trace-mapping@0.3.19: + resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==} + dependencies: + '@jridgewell/resolve-uri': 3.1.1 + '@jridgewell/sourcemap-codec': 1.4.15 + + /@jspm/core@2.0.1: + resolution: {integrity: sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==} + dev: false + + /@juggle/resize-observer@3.3.1: + resolution: {integrity: sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw==} + dev: false + + /@leichtgewicht/ip-codec@2.0.4: + resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==} + + /@lit-labs/ssr-dom-shim@1.1.1: + resolution: {integrity: sha512-kXOeFbfCm4fFf2A3WwVEeQj55tMZa8c8/f9AKHMobQMkzNUfUj+antR3fRPaZJawsa1aZiP/Da3ndpZrwEe4rQ==} + dev: false + + /@lit/reactive-element@1.6.3: + resolution: {integrity: sha512-QuTgnG52Poic7uM1AN5yJ09QMe0O28e10XzSvWDz02TJiiKee4stsiownEIadWm8nYzyDAyT+gKzUoZmiWQtsQ==} + dependencies: + '@lit-labs/ssr-dom-shim': 1.1.1 + dev: false + + /@mapbox/node-pre-gyp@1.0.11: + resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==} + hasBin: true + dependencies: + detect-libc: 2.0.2 + https-proxy-agent: 5.0.1 + make-dir: 3.1.0 + node-fetch: 2.7.0 + nopt: 5.0.0 + npmlog: 5.0.1 + rimraf: 3.0.2 + semver: 7.5.4 + tar: 6.1.15 + transitivePeerDependencies: + - encoding + - supports-color + dev: true + + /@msgpack/msgpack@2.8.0: + resolution: {integrity: sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==} + engines: {node: '>= 10'} + dev: false + + /@nodelib/fs.scandir@2.1.5: + resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} + engines: {node: '>= 8'} + dependencies: + '@nodelib/fs.stat': 2.0.5 + run-parallel: 1.2.0 + dev: true + + /@nodelib/fs.stat@2.0.5: + resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} + engines: {node: '>= 8'} + dev: true + + /@nodelib/fs.walk@1.2.8: + resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} + engines: {node: '>= 8'} + dependencies: + '@nodelib/fs.scandir': 2.1.5 + fastq: 1.15.0 + dev: true + + /@pkgjs/parseargs@0.11.0: + resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} + engines: {node: '>=14'} + requiresBuild: true + dev: true + optional: true + + /@pmmmwh/react-refresh-webpack-plugin@0.5.11(react-refresh@0.14.0)(webpack-dev-server@4.15.1)(webpack@5.88.2): + resolution: {integrity: sha512-7j/6vdTym0+qZ6u4XbSAxrWBGYSdCfTzySkj7WAFgDLmSyWlOrWvpyzxlFh5jtw9dn0oL/jtW+06XfFiisN3JQ==} + engines: {node: '>= 10.13'} + peerDependencies: + '@types/webpack': 4.x || 5.x + react-refresh: '>=0.10.0 <1.0.0' + sockjs-client: ^1.4.0 + type-fest: '>=0.17.0 <5.0.0' + webpack: '>=4.43.0 <6.0.0' + webpack-dev-server: 3.x || 4.x + webpack-hot-middleware: 2.x + webpack-plugin-serve: 0.x || 1.x + peerDependenciesMeta: + '@types/webpack': + optional: true + sockjs-client: + optional: true + type-fest: + optional: true + webpack-dev-server: + optional: true + webpack-hot-middleware: + optional: true + webpack-plugin-serve: + optional: true + dependencies: + ansi-html-community: 0.0.8 + common-path-prefix: 3.0.0 + core-js-pure: 3.32.1 + error-stack-parser: 2.1.4 + find-up: 5.0.0 + html-entities: 2.4.0 + loader-utils: 2.0.4 + react-refresh: 0.14.0 + schema-utils: 3.3.0 + source-map: 0.7.4 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack-dev-server: 4.15.1(webpack-cli@5.1.4)(webpack@5.88.2) + dev: false + + /@popperjs/core@2.11.8: + resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} + dev: false + + /@rollup/plugin-babel@5.3.1(@babel/core@7.22.11)(rollup@2.79.1): + resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==} + engines: {node: '>= 10.0.0'} + peerDependencies: + '@babel/core': ^7.0.0 + '@types/babel__core': ^7.1.9 + rollup: ^1.20.0||^2.0.0 + peerDependenciesMeta: + '@types/babel__core': + optional: true + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-module-imports': 7.22.5 + '@rollup/pluginutils': 3.1.0(rollup@2.79.1) + rollup: 2.79.1 + + /@rollup/plugin-node-resolve@11.2.1(rollup@2.79.1): + resolution: {integrity: sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==} + engines: {node: '>= 10.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0 + dependencies: + '@rollup/pluginutils': 3.1.0(rollup@2.79.1) + '@types/resolve': 1.17.1 + builtin-modules: 3.3.0 + deepmerge: 4.3.1 + is-module: 1.0.0 + resolve: 1.22.4 + rollup: 2.79.1 + + /@rollup/plugin-replace@2.4.2(rollup@2.79.1): + resolution: {integrity: sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==} + peerDependencies: + rollup: ^1.20.0 || ^2.0.0 + dependencies: + '@rollup/pluginutils': 3.1.0(rollup@2.79.1) + magic-string: 0.25.9 + rollup: 2.79.1 + + /@rollup/pluginutils@3.1.0(rollup@2.79.1): + resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} + engines: {node: '>= 8.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0 + dependencies: + '@types/estree': 0.0.39 + estree-walker: 1.0.1 + picomatch: 2.3.1 + rollup: 2.79.1 + + /@sideway/address@4.1.4: + resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==} + dependencies: + '@hapi/hoek': 9.3.0 + dev: true + + /@sideway/formula@3.0.1: + resolution: {integrity: sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==} + dev: true + + /@sideway/pinpoint@2.0.0: + resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==} + dev: true + + /@sinonjs/commons@1.8.6: + resolution: {integrity: sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==} + dependencies: + type-detect: 4.0.8 + dev: true + + /@sinonjs/fake-timers@8.1.0: + resolution: {integrity: sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==} + dependencies: + '@sinonjs/commons': 1.8.6 + dev: true + + /@socket.io/component-emitter@3.1.0: + resolution: {integrity: sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==} + + /@surma/rollup-plugin-off-main-thread@2.2.3: + resolution: {integrity: sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==} + dependencies: + ejs: 3.1.9 + json5: 2.2.3 + magic-string: 0.25.9 + string.prototype.matchall: 4.0.8 + + /@tootallnate/once@1.1.2: + resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==} + engines: {node: '>= 6'} + dev: true + + /@tweenjs/tween.js@20.0.3: + resolution: {integrity: sha512-SYUe1UgY5HM05EB4+0B4arq2IPjvyzKXoklXKxSYrc2IFxGm1cBrqg5XbiB5uwbs0xY5j+rj986NAJMM0KZaUw==} + + /@types/babel__core@7.20.1: + resolution: {integrity: sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==} + dependencies: + '@babel/parser': 7.22.13 + '@babel/types': 7.22.11 + '@types/babel__generator': 7.6.4 + '@types/babel__template': 7.4.1 + '@types/babel__traverse': 7.20.1 + dev: true + + /@types/babel__generator@7.6.4: + resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==} + dependencies: + '@babel/types': 7.22.11 + dev: true + + /@types/babel__template@7.4.1: + resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==} + dependencies: + '@babel/parser': 7.22.13 + '@babel/types': 7.22.11 + dev: true + + /@types/babel__traverse@7.20.1: + resolution: {integrity: sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==} + dependencies: + '@babel/types': 7.22.11 + dev: true + + /@types/body-parser@1.19.2: + resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} + dependencies: + '@types/connect': 3.4.35 + '@types/node': 20.5.7 + + /@types/bonjour@3.5.10: + resolution: {integrity: sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==} + dependencies: + '@types/node': 20.5.7 + + /@types/connect-history-api-fallback@1.5.0: + resolution: {integrity: sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==} + dependencies: + '@types/express-serve-static-core': 4.17.36 + '@types/node': 20.5.7 + + /@types/connect@3.4.35: + resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} + dependencies: + '@types/node': 20.5.7 + + /@types/cookie@0.4.1: + resolution: {integrity: sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==} + + /@types/cors@2.8.13: + resolution: {integrity: sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==} + dependencies: + '@types/node': 20.5.7 + + /@types/eslint-scope@3.7.4: + resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==} + dependencies: + '@types/eslint': 8.44.2 + '@types/estree': 1.0.1 + + /@types/eslint@8.44.2: + resolution: {integrity: sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==} + dependencies: + '@types/estree': 1.0.1 + '@types/json-schema': 7.0.12 + + /@types/estree@0.0.39: + resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==} + + /@types/estree@1.0.1: + resolution: {integrity: sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==} + + /@types/express-serve-static-core@4.17.36: + resolution: {integrity: sha512-zbivROJ0ZqLAtMzgzIUC4oNqDG9iF0lSsAqpOD9kbs5xcIM3dTiyuHvBc7R8MtWBp3AAWGaovJa+wzWPjLYW7Q==} + dependencies: + '@types/node': 20.5.7 + '@types/qs': 6.9.7 + '@types/range-parser': 1.2.4 + '@types/send': 0.17.1 + + /@types/express@4.17.17: + resolution: {integrity: sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==} + dependencies: + '@types/body-parser': 1.19.2 + '@types/express-serve-static-core': 4.17.36 + '@types/qs': 6.9.7 + '@types/serve-static': 1.15.2 + + /@types/glob@7.2.0: + resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} + dependencies: + '@types/minimatch': 5.1.2 + '@types/node': 20.5.7 + dev: true + + /@types/graceful-fs@4.1.6: + resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==} + dependencies: + '@types/node': 20.5.7 + dev: true + + /@types/html-minifier-terser@6.1.0: + resolution: {integrity: sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==} + dev: true + + /@types/http-errors@2.0.1: + resolution: {integrity: sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==} + + /@types/http-proxy@1.17.11: + resolution: {integrity: sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==} + dependencies: + '@types/node': 20.5.7 + + /@types/istanbul-lib-coverage@2.0.4: + resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==} + dev: true + + /@types/istanbul-lib-report@3.0.0: + resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==} + dependencies: + '@types/istanbul-lib-coverage': 2.0.4 + dev: true + + /@types/istanbul-reports@3.0.1: + resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==} + dependencies: + '@types/istanbul-lib-report': 3.0.0 + dev: true + + /@types/js-cookie@2.2.7: + resolution: {integrity: sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA==} + dev: false + + /@types/json-schema@7.0.12: + resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==} + + /@types/json5@0.0.29: + resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} + dev: true + + /@types/mime@1.3.2: + resolution: {integrity: sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==} + + /@types/mime@3.0.1: + resolution: {integrity: sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==} + + /@types/minimatch@5.1.2: + resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==} + dev: true + + /@types/node@14.18.56: + resolution: {integrity: sha512-+k+57NVS9opgrEn5l9c0gvD1r6C+PtyhVE4BTnMMRwiEA8ZO8uFcs6Yy2sXIy0eC95ZurBtRSvhZiHXBysbl6w==} + + /@types/node@20.5.7: + resolution: {integrity: sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==} + + /@types/node@20.6.2: + resolution: {integrity: sha512-Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw==} + + /@types/parse-json@4.0.0: + resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} + dev: false + + /@types/prettier@2.7.3: + resolution: {integrity: sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==} + dev: true + + /@types/prop-types@15.7.5: + resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==} + + /@types/qs@6.9.7: + resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==} + + /@types/range-parser@1.2.4: + resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==} + + /@types/react-dom@18.2.7: + resolution: {integrity: sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==} + dependencies: + '@types/react': 18.2.20 + dev: false + + /@types/react@18.2.20: + resolution: {integrity: sha512-WKNtmsLWJM/3D5mG4U84cysVY31ivmyw85dE84fOCk5Hx78wezB/XEjVPWl2JTZ5FkEeaTJf+VgUAUn3PE7Isw==} + dependencies: + '@types/prop-types': 15.7.5 + '@types/scheduler': 0.16.3 + csstype: 3.1.2 + + /@types/readable-stream@4.0.2: + resolution: {integrity: sha512-hhzOsMEISZ+mX1l+01F0duYt9wHEbCGmjARed0PcQoVS5zAdu7u5YbWYuNGhw09M1MgGr3kfsto+ut/MnAdKqA==} + dependencies: + '@types/node': 20.6.2 + safe-buffer: 5.1.2 + + /@types/resolve@1.17.1: + resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} + dependencies: + '@types/node': 20.5.7 + + /@types/retry@0.12.0: + resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==} + + /@types/scheduler@0.16.3: + resolution: {integrity: sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==} + + /@types/send@0.17.1: + resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} + dependencies: + '@types/mime': 1.3.2 + '@types/node': 20.5.7 + + /@types/serve-index@1.9.1: + resolution: {integrity: sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==} + dependencies: + '@types/express': 4.17.17 + + /@types/serve-static@1.15.2: + resolution: {integrity: sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==} + dependencies: + '@types/http-errors': 2.0.1 + '@types/mime': 3.0.1 + '@types/node': 20.5.7 + + /@types/sinonjs__fake-timers@8.1.1: + resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==} + + /@types/sizzle@2.3.3: + resolution: {integrity: sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==} + + /@types/sockjs@0.3.33: + resolution: {integrity: sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==} + dependencies: + '@types/node': 20.5.7 + + /@types/stack-utils@2.0.1: + resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} + dev: true + + /@types/three@0.128.0: + resolution: {integrity: sha512-Jwq5XYUkzAcPTo34hlGAQGUyAI0b2F3aCCFWG/v7ZhJBEG5HGcusMSr70GhDlT8Gs0f02QnSPZ2RCA1MrCOa/w==} + dev: true + + /@types/trusted-types@2.0.3: + resolution: {integrity: sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==} + + /@types/wicg-file-system-access@2020.9.6: + resolution: {integrity: sha512-6hogE75Hl2Ov/jgp8ZhDaGmIF/q3J07GtXf8nCJCwKTHq7971po5+DId7grft09zG7plBwpF6ZU0yx9Du4/e1A==} + dev: false + + /@types/ws@8.5.5: + resolution: {integrity: sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==} + dependencies: + '@types/node': 20.5.7 + + /@types/yargs-parser@21.0.0: + resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} + dev: true + + /@types/yargs@16.0.5: + resolution: {integrity: sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==} + dependencies: + '@types/yargs-parser': 21.0.0 + dev: true + + /@types/yauzl@2.10.0: + resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==} + requiresBuild: true + dependencies: + '@types/node': 20.5.7 + optional: true + + /@webassemblyjs/ast@1.11.6: + resolution: {integrity: sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==} + dependencies: + '@webassemblyjs/helper-numbers': 1.11.6 + '@webassemblyjs/helper-wasm-bytecode': 1.11.6 + + /@webassemblyjs/floating-point-hex-parser@1.11.6: + resolution: {integrity: sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==} + + /@webassemblyjs/helper-api-error@1.11.6: + resolution: {integrity: sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==} + + /@webassemblyjs/helper-buffer@1.11.6: + resolution: {integrity: sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==} + + /@webassemblyjs/helper-numbers@1.11.6: + resolution: {integrity: sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==} + dependencies: + '@webassemblyjs/floating-point-hex-parser': 1.11.6 + '@webassemblyjs/helper-api-error': 1.11.6 + '@xtuc/long': 4.2.2 + + /@webassemblyjs/helper-wasm-bytecode@1.11.6: + resolution: {integrity: sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==} + + /@webassemblyjs/helper-wasm-section@1.11.6: + resolution: {integrity: sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==} + dependencies: + '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/helper-buffer': 1.11.6 + '@webassemblyjs/helper-wasm-bytecode': 1.11.6 + '@webassemblyjs/wasm-gen': 1.11.6 + + /@webassemblyjs/ieee754@1.11.6: + resolution: {integrity: sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==} + dependencies: + '@xtuc/ieee754': 1.2.0 + + /@webassemblyjs/leb128@1.11.6: + resolution: {integrity: sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==} + dependencies: + '@xtuc/long': 4.2.2 + + /@webassemblyjs/utf8@1.11.6: + resolution: {integrity: sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==} + + /@webassemblyjs/wasm-edit@1.11.6: + resolution: {integrity: sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==} + dependencies: + '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/helper-buffer': 1.11.6 + '@webassemblyjs/helper-wasm-bytecode': 1.11.6 + '@webassemblyjs/helper-wasm-section': 1.11.6 + '@webassemblyjs/wasm-gen': 1.11.6 + '@webassemblyjs/wasm-opt': 1.11.6 + '@webassemblyjs/wasm-parser': 1.11.6 + '@webassemblyjs/wast-printer': 1.11.6 + + /@webassemblyjs/wasm-gen@1.11.6: + resolution: {integrity: sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==} + dependencies: + '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/helper-wasm-bytecode': 1.11.6 + '@webassemblyjs/ieee754': 1.11.6 + '@webassemblyjs/leb128': 1.11.6 + '@webassemblyjs/utf8': 1.11.6 + + /@webassemblyjs/wasm-opt@1.11.6: + resolution: {integrity: sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==} + dependencies: + '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/helper-buffer': 1.11.6 + '@webassemblyjs/wasm-gen': 1.11.6 + '@webassemblyjs/wasm-parser': 1.11.6 + + /@webassemblyjs/wasm-parser@1.11.6: + resolution: {integrity: sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==} + dependencies: + '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/helper-api-error': 1.11.6 + '@webassemblyjs/helper-wasm-bytecode': 1.11.6 + '@webassemblyjs/ieee754': 1.11.6 + '@webassemblyjs/leb128': 1.11.6 + '@webassemblyjs/utf8': 1.11.6 + + /@webassemblyjs/wast-printer@1.11.6: + resolution: {integrity: sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==} + dependencies: + '@webassemblyjs/ast': 1.11.6 + '@xtuc/long': 4.2.2 + + /@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.88.2): + resolution: {integrity: sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==} + engines: {node: '>=14.15.0'} + peerDependencies: + webpack: 5.x.x + webpack-cli: 5.x.x + dependencies: + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) + + /@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.88.2): + resolution: {integrity: sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==} + engines: {node: '>=14.15.0'} + peerDependencies: + webpack: 5.x.x + webpack-cli: 5.x.x + dependencies: + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) + + /@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@4.15.1)(webpack@5.88.2): + resolution: {integrity: sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==} + engines: {node: '>=14.15.0'} + peerDependencies: + webpack: 5.x.x + webpack-cli: 5.x.x + webpack-dev-server: '*' + peerDependenciesMeta: + webpack-dev-server: + optional: true + dependencies: + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) + webpack-dev-server: 4.15.1(webpack-cli@5.1.4)(webpack@5.88.2) + + /@xboxreplay/errors@0.1.0: + resolution: {integrity: sha512-Tgz1d/OIPDWPeyOvuL5+aai5VCcqObhPnlI3skQuf80GVF3k1I0lPCnGC+8Cm5PV9aLBT5m8qPcJoIUQ2U4y9g==} + + /@xboxreplay/xboxlive-auth@3.3.3(debug@4.3.4): + resolution: {integrity: sha512-j0AU8pW10LM8O68CTZ5QHnvOjSsnPICy0oQcP7zyM7eWkDQ/InkiQiirQKsPn1XRYDl4ccNu0WM582s3UKwcBg==} + dependencies: + '@xboxreplay/errors': 0.1.0 + axios: 0.21.4(debug@4.3.4) + transitivePeerDependencies: + - debug + + /@xobotyi/scrollbar-width@1.9.5: + resolution: {integrity: sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==} + dev: false + + /@xtuc/ieee754@1.2.0: + resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} + + /@xtuc/long@4.2.2: + resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==} + + /@zardoy/react-util@0.2.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-glABtx54mh4XSaK6BNALWE3mlshPjcPwPsRj/GnOXEA7WJY/6n43iJoukbaYF3758mGZRU5Fq6gklyFjBg0yHQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + peerDependencies: + react: ^18.0.0 + react-dom: ^18.0.0 + dependencies: + classnames: 2.3.2 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: false + + /@zardoy/utils@0.0.11: + resolution: {integrity: sha512-d6xBnSFCOa98HcL52xSBflJKjKpxfRhtr1eVexy89YujeCHSQhUMmSz9h07xyrulfW60k9tSeYH5reuqoh4l4w==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + escape-string-regexp: 4.0.0 + lodash.compact: 3.0.1 + rambda: 6.9.0 + type-fest: 2.19.0 + dev: false + + /Base64@0.2.1: + resolution: {integrity: sha512-reGEWshDmTDQDsCec/HduOO9Wyj6yMOupMfhIf3ugN1TDlK2NQW4DDJSqNNtp380SNcvRfXtO8HSCQot0d0SMw==} + dev: true + + /abab@2.0.6: + resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==} + dev: true + + /abbrev@1.1.1: + resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} + + /abort-controller@3.0.0: + resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==} + engines: {node: '>=6.5'} + dependencies: + event-target-shim: 5.0.1 + + /accepts@1.3.8: + resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} + engines: {node: '>= 0.6'} + dependencies: + mime-types: 2.1.35 + negotiator: 0.6.3 + + /acorn-globals@6.0.0: + resolution: {integrity: sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==} + dependencies: + acorn: 7.4.1 + acorn-walk: 7.2.0 + dev: true + + /acorn-import-assertions@1.9.0(acorn@8.10.0): + resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==} + peerDependencies: + acorn: ^8 + dependencies: + acorn: 8.10.0 + + /acorn-jsx@5.3.2(acorn@8.10.0): + resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} + peerDependencies: + acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 + dependencies: + acorn: 8.10.0 + dev: true + + /acorn-walk@7.2.0: + resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==} + engines: {node: '>=0.4.0'} + dev: true + + /acorn@7.4.1: + resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==} + engines: {node: '>=0.4.0'} + hasBin: true + dev: true + + /acorn@8.10.0: + resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} + engines: {node: '>=0.4.0'} + hasBin: true + + /aes-js@3.1.2: + resolution: {integrity: sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ==} + + /after@0.8.2: + resolution: {integrity: sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==} + dev: false + + /agent-base@6.0.2: + resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} + engines: {node: '>= 6.0.0'} + dependencies: + debug: 4.3.4(supports-color@8.1.1) + transitivePeerDependencies: + - supports-color + dev: true + + /aggregate-error@3.1.0: + resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==} + engines: {node: '>=8'} + dependencies: + clean-stack: 2.2.0 + indent-string: 4.0.0 + + /ajv-formats@2.1.1(ajv@8.12.0): + resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} + peerDependencies: + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true + dependencies: + ajv: 8.12.0 + + /ajv-keywords@3.5.2(ajv@6.12.6): + resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} + peerDependencies: + ajv: ^6.9.1 + dependencies: + ajv: 6.12.6 + + /ajv-keywords@5.1.0(ajv@8.12.0): + resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==} + peerDependencies: + ajv: ^8.8.2 + dependencies: + ajv: 8.12.0 + fast-deep-equal: 3.1.3 + + /ajv@6.12.6: + resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} + dependencies: + fast-deep-equal: 3.1.3 + fast-json-stable-stringify: 2.1.0 + json-schema-traverse: 0.4.1 + uri-js: 4.4.1 + + /ajv@8.12.0: + resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==} + dependencies: + fast-deep-equal: 3.1.3 + json-schema-traverse: 1.0.0 + require-from-string: 2.0.2 + uri-js: 4.4.1 + + /animejs@3.2.1: + resolution: {integrity: sha512-sWno3ugFryK5nhiDm/2BKeFCpZv7vzerWUcUPyAZLDhMek3+S/p418ldZJbJXo5ZUOpfm2kP2XRO4NJcULMy9A==} + dev: false + + /ansi-colors@4.1.3: + resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} + engines: {node: '>=6'} + + /ansi-escapes@4.3.2: + resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==} + engines: {node: '>=8'} + dependencies: + type-fest: 0.21.3 + + /ansi-html-community@0.0.8: + resolution: {integrity: sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==} + engines: {'0': node >= 0.8.0} + hasBin: true + + /ansi-regex@5.0.1: + resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} + engines: {node: '>=8'} + + /ansi-regex@6.0.1: + resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} + engines: {node: '>=12'} + dev: true + + /ansi-styles@3.2.1: + resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} + engines: {node: '>=4'} + dependencies: + color-convert: 1.9.3 + + /ansi-styles@4.3.0: + resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} + engines: {node: '>=8'} + dependencies: + color-convert: 2.0.1 + + /ansi-styles@5.2.0: + resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} + engines: {node: '>=10'} + dev: true + + /ansi-styles@6.2.1: + resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} + engines: {node: '>=12'} + dev: true + + /any-base@1.1.0: + resolution: {integrity: sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg==} + dev: false + + /any-promise@1.3.0: + resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} + dev: true + + /anymatch@3.1.3: + resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} + engines: {node: '>= 8'} + dependencies: + normalize-path: 3.0.0 + picomatch: 2.3.1 + + /aproba@2.0.0: + resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} + dev: true + + /arch@2.2.0: + resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==} + + /are-we-there-yet@2.0.0: + resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==} + engines: {node: '>=10'} + dependencies: + delegates: 1.0.0 + readable-stream: 3.6.2 + dev: true + + /argparse@1.0.10: + resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} + dependencies: + sprintf-js: 1.0.3 + dev: true + + /argparse@2.0.1: + resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} + dev: true + + /arr-union@3.1.0: + resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==} + engines: {node: '>=0.10.0'} + dev: true + + /array-buffer-byte-length@1.0.0: + resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==} + dependencies: + call-bind: 1.0.2 + is-array-buffer: 3.0.2 + + /array-flatten@1.1.1: + resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==} + + /array-flatten@2.1.2: + resolution: {integrity: sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==} + + /array-includes@3.1.6: + resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + get-intrinsic: 1.2.1 + is-string: 1.0.7 + dev: true + + /array-union@1.0.2: + resolution: {integrity: sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==} + engines: {node: '>=0.10.0'} + dependencies: + array-uniq: 1.0.3 + dev: true + + /array-uniq@1.0.3: + resolution: {integrity: sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==} + engines: {node: '>=0.10.0'} + dev: true + + /array.prototype.findlastindex@1.2.2: + resolution: {integrity: sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + es-shim-unscopables: 1.0.0 + get-intrinsic: 1.2.1 + dev: true + + /array.prototype.flat@1.3.1: + resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + es-shim-unscopables: 1.0.0 + dev: true + + /array.prototype.flatmap@1.3.1: + resolution: {integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + es-shim-unscopables: 1.0.0 + dev: true + + /array.prototype.tosorted@1.1.1: + resolution: {integrity: sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + es-shim-unscopables: 1.0.0 + get-intrinsic: 1.2.1 + dev: true + + /arraybuffer.prototype.slice@1.0.1: + resolution: {integrity: sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==} + engines: {node: '>= 0.4'} + 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 + + /arraybuffer.slice@0.0.7: + resolution: {integrity: sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==} + dev: false + + /asap@1.0.0: + resolution: {integrity: sha512-Ej9qjcXY+8Tuy1cNqiwNMwFRXOy9UwgTeMA8LxreodygIPV48lx8PU1ecFxb5ZeU1DpMKxiq6vGLTxcitWZPbA==} + dev: false + + /asn1.js@5.4.1: + resolution: {integrity: sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==} + dependencies: + bn.js: 4.12.0 + inherits: 2.0.4 + minimalistic-assert: 1.0.1 + safer-buffer: 2.1.2 + dev: true + + /asn1@0.2.3: + resolution: {integrity: sha512-6i37w/+EhlWlGUJff3T/Q8u1RGmP5wgbiwYnOnbOqvtrPxT63/sYFyP9RcpxtxGymtfA075IvmOnL7ycNOWl3w==} + + /asn1@0.2.6: + resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==} + dependencies: + safer-buffer: 2.1.2 + + /assert-plus@1.0.0: + resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==} + engines: {node: '>=0.8'} + + /assert@2.0.0: + resolution: {integrity: sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==} + dependencies: + es6-object-assign: 1.1.0 + is-nan: 1.3.2 + object-is: 1.1.5 + util: 0.12.5 + dev: true + + /astral-regex@2.0.0: + resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==} + engines: {node: '>=8'} + + /async-limiter@1.0.1: + resolution: {integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==} + dev: false + + /async@2.6.4: + resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} + dependencies: + lodash: 4.17.21 + + /async@3.2.4: + resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==} + + /asynciterator.prototype@1.0.0: + resolution: {integrity: sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==} + dependencies: + has-symbols: 1.0.3 + dev: true + + /asynckit@0.4.0: + resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} + + /at-least-node@1.0.0: + resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==} + engines: {node: '>= 4.0.0'} + + /available-typed-arrays@1.0.5: + resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==} + engines: {node: '>= 0.4'} + + /aws-sign2@0.7.0: + resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==} + + /aws4@1.12.0: + resolution: {integrity: sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==} + + /axios@0.21.4(debug@4.3.4): + resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} + dependencies: + follow-redirects: 1.15.2(debug@4.3.4) + transitivePeerDependencies: + - debug + + /axios@0.25.0: + resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==} + dependencies: + follow-redirects: 1.15.2(debug@4.3.4) + transitivePeerDependencies: + - debug + dev: true + + /babel-jest@27.5.1(@babel/core@7.22.11): + resolution: {integrity: sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + peerDependencies: + '@babel/core': ^7.8.0 + dependencies: + '@babel/core': 7.22.11 + '@jest/transform': 27.5.1 + '@jest/types': 27.5.1 + '@types/babel__core': 7.20.1 + babel-plugin-istanbul: 6.1.1 + babel-preset-jest: 27.5.1(@babel/core@7.22.11) + chalk: 4.1.2 + graceful-fs: 4.2.11 + slash: 3.0.0 + transitivePeerDependencies: + - supports-color + dev: true + + /babel-plugin-istanbul@6.1.1: + resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==} + engines: {node: '>=8'} + dependencies: + '@babel/helper-plugin-utils': 7.22.5 + '@istanbuljs/load-nyc-config': 1.1.0 + '@istanbuljs/schema': 0.1.3 + istanbul-lib-instrument: 5.2.1 + test-exclude: 6.0.0 + transitivePeerDependencies: + - supports-color + dev: true + + /babel-plugin-jest-hoist@27.5.1: + resolution: {integrity: sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@babel/template': 7.22.5 + '@babel/types': 7.22.11 + '@types/babel__core': 7.20.1 + '@types/babel__traverse': 7.20.1 + dev: true + + /babel-plugin-macros@3.1.0: + resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==} + engines: {node: '>=10', npm: '>=6'} + dependencies: + '@babel/runtime': 7.22.11 + cosmiconfig: 7.1.0 + resolve: 1.22.4 + dev: false + + /babel-plugin-polyfill-corejs2@0.4.5(@babel/core@7.22.11): + resolution: {integrity: sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==} + peerDependencies: + '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 + dependencies: + '@babel/compat-data': 7.22.9 + '@babel/core': 7.22.11 + '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.22.11) + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + + /babel-plugin-polyfill-corejs3@0.8.3(@babel/core@7.22.11): + resolution: {integrity: sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==} + peerDependencies: + '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.22.11) + core-js-compat: 3.32.1 + transitivePeerDependencies: + - supports-color + + /babel-plugin-polyfill-regenerator@0.5.2(@babel/core@7.22.11): + resolution: {integrity: sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==} + peerDependencies: + '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.22.11) + transitivePeerDependencies: + - supports-color + + /babel-preset-current-node-syntax@1.0.1(@babel/core@7.22.11): + resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.22.11 + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.11) + '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.22.11) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.22.11) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.11) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.11) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.11) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.22.11) + dev: true + + /babel-preset-jest@27.5.1(@babel/core@7.22.11): + resolution: {integrity: sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.22.11 + babel-plugin-jest-hoist: 27.5.1 + babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.11) + dev: true + + /backo2@1.0.2: + resolution: {integrity: sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==} + dev: false + + /balanced-match@1.0.2: + resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} + + /base64-arraybuffer@0.1.4: + resolution: {integrity: sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg==} + engines: {node: '>= 0.6.0'} + dev: false + + /base64-js@1.5.1: + resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} + + /base64id@2.0.0: + resolution: {integrity: sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==} + engines: {node: ^4.5.0 || >= 5.9} + + /basic-auth@2.0.1: + resolution: {integrity: sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==} + engines: {node: '>= 0.8'} + dependencies: + safe-buffer: 5.1.2 + dev: true + + /batch@0.6.1: + resolution: {integrity: sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==} + + /bcrypt-pbkdf@1.0.2: + resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==} + dependencies: + tweetnacl: 0.14.5 + + /big.js@5.2.2: + resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} + + /binary-extensions@2.2.0: + resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} + engines: {node: '>=8'} + + /bl@4.1.0: + resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} + dependencies: + buffer: 5.7.1 + inherits: 2.0.4 + readable-stream: 3.6.2 + dev: true + + /blob-util@2.0.2: + resolution: {integrity: sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==} + + /blob@0.0.5: + resolution: {integrity: sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==} + dev: false + + /bluebird@3.7.2: + resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==} + + /bmp-js@0.1.0: + resolution: {integrity: sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==} + dev: false + + /bn.js@4.12.0: + resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==} + dev: true + + /bn.js@5.2.1: + resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==} + dev: true + + /body-parser@1.20.1: + resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==} + engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} + dependencies: + bytes: 3.1.2 + content-type: 1.0.5 + debug: 2.6.9 + depd: 2.0.0 + destroy: 1.2.0 + http-errors: 2.0.0 + iconv-lite: 0.4.24 + on-finished: 2.4.1 + qs: 6.11.0 + raw-body: 2.5.1 + type-is: 1.6.18 + unpipe: 1.0.0 + transitivePeerDependencies: + - supports-color + + /body-parser@1.20.2: + resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==} + engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} + dependencies: + bytes: 3.1.2 + content-type: 1.0.5 + debug: 2.6.9 + depd: 2.0.0 + destroy: 1.2.0 + http-errors: 2.0.0 + iconv-lite: 0.4.24 + on-finished: 2.4.1 + qs: 6.11.0 + raw-body: 2.5.2 + type-is: 1.6.18 + unpipe: 1.0.0 + transitivePeerDependencies: + - supports-color + dev: false + + /bonjour-service@1.1.1: + resolution: {integrity: sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==} + dependencies: + array-flatten: 2.1.2 + dns-equal: 1.0.0 + fast-deep-equal: 3.1.3 + multicast-dns: 7.2.5 + + /boolbase@1.0.0: + resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} + dev: true + + /brace-expansion@1.1.11: + resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} + dependencies: + balanced-match: 1.0.2 + concat-map: 0.0.1 + + /brace-expansion@2.0.1: + resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} + dependencies: + balanced-match: 1.0.2 + + /braces@3.0.2: + resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} + engines: {node: '>=8'} + dependencies: + fill-range: 7.0.1 + + /brorand@1.1.0: + resolution: {integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==} + dev: true + + /browser-process-hrtime@1.0.0: + resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==} + dev: true + + /browserify-aes@1.2.0: + resolution: {integrity: sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==} + dependencies: + buffer-xor: 1.0.3 + cipher-base: 1.0.4 + create-hash: 1.2.0 + evp_bytestokey: 1.0.3 + inherits: 2.0.4 + safe-buffer: 5.2.1 + dev: true + + /browserify-cipher@1.0.1: + resolution: {integrity: sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==} + dependencies: + browserify-aes: 1.2.0 + browserify-des: 1.0.2 + evp_bytestokey: 1.0.3 + dev: true + + /browserify-des@1.0.2: + resolution: {integrity: sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==} + dependencies: + cipher-base: 1.0.4 + des.js: 1.1.0 + inherits: 2.0.4 + safe-buffer: 5.2.1 + dev: true + + /browserify-rsa@4.1.0: + resolution: {integrity: sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==} + dependencies: + bn.js: 5.2.1 + randombytes: 2.1.0 + dev: true + + /browserify-sign@4.2.1: + resolution: {integrity: sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==} + dependencies: + bn.js: 5.2.1 + browserify-rsa: 4.1.0 + create-hash: 1.2.0 + create-hmac: 1.1.7 + elliptic: 6.5.4 + inherits: 2.0.4 + parse-asn1: 5.1.6 + readable-stream: 3.6.2 + safe-buffer: 5.2.1 + dev: true + + /browserify-zlib@0.2.0: + resolution: {integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==} + dependencies: + pako: 1.0.11 + dev: true + + /browserslist@4.21.10: + resolution: {integrity: sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + dependencies: + caniuse-lite: 1.0.30001524 + electron-to-chromium: 1.4.504 + node-releases: 2.0.13 + update-browserslist-db: 1.0.11(browserslist@4.21.10) + + /bser@2.1.1: + resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==} + dependencies: + node-int64: 0.4.0 + dev: true + + /buffer-crc32@0.2.13: + resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} + + /buffer-equal-constant-time@1.0.1: + resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==} + + /buffer-equal@0.0.1: + resolution: {integrity: sha512-RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA==} + engines: {node: '>=0.4.0'} + dev: false + + /buffer-equal@1.0.1: + resolution: {integrity: sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==} + engines: {node: '>=0.4'} + + /buffer-from@1.1.2: + resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} + + /buffer-xor@1.0.3: + resolution: {integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==} + dev: true + + /buffer@5.7.1: + resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} + dependencies: + base64-js: 1.5.1 + ieee754: 1.2.1 + + /buffer@6.0.3: + resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==} + dependencies: + base64-js: 1.5.1 + ieee754: 1.2.1 + + /builtin-modules@3.3.0: + resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} + engines: {node: '>=6'} + + /builtins@5.0.1: + resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} + dependencies: + semver: 7.5.4 + dev: true + + /bytes@3.0.0: + resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==} + engines: {node: '>= 0.8'} + + /bytes@3.1.2: + resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} + engines: {node: '>= 0.8'} + + /cachedir@2.4.0: + resolution: {integrity: sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==} + engines: {node: '>=6'} + + /call-bind@1.0.2: + resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} + dependencies: + function-bind: 1.1.1 + get-intrinsic: 1.2.1 + + /callsites@3.1.0: + resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} + engines: {node: '>=6'} + + /camel-case@4.1.2: + resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==} + dependencies: + pascal-case: 3.1.2 + tslib: 2.6.2 + + /camelcase@5.3.1: + resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==} + engines: {node: '>=6'} + dev: true + + /camelcase@6.3.0: + resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} + engines: {node: '>=10'} + dev: true + + /caniuse-lite@1.0.30001524: + resolution: {integrity: sha512-Jj917pJtYg9HSJBF95HVX3Cdr89JUyLT4IZ8SvM5aDRni95swKgYi3TgYLH5hnGfPE/U1dg6IfZ50UsIlLkwSA==} + + /canvas@2.11.2: + resolution: {integrity: sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==} + engines: {node: '>=6'} + requiresBuild: true + dependencies: + '@mapbox/node-pre-gyp': 1.0.11 + nan: 2.17.0 + simple-get: 3.1.1 + transitivePeerDependencies: + - encoding + - supports-color + dev: true + + /capital-case@1.0.4: + resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==} + dependencies: + no-case: 3.0.4 + tslib: 2.6.2 + upper-case-first: 2.0.2 + dev: false + + /caseless@0.12.0: + resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} + + /cbor-extract@2.1.1: + resolution: {integrity: sha512-1UX977+L+zOJHsp0mWFG13GLwO6ucKgSmSW6JTl8B9GUvACvHeIVpFqhU92299Z6PfD09aTXDell5p+lp1rUFA==} + hasBin: true + requiresBuild: true + dependencies: + node-gyp-build-optional-packages: 5.0.3 + optionalDependencies: + '@cbor-extract/cbor-extract-darwin-arm64': 2.1.1 + '@cbor-extract/cbor-extract-darwin-x64': 2.1.1 + '@cbor-extract/cbor-extract-linux-arm': 2.1.1 + '@cbor-extract/cbor-extract-linux-arm64': 2.1.1 + '@cbor-extract/cbor-extract-linux-x64': 2.1.1 + '@cbor-extract/cbor-extract-win32-x64': 2.1.1 + dev: false + optional: true + + /cbor-x@1.5.4: + resolution: {integrity: sha512-PVKILDn+Rf6MRhhcyzGXi5eizn1i0i3F8Fe6UMMxXBnWkalq9+C5+VTmlIjAYM4iF2IYF2N+zToqAfYOp+3rfw==} + optionalDependencies: + cbor-extract: 2.1.1 + dev: false + + /chalk@2.4.2: + resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} + engines: {node: '>=4'} + dependencies: + ansi-styles: 3.2.1 + escape-string-regexp: 1.0.5 + supports-color: 5.5.0 + + /chalk@4.1.2: + resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} + engines: {node: '>=10'} + dependencies: + ansi-styles: 4.3.0 + supports-color: 7.2.0 + + /change-case@4.1.2: + resolution: {integrity: sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==} + dependencies: + camel-case: 4.1.2 + capital-case: 1.0.4 + constant-case: 3.0.4 + dot-case: 3.0.4 + header-case: 2.0.4 + no-case: 3.0.4 + param-case: 3.0.4 + pascal-case: 3.1.2 + path-case: 3.0.4 + sentence-case: 3.0.4 + snake-case: 3.0.4 + tslib: 2.6.2 + dev: false + + /char-regex@1.0.2: + resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==} + engines: {node: '>=10'} + dev: true + + /check-more-types@2.24.0: + resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==} + engines: {node: '>= 0.8.0'} + + /chokidar@3.5.3: + resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} + engines: {node: '>= 8.10.0'} + dependencies: + anymatch: 3.1.3 + braces: 3.0.2 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.3 + + /chownr@1.1.4: + resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} + dev: true + + /chownr@2.0.0: + resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} + engines: {node: '>=10'} + dev: true + + /chrome-trace-event@1.0.3: + resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==} + engines: {node: '>=6.0'} + + /ci-info@3.8.0: + resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==} + engines: {node: '>=8'} + + /cipher-base@1.0.4: + resolution: {integrity: sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==} + dependencies: + inherits: 2.0.4 + safe-buffer: 5.2.1 + dev: true + + /cjs-module-lexer@1.2.3: + resolution: {integrity: sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==} + dev: true + + /classnames@2.3.2: + resolution: {integrity: sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==} + dev: false + + /clean-css@5.3.2: + resolution: {integrity: sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==} + engines: {node: '>= 10.0'} + dependencies: + source-map: 0.6.1 + dev: true + + /clean-stack@2.2.0: + resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==} + engines: {node: '>=6'} + + /clean-webpack-plugin@4.0.0(webpack@5.88.2): + resolution: {integrity: sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==} + engines: {node: '>=10.0.0'} + peerDependencies: + webpack: '>=4.0.0 <6.0.0' + dependencies: + del: 4.1.1 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + dev: true + + /cli-cursor@3.1.0: + resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==} + engines: {node: '>=8'} + dependencies: + restore-cursor: 3.1.0 + + /cli-table3@0.6.3: + resolution: {integrity: sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==} + engines: {node: 10.* || >= 12.*} + dependencies: + string-width: 4.2.3 + optionalDependencies: + '@colors/colors': 1.5.0 + + /cli-truncate@2.1.0: + resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==} + engines: {node: '>=8'} + dependencies: + slice-ansi: 3.0.0 + string-width: 4.2.3 + + /cliui@7.0.4: + resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} + dependencies: + string-width: 4.2.3 + strip-ansi: 6.0.1 + wrap-ansi: 7.0.0 + dev: true + + /cliui@8.0.1: + resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} + engines: {node: '>=12'} + dependencies: + string-width: 4.2.3 + strip-ansi: 6.0.1 + wrap-ansi: 7.0.0 + dev: false + + /clone-deep@0.2.4: + resolution: {integrity: sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==} + engines: {node: '>=0.10.0'} + dependencies: + for-own: 0.1.5 + is-plain-object: 2.0.4 + kind-of: 3.2.2 + lazy-cache: 1.0.4 + shallow-clone: 0.1.2 + dev: true + + /clone-deep@4.0.1: + resolution: {integrity: sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==} + engines: {node: '>=6'} + dependencies: + is-plain-object: 2.0.4 + kind-of: 6.0.3 + shallow-clone: 3.0.1 + + /clsx@1.1.1: + resolution: {integrity: sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==} + engines: {node: '>=6'} + dev: false + + /co@4.6.0: + resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==} + engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'} + dev: true + + /collect-v8-coverage@1.0.2: + resolution: {integrity: sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==} + dev: true + + /color-convert@1.9.3: + resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} + dependencies: + color-name: 1.1.3 + + /color-convert@2.0.1: + resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} + engines: {node: '>=7.0.0'} + dependencies: + color-name: 1.1.4 + + /color-name@1.1.3: + resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} + + /color-name@1.1.4: + resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + + /color-support@1.1.3: + resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==} + hasBin: true + dev: true + + /colorette@2.0.20: + resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} + + /colors@1.4.0: + resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==} + engines: {node: '>=0.1.90'} + dev: false + + /combined-stream@1.0.8: + resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==} + engines: {node: '>= 0.8'} + dependencies: + delayed-stream: 1.0.0 + + /commander@10.0.1: + resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==} + engines: {node: '>=14'} + + /commander@2.20.3: + resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} + + /commander@5.1.0: + resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==} + engines: {node: '>= 6'} + + /commander@8.3.0: + resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} + engines: {node: '>= 12'} + dev: true + + /common-path-prefix@3.0.0: + resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==} + dev: false + + /common-tags@1.8.2: + resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==} + engines: {node: '>=4.0.0'} + + /component-bind@1.0.0: + resolution: {integrity: sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw==} + dev: false + + /component-emitter@1.2.1: + resolution: {integrity: sha512-jPatnhd33viNplKjqXKRkGU345p263OIWzDL2wH3LGIGp5Kojo+uXizHmOADRvhGFFTnJqX3jBAKP6vvmSDKcA==} + dev: false + + /component-emitter@1.3.0: + resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==} + dev: false + + /component-inherit@0.0.3: + resolution: {integrity: sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA==} + dev: false + + /compressible@2.0.18: + resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==} + engines: {node: '>= 0.6'} + dependencies: + mime-db: 1.52.0 + + /compression@1.7.4: + resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==} + engines: {node: '>= 0.8.0'} + dependencies: + accepts: 1.3.8 + bytes: 3.0.0 + compressible: 2.0.18 + debug: 2.6.9 + on-headers: 1.0.2 + safe-buffer: 5.1.2 + vary: 1.1.2 + transitivePeerDependencies: + - supports-color + + /concat-map@0.0.1: + resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + + /connect-history-api-fallback@2.0.0: + resolution: {integrity: sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==} + engines: {node: '>=0.8'} + + /console-control-strings@1.1.0: + resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==} + dev: true + + /constant-case@3.0.4: + resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==} + dependencies: + no-case: 3.0.4 + tslib: 2.6.2 + upper-case: 2.0.2 + dev: false + + /constants-browserify@1.0.0: + resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==} + dev: true + + /content-disposition@0.5.4: + resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==} + engines: {node: '>= 0.6'} + dependencies: + safe-buffer: 5.2.1 + + /content-type@1.0.5: + resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} + engines: {node: '>= 0.6'} + + /contro-max@0.1.1: + resolution: {integrity: sha512-H+bzJWxiuxu98Tz8iGs1occMkRlr9fOzfOKeflVU8bD5teAEiJu8zjVnNSbweLQIR+Vhdynygv18N69t97rVAw==} + dependencies: + emittery: 0.10.2 + lodash-es: 4.17.21 + optionalDependencies: + react: 17.0.2 + use-typed-event-listener: 4.0.2(react@17.0.2) + transitivePeerDependencies: + - typescript + dev: true + + /convert-source-map@1.9.0: + resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} + + /cookie-signature@1.0.6: + resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==} + + /cookie@0.4.2: + resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==} + engines: {node: '>= 0.6'} + + /cookie@0.5.0: + resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==} + engines: {node: '>= 0.6'} + + /copy-to-clipboard@3.3.3: + resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==} + dependencies: + toggle-selection: 1.0.6 + dev: false + + /copy-webpack-plugin@11.0.0(webpack@5.88.2): + resolution: {integrity: sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==} + engines: {node: '>= 14.15.0'} + peerDependencies: + webpack: ^5.1.0 + dependencies: + fast-glob: 3.3.1 + glob-parent: 6.0.2 + globby: 13.2.2 + normalize-path: 3.0.0 + schema-utils: 4.2.0 + serialize-javascript: 6.0.1 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + dev: true + + /core-js-compat@3.32.1: + resolution: {integrity: sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==} + dependencies: + browserslist: 4.21.10 + + /core-js-pure@3.32.1: + resolution: {integrity: sha512-f52QZwkFVDPf7UEQZGHKx6NYxsxmVGJe5DIvbzOdRMJlmT6yv0KDjR8rmy3ngr/t5wU54c7Sp/qIJH0ppbhVpQ==} + requiresBuild: true + dev: false + + /core-js@3.32.1: + resolution: {integrity: sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==} + requiresBuild: true + dev: false + + /core-util-is@1.0.2: + resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==} + + /core-util-is@1.0.3: + resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} + + /cors@2.8.5: + resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==} + engines: {node: '>= 0.10'} + dependencies: + object-assign: 4.1.1 + vary: 1.1.2 + + /corser@2.0.1: + resolution: {integrity: sha512-utCYNzRSQIZNPIcGZdQc92UVJYAhtGAteCFg0yRaFm8f0P+CPtyGyHXJcGXnffjCybUCEx3FQ2G7U3/o9eIkVQ==} + engines: {node: '>= 0.4.0'} + dev: true + + /cosmiconfig@7.1.0: + resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==} + engines: {node: '>=10'} + dependencies: + '@types/parse-json': 4.0.0 + import-fresh: 3.3.0 + parse-json: 5.2.0 + path-type: 4.0.0 + yaml: 1.10.2 + dev: false + + /create-ecdh@4.0.4: + resolution: {integrity: sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==} + dependencies: + bn.js: 4.12.0 + elliptic: 6.5.4 + dev: true + + /create-hash@1.2.0: + resolution: {integrity: sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==} + dependencies: + cipher-base: 1.0.4 + inherits: 2.0.4 + md5.js: 1.3.5 + ripemd160: 2.0.2 + sha.js: 2.4.11 + dev: true + + /create-hmac@1.1.7: + resolution: {integrity: sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==} + dependencies: + cipher-base: 1.0.4 + create-hash: 1.2.0 + inherits: 2.0.4 + ripemd160: 2.0.2 + safe-buffer: 5.2.1 + sha.js: 2.4.11 + dev: true + + /cross-fetch@3.1.5: + resolution: {integrity: sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==} + dependencies: + node-fetch: 2.6.7 + transitivePeerDependencies: + - encoding + dev: true + + /cross-spawn@6.0.5: + resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==} + engines: {node: '>=4.8'} + dependencies: + nice-try: 1.0.5 + path-key: 2.0.1 + semver: 5.7.2 + shebang-command: 1.2.0 + which: 1.3.1 + dev: true + + /cross-spawn@7.0.3: + resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} + engines: {node: '>= 8'} + dependencies: + path-key: 3.1.1 + shebang-command: 2.0.0 + which: 2.0.2 + + /crypto-browserify@3.12.0: + resolution: {integrity: sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==} + dependencies: + browserify-cipher: 1.0.1 + browserify-sign: 4.2.1 + create-ecdh: 4.0.4 + create-hash: 1.2.0 + create-hmac: 1.1.7 + diffie-hellman: 5.0.3 + inherits: 2.0.4 + pbkdf2: 3.1.2 + public-encrypt: 4.0.3 + randombytes: 2.1.0 + randomfill: 1.0.4 + dev: true + + /crypto-random-string@2.0.0: + resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} + engines: {node: '>=8'} + + /css-in-js-utils@3.1.0: + resolution: {integrity: sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A==} + dependencies: + hyphenate-style-name: 1.0.4 + dev: false + + /css-loader@6.8.1(webpack@5.88.2): + resolution: {integrity: sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==} + engines: {node: '>= 12.13.0'} + peerDependencies: + webpack: ^5.0.0 + dependencies: + icss-utils: 5.1.0(postcss@8.4.28) + postcss: 8.4.28 + postcss-modules-extract-imports: 3.0.0(postcss@8.4.28) + postcss-modules-local-by-default: 4.0.3(postcss@8.4.28) + postcss-modules-scope: 3.0.0(postcss@8.4.28) + postcss-modules-values: 4.0.0(postcss@8.4.28) + postcss-value-parser: 4.2.0 + semver: 7.5.4 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + dev: true + + /css-select@4.3.0: + resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==} + dependencies: + boolbase: 1.0.0 + css-what: 6.1.0 + domhandler: 4.3.1 + domutils: 2.8.0 + nth-check: 2.1.1 + dev: true + + /css-tree@1.1.3: + resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==} + engines: {node: '>=8.0.0'} + dependencies: + mdn-data: 2.0.14 + source-map: 0.6.1 + dev: false + + /css-what@6.1.0: + resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==} + engines: {node: '>= 6'} + dev: true + + /cssesc@3.0.0: + resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==} + engines: {node: '>=4'} + hasBin: true + dev: true + + /cssom@0.3.8: + resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==} + dev: true + + /cssom@0.4.4: + resolution: {integrity: sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==} + dev: true + + /cssstyle@2.3.0: + resolution: {integrity: sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==} + engines: {node: '>=8'} + dependencies: + cssom: 0.3.8 + dev: true + + /csstype@3.1.2: + resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==} + + /cwd@0.10.0: + resolution: {integrity: sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==} + engines: {node: '>=0.8'} + dependencies: + find-pkg: 0.1.2 + fs-exists-sync: 0.1.0 + dev: true + + /cypress-esbuild-preprocessor@1.0.2: + resolution: {integrity: sha512-JsFnm6fBQt/OEzstknJ1KLMTuUERUaG0ZB9fk0KdNUlZqxaVEoQ9/pFvKmqRfzUe2y00cWD++ptccQA4tNAAlQ==} + dev: true + + /cypress-plugin-snapshots@1.4.4(cypress@9.5.4): + resolution: {integrity: sha512-rijq3RTEZNtxQA4KCUwjXinmE1Ww+z6cQW0B14iodFM/HlX5LN16XT/2QS3X1nUXRKt0QdTrAC5MQfMUrjBkSQ==} + engines: {node: '>=8.2.1'} + peerDependencies: + cypress: ^4.5.0 + dependencies: + cypress: 9.5.4 + diff2html: 2.12.2 + fs-extra: 7.0.1 + image-size: 0.7.5 + jimp: 0.10.3 + js-base64: 2.6.4 + lodash: 4.17.21 + pixelmatch: 4.0.2 + pngjs: 3.4.0 + prettier: 1.19.1 + rimraf: 2.7.1 + sanitize-filename: 1.6.3 + socket.io: 2.5.0 + socket.io-client: 2.5.0 + source-map-support: 0.5.21 + unidiff: 1.0.2 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: false + + /cypress@9.5.4: + resolution: {integrity: sha512-6AyJAD8phe7IMvOL4oBsI9puRNOWxZjl8z1lgixJMcgJ85JJmyKeP6uqNA0dI1z14lmJ7Qklf2MOgP/xdAqJ/Q==} + engines: {node: '>=12.0.0'} + hasBin: true + requiresBuild: true + dependencies: + '@cypress/request': 2.88.12 + '@cypress/xvfb': 1.2.4(supports-color@8.1.1) + '@types/node': 14.18.56 + '@types/sinonjs__fake-timers': 8.1.1 + '@types/sizzle': 2.3.3 + arch: 2.2.0 + blob-util: 2.0.2 + bluebird: 3.7.2 + buffer: 5.7.1 + cachedir: 2.4.0 + chalk: 4.1.2 + check-more-types: 2.24.0 + cli-cursor: 3.1.0 + cli-table3: 0.6.3 + commander: 5.1.0 + common-tags: 1.8.2 + dayjs: 1.11.9 + debug: 4.3.4(supports-color@8.1.1) + enquirer: 2.4.1 + eventemitter2: 6.4.9 + execa: 4.1.0 + executable: 4.1.1 + extract-zip: 2.0.1(supports-color@8.1.1) + figures: 3.2.0 + fs-extra: 9.1.0 + getos: 3.2.1 + is-ci: 3.0.1 + is-installed-globally: 0.4.0 + lazy-ass: 1.6.0 + listr2: 3.14.0(enquirer@2.4.1) + lodash: 4.17.21 + log-symbols: 4.1.0 + minimist: 1.2.8 + ospath: 1.2.2 + pretty-bytes: 5.6.0 + proxy-from-env: 1.0.0 + request-progress: 3.0.0 + semver: 7.5.4 + supports-color: 8.1.1 + tmp: 0.2.1 + untildify: 4.0.0 + yauzl: 2.10.0 + + /dashdash@1.14.1: + resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==} + engines: {node: '>=0.10'} + dependencies: + assert-plus: 1.0.0 + + /data-urls@2.0.0: + resolution: {integrity: sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==} + engines: {node: '>=10'} + dependencies: + abab: 2.0.6 + whatwg-mimetype: 2.3.0 + whatwg-url: 8.7.0 + dev: true + + /dayjs@1.11.9: + resolution: {integrity: sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==} + + /debounce@1.2.1: + resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==} + dev: false + + /debug@2.6.9: + resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.0.0 + + /debug@3.1.0: + resolution: {integrity: sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.0.0 + dev: false + + /debug@3.2.7(supports-color@8.1.1): + resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.3 + supports-color: 8.1.1 + + /debug@4.1.1: + resolution: {integrity: sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==} + deprecated: Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797) + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.3 + dev: false + + /debug@4.3.4(supports-color@8.1.1): + resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.2 + supports-color: 8.1.1 + + /decimal.js@10.4.3: + resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==} + dev: true + + /decompress-response@4.2.1: + resolution: {integrity: sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==} + engines: {node: '>=8'} + dependencies: + mimic-response: 2.1.0 + dev: true + + /dedent@0.7.0: + resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==} + dev: true + + /deep-is@0.1.4: + resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} + dev: true + + /deepmerge@4.3.1: + resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} + engines: {node: '>=0.10.0'} + + /default-gateway@6.0.3: + resolution: {integrity: sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==} + engines: {node: '>= 10'} + dependencies: + execa: 5.1.1 + + /define-lazy-prop@2.0.0: + resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} + engines: {node: '>=8'} + + /define-properties@1.2.0: + resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==} + engines: {node: '>= 0.4'} + dependencies: + has-property-descriptors: 1.0.0 + object-keys: 1.1.1 + + /del@4.1.1: + resolution: {integrity: sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==} + engines: {node: '>=6'} + dependencies: + '@types/glob': 7.2.0 + globby: 6.1.0 + is-path-cwd: 2.2.0 + is-path-in-cwd: 2.1.0 + p-map: 2.1.0 + pify: 4.0.1 + rimraf: 2.7.1 + dev: true + + /delayed-stream@1.0.0: + resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} + engines: {node: '>=0.4.0'} + + /delegates@1.0.0: + resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} + dev: true + + /depd@1.1.2: + resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==} + engines: {node: '>= 0.6'} + + /depd@2.0.0: + resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} + engines: {node: '>= 0.8'} + + /dequal@1.0.0: + resolution: {integrity: sha512-/Nd1EQbQbI9UbSHrMiKZjFLrXSnU328iQdZKPQf78XQI6C+gutkFUeoHpG5J08Ioa6HeRbRNFpSIclh1xyG0mw==} + engines: {node: '>=6'} + dev: true + + /des.js@1.1.0: + resolution: {integrity: sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==} + dependencies: + inherits: 2.0.4 + minimalistic-assert: 1.0.1 + dev: true + + /destroy@1.2.0: + resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} + engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} + + /detect-libc@2.0.2: + resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==} + engines: {node: '>=8'} + dev: true + + /detect-newline@3.1.0: + resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==} + engines: {node: '>=8'} + dev: true + + /detect-node@2.1.0: + resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==} + + /devtools-protocol@0.0.1019158: + resolution: {integrity: sha512-wvq+KscQ7/6spEV7czhnZc9RM/woz1AY+/Vpd8/h2HFMwJSdTliu7f/yr1A6vDdJfKICZsShqsYpEQbdhg8AFQ==} + dev: true + + /diamond-square@1.2.0: + resolution: {integrity: sha512-8WKLWV8Bey1UWaDHDocry7JDzpTRBOx/iOktkCoCjmKYcpVFOihIoeeg9CG+n2WIIenRxtyne/DxzsR25bQwpQ==} + dependencies: + minecraft-data: 3.45.0 + prismarine-chunk: 1.35.0(minecraft-data@3.45.0) + random-seed: 0.3.0 + vec3: 0.1.8 + dev: false + + /diff-sequences@27.5.1: + resolution: {integrity: sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dev: true + + /diff2html@2.12.2: + resolution: {integrity: sha512-G/Zn1KyG/OeC+67N/P26WHsQpjrjUiRyWGvg29ypy3MxSsBmF0bzsU/Irq70i2UAg+f/MzmLx4v/Nkt01TOU3g==} + engines: {node: '>=4'} + dependencies: + diff: 4.0.2 + hogan.js: 3.0.2 + merge: 1.2.1 + whatwg-fetch: 3.6.18 + dev: false + + /diff@2.2.3: + resolution: {integrity: sha512-9wfm3RLzMp/PyTFWuw9liEzdlxsdGixCW0ZTU1XDmtlAkvpVXTPGF8KnfSs0hm3BPbg19OrUPPsRkHXoREpP1g==} + engines: {node: '>=0.3.1'} + dev: false + + /diff@4.0.2: + resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} + engines: {node: '>=0.3.1'} + dev: false + + /diffie-hellman@5.0.3: + resolution: {integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==} + dependencies: + bn.js: 4.12.0 + miller-rabin: 4.0.1 + randombytes: 2.1.0 + dev: true + + /dir-glob@3.0.1: + resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} + engines: {node: '>=8'} + dependencies: + path-type: 4.0.0 + dev: true + + /discontinuous-range@1.0.0: + resolution: {integrity: sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==} + + /dns-equal@1.0.0: + resolution: {integrity: sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==} + + /dns-packet@5.6.1: + resolution: {integrity: sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==} + engines: {node: '>=6'} + dependencies: + '@leichtgewicht/ip-codec': 2.0.4 + + /doctrine@2.1.0: + resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==} + engines: {node: '>=0.10.0'} + dependencies: + esutils: 2.0.3 + dev: true + + /doctrine@3.0.0: + resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==} + engines: {node: '>=6.0.0'} + dependencies: + esutils: 2.0.3 + dev: true + + /dom-converter@0.2.0: + resolution: {integrity: sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==} + dependencies: + utila: 0.4.0 + dev: true + + /dom-serializer@1.4.1: + resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==} + dependencies: + domelementtype: 2.3.0 + domhandler: 4.3.1 + entities: 2.2.0 + dev: true + + /dom-walk@0.1.2: + resolution: {integrity: sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==} + dev: false + + /domelementtype@2.3.0: + resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==} + dev: true + + /domexception@2.0.1: + resolution: {integrity: sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==} + engines: {node: '>=8'} + dependencies: + webidl-conversions: 5.0.0 + dev: true + + /domhandler@4.3.1: + resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==} + engines: {node: '>= 4'} + dependencies: + domelementtype: 2.3.0 + dev: true + + /domutils@2.8.0: + resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==} + dependencies: + dom-serializer: 1.4.1 + domelementtype: 2.3.0 + domhandler: 4.3.1 + dev: true + + /dot-case@3.0.4: + resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==} + dependencies: + no-case: 3.0.4 + tslib: 2.6.2 + + /eastasianwidth@0.2.0: + resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} + dev: true + + /ecc-jsbn@0.1.2: + resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==} + dependencies: + jsbn: 0.1.1 + safer-buffer: 2.1.2 + + /ecdsa-sig-formatter@1.0.11: + resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==} + dependencies: + safe-buffer: 5.2.1 + + /ee-first@1.1.1: + resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} + + /ejs@3.1.9: + resolution: {integrity: sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==} + engines: {node: '>=0.10.0'} + hasBin: true + dependencies: + jake: 10.8.7 + + /electron-to-chromium@1.4.504: + resolution: {integrity: sha512-cSMwIAd8yUh54VwitVRVvHK66QqHWE39C3DRj8SWiXitEpVSY3wNPD9y1pxQtLIi4w3UdzF9klLsmuPshz09DQ==} + + /elliptic@6.5.4: + resolution: {integrity: sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==} + dependencies: + bn.js: 4.12.0 + brorand: 1.1.0 + hash.js: 1.1.7 + hmac-drbg: 1.0.1 + inherits: 2.0.4 + minimalistic-assert: 1.0.1 + minimalistic-crypto-utils: 1.0.1 + dev: true + + /emit-then@2.0.0: + resolution: {integrity: sha512-y5JHnrygHnCndtqVHHDhCr0ZzzWHK5RBTczWRlGSIR5UnGHBXuxpoaE0UB5E82qym8ma2dI799wDSSJN2e4VSg==} + engines: {node: '>=5'} + dev: false + + /emittery@0.10.2: + resolution: {integrity: sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==} + engines: {node: '>=12'} + dev: true + + /emittery@0.8.1: + resolution: {integrity: sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==} + engines: {node: '>=10'} + dev: true + + /emoji-regex@8.0.0: + resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} + + /emoji-regex@9.2.2: + resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} + dev: true + + /emojis-list@3.0.0: + resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} + engines: {node: '>= 4'} + + /encodeurl@1.0.2: + resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} + engines: {node: '>= 0.8'} + + /end-of-stream@1.4.4: + resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} + dependencies: + once: 1.4.0 + + /endian-toggle@0.0.0: + resolution: {integrity: sha512-ShfqhXeHRE4TmggSlHXG8CMGIcsOsqDw/GcoPcosToE59Rm9e4aXaMhEQf2kPBsBRrKem1bbOAv5gOKnkliMFQ==} + + /engine.io-client@3.5.3: + resolution: {integrity: sha512-qsgyc/CEhJ6cgMUwxRRtOndGVhIu5hpL5tR4umSpmX/MvkFoIxUTM7oFMDQumHNzlNLwSVy6qhstFPoWTf7dOw==} + dependencies: + component-emitter: 1.3.0 + component-inherit: 0.0.3 + debug: 3.1.0 + engine.io-parser: 2.2.1 + has-cors: 1.1.0 + indexof: 0.0.1 + parseqs: 0.0.6 + parseuri: 0.0.6 + ws: 7.4.6 + xmlhttprequest-ssl: 1.6.3 + yeast: 0.1.2 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: false + + /engine.io-client@6.5.2: + resolution: {integrity: sha512-CQZqbrpEYnrpGqC07a9dJDz4gePZUgTPMU3NKJPSeQOyw27Tst4Pl3FemKoFGAlHzgZmKjoRmiJvbWfhCXUlIg==} + dependencies: + '@socket.io/component-emitter': 3.1.0 + debug: 4.3.4(supports-color@8.1.1) + engine.io-parser: 5.2.1 + ws: 8.11.0 + xmlhttprequest-ssl: 2.0.0 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + + /engine.io-parser@2.2.1: + resolution: {integrity: sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==} + dependencies: + after: 0.8.2 + arraybuffer.slice: 0.0.7 + base64-arraybuffer: 0.1.4 + blob: 0.0.5 + has-binary2: 1.0.3 + dev: false + + /engine.io-parser@5.2.1: + resolution: {integrity: sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==} + engines: {node: '>=10.0.0'} + + /engine.io@3.6.1: + resolution: {integrity: sha512-dfs8EVg/i7QjFsXxn7cCRQ+Wai1G1TlEvHhdYEi80fxn5R1vZ2K661O6v/rezj1FP234SZ14r9CmJke99iYDGg==} + engines: {node: '>=8.0.0'} + dependencies: + accepts: 1.3.8 + base64id: 2.0.0 + cookie: 0.4.2 + debug: 4.1.1 + engine.io-parser: 2.2.1 + ws: 7.4.6 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: false + + /engine.io@6.5.2: + resolution: {integrity: sha512-IXsMcGpw/xRfjra46sVZVHiSWo/nJ/3g1337q9KNXtS6YRzbW5yIzTCb9DjhrBe7r3GZQR0I4+nq+4ODk5g/cA==} + engines: {node: '>=10.2.0'} + dependencies: + '@types/cookie': 0.4.1 + '@types/cors': 2.8.13 + '@types/node': 20.5.7 + accepts: 1.3.8 + base64id: 2.0.0 + cookie: 0.4.2 + cors: 2.8.5 + debug: 4.3.4(supports-color@8.1.1) + engine.io-parser: 5.2.1 + ws: 8.11.0 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + + /enhanced-resolve@5.15.0: + resolution: {integrity: sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==} + engines: {node: '>=10.13.0'} + dependencies: + graceful-fs: 4.2.11 + tapable: 2.2.1 + + /enquirer@2.4.1: + resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} + engines: {node: '>=8.6'} + dependencies: + ansi-colors: 4.1.3 + strip-ansi: 6.0.1 + + /entities@2.2.0: + resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==} + dev: true + + /envinfo@7.10.0: + resolution: {integrity: sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==} + engines: {node: '>=4'} + hasBin: true + + /error-ex@1.3.2: + resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} + dependencies: + is-arrayish: 0.2.1 + + /error-stack-parser@2.1.4: + resolution: {integrity: sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==} + dependencies: + stackframe: 1.3.4 + dev: false + + /eruda@3.0.1: + resolution: {integrity: sha512-6q1Xdwga4JTr1mKSW4mzuWSSbmXgqpm/8Wa1QGFGfCWRjC0bCQjbS4u06M1te1moucIS3hBLlbSTPWYH2W0qbQ==} + dev: false + + /es-abstract@1.22.1: + resolution: {integrity: sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==} + engines: {node: '>= 0.4'} + 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.6 + get-intrinsic: 1.2.1 + get-symbol-description: 1.0.0 + globalthis: 1.0.3 + gopd: 1.0.1 + has: 1.0.3 + has-property-descriptors: 1.0.0 + has-proto: 1.0.1 + has-symbols: 1.0.3 + internal-slot: 1.0.5 + is-array-buffer: 3.0.2 + is-callable: 1.2.7 + is-negative-zero: 2.0.2 + is-regex: 1.1.4 + is-shared-array-buffer: 1.0.2 + is-string: 1.0.7 + is-typed-array: 1.1.12 + is-weakref: 1.0.2 + object-inspect: 1.12.3 + object-keys: 1.1.1 + object.assign: 4.1.4 + 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.11 + + /es-iterator-helpers@1.0.14: + resolution: {integrity: sha512-JgtVnwiuoRuzLvqelrvN3Xu7H9bu2ap/kQ2CrM62iidP8SKuD99rWU3CJy++s7IVL2qb/AjXPGR/E7i9ngd/Cw==} + dependencies: + asynciterator.prototype: 1.0.0 + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + es-set-tostringtag: 2.0.1 + function-bind: 1.1.1 + get-intrinsic: 1.2.1 + globalthis: 1.0.3 + has-property-descriptors: 1.0.0 + has-proto: 1.0.1 + has-symbols: 1.0.3 + internal-slot: 1.0.5 + iterator.prototype: 1.1.0 + safe-array-concat: 1.0.0 + dev: true + + /es-module-lexer@1.3.0: + resolution: {integrity: sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==} + + /es-set-tostringtag@2.0.1: + resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==} + engines: {node: '>= 0.4'} + dependencies: + get-intrinsic: 1.2.1 + has: 1.0.3 + has-tostringtag: 1.0.0 + + /es-shim-unscopables@1.0.0: + resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==} + dependencies: + has: 1.0.3 + dev: true + + /es-to-primitive@1.2.1: + resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==} + engines: {node: '>= 0.4'} + dependencies: + is-callable: 1.2.7 + is-date-object: 1.0.5 + is-symbol: 1.0.4 + + /es6-object-assign@1.1.0: + resolution: {integrity: sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==} + dev: true + + /es6-promise@4.2.8: + resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==} + dev: true + + /es6-promisify@5.0.0: + resolution: {integrity: sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==} + dependencies: + es6-promise: 4.2.8 + dev: true + + /esbuild-loader@4.0.0(webpack@5.88.2): + resolution: {integrity: sha512-J7TJWyHV2YHmflZaXLZ0Vf4wYmixDyGTw26bt4Ok+XOqSyYA4VWAVt2zJGqIfCA7TwZRDKN8hvus4akN2yAbmA==} + peerDependencies: + webpack: ^4.40.0 || ^5.0.0 + dependencies: + esbuild: 0.19.2 + get-tsconfig: 4.7.0 + loader-utils: 2.0.4 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack-sources: 1.4.3 + dev: false + + /esbuild-plugin-polyfill-node@0.3.0(esbuild@0.19.2): + resolution: {integrity: sha512-SHG6CKUfWfYyYXGpW143NEZtcVVn8S/WHcEOxk62LuDXnY4Zpmc+WmxJKN6GMTgTClXJXhEM5KQlxKY6YjbucQ==} + peerDependencies: + esbuild: '*' + dependencies: + '@jspm/core': 2.0.1 + esbuild: 0.19.2 + import-meta-resolve: 3.0.0 + dev: false + + /esbuild@0.18.20: + resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.18.20 + '@esbuild/android-arm64': 0.18.20 + '@esbuild/android-x64': 0.18.20 + '@esbuild/darwin-arm64': 0.18.20 + '@esbuild/darwin-x64': 0.18.20 + '@esbuild/freebsd-arm64': 0.18.20 + '@esbuild/freebsd-x64': 0.18.20 + '@esbuild/linux-arm': 0.18.20 + '@esbuild/linux-arm64': 0.18.20 + '@esbuild/linux-ia32': 0.18.20 + '@esbuild/linux-loong64': 0.18.20 + '@esbuild/linux-mips64el': 0.18.20 + '@esbuild/linux-ppc64': 0.18.20 + '@esbuild/linux-riscv64': 0.18.20 + '@esbuild/linux-s390x': 0.18.20 + '@esbuild/linux-x64': 0.18.20 + '@esbuild/netbsd-x64': 0.18.20 + '@esbuild/openbsd-x64': 0.18.20 + '@esbuild/sunos-x64': 0.18.20 + '@esbuild/win32-arm64': 0.18.20 + '@esbuild/win32-ia32': 0.18.20 + '@esbuild/win32-x64': 0.18.20 + dev: true + + /esbuild@0.19.2: + resolution: {integrity: sha512-G6hPax8UbFakEj3hWO0Vs52LQ8k3lnBhxZWomUJDxfz3rZTLqF5k/FCzuNdLx2RbpBiQQF9H9onlDDH1lZsnjg==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.19.2 + '@esbuild/android-arm64': 0.19.2 + '@esbuild/android-x64': 0.19.2 + '@esbuild/darwin-arm64': 0.19.2 + '@esbuild/darwin-x64': 0.19.2 + '@esbuild/freebsd-arm64': 0.19.2 + '@esbuild/freebsd-x64': 0.19.2 + '@esbuild/linux-arm': 0.19.2 + '@esbuild/linux-arm64': 0.19.2 + '@esbuild/linux-ia32': 0.19.2 + '@esbuild/linux-loong64': 0.19.2 + '@esbuild/linux-mips64el': 0.19.2 + '@esbuild/linux-ppc64': 0.19.2 + '@esbuild/linux-riscv64': 0.19.2 + '@esbuild/linux-s390x': 0.19.2 + '@esbuild/linux-x64': 0.19.2 + '@esbuild/netbsd-x64': 0.19.2 + '@esbuild/openbsd-x64': 0.19.2 + '@esbuild/sunos-x64': 0.19.2 + '@esbuild/win32-arm64': 0.19.2 + '@esbuild/win32-ia32': 0.19.2 + '@esbuild/win32-x64': 0.19.2 + + /escalade@3.1.1: + resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} + engines: {node: '>=6'} + + /escape-html@1.0.3: + resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==} + + /escape-string-regexp@1.0.5: + resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} + engines: {node: '>=0.8.0'} + + /escape-string-regexp@2.0.0: + resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==} + engines: {node: '>=8'} + dev: true + + /escape-string-regexp@4.0.0: + resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} + engines: {node: '>=10'} + + /escodegen@2.1.0: + resolution: {integrity: sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==} + engines: {node: '>=6.0'} + hasBin: true + dependencies: + esprima: 4.0.1 + estraverse: 5.3.0 + esutils: 2.0.3 + optionalDependencies: + source-map: 0.6.1 + dev: true + + /eslint-config-standard-jsx@11.0.0(eslint-plugin-react@7.33.2)(eslint@8.48.0): + resolution: {integrity: sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==} + peerDependencies: + eslint: ^8.8.0 + eslint-plugin-react: ^7.28.0 + dependencies: + eslint: 8.48.0 + eslint-plugin-react: 7.33.2(eslint@8.48.0) + dev: true + + /eslint-config-standard@17.0.0(eslint-plugin-import@2.28.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.48.0): + resolution: {integrity: sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==} + peerDependencies: + eslint: ^8.0.1 + eslint-plugin-import: ^2.25.2 + eslint-plugin-n: ^15.0.0 + eslint-plugin-promise: ^6.0.0 + dependencies: + eslint: 8.48.0 + eslint-plugin-import: 2.28.1(eslint@8.48.0) + eslint-plugin-n: 15.7.0(eslint@8.48.0) + eslint-plugin-promise: 6.1.1(eslint@8.48.0) + dev: true + + /eslint-import-resolver-node@0.3.9: + resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} + dependencies: + debug: 3.2.7(supports-color@8.1.1) + is-core-module: 2.13.0 + resolve: 1.22.4 + transitivePeerDependencies: + - supports-color + dev: true + + /eslint-module-utils@2.8.0(eslint-import-resolver-node@0.3.9)(eslint@8.48.0): + resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} + engines: {node: '>=4'} + peerDependencies: + '@typescript-eslint/parser': '*' + eslint: '*' + eslint-import-resolver-node: '*' + eslint-import-resolver-typescript: '*' + eslint-import-resolver-webpack: '*' + peerDependenciesMeta: + '@typescript-eslint/parser': + optional: true + eslint: + optional: true + eslint-import-resolver-node: + optional: true + eslint-import-resolver-typescript: + optional: true + eslint-import-resolver-webpack: + optional: true + dependencies: + debug: 3.2.7(supports-color@8.1.1) + eslint: 8.48.0 + eslint-import-resolver-node: 0.3.9 + transitivePeerDependencies: + - supports-color + dev: true + + /eslint-plugin-es@4.1.0(eslint@8.48.0): + resolution: {integrity: sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==} + engines: {node: '>=8.10.0'} + peerDependencies: + eslint: '>=4.19.1' + dependencies: + eslint: 8.48.0 + eslint-utils: 2.1.0 + regexpp: 3.2.0 + dev: true + + /eslint-plugin-import@2.28.1(eslint@8.48.0): + resolution: {integrity: sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==} + engines: {node: '>=4'} + peerDependencies: + '@typescript-eslint/parser': '*' + eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 + peerDependenciesMeta: + '@typescript-eslint/parser': + optional: true + dependencies: + array-includes: 3.1.6 + array.prototype.findlastindex: 1.2.2 + array.prototype.flat: 1.3.1 + array.prototype.flatmap: 1.3.1 + debug: 3.2.7(supports-color@8.1.1) + doctrine: 2.1.0 + eslint: 8.48.0 + eslint-import-resolver-node: 0.3.9 + eslint-module-utils: 2.8.0(eslint-import-resolver-node@0.3.9)(eslint@8.48.0) + has: 1.0.3 + is-core-module: 2.13.0 + is-glob: 4.0.3 + minimatch: 3.1.2 + object.fromentries: 2.0.6 + object.groupby: 1.0.1 + object.values: 1.1.7 + semver: 6.3.1 + tsconfig-paths: 3.14.2 + transitivePeerDependencies: + - eslint-import-resolver-typescript + - eslint-import-resolver-webpack + - supports-color + dev: true + + /eslint-plugin-n@15.7.0(eslint@8.48.0): + resolution: {integrity: sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==} + engines: {node: '>=12.22.0'} + peerDependencies: + eslint: '>=7.0.0' + dependencies: + builtins: 5.0.1 + eslint: 8.48.0 + eslint-plugin-es: 4.1.0(eslint@8.48.0) + eslint-utils: 3.0.0(eslint@8.48.0) + ignore: 5.2.4 + is-core-module: 2.13.0 + minimatch: 3.1.2 + resolve: 1.22.4 + semver: 7.5.4 + dev: true + + /eslint-plugin-promise@6.1.1(eslint@8.48.0): + resolution: {integrity: sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + dependencies: + eslint: 8.48.0 + dev: true + + /eslint-plugin-react@7.33.2(eslint@8.48.0): + resolution: {integrity: sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==} + engines: {node: '>=4'} + peerDependencies: + eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 + dependencies: + array-includes: 3.1.6 + array.prototype.flatmap: 1.3.1 + array.prototype.tosorted: 1.1.1 + doctrine: 2.1.0 + es-iterator-helpers: 1.0.14 + eslint: 8.48.0 + estraverse: 5.3.0 + jsx-ast-utils: 3.3.5 + minimatch: 3.1.2 + object.entries: 1.1.7 + object.fromentries: 2.0.6 + object.hasown: 1.1.3 + object.values: 1.1.7 + prop-types: 15.8.1 + resolve: 2.0.0-next.4 + semver: 6.3.1 + string.prototype.matchall: 4.0.8 + dev: true + + /eslint-scope@5.1.1: + resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} + engines: {node: '>=8.0.0'} + dependencies: + esrecurse: 4.3.0 + estraverse: 4.3.0 + + /eslint-scope@7.2.2: + resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + esrecurse: 4.3.0 + estraverse: 5.3.0 + dev: true + + /eslint-utils@2.1.0: + resolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==} + engines: {node: '>=6'} + dependencies: + eslint-visitor-keys: 1.3.0 + dev: true + + /eslint-utils@3.0.0(eslint@8.48.0): + resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} + engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} + peerDependencies: + eslint: '>=5' + dependencies: + eslint: 8.48.0 + eslint-visitor-keys: 2.1.0 + dev: true + + /eslint-visitor-keys@1.3.0: + resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==} + engines: {node: '>=4'} + dev: true + + /eslint-visitor-keys@2.1.0: + resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==} + engines: {node: '>=10'} + dev: true + + /eslint-visitor-keys@3.4.3: + resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true + + /eslint@8.48.0: + resolution: {integrity: sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + hasBin: true + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.48.0) + '@eslint-community/regexpp': 4.8.0 + '@eslint/eslintrc': 2.1.2 + '@eslint/js': 8.48.0 + '@humanwhocodes/config-array': 0.11.10 + '@humanwhocodes/module-importer': 1.0.1 + '@nodelib/fs.walk': 1.2.8 + ajv: 6.12.6 + chalk: 4.1.2 + cross-spawn: 7.0.3 + debug: 4.3.4(supports-color@8.1.1) + doctrine: 3.0.0 + escape-string-regexp: 4.0.0 + eslint-scope: 7.2.2 + eslint-visitor-keys: 3.4.3 + espree: 9.6.1 + esquery: 1.5.0 + esutils: 2.0.3 + fast-deep-equal: 3.1.3 + file-entry-cache: 6.0.1 + find-up: 5.0.0 + glob-parent: 6.0.2 + globals: 13.21.0 + graphemer: 1.4.0 + ignore: 5.2.4 + imurmurhash: 0.1.4 + is-glob: 4.0.3 + is-path-inside: 3.0.3 + js-yaml: 4.1.0 + json-stable-stringify-without-jsonify: 1.0.1 + levn: 0.4.1 + lodash.merge: 4.6.2 + minimatch: 3.1.2 + natural-compare: 1.4.0 + optionator: 0.9.3 + strip-ansi: 6.0.1 + text-table: 0.2.0 + transitivePeerDependencies: + - supports-color + dev: true + + /espree@9.6.1: + resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + acorn: 8.10.0 + acorn-jsx: 5.3.2(acorn@8.10.0) + eslint-visitor-keys: 3.4.3 + dev: true + + /esprima@4.0.1: + resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==} + engines: {node: '>=4'} + hasBin: true + dev: true + + /esquery@1.5.0: + resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==} + engines: {node: '>=0.10'} + dependencies: + estraverse: 5.3.0 + dev: true + + /esrecurse@4.3.0: + resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==} + engines: {node: '>=4.0'} + dependencies: + estraverse: 5.3.0 + + /estraverse@4.3.0: + resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==} + engines: {node: '>=4.0'} + + /estraverse@5.3.0: + resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} + engines: {node: '>=4.0'} + + /estree-walker@1.0.1: + resolution: {integrity: sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==} + + /esutils@2.0.3: + resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} + engines: {node: '>=0.10.0'} + + /etag@1.8.1: + resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==} + engines: {node: '>= 0.6'} + + /event-promise@0.0.1: + resolution: {integrity: sha512-ouEmk2N0BalybPM0zmj3RHE93AX4p9hAIHZfbbqxolLChqCB6pcLDbYH6zZ8TaiFWImPHfs5kFnNpA0u9RdEaQ==} + dependencies: + promise: 5.0.0 + dev: false + + /event-target-shim@5.0.1: + resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==} + engines: {node: '>=6'} + + /eventemitter2@6.4.9: + resolution: {integrity: sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==} + + /eventemitter3@4.0.7: + resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==} + + /events@3.3.0: + resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==} + engines: {node: '>=0.8.x'} + + /evp_bytestokey@1.0.3: + resolution: {integrity: sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==} + dependencies: + md5.js: 1.3.5 + safe-buffer: 5.2.1 + dev: true + + /execa@4.1.0: + resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==} + engines: {node: '>=10'} + dependencies: + cross-spawn: 7.0.3 + get-stream: 5.2.0 + human-signals: 1.1.1 + is-stream: 2.0.1 + merge-stream: 2.0.0 + npm-run-path: 4.0.1 + onetime: 5.1.2 + signal-exit: 3.0.7 + strip-final-newline: 2.0.0 + + /execa@5.1.1: + resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} + engines: {node: '>=10'} + dependencies: + cross-spawn: 7.0.3 + get-stream: 6.0.1 + human-signals: 2.1.0 + is-stream: 2.0.1 + merge-stream: 2.0.0 + npm-run-path: 4.0.1 + onetime: 5.1.2 + signal-exit: 3.0.7 + strip-final-newline: 2.0.0 + + /executable@4.1.1: + resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==} + engines: {node: '>=4'} + dependencies: + pify: 2.3.0 + + /exif-parser@0.1.12: + resolution: {integrity: sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw==} + dev: false + + /exit-hook@2.2.1: + resolution: {integrity: sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw==} + engines: {node: '>=6'} + dev: false + + /exit@0.1.2: + resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==} + engines: {node: '>= 0.8.0'} + dev: true + + /expand-tilde@1.2.2: + resolution: {integrity: sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==} + engines: {node: '>=0.10.0'} + dependencies: + os-homedir: 1.0.2 + dev: true + + /expect-puppeteer@6.1.1: + resolution: {integrity: sha512-cnQF96qdoEcOD63j5NQMc0RtW9WRMW/WHKXEKsuDQ2tszhVH3qC7zkXXS4D0LTt9qCB3DEExioqylsQXvqPrUw==} + dev: true + + /expect@27.5.1: + resolution: {integrity: sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.5.1 + jest-get-type: 27.5.1 + jest-matcher-utils: 27.5.1 + jest-message-util: 27.5.1 + dev: true + + /express-ws@4.0.0(express@4.18.2): + resolution: {integrity: sha512-KEyUw8AwRET2iFjFsI1EJQrJ/fHeGiJtgpYgEWG3yDv4l/To/m3a2GaYfeGyB3lsWdvbesjF5XCMx+SVBgAAYw==} + engines: {node: '>=4.5.0'} + peerDependencies: + express: ^4.0.0 || ^5.0.0-alpha.1 + dependencies: + express: 4.18.2 + ws: 5.2.3 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + dev: false + + /express@4.18.2: + resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==} + engines: {node: '>= 0.10.0'} + dependencies: + accepts: 1.3.8 + array-flatten: 1.1.1 + body-parser: 1.20.1 + content-disposition: 0.5.4 + content-type: 1.0.5 + cookie: 0.5.0 + cookie-signature: 1.0.6 + debug: 2.6.9 + depd: 2.0.0 + encodeurl: 1.0.2 + escape-html: 1.0.3 + etag: 1.8.1 + finalhandler: 1.2.0 + fresh: 0.5.2 + http-errors: 2.0.0 + merge-descriptors: 1.0.1 + methods: 1.1.2 + on-finished: 2.4.1 + parseurl: 1.3.3 + path-to-regexp: 0.1.7 + proxy-addr: 2.0.7 + qs: 6.11.0 + range-parser: 1.2.1 + safe-buffer: 5.2.1 + send: 0.18.0 + serve-static: 1.15.0 + setprototypeof: 1.2.0 + statuses: 2.0.1 + type-is: 1.6.18 + utils-merge: 1.0.1 + vary: 1.1.2 + transitivePeerDependencies: + - supports-color + + /extend@3.0.2: + resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} + + /extract-zip@2.0.1(supports-color@8.1.1): + resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==} + engines: {node: '>= 10.17.0'} + hasBin: true + dependencies: + debug: 4.3.4(supports-color@8.1.1) + get-stream: 5.2.0 + yauzl: 2.10.0 + optionalDependencies: + '@types/yauzl': 2.10.0 + transitivePeerDependencies: + - supports-color + + /extsprintf@1.3.0: + resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==} + engines: {'0': node >=0.6.0} + + /fast-deep-equal@3.1.3: + resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} + + /fast-glob@3.3.1: + resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==} + engines: {node: '>=8.6.0'} + dependencies: + '@nodelib/fs.stat': 2.0.5 + '@nodelib/fs.walk': 1.2.8 + glob-parent: 5.1.2 + merge2: 1.4.1 + micromatch: 4.0.5 + dev: true + + /fast-json-stable-stringify@2.1.0: + resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} + + /fast-levenshtein@2.0.6: + resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} + dev: true + + /fast-loops@1.1.3: + resolution: {integrity: sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g==} + dev: false + + /fast-shallow-equal@1.0.0: + resolution: {integrity: sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw==} + dev: false + + /fastest-levenshtein@1.0.16: + resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==} + engines: {node: '>= 4.9.1'} + + /fastest-stable-stringify@2.0.2: + resolution: {integrity: sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q==} + dev: false + + /fastq@1.15.0: + resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} + dependencies: + reusify: 1.0.4 + dev: true + + /faye-websocket@0.11.4: + resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==} + engines: {node: '>=0.8.0'} + dependencies: + websocket-driver: 0.7.4 + + /fb-watchman@2.0.2: + resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==} + dependencies: + bser: 2.1.1 + dev: true + + /fd-slicer@1.1.0: + resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==} + dependencies: + pend: 1.2.0 + + /figures@3.2.0: + resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==} + engines: {node: '>=8'} + dependencies: + escape-string-regexp: 1.0.5 + + /file-entry-cache@6.0.1: + resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} + engines: {node: ^10.12.0 || >=12.0.0} + dependencies: + flat-cache: 3.1.0 + dev: true + + /file-type@9.0.0: + resolution: {integrity: sha512-Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw==} + engines: {node: '>=6'} + dev: false + + /filelist@1.0.4: + resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==} + dependencies: + minimatch: 5.1.6 + + /filesize@10.0.12: + resolution: {integrity: sha512-6RS9gDchbn+qWmtV2uSjo5vmKizgfCQeb5jKmqx8HyzA3MoLqqyQxN+QcjkGBJt7FjJ9qFce67Auyya5rRRbpw==} + engines: {node: '>= 10.4.0'} + dev: true + + /fill-range@7.0.1: + resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} + engines: {node: '>=8'} + dependencies: + to-regex-range: 5.0.1 + + /finalhandler@1.2.0: + resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==} + engines: {node: '>= 0.8'} + dependencies: + debug: 2.6.9 + encodeurl: 1.0.2 + escape-html: 1.0.3 + on-finished: 2.4.1 + parseurl: 1.3.3 + statuses: 2.0.1 + unpipe: 1.0.0 + transitivePeerDependencies: + - supports-color + + /find-file-up@0.1.3: + resolution: {integrity: sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==} + engines: {node: '>=0.10.0'} + dependencies: + fs-exists-sync: 0.1.0 + resolve-dir: 0.1.1 + dev: true + + /find-pkg@0.1.2: + resolution: {integrity: sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==} + engines: {node: '>=0.10.0'} + dependencies: + find-file-up: 0.1.3 + dev: true + + /find-process@1.4.7: + resolution: {integrity: sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==} + hasBin: true + dependencies: + chalk: 4.1.2 + commander: 5.1.0 + debug: 4.3.4(supports-color@8.1.1) + transitivePeerDependencies: + - supports-color + dev: true + + /find-root@1.1.0: + resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==} + dev: false + + /find-up@3.0.0: + resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==} + engines: {node: '>=6'} + dependencies: + locate-path: 3.0.0 + dev: true + + /find-up@4.1.0: + resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} + engines: {node: '>=8'} + dependencies: + locate-path: 5.0.0 + path-exists: 4.0.0 + + /find-up@5.0.0: + resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} + engines: {node: '>=10'} + dependencies: + locate-path: 6.0.0 + path-exists: 4.0.0 + + /flat-cache@3.1.0: + resolution: {integrity: sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==} + engines: {node: '>=12.0.0'} + dependencies: + flatted: 3.2.7 + keyv: 4.5.3 + rimraf: 3.0.2 + dev: true + + /flatmap@0.0.3: + resolution: {integrity: sha512-OuR+o7kHVe+x9RtIujPay7Uw3bvDZBZFSBXClEphZuSDLmZTqMdclasf4vFSsogC8baDz0eaC2NdO/2dlXHBKQ==} + + /flatted@3.2.7: + resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} + dev: true + + /follow-redirects@1.15.2(debug@4.3.4): + resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} + engines: {node: '>=4.0'} + peerDependencies: + debug: '*' + peerDependenciesMeta: + debug: + optional: true + dependencies: + debug: 4.3.4(supports-color@8.1.1) + + /for-each@0.3.3: + resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} + dependencies: + is-callable: 1.2.7 + + /for-in@0.1.8: + resolution: {integrity: sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==} + engines: {node: '>=0.10.0'} + dev: true + + /for-in@1.0.2: + resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==} + engines: {node: '>=0.10.0'} + dev: true + + /for-own@0.1.5: + resolution: {integrity: sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==} + engines: {node: '>=0.10.0'} + dependencies: + for-in: 1.0.2 + dev: true + + /foreground-child@3.1.1: + resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} + engines: {node: '>=14'} + dependencies: + cross-spawn: 7.0.3 + signal-exit: 4.1.0 + dev: true + + /forever-agent@0.6.1: + resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==} + + /form-data@2.3.3: + resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==} + engines: {node: '>= 0.12'} + dependencies: + asynckit: 0.4.0 + combined-stream: 1.0.8 + mime-types: 2.1.35 + + /form-data@3.0.1: + resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==} + engines: {node: '>= 6'} + dependencies: + asynckit: 0.4.0 + combined-stream: 1.0.8 + mime-types: 2.1.35 + dev: true + + /forwarded@0.2.0: + resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==} + engines: {node: '>= 0.6'} + + /fresh@0.5.2: + resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==} + engines: {node: '>= 0.6'} + + /fs-constants@1.0.0: + resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} + dev: true + + /fs-exists-sync@0.1.0: + resolution: {integrity: sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==} + engines: {node: '>=0.10.0'} + dev: true + + /fs-extra@11.1.1: + resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==} + engines: {node: '>=14.14'} + dependencies: + graceful-fs: 4.2.11 + jsonfile: 6.1.0 + universalify: 2.0.0 + + /fs-extra@7.0.1: + resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==} + engines: {node: '>=6 <7 || >=8'} + dependencies: + graceful-fs: 4.2.11 + jsonfile: 4.0.0 + universalify: 0.1.2 + dev: false + + /fs-extra@9.1.0: + resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==} + engines: {node: '>=10'} + dependencies: + at-least-node: 1.0.0 + graceful-fs: 4.2.11 + jsonfile: 6.1.0 + universalify: 2.0.0 + + /fs-minipass@2.1.0: + resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} + engines: {node: '>= 8'} + dependencies: + minipass: 3.3.6 + dev: true + + /fs-monkey@1.0.4: + resolution: {integrity: sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==} + + /fs.realpath@1.0.0: + resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} + + /fsevents@2.3.3: + resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} + engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} + os: [darwin] + requiresBuild: true + optional: true + + /function-bind@1.1.1: + resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} + + /function.prototype.name@1.1.6: + resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + functions-have-names: 1.2.3 + + /functions-have-names@1.2.3: + resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} + + /gauge@3.0.2: + resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==} + engines: {node: '>=10'} + dependencies: + aproba: 2.0.0 + color-support: 1.1.3 + console-control-strings: 1.1.0 + has-unicode: 2.0.1 + object-assign: 4.1.1 + signal-exit: 3.0.7 + string-width: 4.2.3 + strip-ansi: 6.0.1 + wide-align: 1.1.5 + dev: true + + /gensync@1.0.0-beta.2: + resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} + engines: {node: '>=6.9.0'} + + /get-caller-file@2.0.5: + resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} + engines: {node: 6.* || 8.* || >= 10.*} + + /get-intrinsic@1.2.1: + resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==} + dependencies: + function-bind: 1.1.1 + has: 1.0.3 + has-proto: 1.0.1 + has-symbols: 1.0.3 + + /get-own-enumerable-property-symbols@3.0.2: + resolution: {integrity: sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==} + + /get-package-type@0.1.0: + resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==} + engines: {node: '>=8.0.0'} + dev: true + + /get-stdin@8.0.0: + resolution: {integrity: sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==} + engines: {node: '>=10'} + dev: true + + /get-stream@5.2.0: + resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==} + engines: {node: '>=8'} + dependencies: + pump: 3.0.0 + + /get-stream@6.0.1: + resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} + engines: {node: '>=10'} + + /get-symbol-description@1.0.0: + resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + get-intrinsic: 1.2.1 + + /get-tsconfig@4.7.0: + resolution: {integrity: sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw==} + dependencies: + resolve-pkg-maps: 1.0.0 + dev: false + + /getos@3.2.1: + resolution: {integrity: sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==} + dependencies: + async: 3.2.4 + + /getpass@0.1.7: + resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==} + dependencies: + assert-plus: 1.0.0 + + /glob-parent@5.1.2: + resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} + engines: {node: '>= 6'} + dependencies: + is-glob: 4.0.3 + + /glob-parent@6.0.2: + resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} + engines: {node: '>=10.13.0'} + dependencies: + is-glob: 4.0.3 + dev: true + + /glob-to-regexp@0.4.1: + resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} + + /glob@10.3.3: + resolution: {integrity: sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==} + engines: {node: '>=16 || 14 >=14.17'} + hasBin: true + dependencies: + foreground-child: 3.1.1 + jackspeak: 2.3.0 + minimatch: 9.0.3 + minipass: 7.0.3 + path-scurry: 1.10.1 + dev: true + + /glob@7.2.3: + resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.4 + minimatch: 3.1.2 + once: 1.4.0 + path-is-absolute: 1.0.1 + + /global-dirs@3.0.1: + resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==} + engines: {node: '>=10'} + dependencies: + ini: 2.0.0 + + /global-modules@0.2.3: + resolution: {integrity: sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==} + engines: {node: '>=0.10.0'} + dependencies: + global-prefix: 0.1.5 + is-windows: 0.2.0 + dev: true + + /global-prefix@0.1.5: + resolution: {integrity: sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==} + engines: {node: '>=0.10.0'} + dependencies: + homedir-polyfill: 1.0.3 + ini: 1.3.8 + is-windows: 0.2.0 + which: 1.3.1 + dev: true + + /global@4.4.0: + resolution: {integrity: sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==} + dependencies: + min-document: 2.19.0 + process: 0.11.10 + dev: false + + /globals@11.12.0: + resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} + engines: {node: '>=4'} + + /globals@13.21.0: + resolution: {integrity: sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==} + engines: {node: '>=8'} + dependencies: + type-fest: 0.20.2 + dev: true + + /globalthis@1.0.3: + resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==} + engines: {node: '>= 0.4'} + dependencies: + define-properties: 1.2.0 + + /globby@13.2.2: + resolution: {integrity: sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + dir-glob: 3.0.1 + fast-glob: 3.3.1 + ignore: 5.2.4 + merge2: 1.4.1 + slash: 4.0.0 + dev: true + + /globby@6.1.0: + resolution: {integrity: sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==} + engines: {node: '>=0.10.0'} + dependencies: + array-union: 1.0.2 + glob: 7.2.3 + object-assign: 4.1.1 + pify: 2.3.0 + pinkie-promise: 2.0.1 + dev: true + + /gopd@1.0.1: + resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} + dependencies: + get-intrinsic: 1.2.1 + + /graceful-fs@4.2.11: + resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} + + /graphemer@1.4.0: + resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} + dev: true + + /handle-thing@2.0.1: + resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==} + + /har-schema@2.0.0: + resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==} + engines: {node: '>=4'} + dev: true + + /har-validator@5.1.5: + resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==} + engines: {node: '>=6'} + deprecated: this library is no longer supported + dependencies: + ajv: 6.12.6 + har-schema: 2.0.0 + dev: true + + /has-bigints@1.0.2: + resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==} + + /has-binary2@1.0.3: + resolution: {integrity: sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==} + dependencies: + isarray: 2.0.1 + dev: false + + /has-cors@1.1.0: + resolution: {integrity: sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==} + dev: false + + /has-flag@3.0.0: + resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} + engines: {node: '>=4'} + + /has-flag@4.0.0: + resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} + engines: {node: '>=8'} + + /has-property-descriptors@1.0.0: + resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==} + dependencies: + get-intrinsic: 1.2.1 + + /has-proto@1.0.1: + resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==} + engines: {node: '>= 0.4'} + + /has-symbols@1.0.3: + resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} + engines: {node: '>= 0.4'} + + /has-tostringtag@1.0.0: + resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==} + engines: {node: '>= 0.4'} + dependencies: + has-symbols: 1.0.3 + + /has-unicode@2.0.1: + resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==} + dev: true + + /has@1.0.3: + resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} + engines: {node: '>= 0.4.0'} + dependencies: + function-bind: 1.1.1 + + /hash-base@3.1.0: + resolution: {integrity: sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==} + engines: {node: '>=4'} + dependencies: + inherits: 2.0.4 + readable-stream: 3.6.2 + safe-buffer: 5.2.1 + dev: true + + /hash.js@1.1.7: + resolution: {integrity: sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==} + dependencies: + inherits: 2.0.4 + minimalistic-assert: 1.0.1 + dev: true + + /he@1.2.0: + resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} + hasBin: true + dev: true + + /header-case@2.0.4: + resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==} + dependencies: + capital-case: 1.0.4 + tslib: 2.6.2 + dev: false + + /hmac-drbg@1.0.1: + resolution: {integrity: sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==} + dependencies: + hash.js: 1.1.7 + minimalistic-assert: 1.0.1 + minimalistic-crypto-utils: 1.0.1 + dev: true + + /hogan.js@3.0.2: + resolution: {integrity: sha512-RqGs4wavGYJWE07t35JQccByczmNUXQT0E12ZYV1VKYu5UiAU9lsos/yBAcf840+zrUQQxgVduCR5/B8nNtibg==} + hasBin: true + dependencies: + mkdirp: 0.3.0 + nopt: 1.0.10 + dev: false + + /homedir-polyfill@1.0.3: + resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==} + engines: {node: '>=0.10.0'} + dependencies: + parse-passwd: 1.0.0 + dev: true + + /hosted-git-info@2.8.9: + resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==} + dev: true + + /hpack.js@2.1.6: + resolution: {integrity: sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==} + dependencies: + inherits: 2.0.4 + obuf: 1.1.2 + readable-stream: 2.3.8 + wbuf: 1.7.3 + + /html-encoding-sniffer@2.0.1: + resolution: {integrity: sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==} + engines: {node: '>=10'} + dependencies: + whatwg-encoding: 1.0.5 + dev: true + + /html-encoding-sniffer@3.0.0: + resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==} + engines: {node: '>=12'} + dependencies: + whatwg-encoding: 2.0.0 + dev: true + + /html-entities@2.4.0: + resolution: {integrity: sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==} + + /html-escaper@2.0.2: + resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} + dev: true + + /html-minifier-terser@6.1.0: + resolution: {integrity: sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==} + engines: {node: '>=12'} + hasBin: true + dependencies: + camel-case: 4.1.2 + clean-css: 5.3.2 + commander: 8.3.0 + he: 1.2.0 + param-case: 3.0.4 + relateurl: 0.2.7 + terser: 5.19.2 + dev: true + + /html-webpack-plugin@5.5.3(webpack@5.88.2): + resolution: {integrity: sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==} + engines: {node: '>=10.13.0'} + peerDependencies: + webpack: ^5.20.0 + dependencies: + '@types/html-minifier-terser': 6.1.0 + html-minifier-terser: 6.1.0 + lodash: 4.17.21 + pretty-error: 4.0.0 + tapable: 2.2.1 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + dev: true + + /htmlparser2@6.1.0: + resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==} + dependencies: + domelementtype: 2.3.0 + domhandler: 4.3.1 + domutils: 2.8.0 + entities: 2.2.0 + dev: true + + /http-browserify@1.7.0: + resolution: {integrity: sha512-Irf/LJXmE3cBzU1eaR4+NEX6bmVLqt1wkmDiA7kBwH7zmb0D8kBAXsDmQ88hhj/qv9iEZKlyGx/hrMcFi8sOHw==} + dependencies: + Base64: 0.2.1 + inherits: 2.0.4 + dev: true + + /http-deceiver@1.2.7: + resolution: {integrity: sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==} + + /http-errors@1.6.3: + resolution: {integrity: sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==} + engines: {node: '>= 0.6'} + dependencies: + depd: 1.1.2 + inherits: 2.0.3 + setprototypeof: 1.1.0 + statuses: 1.5.0 + + /http-errors@2.0.0: + resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==} + engines: {node: '>= 0.8'} + dependencies: + depd: 2.0.0 + inherits: 2.0.4 + setprototypeof: 1.2.0 + statuses: 2.0.1 + toidentifier: 1.0.1 + + /http-parser-js@0.5.8: + resolution: {integrity: sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==} + + /http-proxy-agent@4.0.1: + resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==} + engines: {node: '>= 6'} + dependencies: + '@tootallnate/once': 1.1.2 + agent-base: 6.0.2 + debug: 4.3.4(supports-color@8.1.1) + transitivePeerDependencies: + - supports-color + dev: true + + /http-proxy-middleware@2.0.6(@types/express@4.17.17): + resolution: {integrity: sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==} + engines: {node: '>=12.0.0'} + peerDependencies: + '@types/express': ^4.17.13 + peerDependenciesMeta: + '@types/express': + optional: true + dependencies: + '@types/express': 4.17.17 + '@types/http-proxy': 1.17.11 + http-proxy: 1.18.1 + is-glob: 4.0.3 + is-plain-obj: 3.0.0 + micromatch: 4.0.5 + transitivePeerDependencies: + - debug + + /http-proxy@1.18.1: + resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==} + engines: {node: '>=8.0.0'} + dependencies: + eventemitter3: 4.0.7 + follow-redirects: 1.15.2(debug@4.3.4) + requires-port: 1.0.0 + transitivePeerDependencies: + - debug + + /http-server@14.1.1: + resolution: {integrity: sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A==} + engines: {node: '>=12'} + hasBin: true + dependencies: + basic-auth: 2.0.1 + chalk: 4.1.2 + corser: 2.0.1 + he: 1.2.0 + html-encoding-sniffer: 3.0.0 + http-proxy: 1.18.1 + mime: 1.6.0 + minimist: 1.2.8 + opener: 1.5.2 + portfinder: 1.0.32 + secure-compare: 3.0.1 + union: 0.5.0 + url-join: 4.0.1 + transitivePeerDependencies: + - debug + - supports-color + dev: true + + /http-signature@1.2.0: + resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==} + engines: {node: '>=0.8', npm: '>=1.3.7'} + dependencies: + assert-plus: 1.0.0 + jsprim: 1.4.2 + sshpk: 1.17.0 + dev: true + + /http-signature@1.3.6: + resolution: {integrity: sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==} + engines: {node: '>=0.10'} + dependencies: + assert-plus: 1.0.0 + jsprim: 2.0.2 + sshpk: 1.17.0 + + /https-browserify@1.0.0: + resolution: {integrity: sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==} + dev: true + + /https-proxy-agent@5.0.1: + resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} + engines: {node: '>= 6'} + dependencies: + agent-base: 6.0.2 + debug: 4.3.4(supports-color@8.1.1) + transitivePeerDependencies: + - supports-color + dev: true + + /human-signals@1.1.1: + resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==} + engines: {node: '>=8.12.0'} + + /human-signals@2.1.0: + resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} + engines: {node: '>=10.17.0'} + + /hyphenate-style-name@1.0.4: + resolution: {integrity: sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==} + dev: false + + /iconify-icon@1.0.8: + resolution: {integrity: sha512-jvbUKHXf8EnGGArmhlP2IG8VqQLFFyTvTqb9LVL2TKTh7/eCCD1o2HHE9thpbJJb6B8hzhcFb6rOKhvo7reNKA==} + dependencies: + '@iconify/types': 2.0.0 + dev: false + + /iconv-lite@0.4.24: + resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} + engines: {node: '>=0.10.0'} + dependencies: + safer-buffer: 2.1.2 + + /iconv-lite@0.6.3: + resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} + engines: {node: '>=0.10.0'} + dependencies: + safer-buffer: 2.1.2 + dev: true + + /icss-utils@5.1.0(postcss@8.4.28): + resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==} + engines: {node: ^10 || ^12 || >= 14} + peerDependencies: + postcss: ^8.1.0 + dependencies: + postcss: 8.4.28 + dev: true + + /idb@7.1.1: + resolution: {integrity: sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==} + + /ieee754@1.2.1: + resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} + + /ignore@5.2.4: + resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} + engines: {node: '>= 4'} + dev: true + + /image-size@0.7.5: + resolution: {integrity: sha512-Hiyv+mXHfFEP7LzUL/llg9RwFxxY+o9N3JVLIeG5E7iFIFAalxvRU9UZthBdYDEVnzHMgjnKJPPpay5BWf1g9g==} + engines: {node: '>=6.9.0'} + hasBin: true + dev: false + + /immediate@3.0.6: + resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==} + dev: false + + /import-fresh@3.3.0: + resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} + engines: {node: '>=6'} + dependencies: + parent-module: 1.0.1 + resolve-from: 4.0.0 + + /import-local@3.1.0: + resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==} + engines: {node: '>=8'} + hasBin: true + dependencies: + pkg-dir: 4.2.0 + resolve-cwd: 3.0.0 + + /import-meta-resolve@3.0.0: + resolution: {integrity: sha512-4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg==} + dev: false + + /imurmurhash@0.1.4: + resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} + engines: {node: '>=0.8.19'} + dev: true + + /indent-string@4.0.0: + resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} + engines: {node: '>=8'} + + /indexof@0.0.1: + resolution: {integrity: sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==} + dev: false + + /inflight@1.0.6: + resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} + dependencies: + once: 1.4.0 + wrappy: 1.0.2 + + /inherits@2.0.3: + resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==} + + /inherits@2.0.4: + resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} + + /ini@1.3.8: + resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} + dev: true + + /ini@2.0.0: + resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==} + engines: {node: '>=10'} + + /inline-style-prefixer@6.0.4: + resolution: {integrity: sha512-FwXmZC2zbeeS7NzGjJ6pAiqRhXR0ugUShSNb6GApMl6da0/XGc4MOJsoWAywia52EEWbXNSy0pzkwz/+Y+swSg==} + dependencies: + css-in-js-utils: 3.1.0 + fast-loops: 1.1.3 + dev: false + + /internal-slot@1.0.5: + resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==} + engines: {node: '>= 0.4'} + dependencies: + get-intrinsic: 1.2.1 + has: 1.0.3 + side-channel: 1.0.4 + + /interpret@3.1.1: + resolution: {integrity: sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==} + engines: {node: '>=10.13.0'} + + /ipaddr.js@1.9.1: + resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} + engines: {node: '>= 0.10'} + + /ipaddr.js@2.1.0: + resolution: {integrity: sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==} + engines: {node: '>= 10'} + + /is-arguments@1.1.1: + resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + has-tostringtag: 1.0.0 + dev: true + + /is-array-buffer@3.0.2: + resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==} + dependencies: + call-bind: 1.0.2 + get-intrinsic: 1.2.1 + is-typed-array: 1.1.12 + + /is-arrayish@0.2.1: + resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} + + /is-async-function@2.0.0: + resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==} + engines: {node: '>= 0.4'} + dependencies: + has-tostringtag: 1.0.0 + dev: true + + /is-bigint@1.0.4: + resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==} + dependencies: + has-bigints: 1.0.2 + + /is-binary-path@2.1.0: + resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} + engines: {node: '>=8'} + dependencies: + binary-extensions: 2.2.0 + + /is-boolean-object@1.1.2: + resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + has-tostringtag: 1.0.0 + + /is-buffer@1.1.6: + resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==} + dev: true + + /is-callable@1.2.7: + resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} + engines: {node: '>= 0.4'} + + /is-ci@3.0.1: + resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==} + hasBin: true + dependencies: + ci-info: 3.8.0 + + /is-core-module@2.13.0: + resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==} + dependencies: + has: 1.0.3 + + /is-date-object@1.0.5: + resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} + engines: {node: '>= 0.4'} + dependencies: + has-tostringtag: 1.0.0 + + /is-docker@2.2.1: + resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==} + engines: {node: '>=8'} + hasBin: true + + /is-extendable@0.1.1: + resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==} + engines: {node: '>=0.10.0'} + dev: true + + /is-extglob@2.1.1: + resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} + engines: {node: '>=0.10.0'} + + /is-finalizationregistry@1.0.2: + resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==} + dependencies: + call-bind: 1.0.2 + dev: true + + /is-fullwidth-code-point@3.0.0: + resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} + engines: {node: '>=8'} + + /is-function@1.0.2: + resolution: {integrity: sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==} + dev: false + + /is-generator-fn@2.1.0: + resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==} + engines: {node: '>=6'} + dev: true + + /is-generator-function@1.0.10: + resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==} + engines: {node: '>= 0.4'} + dependencies: + has-tostringtag: 1.0.0 + dev: true + + /is-glob@4.0.3: + resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} + engines: {node: '>=0.10.0'} + dependencies: + is-extglob: 2.1.1 + + /is-installed-globally@0.4.0: + resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==} + engines: {node: '>=10'} + dependencies: + global-dirs: 3.0.1 + is-path-inside: 3.0.3 + + /is-map@2.0.2: + resolution: {integrity: sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==} + dev: true + + /is-module@1.0.0: + resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==} + + /is-nan@1.3.2: + resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + dev: true + + /is-negative-zero@2.0.2: + resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==} + engines: {node: '>= 0.4'} + + /is-number-object@1.0.7: + resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==} + engines: {node: '>= 0.4'} + dependencies: + has-tostringtag: 1.0.0 + + /is-number@7.0.0: + resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} + engines: {node: '>=0.12.0'} + + /is-obj@1.0.1: + resolution: {integrity: sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==} + engines: {node: '>=0.10.0'} + + /is-path-cwd@2.2.0: + resolution: {integrity: sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==} + engines: {node: '>=6'} + dev: true + + /is-path-in-cwd@2.1.0: + resolution: {integrity: sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==} + engines: {node: '>=6'} + dependencies: + is-path-inside: 2.1.0 + dev: true + + /is-path-inside@2.1.0: + resolution: {integrity: sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==} + engines: {node: '>=6'} + dependencies: + path-is-inside: 1.0.2 + dev: true + + /is-path-inside@3.0.3: + resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} + engines: {node: '>=8'} + + /is-plain-obj@3.0.0: + resolution: {integrity: sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==} + engines: {node: '>=10'} + + /is-plain-object@2.0.4: + resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==} + engines: {node: '>=0.10.0'} + dependencies: + isobject: 3.0.1 + + /is-potential-custom-element-name@1.0.1: + resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} + dev: true + + /is-regex@1.1.4: + resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + has-tostringtag: 1.0.0 + + /is-regexp@1.0.0: + resolution: {integrity: sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==} + engines: {node: '>=0.10.0'} + + /is-set@2.0.2: + resolution: {integrity: sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==} + dev: true + + /is-shared-array-buffer@1.0.2: + resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==} + dependencies: + call-bind: 1.0.2 + + /is-stream@2.0.1: + resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} + engines: {node: '>=8'} + + /is-string@1.0.7: + resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} + engines: {node: '>= 0.4'} + dependencies: + has-tostringtag: 1.0.0 + + /is-symbol@1.0.4: + resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==} + engines: {node: '>= 0.4'} + dependencies: + has-symbols: 1.0.3 + + /is-typed-array@1.1.12: + resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==} + engines: {node: '>= 0.4'} + dependencies: + which-typed-array: 1.1.11 + + /is-typedarray@1.0.0: + resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==} + + /is-unicode-supported@0.1.0: + resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==} + engines: {node: '>=10'} + + /is-weakmap@2.0.1: + resolution: {integrity: sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==} + dev: true + + /is-weakref@1.0.2: + resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} + dependencies: + call-bind: 1.0.2 + + /is-weakset@2.0.2: + resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==} + dependencies: + call-bind: 1.0.2 + get-intrinsic: 1.2.1 + dev: true + + /is-windows@0.2.0: + resolution: {integrity: sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==} + engines: {node: '>=0.10.0'} + dev: true + + /is-wsl@2.2.0: + resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==} + engines: {node: '>=8'} + dependencies: + is-docker: 2.2.1 + + /isarray@1.0.0: + resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} + + /isarray@2.0.1: + resolution: {integrity: sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ==} + dev: false + + /isarray@2.0.5: + resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==} + + /isexe@2.0.0: + resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} + + /isobject@3.0.1: + resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==} + engines: {node: '>=0.10.0'} + + /isstream@0.1.2: + resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==} + + /istanbul-lib-coverage@3.2.0: + resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==} + engines: {node: '>=8'} + dev: true + + /istanbul-lib-instrument@5.2.1: + resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==} + engines: {node: '>=8'} + dependencies: + '@babel/core': 7.22.11 + '@babel/parser': 7.22.13 + '@istanbuljs/schema': 0.1.3 + istanbul-lib-coverage: 3.2.0 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + dev: true + + /istanbul-lib-report@3.0.1: + resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==} + engines: {node: '>=10'} + dependencies: + istanbul-lib-coverage: 3.2.0 + make-dir: 4.0.0 + supports-color: 7.2.0 + dev: true + + /istanbul-lib-source-maps@4.0.1: + resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} + engines: {node: '>=10'} + dependencies: + debug: 4.3.4(supports-color@8.1.1) + istanbul-lib-coverage: 3.2.0 + source-map: 0.6.1 + transitivePeerDependencies: + - supports-color + dev: true + + /istanbul-reports@3.1.6: + resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==} + engines: {node: '>=8'} + dependencies: + html-escaper: 2.0.2 + istanbul-lib-report: 3.0.1 + dev: true + + /iterator.prototype@1.1.0: + resolution: {integrity: sha512-rjuhAk1AJ1fssphHD0IFV6TWL40CwRZ53FrztKx43yk2v6rguBYsY4Bj1VU4HmoMmKwZUlx7mfnhDf9cOp4YTw==} + dependencies: + define-properties: 1.2.0 + get-intrinsic: 1.2.1 + has-symbols: 1.0.3 + has-tostringtag: 1.0.0 + reflect.getprototypeof: 1.0.3 + dev: true + + /jackspeak@2.3.0: + resolution: {integrity: sha512-uKmsITSsF4rUWQHzqaRUuyAir3fZfW3f202Ee34lz/gZCi970CPZwyQXLGNgWJvvZbvFyzeyGq0+4fcG/mBKZg==} + engines: {node: '>=14'} + dependencies: + '@isaacs/cliui': 8.0.2 + optionalDependencies: + '@pkgjs/parseargs': 0.11.0 + dev: true + + /jake@10.8.7: + resolution: {integrity: sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==} + engines: {node: '>=10'} + hasBin: true + dependencies: + async: 3.2.4 + chalk: 4.1.2 + filelist: 1.0.4 + minimatch: 3.1.2 + + /jest-changed-files@27.5.1: + resolution: {integrity: sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.5.1 + execa: 5.1.1 + throat: 6.0.2 + dev: true + + /jest-circus@27.5.1: + resolution: {integrity: sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/environment': 27.5.1 + '@jest/test-result': 27.5.1 + '@jest/types': 27.5.1 + '@types/node': 20.5.7 + chalk: 4.1.2 + co: 4.6.0 + dedent: 0.7.0 + expect: 27.5.1 + is-generator-fn: 2.1.0 + jest-each: 27.5.1 + jest-matcher-utils: 27.5.1 + jest-message-util: 27.5.1 + jest-runtime: 27.5.1 + jest-snapshot: 27.5.1 + jest-util: 27.5.1 + pretty-format: 27.5.1 + slash: 3.0.0 + stack-utils: 2.0.6 + throat: 6.0.2 + transitivePeerDependencies: + - supports-color + dev: true + + /jest-cli@27.5.1(canvas@2.11.2): + resolution: {integrity: sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + hasBin: true + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/core': 27.5.1(canvas@2.11.2) + '@jest/test-result': 27.5.1 + '@jest/types': 27.5.1 + chalk: 4.1.2 + exit: 0.1.2 + graceful-fs: 4.2.11 + import-local: 3.1.0 + jest-config: 27.5.1(canvas@2.11.2) + jest-util: 27.5.1 + jest-validate: 27.5.1 + prompts: 2.4.2 + yargs: 16.2.0 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + dev: true + + /jest-config@27.5.1(canvas@2.11.2): + resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + peerDependencies: + ts-node: '>=9.0.0' + peerDependenciesMeta: + ts-node: + optional: true + dependencies: + '@babel/core': 7.22.11 + '@jest/test-sequencer': 27.5.1 + '@jest/types': 27.5.1 + babel-jest: 27.5.1(@babel/core@7.22.11) + chalk: 4.1.2 + ci-info: 3.8.0 + deepmerge: 4.3.1 + glob: 7.2.3 + graceful-fs: 4.2.11 + jest-circus: 27.5.1 + jest-environment-jsdom: 27.5.1(canvas@2.11.2) + jest-environment-node: 27.5.1 + jest-get-type: 27.5.1 + jest-jasmine2: 27.5.1 + jest-regex-util: 27.5.1 + jest-resolve: 27.5.1 + jest-runner: 27.5.1(canvas@2.11.2) + jest-util: 27.5.1 + jest-validate: 27.5.1 + micromatch: 4.0.5 + parse-json: 5.2.0 + pretty-format: 27.5.1 + slash: 3.0.0 + strip-json-comments: 3.1.1 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - utf-8-validate + dev: true + + /jest-dev-server@6.2.0: + resolution: {integrity: sha512-ZWh8CuvxwjhYfvw4tGeftziqIvw/26R6AG3OTgNTQeXul8aZz48RQjDpnlDwnWX53jxJJl9fcigqIdSU5lYZuw==} + dependencies: + chalk: 4.1.2 + cwd: 0.10.0 + find-process: 1.4.7 + prompts: 2.4.2 + spawnd: 6.2.0 + tree-kill: 1.2.2 + wait-on: 6.0.1 + transitivePeerDependencies: + - debug + - supports-color + dev: true + + /jest-diff@27.5.1: + resolution: {integrity: sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + chalk: 4.1.2 + diff-sequences: 27.5.1 + jest-get-type: 27.5.1 + pretty-format: 27.5.1 + dev: true + + /jest-docblock@27.5.1: + resolution: {integrity: sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + detect-newline: 3.1.0 + dev: true + + /jest-each@27.5.1: + resolution: {integrity: sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.5.1 + chalk: 4.1.2 + jest-get-type: 27.5.1 + jest-util: 27.5.1 + pretty-format: 27.5.1 + dev: true + + /jest-environment-jsdom@27.5.1(canvas@2.11.2): + resolution: {integrity: sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/environment': 27.5.1 + '@jest/fake-timers': 27.5.1 + '@jest/types': 27.5.1 + '@types/node': 20.5.7 + jest-mock: 27.5.1 + jest-util: 27.5.1 + jsdom: 16.7.0(canvas@2.11.2) + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - utf-8-validate + dev: true + + /jest-environment-node@27.5.1: + resolution: {integrity: sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/environment': 27.5.1 + '@jest/fake-timers': 27.5.1 + '@jest/types': 27.5.1 + '@types/node': 20.5.7 + jest-mock: 27.5.1 + jest-util: 27.5.1 + dev: true + + /jest-environment-puppeteer@6.2.0: + resolution: {integrity: sha512-a/oSu6dO9D+XoDDe3ZY/0Sk79Jl2FcJl7Q0D+3x22l1eWNOYe4ikXnPGhtmNZ3mJIpuAVIX6LytA8EraOk/aqQ==} + dependencies: + chalk: 4.1.2 + cwd: 0.10.0 + jest-dev-server: 6.2.0 + jest-environment-node: 27.5.1 + merge-deep: 3.0.3 + transitivePeerDependencies: + - debug + - supports-color + dev: true + + /jest-get-type@27.5.1: + resolution: {integrity: sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dev: true + + /jest-haste-map@27.5.1: + resolution: {integrity: sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.5.1 + '@types/graceful-fs': 4.1.6 + '@types/node': 20.5.7 + anymatch: 3.1.3 + fb-watchman: 2.0.2 + graceful-fs: 4.2.11 + jest-regex-util: 27.5.1 + jest-serializer: 27.5.1 + jest-util: 27.5.1 + jest-worker: 27.5.1 + micromatch: 4.0.5 + walker: 1.0.8 + optionalDependencies: + fsevents: 2.3.3 + dev: true + + /jest-jasmine2@27.5.1: + resolution: {integrity: sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/environment': 27.5.1 + '@jest/source-map': 27.5.1 + '@jest/test-result': 27.5.1 + '@jest/types': 27.5.1 + '@types/node': 20.5.7 + chalk: 4.1.2 + co: 4.6.0 + expect: 27.5.1 + is-generator-fn: 2.1.0 + jest-each: 27.5.1 + jest-matcher-utils: 27.5.1 + jest-message-util: 27.5.1 + jest-runtime: 27.5.1 + jest-snapshot: 27.5.1 + jest-util: 27.5.1 + pretty-format: 27.5.1 + throat: 6.0.2 + transitivePeerDependencies: + - supports-color + dev: true + + /jest-leak-detector@27.5.1: + resolution: {integrity: sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + jest-get-type: 27.5.1 + pretty-format: 27.5.1 + dev: true + + /jest-matcher-utils@27.5.1: + resolution: {integrity: sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + chalk: 4.1.2 + jest-diff: 27.5.1 + jest-get-type: 27.5.1 + pretty-format: 27.5.1 + dev: true + + /jest-message-util@27.5.1: + resolution: {integrity: sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@babel/code-frame': 7.22.13 + '@jest/types': 27.5.1 + '@types/stack-utils': 2.0.1 + chalk: 4.1.2 + graceful-fs: 4.2.11 + micromatch: 4.0.5 + pretty-format: 27.5.1 + slash: 3.0.0 + stack-utils: 2.0.6 + dev: true + + /jest-mock@27.5.1: + resolution: {integrity: sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.5.1 + '@types/node': 20.5.7 + dev: true + + /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1): + resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==} + engines: {node: '>=6'} + peerDependencies: + jest-resolve: '*' + peerDependenciesMeta: + jest-resolve: + optional: true + dependencies: + jest-resolve: 27.5.1 + dev: true + + /jest-puppeteer@6.0.0(puppeteer@16.0.0): + resolution: {integrity: sha512-dgZJdBxRafMRqHFRxnsqLDbuJcOcdgaJlg2PLoMxgPy9nQZTrtG9ezwQsRf1poSaLbZGMAL2JVS907MBCYPEJw==} + peerDependencies: + puppeteer: '>= 1.5.0' + dependencies: + expect-puppeteer: 6.1.1 + jest-environment-puppeteer: 6.2.0 + puppeteer: 16.0.0 + transitivePeerDependencies: + - debug + - supports-color + dev: true + + /jest-regex-util@27.5.1: + resolution: {integrity: sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dev: true + + /jest-resolve-dependencies@27.5.1: + resolution: {integrity: sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.5.1 + jest-regex-util: 27.5.1 + jest-snapshot: 27.5.1 + transitivePeerDependencies: + - supports-color + dev: true + + /jest-resolve@27.5.1: + resolution: {integrity: sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.5.1 + chalk: 4.1.2 + graceful-fs: 4.2.11 + jest-haste-map: 27.5.1 + jest-pnp-resolver: 1.2.3(jest-resolve@27.5.1) + jest-util: 27.5.1 + jest-validate: 27.5.1 + resolve: 1.22.4 + resolve.exports: 1.1.1 + slash: 3.0.0 + dev: true + + /jest-runner@27.5.1(canvas@2.11.2): + resolution: {integrity: sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/console': 27.5.1 + '@jest/environment': 27.5.1 + '@jest/test-result': 27.5.1 + '@jest/transform': 27.5.1 + '@jest/types': 27.5.1 + '@types/node': 20.5.7 + chalk: 4.1.2 + emittery: 0.8.1 + graceful-fs: 4.2.11 + jest-docblock: 27.5.1 + jest-environment-jsdom: 27.5.1(canvas@2.11.2) + jest-environment-node: 27.5.1 + jest-haste-map: 27.5.1 + jest-leak-detector: 27.5.1 + jest-message-util: 27.5.1 + jest-resolve: 27.5.1 + jest-runtime: 27.5.1 + jest-util: 27.5.1 + jest-worker: 27.5.1 + source-map-support: 0.5.21 + throat: 6.0.2 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - utf-8-validate + dev: true + + /jest-runtime@27.5.1: + resolution: {integrity: sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/environment': 27.5.1 + '@jest/fake-timers': 27.5.1 + '@jest/globals': 27.5.1 + '@jest/source-map': 27.5.1 + '@jest/test-result': 27.5.1 + '@jest/transform': 27.5.1 + '@jest/types': 27.5.1 + chalk: 4.1.2 + cjs-module-lexer: 1.2.3 + collect-v8-coverage: 1.0.2 + execa: 5.1.1 + glob: 7.2.3 + graceful-fs: 4.2.11 + jest-haste-map: 27.5.1 + jest-message-util: 27.5.1 + jest-mock: 27.5.1 + jest-regex-util: 27.5.1 + jest-resolve: 27.5.1 + jest-snapshot: 27.5.1 + jest-util: 27.5.1 + slash: 3.0.0 + strip-bom: 4.0.0 + transitivePeerDependencies: + - supports-color + dev: true + + /jest-serializer@27.5.1: + resolution: {integrity: sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@types/node': 20.5.7 + graceful-fs: 4.2.11 + dev: true + + /jest-snapshot@27.5.1: + resolution: {integrity: sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@babel/core': 7.22.11 + '@babel/generator': 7.22.10 + '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.22.11) + '@babel/traverse': 7.22.11 + '@babel/types': 7.22.11 + '@jest/transform': 27.5.1 + '@jest/types': 27.5.1 + '@types/babel__traverse': 7.20.1 + '@types/prettier': 2.7.3 + babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.11) + chalk: 4.1.2 + expect: 27.5.1 + graceful-fs: 4.2.11 + jest-diff: 27.5.1 + jest-get-type: 27.5.1 + jest-haste-map: 27.5.1 + jest-matcher-utils: 27.5.1 + jest-message-util: 27.5.1 + jest-util: 27.5.1 + natural-compare: 1.4.0 + pretty-format: 27.5.1 + semver: 7.5.4 + transitivePeerDependencies: + - supports-color + dev: true + + /jest-util@27.5.1: + resolution: {integrity: sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.5.1 + '@types/node': 20.5.7 + chalk: 4.1.2 + ci-info: 3.8.0 + graceful-fs: 4.2.11 + picomatch: 2.3.1 + dev: true + + /jest-validate@27.5.1: + resolution: {integrity: sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.5.1 + camelcase: 6.3.0 + chalk: 4.1.2 + jest-get-type: 27.5.1 + leven: 3.1.0 + pretty-format: 27.5.1 + dev: true + + /jest-watcher@27.5.1: + resolution: {integrity: sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/test-result': 27.5.1 + '@jest/types': 27.5.1 + '@types/node': 20.5.7 + ansi-escapes: 4.3.2 + chalk: 4.1.2 + jest-util: 27.5.1 + string-length: 4.0.2 + dev: true + + /jest-worker@26.6.2: + resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} + engines: {node: '>= 10.13.0'} + dependencies: + '@types/node': 20.5.7 + merge-stream: 2.0.0 + supports-color: 7.2.0 + + /jest-worker@27.5.1: + resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} + engines: {node: '>= 10.13.0'} + dependencies: + '@types/node': 20.5.7 + merge-stream: 2.0.0 + supports-color: 8.1.1 + + /jest@27.0.4(canvas@2.11.2): + resolution: {integrity: sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + hasBin: true + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/core': 27.5.1(canvas@2.11.2) + import-local: 3.1.0 + jest-cli: 27.5.1(canvas@2.11.2) + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + dev: true + + /jimp@0.10.3: + resolution: {integrity: sha512-meVWmDMtyUG5uYjFkmzu0zBgnCvvxwWNi27c4cg55vWNVC9ES4Lcwb+ogx+uBBQE3Q+dLKjXaLl0JVW+nUNwbQ==} + dependencies: + '@babel/runtime': 7.22.11 + '@jimp/custom': 0.10.3 + '@jimp/plugins': 0.10.3(@jimp/custom@0.10.3) + '@jimp/types': 0.10.3(@jimp/custom@0.10.3) + core-js: 3.32.1 + regenerator-runtime: 0.13.11 + dev: false + + /joi@17.10.0: + resolution: {integrity: sha512-hrazgRSlhzacZ69LdcKfhi3Vu13z2yFfoAzmEov3yFIJlatTdVGUW6vle1zjH8qkzdCn/qGw8rapjqsObbYXAg==} + dependencies: + '@hapi/hoek': 9.3.0 + '@hapi/topo': 5.1.0 + '@sideway/address': 4.1.4 + '@sideway/formula': 3.0.1 + '@sideway/pinpoint': 2.0.0 + dev: true + + /jose@4.14.6: + resolution: {integrity: sha512-EqJPEUlZD0/CSUMubKtMaYUOtWe91tZXTWMJZoKSbLk+KtdhNdcvppH8lA9XwVu2V4Ailvsj0GBZJ2ZwDjfesQ==} + + /jpeg-js@0.3.7: + resolution: {integrity: sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==} + dev: false + + /js-base64@2.6.4: + resolution: {integrity: sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==} + dev: false + + /js-cookie@2.2.1: + resolution: {integrity: sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==} + dev: false + + /js-tokens@4.0.0: + resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} + + /js-yaml@3.14.1: + resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} + hasBin: true + dependencies: + argparse: 1.0.10 + esprima: 4.0.1 + dev: true + + /js-yaml@4.1.0: + resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} + hasBin: true + dependencies: + argparse: 2.0.1 + dev: true + + /jsbn@0.1.1: + resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==} + + /jsdom@16.7.0(canvas@2.11.2): + resolution: {integrity: sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==} + engines: {node: '>=10'} + peerDependencies: + canvas: ^2.5.0 + peerDependenciesMeta: + canvas: + optional: true + dependencies: + abab: 2.0.6 + acorn: 8.10.0 + acorn-globals: 6.0.0 + canvas: 2.11.2 + cssom: 0.4.4 + cssstyle: 2.3.0 + data-urls: 2.0.0 + decimal.js: 10.4.3 + domexception: 2.0.1 + escodegen: 2.1.0 + form-data: 3.0.1 + html-encoding-sniffer: 2.0.1 + http-proxy-agent: 4.0.1 + https-proxy-agent: 5.0.1 + is-potential-custom-element-name: 1.0.1 + nwsapi: 2.2.7 + parse5: 6.0.1 + saxes: 5.0.1 + symbol-tree: 3.2.4 + tough-cookie: 4.1.3 + w3c-hr-time: 1.0.2 + w3c-xmlserializer: 2.0.0 + webidl-conversions: 6.1.0 + whatwg-encoding: 1.0.5 + whatwg-mimetype: 2.3.0 + whatwg-url: 8.7.0 + ws: 7.5.9 + xml-name-validator: 3.0.0 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: true + + /jsesc@0.5.0: + resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==} + hasBin: true + + /jsesc@2.5.2: + resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} + engines: {node: '>=4'} + hasBin: true + + /json-buffer@3.0.1: + resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} + dev: true + + /json-parse-better-errors@1.0.2: + resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==} + dev: true + + /json-parse-even-better-errors@2.3.1: + resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} + + /json-schema-traverse@0.4.1: + resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} + + /json-schema-traverse@1.0.0: + resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} + + /json-schema@0.4.0: + resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==} + + /json-stable-stringify-without-jsonify@1.0.1: + resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} + dev: true + + /json-stringify-safe@5.0.1: + resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==} + + /json5@1.0.2: + resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==} + hasBin: true + dependencies: + minimist: 1.2.8 + dev: true + + /json5@2.2.3: + resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} + engines: {node: '>=6'} + hasBin: true + + /jsonfile@4.0.0: + resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} + optionalDependencies: + graceful-fs: 4.2.11 + dev: false + + /jsonfile@6.1.0: + resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==} + dependencies: + universalify: 2.0.0 + optionalDependencies: + graceful-fs: 4.2.11 + + /jsonpointer@5.0.1: + resolution: {integrity: sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==} + engines: {node: '>=0.10.0'} + + /jsonwebtoken@9.0.2: + resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==} + engines: {node: '>=12', npm: '>=6'} + dependencies: + jws: 3.2.2 + lodash.includes: 4.3.0 + lodash.isboolean: 3.0.3 + lodash.isinteger: 4.0.4 + lodash.isnumber: 3.0.3 + lodash.isplainobject: 4.0.6 + lodash.isstring: 4.0.1 + lodash.once: 4.1.1 + ms: 2.1.3 + semver: 7.5.4 + + /jsprim@1.4.2: + resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==} + engines: {node: '>=0.6.0'} + dependencies: + assert-plus: 1.0.0 + extsprintf: 1.3.0 + json-schema: 0.4.0 + verror: 1.10.0 + dev: true + + /jsprim@2.0.2: + resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==} + engines: {'0': node >=0.6.0} + dependencies: + assert-plus: 1.0.0 + extsprintf: 1.3.0 + json-schema: 0.4.0 + verror: 1.10.0 + + /jsx-ast-utils@3.3.5: + resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==} + engines: {node: '>=4.0'} + dependencies: + array-includes: 3.1.6 + array.prototype.flat: 1.3.1 + object.assign: 4.1.4 + object.values: 1.1.7 + dev: true + + /jszip@3.10.1: + resolution: {integrity: sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==} + dependencies: + lie: 3.3.0 + pako: 1.0.11 + readable-stream: 2.3.8 + setimmediate: 1.0.5 + dev: false + + /jwa@1.4.1: + resolution: {integrity: sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==} + dependencies: + buffer-equal-constant-time: 1.0.1 + ecdsa-sig-formatter: 1.0.11 + safe-buffer: 5.2.1 + + /jws@3.2.2: + resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==} + dependencies: + jwa: 1.4.1 + safe-buffer: 5.2.1 + + /keyv@4.5.3: + resolution: {integrity: sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==} + dependencies: + json-buffer: 3.0.1 + dev: true + + /kind-of@2.0.1: + resolution: {integrity: sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==} + engines: {node: '>=0.10.0'} + dependencies: + is-buffer: 1.1.6 + dev: true + + /kind-of@3.2.2: + resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==} + engines: {node: '>=0.10.0'} + dependencies: + is-buffer: 1.1.6 + dev: true + + /kind-of@6.0.3: + resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==} + engines: {node: '>=0.10.0'} + + /kleur@3.0.3: + resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==} + engines: {node: '>=6'} + dev: true + + /launch-editor@2.6.0: + resolution: {integrity: sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==} + dependencies: + picocolors: 1.0.0 + shell-quote: 1.8.1 + + /lazy-ass@1.6.0: + resolution: {integrity: sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==} + engines: {node: '> 0.8'} + + /lazy-cache@0.2.7: + resolution: {integrity: sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==} + engines: {node: '>=0.10.0'} + dev: true + + /lazy-cache@1.0.4: + resolution: {integrity: sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==} + engines: {node: '>=0.10.0'} + dev: true + + /leven@3.1.0: + resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==} + engines: {node: '>=6'} + + /levn@0.4.1: + resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} + engines: {node: '>= 0.8.0'} + dependencies: + prelude-ls: 1.2.1 + type-check: 0.4.0 + dev: true + + /lie@3.3.0: + resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==} + dependencies: + immediate: 3.0.6 + dev: false + + /lines-and-columns@1.2.4: + resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} + + /listr2@3.14.0(enquirer@2.4.1): + resolution: {integrity: sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==} + engines: {node: '>=10.0.0'} + peerDependencies: + enquirer: '>= 2.3.0 < 3' + peerDependenciesMeta: + enquirer: + optional: true + dependencies: + cli-truncate: 2.1.0 + colorette: 2.0.20 + enquirer: 2.4.1 + log-update: 4.0.0 + p-map: 4.0.0 + rfdc: 1.3.0 + rxjs: 7.8.1 + through: 2.3.8 + wrap-ansi: 7.0.0 + + /lit-element@3.3.3: + resolution: {integrity: sha512-XbeRxmTHubXENkV4h8RIPyr8lXc+Ff28rkcQzw3G6up2xg5E8Zu1IgOWIwBLEQsu3cOVFqdYwiVi0hv0SlpqUA==} + dependencies: + '@lit-labs/ssr-dom-shim': 1.1.1 + '@lit/reactive-element': 1.6.3 + lit-html: 2.8.0 + dev: false + + /lit-html@2.8.0: + resolution: {integrity: sha512-o9t+MQM3P4y7M7yNzqAyjp7z+mQGa4NS4CxiyLqFPyFWyc4O+nodLrkrxSaCTrla6M5YOLaT3RpbbqjszB5g3Q==} + dependencies: + '@types/trusted-types': 2.0.3 + dev: false + + /lit@2.8.0: + resolution: {integrity: sha512-4Sc3OFX9QHOJaHbmTMk28SYgVxLN3ePDjg7hofEft2zWlehFL3LiAuapWc4U/kYwMYJSh2hTCPZ6/LIC7ii0MA==} + dependencies: + '@lit/reactive-element': 1.6.3 + lit-element: 3.3.3 + lit-html: 2.8.0 + dev: false + + /load-bmfont@1.4.1: + resolution: {integrity: sha512-8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA==} + dependencies: + buffer-equal: 0.0.1 + mime: 1.6.0 + parse-bmfont-ascii: 1.0.6 + parse-bmfont-binary: 1.0.6 + parse-bmfont-xml: 1.1.4 + phin: 2.9.3 + xhr: 2.6.0 + xtend: 4.0.2 + dev: false + + /load-json-file@4.0.0: + resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==} + engines: {node: '>=4'} + dependencies: + graceful-fs: 4.2.11 + parse-json: 4.0.0 + pify: 3.0.0 + strip-bom: 3.0.0 + dev: true + + /load-json-file@5.3.0: + resolution: {integrity: sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==} + engines: {node: '>=6'} + dependencies: + graceful-fs: 4.2.11 + parse-json: 4.0.0 + pify: 4.0.1 + strip-bom: 3.0.0 + type-fest: 0.3.1 + dev: true + + /loader-runner@4.3.0: + resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==} + engines: {node: '>=6.11.5'} + + /loader-utils@2.0.4: + resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==} + engines: {node: '>=8.9.0'} + dependencies: + big.js: 5.2.2 + emojis-list: 3.0.0 + json5: 2.2.3 + + /locate-path@3.0.0: + resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==} + engines: {node: '>=6'} + dependencies: + p-locate: 3.0.0 + path-exists: 3.0.0 + dev: true + + /locate-path@5.0.0: + resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} + engines: {node: '>=8'} + dependencies: + p-locate: 4.1.0 + + /locate-path@6.0.0: + resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} + engines: {node: '>=10'} + dependencies: + p-locate: 5.0.0 + + /lodash-es@4.17.21: + resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} + dev: true + + /lodash-webpack-plugin@0.11.6(webpack@5.88.2): + resolution: {integrity: sha512-nsHN/+IxZK/C425vGC8pAxkKJ8KQH2+NJnhDul14zYNWr6HJcA95w+oRR7Cp0oZpOdMplDZXmjVROp8prPk7ig==} + peerDependencies: + webpack: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.1.0 + dependencies: + lodash: 4.17.21 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + dev: true + + /lodash.compact@3.0.1: + resolution: {integrity: sha512-2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ==} + dev: false + + /lodash.debounce@4.0.8: + resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==} + + /lodash.get@4.4.2: + resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==} + + /lodash.includes@4.3.0: + resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==} + + /lodash.isboolean@3.0.3: + resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==} + + /lodash.isinteger@4.0.4: + resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==} + + /lodash.isnumber@3.0.3: + resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==} + + /lodash.isplainobject@4.0.6: + resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==} + + /lodash.isstring@4.0.1: + resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==} + + /lodash.merge@4.6.2: + resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} + + /lodash.once@4.1.1: + resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==} + + /lodash.reduce@4.6.0: + resolution: {integrity: sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==} + + /lodash.sortby@4.7.0: + resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} + + /lodash@4.17.21: + resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + + /log-symbols@4.1.0: + resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} + engines: {node: '>=10'} + dependencies: + chalk: 4.1.2 + is-unicode-supported: 0.1.0 + + /log-update@4.0.0: + resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==} + engines: {node: '>=10'} + dependencies: + ansi-escapes: 4.3.2 + cli-cursor: 3.1.0 + slice-ansi: 4.0.0 + wrap-ansi: 6.2.0 + + /long@5.2.3: + resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==} + dev: false + + /loose-envify@1.4.0: + resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} + hasBin: true + dependencies: + js-tokens: 4.0.0 + + /lower-case@2.0.2: + resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==} + dependencies: + tslib: 2.6.2 + + /lru-cache@10.0.1: + resolution: {integrity: sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==} + engines: {node: 14 || >=16.14} + dev: true + + /lru-cache@5.1.1: + resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} + dependencies: + yallist: 3.1.1 + + /lru-cache@6.0.0: + resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} + engines: {node: '>=10'} + dependencies: + yallist: 4.0.0 + + /macaddress@0.5.3: + resolution: {integrity: sha512-vGBKTA+jwM4KgjGZ+S/8/Mkj9rWzePyGY6jManXPGhiWu63RYwW8dKPyk5koP+8qNVhPhHgFa1y/MJ4wrjsNrg==} + + /magic-string@0.25.9: + resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==} + dependencies: + sourcemap-codec: 1.4.8 + + /make-dir@3.1.0: + resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} + engines: {node: '>=8'} + dependencies: + semver: 6.3.1 + dev: true + + /make-dir@4.0.0: + resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} + engines: {node: '>=10'} + dependencies: + semver: 7.5.4 + dev: true + + /makeerror@1.0.12: + resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==} + dependencies: + tmpl: 1.0.5 + dev: true + + /md5-file@4.0.0: + resolution: {integrity: sha512-UC0qFwyAjn4YdPpKaDNw6gNxRf7Mcx7jC1UGCY4boCzgvU2Aoc1mOGzTtrjjLKhM5ivsnhoKpQVxKPp+1j1qwg==} + engines: {node: '>=6.0'} + hasBin: true + dev: true + + /md5.js@1.3.5: + resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==} + dependencies: + hash-base: 3.1.0 + inherits: 2.0.4 + safe-buffer: 5.2.1 + dev: true + + /mdn-data@2.0.14: + resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==} + dev: false + + /media-typer@0.3.0: + resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} + engines: {node: '>= 0.6'} + + /memfs@3.5.3: + resolution: {integrity: sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==} + engines: {node: '>= 4.0.0'} + dependencies: + fs-monkey: 1.0.4 + + /memorystream@0.3.1: + resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==} + engines: {node: '>= 0.10.0'} + dev: true + + /merge-deep@3.0.3: + resolution: {integrity: sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==} + engines: {node: '>=0.10.0'} + dependencies: + arr-union: 3.1.0 + clone-deep: 0.2.4 + kind-of: 3.2.2 + dev: true + + /merge-descriptors@1.0.1: + resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==} + + /merge-stream@2.0.0: + resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} + + /merge2@1.4.1: + resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} + engines: {node: '>= 8'} + dev: true + + /merge@1.2.1: + resolution: {integrity: sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==} + dev: false + + /methods@1.1.2: + resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} + engines: {node: '>= 0.6'} + + /micromatch@4.0.5: + resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} + engines: {node: '>=8.6'} + dependencies: + braces: 3.0.2 + picomatch: 2.3.1 + + /miller-rabin@4.0.1: + resolution: {integrity: sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==} + hasBin: true + dependencies: + bn.js: 4.12.0 + brorand: 1.1.0 + dev: true + + /mime-db@1.52.0: + resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} + engines: {node: '>= 0.6'} + + /mime-types@2.1.35: + resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} + engines: {node: '>= 0.6'} + dependencies: + mime-db: 1.52.0 + + /mime@1.6.0: + resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==} + engines: {node: '>=4'} + hasBin: true + + /mimic-fn@2.1.0: + resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} + engines: {node: '>=6'} + + /mimic-response@2.1.0: + resolution: {integrity: sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==} + engines: {node: '>=8'} + dev: true + + /min-document@2.19.0: + resolution: {integrity: sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==} + dependencies: + dom-walk: 0.1.2 + dev: false + + /minecraft-assets@1.9.0: + resolution: {integrity: sha512-KtvIRd9gcKlxbvrswGv1Ap9k7tVs//QW2ukp+8vJ28miYwkhUmYfjTZyElIG8KUXV/46wL2kDzLH8SJbXQ56Mg==} + dev: true + + /minecraft-data@3.45.0: + resolution: {integrity: sha512-LJMKveMXNjQKk48mDEhFgjDQGBAGa0xKDXjsJ865eB2qdFei73vgu1YXQbyK3Zlg5a0cIgfvyHKG8Pf5s6XFqg==} + + /minecraft-folder-path@1.2.0: + resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==} + + /minecraft-wrap@1.3.0: + resolution: {integrity: sha512-DTEG6j4IkUHCRl/Ad8aw5ku35X5xYCxWslQG74k7ESN4g4ZLg81HGGGpZYhB7KvcL/V5H7EofUoQ+eah76BoHQ==} + hasBin: true + dependencies: + debug: 4.3.4(supports-color@8.1.1) + es6-promisify: 5.0.0 + extract-zip: 2.0.1(supports-color@8.1.1) + flatmap: 0.0.3 + md5-file: 4.0.0 + minecraft-folder-path: 1.2.0 + mkdirp: 0.5.6 + mz: 2.7.0 + promise-queue: 2.2.5 + request: 2.88.2 + request-promise: 4.2.6(request@2.88.2) + rimraf: 3.0.2 + yggdrasil: 1.7.0 + transitivePeerDependencies: + - encoding + - supports-color + dev: true + + /minecrafthawkeye@1.2.5(prismarine-registry@1.7.0): + resolution: {integrity: sha512-s6YJrpahvzVEKelAv6Tjp2we7VataThAlTH+O2SoaSgIqGDg+ocxwb1+5Yh11CyQ2llMTcnplbaI2xOtyr39Pw==} + dependencies: + mineflayer: 3.18.0(prismarine-registry@1.7.0) + transitivePeerDependencies: + - encoding + - prismarine-registry + - supports-color + dev: true + + /mineflayer-pathfinder@2.4.4: + resolution: {integrity: sha512-HAXakZrJRb1UC+5dv8EaDrqjW3ZnBnBk3nkb6x/YWyhHCUKn/E7VU0FO+UN9whuqPlkSaVumEdXJdydE6lSYxQ==} + dependencies: + minecraft-data: 3.45.0 + prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-entity: 2.3.1 + prismarine-item: 1.14.0 + prismarine-nbt: 2.2.1 + prismarine-physics: 1.7.0 + vec3: 0.1.8 + dev: true + + /mineflayer@3.18.0(prismarine-registry@1.7.0): + resolution: {integrity: sha512-eHLr3rPqGtZuoAWrocMY+WBGxZ1ao8OHAxBr3L8XFT4cZVybjLbEqs/NAa2RFTKTzhO23kzxt+qsmxkLL7Oxiw==} + engines: {node: '>=14'} + dependencies: + minecraft-data: 3.45.0 + minecraft-protocol: github.com/zardoy/minecraft-protocol/22e71bf29f3471f2543102ad76dfeebd5123e43f + prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) + prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-chat: 1.9.1 + prismarine-chunk: 1.35.0(minecraft-data@3.45.0) + prismarine-entity: 2.3.1 + prismarine-item: 1.14.0 + prismarine-nbt: 2.2.1 + prismarine-physics: 1.7.0 + prismarine-recipe: 1.3.1(prismarine-registry@1.7.0) + prismarine-windows: 2.8.0 + prismarine-world: github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786 + protodef: 1.15.0 + typed-emitter: 1.4.0 + vec3: 0.1.8 + transitivePeerDependencies: + - encoding + - prismarine-registry + - supports-color + dev: true + + /mineflayer@4.0.0(prismarine-registry@1.7.0): + resolution: {integrity: sha512-Yg/r/DC2Ski0ys+tyfE0d7VRJvamtfoCCEICf+q/3XyiSw36+Dt0guPpglQ2h2wZQrRaUqe9przZe+gdWgusug==} + engines: {node: '>=14'} + dependencies: + minecraft-data: 3.45.0 + minecraft-protocol: github.com/zardoy/minecraft-protocol/22e71bf29f3471f2543102ad76dfeebd5123e43f + prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) + prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-chat: 1.9.1 + prismarine-chunk: 1.35.0(minecraft-data@3.45.0) + prismarine-entity: 2.3.1 + prismarine-item: 1.14.0 + prismarine-nbt: 2.2.1 + prismarine-physics: 1.7.0 + prismarine-recipe: 1.3.1(prismarine-registry@1.7.0) + prismarine-windows: 2.8.0 + prismarine-world: github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786 + protodef: 1.15.0 + typed-emitter: 1.4.0 + vec3: 0.1.8 + transitivePeerDependencies: + - encoding + - prismarine-registry + - supports-color + dev: true + + /minimalistic-assert@1.0.1: + resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==} + + /minimalistic-crypto-utils@1.0.1: + resolution: {integrity: sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==} + dev: true + + /minimatch@3.1.2: + resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} + dependencies: + brace-expansion: 1.1.11 + + /minimatch@5.1.6: + resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==} + engines: {node: '>=10'} + dependencies: + brace-expansion: 2.0.1 + + /minimatch@9.0.3: + resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 + dev: true + + /minimist@1.2.8: + resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} + + /minipass@3.3.6: + resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} + engines: {node: '>=8'} + dependencies: + yallist: 4.0.0 + dev: true + + /minipass@5.0.0: + resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} + engines: {node: '>=8'} + dev: true + + /minipass@7.0.3: + resolution: {integrity: sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==} + engines: {node: '>=16 || 14 >=14.17'} + dev: true + + /minizlib@2.1.2: + resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} + engines: {node: '>= 8'} + dependencies: + minipass: 3.3.6 + yallist: 4.0.0 + dev: true + + /mixin-object@2.0.1: + resolution: {integrity: sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==} + engines: {node: '>=0.10.0'} + dependencies: + for-in: 0.1.8 + is-extendable: 0.1.1 + dev: true + + /mkdirp-classic@0.5.3: + resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==} + dev: true + + /mkdirp@0.3.0: + resolution: {integrity: sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==} + deprecated: Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.) + dev: false + + /mkdirp@0.5.6: + resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} + hasBin: true + dependencies: + minimist: 1.2.8 + + /mkdirp@1.0.4: + resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} + engines: {node: '>=10'} + hasBin: true + dev: true + + /mojangson@2.0.4: + resolution: {integrity: sha512-HYmhgDjr1gzF7trGgvcC/huIg2L8FsVbi/KacRe6r1AswbboGVZDS47SOZlomPuMWvZLas8m9vuHHucdZMwTmQ==} + dependencies: + nearley: 2.20.1 + + /moment@2.29.4: + resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==} + dev: false + + /moo@0.5.2: + resolution: {integrity: sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==} + + /ms@2.0.0: + resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} + + /ms@2.1.2: + resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} + + /ms@2.1.3: + resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + + /multicast-dns@7.2.5: + resolution: {integrity: sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==} + hasBin: true + dependencies: + dns-packet: 5.6.1 + thunky: 1.1.0 + + /mz@2.7.0: + resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} + dependencies: + any-promise: 1.3.0 + object-assign: 4.1.1 + thenify-all: 1.6.0 + dev: true + + /nan@2.17.0: + resolution: {integrity: sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==} + dev: true + + /nano-css@5.3.5(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-vSB9X12bbNu4ALBu7nigJgRViZ6ja3OU7CeuiV1zMIbXOdmkLahgtPmh3GBOlDxbKY0CitqlPdOReGlBLSp+yg==} + peerDependencies: + react: '*' + react-dom: '*' + dependencies: + css-tree: 1.1.3 + csstype: 3.1.2 + fastest-stable-stringify: 2.0.2 + inline-style-prefixer: 6.0.4 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + rtl-css-js: 1.16.1 + sourcemap-codec: 1.4.8 + stacktrace-js: 2.0.2 + stylis: 4.2.0 + dev: false + + /nanoid@3.3.6: + resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true + dev: true + + /natural-compare@1.4.0: + resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} + dev: true + + /nearley@2.20.1: + resolution: {integrity: sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==} + hasBin: true + dependencies: + commander: 2.20.3 + moo: 0.5.2 + railroad-diagrams: 1.0.0 + randexp: 0.4.6 + + /needle@2.9.1: + resolution: {integrity: sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==} + engines: {node: '>= 4.4.x'} + hasBin: true + dependencies: + debug: 3.2.7(supports-color@8.1.1) + iconv-lite: 0.4.24 + sax: 1.2.4 + transitivePeerDependencies: + - supports-color + dev: false + + /negotiator@0.6.3: + resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==} + engines: {node: '>= 0.6'} + + /neo-async@2.6.2: + resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} + + /nice-try@1.0.5: + resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} + dev: true + + /no-case@3.0.4: + resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==} + dependencies: + lower-case: 2.0.2 + tslib: 2.6.2 + + /node-fetch@2.6.7: + resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==} + engines: {node: 4.x || >=6.0.0} + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + dependencies: + whatwg-url: 5.0.0 + dev: true + + /node-fetch@2.7.0: + resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==} + engines: {node: 4.x || >=6.0.0} + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + dependencies: + whatwg-url: 5.0.0 + + /node-forge@1.3.1: + resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==} + engines: {node: '>= 6.13.0'} + + /node-gyp-build-optional-packages@5.0.3: + resolution: {integrity: sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==} + hasBin: true + requiresBuild: true + dev: false + optional: true + + /node-gzip@1.1.2: + resolution: {integrity: sha512-ZB6zWpfZHGtxZnPMrJSKHVPrRjURoUzaDbLFj3VO70mpLTW5np96vXyHwft4Id0o+PYIzgDkBUjIzaNHhQ8srw==} + dev: false + + /node-int64@0.4.0: + resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} + dev: true + + /node-releases@2.0.13: + resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==} + + /node-rsa@0.4.2: + resolution: {integrity: sha512-Bvso6Zi9LY4otIZefYrscsUpo2mUpiAVIEmSZV2q41sP8tHZoert3Yu6zv4f/RXJqMNZQKCtnhDugIuCma23YA==} + dependencies: + asn1: 0.2.3 + + /nopt@1.0.10: + resolution: {integrity: sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==} + hasBin: true + dependencies: + abbrev: 1.1.1 + dev: false + + /nopt@5.0.0: + resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==} + engines: {node: '>=6'} + hasBin: true + dependencies: + abbrev: 1.1.1 + dev: true + + /normalize-package-data@2.5.0: + resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} + dependencies: + hosted-git-info: 2.8.9 + resolve: 1.22.4 + semver: 5.7.2 + validate-npm-package-license: 3.0.4 + dev: true + + /normalize-path@3.0.0: + resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} + engines: {node: '>=0.10.0'} + + /npm-run-all@4.1.5: + resolution: {integrity: sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==} + engines: {node: '>= 4'} + hasBin: true + dependencies: + ansi-styles: 3.2.1 + chalk: 2.4.2 + cross-spawn: 6.0.5 + memorystream: 0.3.1 + minimatch: 3.1.2 + pidtree: 0.3.1 + read-pkg: 3.0.0 + shell-quote: 1.8.1 + string.prototype.padend: 3.1.4 + dev: true + + /npm-run-path@4.0.1: + resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} + engines: {node: '>=8'} + dependencies: + path-key: 3.1.1 + + /npmlog@5.0.1: + resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==} + dependencies: + are-we-there-yet: 2.0.0 + console-control-strings: 1.1.0 + gauge: 3.0.2 + set-blocking: 2.0.0 + dev: true + + /nth-check@2.1.1: + resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} + dependencies: + boolbase: 1.0.0 + dev: true + + /nwsapi@2.2.7: + resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==} + dev: true + + /oauth-sign@0.9.0: + resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==} + dev: true + + /object-assign@4.1.1: + resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} + engines: {node: '>=0.10.0'} + + /object-inspect@1.12.3: + resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==} + + /object-is@1.1.5: + resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + dev: true + + /object-keys@1.1.1: + resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} + engines: {node: '>= 0.4'} + + /object.assign@4.1.4: + resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + has-symbols: 1.0.3 + object-keys: 1.1.1 + + /object.entries@1.1.7: + resolution: {integrity: sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + dev: true + + /object.fromentries@2.0.6: + resolution: {integrity: sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + dev: true + + /object.groupby@1.0.1: + resolution: {integrity: sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + get-intrinsic: 1.2.1 + dev: true + + /object.hasown@1.1.3: + resolution: {integrity: sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==} + dependencies: + define-properties: 1.2.0 + es-abstract: 1.22.1 + dev: true + + /object.values@1.1.7: + resolution: {integrity: sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + dev: true + + /obuf@1.1.2: + resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==} + + /omggif@1.0.10: + resolution: {integrity: sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==} + dev: false + + /on-finished@2.4.1: + resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} + engines: {node: '>= 0.8'} + dependencies: + ee-first: 1.1.1 + + /on-headers@1.0.2: + resolution: {integrity: sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==} + engines: {node: '>= 0.8'} + + /once@1.4.0: + resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} + dependencies: + wrappy: 1.0.2 + + /onetime@5.1.2: + resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} + engines: {node: '>=6'} + dependencies: + mimic-fn: 2.1.0 + + /open@8.4.2: + resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==} + engines: {node: '>=12'} + dependencies: + define-lazy-prop: 2.0.0 + is-docker: 2.2.1 + is-wsl: 2.2.0 + + /opener@1.5.2: + resolution: {integrity: sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==} + hasBin: true + dev: true + + /optionator@0.9.3: + resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} + engines: {node: '>= 0.8.0'} + dependencies: + '@aashutoshrathi/word-wrap': 1.2.6 + deep-is: 0.1.4 + fast-levenshtein: 2.0.6 + levn: 0.4.1 + prelude-ls: 1.2.1 + type-check: 0.4.0 + dev: true + + /os-browserify@0.3.0: + resolution: {integrity: sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==} + dev: true + + /os-homedir@1.0.2: + resolution: {integrity: sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==} + engines: {node: '>=0.10.0'} + dev: true + + /ospath@1.2.2: + resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==} + + /p-limit@2.3.0: + resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} + engines: {node: '>=6'} + dependencies: + p-try: 2.2.0 + + /p-limit@3.1.0: + resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} + engines: {node: '>=10'} + dependencies: + yocto-queue: 0.1.0 + + /p-locate@3.0.0: + resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==} + engines: {node: '>=6'} + dependencies: + p-limit: 2.3.0 + dev: true + + /p-locate@4.1.0: + resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} + engines: {node: '>=8'} + dependencies: + p-limit: 2.3.0 + + /p-locate@5.0.0: + resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} + engines: {node: '>=10'} + dependencies: + p-limit: 3.1.0 + + /p-map@2.1.0: + resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==} + engines: {node: '>=6'} + dev: true + + /p-map@4.0.0: + resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==} + engines: {node: '>=10'} + dependencies: + aggregate-error: 3.1.0 + + /p-retry@4.6.2: + resolution: {integrity: sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==} + engines: {node: '>=8'} + dependencies: + '@types/retry': 0.12.0 + retry: 0.13.1 + + /p-try@2.2.0: + resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} + engines: {node: '>=6'} + + /pako@1.0.11: + resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==} + + /param-case@3.0.4: + resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==} + dependencies: + dot-case: 3.0.4 + tslib: 2.6.2 + + /parent-module@1.0.1: + resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} + engines: {node: '>=6'} + dependencies: + callsites: 3.1.0 + + /parse-asn1@5.1.6: + resolution: {integrity: sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==} + dependencies: + asn1.js: 5.4.1 + browserify-aes: 1.2.0 + evp_bytestokey: 1.0.3 + pbkdf2: 3.1.2 + safe-buffer: 5.2.1 + dev: true + + /parse-bmfont-ascii@1.0.6: + resolution: {integrity: sha512-U4RrVsUFCleIOBsIGYOMKjn9PavsGOXxbvYGtMOEfnId0SVNsgehXh1DxUdVPLoxd5mvcEtvmKs2Mmf0Mpa1ZA==} + dev: false + + /parse-bmfont-binary@1.0.6: + resolution: {integrity: sha512-GxmsRea0wdGdYthjuUeWTMWPqm2+FAd4GI8vCvhgJsFnoGhTrLhXDDupwTo7rXVAgaLIGoVHDZS9p/5XbSqeWA==} + dev: false + + /parse-bmfont-xml@1.1.4: + resolution: {integrity: sha512-bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ==} + dependencies: + xml-parse-from-string: 1.0.1 + xml2js: 0.4.23 + dev: false + + /parse-headers@2.0.5: + resolution: {integrity: sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA==} + dev: false + + /parse-json@4.0.0: + resolution: {integrity: sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==} + engines: {node: '>=4'} + dependencies: + error-ex: 1.3.2 + json-parse-better-errors: 1.0.2 + dev: true + + /parse-json@5.2.0: + resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} + engines: {node: '>=8'} + dependencies: + '@babel/code-frame': 7.22.13 + error-ex: 1.3.2 + json-parse-even-better-errors: 2.3.1 + lines-and-columns: 1.2.4 + + /parse-passwd@1.0.0: + resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==} + engines: {node: '>=0.10.0'} + dev: true + + /parse5@6.0.1: + resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==} + dev: true + + /parseqs@0.0.6: + resolution: {integrity: sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==} + dev: false + + /parseuri@0.0.6: + resolution: {integrity: sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==} + dev: false + + /parseurl@1.3.3: + resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==} + engines: {node: '>= 0.8'} + + /pascal-case@3.1.2: + resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==} + dependencies: + no-case: 3.0.4 + tslib: 2.6.2 + + /path-browserify@1.0.1: + resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==} + dev: true + + /path-case@3.0.4: + resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==} + dependencies: + dot-case: 3.0.4 + tslib: 2.6.2 + dev: false + + /path-exists@3.0.0: + resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==} + engines: {node: '>=4'} + dev: true + + /path-exists@4.0.0: + resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} + engines: {node: '>=8'} + + /path-is-absolute@1.0.1: + resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} + engines: {node: '>=0.10.0'} + + /path-is-inside@1.0.2: + resolution: {integrity: sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==} + dev: true + + /path-key@2.0.1: + resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==} + engines: {node: '>=4'} + dev: true + + /path-key@3.1.1: + resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} + engines: {node: '>=8'} + + /path-parse@1.0.7: + resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} + + /path-scurry@1.10.1: + resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + lru-cache: 10.0.1 + minipass: 7.0.3 + dev: true + + /path-to-regexp@0.1.7: + resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} + + /path-type@3.0.0: + resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==} + engines: {node: '>=4'} + dependencies: + pify: 3.0.0 + dev: true + + /path-type@4.0.0: + resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} + engines: {node: '>=8'} + + /pbkdf2@3.1.2: + resolution: {integrity: sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==} + engines: {node: '>=0.12'} + dependencies: + create-hash: 1.2.0 + create-hmac: 1.1.7 + ripemd160: 2.0.2 + safe-buffer: 5.2.1 + sha.js: 2.4.11 + dev: true + + /peerjs-js-binarypack@2.0.0: + resolution: {integrity: sha512-wu+L0Qeg4IH2DXm3B6xKP5ODeCIovwEEO/Fu3MVqApPQeVLzSdZpFzQzPobh+sdhUWMQGEO7YxHeiwpPngLjqQ==} + engines: {node: '>= 14.0.0'} + dev: false + + /peerjs@1.5.0: + resolution: {integrity: sha512-NLZ73jRNE4aLq2pmVTiSkWmwf6cvt9cH72qJHnzaLH+I2CtoWVvY42U9/O0/tYE6UYwRYJ1ktKRs2DdZ1Jrgcg==} + engines: {node: '>= 14'} + dependencies: + '@msgpack/msgpack': 2.8.0 + cbor-x: 1.5.4 + eventemitter3: 4.0.7 + peerjs-js-binarypack: 2.0.0 + webrtc-adapter: 8.2.3 + dev: false + + /pend@1.2.0: + resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==} + + /performance-now@2.1.0: + resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==} + + /phin@2.9.3: + resolution: {integrity: sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==} + dev: false + + /picocolors@1.0.0: + resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} + + /picomatch@2.3.1: + resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} + engines: {node: '>=8.6'} + + /pidtree@0.3.1: + resolution: {integrity: sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==} + engines: {node: '>=0.10'} + hasBin: true + dev: true + + /pify@2.3.0: + resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==} + engines: {node: '>=0.10.0'} + + /pify@3.0.0: + resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==} + engines: {node: '>=4'} + dev: true + + /pify@4.0.1: + resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} + engines: {node: '>=6'} + dev: true + + /pinkie-promise@2.0.1: + resolution: {integrity: sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==} + engines: {node: '>=0.10.0'} + dependencies: + pinkie: 2.0.4 + dev: true + + /pinkie@2.0.4: + resolution: {integrity: sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==} + engines: {node: '>=0.10.0'} + dev: true + + /pirates@4.0.6: + resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} + engines: {node: '>= 6'} + dev: true + + /pixelmatch@4.0.2: + resolution: {integrity: sha512-J8B6xqiO37sU/gkcMglv6h5Jbd9xNER7aHzpfRdNmV4IbQBzBpe4l9XmbG+xPF/znacgu2jfEw+wHffaq/YkXA==} + hasBin: true + dependencies: + pngjs: 3.4.0 + dev: false + + /pkg-conf@3.1.0: + resolution: {integrity: sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==} + engines: {node: '>=6'} + dependencies: + find-up: 3.0.0 + load-json-file: 5.3.0 + dev: true + + /pkg-dir@4.2.0: + resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} + engines: {node: '>=8'} + dependencies: + find-up: 4.1.0 + + /pngjs@3.4.0: + resolution: {integrity: sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==} + engines: {node: '>=4.0.0'} + dev: false + + /portfinder@1.0.32: + resolution: {integrity: sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==} + engines: {node: '>= 0.12.0'} + dependencies: + async: 2.6.4 + debug: 3.2.7(supports-color@8.1.1) + mkdirp: 0.5.6 + transitivePeerDependencies: + - supports-color + dev: true + + /postcss-modules-extract-imports@3.0.0(postcss@8.4.28): + resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==} + engines: {node: ^10 || ^12 || >= 14} + peerDependencies: + postcss: ^8.1.0 + dependencies: + postcss: 8.4.28 + dev: true + + /postcss-modules-local-by-default@4.0.3(postcss@8.4.28): + resolution: {integrity: sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==} + engines: {node: ^10 || ^12 || >= 14} + peerDependencies: + postcss: ^8.1.0 + dependencies: + icss-utils: 5.1.0(postcss@8.4.28) + postcss: 8.4.28 + postcss-selector-parser: 6.0.13 + postcss-value-parser: 4.2.0 + dev: true + + /postcss-modules-scope@3.0.0(postcss@8.4.28): + resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==} + engines: {node: ^10 || ^12 || >= 14} + peerDependencies: + postcss: ^8.1.0 + dependencies: + postcss: 8.4.28 + postcss-selector-parser: 6.0.13 + dev: true + + /postcss-modules-values@4.0.0(postcss@8.4.28): + resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==} + engines: {node: ^10 || ^12 || >= 14} + peerDependencies: + postcss: ^8.1.0 + dependencies: + icss-utils: 5.1.0(postcss@8.4.28) + postcss: 8.4.28 + dev: true + + /postcss-selector-parser@6.0.13: + resolution: {integrity: sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==} + engines: {node: '>=4'} + dependencies: + cssesc: 3.0.0 + util-deprecate: 1.0.2 + dev: true + + /postcss-value-parser@4.2.0: + resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} + dev: true + + /postcss@8.4.28: + resolution: {integrity: sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.6 + picocolors: 1.0.0 + source-map-js: 1.0.2 + dev: true + + /prelude-ls@1.2.1: + resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} + engines: {node: '>= 0.8.0'} + dev: true + + /prettier@1.19.1: + resolution: {integrity: sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==} + engines: {node: '>=4'} + hasBin: true + dev: false + + /pretty-bytes@5.6.0: + resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==} + engines: {node: '>=6'} + + /pretty-bytes@6.1.1: + resolution: {integrity: sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==} + engines: {node: ^14.13.1 || >=16.0.0} + dev: false + + /pretty-error@4.0.0: + resolution: {integrity: sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==} + dependencies: + lodash: 4.17.21 + renderkid: 3.0.0 + dev: true + + /pretty-format@27.5.1: + resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + ansi-regex: 5.0.1 + ansi-styles: 5.2.0 + react-is: 17.0.2 + dev: true + + /prismarine-auth@2.2.0: + resolution: {integrity: sha512-3XfR3bqrd7nrTVyEqMwuYRr+/Vy+hkfBplubSDuoRAcRCs90lDx7R4EG3fjMSoKY53RLTXjeFnsB6m1krhL/2A==} + dependencies: + '@azure/msal-node': 1.18.3 + '@xboxreplay/xboxlive-auth': 3.3.3(debug@4.3.4) + debug: 4.3.4(supports-color@8.1.1) + jose: 4.14.6 + node-fetch: 2.7.0 + smart-buffer: 4.2.0 + uuid-1345: 1.0.2 + transitivePeerDependencies: + - encoding + - supports-color + + /prismarine-biome@1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0): + resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==} + peerDependencies: + minecraft-data: 3.45.0 + prismarine-registry: ^1.1.0 + dependencies: + minecraft-data: 3.45.0 + prismarine-registry: 1.7.0 + + /prismarine-chat@1.9.1: + resolution: {integrity: sha512-x7WWa5MNhiLZSO6tw+YyKpzquFZ+DNISVgiV6K3SU0GsishMXe+nto02WhF/4AuFerKdugm9u1d/r4C4zSkJOg==} + dependencies: + mojangson: 2.0.4 + prismarine-item: 1.14.0 + prismarine-nbt: 2.2.1 + prismarine-registry: 1.7.0 + + /prismarine-chunk@1.35.0(minecraft-data@3.45.0): + resolution: {integrity: sha512-Q1lElMUle7wWxWdQjbZo3j2/dLNG325j90IcbbMmBTnHdQSWIjWFe792XOz3RVBlvrhRJEiZk38S6/eQTQ9esw==} + engines: {node: '>=14'} + dependencies: + prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) + prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-nbt: 2.2.1 + prismarine-registry: 1.7.0 + smart-buffer: 4.2.0 + uint4: 0.1.2 + vec3: 0.1.8 + xxhash-wasm: 0.4.2 + transitivePeerDependencies: + - minecraft-data + + /prismarine-entity@2.3.1: + resolution: {integrity: sha512-HOv8l7IetHNf4hwZ7V/W4vM3GNl+e6VCtKDkH9h02TRq7jWngsggKtJV+VanCce/sNwtJUhJDjORGs728ep4MA==} + dependencies: + prismarine-chat: 1.9.1 + prismarine-item: 1.14.0 + prismarine-registry: 1.7.0 + vec3: 0.1.8 + + /prismarine-item@1.14.0: + resolution: {integrity: sha512-udQHYGJ05klFe8Kkc0TOmwoXj5Xl1ZPgHVoMbGUAFB9exN4TFxEa1A39vkSYhxP5Et9PNufQQvFBFVom0nXikA==} + dependencies: + prismarine-nbt: 2.2.1 + prismarine-registry: 1.7.0 + + /prismarine-nbt@1.6.0: + resolution: {integrity: sha512-h0ECvIjjwjMOtsmHxHc8hNY7kzktnKqKXmOHF0AkmH7OjkcHNAFsWRiZNvfc76rOhNonRutHvTVAlh/eLtK0oA==} + dependencies: + protodef: 1.15.0 + dev: true + + /prismarine-nbt@2.2.1: + resolution: {integrity: sha512-Mb50c58CPnuZ+qvM31DBa08tf9UumlTq1LkvpMoUpKfCuN05GZHTqCUwER3lxTSHLL0GZKghIPbYR/JQkINijQ==} + dependencies: + protodef: 1.15.0 + + /prismarine-physics@1.7.0: + resolution: {integrity: sha512-NIm13HYQU6gzWyzb64eSS2civSbnn4cmqZgX+o27TWZMdqJEqmwPZaHSo9rHhPT96c3ZodelRE4qGIEE7q4gow==} + dependencies: + minecraft-data: 3.45.0 + prismarine-nbt: 2.2.1 + vec3: 0.1.8 + dev: true + + /prismarine-physics@1.8.0: + resolution: {integrity: sha512-gbM+S+bmVtOKVv+Z0WGaHMeEeBHISIDsRDRlv8sr0dex3ZJRhuq8djA02CBreguXtI18ZKh6q3TSj2qDr45NHA==} + dependencies: + minecraft-data: 3.45.0 + prismarine-nbt: 2.2.1 + vec3: 0.1.8 + dev: true + + /prismarine-realms@1.3.2: + resolution: {integrity: sha512-5apl9Ru8veTj5q2OozRc4GZOuSIcs3yY4UEtALiLKHstBe8bRw8vNlaz4Zla3jsQ8yP/ul1b1IJINTRbocuA6g==} + dependencies: + debug: 4.3.4(supports-color@8.1.1) + node-fetch: 2.7.0 + transitivePeerDependencies: + - encoding + - supports-color + + /prismarine-recipe@1.3.1(prismarine-registry@1.7.0): + resolution: {integrity: sha512-xfa9E9ACoaDi+YzNQ+nk8kWSIqt5vSZOOCHIT+dTXscf/dng2HaJ/59uwe1D/jvOkAd2OvM6RRJM6fFe0q/LDA==} + peerDependencies: + prismarine-registry: ^1.4.0 + dependencies: + prismarine-registry: 1.7.0 + dev: true + + /prismarine-registry@1.7.0: + resolution: {integrity: sha512-yyva0FpWI078nNeMhx8ekVza5uUTYhEv+C+ADu3wUQXiG8qhXkvrf0uzsnhTgZL8BLdsi2axgCEiKw9qSKIuxQ==} + dependencies: + minecraft-data: 3.45.0 + prismarine-nbt: 2.2.1 + + /prismarine-schematic@1.2.0: + resolution: {integrity: sha512-iMam8wsUIYoqty3PSfAbbSLIWto/EnXs+zv7lHiZxwaiSR8GgFyN71H4Lp3g5ly4yuiLK8ROF4AINjrKx+vmUA==} + dependencies: + minecraft-data: 3.45.0 + prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-nbt: 1.6.0 + prismarine-world: github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786 + vec3: 0.1.8 + dev: true + + /prismarine-windows@2.8.0: + resolution: {integrity: sha512-9HVhJ8tfCeRubYwQzgz8oiHNAebMJ5hDdjm45PZwrOgewaislnR2HDsbPMWiCcyWkYL7J8bVLVoSzEzv5pH98g==} + dependencies: + prismarine-item: 1.14.0 + prismarine-registry: 1.7.0 + typed-emitter: 2.1.0 + + /process-nextick-args@2.0.1: + resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} + + /process@0.11.10: + resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==} + engines: {node: '>= 0.6.0'} + + /progress@2.0.3: + resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==} + engines: {node: '>=0.4.0'} + dev: true + + /promise-queue@2.2.5: + resolution: {integrity: sha512-p/iXrPSVfnqPft24ZdNNLECw/UrtLTpT3jpAAMzl/o5/rDsGCPo3/CQS2611flL6LkoEJ3oQZw7C8Q80ZISXRQ==} + engines: {node: '>= 0.8.0'} + dev: true + + /promise@5.0.0: + resolution: {integrity: sha512-N2BfLz0Sigf7rsm5NnItRwTNqEDUF2ephwEXTcOAf2cO9NwZ9TnIjOmnQNtC0r70CV0S1+uc9mSMmFH7gxk87Q==} + dependencies: + asap: 1.0.0 + dev: false + + /prompts@2.4.2: + resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==} + engines: {node: '>= 6'} + dependencies: + kleur: 3.0.3 + sisteransi: 1.0.5 + dev: true + + /prop-types@15.8.1: + resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==} + dependencies: + loose-envify: 1.4.0 + object-assign: 4.1.1 + react-is: 16.13.1 + + /protodef-validator@1.3.1: + resolution: {integrity: sha512-lZ5FWKZYR9xOjpMw1+EfZRfCjzNRQWPq+Dk+jki47Sikl2EeWEPnTfnJERwnU/EwFq6us+0zqHHzSsmLeYX+Lg==} + hasBin: true + dependencies: + ajv: 6.12.6 + + /protodef@1.15.0: + resolution: {integrity: sha512-bZ2Omw8dT+DACjJHLrBWZlqN4MlT9g9oSpJDdkUAJOStUzgJp+Zn42FJfPUdwutUxjaxA0PftN0PDlNa2XbneA==} + engines: {node: '>=14'} + dependencies: + lodash.get: 4.4.2 + lodash.reduce: 4.6.0 + protodef-validator: 1.3.1 + readable-stream: 3.6.2 + + /proxy-addr@2.0.7: + resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==} + engines: {node: '>= 0.10'} + dependencies: + forwarded: 0.2.0 + ipaddr.js: 1.9.1 + + /proxy-compare@2.5.1: + resolution: {integrity: sha512-oyfc0Tx87Cpwva5ZXezSp5V9vht1c7dZBhvuV/y3ctkgMVUmiAGDVeeB0dKhGSyT0v1ZTEQYpe/RXlBVBNuCLA==} + + /proxy-from-env@1.0.0: + resolution: {integrity: sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==} + + /proxy-from-env@1.1.0: + resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} + dev: true + + /psl@1.9.0: + resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} + + /public-encrypt@4.0.3: + resolution: {integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==} + dependencies: + bn.js: 4.12.0 + browserify-rsa: 4.1.0 + create-hash: 1.2.0 + parse-asn1: 5.1.6 + randombytes: 2.1.0 + safe-buffer: 5.2.1 + dev: true + + /pump@3.0.0: + resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==} + dependencies: + end-of-stream: 1.4.4 + once: 1.4.0 + + /punycode@1.4.1: + resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==} + dev: false + + /punycode@2.3.0: + resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} + engines: {node: '>=6'} + + /puppeteer@16.0.0: + resolution: {integrity: sha512-FgSe21IHNHkqv1SiJiob4ANsxVujcINa4p3MaDEMyoZsocbgSgwYE0c9lnF8eoinw4id3vx4DOXwhFdOOwVlDg==} + engines: {node: '>=14.1.0'} + deprecated: < 18.1.0 is no longer supported + requiresBuild: true + dependencies: + cross-fetch: 3.1.5 + debug: 4.3.4(supports-color@8.1.1) + devtools-protocol: 0.0.1019158 + extract-zip: 2.0.1(supports-color@8.1.1) + https-proxy-agent: 5.0.1 + pkg-dir: 4.2.0 + progress: 2.0.3 + proxy-from-env: 1.1.0 + rimraf: 3.0.2 + tar-fs: 2.1.1 + unbzip2-stream: 1.4.3 + ws: 8.8.1 + transitivePeerDependencies: + - bufferutil + - encoding + - supports-color + - utf-8-validate + dev: true + + /qrcode.react@3.1.0(react@18.2.0): + resolution: {integrity: sha512-oyF+Urr3oAMUG/OiOuONL3HXM+53wvuH3mtIWQrYmsXoAq0DkvZp2RYUWFSMFtbdOpuS++9v+WAkzNVkMlNW6Q==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + dependencies: + react: 18.2.0 + dev: false + + /qs@6.10.4: + resolution: {integrity: sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==} + engines: {node: '>=0.6'} + dependencies: + side-channel: 1.0.4 + + /qs@6.11.0: + resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} + engines: {node: '>=0.6'} + dependencies: + side-channel: 1.0.4 + + /qs@6.11.2: + resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==} + engines: {node: '>=0.6'} + dependencies: + side-channel: 1.0.4 + + /qs@6.5.3: + resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==} + engines: {node: '>=0.6'} + dev: true + + /querystringify@2.2.0: + resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} + + /queue-microtask@1.2.3: + resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} + dev: true + + /railroad-diagrams@1.0.0: + resolution: {integrity: sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==} + + /rambda@6.9.0: + resolution: {integrity: sha512-yosVdGg1hNGkXPzqGiOYNEpXKjEOxzUCg2rB0l+NKdyCaSf4z+i5ojbN0IqDSezMMf71YEglI+ZUTgTffn5afw==} + dev: false + + /randexp@0.4.6: + resolution: {integrity: sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==} + engines: {node: '>=0.12'} + dependencies: + discontinuous-range: 1.0.0 + ret: 0.1.15 + + /random-seed@0.3.0: + resolution: {integrity: sha512-y13xtn3kcTlLub3HKWXxJNeC2qK4mB59evwZ5EkeRlolx+Bp2ztF7LbcZmyCnOqlHQrLnfuNbi1sVmm9lPDlDA==} + engines: {node: '>= 0.6.0'} + dependencies: + json-stringify-safe: 5.0.1 + dev: false + + /randombytes@2.1.0: + resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==} + dependencies: + safe-buffer: 5.2.1 + + /randomfill@1.0.4: + resolution: {integrity: sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==} + dependencies: + randombytes: 2.1.0 + safe-buffer: 5.2.1 + dev: true + + /range-parser@1.2.1: + resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==} + engines: {node: '>= 0.6'} + + /range@0.0.3: + resolution: {integrity: sha512-OxK2nY2bmeEB4NxoBraQIBOOeOIxoBvm6yt8MA1kLappgkG3SyLf173iOtT5woWycrtESDD2g0Nl2yt8YPoUnw==} + engines: {node: '>=0.8'} + dev: false + + /raw-body@2.5.1: + resolution: {integrity: sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==} + engines: {node: '>= 0.8'} + dependencies: + bytes: 3.1.2 + http-errors: 2.0.0 + iconv-lite: 0.4.24 + unpipe: 1.0.0 + + /raw-body@2.5.2: + resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==} + engines: {node: '>= 0.8'} + dependencies: + bytes: 3.1.2 + http-errors: 2.0.0 + iconv-lite: 0.4.24 + unpipe: 1.0.0 + dev: false + + /react-dom@18.2.0(react@18.2.0): + resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==} + peerDependencies: + react: ^18.2.0 + dependencies: + loose-envify: 1.4.0 + react: 18.2.0 + scheduler: 0.23.0 + dev: false + + /react-fast-compare@3.2.2: + resolution: {integrity: sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==} + dev: false + + /react-is@16.13.1: + resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} + + /react-is@17.0.2: + resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} + dev: true + + /react-popper@2.3.0(@popperjs/core@2.11.8)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==} + peerDependencies: + '@popperjs/core': ^2.0.0 + react: ^16.8.0 || ^17 || ^18 + react-dom: ^16.8.0 || ^17 || ^18 + dependencies: + '@popperjs/core': 2.11.8 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + react-fast-compare: 3.2.2 + warning: 4.0.3 + dev: false + + /react-portal@4.2.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-fE9kOBagwmTXZ3YGRYb4gcMy+kSA+yLO0xnPankjRlfBv4uCpFXqKPfkpsGQQR15wkZ9EssnvTOl1yMzbkxhPQ==} + peerDependencies: + react: ^15.0.0-0 || ^16.0.0-0 || ^17.0.0-0 + react-dom: ^15.0.0-0 || ^16.0.0-0 || ^17.0.0-0 + dependencies: + prop-types: 15.8.1 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: false + + /react-refresh@0.14.0: + resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==} + engines: {node: '>=0.10.0'} + dev: false + + /react-universal-interface@0.6.2(react@18.2.0)(tslib@2.6.2): + resolution: {integrity: sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==} + peerDependencies: + react: '*' + tslib: '*' + dependencies: + react: 18.2.0 + tslib: 2.6.2 + dev: false + + /react-use-measure@2.1.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-nocZhN26cproIiIduswYpV5y5lQpSQS1y/4KuvUCjSKmw7ZWIS/+g3aFnX3WdBkyuGUtTLif3UTqnLLhbDoQig==} + peerDependencies: + react: '>=16.13' + react-dom: '>=16.13' + dependencies: + debounce: 1.2.1 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: false + + /react-use@17.3.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-hs7+tS4rRm1QLHPfanLCqXIi632tP4V7Sai1ENUP2WTufU6am++tU9uSw9YrNCFqbABiEv0ndKU1XCUcfu2tXA==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 + react-dom: ^16.8.0 || ^17.0.0 + dependencies: + '@types/js-cookie': 2.2.7 + '@xobotyi/scrollbar-width': 1.9.5 + copy-to-clipboard: 3.3.3 + fast-deep-equal: 3.1.3 + fast-shallow-equal: 1.0.0 + js-cookie: 2.2.1 + nano-css: 5.3.5(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + react-universal-interface: 0.6.2(react@18.2.0)(tslib@2.6.2) + resize-observer-polyfill: 1.5.1 + screenfull: 5.2.0 + set-harmonic-interval: 1.0.1 + throttle-debounce: 3.0.1 + ts-easing: 0.2.0 + tslib: 2.6.2 + dev: false + + /react@17.0.2: + resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==} + engines: {node: '>=0.10.0'} + requiresBuild: true + dependencies: + loose-envify: 1.4.0 + object-assign: 4.1.1 + dev: true + optional: true + + /react@18.2.0: + resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==} + engines: {node: '>=0.10.0'} + dependencies: + loose-envify: 1.4.0 + + /read-pkg@3.0.0: + resolution: {integrity: sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==} + engines: {node: '>=4'} + dependencies: + load-json-file: 4.0.0 + normalize-package-data: 2.5.0 + path-type: 3.0.0 + dev: true + + /readable-stream@2.3.8: + resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==} + dependencies: + core-util-is: 1.0.3 + inherits: 2.0.4 + isarray: 1.0.0 + process-nextick-args: 2.0.1 + safe-buffer: 5.1.2 + string_decoder: 1.1.1 + util-deprecate: 1.0.2 + + /readable-stream@3.6.2: + resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} + engines: {node: '>= 6'} + dependencies: + inherits: 2.0.4 + string_decoder: 1.3.0 + util-deprecate: 1.0.2 + + /readable-stream@4.4.2: + resolution: {integrity: sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + abort-controller: 3.0.0 + buffer: 6.0.3 + events: 3.3.0 + process: 0.11.10 + string_decoder: 1.3.0 + + /readdirp@3.6.0: + resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} + engines: {node: '>=8.10.0'} + dependencies: + picomatch: 2.3.1 + + /readline@1.3.0: + resolution: {integrity: sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==} + dev: false + + /rechoir@0.8.0: + resolution: {integrity: sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==} + engines: {node: '>= 10.13.0'} + dependencies: + resolve: 1.22.4 + + /reflect.getprototypeof@1.0.3: + resolution: {integrity: sha512-TTAOZpkJ2YLxl7mVHWrNo3iDMEkYlva/kgFcXndqMgbo/AZUmmavEkdXV+hXtE4P8xdyEKRzalaFqZVuwIk/Nw==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + get-intrinsic: 1.2.1 + globalthis: 1.0.3 + which-builtin-type: 1.1.3 + dev: true + + /regenerate-unicode-properties@10.1.0: + resolution: {integrity: sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==} + engines: {node: '>=4'} + dependencies: + regenerate: 1.4.2 + + /regenerate@1.4.2: + resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==} + + /regenerator-runtime@0.13.11: + resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} + dev: false + + /regenerator-runtime@0.14.0: + resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==} + + /regenerator-transform@0.15.2: + resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==} + dependencies: + '@babel/runtime': 7.22.11 + + /regexp.prototype.flags@1.5.0: + resolution: {integrity: sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + functions-have-names: 1.2.3 + + /regexpp@3.2.0: + resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==} + engines: {node: '>=8'} + dev: true + + /regexpu-core@5.3.2: + resolution: {integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==} + engines: {node: '>=4'} + dependencies: + '@babel/regjsgen': 0.8.0 + regenerate: 1.4.2 + regenerate-unicode-properties: 10.1.0 + regjsparser: 0.9.1 + unicode-match-property-ecmascript: 2.0.0 + unicode-match-property-value-ecmascript: 2.1.0 + + /regjsparser@0.9.1: + resolution: {integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==} + hasBin: true + dependencies: + jsesc: 0.5.0 + + /relateurl@0.2.7: + resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==} + engines: {node: '>= 0.10'} + dev: true + + /renderkid@3.0.0: + resolution: {integrity: sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==} + dependencies: + css-select: 4.3.0 + dom-converter: 0.2.0 + htmlparser2: 6.1.0 + lodash: 4.17.21 + strip-ansi: 6.0.1 + dev: true + + /request-progress@3.0.0: + resolution: {integrity: sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==} + dependencies: + throttleit: 1.0.0 + + /request-promise-core@1.1.4(request@2.88.2): + resolution: {integrity: sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==} + engines: {node: '>=0.10.0'} + peerDependencies: + request: ^2.34 + dependencies: + lodash: 4.17.21 + request: 2.88.2 + dev: true + + /request-promise@4.2.6(request@2.88.2): + resolution: {integrity: sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==} + engines: {node: '>=0.10.0'} + deprecated: request-promise has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142 + peerDependencies: + request: ^2.34 + dependencies: + bluebird: 3.7.2 + request: 2.88.2 + request-promise-core: 1.1.4(request@2.88.2) + stealthy-require: 1.1.1 + tough-cookie: 2.5.0 + dev: true + + /request@2.88.2: + resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==} + engines: {node: '>= 6'} + deprecated: request has been deprecated, see https://github.com/request/request/issues/3142 + dependencies: + aws-sign2: 0.7.0 + aws4: 1.12.0 + caseless: 0.12.0 + combined-stream: 1.0.8 + extend: 3.0.2 + forever-agent: 0.6.1 + form-data: 2.3.3 + har-validator: 5.1.5 + http-signature: 1.2.0 + is-typedarray: 1.0.0 + isstream: 0.1.2 + json-stringify-safe: 5.0.1 + mime-types: 2.1.35 + oauth-sign: 0.9.0 + performance-now: 2.1.0 + qs: 6.5.3 + safe-buffer: 5.2.1 + tough-cookie: 2.5.0 + tunnel-agent: 0.6.0 + uuid: 3.4.0 + dev: true + + /require-directory@2.1.1: + resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} + engines: {node: '>=0.10.0'} + + /require-from-string@2.0.2: + resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} + engines: {node: '>=0.10.0'} + + /requires-port@1.0.0: + resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} + + /resize-observer-polyfill@1.5.1: + resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==} + dev: false + + /resolve-cwd@3.0.0: + resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==} + engines: {node: '>=8'} + dependencies: + resolve-from: 5.0.0 + + /resolve-dir@0.1.1: + resolution: {integrity: sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==} + engines: {node: '>=0.10.0'} + dependencies: + expand-tilde: 1.2.2 + global-modules: 0.2.3 + dev: true + + /resolve-from@4.0.0: + resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} + engines: {node: '>=4'} + + /resolve-from@5.0.0: + resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==} + engines: {node: '>=8'} + + /resolve-pkg-maps@1.0.0: + resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} + dev: false + + /resolve.exports@1.1.1: + resolution: {integrity: sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==} + engines: {node: '>=10'} + dev: true + + /resolve@1.22.4: + resolution: {integrity: sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==} + hasBin: true + dependencies: + is-core-module: 2.13.0 + path-parse: 1.0.7 + supports-preserve-symlinks-flag: 1.0.0 + + /resolve@2.0.0-next.4: + resolution: {integrity: sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==} + hasBin: true + dependencies: + is-core-module: 2.13.0 + path-parse: 1.0.7 + supports-preserve-symlinks-flag: 1.0.0 + dev: true + + /restore-cursor@3.1.0: + resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==} + engines: {node: '>=8'} + dependencies: + onetime: 5.1.2 + signal-exit: 3.0.7 + + /ret@0.1.15: + resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==} + engines: {node: '>=0.12'} + + /retry@0.13.1: + resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==} + engines: {node: '>= 4'} + + /reusify@1.0.4: + resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} + engines: {iojs: '>=1.0.0', node: '>=0.10.0'} + dev: true + + /rfdc@1.3.0: + resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==} + + /rimraf@2.7.1: + resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} + hasBin: true + dependencies: + glob: 7.2.3 + + /rimraf@3.0.2: + resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} + hasBin: true + dependencies: + glob: 7.2.3 + + /rimraf@5.0.1: + resolution: {integrity: sha512-OfFZdwtd3lZ+XZzYP/6gTACubwFcHdLRqS9UX3UwpU2dnGQYkPFISRwvM3w9IiB2w7bW5qGo/uAwE4SmXXSKvg==} + engines: {node: '>=14'} + hasBin: true + dependencies: + glob: 10.3.3 + dev: true + + /ripemd160@2.0.2: + resolution: {integrity: sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==} + dependencies: + hash-base: 3.1.0 + inherits: 2.0.4 + dev: true + + /rollup-plugin-terser@7.0.2(rollup@2.79.1): + resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==} + deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser + peerDependencies: + rollup: ^2.0.0 + dependencies: + '@babel/code-frame': 7.22.13 + jest-worker: 26.6.2 + rollup: 2.79.1 + serialize-javascript: 4.0.0 + terser: 5.19.2 + + /rollup@2.79.1: + resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==} + engines: {node: '>=10.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.3 + + /rollup@3.28.1: + resolution: {integrity: sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==} + engines: {node: '>=14.18.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.3 + dev: true + + /rtl-css-js@1.16.1: + resolution: {integrity: sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg==} + dependencies: + '@babel/runtime': 7.22.11 + dev: false + + /run-parallel@1.2.0: + resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} + dependencies: + queue-microtask: 1.2.3 + dev: true + + /rxjs@7.8.1: + resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==} + requiresBuild: true + dependencies: + tslib: 2.6.2 + + /safe-array-concat@1.0.0: + resolution: {integrity: sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==} + engines: {node: '>=0.4'} + dependencies: + call-bind: 1.0.2 + get-intrinsic: 1.2.1 + has-symbols: 1.0.3 + isarray: 2.0.5 + + /safe-buffer@5.1.2: + resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} + + /safe-buffer@5.2.1: + resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} + + /safe-regex-test@1.0.0: + resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==} + dependencies: + call-bind: 1.0.2 + get-intrinsic: 1.2.1 + is-regex: 1.1.4 + + /safer-buffer@2.1.2: + resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} + + /sanitize-filename@1.6.3: + resolution: {integrity: sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==} + dependencies: + truncate-utf8-bytes: 1.0.2 + dev: false + + /sax@1.2.4: + resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==} + dev: false + + /saxes@5.0.1: + resolution: {integrity: sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==} + engines: {node: '>=10'} + dependencies: + xmlchars: 2.2.0 + dev: true + + /scheduler@0.23.0: + resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==} + dependencies: + loose-envify: 1.4.0 + dev: false + + /schema-utils@3.3.0: + resolution: {integrity: sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==} + engines: {node: '>= 10.13.0'} + dependencies: + '@types/json-schema': 7.0.12 + ajv: 6.12.6 + ajv-keywords: 3.5.2(ajv@6.12.6) + + /schema-utils@4.2.0: + resolution: {integrity: sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==} + engines: {node: '>= 12.13.0'} + dependencies: + '@types/json-schema': 7.0.12 + ajv: 8.12.0 + ajv-formats: 2.1.1(ajv@8.12.0) + ajv-keywords: 5.1.0(ajv@8.12.0) + + /screenfull@5.2.0: + resolution: {integrity: sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==} + engines: {node: '>=0.10.0'} + dev: false + + /sdp@3.2.0: + resolution: {integrity: sha512-d7wDPgDV3DDiqulJjKiV2865wKsJ34YI+NDREbm+FySq6WuKOikwyNQcm+doLAZ1O6ltdO0SeKle2xMpN3Brgw==} + dev: false + + /secure-compare@3.0.1: + resolution: {integrity: sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw==} + dev: true + + /select-hose@2.0.0: + resolution: {integrity: sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==} + + /selfsigned@2.1.1: + resolution: {integrity: sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==} + engines: {node: '>=10'} + dependencies: + node-forge: 1.3.1 + + /semver@5.7.2: + resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==} + hasBin: true + dev: true + + /semver@6.3.1: + resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} + hasBin: true + + /semver@7.5.4: + resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} + engines: {node: '>=10'} + hasBin: true + dependencies: + lru-cache: 6.0.0 + + /send@0.18.0: + resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} + engines: {node: '>= 0.8.0'} + dependencies: + debug: 2.6.9 + depd: 2.0.0 + destroy: 1.2.0 + encodeurl: 1.0.2 + escape-html: 1.0.3 + etag: 1.8.1 + fresh: 0.5.2 + http-errors: 2.0.0 + mime: 1.6.0 + ms: 2.1.3 + on-finished: 2.4.1 + range-parser: 1.2.1 + statuses: 2.0.1 + transitivePeerDependencies: + - supports-color + + /sentence-case@3.0.4: + resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==} + dependencies: + no-case: 3.0.4 + tslib: 2.6.2 + upper-case-first: 2.0.2 + dev: false + + /serialize-javascript@4.0.0: + resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==} + dependencies: + randombytes: 2.1.0 + + /serialize-javascript@6.0.1: + resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==} + dependencies: + randombytes: 2.1.0 + + /serve-index@1.9.1: + resolution: {integrity: sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==} + engines: {node: '>= 0.8.0'} + dependencies: + accepts: 1.3.8 + batch: 0.6.1 + debug: 2.6.9 + escape-html: 1.0.3 + http-errors: 1.6.3 + mime-types: 2.1.35 + parseurl: 1.3.3 + transitivePeerDependencies: + - supports-color + + /serve-static@1.15.0: + resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==} + engines: {node: '>= 0.8.0'} + dependencies: + encodeurl: 1.0.2 + escape-html: 1.0.3 + parseurl: 1.3.3 + send: 0.18.0 + transitivePeerDependencies: + - supports-color + + /set-blocking@2.0.0: + resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} + dev: true + + /set-harmonic-interval@1.0.1: + resolution: {integrity: sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g==} + engines: {node: '>=6.9'} + dev: false + + /setimmediate@1.0.5: + resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==} + + /setprototypeof@1.1.0: + resolution: {integrity: sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==} + + /setprototypeof@1.2.0: + resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} + + /sha.js@2.4.11: + resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==} + hasBin: true + dependencies: + inherits: 2.0.4 + safe-buffer: 5.2.1 + dev: true + + /shallow-clone@0.1.2: + resolution: {integrity: sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==} + engines: {node: '>=0.10.0'} + dependencies: + is-extendable: 0.1.1 + kind-of: 2.0.1 + lazy-cache: 0.2.7 + mixin-object: 2.0.1 + dev: true + + /shallow-clone@3.0.1: + resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==} + engines: {node: '>=8'} + dependencies: + kind-of: 6.0.3 + + /shebang-command@1.2.0: + resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==} + engines: {node: '>=0.10.0'} + dependencies: + shebang-regex: 1.0.0 + dev: true + + /shebang-command@2.0.0: + resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} + engines: {node: '>=8'} + dependencies: + shebang-regex: 3.0.0 + + /shebang-regex@1.0.0: + resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==} + engines: {node: '>=0.10.0'} + dev: true + + /shebang-regex@3.0.0: + resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} + engines: {node: '>=8'} + + /shell-quote@1.8.1: + resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==} + + /side-channel@1.0.4: + resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} + dependencies: + call-bind: 1.0.2 + get-intrinsic: 1.2.1 + object-inspect: 1.12.3 + + /signal-exit@3.0.7: + resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} + + /signal-exit@4.1.0: + resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} + engines: {node: '>=14'} + dev: true + + /simple-concat@1.0.1: + resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==} + dev: true + + /simple-get@3.1.1: + resolution: {integrity: sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==} + dependencies: + decompress-response: 4.2.1 + once: 1.4.0 + simple-concat: 1.0.1 + dev: true + + /sisteransi@1.0.5: + resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} + dev: true + + /slash@3.0.0: + resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} + engines: {node: '>=8'} + dev: true + + /slash@4.0.0: + resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==} + engines: {node: '>=12'} + dev: true + + /slice-ansi@3.0.0: + resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==} + engines: {node: '>=8'} + dependencies: + ansi-styles: 4.3.0 + astral-regex: 2.0.0 + is-fullwidth-code-point: 3.0.0 + + /slice-ansi@4.0.0: + resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==} + engines: {node: '>=10'} + dependencies: + ansi-styles: 4.3.0 + astral-regex: 2.0.0 + is-fullwidth-code-point: 3.0.0 + + /smart-buffer@4.2.0: + resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==} + engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} + + /snake-case@3.0.4: + resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==} + dependencies: + dot-case: 3.0.4 + tslib: 2.6.2 + dev: false + + /socket.io-adapter@1.1.2: + resolution: {integrity: sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==} + dev: false + + /socket.io-adapter@2.5.2: + resolution: {integrity: sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==} + dependencies: + ws: 8.11.0 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + + /socket.io-client@2.5.0: + resolution: {integrity: sha512-lOO9clmdgssDykiOmVQQitwBAF3I6mYcQAo7hQ7AM6Ny5X7fp8hIJ3HcQs3Rjz4SoggoxA1OgrQyY8EgTbcPYw==} + dependencies: + backo2: 1.0.2 + component-bind: 1.0.0 + component-emitter: 1.3.0 + debug: 3.1.0 + engine.io-client: 3.5.3 + has-binary2: 1.0.3 + indexof: 0.0.1 + parseqs: 0.0.6 + parseuri: 0.0.6 + socket.io-parser: 3.3.3 + to-array: 0.1.4 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: false + + /socket.io-client@4.7.2: + resolution: {integrity: sha512-vtA0uD4ibrYD793SOIAwlo8cj6haOeMHrGvwPxJsxH7CeIksqJ+3Zc06RvWTIFgiSqx4A3sOnTXpfAEE2Zyz6w==} + engines: {node: '>=10.0.0'} + dependencies: + '@socket.io/component-emitter': 3.1.0 + debug: 4.3.4(supports-color@8.1.1) + engine.io-client: 6.5.2 + socket.io-parser: 4.2.4 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + + /socket.io-parser@3.3.3: + resolution: {integrity: sha512-qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==} + dependencies: + component-emitter: 1.3.0 + debug: 3.1.0 + isarray: 2.0.1 + transitivePeerDependencies: + - supports-color + dev: false + + /socket.io-parser@3.4.3: + resolution: {integrity: sha512-1rE4dZN3kCI/E5wixd393hmbqa78vVpkKmnEJhLeWoS/C5hbFYAbcSfnWoaVH43u9ToUVtzKjguxEZq+1XZfCQ==} + engines: {node: '>=10.0.0'} + dependencies: + component-emitter: 1.2.1 + debug: 4.1.1 + isarray: 2.0.1 + transitivePeerDependencies: + - supports-color + dev: false + + /socket.io-parser@4.2.4: + resolution: {integrity: sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==} + engines: {node: '>=10.0.0'} + dependencies: + '@socket.io/component-emitter': 3.1.0 + debug: 4.3.4(supports-color@8.1.1) + transitivePeerDependencies: + - supports-color + + /socket.io@2.5.0: + resolution: {integrity: sha512-gGunfS0od3VpwDBpGwVkzSZx6Aqo9uOcf1afJj2cKnKFAoyl16fvhpsUhmUFd4Ldbvl5JvRQed6eQw6oQp6n8w==} + dependencies: + debug: 4.1.1 + engine.io: 3.6.1 + has-binary2: 1.0.3 + socket.io-adapter: 1.1.2 + socket.io-client: 2.5.0 + socket.io-parser: 3.4.3 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: false + + /socket.io@4.7.2: + resolution: {integrity: sha512-bvKVS29/I5fl2FGLNHuXlQaUH/BlzX1IN6S+NKLNZpBsPZIDH+90eQmCs2Railn4YUiww4SzUedJ6+uzwFnKLw==} + engines: {node: '>=10.2.0'} + dependencies: + accepts: 1.3.8 + base64id: 2.0.0 + cors: 2.8.5 + debug: 4.3.4(supports-color@8.1.1) + engine.io: 6.5.2 + socket.io-adapter: 2.5.2 + socket.io-parser: 4.2.4 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + + /sockjs@0.3.24: + resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==} + dependencies: + faye-websocket: 0.11.4 + uuid: 8.3.2 + websocket-driver: 0.7.4 + + /source-list-map@2.0.1: + resolution: {integrity: sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==} + + /source-map-js@1.0.2: + resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} + engines: {node: '>=0.10.0'} + dev: true + + /source-map-support@0.5.21: + resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} + dependencies: + buffer-from: 1.1.2 + source-map: 0.6.1 + + /source-map@0.5.6: + resolution: {integrity: sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==} + engines: {node: '>=0.10.0'} + dev: false + + /source-map@0.5.7: + resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==} + engines: {node: '>=0.10.0'} + dev: false + + /source-map@0.6.1: + resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} + engines: {node: '>=0.10.0'} + + /source-map@0.7.4: + resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==} + engines: {node: '>= 8'} + + /source-map@0.8.0-beta.0: + resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} + engines: {node: '>= 8'} + dependencies: + whatwg-url: 7.1.0 + + /sourcemap-codec@1.4.8: + resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==} + deprecated: Please use @jridgewell/sourcemap-codec instead + + /spawnd@6.2.0: + resolution: {integrity: sha512-qX/I4lQy4KgVEcNle0kuc4FxFWHISzBhZW1YemPfwmrmQjyZmfTK/OhBKkhrD2ooAaFZEm1maEBLE6/6enwt+g==} + dependencies: + exit: 0.1.2 + signal-exit: 3.0.7 + tree-kill: 1.2.2 + dev: true + + /spdx-correct@3.2.0: + resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} + dependencies: + spdx-expression-parse: 3.0.1 + spdx-license-ids: 3.0.13 + dev: true + + /spdx-exceptions@2.3.0: + resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==} + dev: true + + /spdx-expression-parse@3.0.1: + resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} + dependencies: + spdx-exceptions: 2.3.0 + spdx-license-ids: 3.0.13 + dev: true + + /spdx-license-ids@3.0.13: + resolution: {integrity: sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==} + dev: true + + /spdy-transport@3.0.0: + resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==} + dependencies: + debug: 4.3.4(supports-color@8.1.1) + detect-node: 2.1.0 + hpack.js: 2.1.6 + obuf: 1.1.2 + readable-stream: 3.6.2 + wbuf: 1.7.3 + transitivePeerDependencies: + - supports-color + + /spdy@4.0.2: + resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==} + engines: {node: '>=6.0.0'} + dependencies: + debug: 4.3.4(supports-color@8.1.1) + handle-thing: 2.0.1 + http-deceiver: 1.2.7 + select-hose: 2.0.0 + spdy-transport: 3.0.0 + transitivePeerDependencies: + - supports-color + + /speed-measure-webpack-plugin@1.5.0(webpack@5.88.2): + resolution: {integrity: sha512-Re0wX5CtM6gW7bZA64ONOfEPEhwbiSF/vz6e2GvadjuaPrQcHTQdRGsD8+BE7iUOysXH8tIenkPCQBEcspXsNg==} + engines: {node: '>=6.0.0'} + peerDependencies: + webpack: ^1 || ^2 || ^3 || ^4 || ^5 + dependencies: + chalk: 4.1.2 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + dev: false + + /spiralloop@1.0.2: + resolution: {integrity: sha512-arrGOnli7tXoLWMqK8xXdV0qXLj3zd0OtgeME5SL/Nub0ssSYD27m9SlEsYcJGNi+VvEzVQIoBnAHOOhdZqc5Q==} + dev: false + + /sprintf-js@1.0.3: + resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} + dev: true + + /sshpk@1.17.0: + resolution: {integrity: sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==} + engines: {node: '>=0.10.0'} + hasBin: true + dependencies: + asn1: 0.2.6 + assert-plus: 1.0.0 + bcrypt-pbkdf: 1.0.2 + dashdash: 1.14.1 + ecc-jsbn: 0.1.2 + getpass: 0.1.7 + jsbn: 0.1.1 + safer-buffer: 2.1.2 + tweetnacl: 0.14.5 + + /stack-generator@2.0.10: + resolution: {integrity: sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==} + dependencies: + stackframe: 1.3.4 + dev: false + + /stack-utils@2.0.6: + resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==} + engines: {node: '>=10'} + dependencies: + escape-string-regexp: 2.0.0 + dev: true + + /stackframe@1.3.4: + resolution: {integrity: sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==} + dev: false + + /stacktrace-gps@3.1.2: + resolution: {integrity: sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==} + dependencies: + source-map: 0.5.6 + stackframe: 1.3.4 + dev: false + + /stacktrace-js@2.0.2: + resolution: {integrity: sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==} + dependencies: + error-stack-parser: 2.1.4 + stack-generator: 2.0.10 + stacktrace-gps: 3.1.2 + dev: false + + /standard-engine@15.1.0: + resolution: {integrity: sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + get-stdin: 8.0.0 + minimist: 1.2.8 + pkg-conf: 3.1.0 + xdg-basedir: 4.0.0 + dev: true + + /standard@17.0.0: + resolution: {integrity: sha512-GlCM9nzbLUkr+TYR5I2WQoIah4wHA2lMauqbyPLV/oI5gJxqhHzhjl9EG2N0lr/nRqI3KCbCvm/W3smxvLaChA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + hasBin: true + dependencies: + eslint: 8.48.0 + eslint-config-standard: 17.0.0(eslint-plugin-import@2.28.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.48.0) + eslint-config-standard-jsx: 11.0.0(eslint-plugin-react@7.33.2)(eslint@8.48.0) + eslint-plugin-import: 2.28.1(eslint@8.48.0) + eslint-plugin-n: 15.7.0(eslint@8.48.0) + eslint-plugin-promise: 6.1.1(eslint@8.48.0) + eslint-plugin-react: 7.33.2(eslint@8.48.0) + standard-engine: 15.1.0 + transitivePeerDependencies: + - '@typescript-eslint/parser' + - eslint-import-resolver-typescript + - eslint-import-resolver-webpack + - supports-color + dev: true + + /stats.js@0.17.0: + resolution: {integrity: sha512-hNKz8phvYLPEcRkeG1rsGmV5ChMjKDAWU7/OJJdDErPBNChQXxCo3WZurGpnWc6gZhAzEPFad1aVgyOANH1sMw==} + dev: false + + /statuses@1.5.0: + resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==} + engines: {node: '>= 0.6'} + + /statuses@2.0.1: + resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} + engines: {node: '>= 0.8'} + + /stealthy-require@1.1.1: + resolution: {integrity: sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==} + engines: {node: '>=0.10.0'} + dev: true + + /stream-browserify@3.0.0: + resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==} + dependencies: + inherits: 2.0.4 + readable-stream: 3.6.2 + dev: true + + /string-length@4.0.2: + resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==} + engines: {node: '>=10'} + dependencies: + char-regex: 1.0.2 + strip-ansi: 6.0.1 + dev: true + + /string-width@4.2.3: + resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} + engines: {node: '>=8'} + dependencies: + emoji-regex: 8.0.0 + is-fullwidth-code-point: 3.0.0 + strip-ansi: 6.0.1 + + /string-width@5.1.2: + resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} + engines: {node: '>=12'} + dependencies: + eastasianwidth: 0.2.0 + emoji-regex: 9.2.2 + strip-ansi: 7.1.0 + dev: true + + /string.prototype.matchall@4.0.8: + resolution: {integrity: sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + get-intrinsic: 1.2.1 + has-symbols: 1.0.3 + internal-slot: 1.0.5 + regexp.prototype.flags: 1.5.0 + side-channel: 1.0.4 + + /string.prototype.padend@3.1.4: + resolution: {integrity: sha512-67otBXoksdjsnXXRUq+KMVTdlVRZ2af422Y0aTyTjVaoQkGr3mxl2Bc5emi7dOQ3OGVVQQskmLEWwFXwommpNw==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + dev: true + + /string.prototype.trim@1.2.7: + resolution: {integrity: sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + + /string.prototype.trimend@1.0.6: + resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + + /string.prototype.trimstart@1.0.6: + resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.22.1 + + /string_decoder@1.1.1: + resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} + dependencies: + safe-buffer: 5.1.2 + + /string_decoder@1.3.0: + resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==} + dependencies: + safe-buffer: 5.2.1 + + /stringify-object@3.3.0: + resolution: {integrity: sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==} + engines: {node: '>=4'} + dependencies: + get-own-enumerable-property-symbols: 3.0.2 + is-obj: 1.0.1 + is-regexp: 1.0.0 + + /strip-ansi@6.0.1: + resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} + engines: {node: '>=8'} + dependencies: + ansi-regex: 5.0.1 + + /strip-ansi@7.1.0: + resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} + engines: {node: '>=12'} + dependencies: + ansi-regex: 6.0.1 + dev: true + + /strip-bom@3.0.0: + resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} + engines: {node: '>=4'} + dev: true + + /strip-bom@4.0.0: + resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==} + engines: {node: '>=8'} + dev: true + + /strip-comments@2.0.1: + resolution: {integrity: sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==} + engines: {node: '>=10'} + + /strip-final-newline@2.0.0: + resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} + engines: {node: '>=6'} + + /strip-json-comments@3.1.1: + resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} + engines: {node: '>=8'} + dev: true + + /style-loader@3.3.3(webpack@5.88.2): + resolution: {integrity: sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==} + engines: {node: '>= 12.13.0'} + peerDependencies: + webpack: ^5.0.0 + dependencies: + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + dev: true + + /stylis@4.2.0: + resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==} + dev: false + + /supports-color@5.5.0: + resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} + engines: {node: '>=4'} + dependencies: + has-flag: 3.0.0 + + /supports-color@7.2.0: + resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} + engines: {node: '>=8'} + dependencies: + has-flag: 4.0.0 + + /supports-color@8.1.1: + resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==} + engines: {node: '>=10'} + dependencies: + has-flag: 4.0.0 + + /supports-hyperlinks@2.3.0: + resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==} + engines: {node: '>=8'} + dependencies: + has-flag: 4.0.0 + supports-color: 7.2.0 + dev: true + + /supports-preserve-symlinks-flag@1.0.0: + resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} + engines: {node: '>= 0.4'} + + /symbol-tree@3.2.4: + resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} + dev: true + + /tapable@2.2.1: + resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} + engines: {node: '>=6'} + + /tar-fs@2.1.1: + resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} + dependencies: + chownr: 1.1.4 + mkdirp-classic: 0.5.3 + pump: 3.0.0 + tar-stream: 2.2.0 + dev: true + + /tar-stream@2.2.0: + resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==} + engines: {node: '>=6'} + dependencies: + bl: 4.1.0 + end-of-stream: 1.4.4 + fs-constants: 1.0.0 + inherits: 2.0.4 + readable-stream: 3.6.2 + dev: true + + /tar@6.1.15: + resolution: {integrity: sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==} + engines: {node: '>=10'} + dependencies: + chownr: 2.0.0 + fs-minipass: 2.1.0 + minipass: 5.0.0 + minizlib: 2.1.2 + mkdirp: 1.0.4 + yallist: 4.0.0 + dev: true + + /temp-dir@2.0.0: + resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==} + engines: {node: '>=8'} + + /tempy@0.6.0: + resolution: {integrity: sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==} + engines: {node: '>=10'} + dependencies: + is-stream: 2.0.1 + temp-dir: 2.0.0 + type-fest: 0.16.0 + unique-string: 2.0.0 + + /terminal-link@2.1.1: + resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==} + engines: {node: '>=8'} + dependencies: + ansi-escapes: 4.3.2 + supports-hyperlinks: 2.3.0 + dev: true + + /terser-webpack-plugin@5.3.9(esbuild@0.19.2)(webpack@5.88.2): + resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} + engines: {node: '>= 10.13.0'} + peerDependencies: + '@swc/core': '*' + esbuild: '*' + uglify-js: '*' + webpack: ^5.1.0 + peerDependenciesMeta: + '@swc/core': + optional: true + esbuild: + optional: true + uglify-js: + optional: true + dependencies: + '@jridgewell/trace-mapping': 0.3.19 + esbuild: 0.19.2 + jest-worker: 27.5.1 + schema-utils: 3.3.0 + serialize-javascript: 6.0.1 + terser: 5.19.2 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + + /terser@5.19.2: + resolution: {integrity: sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==} + engines: {node: '>=10'} + hasBin: true + dependencies: + '@jridgewell/source-map': 0.3.5 + acorn: 8.10.0 + commander: 2.20.3 + source-map-support: 0.5.21 + + /test-exclude@6.0.0: + resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==} + engines: {node: '>=8'} + dependencies: + '@istanbuljs/schema': 0.1.3 + glob: 7.2.3 + minimatch: 3.1.2 + dev: true + + /text-table@0.2.0: + resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} + dev: true + + /thenify-all@1.6.0: + resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} + engines: {node: '>=0.8'} + dependencies: + thenify: 3.3.1 + dev: true + + /thenify@3.3.1: + resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} + dependencies: + any-promise: 1.3.0 + dev: true + + /three.meshline@1.4.0: + resolution: {integrity: sha512-A8IsiMrWP8zmHisGDAJ76ZD7t/dOF/oCe/FUKNE6Bu01ZYEx8N6IlU/1Plb2aOZtAuWM2A8s8qS3hvY0OFuvOw==} + + /three@0.128.0: + resolution: {integrity: sha512-i0ap/E+OaSfzw7bD1TtYnPo3VEplkl70WX5fZqZnfZsE3k3aSFudqrrC9ldFZfYFkn1zwDmBcdGfiIm/hnbyZA==} + + /throat@6.0.2: + resolution: {integrity: sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==} + dev: true + + /throttle-debounce@3.0.1: + resolution: {integrity: sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==} + engines: {node: '>=10'} + dev: false + + /throttleit@1.0.0: + resolution: {integrity: sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==} + + /through@2.3.8: + resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} + + /thunky@1.1.0: + resolution: {integrity: sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==} + + /timers-browserify@2.0.12: + resolution: {integrity: sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==} + engines: {node: '>=0.6.0'} + dependencies: + setimmediate: 1.0.5 + dev: true + + /timm@1.7.1: + resolution: {integrity: sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw==} + dev: false + + /tinycolor2@1.6.0: + resolution: {integrity: sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==} + dev: false + + /tmp@0.2.1: + resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==} + engines: {node: '>=8.17.0'} + dependencies: + rimraf: 3.0.2 + + /tmpl@1.0.5: + resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==} + dev: true + + /to-array@0.1.4: + resolution: {integrity: sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==} + dev: false + + /to-fast-properties@2.0.0: + resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} + engines: {node: '>=4'} + + /to-regex-range@5.0.1: + resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} + engines: {node: '>=8.0'} + dependencies: + is-number: 7.0.0 + + /toggle-selection@1.0.6: + resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==} + dev: false + + /toidentifier@1.0.1: + resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} + engines: {node: '>=0.6'} + + /tough-cookie@2.5.0: + resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==} + engines: {node: '>=0.8'} + dependencies: + psl: 1.9.0 + punycode: 2.3.0 + dev: true + + /tough-cookie@4.1.3: + resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==} + engines: {node: '>=6'} + dependencies: + psl: 1.9.0 + punycode: 2.3.0 + universalify: 0.2.0 + url-parse: 1.5.10 + + /tr46@0.0.3: + resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} + + /tr46@1.0.1: + resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} + dependencies: + punycode: 2.3.0 + + /tr46@2.1.0: + resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==} + engines: {node: '>=8'} + dependencies: + punycode: 2.3.0 + dev: true + + /tree-kill@1.2.2: + resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} + hasBin: true + dev: true + + /truncate-utf8-bytes@1.0.2: + resolution: {integrity: sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==} + dependencies: + utf8-byte-length: 1.0.4 + dev: false + + /ts-easing@0.2.0: + resolution: {integrity: sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==} + dev: false + + /tsconfig-paths@3.14.2: + resolution: {integrity: sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==} + dependencies: + '@types/json5': 0.0.29 + json5: 1.0.2 + minimist: 1.2.8 + strip-bom: 3.0.0 + dev: true + + /tslib@2.6.2: + resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} + + /tunnel-agent@0.6.0: + resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} + dependencies: + safe-buffer: 5.2.1 + + /tweetnacl@0.14.5: + resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==} + + /type-check@0.4.0: + resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} + engines: {node: '>= 0.8.0'} + dependencies: + prelude-ls: 1.2.1 + dev: true + + /type-detect@4.0.8: + resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} + engines: {node: '>=4'} + dev: true + + /type-fest@0.16.0: + resolution: {integrity: sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==} + engines: {node: '>=10'} + + /type-fest@0.20.2: + resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} + engines: {node: '>=10'} + dev: true + + /type-fest@0.21.3: + resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} + engines: {node: '>=10'} + + /type-fest@0.3.1: + resolution: {integrity: sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==} + engines: {node: '>=6'} + dev: true + + /type-fest@2.19.0: + resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==} + engines: {node: '>=12.20'} + dev: false + + /type-is@1.6.18: + resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} + engines: {node: '>= 0.6'} + dependencies: + media-typer: 0.3.0 + mime-types: 2.1.35 + + /typed-array-buffer@1.0.0: + resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + get-intrinsic: 1.2.1 + is-typed-array: 1.1.12 + + /typed-array-byte-length@1.0.0: + resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + for-each: 0.3.3 + has-proto: 1.0.1 + is-typed-array: 1.1.12 + + /typed-array-byte-offset@1.0.0: + resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==} + engines: {node: '>= 0.4'} + 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.12 + + /typed-array-length@1.0.4: + resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==} + dependencies: + call-bind: 1.0.2 + for-each: 0.3.3 + is-typed-array: 1.1.12 + + /typed-emitter@1.4.0: + resolution: {integrity: sha512-weBmoo3HhpKGgLBOYwe8EB31CzDFuaK7CCL+axXhUYhn4jo6DSkHnbefboCF5i4DQ2aMFe0C/FdTWcPdObgHyg==} + dev: true + + /typed-emitter@2.1.0: + resolution: {integrity: sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==} + optionalDependencies: + rxjs: 7.8.1 + + /typedarray-to-buffer@3.1.5: + resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==} + dependencies: + is-typedarray: 1.0.0 + dev: true + + /uint4@0.1.2: + resolution: {integrity: sha512-lhEx78gdTwFWG+mt6cWAZD/R6qrIj0TTBeH5xwyuDJyswLNlGe+KVlUPQ6+mx5Ld332pS0AMUTo9hIly7YsWxQ==} + + /unbox-primitive@1.0.2: + resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} + dependencies: + call-bind: 1.0.2 + has-bigints: 1.0.2 + has-symbols: 1.0.3 + which-boxed-primitive: 1.0.2 + + /unbzip2-stream@1.4.3: + resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==} + dependencies: + buffer: 5.7.1 + through: 2.3.8 + dev: true + + /unicode-canonical-property-names-ecmascript@2.0.0: + resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==} + engines: {node: '>=4'} + + /unicode-match-property-ecmascript@2.0.0: + resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==} + engines: {node: '>=4'} + dependencies: + unicode-canonical-property-names-ecmascript: 2.0.0 + unicode-property-aliases-ecmascript: 2.1.0 + + /unicode-match-property-value-ecmascript@2.1.0: + resolution: {integrity: sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==} + engines: {node: '>=4'} + + /unicode-property-aliases-ecmascript@2.1.0: + resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==} + engines: {node: '>=4'} + + /unidiff@1.0.2: + resolution: {integrity: sha512-2sbEzki5fBmjgAqoafwxRenfMcumMlmVAoJDwYJa3CI4ZVugkdR6qjTw5sVsl29/4JfBBXhWEAd5ars8nRdqXg==} + dependencies: + diff: 2.2.3 + dev: false + + /union@0.5.0: + resolution: {integrity: sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==} + engines: {node: '>= 0.8.0'} + dependencies: + qs: 6.11.2 + dev: true + + /unique-string@2.0.0: + resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==} + engines: {node: '>=8'} + dependencies: + crypto-random-string: 2.0.0 + + /universalify@0.1.2: + resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} + engines: {node: '>= 4.0.0'} + dev: false + + /universalify@0.2.0: + resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==} + engines: {node: '>= 4.0.0'} + + /universalify@2.0.0: + resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==} + engines: {node: '>= 10.0.0'} + + /unpipe@1.0.0: + resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} + engines: {node: '>= 0.8'} + + /untildify@4.0.0: + resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==} + engines: {node: '>=8'} + + /upath@1.2.0: + resolution: {integrity: sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==} + engines: {node: '>=4'} + + /update-browserslist-db@1.0.11(browserslist@4.21.10): + resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==} + hasBin: true + peerDependencies: + browserslist: '>= 4.21.0' + dependencies: + browserslist: 4.21.10 + escalade: 3.1.1 + picocolors: 1.0.0 + + /upper-case-first@2.0.2: + resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==} + dependencies: + tslib: 2.6.2 + dev: false + + /upper-case@2.0.2: + resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==} + dependencies: + tslib: 2.6.2 + dev: false + + /uri-js@4.4.1: + resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} + dependencies: + punycode: 2.3.0 + + /url-join@4.0.1: + resolution: {integrity: sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==} + dev: true + + /url-loader@4.1.1(webpack@5.88.2): + resolution: {integrity: sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==} + engines: {node: '>= 10.13.0'} + peerDependencies: + file-loader: '*' + webpack: ^4.0.0 || ^5.0.0 + peerDependenciesMeta: + file-loader: + optional: true + dependencies: + loader-utils: 2.0.4 + mime-types: 2.1.35 + schema-utils: 3.3.0 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + dev: true + + /url-parse@1.5.10: + resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} + dependencies: + querystringify: 2.2.0 + requires-port: 1.0.0 + + /url@0.11.1: + resolution: {integrity: sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==} + dependencies: + punycode: 1.4.1 + qs: 6.11.2 + dev: false + + /use-deep-compare@1.1.0(react@17.0.2): + resolution: {integrity: sha512-6yY3zmKNCJ1jjIivfZMZMReZjr8e6iC6Uqtp701jvWJ6ejC/usXD+JjmslZDPJQgX8P4B1Oi5XSLHkOLeYSJsA==} + peerDependencies: + react: '>=16.8.0' + dependencies: + dequal: 1.0.0 + react: 17.0.2 + dev: true + optional: true + + /use-deep-compare@1.1.0(react@18.2.0): + resolution: {integrity: sha512-6yY3zmKNCJ1jjIivfZMZMReZjr8e6iC6Uqtp701jvWJ6ejC/usXD+JjmslZDPJQgX8P4B1Oi5XSLHkOLeYSJsA==} + peerDependencies: + react: '>=16.8.0' + dependencies: + dequal: 1.0.0 + react: 18.2.0 + dev: true + + /use-sync-external-store@1.2.0(react@18.2.0): + resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + dependencies: + react: 18.2.0 + + /use-typed-event-listener@4.0.2(react@17.0.2): + resolution: {integrity: sha512-AhjRw+qg5t7OWg7en2Q4XDCdi2iyhALFl71tITL3FeZqt/jD1Qa6KnbH/UolARtID1Gd0IElizbCgolv3ZbUFA==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + peerDependencies: + react: '>=16.14.0' + typescript: '>=4.1.2' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@babel/runtime': 7.22.11 + react: 17.0.2 + use-deep-compare: 1.1.0(react@17.0.2) + dev: true + optional: true + + /use-typed-event-listener@4.0.2(react@18.2.0): + resolution: {integrity: sha512-AhjRw+qg5t7OWg7en2Q4XDCdi2iyhALFl71tITL3FeZqt/jD1Qa6KnbH/UolARtID1Gd0IElizbCgolv3ZbUFA==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + peerDependencies: + react: '>=16.14.0' + typescript: '>=4.1.2' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@babel/runtime': 7.22.11 + react: 18.2.0 + use-deep-compare: 1.1.0(react@18.2.0) + dev: true + + /utf8-byte-length@1.0.4: + resolution: {integrity: sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==} + dev: false + + /utif@2.0.1: + resolution: {integrity: sha512-Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg==} + dependencies: + pako: 1.0.11 + dev: false + + /util-deprecate@1.0.2: + resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + + /util@0.12.5: + resolution: {integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==} + dependencies: + inherits: 2.0.4 + is-arguments: 1.1.1 + is-generator-function: 1.0.10 + is-typed-array: 1.1.12 + which-typed-array: 1.1.11 + dev: true + + /utila@0.4.0: + resolution: {integrity: sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==} + dev: true + + /utils-merge@1.0.1: + resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} + engines: {node: '>= 0.4.0'} + + /uuid-1345@1.0.2: + resolution: {integrity: sha512-bA5zYZui+3nwAc0s3VdGQGBfbVsJLVX7Np7ch2aqcEWFi5lsAEcmO3+lx3djM1npgpZI8KY2FITZ2uYTnYUYyw==} + dependencies: + macaddress: 0.5.3 + + /uuid@3.4.0: + resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==} + deprecated: Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details. + hasBin: true + dev: true + + /uuid@8.3.2: + resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} + hasBin: true + + /v8-to-istanbul@8.1.1: + resolution: {integrity: sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==} + engines: {node: '>=10.12.0'} + dependencies: + '@types/istanbul-lib-coverage': 2.0.4 + convert-source-map: 1.9.0 + source-map: 0.7.4 + dev: true + + /validate-npm-package-license@3.0.4: + resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} + dependencies: + spdx-correct: 3.2.0 + spdx-expression-parse: 3.0.1 + dev: true + + /valtio@1.11.1(react@18.2.0): + resolution: {integrity: sha512-sTKWY1e1AVUu4sY9CimoSZpufAsAXO+fzZrw0X5xtijEmDDQaPPLHZxlpONUpTLtvxPjpQURCSdUuUyBszoEOg==} + engines: {node: '>=12.20.0'} + peerDependencies: + react: '>=16.8' + peerDependenciesMeta: + react: + optional: true + dependencies: + proxy-compare: 2.5.1 + react: 18.2.0 + use-sync-external-store: 1.2.0(react@18.2.0) + dev: false + + /valtio@1.11.2(@types/react@18.2.20)(react@18.2.0): + resolution: {integrity: sha512-1XfIxnUXzyswPAPXo1P3Pdx2mq/pIqZICkWN60Hby0d9Iqb+MEIpqgYVlbflvHdrp2YR/q3jyKWRPJJ100yxaw==} + engines: {node: '>=12.20.0'} + peerDependencies: + '@types/react': '>=16.8' + react: '>=16.8' + peerDependenciesMeta: + '@types/react': + optional: true + react: + optional: true + dependencies: + '@types/react': 18.2.20 + proxy-compare: 2.5.1 + react: 18.2.0 + use-sync-external-store: 1.2.0(react@18.2.0) + + /vary@1.1.2: + resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} + engines: {node: '>= 0.8'} + + /vec3@0.1.8: + resolution: {integrity: sha512-LfKrP625Bsg/Tj52YdYPsHmpsJuo+tc6fLxZxXjEo9k2xSspKlPvoYTHehykKhp1FvV9nm+XU3Ehej5/9tpDCg==} + + /verror@1.10.0: + resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==} + engines: {'0': node >=0.6.0} + dependencies: + assert-plus: 1.0.0 + core-util-is: 1.0.2 + extsprintf: 1.3.0 + + /vite@4.4.9: + resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + esbuild: 0.18.20 + postcss: 8.4.28 + rollup: 3.28.1 + optionalDependencies: + fsevents: 2.3.3 + dev: true + + /w3c-hr-time@1.0.2: + resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} + deprecated: Use your platform's native performance.now() and performance.timeOrigin. + dependencies: + browser-process-hrtime: 1.0.0 + dev: true + + /w3c-xmlserializer@2.0.0: + resolution: {integrity: sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==} + engines: {node: '>=10'} + dependencies: + xml-name-validator: 3.0.0 + dev: true + + /wait-on@6.0.1: + resolution: {integrity: sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==} + engines: {node: '>=10.0.0'} + hasBin: true + dependencies: + axios: 0.25.0 + joi: 17.10.0 + lodash: 4.17.21 + minimist: 1.2.8 + rxjs: 7.8.1 + transitivePeerDependencies: + - debug + dev: true + + /walker@1.0.8: + resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==} + dependencies: + makeerror: 1.0.12 + dev: true + + /warning@4.0.3: + resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==} + dependencies: + loose-envify: 1.4.0 + dev: false + + /watchpack@2.4.0: + resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==} + engines: {node: '>=10.13.0'} + dependencies: + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.11 + + /wbuf@1.7.3: + resolution: {integrity: sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==} + dependencies: + minimalistic-assert: 1.0.1 + + /webidl-conversions@3.0.1: + resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} + + /webidl-conversions@4.0.2: + resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} + + /webidl-conversions@5.0.0: + resolution: {integrity: sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==} + engines: {node: '>=8'} + dev: true + + /webidl-conversions@6.1.0: + resolution: {integrity: sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==} + engines: {node: '>=10.4'} + dev: true + + /webpack-cli@5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2): + resolution: {integrity: sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==} + engines: {node: '>=14.15.0'} + hasBin: true + peerDependencies: + '@webpack-cli/generators': '*' + webpack: 5.x.x + webpack-bundle-analyzer: '*' + webpack-dev-server: '*' + peerDependenciesMeta: + '@webpack-cli/generators': + optional: true + webpack-bundle-analyzer: + optional: true + webpack-dev-server: + optional: true + dependencies: + '@discoveryjs/json-ext': 0.5.7 + '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4)(webpack@5.88.2) + '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4)(webpack@5.88.2) + '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack-dev-server@4.15.1)(webpack@5.88.2) + colorette: 2.0.20 + commander: 10.0.1 + cross-spawn: 7.0.3 + envinfo: 7.10.0 + fastest-levenshtein: 1.0.16 + import-local: 3.1.0 + interpret: 3.1.1 + rechoir: 0.8.0 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack-dev-server: 4.15.1(webpack-cli@5.1.4)(webpack@5.88.2) + webpack-merge: 5.9.0 + + /webpack-dev-middleware@5.3.3(webpack@5.88.2): + resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==} + engines: {node: '>= 12.13.0'} + peerDependencies: + webpack: ^4.0.0 || ^5.0.0 + dependencies: + colorette: 2.0.20 + memfs: 3.5.3 + mime-types: 2.1.35 + range-parser: 1.2.1 + schema-utils: 4.2.0 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + + /webpack-dev-middleware@6.1.1(webpack@5.88.2): + resolution: {integrity: sha512-y51HrHaFeeWir0YO4f0g+9GwZawuigzcAdRNon6jErXy/SqV/+O6eaVAzDqE6t3e3NpGeR5CS+cCDaTC+V3yEQ==} + engines: {node: '>= 14.15.0'} + peerDependencies: + webpack: ^5.0.0 + peerDependenciesMeta: + webpack: + optional: true + dependencies: + colorette: 2.0.20 + memfs: 3.5.3 + mime-types: 2.1.35 + range-parser: 1.2.1 + schema-utils: 4.2.0 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + dev: true + + /webpack-dev-server@4.15.1(webpack-cli@5.1.4)(webpack@5.88.2): + resolution: {integrity: sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==} + engines: {node: '>= 12.13.0'} + hasBin: true + peerDependencies: + webpack: ^4.37.0 || ^5.0.0 + webpack-cli: '*' + peerDependenciesMeta: + webpack: + optional: true + webpack-cli: + optional: true + dependencies: + '@types/bonjour': 3.5.10 + '@types/connect-history-api-fallback': 1.5.0 + '@types/express': 4.17.17 + '@types/serve-index': 1.9.1 + '@types/serve-static': 1.15.2 + '@types/sockjs': 0.3.33 + '@types/ws': 8.5.5 + ansi-html-community: 0.0.8 + bonjour-service: 1.1.1 + chokidar: 3.5.3 + colorette: 2.0.20 + compression: 1.7.4 + connect-history-api-fallback: 2.0.0 + default-gateway: 6.0.3 + express: 4.18.2 + graceful-fs: 4.2.11 + html-entities: 2.4.0 + http-proxy-middleware: 2.0.6(@types/express@4.17.17) + ipaddr.js: 2.1.0 + launch-editor: 2.6.0 + open: 8.4.2 + p-retry: 4.6.2 + rimraf: 3.0.2 + schema-utils: 4.2.0 + selfsigned: 2.1.1 + serve-index: 1.9.1 + sockjs: 0.3.24 + spdy: 4.0.2 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) + webpack-dev-middleware: 5.3.3(webpack@5.88.2) + ws: 8.13.0 + transitivePeerDependencies: + - bufferutil + - debug + - supports-color + - utf-8-validate + + /webpack-merge@5.9.0: + resolution: {integrity: sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==} + engines: {node: '>=10.0.0'} + dependencies: + clone-deep: 4.0.1 + wildcard: 2.0.1 + + /webpack-sources@1.4.3: + resolution: {integrity: sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==} + dependencies: + source-list-map: 2.0.1 + source-map: 0.6.1 + + /webpack-sources@3.2.3: + resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} + engines: {node: '>=10.13.0'} + + /webpack@5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4): + resolution: {integrity: sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==} + engines: {node: '>=10.13.0'} + hasBin: true + peerDependencies: + webpack-cli: '*' + peerDependenciesMeta: + webpack-cli: + optional: true + dependencies: + '@types/eslint-scope': 3.7.4 + '@types/estree': 1.0.1 + '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/wasm-edit': 1.11.6 + '@webassemblyjs/wasm-parser': 1.11.6 + acorn: 8.10.0 + acorn-import-assertions: 1.9.0(acorn@8.10.0) + browserslist: 4.21.10 + chrome-trace-event: 1.0.3 + enhanced-resolve: 5.15.0 + es-module-lexer: 1.3.0 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.11 + json-parse-even-better-errors: 2.3.1 + loader-runner: 4.3.0 + mime-types: 2.1.35 + neo-async: 2.6.2 + schema-utils: 3.3.0 + tapable: 2.2.1 + terser-webpack-plugin: 5.3.9(esbuild@0.19.2)(webpack@5.88.2) + watchpack: 2.4.0 + webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) + webpack-sources: 3.2.3 + transitivePeerDependencies: + - '@swc/core' + - esbuild + - uglify-js + + /webrtc-adapter@8.2.3: + resolution: {integrity: sha512-gnmRz++suzmvxtp3ehQts6s2JtAGPuDPjA1F3a9ckNpG1kYdYuHWYpazoAnL9FS5/B21tKlhkorbdCXat0+4xQ==} + engines: {node: '>=6.0.0', npm: '>=3.10.0'} + dependencies: + sdp: 3.2.0 + dev: false + + /websocket-driver@0.7.4: + resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} + engines: {node: '>=0.8.0'} + dependencies: + http-parser-js: 0.5.8 + safe-buffer: 5.2.1 + websocket-extensions: 0.1.4 + + /websocket-extensions@0.1.4: + resolution: {integrity: sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==} + engines: {node: '>=0.8.0'} + + /whatwg-encoding@1.0.5: + resolution: {integrity: sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==} + dependencies: + iconv-lite: 0.4.24 + dev: true + + /whatwg-encoding@2.0.0: + resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==} + engines: {node: '>=12'} + dependencies: + iconv-lite: 0.6.3 + dev: true + + /whatwg-fetch@3.6.18: + resolution: {integrity: sha512-ltN7j66EneWn5TFDO4L9inYC1D+Czsxlrw2SalgjMmEMkLfA5SIZxEFdE6QtHFiiM6Q7WL32c7AkI3w6yxM84Q==} + dev: false + + /whatwg-mimetype@2.3.0: + resolution: {integrity: sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==} + dev: true + + /whatwg-url@5.0.0: + resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} + dependencies: + tr46: 0.0.3 + webidl-conversions: 3.0.1 + + /whatwg-url@7.1.0: + resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} + dependencies: + lodash.sortby: 4.7.0 + tr46: 1.0.1 + webidl-conversions: 4.0.2 + + /whatwg-url@8.7.0: + resolution: {integrity: sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==} + engines: {node: '>=10'} + dependencies: + lodash: 4.17.21 + tr46: 2.1.0 + webidl-conversions: 6.1.0 + dev: true + + /which-boxed-primitive@1.0.2: + resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==} + dependencies: + is-bigint: 1.0.4 + is-boolean-object: 1.1.2 + is-number-object: 1.0.7 + is-string: 1.0.7 + is-symbol: 1.0.4 + + /which-builtin-type@1.1.3: + resolution: {integrity: sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==} + engines: {node: '>= 0.4'} + dependencies: + function.prototype.name: 1.1.6 + has-tostringtag: 1.0.0 + is-async-function: 2.0.0 + is-date-object: 1.0.5 + is-finalizationregistry: 1.0.2 + is-generator-function: 1.0.10 + is-regex: 1.1.4 + is-weakref: 1.0.2 + isarray: 2.0.5 + which-boxed-primitive: 1.0.2 + which-collection: 1.0.1 + which-typed-array: 1.1.11 + dev: true + + /which-collection@1.0.1: + resolution: {integrity: sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==} + dependencies: + is-map: 2.0.2 + is-set: 2.0.2 + is-weakmap: 2.0.1 + is-weakset: 2.0.2 + dev: true + + /which-typed-array@1.1.11: + resolution: {integrity: sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==} + engines: {node: '>= 0.4'} + 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@1.3.1: + resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} + hasBin: true + dependencies: + isexe: 2.0.0 + dev: true + + /which@2.0.2: + resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} + engines: {node: '>= 8'} + hasBin: true + dependencies: + isexe: 2.0.0 + + /wide-align@1.1.5: + resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} + dependencies: + string-width: 4.2.3 + dev: true + + /wildcard@2.0.1: + resolution: {integrity: sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==} + + /workbox-background-sync@6.6.0: + resolution: {integrity: sha512-jkf4ZdgOJxC9u2vztxLuPT/UjlH7m/nWRQ/MgGL0v8BJHoZdVGJd18Kck+a0e55wGXdqyHO+4IQTk0685g4MUw==} + dependencies: + idb: 7.1.1 + workbox-core: 6.6.0 + dev: true + + /workbox-background-sync@7.0.0: + resolution: {integrity: sha512-S+m1+84gjdueM+jIKZ+I0Lx0BDHkk5Nu6a3kTVxP4fdj3gKouRNmhO8H290ybnJTOPfBDtTMXSQA/QLTvr7PeA==} + dependencies: + idb: 7.1.1 + workbox-core: 7.0.0 + dev: false + + /workbox-broadcast-update@6.6.0: + resolution: {integrity: sha512-nm+v6QmrIFaB/yokJmQ/93qIJ7n72NICxIwQwe5xsZiV2aI93MGGyEyzOzDPVz5THEr5rC3FJSsO3346cId64Q==} + dependencies: + workbox-core: 6.6.0 + dev: true + + /workbox-broadcast-update@7.0.0: + resolution: {integrity: sha512-oUuh4jzZrLySOo0tC0WoKiSg90bVAcnE98uW7F8GFiSOXnhogfNDGZelPJa+6KpGBO5+Qelv04Hqx2UD+BJqNQ==} + dependencies: + workbox-core: 7.0.0 + dev: false + + /workbox-build@6.6.0: + resolution: {integrity: sha512-Tjf+gBwOTuGyZwMz2Nk/B13Fuyeo0Q84W++bebbVsfr9iLkDSo6j6PST8tET9HYA58mlRXwlMGpyWO8ETJiXdQ==} + engines: {node: '>=10.0.0'} + dependencies: + '@apideck/better-ajv-errors': 0.3.6(ajv@8.12.0) + '@babel/core': 7.22.11 + '@babel/preset-env': 7.22.10(@babel/core@7.22.11) + '@babel/runtime': 7.22.11 + '@rollup/plugin-babel': 5.3.1(@babel/core@7.22.11)(rollup@2.79.1) + '@rollup/plugin-node-resolve': 11.2.1(rollup@2.79.1) + '@rollup/plugin-replace': 2.4.2(rollup@2.79.1) + '@surma/rollup-plugin-off-main-thread': 2.2.3 + ajv: 8.12.0 + common-tags: 1.8.2 + fast-json-stable-stringify: 2.1.0 + fs-extra: 9.1.0 + glob: 7.2.3 + lodash: 4.17.21 + pretty-bytes: 5.6.0 + rollup: 2.79.1 + rollup-plugin-terser: 7.0.2(rollup@2.79.1) + source-map: 0.8.0-beta.0 + stringify-object: 3.3.0 + strip-comments: 2.0.1 + tempy: 0.6.0 + upath: 1.2.0 + workbox-background-sync: 6.6.0 + workbox-broadcast-update: 6.6.0 + workbox-cacheable-response: 6.6.0 + workbox-core: 6.6.0 + workbox-expiration: 6.6.0 + workbox-google-analytics: 6.6.0 + workbox-navigation-preload: 6.6.0 + workbox-precaching: 6.6.0 + workbox-range-requests: 6.6.0 + workbox-recipes: 6.6.0 + workbox-routing: 6.6.0 + workbox-strategies: 6.6.0 + workbox-streams: 6.6.0 + workbox-sw: 6.6.0 + workbox-window: 6.6.0 + transitivePeerDependencies: + - '@types/babel__core' + - supports-color + dev: true + + /workbox-build@7.0.0: + resolution: {integrity: sha512-CttE7WCYW9sZC+nUYhQg3WzzGPr4IHmrPnjKiu3AMXsiNQKx+l4hHl63WTrnicLmKEKHScWDH8xsGBdrYgtBzg==} + engines: {node: '>=16.0.0'} + dependencies: + '@apideck/better-ajv-errors': 0.3.6(ajv@8.12.0) + '@babel/core': 7.22.11 + '@babel/preset-env': 7.22.10(@babel/core@7.22.11) + '@babel/runtime': 7.22.11 + '@rollup/plugin-babel': 5.3.1(@babel/core@7.22.11)(rollup@2.79.1) + '@rollup/plugin-node-resolve': 11.2.1(rollup@2.79.1) + '@rollup/plugin-replace': 2.4.2(rollup@2.79.1) + '@surma/rollup-plugin-off-main-thread': 2.2.3 + ajv: 8.12.0 + common-tags: 1.8.2 + fast-json-stable-stringify: 2.1.0 + fs-extra: 9.1.0 + glob: 7.2.3 + lodash: 4.17.21 + pretty-bytes: 5.6.0 + rollup: 2.79.1 + rollup-plugin-terser: 7.0.2(rollup@2.79.1) + source-map: 0.8.0-beta.0 + stringify-object: 3.3.0 + strip-comments: 2.0.1 + tempy: 0.6.0 + upath: 1.2.0 + workbox-background-sync: 7.0.0 + workbox-broadcast-update: 7.0.0 + workbox-cacheable-response: 7.0.0 + workbox-core: 7.0.0 + workbox-expiration: 7.0.0 + workbox-google-analytics: 7.0.0 + workbox-navigation-preload: 7.0.0 + workbox-precaching: 7.0.0 + workbox-range-requests: 7.0.0 + workbox-recipes: 7.0.0 + workbox-routing: 7.0.0 + workbox-strategies: 7.0.0 + workbox-streams: 7.0.0 + workbox-sw: 7.0.0 + workbox-window: 7.0.0 + transitivePeerDependencies: + - '@types/babel__core' + - supports-color + dev: false + + /workbox-cacheable-response@6.6.0: + resolution: {integrity: sha512-JfhJUSQDwsF1Xv3EV1vWzSsCOZn4mQ38bWEBR3LdvOxSPgB65gAM6cS2CX8rkkKHRgiLrN7Wxoyu+TuH67kHrw==} + deprecated: workbox-background-sync@6.6.0 + dependencies: + workbox-core: 6.6.0 + dev: true + + /workbox-cacheable-response@7.0.0: + resolution: {integrity: sha512-0lrtyGHn/LH8kKAJVOQfSu3/80WDc9Ma8ng0p2i/5HuUndGttH+mGMSvOskjOdFImLs2XZIimErp7tSOPmu/6g==} + dependencies: + workbox-core: 7.0.0 + dev: false + + /workbox-core@6.6.0: + resolution: {integrity: sha512-GDtFRF7Yg3DD859PMbPAYPeJyg5gJYXuBQAC+wyrWuuXgpfoOrIQIvFRZnQ7+czTIQjIr1DhLEGFzZanAT/3bQ==} + dev: true + + /workbox-core@7.0.0: + resolution: {integrity: sha512-81JkAAZtfVP8darBpfRTovHg8DGAVrKFgHpOArZbdFd78VqHr5Iw65f2guwjE2NlCFbPFDoez3D3/6ZvhI/rwQ==} + dev: false + + /workbox-expiration@6.6.0: + resolution: {integrity: sha512-baplYXcDHbe8vAo7GYvyAmlS4f6998Jff513L4XvlzAOxcl8F620O91guoJ5EOf5qeXG4cGdNZHkkVAPouFCpw==} + dependencies: + idb: 7.1.1 + workbox-core: 6.6.0 + dev: true + + /workbox-expiration@7.0.0: + resolution: {integrity: sha512-MLK+fogW+pC3IWU9SFE+FRStvDVutwJMR5if1g7oBJx3qwmO69BNoJQVaMXq41R0gg3MzxVfwOGKx3i9P6sOLQ==} + dependencies: + idb: 7.1.1 + workbox-core: 7.0.0 + dev: false + + /workbox-google-analytics@6.6.0: + resolution: {integrity: sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==} + dependencies: + workbox-background-sync: 6.6.0 + workbox-core: 6.6.0 + workbox-routing: 6.6.0 + workbox-strategies: 6.6.0 + dev: true + + /workbox-google-analytics@7.0.0: + resolution: {integrity: sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==} + dependencies: + workbox-background-sync: 7.0.0 + workbox-core: 7.0.0 + workbox-routing: 7.0.0 + workbox-strategies: 7.0.0 + dev: false + + /workbox-navigation-preload@6.6.0: + resolution: {integrity: sha512-utNEWG+uOfXdaZmvhshrh7KzhDu/1iMHyQOV6Aqup8Mm78D286ugu5k9MFD9SzBT5TcwgwSORVvInaXWbvKz9Q==} + dependencies: + workbox-core: 6.6.0 + dev: true + + /workbox-navigation-preload@7.0.0: + resolution: {integrity: sha512-juWCSrxo/fiMz3RsvDspeSLGmbgC0U9tKqcUPZBCf35s64wlaLXyn2KdHHXVQrb2cqF7I0Hc9siQalainmnXJA==} + dependencies: + workbox-core: 7.0.0 + dev: false + + /workbox-precaching@6.6.0: + resolution: {integrity: sha512-eYu/7MqtRZN1IDttl/UQcSZFkHP7dnvr/X3Vn6Iw6OsPMruQHiVjjomDFCNtd8k2RdjLs0xiz9nq+t3YVBcWPw==} + dependencies: + workbox-core: 6.6.0 + workbox-routing: 6.6.0 + workbox-strategies: 6.6.0 + dev: true + + /workbox-precaching@7.0.0: + resolution: {integrity: sha512-EC0vol623LJqTJo1mkhD9DZmMP604vHqni3EohhQVwhJlTgyKyOkMrZNy5/QHfOby+39xqC01gv4LjOm4HSfnA==} + dependencies: + workbox-core: 7.0.0 + workbox-routing: 7.0.0 + workbox-strategies: 7.0.0 + dev: false + + /workbox-range-requests@6.6.0: + resolution: {integrity: sha512-V3aICz5fLGq5DpSYEU8LxeXvsT//mRWzKrfBOIxzIdQnV/Wj7R+LyJVTczi4CQ4NwKhAaBVaSujI1cEjXW+hTw==} + dependencies: + workbox-core: 6.6.0 + dev: true + + /workbox-range-requests@7.0.0: + resolution: {integrity: sha512-SxAzoVl9j/zRU9OT5+IQs7pbJBOUOlriB8Gn9YMvi38BNZRbM+RvkujHMo8FOe9IWrqqwYgDFBfv6sk76I1yaQ==} + dependencies: + workbox-core: 7.0.0 + dev: false + + /workbox-recipes@6.6.0: + resolution: {integrity: sha512-TFi3kTgYw73t5tg73yPVqQC8QQjxJSeqjXRO4ouE/CeypmP2O/xqmB/ZFBBQazLTPxILUQ0b8aeh0IuxVn9a6A==} + dependencies: + workbox-cacheable-response: 6.6.0 + workbox-core: 6.6.0 + workbox-expiration: 6.6.0 + workbox-precaching: 6.6.0 + workbox-routing: 6.6.0 + workbox-strategies: 6.6.0 + dev: true + + /workbox-recipes@7.0.0: + resolution: {integrity: sha512-DntcK9wuG3rYQOONWC0PejxYYIDHyWWZB/ueTbOUDQgefaeIj1kJ7pdP3LZV2lfrj8XXXBWt+JDRSw1lLLOnww==} + dependencies: + workbox-cacheable-response: 7.0.0 + workbox-core: 7.0.0 + workbox-expiration: 7.0.0 + workbox-precaching: 7.0.0 + workbox-routing: 7.0.0 + workbox-strategies: 7.0.0 + dev: false + + /workbox-routing@6.6.0: + resolution: {integrity: sha512-x8gdN7VDBiLC03izAZRfU+WKUXJnbqt6PG9Uh0XuPRzJPpZGLKce/FkOX95dWHRpOHWLEq8RXzjW0O+POSkKvw==} + dependencies: + workbox-core: 6.6.0 + dev: true + + /workbox-routing@7.0.0: + resolution: {integrity: sha512-8YxLr3xvqidnbVeGyRGkaV4YdlKkn5qZ1LfEePW3dq+ydE73hUUJJuLmGEykW3fMX8x8mNdL0XrWgotcuZjIvA==} + dependencies: + workbox-core: 7.0.0 + dev: false + + /workbox-strategies@6.6.0: + resolution: {integrity: sha512-eC07XGuINAKUWDnZeIPdRdVja4JQtTuc35TZ8SwMb1ztjp7Ddq2CJ4yqLvWzFWGlYI7CG/YGqaETntTxBGdKgQ==} + dependencies: + workbox-core: 6.6.0 + dev: true + + /workbox-strategies@7.0.0: + resolution: {integrity: sha512-dg3qJU7tR/Gcd/XXOOo7x9QoCI9nk74JopaJaYAQ+ugLi57gPsXycVdBnYbayVj34m6Y8ppPwIuecrzkpBVwbA==} + dependencies: + workbox-core: 7.0.0 + dev: false + + /workbox-streams@6.6.0: + resolution: {integrity: sha512-rfMJLVvwuED09CnH1RnIep7L9+mj4ufkTyDPVaXPKlhi9+0czCu+SJggWCIFbPpJaAZmp2iyVGLqS3RUmY3fxg==} + dependencies: + workbox-core: 6.6.0 + workbox-routing: 6.6.0 + dev: true + + /workbox-streams@7.0.0: + resolution: {integrity: sha512-moVsh+5to//l6IERWceYKGiftc+prNnqOp2sgALJJFbnNVpTXzKISlTIsrWY+ogMqt+x1oMazIdHj25kBSq/HQ==} + dependencies: + workbox-core: 7.0.0 + workbox-routing: 7.0.0 + dev: false + + /workbox-sw@6.6.0: + resolution: {integrity: sha512-R2IkwDokbtHUE4Kus8pKO5+VkPHD2oqTgl+XJwh4zbF1HyjAbgNmK/FneZHVU7p03XUt9ICfuGDYISWG9qV/CQ==} + dev: true + + /workbox-sw@7.0.0: + resolution: {integrity: sha512-SWfEouQfjRiZ7GNABzHUKUyj8pCoe+RwjfOIajcx6J5mtgKkN+t8UToHnpaJL5UVVOf5YhJh+OHhbVNIHe+LVA==} + dev: false + + /workbox-webpack-plugin@6.6.0(webpack@5.88.2): + resolution: {integrity: sha512-xNZIZHalboZU66Wa7x1YkjIqEy1gTR+zPM+kjrYJzqN7iurYZBctBLISyScjhkJKYuRrZUP0iqViZTh8rS0+3A==} + engines: {node: '>=10.0.0'} + peerDependencies: + webpack: ^4.4.0 || ^5.9.0 + dependencies: + fast-json-stable-stringify: 2.1.0 + pretty-bytes: 5.6.0 + upath: 1.2.0 + webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack-sources: 1.4.3 + workbox-build: 6.6.0 + transitivePeerDependencies: + - '@types/babel__core' + - supports-color + dev: true + + /workbox-window@6.6.0: + resolution: {integrity: sha512-L4N9+vka17d16geaJXXRjENLFldvkWy7JyGxElRD0JvBxvFEd8LOhr+uXCcar/NzAmIBRv9EZ+M+Qr4mOoBITw==} + dependencies: + '@types/trusted-types': 2.0.3 + workbox-core: 6.6.0 + dev: true + + /workbox-window@7.0.0: + resolution: {integrity: sha512-j7P/bsAWE/a7sxqTzXo3P2ALb1reTfZdvVp6OJ/uLr/C2kZAMvjeWGm8V4htQhor7DOvYg0sSbFN2+flT5U0qA==} + dependencies: + '@types/trusted-types': 2.0.3 + workbox-core: 7.0.0 + dev: false + + /wrap-ansi@6.2.0: + resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} + engines: {node: '>=8'} + dependencies: + ansi-styles: 4.3.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + + /wrap-ansi@7.0.0: + resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} + engines: {node: '>=10'} + dependencies: + ansi-styles: 4.3.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + + /wrap-ansi@8.1.0: + resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} + engines: {node: '>=12'} + dependencies: + ansi-styles: 6.2.1 + string-width: 5.1.2 + strip-ansi: 7.1.0 + dev: true + + /wrappy@1.0.2: + resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} + + /write-file-atomic@3.0.3: + resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==} + dependencies: + imurmurhash: 0.1.4 + is-typedarray: 1.0.0 + signal-exit: 3.0.7 + typedarray-to-buffer: 3.1.5 + dev: true + + /ws@5.2.3: + resolution: {integrity: sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + dependencies: + async-limiter: 1.0.1 + dev: false + + /ws@7.4.6: + resolution: {integrity: sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==} + engines: {node: '>=8.3.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + dev: false + + /ws@7.5.9: + resolution: {integrity: sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==} + engines: {node: '>=8.3.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + dev: true + + /ws@8.11.0: + resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==} + engines: {node: '>=10.0.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + + /ws@8.13.0: + resolution: {integrity: sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==} + engines: {node: '>=10.0.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: '>=5.0.2' + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + + /ws@8.8.1: + resolution: {integrity: sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==} + engines: {node: '>=10.0.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + dev: true + + /xdg-basedir@4.0.0: + resolution: {integrity: sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==} + engines: {node: '>=8'} + dev: true + + /xhr@2.6.0: + resolution: {integrity: sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==} + dependencies: + global: 4.4.0 + is-function: 1.0.2 + parse-headers: 2.0.5 + xtend: 4.0.2 + dev: false + + /xml-name-validator@3.0.0: + resolution: {integrity: sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==} + dev: true + + /xml-parse-from-string@1.0.1: + resolution: {integrity: sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g==} + dev: false + + /xml2js@0.4.23: + resolution: {integrity: sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==} + engines: {node: '>=4.0.0'} + dependencies: + sax: 1.2.4 + xmlbuilder: 11.0.1 + dev: false + + /xmlbuilder@11.0.1: + resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==} + engines: {node: '>=4.0'} + dev: false + + /xmlchars@2.2.0: + resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==} + dev: true + + /xmlhttprequest-ssl@1.6.3: + resolution: {integrity: sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==} + engines: {node: '>=0.4.0'} + dev: false + + /xmlhttprequest-ssl@2.0.0: + resolution: {integrity: sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==} + engines: {node: '>=0.4.0'} + + /xtend@4.0.2: + resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} + engines: {node: '>=0.4'} + dev: false + + /xxhash-wasm@0.4.2: + resolution: {integrity: sha512-/eyHVRJQCirEkSZ1agRSCwriMhwlyUcFkXD5TPVSLP+IPzjsqMVzZwdoczLp1SoQU0R3dxz1RpIK+4YNQbCVOA==} + + /y18n@5.0.8: + resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} + engines: {node: '>=10'} + + /yallist@3.1.1: + resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} + + /yallist@4.0.0: + resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} + + /yaml@1.10.2: + resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} + engines: {node: '>= 6'} + dev: false + + /yaml@2.3.2: + resolution: {integrity: sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==} + engines: {node: '>= 14'} + dev: true + + /yargs-parser@20.2.4: + resolution: {integrity: sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==} + engines: {node: '>=10'} + dev: true + + /yargs-parser@21.1.1: + resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} + engines: {node: '>=12'} + dev: false + + /yargs@16.2.0: + resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==} + engines: {node: '>=10'} + dependencies: + cliui: 7.0.4 + escalade: 3.1.1 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + string-width: 4.2.3 + y18n: 5.0.8 + yargs-parser: 20.2.4 + dev: true + + /yargs@17.7.2: + resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} + engines: {node: '>=12'} + dependencies: + cliui: 8.0.1 + escalade: 3.1.1 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + string-width: 4.2.3 + y18n: 5.0.8 + yargs-parser: 21.1.1 + dev: false + + /yauzl@2.10.0: + resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==} + dependencies: + buffer-crc32: 0.2.13 + fd-slicer: 1.1.0 + + /yeast@0.1.2: + resolution: {integrity: sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==} + dev: false + + /yggdrasil@1.7.0: + resolution: {integrity: sha512-QBIo5fiNd7688G3FqXXYGr36uyrYzczlNuzpWFy2zL3+R+3KT2lF+wFxm51synfA3l3z6IBiGOc1/EVXWCYY1Q==} + dependencies: + node-fetch: 2.7.0 + uuid: 8.3.2 + transitivePeerDependencies: + - encoding + + /yocto-queue@0.1.0: + resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} + engines: {node: '>=10'} + + /zustand@3.6.5(react@18.2.0): + resolution: {integrity: sha512-/WfLJuXiEJimt61KGMHebrFBwckkCHGhAgVXTgPQHl6IMzjqm6MREb1OnDSnCRiSmRdhgdFCctceg6tSm79hiw==} + engines: {node: '>=12.7.0'} + peerDependencies: + react: '>=16.8' + peerDependenciesMeta: + react: + optional: true + dependencies: + react: 18.2.0 + dev: false + + file:prismarine-viewer: + resolution: {directory: prismarine-viewer, type: directory} + name: prismarine-viewer + requiresBuild: true + dependencies: + '@tweenjs/tween.js': 20.0.3 + compression: 1.7.4 + express: 4.18.2 + minecraft-data: 3.45.0 + prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-chunk: 1.35.0(minecraft-data@3.45.0) + prismarine-world: github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786 + socket.io: 4.7.2 + socket.io-client: 4.7.2 + three: 0.128.0 + three.meshline: 1.4.0 + vec3: 0.1.8 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: true + + github.com/PrismarineJS/net-browserify/0acebf76d5a14991e6b2586f83f707be5171579c: + resolution: {tarball: https://codeload.github.com/PrismarineJS/net-browserify/tar.gz/0acebf76d5a14991e6b2586f83f707be5171579c} + name: net-browserify + version: 0.2.4 + dependencies: + body-parser: 1.20.2 + express: 4.18.2 + express-ws: 4.0.0(express@4.18.2) + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: false + + github.com/PrismarineJS/node-process/380d0b4f4c86f1b65b216c311bf00431f314e88e: + resolution: {tarball: https://codeload.github.com/PrismarineJS/node-process/tar.gz/380d0b4f4c86f1b65b216c311bf00431f314e88e} + name: process + version: 0.11.10 + engines: {node: '>= 0.6.0'} + dev: true + + github.com/zardoy/browserfs/0ff5df5c4e67f54b5f032b87dc650e8b78626bc7: + resolution: {tarball: https://codeload.github.com/zardoy/browserfs/tar.gz/0ff5df5c4e67f54b5f032b87dc650e8b78626bc7} + name: browserfs + version: 2.0.0-zardoy + dependencies: + async: 2.6.4 + dev: false + + github.com/zardoy/minecraft-inventory-gui/c1331c91fb39bd562dc48eeb33321240d4870edd(@types/react@18.2.20)(react@18.2.0): + resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/c1331c91fb39bd562dc48eeb33321240d4870edd} + id: github.com/zardoy/minecraft-inventory-gui/c1331c91fb39bd562dc48eeb33321240d4870edd + name: minecraft-inventory-gui + version: 1.0.1 + dependencies: + valtio: 1.11.2(@types/react@18.2.20)(react@18.2.0) + transitivePeerDependencies: + - '@types/react' + - react + dev: true + + github.com/zardoy/minecraft-protocol/22e71bf29f3471f2543102ad76dfeebd5123e43f: + resolution: {tarball: https://codeload.github.com/zardoy/minecraft-protocol/tar.gz/22e71bf29f3471f2543102ad76dfeebd5123e43f} + name: minecraft-protocol + version: 1.44.0 + engines: {node: '>=14'} + dependencies: + '@types/readable-stream': 4.0.2 + aes-js: 3.1.2 + buffer-equal: 1.0.1 + debug: 4.3.4(supports-color@8.1.1) + endian-toggle: 0.0.0 + lodash.get: 4.4.2 + lodash.merge: 4.6.2 + minecraft-data: 3.45.0 + minecraft-folder-path: 1.2.0 + node-fetch: 2.7.0 + node-rsa: 0.4.2 + prismarine-auth: 2.2.0 + prismarine-nbt: 2.2.1 + prismarine-realms: 1.3.2 + protodef: 1.15.0 + readable-stream: 4.4.2 + uuid-1345: 1.0.2 + yggdrasil: 1.7.0 + transitivePeerDependencies: + - encoding + - supports-color + + github.com/zardoy/mineflayer/08a79e7affa1ce82e1ac7aad177745665ed54572: + resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/08a79e7affa1ce82e1ac7aad177745665ed54572} + name: mineflayer + version: 4.13.0 + engines: {node: '>=14'} + dependencies: + minecraft-data: 3.45.0 + minecraft-protocol: github.com/zardoy/minecraft-protocol/22e71bf29f3471f2543102ad76dfeebd5123e43f + prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) + prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-chat: 1.9.1 + prismarine-chunk: 1.35.0(minecraft-data@3.45.0) + prismarine-entity: 2.3.1 + prismarine-item: 1.14.0 + prismarine-nbt: 2.2.1 + prismarine-physics: 1.8.0 + prismarine-recipe: 1.3.1(prismarine-registry@1.7.0) + prismarine-registry: 1.7.0 + prismarine-windows: 2.8.0 + prismarine-world: github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786 + protodef: 1.15.0 + typed-emitter: 1.4.0 + vec3: 0.1.8 + transitivePeerDependencies: + - encoding + - supports-color + dev: true + + github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02: + resolution: {tarball: https://codeload.github.com/zardoy/prismarine-block/tar.gz/100f3e3be7927b8144e19a71c8d06f6218021a02} + name: prismarine-block + version: 1.17.1 + dependencies: + minecraft-data: 3.45.0 + prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) + prismarine-chat: 1.9.1 + prismarine-item: 1.14.0 + prismarine-nbt: 2.2.1 + prismarine-registry: 1.7.0 + + github.com/zardoy/prismarine-provider-anvil/49bf8150422301565b386110aaf3dec69e31c4cf(minecraft-data@3.45.0): + resolution: {tarball: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/49bf8150422301565b386110aaf3dec69e31c4cf} + id: github.com/zardoy/prismarine-provider-anvil/49bf8150422301565b386110aaf3dec69e31c4cf + name: prismarine-provider-anvil + version: 2.7.0 + dependencies: + prismarine-chunk: 1.35.0(minecraft-data@3.45.0) + prismarine-nbt: 2.2.1 + uint4: 0.1.2 + vec3: 0.1.8 + transitivePeerDependencies: + - minecraft-data + dev: false + + github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786: + resolution: {tarball: https://codeload.github.com/zardoy/prismarine-world/tar.gz/c358222204d21fe7d45379fbfcefb047f926c786} + name: prismarine-world + version: 3.6.2 + engines: {node: '>=8.0.0'} + dependencies: + vec3: 0.1.8 + + github.com/zardoy/space-squid/eec886b7a881eb40dd8efc6d48fa52e638e07693: + resolution: {tarball: https://codeload.github.com/zardoy/space-squid/tar.gz/eec886b7a881eb40dd8efc6d48fa52e638e07693} + name: flying-squid + version: 1.5.0 + engines: {node: '>=8'} + hasBin: true + dependencies: + change-case: 4.1.2 + colors: 1.4.0 + diamond-square: 1.2.0 + emit-then: 2.0.0 + event-promise: 0.0.1 + exit-hook: 2.2.1 + flatmap: 0.0.3 + long: 5.2.3 + minecraft-data: 3.45.0 + minecraft-protocol: github.com/zardoy/minecraft-protocol/22e71bf29f3471f2543102ad76dfeebd5123e43f + moment: 2.29.4 + needle: 2.9.1 + node-gzip: 1.1.2 + prismarine-chunk: 1.35.0(minecraft-data@3.45.0) + prismarine-entity: 2.3.1 + prismarine-item: 1.14.0 + prismarine-nbt: 2.2.1 + prismarine-provider-anvil: github.com/zardoy/prismarine-provider-anvil/49bf8150422301565b386110aaf3dec69e31c4cf(minecraft-data@3.45.0) + prismarine-windows: 2.8.0 + prismarine-world: github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786 + random-seed: 0.3.0 + range: 0.0.3 + readline: 1.3.0 + spiralloop: 1.0.2 + uuid-1345: 1.0.2 + vec3: 0.1.8 + yargs: 17.7.2 + transitivePeerDependencies: + - encoding + - supports-color + dev: false diff --git a/scripts/updateGitPackages.mjs b/scripts/updateGitPackages.mjs new file mode 100644 index 000000000..14524587e --- /dev/null +++ b/scripts/updateGitPackages.mjs @@ -0,0 +1,26 @@ +// pnpm bug workaround +import fs from 'fs' +import { parse } from 'yaml' + +const lockfile = parse(fs.readFileSync('./pnpm-lock.yaml', 'utf8')) + +const depsKeys = ['dependencies', 'devDependencies'] + +for (const importer of Object.values(lockfile.importers)) { + for (const depsKey of depsKeys) { + for (const [depName, { specifier, version }] of Object.entries(importer[depsKey])) { + if (!specifier.startsWith('github:')) continue + let branch = specifier.match(/#(.*)$/)?.[1] ?? '' + if (branch) branch = `/${branch}` + const sha = version.split('/').slice(3).join('/').replace(/\(.+/, '') + const repo = version.split('/').slice(1, 3).join('/') + const lastCommitJson = await fetch(`https://api.github.com/repos/${repo}/commits${branch}?per_page=1`).then(res => res.json()) + const lastCommitActual = lastCommitJson ?? lastCommitJson[0] + const lastCommitActualSha = lastCommitActual?.sha + if (lastCommitActualSha === undefined) debugger + if (sha !== lastCommitActualSha) { + console.log(`Outdated ${depName} github.com/${repo} : ${sha} -> ${lastCommitActualSha} (${lastCommitActual.commit.message})`) + } + } + } +} diff --git a/src/cursor.js b/src/cursor.js index 25865ae69..a76f2c834 100644 --- a/src/cursor.js +++ b/src/cursor.js @@ -28,6 +28,7 @@ class Cursor { static instance = null constructor (viewer, renderer, /** @type {import('mineflayer').Bot} */bot) { + bot.on('physicsTick', () => { if (this.lastBlockPlaced < 4) this.lastBlockPlaced++ }) if (Cursor.instance) return Cursor.instance // Init state @@ -108,7 +109,6 @@ class Cursor { bot.attack(entity) } }) - bot.on('physicsTick', () => { if (this.lastBlockPlaced < 4) this.lastBlockPlaced++ }) } // todo this shouldnt be done in the render loop, migrate the code to dom events to avoid delays on lags diff --git a/src/customServer.ts b/src/customServer.ts index 39941d6a1..682459f4f 100644 --- a/src/customServer.ts +++ b/src/customServer.ts @@ -1,6 +1,6 @@ import EventEmitter from 'events' -import Client from 'minecraft-protocol/src/client' +import CustomChannelClient from 'minecraft-protocol/src/customChannelClient' window.serverDataChannel ??= {} export const customCommunication = { @@ -27,7 +27,7 @@ export class LocalServer extends EventEmitter.EventEmitter { } listen() { - this.emit('connection', new Client(true, this.version, this.customPackets, this.hideErrors, customCommunication)) + this.emit('connection', new CustomChannelClient(true, this.version, customCommunication)) } close() { } diff --git a/src/index.ts b/src/index.ts index b7d6ade4d..0e9189340 100644 --- a/src/index.ts +++ b/src/index.ts @@ -136,6 +136,7 @@ const minPitch = -0.5 * Math.PI const renderer = new THREE.WebGLRenderer() renderer.setPixelRatio(window.devicePixelRatio || 1) // todo this value is too high on ios, need to check, probably we should use avg, also need to make it configurable renderer.setSize(window.innerWidth, window.innerHeight) +renderer.domElement.id = 'viewer-canvas' document.body.appendChild(renderer.domElement) // Create viewer @@ -196,14 +197,21 @@ const optionsScrn = document.getElementById('options-screen') const pauseMenu = document.getElementById('pause-screen') let mouseMovePostHandle = (e) => { } -let lastMouseCall -function onMouseMove(e) { +let lastMouseMove: number +let cursor: Cursor +let debugMenu +const updateCursor = () => { + cursor.update(bot) + debugMenu ??= hud.shadowRoot.querySelector('#debug-overlay') + debugMenu.cursorBlock = cursor.cursorBlock +} +function onCameraMove(e) { if (e.type !== 'touchmove' && !pointerLock.hasPointerLock) return e.stopPropagation?.() const now = performance.now() // todo: limit camera movement for now to avoid unexpected jumps - if (now - lastMouseCall < 4) return - lastMouseCall = now + if (now - lastMouseMove < 4) return + lastMouseMove = now let { mouseSensX, mouseSensY } = optionsScrn if (mouseSensY === true) mouseSensY = mouseSensX // debugPitch.innerText = +debugPitch.innerText + e.movementX @@ -211,8 +219,10 @@ function onMouseMove(e) { x: e.movementX * mouseSensX * 0.0001, y: e.movementY * mouseSensY * 0.0001 }) + // todo do it also on every block update within radius 5 + updateCursor() } -window.addEventListener('mousemove', onMouseMove, { capture: true }) +window.addEventListener('mousemove', onCameraMove, { capture: true }) function hideCurrentScreens() { @@ -289,8 +299,6 @@ async function connect(connectOptions: { timeouts.push(id) return id } - const debugMenu = hud.shadowRoot.querySelector('#debug-overlay') - const { renderDistance, maxMultiplayerRenderDistance } = options const hostprompt = connectOptions.server const proxyprompt = connectOptions.proxy @@ -478,6 +486,9 @@ async function connect(connectOptions: { handleError(err) } if (!bot) return + cursor = new Cursor(viewer, renderer, bot) + // bot.on('move', () => updateCursor()) + let p2pConnectTimeout = p2pMultiplayer ? setTimeout(() => { throw new Error('Spawn timeout. There might be error on other side, check console.') }, 20_000) : undefined hud.preload(bot) @@ -546,8 +557,11 @@ async function connect(connectOptions: { }) optionsScrn.addEventListener('fov_changed', updateFov) + bot.on('physicsTick', () => updateCursor()) viewer.setVersion(version) + const debugMenu = hud.shadowRoot.querySelector('#debug-overlay') + window.viewer = viewer window.loadedData = mcData window.worldView = worldView @@ -559,11 +573,8 @@ async function connect(connectOptions: { initVR(bot, renderer, viewer) - const cursor = new Cursor(viewer, renderer, bot) postRenderFrameFn = () => { - viewer.setFirstPersonCamera(null, bot.entity.yaw, bot.entity.pitch) - cursor.update(bot) - debugMenu.cursorBlock = cursor.cursorBlock + // viewer.setFirstPersonCamera(null, bot.entity.yaw, bot.entity.pitch) } try { @@ -615,6 +626,7 @@ async function connect(connectOptions: { let virtualClickTimeout let screenTouches = 0 let capturedPointer: { id; x; y; sourceX; sourceY; activateCameraMove; time } | null + document.body.addEventListener('touchstart', (e) => e.preventDefault(), { passive: false }) registerListener(document, 'pointerdown', (e) => { const clickedEl = e.composedPath()[0] if (!isGameActive(true) || !miscUiState.currentTouch || clickedEl !== cameraControlEl || e.pointerId === undefined) { @@ -656,7 +668,7 @@ async function connect(connectOptions: { if (capturedPointer.activateCameraMove) { clearTimeout(virtualClickTimeout) } - onMouseMove({ movementX: e.pageX - capturedPointer.x, movementY: e.pageY - capturedPointer.y, type: 'touchmove' }) + onCameraMove({ movementX: e.pageX - capturedPointer.x, movementY: e.pageY - capturedPointer.y, type: 'touchmove' }) capturedPointer.x = e.pageX capturedPointer.y = e.pageY }, { passive: false }) @@ -666,7 +678,7 @@ async function connect(connectOptions: { let { x, z } = vector if (Math.abs(x) < 0.18) x = 0 if (Math.abs(z) < 0.18) z = 0 - onMouseMove({ movementX: x * 10, movementY: z * 10, type: 'touchmove' }) + onCameraMove({ movementX: x * 10, movementY: z * 10, type: 'touchmove' }) }) registerListener(document, 'lostpointercapture', (e) => { @@ -766,6 +778,7 @@ downloadAndOpenFile().then((downloadAction) => { if (peerId) { let username = options.guestUsername if (options.askGuestName) username = prompt('Enter your username', username) + if (!username) return options.guestUsername = username connect({ server: '', port: '', proxy: '', password: '', @@ -775,6 +788,7 @@ downloadAndOpenFile().then((downloadAction) => { }) } }) + if (document.getElementById('hud').isReady) window.dispatchEvent(new Event('hud-ready')) }, (err) => { console.error(err) alert(`Failed to download file: ${err}`) diff --git a/src/localServerMultiplayer.ts b/src/localServerMultiplayer.ts index 1268b55f5..a63822846 100644 --- a/src/localServerMultiplayer.ts +++ b/src/localServerMultiplayer.ts @@ -50,7 +50,7 @@ export const openToWanAndCopyJoinLink = async (writeText: (text) => void, doCopy peer.on('connection', (connection) => { console.log('connection') const serverDuplex = new CustomDuplex({}, (data) => connection.send(data)) - const client = new Client(true, localServer.options.version, undefined, false, undefined, /* true */); + const client = new Client(true, localServer.options.version, undefined) client.setSocket(serverDuplex) localServer._server.emit('connection', client) @@ -62,7 +62,7 @@ export const openToWanAndCopyJoinLink = async (writeText: (text) => void, doCopy console.log('connection.close') serverDuplex.end() connection.close() - }; + } serverDuplex.on('end', endConnection) serverDuplex.on('force-close', endConnection) client.on('end', endConnection) @@ -120,7 +120,7 @@ export const connectToPeer = async (peerId: string) => { connection.once('error', (error) => { console.log(error.type, error.name) console.log(error) - return reject(error.message); + return reject(error.message) }) connection.once('open', resolve) })) @@ -128,7 +128,7 @@ export const connectToPeer = async (peerId: string) => { const clientDuplex = new CustomDuplex({}, (data) => { // todo rm debug console.debug('sending', data.toString()) - connection.send(data); + connection.send(data) }) connection.on('data', (data: any) => { console.debug('received', Buffer.from(data).toString()) diff --git a/src/menus/components/health_bar.js b/src/menus/components/health_bar.js index a6dacef8b..ace2641af 100644 --- a/src/menus/components/health_bar.js +++ b/src/menus/components/health_bar.js @@ -14,7 +14,7 @@ class HealthBar extends LitElement { static get styles () { return css` .health { - position: absolute; + position: fixed; display: flex; flex-direction: row; left: calc(50% - 91px); diff --git a/src/menus/components/hotbar.js b/src/menus/components/hotbar.js index 94ead334c..6070d33aa 100644 --- a/src/menus/components/hotbar.js +++ b/src/menus/components/hotbar.js @@ -10,7 +10,7 @@ class Hotbar extends LitElement { static get styles () { return css` .hotbar { - position: absolute; + position: fixed; bottom: ${unsafeCSS(isProbablyIphone() ? '40px' : '0')}; left: 50%; transform: translate(-50%); diff --git a/src/menus/hud.js b/src/menus/hud.js index 7437d4e17..4906ed25f 100644 --- a/src/menus/hud.js +++ b/src/menus/hud.js @@ -10,18 +10,19 @@ export const guiIcons1_16_4 = require('minecraft-assets/minecraft-assets/data/1. class Hud extends LitElement { firstUpdated () { + this.isReady = true window.dispatchEvent(new CustomEvent('hud-ready', { detail: this })) } static get styles () { return css` :host { - position: absolute; + position: fixed; top: 0; left: 0; z-index: -2; width: 100%; - height: 100%; + height: 100vh; touch-action: none; } @@ -30,7 +31,7 @@ class Hud extends LitElement { height: 16px; background: url('${unsafeCSS(guiIcons1_17_1)}'); background-size: 256px; - position: absolute; + position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); @@ -38,7 +39,7 @@ class Hud extends LitElement { } #xp-label { - position: absolute; + position: fixed; top: -8px; left: 50%; transform: translate(-50%); @@ -50,7 +51,7 @@ class Hud extends LitElement { } #xp-bar-bg { - position: absolute; + position: fixed; left: 50%; bottom: 24px; transform: translate(-50%); @@ -72,7 +73,7 @@ class Hud extends LitElement { .mobile-top-btns { display: none; flex-direction: row; - position: absolute; + position: fixed; top: 0; left: 50%; transform: translate(-50%); @@ -318,17 +319,17 @@ class Hud extends LitElement { render () { return html`
    - - - - diff --git a/src/menus/play_screen.js b/src/menus/play_screen.js index 152397c2a..f79a1fb40 100644 --- a/src/menus/play_screen.js +++ b/src/menus/play_screen.js @@ -17,7 +17,7 @@ class PlayScreen extends LitElement { } .edit-boxes { - position: absolute; + position: fixed; top: 59px; left: 50%; display: flex; diff --git a/src/reactUi.jsx b/src/reactUi.jsx index 63af67759..f686ac95a 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -15,7 +15,7 @@ import { createPortal } from 'react-dom' useInterfaceState.setState({ isFlying: false, uiCustomization: { - touchButtonSize: isProbablyIphone() ? 30 : 40, + touchButtonSize: 40, }, updateCoord: ([coord, state]) => { const coordToAction = [ diff --git a/src/styles.css b/src/styles.css index 50070d66f..61a7b9058 100644 --- a/src/styles.css +++ b/src/styles.css @@ -12,6 +12,11 @@ box-sizing: border-box; } +#react-root { + z-index: 9; + position: fixed; +} + a { color: white; } @@ -63,8 +68,8 @@ body { user-select: none; } -canvas { - position: absolute; +#viewer-canvas { + position: fixed; top: 0; left: 0; height: 100%; @@ -75,14 +80,14 @@ canvas { } #ui-root { - position: absolute; + position: fixed; top: 0; left: 0; transform-origin: top left; transform: scale(var(--guiScale)); width: calc(100% / var(--guiScale)); height: calc(100% / var(--guiScale)); - z-index: 10; + z-index: 8; image-rendering: optimizeSpeed; image-rendering: -moz-crisp-edges; image-rendering: -webkit-optimize-contrast; From 1d9411737bdab7cf61ea4a6eb740bdf6fd5ad652 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 19 Sep 2023 22:59:41 +0300 Subject: [PATCH 253/318] manual build fixes --- package.json | 2 +- pnpm-lock.yaml | 33 +++++++++++++++++++++++++++++---- scripts/build.js | 20 ++++++++------------ src/globals.d.ts | 4 ++-- src/index.ts | 4 ++-- src/menus/play_screen.js | 2 +- 6 files changed, 43 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index f5392c87d..d7e2fd85e 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "npm-run-all": "^4.1.5", "os-browserify": "^0.3.0", "path-browserify": "^1.0.1", - "prismarine-viewer": "github:PrismarineJS/prismarine-viewer", + "prismarine-viewer": "github:zardoy/prismarine-viewer#world-improvements", "process": "github:PrismarineJS/node-process", "rimraf": "^5.0.1", "stream-browserify": "^3.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0f87d30bb..828980980 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -200,8 +200,8 @@ importers: specifier: ^1.0.1 version: 1.0.1 prismarine-viewer: - specifier: ./prismarine-viewer - version: link:prismarine-viewer + specifier: github:zardoy/prismarine-viewer#world-improvements + version: github.com/zardoy/prismarine-viewer/cfb88434c576b17cb270e04d2024f2ca24d6543e process: specifier: github:PrismarineJS/node-process version: github.com/PrismarineJS/node-process/380d0b4f4c86f1b65b216c311bf00431f314e88e @@ -3022,7 +3022,7 @@ packages: /@types/cors@2.8.13: resolution: {integrity: sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==} dependencies: - '@types/node': 20.5.7 + '@types/node': 20.6.2 /@types/eslint-scope@3.7.4: resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==} @@ -5360,7 +5360,7 @@ packages: dependencies: '@types/cookie': 0.4.1 '@types/cors': 2.8.13 - '@types/node': 20.5.7 + '@types/node': 20.6.2 accepts: 1.3.8 base64id: 2.0.0 cookie: 0.4.2 @@ -12926,6 +12926,31 @@ packages: - minecraft-data dev: false + github.com/zardoy/prismarine-viewer/cfb88434c576b17cb270e04d2024f2ca24d6543e: + resolution: {tarball: https://codeload.github.com/zardoy/prismarine-viewer/tar.gz/cfb88434c576b17cb270e04d2024f2ca24d6543e} + name: prismarine-viewer + version: 1.25.0 + prepare: true + requiresBuild: true + dependencies: + '@tweenjs/tween.js': 20.0.3 + compression: 1.7.4 + express: 4.18.2 + minecraft-data: 3.45.0 + prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-chunk: 1.35.0(minecraft-data@3.45.0) + prismarine-world: github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786 + socket.io: 4.7.2 + socket.io-client: 4.7.2 + three: 0.128.0 + three.meshline: 1.4.0 + vec3: 0.1.8 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: true + github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786: resolution: {tarball: https://codeload.github.com/zardoy/prismarine-world/tar.gz/c358222204d21fe7d45379fbfcefb047f926c786} name: prismarine-world diff --git a/scripts/build.js b/scripts/build.js index 15cf4b060..86899312f 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -1,3 +1,4 @@ +//@ts-check const fsExtra = require('fs-extra') const defaultLocalServerOptions = require('../src/defaultLocalServerOptions') const glob = require('glob') @@ -5,28 +6,23 @@ const fs = require('fs') const crypto = require('crypto') const path = require('path') -// these files need to be copied before build for now -const filesAlwaysToCopy = [ - // { from: './node_modules/prismarine-viewer2/public/supportedVersions.json', to: './prismarine-viewer/public/supportedVersions.json' }, -] -// these files could be copied at build time eg with copy plugin, but copy plugin slows down the config (2x in my testing, sometimes with too many open files error) is slow so we also copy them there +const prismarineViewerBase = "./node_modules/prismarine-viewer"; + +// these files could be copied at build time eg with copy plugin, but copy plugin slows down the config so we copy them there, alternative we could inline it in esbuild config const webpackFilesToCopy = [ - { from: './prismarine-viewer/public/blocksStates/', to: 'dist/blocksStates/' }, - // { from: './prismarine-viewer/public/textures/', to: 'dist/textures/' }, - // { from: './prismarine-viewer/public/textures/1.17.1/gui', to: 'dist/gui' }, - { from: './prismarine-viewer/public/worker.js', to: 'dist/worker.js' }, - // { from: './prismarine-viewer/public/supportedVersions.json', to: 'dist/supportedVersions.json' }, + { from: `${prismarineViewerBase}/public/blocksStates/`, to: 'dist/blocksStates/' }, + { from: `${prismarineViewerBase}/public/worker.js`, to: 'dist/worker.js' }, { from: './assets/', to: './dist/' }, { from: './config.json', to: 'dist/config.json' } ] exports.webpackFilesToCopy = webpackFilesToCopy exports.copyFiles = (isDev = false) => { console.time('copy files'); - [...filesAlwaysToCopy, ...webpackFilesToCopy].forEach(file => { + webpackFilesToCopy.forEach(file => { fsExtra.copySync(file.from, file.to) }) // todo copy directly only needed - const cwd = './prismarine-viewer/public/textures/' + const cwd = `${prismarineViewerBase}/public/textures/` const files = glob.sync('{*/entity/**,*.png}', { cwd: cwd, nodir: true, }) for (const file of files) { const copyDest = path.join('dist/textures/', file) diff --git a/src/globals.d.ts b/src/globals.d.ts index dadeafa72..434333911 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -3,8 +3,8 @@ declare const THREE: typeof import('three') // todo declare const bot: import('mineflayer').Bot -declare const viewer: import('../prismarine-viewer/viewer/lib/viewer').Viewer | undefined -declare const worldView: import('../prismarine-viewer/viewer/lib/worldView').WorldView | undefined +declare const viewer: import('prismarine-viewer/viewer/lib/viewer').Viewer | undefined +declare const worldView: import('prismarine-viewer/viewer/lib/worldView').WorldView | undefined declare const localServer: any declare interface Document { diff --git a/src/index.ts b/src/index.ts index 0e9189340..85b933776 100644 --- a/src/index.ts +++ b/src/index.ts @@ -140,7 +140,7 @@ renderer.domElement.id = 'viewer-canvas' document.body.appendChild(renderer.domElement) // Create viewer -const viewer: import('../prismarine-viewer/viewer/lib/viewer').Viewer = new Viewer(renderer, options.numWorkers) +const viewer: import('prismarine-viewer/viewer/lib/viewer').Viewer = new Viewer(renderer, options.numWorkers) initPanoramaOptions(viewer) watchTexturepackInViewer(viewer) @@ -532,7 +532,7 @@ async function connect(connectOptions: { const center = bot.entity.position - const worldView: import('../prismarine-viewer/viewer/lib/worldView').WorldView = new WorldView(bot.world, singeplayer ? renderDistance : Math.min(renderDistance, maxMultiplayerRenderDistance), center) + const worldView: import('prismarine-viewer/viewer/lib/worldView').WorldView = new WorldView(bot.world, singeplayer ? renderDistance : Math.min(renderDistance, maxMultiplayerRenderDistance), center) let fovSetting = optionsScrn.fov const updateFov = () => { diff --git a/src/menus/play_screen.js b/src/menus/play_screen.js index f79a1fb40..923d6d2fb 100644 --- a/src/menus/play_screen.js +++ b/src/menus/play_screen.js @@ -3,7 +3,7 @@ const { LitElement, html, css } = require('lit') const { commonCss } = require('./components/common') const { hideCurrentModal } = require('../globalState') const mineflayer = require('mineflayer') -const viewerSupportedVersions = require('prismarine-viewer/viewer/supportedVersions.json') +const viewerSupportedVersions = require('prismarine-viewer/public/supportedVersions.json') const fullySupporedVersions = viewerSupportedVersions const partiallySupportVersions = mineflayer.supportedVersions From 17a60481b9289b76eca13fce1bc7218f4b54e0b9 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 19 Sep 2023 23:27:30 +0300 Subject: [PATCH 254/318] add assets dep --- package.json | 1 + pnpm-lock.yaml | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/package.json b/package.json index d7e2fd85e..38c352a85 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "stats.js": "^0.17.0", "url": "^0.11.1", "valtio": "^1.11.1", + "minecraft-assets": "^1.9.1", "workbox-build": "^7.0.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 828980980..0717ca67d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -81,6 +81,9 @@ importers: lit: specifier: ^2.8.0 version: 2.8.0 + minecraft-assets: + specifier: ^1.9.1 + version: 1.9.1 minecraft-data: specifier: 3.45.0 version: 3.45.0 @@ -8580,6 +8583,10 @@ packages: resolution: {integrity: sha512-KtvIRd9gcKlxbvrswGv1Ap9k7tVs//QW2ukp+8vJ28miYwkhUmYfjTZyElIG8KUXV/46wL2kDzLH8SJbXQ56Mg==} dev: true + /minecraft-assets@1.9.1: + resolution: {integrity: sha512-vYKN5fhMilPafH0CnmYQBCP8zW0Fn3FVvPM25w7HC2PiXZQsP/p3Yl5QdCKjgqTk1LddNdmrw4notNoE6exVRQ==} + dev: false + /minecraft-data@3.45.0: resolution: {integrity: sha512-LJMKveMXNjQKk48mDEhFgjDQGBAGa0xKDXjsJ865eB2qdFei73vgu1YXQbyK3Zlg5a0cIgfvyHKG8Pf5s6XFqg==} From 202bd02ff86703d0c1db94013a3179fa534cfc44 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Tue, 19 Sep 2023 17:40:07 +0300 Subject: [PATCH 255/318] dont fail vercel on gh pages preview --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 512dc55bd..13c5e68d4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,6 +23,7 @@ jobs: - run: pnpx zardoy-release node env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - run: cp vercel.json .vercel/output/static/vercel.json - uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GITHUB_TOKEN }} From 81e6e565fd0366bfecdb13ad1dcf4ac9d36773cc Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Tue, 19 Sep 2023 17:50:24 +0300 Subject: [PATCH 256/318] ci should be fixed now --- .github/workflows/ci.yml | 3 ++- cypress/integration/index.spec.ts | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b793e1ff3..78de9b773 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,8 @@ jobs: run: npm i -g pnpm - run: pnpm install - run: pnpm build - - run: nohup pnpm prod-start & node cypress/minecraft-server.mjs & + - run: nohup pnpm prod-start & + - run: nohup node cypress/minecraft-server.mjs & - uses: cypress-io/github-action@v5 with: install: false diff --git a/cypress/integration/index.spec.ts b/cypress/integration/index.spec.ts index 68944b2e8..31a113ab6 100644 --- a/cypress/integration/index.spec.ts +++ b/cypress/integration/index.spec.ts @@ -8,7 +8,6 @@ const setLocalStorageSettings = () => { // todo use ssl it('Loads & renders singleplayer', () => { - // todo use
    - From dad3b6db355a7610a4f977b06c68ba56ea323080 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 24 Sep 2023 19:54:10 +0300 Subject: [PATCH 279/318] up esbuild --- package.json | 2 +- pnpm-lock.yaml | 222 ++++++++++++++++++++++++++----------------------- 2 files changed, 118 insertions(+), 106 deletions(-) diff --git a/package.json b/package.json index bebbd01ef..e2dbe0623 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "cypress-plugin-snapshots": "^1.4.4", "diamond-square": "^1.2.0", "eruda": "^3.0.1", - "esbuild": "^0.19.2", + "esbuild": "^0.19.3", "esbuild-loader": "^4.0.0", "esbuild-plugin-polyfill-node": "^0.3.0", "express": "^4.18.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3fc6960ba..614449875 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -55,14 +55,14 @@ importers: specifier: ^3.0.1 version: 3.0.1 esbuild: - specifier: ^0.19.2 - version: 0.19.2 + specifier: ^0.19.3 + version: 0.19.3 esbuild-loader: specifier: ^4.0.0 version: 4.0.0(webpack@5.88.2) esbuild-plugin-polyfill-node: specifier: ^0.3.0 - version: 0.3.0(esbuild@0.19.2) + version: 0.3.0(esbuild@0.19.3) express: specifier: ^4.18.2 version: 4.18.2 @@ -237,7 +237,7 @@ importers: version: 4.4.9 webpack: specifier: ^5.88.2 - version: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + version: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) webpack-cli: specifier: ^5.1.4 version: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) @@ -349,7 +349,7 @@ importers: version: 17.0.0 webpack: specifier: ^5.10.2 - version: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + version: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) webpack-cli: specifier: ^5.1.1 version: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) @@ -1669,8 +1669,8 @@ packages: dev: true optional: true - /@esbuild/android-arm64@0.19.2: - resolution: {integrity: sha512-lsB65vAbe90I/Qe10OjkmrdxSX4UJDjosDgb8sZUKcg3oefEuW2OT2Vozz8ef7wrJbMcmhvCC+hciF8jY/uAkw==} + /@esbuild/android-arm64@0.19.3: + resolution: {integrity: sha512-w+Akc0vv5leog550kjJV9Ru+MXMR2VuMrui3C61mnysim0gkFCPOUTAfzTP0qX+HpN9Syu3YA3p1hf3EPqObRw==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -1686,8 +1686,8 @@ packages: dev: true optional: true - /@esbuild/android-arm@0.19.2: - resolution: {integrity: sha512-tM8yLeYVe7pRyAu9VMi/Q7aunpLwD139EY1S99xbQkT4/q2qa6eA4ige/WJQYdJ8GBL1K33pPFhPfPdJ/WzT8Q==} + /@esbuild/android-arm@0.19.3: + resolution: {integrity: sha512-Lemgw4io4VZl9GHJmjiBGzQ7ONXRfRPHcUEerndjwiSkbxzrpq0Uggku5MxxrXdwJ+pTj1qyw4jwTu7hkPsgIA==} engines: {node: '>=12'} cpu: [arm] os: [android] @@ -1703,8 +1703,8 @@ packages: dev: true optional: true - /@esbuild/android-x64@0.19.2: - resolution: {integrity: sha512-qK/TpmHt2M/Hg82WXHRc/W/2SGo/l1thtDHZWqFq7oi24AjZ4O/CpPSu6ZuYKFkEgmZlFoa7CooAyYmuvnaG8w==} + /@esbuild/android-x64@0.19.3: + resolution: {integrity: sha512-FKQJKkK5MXcBHoNZMDNUAg1+WcZlV/cuXrWCoGF/TvdRiYS4znA0m5Il5idUwfxrE20bG/vU1Cr5e1AD6IEIjQ==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -1720,8 +1720,8 @@ packages: dev: true optional: true - /@esbuild/darwin-arm64@0.19.2: - resolution: {integrity: sha512-Ora8JokrvrzEPEpZO18ZYXkH4asCdc1DLdcVy8TGf5eWtPO1Ie4WroEJzwI52ZGtpODy3+m0a2yEX9l+KUn0tA==} + /@esbuild/darwin-arm64@0.19.3: + resolution: {integrity: sha512-kw7e3FXU+VsJSSSl2nMKvACYlwtvZB8RUIeVShIEY6PVnuZ3c9+L9lWB2nWeeKWNNYDdtL19foCQ0ZyUL7nqGw==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -1737,8 +1737,8 @@ packages: dev: true optional: true - /@esbuild/darwin-x64@0.19.2: - resolution: {integrity: sha512-tP+B5UuIbbFMj2hQaUr6EALlHOIOmlLM2FK7jeFBobPy2ERdohI4Ka6ZFjZ1ZYsrHE/hZimGuU90jusRE0pwDw==} + /@esbuild/darwin-x64@0.19.3: + resolution: {integrity: sha512-tPfZiwF9rO0jW6Jh9ipi58N5ZLoSjdxXeSrAYypy4psA2Yl1dAMhM71KxVfmjZhJmxRjSnb29YlRXXhh3GqzYw==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -1754,8 +1754,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-arm64@0.19.2: - resolution: {integrity: sha512-YbPY2kc0acfzL1VPVK6EnAlig4f+l8xmq36OZkU0jzBVHcOTyQDhnKQaLzZudNJQyymd9OqQezeaBgkTGdTGeQ==} + /@esbuild/freebsd-arm64@0.19.3: + resolution: {integrity: sha512-ERDyjOgYeKe0Vrlr1iLrqTByB026YLPzTytDTz1DRCYM+JI92Dw2dbpRHYmdqn6VBnQ9Bor6J8ZlNwdZdxjlSg==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -1771,8 +1771,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-x64@0.19.2: - resolution: {integrity: sha512-nSO5uZT2clM6hosjWHAsS15hLrwCvIWx+b2e3lZ3MwbYSaXwvfO528OF+dLjas1g3bZonciivI8qKR/Hm7IWGw==} + /@esbuild/freebsd-x64@0.19.3: + resolution: {integrity: sha512-nXesBZ2Ad1qL+Rm3crN7NmEVJ5uvfLFPLJev3x1j3feCQXfAhoYrojC681RhpdOph8NsvKBBwpYZHR7W0ifTTA==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -1788,8 +1788,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm64@0.19.2: - resolution: {integrity: sha512-ig2P7GeG//zWlU0AggA3pV1h5gdix0MA3wgB+NsnBXViwiGgY77fuN9Wr5uoCrs2YzaYfogXgsWZbm+HGr09xg==} + /@esbuild/linux-arm64@0.19.3: + resolution: {integrity: sha512-qXvYKmXj8GcJgWq3aGvxL/JG1ZM3UR272SdPU4QSTzD0eymrM7leiZH77pvY3UetCy0k1xuXZ+VPvoJNdtrsWQ==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -1805,8 +1805,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm@0.19.2: - resolution: {integrity: sha512-Odalh8hICg7SOD7XCj0YLpYCEc+6mkoq63UnExDCiRA2wXEmGlK5JVrW50vZR9Qz4qkvqnHcpH+OFEggO3PgTg==} + /@esbuild/linux-arm@0.19.3: + resolution: {integrity: sha512-zr48Cg/8zkzZCzDHNxXO/89bf9e+r4HtzNUPoz4GmgAkF1gFAFmfgOdCbR8zMbzFDGb1FqBBhdXUpcTQRYS1cQ==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -1822,8 +1822,8 @@ packages: dev: true optional: true - /@esbuild/linux-ia32@0.19.2: - resolution: {integrity: sha512-mLfp0ziRPOLSTek0Gd9T5B8AtzKAkoZE70fneiiyPlSnUKKI4lp+mGEnQXcQEHLJAcIYDPSyBvsUbKUG2ri/XQ==} + /@esbuild/linux-ia32@0.19.3: + resolution: {integrity: sha512-7XlCKCA0nWcbvYpusARWkFjRQNWNGlt45S+Q18UeS///K6Aw8bB2FKYe9mhVWy/XLShvCweOLZPrnMswIaDXQA==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -1839,8 +1839,8 @@ packages: dev: true optional: true - /@esbuild/linux-loong64@0.19.2: - resolution: {integrity: sha512-hn28+JNDTxxCpnYjdDYVMNTR3SKavyLlCHHkufHV91fkewpIyQchS1d8wSbmXhs1fiYDpNww8KTFlJ1dHsxeSw==} + /@esbuild/linux-loong64@0.19.3: + resolution: {integrity: sha512-qGTgjweER5xqweiWtUIDl9OKz338EQqCwbS9c2Bh5jgEH19xQ1yhgGPNesugmDFq+UUSDtWgZ264st26b3de8A==} engines: {node: '>=12'} cpu: [loong64] os: [linux] @@ -1856,8 +1856,8 @@ packages: dev: true optional: true - /@esbuild/linux-mips64el@0.19.2: - resolution: {integrity: sha512-KbXaC0Sejt7vD2fEgPoIKb6nxkfYW9OmFUK9XQE4//PvGIxNIfPk1NmlHmMg6f25x57rpmEFrn1OotASYIAaTg==} + /@esbuild/linux-mips64el@0.19.3: + resolution: {integrity: sha512-gy1bFskwEyxVMFRNYSvBauDIWNggD6pyxUksc0MV9UOBD138dKTzr8XnM2R4mBsHwVzeuIH8X5JhmNs2Pzrx+A==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -1873,8 +1873,8 @@ packages: dev: true optional: true - /@esbuild/linux-ppc64@0.19.2: - resolution: {integrity: sha512-dJ0kE8KTqbiHtA3Fc/zn7lCd7pqVr4JcT0JqOnbj4LLzYnp+7h8Qi4yjfq42ZlHfhOCM42rBh0EwHYLL6LEzcw==} + /@esbuild/linux-ppc64@0.19.3: + resolution: {integrity: sha512-UrYLFu62x1MmmIe85rpR3qou92wB9lEXluwMB/STDzPF9k8mi/9UvNsG07Tt9AqwPQXluMQ6bZbTzYt01+Ue5g==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -1890,8 +1890,8 @@ packages: dev: true optional: true - /@esbuild/linux-riscv64@0.19.2: - resolution: {integrity: sha512-7Z/jKNFufZ/bbu4INqqCN6DDlrmOTmdw6D0gH+6Y7auok2r02Ur661qPuXidPOJ+FSgbEeQnnAGgsVynfLuOEw==} + /@esbuild/linux-riscv64@0.19.3: + resolution: {integrity: sha512-9E73TfyMCbE+1AwFOg3glnzZ5fBAFK4aawssvuMgCRqCYzE0ylVxxzjEfut8xjmKkR320BEoMui4o/t9KA96gA==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -1907,8 +1907,8 @@ packages: dev: true optional: true - /@esbuild/linux-s390x@0.19.2: - resolution: {integrity: sha512-U+RinR6aXXABFCcAY4gSlv4CL1oOVvSSCdseQmGO66H+XyuQGZIUdhG56SZaDJQcLmrSfRmx5XZOWyCJPRqS7g==} + /@esbuild/linux-s390x@0.19.3: + resolution: {integrity: sha512-LlmsbuBdm1/D66TJ3HW6URY8wO6IlYHf+ChOUz8SUAjVTuaisfuwCOAgcxo3Zsu3BZGxmI7yt//yGOxV+lHcEA==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -1924,8 +1924,8 @@ packages: dev: true optional: true - /@esbuild/linux-x64@0.19.2: - resolution: {integrity: sha512-oxzHTEv6VPm3XXNaHPyUTTte+3wGv7qVQtqaZCrgstI16gCuhNOtBXLEBkBREP57YTd68P0VgDgG73jSD8bwXQ==} + /@esbuild/linux-x64@0.19.3: + resolution: {integrity: sha512-ogV0+GwEmvwg/8ZbsyfkYGaLACBQWDvO0Kkh8LKBGKj9Ru8VM39zssrnu9Sxn1wbapA2qNS6BiLdwJZGouyCwQ==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -1941,8 +1941,8 @@ packages: dev: true optional: true - /@esbuild/netbsd-x64@0.19.2: - resolution: {integrity: sha512-WNa5zZk1XpTTwMDompZmvQLHszDDDN7lYjEHCUmAGB83Bgs20EMs7ICD+oKeT6xt4phV4NDdSi/8OfjPbSbZfQ==} + /@esbuild/netbsd-x64@0.19.3: + resolution: {integrity: sha512-o1jLNe4uzQv2DKXMlmEzf66Wd8MoIhLNO2nlQBHLtWyh2MitDG7sMpfCO3NTcoTMuqHjfufgUQDFRI5C+xsXQw==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -1958,8 +1958,8 @@ packages: dev: true optional: true - /@esbuild/openbsd-x64@0.19.2: - resolution: {integrity: sha512-S6kI1aT3S++Dedb7vxIuUOb3oAxqxk2Rh5rOXOTYnzN8JzW1VzBd+IqPiSpgitu45042SYD3HCoEyhLKQcDFDw==} + /@esbuild/openbsd-x64@0.19.3: + resolution: {integrity: sha512-AZJCnr5CZgZOdhouLcfRdnk9Zv6HbaBxjcyhq0StNcvAdVZJSKIdOiPB9az2zc06ywl0ePYJz60CjdKsQacp5Q==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -1975,8 +1975,8 @@ packages: dev: true optional: true - /@esbuild/sunos-x64@0.19.2: - resolution: {integrity: sha512-VXSSMsmb+Z8LbsQGcBMiM+fYObDNRm8p7tkUDMPG/g4fhFX5DEFmjxIEa3N8Zr96SjsJ1woAhF0DUnS3MF3ARw==} + /@esbuild/sunos-x64@0.19.3: + resolution: {integrity: sha512-Acsujgeqg9InR4glTRvLKGZ+1HMtDm94ehTIHKhJjFpgVzZG9/pIcWW/HA/DoMfEyXmANLDuDZ2sNrWcjq1lxw==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -1992,8 +1992,8 @@ packages: dev: true optional: true - /@esbuild/win32-arm64@0.19.2: - resolution: {integrity: sha512-5NayUlSAyb5PQYFAU9x3bHdsqB88RC3aM9lKDAz4X1mo/EchMIT1Q+pSeBXNgkfNmRecLXA0O8xP+x8V+g/LKg==} + /@esbuild/win32-arm64@0.19.3: + resolution: {integrity: sha512-FSrAfjVVy7TifFgYgliiJOyYynhQmqgPj15pzLyJk8BUsnlWNwP/IAy6GAiB1LqtoivowRgidZsfpoYLZH586A==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -2009,8 +2009,8 @@ packages: dev: true optional: true - /@esbuild/win32-ia32@0.19.2: - resolution: {integrity: sha512-47gL/ek1v36iN0wL9L4Q2MFdujR0poLZMJwhO2/N3gA89jgHp4MR8DKCmwYtGNksbfJb9JoTtbkoe6sDhg2QTA==} + /@esbuild/win32-ia32@0.19.3: + resolution: {integrity: sha512-xTScXYi12xLOWZ/sc5RBmMN99BcXp/eEf7scUC0oeiRoiT5Vvo9AycuqCp+xdpDyAU+LkrCqEpUS9fCSZF8J3Q==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -2026,8 +2026,8 @@ packages: dev: true optional: true - /@esbuild/win32-x64@0.19.2: - resolution: {integrity: sha512-tcuhV7ncXBqbt/Ybf0IyrMcwVOAPDckMK9rXNHtF17UTK18OKLpg08glminN06pt2WCoALhXdLfSPbVvK/6fxw==} + /@esbuild/win32-x64@0.19.3: + resolution: {integrity: sha512-FbUN+0ZRXsypPyWE2IwIkVjDkDnJoMJARWOcFZn4KPPli+QnKqF0z1anvfaYe3ev5HFCpRDLLBDHyOALLppWHw==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -2868,7 +2868,7 @@ packages: react-refresh: 0.14.0 schema-utils: 3.3.0 source-map: 0.7.4 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) webpack-dev-server: 4.15.1(webpack-cli@5.1.4)(webpack@5.88.2) dev: false @@ -3135,6 +3135,9 @@ packages: /@types/node@20.6.2: resolution: {integrity: sha512-Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw==} + /@types/node@20.6.4: + resolution: {integrity: sha512-nU6d9MPY0NBUMiE/nXd2IIoC4OLvsLpwAjheoAeuzgvDZA1Cb10QYg+91AF6zQiKWRN5i1m07x6sMe0niBznoQ==} + /@types/parse-json@4.0.0: resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} dev: false @@ -3168,7 +3171,7 @@ packages: /@types/readable-stream@4.0.2: resolution: {integrity: sha512-hhzOsMEISZ+mX1l+01F0duYt9wHEbCGmjARed0PcQoVS5zAdu7u5YbWYuNGhw09M1MgGr3kfsto+ut/MnAdKqA==} dependencies: - '@types/node': 20.6.2 + '@types/node': 20.6.4 safe-buffer: 5.1.2 /@types/resolve@1.17.1: @@ -3346,7 +3349,7 @@ packages: webpack: 5.x.x webpack-cli: 5.x.x dependencies: - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) /@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.88.2): @@ -3356,7 +3359,7 @@ packages: webpack: 5.x.x webpack-cli: 5.x.x dependencies: - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) /@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@4.15.1)(webpack@5.88.2): @@ -3370,7 +3373,7 @@ packages: webpack-dev-server: optional: true dependencies: - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) webpack-dev-server: 4.15.1(webpack-cli@5.1.4)(webpack@5.88.2) @@ -3805,14 +3808,14 @@ packages: /axios@0.21.4(debug@4.3.4): resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: - follow-redirects: 1.15.2(debug@4.3.4) + follow-redirects: 1.15.3(debug@4.3.4) transitivePeerDependencies: - debug /axios@0.25.0: resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==} dependencies: - follow-redirects: 1.15.2(debug@4.3.4) + follow-redirects: 1.15.2 transitivePeerDependencies: - debug dev: true @@ -4386,7 +4389,7 @@ packages: webpack: '>=4.0.0 <6.0.0' dependencies: del: 4.1.1 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) dev: true /cli-cursor@3.1.0: @@ -4633,7 +4636,7 @@ packages: normalize-path: 3.0.0 schema-utils: 4.2.0 serialize-javascript: 6.0.1 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) dev: true /core-js-compat@3.32.1: @@ -4775,7 +4778,7 @@ packages: postcss-modules-values: 4.0.0(postcss@8.4.28) postcss-value-parser: 4.2.0 semver: 7.5.4 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) dev: true /css-select@4.3.0: @@ -5524,20 +5527,20 @@ packages: peerDependencies: webpack: ^4.40.0 || ^5.0.0 dependencies: - esbuild: 0.19.2 + esbuild: 0.19.3 get-tsconfig: 4.7.0 loader-utils: 2.0.4 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) webpack-sources: 1.4.3 dev: false - /esbuild-plugin-polyfill-node@0.3.0(esbuild@0.19.2): + /esbuild-plugin-polyfill-node@0.3.0(esbuild@0.19.3): resolution: {integrity: sha512-SHG6CKUfWfYyYXGpW143NEZtcVVn8S/WHcEOxk62LuDXnY4Zpmc+WmxJKN6GMTgTClXJXhEM5KQlxKY6YjbucQ==} peerDependencies: esbuild: '*' dependencies: '@jspm/core': 2.0.1 - esbuild: 0.19.2 + esbuild: 0.19.3 import-meta-resolve: 3.0.0 dev: false @@ -5571,34 +5574,34 @@ packages: '@esbuild/win32-x64': 0.18.20 dev: true - /esbuild@0.19.2: - resolution: {integrity: sha512-G6hPax8UbFakEj3hWO0Vs52LQ8k3lnBhxZWomUJDxfz3rZTLqF5k/FCzuNdLx2RbpBiQQF9H9onlDDH1lZsnjg==} + /esbuild@0.19.3: + resolution: {integrity: sha512-UlJ1qUUA2jL2nNib1JTSkifQTcYTroFqRjwCFW4QYEKEsixXD5Tik9xML7zh2gTxkYTBKGHNH9y7txMwVyPbjw==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/android-arm': 0.19.2 - '@esbuild/android-arm64': 0.19.2 - '@esbuild/android-x64': 0.19.2 - '@esbuild/darwin-arm64': 0.19.2 - '@esbuild/darwin-x64': 0.19.2 - '@esbuild/freebsd-arm64': 0.19.2 - '@esbuild/freebsd-x64': 0.19.2 - '@esbuild/linux-arm': 0.19.2 - '@esbuild/linux-arm64': 0.19.2 - '@esbuild/linux-ia32': 0.19.2 - '@esbuild/linux-loong64': 0.19.2 - '@esbuild/linux-mips64el': 0.19.2 - '@esbuild/linux-ppc64': 0.19.2 - '@esbuild/linux-riscv64': 0.19.2 - '@esbuild/linux-s390x': 0.19.2 - '@esbuild/linux-x64': 0.19.2 - '@esbuild/netbsd-x64': 0.19.2 - '@esbuild/openbsd-x64': 0.19.2 - '@esbuild/sunos-x64': 0.19.2 - '@esbuild/win32-arm64': 0.19.2 - '@esbuild/win32-ia32': 0.19.2 - '@esbuild/win32-x64': 0.19.2 + '@esbuild/android-arm': 0.19.3 + '@esbuild/android-arm64': 0.19.3 + '@esbuild/android-x64': 0.19.3 + '@esbuild/darwin-arm64': 0.19.3 + '@esbuild/darwin-x64': 0.19.3 + '@esbuild/freebsd-arm64': 0.19.3 + '@esbuild/freebsd-x64': 0.19.3 + '@esbuild/linux-arm': 0.19.3 + '@esbuild/linux-arm64': 0.19.3 + '@esbuild/linux-ia32': 0.19.3 + '@esbuild/linux-loong64': 0.19.3 + '@esbuild/linux-mips64el': 0.19.3 + '@esbuild/linux-ppc64': 0.19.3 + '@esbuild/linux-riscv64': 0.19.3 + '@esbuild/linux-s390x': 0.19.3 + '@esbuild/linux-x64': 0.19.3 + '@esbuild/netbsd-x64': 0.19.3 + '@esbuild/openbsd-x64': 0.19.3 + '@esbuild/sunos-x64': 0.19.3 + '@esbuild/win32-arm64': 0.19.3 + '@esbuild/win32-ia32': 0.19.3 + '@esbuild/win32-x64': 0.19.3 /escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -6272,7 +6275,7 @@ packages: resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} dev: true - /follow-redirects@1.15.2(debug@4.3.4): + /follow-redirects@1.15.2: resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} engines: {node: '>=4.0'} peerDependencies: @@ -6280,6 +6283,15 @@ packages: peerDependenciesMeta: debug: optional: true + + /follow-redirects@1.15.3(debug@4.3.4): + resolution: {integrity: sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==} + engines: {node: '>=4.0'} + peerDependencies: + debug: '*' + peerDependenciesMeta: + debug: + optional: true dependencies: debug: 4.3.4(supports-color@8.1.1) @@ -6784,7 +6796,7 @@ packages: lodash: 4.17.21 pretty-error: 4.0.0 tapable: 2.2.1 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) dev: true /htmlparser2@6.1.0: @@ -6862,7 +6874,7 @@ packages: engines: {node: '>=8.0.0'} dependencies: eventemitter3: 4.0.7 - follow-redirects: 1.15.2(debug@4.3.4) + follow-redirects: 1.15.2 requires-port: 1.0.0 transitivePeerDependencies: - debug @@ -8355,7 +8367,7 @@ packages: webpack: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.1.0 dependencies: lodash: 4.17.21 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) dev: true /lodash.compact@3.0.1: @@ -8653,7 +8665,7 @@ packages: prismarine-entity: 2.3.1 prismarine-item: 1.14.0 prismarine-nbt: 2.2.1 - prismarine-physics: 1.7.0 + prismarine-physics: 1.8.0 prismarine-recipe: 1.3.1(prismarine-registry@1.7.0) prismarine-windows: 2.8.0 prismarine-world: github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786 @@ -10882,7 +10894,7 @@ packages: webpack: ^1 || ^2 || ^3 || ^4 || ^5 dependencies: chalk: 4.1.2 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) dev: false /spiralloop@1.0.2: @@ -11122,7 +11134,7 @@ packages: peerDependencies: webpack: ^5.0.0 dependencies: - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) dev: true /stylis@4.2.0: @@ -11220,7 +11232,7 @@ packages: supports-hyperlinks: 2.3.0 dev: true - /terser-webpack-plugin@5.3.9(esbuild@0.19.2)(webpack@5.88.2): + /terser-webpack-plugin@5.3.9(esbuild@0.19.3)(webpack@5.88.2): resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -11237,12 +11249,12 @@ packages: optional: true dependencies: '@jridgewell/trace-mapping': 0.3.19 - esbuild: 0.19.2 + esbuild: 0.19.3 jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.1 terser: 5.19.2 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) /terser@5.19.2: resolution: {integrity: sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==} @@ -11634,7 +11646,7 @@ packages: loader-utils: 2.0.4 mime-types: 2.1.35 schema-utils: 3.3.0 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) dev: true /url-parse@1.5.10: @@ -11947,7 +11959,7 @@ packages: import-local: 3.1.0 interpret: 3.1.1 rechoir: 0.8.0 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) webpack-dev-server: 4.15.1(webpack-cli@5.1.4)(webpack@5.88.2) webpack-merge: 5.9.0 @@ -11962,7 +11974,7 @@ packages: mime-types: 2.1.35 range-parser: 1.2.1 schema-utils: 4.2.0 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) /webpack-dev-middleware@6.1.1(webpack@5.88.2): resolution: {integrity: sha512-y51HrHaFeeWir0YO4f0g+9GwZawuigzcAdRNon6jErXy/SqV/+O6eaVAzDqE6t3e3NpGeR5CS+cCDaTC+V3yEQ==} @@ -11978,7 +11990,7 @@ packages: mime-types: 2.1.35 range-parser: 1.2.1 schema-utils: 4.2.0 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) dev: true /webpack-dev-server@4.15.1(webpack-cli@5.1.4)(webpack@5.88.2): @@ -12022,7 +12034,7 @@ packages: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) webpack-dev-middleware: 5.3.3(webpack@5.88.2) ws: 8.13.0 @@ -12049,7 +12061,7 @@ packages: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} - /webpack@5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4): + /webpack@5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4): resolution: {integrity: sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==} engines: {node: '>=10.13.0'} hasBin: true @@ -12080,7 +12092,7 @@ packages: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.9(esbuild@0.19.2)(webpack@5.88.2) + terser-webpack-plugin: 5.3.9(esbuild@0.19.3)(webpack@5.88.2) watchpack: 2.4.0 webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) webpack-sources: 3.2.3 @@ -12508,7 +12520,7 @@ packages: fast-json-stable-stringify: 2.1.0 pretty-bytes: 5.6.0 upath: 1.2.0 - webpack: 5.88.2(esbuild@0.19.2)(webpack-cli@5.1.4) + webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) webpack-sources: 1.4.3 workbox-build: 6.6.0 transitivePeerDependencies: From 28969710fa03596dbfdfbedda0bb26ef06acc80e Mon Sep 17 00:00:00 2001 From: Vitaly Date: Sun, 24 Sep 2023 23:56:10 +0300 Subject: [PATCH 280/318] server: allow to specify port on start --- server.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/server.js b/server.js index 0da756cad..7028b2775 100644 --- a/server.js +++ b/server.js @@ -29,9 +29,14 @@ if (process.argv[3] === 'dev') { app.use(express.static(path.join(__dirname, './dist'))) } +const portArg = process.argv.indexOf('--port') +const port = require.main === module ? process.argv[2] : (portArg !== -1 ? process.argv[portArg + 1] : 8080) + // Start the server -const server = process.argv.includes('--prod') ? undefined : app.listen(require.main !== module || process.argv[2] === undefined ? 8080 : process.argv[2], function () { - console.log('Server listening on port ' + server.address().port) -}) +const server = process.argv.includes('--prod') ? + undefined : + app.listen(port, function () { + console.log('Server listening on port ' + server.address().port) + }) module.exports = { app } From 611f07bdb56e19b27c89bf0061c96c9715c56642 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 25 Sep 2023 00:10:32 +0300 Subject: [PATCH 281/318] sync build.js from main-ligth --- scripts/build.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/build.js b/scripts/build.js index 86899312f..40a41a111 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -1,4 +1,5 @@ //@ts-check +//@ts-check const fsExtra = require('fs-extra') const defaultLocalServerOptions = require('../src/defaultLocalServerOptions') const glob = require('glob') @@ -6,7 +7,7 @@ const fs = require('fs') const crypto = require('crypto') const path = require('path') -const prismarineViewerBase = "./node_modules/prismarine-viewer"; +const prismarineViewerBase = "./node_modules/prismarine-viewer" // these files could be copied at build time eg with copy plugin, but copy plugin slows down the config so we copy them there, alternative we could inline it in esbuild config const webpackFilesToCopy = [ @@ -17,7 +18,7 @@ const webpackFilesToCopy = [ ] exports.webpackFilesToCopy = webpackFilesToCopy exports.copyFiles = (isDev = false) => { - console.time('copy files'); + console.time('copy files') webpackFilesToCopy.forEach(file => { fsExtra.copySync(file.from, file.to) }) From 37d1ca0f4923426e762ddd9f9ad8fb27664f7676 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 25 Sep 2023 00:12:57 +0300 Subject: [PATCH 282/318] prerender -> generateTextures --- src/texturePack.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/texturePack.ts b/src/texturePack.ts index d0ecc18bd..0f54e2961 100644 --- a/src/texturePack.ts +++ b/src/texturePack.ts @@ -123,7 +123,7 @@ const applyTexturePackData = async (version: string, { blockSize }: TextureResol const blockStates: BlockStates = await result.json() const factor = blockSize / 16 - // this will be refactored with prerender refactor + // this will be refactored with generateTextures refactor const processObj = (x) => { if (typeof x !== 'object' || !x) return if (Array.isArray(x)) { From c5cffc1d24ad0b730e18ed018c7f769c79716981 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 25 Sep 2023 00:25:45 +0300 Subject: [PATCH 283/318] drop dist/textures folder 76mb -> 3mb rm unused textures, affects only deploy speed --- scripts/build.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/build.js b/scripts/build.js index 40a41a111..9bf00355a 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -14,23 +14,25 @@ const webpackFilesToCopy = [ { from: `${prismarineViewerBase}/public/blocksStates/`, to: 'dist/blocksStates/' }, { from: `${prismarineViewerBase}/public/worker.js`, to: 'dist/worker.js' }, { from: './assets/', to: './dist/' }, - { from: './config.json', to: 'dist/config.json' } + { from: './config.json', to: 'dist/config.json' }, + { from: `${prismarineViewerBase}/public/textures/1.16.4/entity`, to: 'dist/textures/1.16.4/entity' }, ] exports.webpackFilesToCopy = webpackFilesToCopy exports.copyFiles = (isDev = false) => { console.time('copy files') - webpackFilesToCopy.forEach(file => { - fsExtra.copySync(file.from, file.to) - }) - // todo copy directly only needed + // copy glob const cwd = `${prismarineViewerBase}/public/textures/` - const files = glob.sync('{*/entity/**,*.png}', { cwd: cwd, nodir: true, }) + const files = glob.sync('*.png', { cwd: cwd, nodir: true, }) for (const file of files) { const copyDest = path.join('dist/textures/', file) fs.mkdirSync(path.dirname(copyDest), { recursive: true, }) fs.copyFileSync(path.join(cwd, file), copyDest) } + webpackFilesToCopy.forEach(file => { + fsExtra.copySync(file.from, file.to) + }) + console.timeEnd('copy files') } From 0f11227712339c25984dc8e2982e78b988220556 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 25 Sep 2023 03:35:18 +0300 Subject: [PATCH 284/318] feat: correctly show all interaction & break shapes on some blocks like anvil & beds. Ignore water. todo: to test: break texture --- pnpm-lock.yaml | 29 +++++---- src/{cursor.js => blockInteraction.js} | 90 +++++++++++++++++--------- src/index.ts | 11 ++-- 3 files changed, 79 insertions(+), 51 deletions(-) rename src/{cursor.js => blockInteraction.js} (71%) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 614449875..b515c69af 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -273,7 +273,7 @@ importers: version: 3.45.0 prismarine-block: specifier: github:zardoy/prismarine-block#next-era - version: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + version: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-chunk: specifier: ^1.22.0 version: 1.35.0(minecraft-data@3.45.0) @@ -3020,7 +3020,7 @@ packages: /@types/connect@3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 20.5.7 + '@types/node': 20.6.4 /@types/cookie@0.4.1: resolution: {integrity: sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==} @@ -3134,6 +3134,7 @@ packages: /@types/node@20.6.2: resolution: {integrity: sha512-Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw==} + dev: true /@types/node@20.6.4: resolution: {integrity: sha512-nU6d9MPY0NBUMiE/nXd2IIoC4OLvsLpwAjheoAeuzgvDZA1Cb10QYg+91AF6zQiKWRN5i1m07x6sMe0niBznoQ==} @@ -3177,7 +3178,7 @@ packages: /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 20.6.2 + '@types/node': 20.6.4 /@types/retry@0.12.0: resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==} @@ -3189,7 +3190,7 @@ packages: resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} dependencies: '@types/mime': 1.3.2 - '@types/node': 20.5.7 + '@types/node': 20.6.4 /@types/serve-index@1.9.1: resolution: {integrity: sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==} @@ -7916,7 +7917,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.6.2 + '@types/node': 20.6.4 merge-stream: 2.0.0 supports-color: 7.2.0 @@ -8644,7 +8645,7 @@ packages: resolution: {integrity: sha512-HAXakZrJRb1UC+5dv8EaDrqjW3ZnBnBk3nkb6x/YWyhHCUKn/E7VU0FO+UN9whuqPlkSaVumEdXJdydE6lSYxQ==} dependencies: minecraft-data: 3.45.0 - prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-entity: 2.3.1 prismarine-item: 1.14.0 prismarine-nbt: 2.2.1 @@ -8659,7 +8660,7 @@ packages: minecraft-data: 3.45.0 minecraft-protocol: github.com/zardoy/minecraft-protocol/ef7c0b8d7a56ef997c21d4eba076f9e34560e91a prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) - prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-chat: 1.9.1 prismarine-chunk: 1.35.0(minecraft-data@3.45.0) prismarine-entity: 2.3.1 @@ -8685,7 +8686,7 @@ packages: minecraft-data: 3.45.0 minecraft-protocol: github.com/zardoy/minecraft-protocol/ef7c0b8d7a56ef997c21d4eba076f9e34560e91a prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) - prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-chat: 1.9.1 prismarine-chunk: 1.35.0(minecraft-data@3.45.0) prismarine-entity: 2.3.1 @@ -9606,7 +9607,7 @@ packages: engines: {node: '>=14'} dependencies: prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) - prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-nbt: 2.2.1 prismarine-registry: 1.7.0 smart-buffer: 4.2.0 @@ -9684,7 +9685,7 @@ packages: resolution: {integrity: sha512-iMam8wsUIYoqty3PSfAbbSLIWto/EnXs+zv7lHiZxwaiSR8GgFyN71H4Lp3g5ly4yuiLK8ROF4AINjrKx+vmUA==} dependencies: minecraft-data: 3.45.0 - prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-nbt: 1.6.0 prismarine-world: github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786 vec3: 0.1.8 @@ -12811,7 +12812,7 @@ packages: compression: 1.7.4 express: 4.18.2 minecraft-data: 3.45.0 - prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-chunk: 1.35.0(minecraft-data@3.45.0) prismarine-world: github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786 socket.io: 4.7.2 @@ -12903,7 +12904,7 @@ packages: minecraft-data: 3.45.0 minecraft-protocol: github.com/zardoy/minecraft-protocol/ef7c0b8d7a56ef997c21d4eba076f9e34560e91a prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) - prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-chat: 1.9.1 prismarine-chunk: 1.35.0(minecraft-data@3.45.0) prismarine-entity: 2.3.1 @@ -12922,8 +12923,8 @@ packages: - supports-color dev: true - github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02: - resolution: {tarball: https://codeload.github.com/zardoy/prismarine-block/tar.gz/100f3e3be7927b8144e19a71c8d06f6218021a02} + github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2: + resolution: {tarball: https://codeload.github.com/zardoy/prismarine-block/tar.gz/753cf1fe507f7647063c69d5c124d40f85b29cc2} name: prismarine-block version: 1.17.1 dependencies: diff --git a/src/cursor.js b/src/blockInteraction.js similarity index 71% rename from src/cursor.js rename to src/blockInteraction.js index a76f2c834..5b94ca571 100644 --- a/src/cursor.js +++ b/src/blockInteraction.js @@ -1,5 +1,4 @@ //@ts-check -/* global THREE performance */ // wouldn't better to create atlas instead? import destroyStage0 from 'minecraft-assets/minecraft-assets/data/1.10/blocks/destroy_stage_0.png' @@ -24,12 +23,11 @@ function getViewDirection (pitch, yaw) { return new Vec3(-snYaw * csPitch, snPitch, -csYaw * csPitch) } -class Cursor { +class BlockInteraction { static instance = null - constructor (viewer, renderer, /** @type {import('mineflayer').Bot} */bot) { + init () { bot.on('physicsTick', () => { if (this.lastBlockPlaced < 4) this.lastBlockPlaced++ }) - if (Cursor.instance) return Cursor.instance // Init state this.buttons = [false, false, false] @@ -37,12 +35,6 @@ class Cursor { this.breakStartTime = 0 this.cursorBlock = null - // Setup graphics - const blockGeometry = new THREE.BoxGeometry(1.001, 1.001, 1.001) - this.cursorMesh = new THREE.LineSegments(new THREE.EdgesGeometry(blockGeometry), new THREE.LineBasicMaterial({ color: 0 })) - this.cursorMesh.visible = false - viewer.scene.add(this.cursorMesh) - const loader = new THREE.TextureLoader() this.breakTextures = [] const destroyStagesImages = [ @@ -67,7 +59,7 @@ class Cursor { transparent: true, blending: THREE.MultiplyBlending }) - this.blockBreakMesh = new THREE.Mesh(blockGeometry, breakMaterial) + this.blockBreakMesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 1), breakMaterial) this.blockBreakMesh.visible = false this.blockBreakMesh.renderOrder = 999 viewer.scene.add(this.blockBreakMesh) @@ -111,8 +103,31 @@ class Cursor { }) } + /** @type {null | {blockPos,mesh}} */ + interactionLines = null + updateBlockInteractionLines (/** @type {Vec3 | null} */blockPos, /** @type {{position, width, height, depth}[]} */shapePositions = undefined) { + if (this.interactionLines !== null) { + viewer.scene.remove(this.interactionLines.mesh) + this.interactionLines = null + } + if (blockPos === null || (this.interactionLines && blockPos.equals(this.interactionLines.blockPos))) { + return + } + + const group = new THREE.Group() + for (const { position, width, height, depth } of shapePositions) { + const geometry = new THREE.BoxGeometry(1.001 * width, 1.001 * height, 1.001 * depth) + const mesh = new THREE.LineSegments(new THREE.EdgesGeometry(geometry), new THREE.LineBasicMaterial({ color: 0 })) + const pos = blockPos.plus(position) + mesh.position.set(pos.x, pos.y, pos.z) + group.add(mesh) + } + viewer.scene.add(group) + this.interactionLines = { blockPos, mesh: group } + } + // todo this shouldnt be done in the render loop, migrate the code to dom events to avoid delays on lags - update (/** @type {import('mineflayer').Bot} */bot) { + update () { const cursorBlock = bot.blockAtCursor(5) let cursorBlockDiggable = cursorBlock if (!bot.canDigBlock(cursorBlock) && bot.game.gameMode !== 'creative') cursorBlockDiggable = null @@ -153,25 +168,29 @@ class Cursor { // Show cursor if (!cursorBlock) { - this.cursorMesh.visible = false + this.updateBlockInteractionLines(null) } else { - for (const collisionData of [...cursorBlock.shapes, ...cursorBlock['interactionShapes'] ?? []].slice(0, 1) ?? []) { - const width = collisionData[3] - collisionData[0] - const height = collisionData[4] - collisionData[1] - const depth = collisionData[5] - collisionData[2] - - const initialSize = 1.001 - this.cursorMesh.scale.set(width * initialSize, height * initialSize, depth * initialSize) - this.blockBreakMesh.scale.set(width * initialSize, height * initialSize, depth * initialSize) - // this.cursorMesh.position.set(cursorBlock.position.x + 0.5, cursorBlock.position.y + 0.5, cursorBlock.position.z + 0.5) - const centerX = (collisionData[3] + collisionData[0]) / 2 - const centerY = (collisionData[4] + collisionData[1]) / 2 - const centerZ = (collisionData[5] + collisionData[2]) / 2 - this.cursorMesh.position.set(cursorBlock.position.x + centerX, cursorBlock.position.y + centerY, cursorBlock.position.z + centerZ) - this.blockBreakMesh.position.set(cursorBlock.position.x + centerX, cursorBlock.position.y + centerY, cursorBlock.position.z + centerZ) + const allShapes = [...cursorBlock.shapes, ...cursorBlock['interactionShapes'] ?? []] + this.updateBlockInteractionLines(cursorBlock.position, allShapes.map(shape => { + return getDataFromShape(shape) + })) + { + // union of all values + const breakShape = allShapes.reduce((acc, cur) => { + return [ + Math.min(acc[0], cur[0]), + Math.min(acc[1], cur[1]), + Math.min(acc[2], cur[2]), + Math.max(acc[3], cur[3]), + Math.max(acc[4], cur[4]), + Math.max(acc[5], cur[5]) + ] + }) + const { position, width, height, depth } = getDataFromShape(breakShape) + this.blockBreakMesh.scale.set(width * 1.001, height * 1.001, depth * 1.001) + position.add(cursorBlock.position) + this.blockBreakMesh.position.set(position.x, position.y, position.z) } - this.cursorMesh.visible = true - // change } // Show break animation @@ -193,4 +212,15 @@ class Cursor { } } -export default Cursor +const getDataFromShape = (shape) => { + const width = shape[3] - shape[0] + const height = shape[4] - shape[1] + const depth = shape[5] - shape[2] + const centerX = (shape[3] + shape[0]) / 2 + const centerY = (shape[4] + shape[1]) / 2 + const centerZ = (shape[5] + shape[2]) / 2 + const position = new Vec3(centerX, centerY, centerZ) + return { position, width, height, depth } +} + +export default new BlockInteraction() diff --git a/src/index.ts b/src/index.ts index fe08f45b0..bcad65365 100644 --- a/src/index.ts +++ b/src/index.ts @@ -41,7 +41,7 @@ import { WorldView, Viewer } from 'prismarine-viewer/viewer' import pathfinder from 'mineflayer-pathfinder' import { Vec3 } from 'vec3' -import Cursor from './cursor' +import blockInteraction from './blockInteraction' import * as THREE from 'three' @@ -85,8 +85,6 @@ import CustomChannelClient from './customClient' //@ts-ignore window.THREE = THREE -// workaround to be used in prismarine-block -globalThis.emptyShapeReplacer = [[0.0, 0.0, 0.0, 1.0, 1.0, 1.0]] if ('serviceWorker' in navigator && !isCypress() && process.env.NODE_ENV !== 'development') { window.addEventListener('load', () => { @@ -198,12 +196,11 @@ const pauseMenu = document.getElementById('pause-screen') let mouseMovePostHandle = (e) => { } let lastMouseMove: number -let cursor: Cursor let debugMenu const updateCursor = () => { - cursor.update(bot) + blockInteraction.update() debugMenu ??= hud.shadowRoot.querySelector('#debug-overlay') - debugMenu.cursorBlock = cursor.cursorBlock + debugMenu.cursorBlock = blockInteraction.cursorBlock } function onCameraMove(e) { if (e.type !== 'touchmove' && !pointerLock.hasPointerLock) return @@ -487,7 +484,6 @@ async function connect(connectOptions: { handleError(err) } if (!bot) return - cursor = new Cursor(viewer, renderer, bot) // bot.on('move', () => updateCursor()) let p2pConnectTimeout = p2pMultiplayer ? setTimeout(() => { throw new Error('Spawn timeout. There might be error on other side, check console.') }, 20_000) : undefined @@ -722,6 +718,7 @@ async function connect(connectOptions: { hud.init(renderer, bot, host) hud.style.display = 'block' + blockInteraction.init() setTimeout(function () { errorAbortController.abort() From 47b895d2cfa63ebaae18b296e4de2f99b5bf12de Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 25 Sep 2023 03:48:12 +0300 Subject: [PATCH 285/318] fix: fix hotbar interactions on mobile --- src/menus/components/hotbar.js | 48 +++++++--------------------------- 1 file changed, 10 insertions(+), 38 deletions(-) diff --git a/src/menus/components/hotbar.js b/src/menus/components/hotbar.js index a4ff4a0c5..95744da69 100644 --- a/src/menus/components/hotbar.js +++ b/src/menus/components/hotbar.js @@ -187,48 +187,20 @@ class Hotbar extends LitElement {

    ${this.activeItemName}

    -
    { +
    { if (!e.target.id.startsWith('hotbar')) return const slot = +e.target.id.split('-')[1] this.reloadHotbarSelected(slot) }}> -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    - ${miscUiState.currentTouch ? html`
    { + ${Array.from({ length: 9 }).map((_, i) => html` +
    { + this.reloadHotbarSelected(i) + }}> +
    + +
    + `)} + ${miscUiState.currentTouch ? html`
    { showModal({ reactType: 'inventory', }) }}>` : undefined}
    From e4265e2dc8816ec56feb5feab1f0f8c8b6e2f9c5 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 25 Sep 2023 08:08:43 +0300 Subject: [PATCH 286/318] always show errors on tcp disconnect! --- package.json | 3 ++- pnpm-lock.yaml | 67 +++++++++++++++++++++++++++----------------------- src/index.ts | 23 +++++++++++++++-- 3 files changed, 59 insertions(+), 34 deletions(-) diff --git a/package.json b/package.json index e2dbe0623..b9c831e84 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,8 @@ "url": "^0.11.1", "valtio": "^1.11.1", "minecraft-assets": "^1.9.1", - "workbox-build": "^7.0.0" + "workbox-build": "^7.0.0", + "debug": "^4.3.4" }, "devDependencies": { "@types/three": "0.128.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b515c69af..2257bb5ca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,6 +48,9 @@ importers: cypress-plugin-snapshots: specifier: ^1.4.4 version: 1.4.4(cypress@9.5.4) + debug: + specifier: ^4.3.4 + version: 4.3.4(supports-color@8.1.1) diamond-square: specifier: ^1.2.0 version: 1.2.0 @@ -177,7 +180,7 @@ importers: version: 1.7.0 http-server: specifier: ^14.1.1 - version: 14.1.1 + version: 14.1.1(debug@4.3.4) https-browserify: specifier: ^1.0.0 version: 1.0.0 @@ -246,7 +249,7 @@ importers: version: 6.1.1(webpack@5.88.2) webpack-dev-server: specifier: ^4.15.1 - version: 4.15.1(webpack-cli@5.1.4)(webpack@5.88.2) + version: 4.15.1(debug@4.3.4)(webpack-cli@5.1.4)(webpack@5.88.2) webpack-merge: specifier: ^5.9.0 version: 5.9.0 @@ -316,7 +319,7 @@ importers: version: 27.0.4(canvas@2.11.2) jest-puppeteer: specifier: ^6.0.0 - version: 6.0.0(puppeteer@16.0.0) + version: 6.0.0(debug@4.3.4)(puppeteer@16.0.0) minecraft-assets: specifier: ^1.9.0 version: 1.9.0 @@ -2869,7 +2872,7 @@ packages: schema-utils: 3.3.0 source-map: 0.7.4 webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - webpack-dev-server: 4.15.1(webpack-cli@5.1.4)(webpack@5.88.2) + webpack-dev-server: 4.15.1(debug@4.3.4)(webpack-cli@5.1.4)(webpack@5.88.2) dev: false /@popperjs/core@2.11.8: @@ -3376,7 +3379,7 @@ packages: dependencies: webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) - webpack-dev-server: 4.15.1(webpack-cli@5.1.4)(webpack@5.88.2) + webpack-dev-server: 4.15.1(debug@4.3.4)(webpack-cli@5.1.4)(webpack@5.88.2) /@xboxreplay/errors@0.1.0: resolution: {integrity: sha512-Tgz1d/OIPDWPeyOvuL5+aai5VCcqObhPnlI3skQuf80GVF3k1I0lPCnGC+8Cm5PV9aLBT5m8qPcJoIUQ2U4y9g==} @@ -3813,10 +3816,10 @@ packages: transitivePeerDependencies: - debug - /axios@0.25.0: + /axios@0.25.0(debug@4.3.4): resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==} dependencies: - follow-redirects: 1.15.2 + follow-redirects: 1.15.2(debug@4.3.4) transitivePeerDependencies: - debug dev: true @@ -6276,7 +6279,7 @@ packages: resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} dev: true - /follow-redirects@1.15.2: + /follow-redirects@1.15.2(debug@4.3.4): resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} engines: {node: '>=4.0'} peerDependencies: @@ -6284,6 +6287,8 @@ packages: peerDependenciesMeta: debug: optional: true + dependencies: + debug: 4.3.4(supports-color@8.1.1) /follow-redirects@1.15.3(debug@4.3.4): resolution: {integrity: sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==} @@ -6852,7 +6857,7 @@ packages: - supports-color dev: true - /http-proxy-middleware@2.0.6(@types/express@4.17.17): + /http-proxy-middleware@2.0.6(@types/express@4.17.17)(debug@4.3.4): resolution: {integrity: sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==} engines: {node: '>=12.0.0'} peerDependencies: @@ -6863,24 +6868,24 @@ packages: dependencies: '@types/express': 4.17.17 '@types/http-proxy': 1.17.11 - http-proxy: 1.18.1 + http-proxy: 1.18.1(debug@4.3.4) is-glob: 4.0.3 is-plain-obj: 3.0.0 micromatch: 4.0.5 transitivePeerDependencies: - debug - /http-proxy@1.18.1: + /http-proxy@1.18.1(debug@4.3.4): resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==} engines: {node: '>=8.0.0'} dependencies: eventemitter3: 4.0.7 - follow-redirects: 1.15.2 + follow-redirects: 1.15.2(debug@4.3.4) requires-port: 1.0.0 transitivePeerDependencies: - debug - /http-server@14.1.1: + /http-server@14.1.1(debug@4.3.4): resolution: {integrity: sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A==} engines: {node: '>=12'} hasBin: true @@ -6890,7 +6895,7 @@ packages: corser: 2.0.1 he: 1.2.0 html-encoding-sniffer: 3.0.0 - http-proxy: 1.18.1 + http-proxy: 1.18.1(debug@4.3.4) mime: 1.6.0 minimist: 1.2.8 opener: 1.5.2 @@ -7542,7 +7547,7 @@ packages: - utf-8-validate dev: true - /jest-dev-server@6.2.0: + /jest-dev-server@6.2.0(debug@4.3.4): resolution: {integrity: sha512-ZWh8CuvxwjhYfvw4tGeftziqIvw/26R6AG3OTgNTQeXul8aZz48RQjDpnlDwnWX53jxJJl9fcigqIdSU5lYZuw==} dependencies: chalk: 4.1.2 @@ -7551,7 +7556,7 @@ packages: prompts: 2.4.2 spawnd: 6.2.0 tree-kill: 1.2.2 - wait-on: 6.0.1 + wait-on: 6.0.1(debug@4.3.4) transitivePeerDependencies: - debug - supports-color @@ -7615,12 +7620,12 @@ packages: jest-util: 27.5.1 dev: true - /jest-environment-puppeteer@6.2.0: + /jest-environment-puppeteer@6.2.0(debug@4.3.4): resolution: {integrity: sha512-a/oSu6dO9D+XoDDe3ZY/0Sk79Jl2FcJl7Q0D+3x22l1eWNOYe4ikXnPGhtmNZ3mJIpuAVIX6LytA8EraOk/aqQ==} dependencies: chalk: 4.1.2 cwd: 0.10.0 - jest-dev-server: 6.2.0 + jest-dev-server: 6.2.0(debug@4.3.4) jest-environment-node: 27.5.1 merge-deep: 3.0.3 transitivePeerDependencies: @@ -7731,13 +7736,13 @@ packages: jest-resolve: 27.5.1 dev: true - /jest-puppeteer@6.0.0(puppeteer@16.0.0): + /jest-puppeteer@6.0.0(debug@4.3.4)(puppeteer@16.0.0): resolution: {integrity: sha512-dgZJdBxRafMRqHFRxnsqLDbuJcOcdgaJlg2PLoMxgPy9nQZTrtG9ezwQsRf1poSaLbZGMAL2JVS907MBCYPEJw==} peerDependencies: puppeteer: '>= 1.5.0' dependencies: expect-puppeteer: 6.1.1 - jest-environment-puppeteer: 6.2.0 + jest-environment-puppeteer: 6.2.0(debug@4.3.4) puppeteer: 16.0.0 transitivePeerDependencies: - debug @@ -8658,7 +8663,7 @@ packages: engines: {node: '>=14'} dependencies: minecraft-data: 3.45.0 - minecraft-protocol: github.com/zardoy/minecraft-protocol/ef7c0b8d7a56ef997c21d4eba076f9e34560e91a + minecraft-protocol: github.com/zardoy/minecraft-protocol/66cb9ab8c23787de13e39ab50dc94a1807485335 prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-chat: 1.9.1 @@ -8684,7 +8689,7 @@ packages: engines: {node: '>=14'} dependencies: minecraft-data: 3.45.0 - minecraft-protocol: github.com/zardoy/minecraft-protocol/ef7c0b8d7a56ef997c21d4eba076f9e34560e91a + minecraft-protocol: github.com/zardoy/minecraft-protocol/66cb9ab8c23787de13e39ab50dc94a1807485335 prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-chat: 1.9.1 @@ -11877,12 +11882,12 @@ packages: xml-name-validator: 3.0.0 dev: true - /wait-on@6.0.1: + /wait-on@6.0.1(debug@4.3.4): resolution: {integrity: sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==} engines: {node: '>=10.0.0'} hasBin: true dependencies: - axios: 0.25.0 + axios: 0.25.0(debug@4.3.4) joi: 17.10.0 lodash: 4.17.21 minimist: 1.2.8 @@ -11961,7 +11966,7 @@ packages: interpret: 3.1.1 rechoir: 0.8.0 webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - webpack-dev-server: 4.15.1(webpack-cli@5.1.4)(webpack@5.88.2) + webpack-dev-server: 4.15.1(debug@4.3.4)(webpack-cli@5.1.4)(webpack@5.88.2) webpack-merge: 5.9.0 /webpack-dev-middleware@5.3.3(webpack@5.88.2): @@ -11994,7 +11999,7 @@ packages: webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) dev: true - /webpack-dev-server@4.15.1(webpack-cli@5.1.4)(webpack@5.88.2): + /webpack-dev-server@4.15.1(debug@4.3.4)(webpack-cli@5.1.4)(webpack@5.88.2): resolution: {integrity: sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==} engines: {node: '>= 12.13.0'} hasBin: true @@ -12024,7 +12029,7 @@ packages: express: 4.18.2 graceful-fs: 4.2.11 html-entities: 2.4.0 - http-proxy-middleware: 2.0.6(@types/express@4.17.17) + http-proxy-middleware: 2.0.6(@types/express@4.17.17)(debug@4.3.4) ipaddr.js: 2.1.0 launch-editor: 2.6.0 open: 8.4.2 @@ -12867,8 +12872,8 @@ packages: - react dev: true - github.com/zardoy/minecraft-protocol/ef7c0b8d7a56ef997c21d4eba076f9e34560e91a: - resolution: {tarball: https://codeload.github.com/zardoy/minecraft-protocol/tar.gz/ef7c0b8d7a56ef997c21d4eba076f9e34560e91a} + github.com/zardoy/minecraft-protocol/66cb9ab8c23787de13e39ab50dc94a1807485335: + resolution: {tarball: https://codeload.github.com/zardoy/minecraft-protocol/tar.gz/66cb9ab8c23787de13e39ab50dc94a1807485335} name: minecraft-protocol version: 1.44.0 engines: {node: '>=14'} @@ -12902,7 +12907,7 @@ packages: engines: {node: '>=14'} dependencies: minecraft-data: 3.45.0 - minecraft-protocol: github.com/zardoy/minecraft-protocol/ef7c0b8d7a56ef997c21d4eba076f9e34560e91a + minecraft-protocol: github.com/zardoy/minecraft-protocol/66cb9ab8c23787de13e39ab50dc94a1807485335 prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-chat: 1.9.1 @@ -12998,7 +13003,7 @@ packages: flatmap: 0.0.3 long: 5.2.3 minecraft-data: 3.45.0 - minecraft-protocol: github.com/zardoy/minecraft-protocol/ef7c0b8d7a56ef997c21d4eba076f9e34560e91a + minecraft-protocol: github.com/zardoy/minecraft-protocol/66cb9ab8c23787de13e39ab50dc94a1807485335 moment: 2.29.4 needle: 2.9.1 node-gzip: 1.1.2 diff --git a/src/index.ts b/src/index.ts index bcad65365..6c487cb06 100644 --- a/src/index.ts +++ b/src/index.ts @@ -82,7 +82,9 @@ import { contro } from './controls' import { genTexturePackTextures, watchTexturepackInViewer } from './texturePack' import { connectToPeer } from './localServerMultiplayer' import CustomChannelClient from './customClient' +import debug from 'debug' +window.debug = debug //@ts-ignore window.THREE = THREE @@ -98,6 +100,7 @@ if ('serviceWorker' in navigator && !isCypress() && process.env.NODE_ENV !== 'de // ACTUAL CODE +// todo stats-gl let stats let stats2 stats = new Stats() @@ -333,7 +336,9 @@ async function connect(connectOptions: { bot.removeAllListeners() bot._client.removeAllListeners() bot._client = undefined - bot = undefined + // for debugging + window._botDisconnected = undefined + window.bot = bot = undefined } removeAllListeners() for (const timeout of timeouts) { @@ -465,8 +470,10 @@ async function connect(connectOptions: { closeTimeout: 240 * 1000, async versionSelectedHook(client) { await downloadMcData(client.version) + setLoadingScreenStatus('Connecting to server') } }) + window.bot = bot if (singeplayer || p2pMultiplayer) { // p2pMultiplayer still uses the same flying-squid server const _supportFeature = bot.supportFeature @@ -479,6 +486,19 @@ async function connect(connectOptions: { bot.emit('inject_allowed') bot._client.emit('connect') + } else { + bot._client.socket.on('connect', () => { + console.log('TCP connection established') + //@ts-ignore + bot._client.socket._ws.addEventListener('close', () => { + console.log('TCP connection closed') + setTimeout(() => { + if (bot) { + bot.emit('end', 'TCP connection closed with unknown reason') + } + }) + }) + }) } } catch (err) { handleError(err) @@ -560,7 +580,6 @@ async function connect(connectOptions: { const debugMenu = hud.shadowRoot.querySelector('#debug-overlay') window.loadedData = mcData - window.bot = bot window.Vec3 = Vec3 window.pathfinder = pathfinder window.debugMenu = debugMenu From 34dcd5ce21ceb859039889107e296acce8c182d0 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Mon, 25 Sep 2023 09:48:43 +0300 Subject: [PATCH 287/318] up prototol --- pnpm-lock.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2257bb5ca..aa063ac86 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8663,7 +8663,7 @@ packages: engines: {node: '>=14'} dependencies: minecraft-data: 3.45.0 - minecraft-protocol: github.com/zardoy/minecraft-protocol/66cb9ab8c23787de13e39ab50dc94a1807485335 + minecraft-protocol: github.com/zardoy/minecraft-protocol/320088fcc115b4c500f8de66d0e3ae87efadcc15 prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-chat: 1.9.1 @@ -8689,7 +8689,7 @@ packages: engines: {node: '>=14'} dependencies: minecraft-data: 3.45.0 - minecraft-protocol: github.com/zardoy/minecraft-protocol/66cb9ab8c23787de13e39ab50dc94a1807485335 + minecraft-protocol: github.com/zardoy/minecraft-protocol/320088fcc115b4c500f8de66d0e3ae87efadcc15 prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-chat: 1.9.1 @@ -12872,8 +12872,8 @@ packages: - react dev: true - github.com/zardoy/minecraft-protocol/66cb9ab8c23787de13e39ab50dc94a1807485335: - resolution: {tarball: https://codeload.github.com/zardoy/minecraft-protocol/tar.gz/66cb9ab8c23787de13e39ab50dc94a1807485335} + github.com/zardoy/minecraft-protocol/320088fcc115b4c500f8de66d0e3ae87efadcc15: + resolution: {tarball: https://codeload.github.com/zardoy/minecraft-protocol/tar.gz/320088fcc115b4c500f8de66d0e3ae87efadcc15} name: minecraft-protocol version: 1.44.0 engines: {node: '>=14'} @@ -12907,7 +12907,7 @@ packages: engines: {node: '>=14'} dependencies: minecraft-data: 3.45.0 - minecraft-protocol: github.com/zardoy/minecraft-protocol/66cb9ab8c23787de13e39ab50dc94a1807485335 + minecraft-protocol: github.com/zardoy/minecraft-protocol/320088fcc115b4c500f8de66d0e3ae87efadcc15 prismarine-biome: 1.3.0(minecraft-data@3.45.0)(prismarine-registry@1.7.0) prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-chat: 1.9.1 @@ -13003,7 +13003,7 @@ packages: flatmap: 0.0.3 long: 5.2.3 minecraft-data: 3.45.0 - minecraft-protocol: github.com/zardoy/minecraft-protocol/66cb9ab8c23787de13e39ab50dc94a1807485335 + minecraft-protocol: github.com/zardoy/minecraft-protocol/320088fcc115b4c500f8de66d0e3ae87efadcc15 moment: 2.29.4 needle: 2.9.1 node-gzip: 1.1.2 From ae1841157de3496f06a19c27a61919a6f6ec2a38 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Mon, 25 Sep 2023 09:50:13 +0300 Subject: [PATCH 288/318] button click: restore using web audio to ensure it doesn't affect music playback, but do not create audiocontext without gesture --- src/menus/components/button.js | 48 ++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/src/menus/components/button.js b/src/menus/components/button.js index d1a402470..6ccc6bad5 100644 --- a/src/menus/components/button.js +++ b/src/menus/components/button.js @@ -1,15 +1,46 @@ //@ts-check const { LitElement, html, css, unsafeCSS } = require('lit') const widgetsGui = require('minecraft-assets/minecraft-assets/data/1.17.1/gui/widgets.png') -const { options, watchValue } = require('../../optionsStorage') +const { options } = require('../../optionsStorage') + +let audioContext +/** @type {Record} */ +const sounds = {} -const buttonClickAudio = new Audio() -buttonClickAudio.src = 'button_click.mp3' // load as many resources on page load as possible instead on demand as user can disable internet connection after he thinks the page is loaded -buttonClickAudio.load() -watchValue(options, o => { - buttonClickAudio.volume = o.volume / 100 -}) +let loadingSounds = [] +async function loadSound (path) { + loadingSounds.push(path) + const res = await window.fetch(path) + const data = await res.arrayBuffer() + + // sounds[path] = await audioContext.decodeAudioData(data) + sounds[path] = data + loadingSounds.splice(loadingSounds.indexOf(path), 1) +} + +export async function playSound (path) { + if (!audioContext) { + audioContext = new window.AudioContext() + for (const [soundName, sound] of Object.entries(sounds)) { + sounds[soundName] = await audioContext.decodeAudioData(sound) + } + } + + const volume = options.volume / 100 + + if (loadingSounds.includes(path)) return + const soundBuffer = sounds[path] + if (!soundBuffer) throw new Error(`Sound ${path} not loaded`) + + const gainNode = audioContext.createGain() + const source = audioContext.createBufferSource() + source.buffer = soundBuffer + source.connect(gainNode) + gainNode.connect(audioContext.destination) + gainNode.gain.value = volume + source.start(0) +} class Button extends LitElement { static get styles () { @@ -134,9 +165,10 @@ class Button extends LitElement { } onBtnClick (e) { - buttonClickAudio.play() + playSound('button_click.mp3') this.dispatchEvent(new window.CustomEvent('pmui-click', { detail: e, })) } } +loadSound('button_click.mp3') window.customElements.define('pmui-button', Button) From e7c2b98631fc54bf4e0aa721b7698390a6bb1b67 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Mon, 25 Sep 2023 09:51:22 +0300 Subject: [PATCH 289/318] fix server default port --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 7028b2775..d89018c9d 100644 --- a/server.js +++ b/server.js @@ -30,7 +30,7 @@ if (process.argv[3] === 'dev') { } const portArg = process.argv.indexOf('--port') -const port = require.main === module ? process.argv[2] : (portArg !== -1 ? process.argv[portArg + 1] : 8080) +const port = (require.main === module ? process.argv[2] : portArg !== -1 ? process.argv[portArg + 1] : undefined) || 8080 // Start the server const server = process.argv.includes('--prod') ? From fd8445d124585066c9d1cca3cb7db76031848011 Mon Sep 17 00:00:00 2001 From: Vitaly Turovsky Date: Mon, 25 Sep 2023 10:06:23 +0300 Subject: [PATCH 290/318] fix: regression: placing blocks on mobile now always works --- src/index.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/index.ts b/src/index.ts index 6c487cb06..7dcf70eb3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -665,8 +665,9 @@ async function connect(connectOptions: { sourceX: e.clientX, sourceY: e.clientY, activateCameraMove: false, - time: new Date() + time: Date.now() } + console.log('capture!') virtualClickTimeout ??= setTimeout(() => { virtualClickActive = true document.dispatchEvent(new MouseEvent('mousedown', { button: 0 })) @@ -710,9 +711,8 @@ async function connect(connectOptions: { virtualClickActive = false } else if (!capturedPointer.activateCameraMove && (Date.now() - capturedPointer.time < touchStartBreakingBlockMs)) { document.dispatchEvent(new MouseEvent('mousedown', { button: 2 })) - nextFrameFn.push(() => { - document.dispatchEvent(new MouseEvent('mouseup', { button: 2 })) - }) + blockInteraction.update() + document.dispatchEvent(new MouseEvent('mouseup', { button: 2 })) } capturedPointer = undefined }, { passive: false }) From c728d79225a4ad47da23afa18bea67dc9d3ecd81 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 25 Sep 2023 20:29:49 +0300 Subject: [PATCH 291/318] autocmplete fixes: dont auto-trigger in non-commands, fix manual tab accept --- src/chat.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chat.js b/src/chat.js index 43fa396ef..318e8889f 100644 --- a/src/chat.js +++ b/src/chat.js @@ -466,13 +466,13 @@ class ChatBox extends LitElement { chatInput.addEventListener('keydown', (e) => { if (e.code === 'Tab') { if (this.completionItems.length) { - this.tabComplete(this.completionItems[0]) + this.acceptComplete(this.completionItems[0]) } else { void this.fetchCompletion(chatInput.value) } e.preventDefault() } - if (e.code === 'Space' && options.autoRequestCompletions) { + if (e.code === 'Space' && options.autoRequestCompletions && chatInput.value.startsWith('/')) { // alternative we could just simply use keyup, but only with keydown we can display suggestions popup as soon as possible void this.fetchCompletion(this.getCompleteValue(chatInput.value + ' ')) } @@ -553,8 +553,8 @@ class ChatBox extends LitElement { this.chatInput.focus() } - tabComplete (item) { - const base = this.completeRequestValue === '/' ? '' : this.completeRequestValue + acceptComplete (item) { + const base = this.completeRequestValue === '/' ? '' : this.getCompleteValue() this.updateInputValue(base + item) // would be cool but disabled because some comands don't need args (like ping) // // trigger next tab complete @@ -576,7 +576,7 @@ class ChatBox extends LitElement { ${this.completionItems.length ? html`
    ${this.completePadText}
    - ${repeat(this.completionItems, (i) => i, (i) => html`
    this.tabComplete(i)}>${i}
    `)} + ${repeat(this.completionItems, (i) => i, (i) => html`
    this.acceptComplete(i)}>${i}
    `)}
    ` : ''} { From 2f35f001d682e9a1756a5e54459ee0e793e84f49 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 25 Sep 2023 21:40:13 +0300 Subject: [PATCH 292/318] cleanup cypress tests! they now run as fast as possible --- cypress/integration/index.spec.ts | 81 ++++++++++++++++++------------- src/index.ts | 6 +++ src/optionsStorage.ts | 2 + 3 files changed, 55 insertions(+), 34 deletions(-) diff --git a/cypress/integration/index.spec.ts b/cypress/integration/index.spec.ts index 31a113ab6..c4f239178 100644 --- a/cypress/integration/index.spec.ts +++ b/cypress/integration/index.spec.ts @@ -1,65 +1,78 @@ /// +import type { AppOptions } from '../../src/optionsStorage' -const setLocalStorageSettings = () => { +const cleanVisit = () => { + window.localStorage.clear() + visit() +} + +const visit = (url = '/') => { window.localStorage.cypress = 'true' - window.localStorage.server = 'localhost' + cy.visit(url) } // todo use ssl +const compareRenderedFlatWorld = () => { + // wait for render + // cy.wait(6000) + // cy.get('body').toMatchImageSnapshot({ + // name: 'superflat-world', + // }) +} + +const testWorldLoad = () => { + cy.document().then({ timeout: 20_000, }, doc => { + return new Cypress.Promise(resolve => { + doc.addEventListener('cypress-world-ready', resolve) + }) + }).then(() => { + compareRenderedFlatWorld() + }) +} + +const setOptions = (options: Partial) => { + cy.window().then(win => { + Object.assign(win['options'], options) + }) +} + it('Loads & renders singleplayer', () => { - cy.visit('/') - window.localStorage.clear() - window.localStorage.setItem('renderDistance', '2') - window.localStorage.setItem('options', JSON.stringify({ + cleanVisit() + setOptions({ localServerOptions: { generation: { name: 'superflat', options: { seed: 250869072 } - } - } - })) - setLocalStorageSettings() - cy.get('#title-screen').find('[data-test-id="singleplayer-button"]', { includeShadowDom: true, }).click() - // todo implement load event - cy.wait(12000) - cy.get('body').toMatchImageSnapshot({ - name: 'superflat-world', + }, + }, + renderDistance: 2 }) + cy.get('#title-screen').find('[data-test-id="singleplayer-button"]', { includeShadowDom: true, }).click() + testWorldLoad() }) it('Joins to server', () => { - cy.visit('/') - setLocalStorageSettings() + // visit('/?version=1.16.1') + window.localStorage.version = '1.16.1' + visit() // todo replace with data-test cy.get('#title-screen').find('[data-test-id="connect-screen-button"]', { includeShadowDom: true, }).click() cy.get('input#serverip', { includeShadowDom: true, }).clear().focus().type('localhost') cy.get('[data-test-id="connect-to-server"]', { includeShadowDom: true, }).click() - // todo implement load event - cy.wait(12000) - cy.get('body').toMatchImageSnapshot({ - name: 'superflat-world', - }) + testWorldLoad() }) it('Loads & renders zip world', () => { - cy.visit('/') - setLocalStorageSettings() + cleanVisit() cy.get('#title-screen').find('[data-test-id="select-file-folder"]', { includeShadowDom: true, }).click({ shiftKey: true }) cy.get('input[type="file"]').selectFile('cypress/superflat.zip', { force: true }) - // todo implement load event - cy.wait(12000) - cy.get('body').toMatchImageSnapshot({ - name: 'superflat-world', - }) + testWorldLoad() }) it.skip('Performance test', () => { - cy.visit('/') - window.localStorage.cypress = 'true' - window.localStorage.setItem('renderDistance', '6') - cy.get('#title-screen').find('.menu > div:nth-child(2) > pmui-button:nth-child(1)', { includeShadowDom: true, }).selectFile('worlds') - // -2 85 24 + // select that world + // from -2 85 24 // await bot.loadPlugin(pathfinder.pathfinder) // bot.pathfinder.goto(new pathfinder.goals.GoalXZ(28, -28)) }) diff --git a/src/index.ts b/src/index.ts index 7dcf70eb3..0e45d5d48 100644 --- a/src/index.ts +++ b/src/index.ts @@ -365,6 +365,7 @@ async function connect(connectOptions: { setLoadingScreenStatus(`Error encountered. Error message: ${err}`, true) destroyAll() + if (isCypress()) throw err } const errorAbortController = new AbortController() @@ -525,6 +526,7 @@ async function connect(connectOptions: { console.log('disconnected for', endReason) destroyAll() setLoadingScreenStatus(`You have been disconnected from the server. End reason: ${endReason}`, true) + if (isCypress()) throw new Error(`disconnected: ${endReason}`) }) bot.once('login', () => { @@ -745,6 +747,10 @@ async function connect(connectOptions: { // remove loading screen, wait a second to make sure a frame has properly rendered setLoadingScreenStatus(undefined) hideCurrentScreens() + viewer.waitForChunksToRender().then(() => { + console.log('All done and ready!') + document.dispatchEvent(new Event('cypress-world-ready')) + }) }, singeplayer ? 0 : 2500) }) } diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts index 81f9b8232..540e97a05 100644 --- a/src/optionsStorage.ts +++ b/src/optionsStorage.ts @@ -39,6 +39,8 @@ const defaultOptions = { askGuestName: true } +export type AppOptions = typeof defaultOptions + export const options = proxy( mergeAny(defaultOptions, JSON.parse(localStorage.options || '{}')) ) From 25d858e6d009573fbca34aa900ba9767c72d3382 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 25 Sep 2023 21:48:13 +0300 Subject: [PATCH 293/318] add typecheck to ci, always prepare data --- .github/workflows/ci.yml | 2 +- package.json | 8 +++++--- pnpm-lock.yaml | 23 +++++++++++++++++------ scripts/prepareData.mjs | 2 +- tsconfig.json | 16 +++++++++++----- 5 files changed, 35 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78de9b773..c132fa563 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: - name: Install pnpm run: npm i -g pnpm - run: pnpm install - - run: pnpm build + - run: pnpm check-build - run: nohup pnpm prod-start & - run: nohup node cypress/minecraft-server.mjs & - uses: cypress-io/github-action@v5 diff --git a/package.json b/package.json index b9c831e84..05adc7c26 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "scripts": { "start": "node scripts/build.js copyFilesDev && node scripts/prepareData.mjs && node esbuild.mjs --watch", "start-watch-script": "nodemon -w esbuild.mjs esbuild.mjs", - "build": "node scripts/build.js copyFiles && node scripts/prepareData.mjs && node esbuild.mjs --minify --prod", + "build": "node scripts/build.js copyFiles && node scripts/prepareData.mjs -f && node esbuild.mjs --minify --prod", + "check-build": "tsc && pnpm build", "watch": "node scripts/build.js copyFilesDev && webpack serve --config webpack.dev.js --progress", "test:cypress": "cypress run", "test:e2e": "start-test http-get://localhost:8080 test:cypress", @@ -31,6 +32,7 @@ "browserfs": "github:zardoy/browserfs#build", "compression": "^1.7.4", "cypress-plugin-snapshots": "^1.4.4", + "debug": "^4.3.4", "diamond-square": "^1.2.0", "eruda": "^3.0.1", "esbuild": "^0.19.3", @@ -56,8 +58,7 @@ "url": "^0.11.1", "valtio": "^1.11.1", "minecraft-assets": "^1.9.1", - "workbox-build": "^7.0.0", - "debug": "^4.3.4" + "workbox-build": "^7.0.0" }, "devDependencies": { "@types/three": "0.128.0", @@ -93,6 +94,7 @@ "style-loader": "^3.3.3", "three": "0.128.0", "timers-browserify": "^2.0.12", + "typescript": "^5.2.2", "url-loader": "^4.1.1", "use-typed-event-listener": "^4.0.2", "vite": "^4.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aa063ac86..20046a04a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -150,7 +150,7 @@ importers: version: 1.0.0 contro-max: specifier: ^0.1.1 - version: 0.1.1 + version: 0.1.1(typescript@5.2.2) copy-webpack-plugin: specifier: ^11.0.0 version: 11.0.0(webpack@5.88.2) @@ -229,12 +229,15 @@ importers: timers-browserify: specifier: ^2.0.12 version: 2.0.12 + typescript: + specifier: ^5.2.2 + version: 5.2.2 url-loader: specifier: ^4.1.1 version: 4.1.1(webpack@5.88.2) use-typed-event-listener: specifier: ^4.0.2 - version: 4.0.2(react@18.2.0) + version: 4.0.2(react@18.2.0)(typescript@5.2.2) vite: specifier: ^4.4.9 version: 4.4.9 @@ -4596,14 +4599,14 @@ packages: resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} engines: {node: '>= 0.6'} - /contro-max@0.1.1: + /contro-max@0.1.1(typescript@5.2.2): resolution: {integrity: sha512-H+bzJWxiuxu98Tz8iGs1occMkRlr9fOzfOKeflVU8bD5teAEiJu8zjVnNSbweLQIR+Vhdynygv18N69t97rVAw==} dependencies: emittery: 0.10.2 lodash-es: 4.17.21 optionalDependencies: react: 17.0.2 - use-typed-event-listener: 4.0.2(react@17.0.2) + use-typed-event-listener: 4.0.2(react@17.0.2)(typescript@5.2.2) transitivePeerDependencies: - typescript dev: true @@ -11527,6 +11530,12 @@ packages: is-typedarray: 1.0.0 dev: true + /typescript@5.2.2: + resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} + engines: {node: '>=14.17'} + hasBin: true + dev: true + /uint4@0.1.2: resolution: {integrity: sha512-lhEx78gdTwFWG+mt6cWAZD/R6qrIj0TTBeH5xwyuDJyswLNlGe+KVlUPQ6+mx5Ld332pS0AMUTo9hIly7YsWxQ==} @@ -11694,7 +11703,7 @@ packages: dependencies: react: 18.2.0 - /use-typed-event-listener@4.0.2(react@17.0.2): + /use-typed-event-listener@4.0.2(react@17.0.2)(typescript@5.2.2): resolution: {integrity: sha512-AhjRw+qg5t7OWg7en2Q4XDCdi2iyhALFl71tITL3FeZqt/jD1Qa6KnbH/UolARtID1Gd0IElizbCgolv3ZbUFA==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} peerDependencies: @@ -11706,11 +11715,12 @@ packages: dependencies: '@babel/runtime': 7.22.11 react: 17.0.2 + typescript: 5.2.2 use-deep-compare: 1.1.0(react@17.0.2) dev: true optional: true - /use-typed-event-listener@4.0.2(react@18.2.0): + /use-typed-event-listener@4.0.2(react@18.2.0)(typescript@5.2.2): resolution: {integrity: sha512-AhjRw+qg5t7OWg7en2Q4XDCdi2iyhALFl71tITL3FeZqt/jD1Qa6KnbH/UolARtID1Gd0IElizbCgolv3ZbUFA==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} peerDependencies: @@ -11722,6 +11732,7 @@ packages: dependencies: '@babel/runtime': 7.22.11 react: 18.2.0 + typescript: 5.2.2 use-deep-compare: 1.1.0(react@18.2.0) dev: true diff --git a/scripts/prepareData.mjs b/scripts/prepareData.mjs index 6d13156cf..1c5d62401 100644 --- a/scripts/prepareData.mjs +++ b/scripts/prepareData.mjs @@ -4,7 +4,7 @@ import { existsSync } from 'node:fs' import Module from "node:module" import { dirname } from 'node:path' -if (existsSync('dist/mc-data')) { +if (existsSync('dist/mc-data') && !process.argv.includes('-f')) { console.log('using cached prepared data') process.exit(0) } diff --git a/tsconfig.json b/tsconfig.json index d6ed70d8f..754ae40e4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,18 +1,24 @@ { "compilerOptions": { - "target": "ES2022", + "target": "ESNext", "moduleResolution": "Node", - "module": "CommonJS", + "module": "ESNext", "allowJs": true, "jsx": "react-jsx", "allowSyntheticDefaultImports": true, "noEmit": true, - "strictFunctionTypes": true, "resolveJsonModule": true, - "noFallthroughCasesInSwitch": true + "strictFunctionTypes": true, + "noImplicitAny": false, + "noFallthroughCasesInSwitch": true, + "allowUnreachableCode": true, + "forceConsistentCasingInFileNames": true, + "useUnknownInCatchVariables": false, + "skipLibCheck": true // "strictNullChecks": true }, "include": [ - "src" + "src", + "cypress" ] } From 9dc6a43f486560c1d5bd2e2102605a94714e3716 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 25 Sep 2023 22:28:06 +0300 Subject: [PATCH 294/318] preview workflow should be fixed --- .github/workflows/preview.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 9ba981108..bc5d5ecd1 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -14,11 +14,14 @@ jobs: ( contains(github.event.comment.body, '/deploy') ) + permissions: + pull-requests: write steps: - name: Checkout uses: actions/checkout@v2 with: fetch-depth: 0 + ref: refs/pull/${{ github.event.issue.number }}/head - name: Install Global Dependencies run: npm install --global vercel pnpm - name: Pull Vercel Environment Information @@ -26,4 +29,11 @@ jobs: - name: Build Project Artifacts run: vercel build --token=${{ secrets.VERCEL_TOKEN }} - name: Deploy Project Artifacts to Vercel - run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} + uses: mathiasvr/command-output@v2.0.0 + with: + run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} + id: deploy + - uses: mshick/add-pr-comment@v2 + with: + message: | + Deployed to Vercel Preview: ${{ steps.deploy.outputs.stdout }} From ffa2c08c954897dd1d3fc8c3b2b625742e5d28a4 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 25 Sep 2023 23:24:28 +0300 Subject: [PATCH 295/318] fix eruda clicks --- src/index.ts | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/index.ts b/src/index.ts index 0e45d5d48..fb90fc261 100644 --- a/src/index.ts +++ b/src/index.ts @@ -634,19 +634,30 @@ async function connect(connectOptions: { registerListener(document, 'pointerlockchange', changeCallback, false) + let holdingTouch: { touch: Touch, elem: HTMLElement } | undefined + document.body.addEventListener('touchend', (e) => { + if (!isGameActive(true)) return + if (holdingTouch?.touch.identifier !== e.changedTouches[0].identifier) return + holdingTouch.elem.click() + holdingTouch = undefined + }) + document.body.addEventListener('touchstart', (e) => { + if (!isGameActive(true)) return + e.preventDefault() + holdingTouch = { + touch: e.touches[0], + elem: e.composedPath()[0] as HTMLElement + } + }, { passive: false }) + const cameraControlEl = hud - // after what time of holding the finger start breaking the block + /** after what time of holding the finger start breaking the block */ const touchStartBreakingBlockMs = 500 let virtualClickActive = false let virtualClickTimeout let screenTouches = 0 let capturedPointer: { id; x; y; sourceX; sourceY; activateCameraMove; time } | null - document.body.addEventListener('touchstart', (e) => { - if (isGameActive(true)) { - e.preventDefault() - } - }, { passive: false }) registerListener(document, 'pointerdown', (e) => { const clickedEl = e.composedPath()[0] if (!isGameActive(true) || !miscUiState.currentTouch || clickedEl !== cameraControlEl || e.pointerId === undefined) { From b360187b77daa2355055dfb670286116d5661023 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 25 Sep 2023 23:30:00 +0300 Subject: [PATCH 296/318] feat: add a way to change size of touch buttons --- src/menus/advanced_options_screen.js | 7 ++++++- src/optionsStorage.ts | 1 + src/reactUi.jsx | 10 +++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/menus/advanced_options_screen.js b/src/menus/advanced_options_screen.js index 18d180a5a..7efa690a1 100644 --- a/src/menus/advanced_options_screen.js +++ b/src/menus/advanced_options_screen.js @@ -2,7 +2,7 @@ const { html, css, LitElement } = require('lit') const { commonCss, openURL } = require('./components/common') const { hideCurrentModal } = require('../globalState') -const { toNumber, getScreenRefreshRate } = require('../utils') +const { getScreenRefreshRate } = require('../utils') const { subscribe } = require('valtio') const { options } = require('../optionsStorage') @@ -74,6 +74,11 @@ class AdvancedOptionsScreen extends LitElement { this.requestUpdate() }}>
    +
    + { + options.touchButtonsSize = +e.target.value + }}> +
    hideCurrentModal()}> diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts index 540e97a05..51aeb35d5 100644 --- a/src/optionsStorage.ts +++ b/src/optionsStorage.ts @@ -24,6 +24,7 @@ const defaultOptions = { fov: 75, guiScale: 3, autoRequestCompletions: true, + touchButtonsSize: 40, frameLimit: false as number | false, alwaysBackupWorldBeforeLoading: undefined as boolean | undefined | null, diff --git a/src/reactUi.jsx b/src/reactUi.jsx index f686ac95a..efe49792e 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -4,12 +4,12 @@ import { renderToDom } from '@zardoy/react-util' import { LeftTouchArea, RightTouchArea, useUsingTouch, useInterfaceState } from '@dimaka/interface' import { css } from '@emotion/css' import { activeModalStack, isGameActive, miscUiState } from './globalState' -import { isProbablyIphone } from './menus/components/common' // import DeathScreen from './react/DeathScreen' import { useSnapshot } from 'valtio' import { contro } from './controls' import { QRCodeSVG } from 'qrcode.react' import { createPortal } from 'react-dom' +import { options, watchValue } from './optionsStorage' // todo useInterfaceState.setState({ @@ -40,6 +40,14 @@ useInterfaceState.setState({ } }) +watchValue(options, (o) => { + useInterfaceState.setState({ + uiCustomization: { + touchButtonSize: o.touchButtonsSize, + }, + }) +}) + const TouchControls = () => { // todo setting const usingTouch = useUsingTouch() From f5c07e0cbf8cdd9013395a4865c7cbc892d4a545 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 26 Sep 2023 00:08:21 +0300 Subject: [PATCH 297/318] remove webpack & unused deps --- package.json | 23 - pnpm-lock.yaml | 1806 ++++++--------------------------------------- scripts/build.js | 10 +- webpack.common.js | 127 ---- webpack.dev.js | 51 -- webpack.prod.js | 51 -- 6 files changed, 242 insertions(+), 1826 deletions(-) delete mode 100644 webpack.common.js delete mode 100644 webpack.dev.js delete mode 100644 webpack.prod.js diff --git a/package.json b/package.json index 05adc7c26..35a086683 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "start-watch-script": "nodemon -w esbuild.mjs esbuild.mjs", "build": "node scripts/build.js copyFiles && node scripts/prepareData.mjs -f && node esbuild.mjs --minify --prod", "check-build": "tsc && pnpm build", - "watch": "node scripts/build.js copyFilesDev && webpack serve --config webpack.dev.js --progress", "test:cypress": "cypress run", "test:e2e": "start-test http-get://localhost:8080 test:cypress", "prod-start": "node server.js", @@ -22,8 +21,6 @@ "license": "MIT", "dependencies": { "@dimaka/interface": "0.0.3-alpha.0", - "@emotion/css": "^11.11.2", - "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11", "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "@types/wicg-file-system-access": "^2020.9.6", @@ -33,10 +30,8 @@ "compression": "^1.7.4", "cypress-plugin-snapshots": "^1.4.4", "debug": "^4.3.4", - "diamond-square": "^1.2.0", "eruda": "^3.0.1", "esbuild": "^0.19.3", - "esbuild-loader": "^4.0.0", "esbuild-plugin-polyfill-node": "^0.3.0", "express": "^4.18.2", "flying-squid": "github:zardoy/space-squid#everything", @@ -52,10 +47,7 @@ "qrcode.react": "^3.1.0", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-refresh": "^0.14.0", - "speed-measure-webpack-plugin": "^1.5.0", "stats.js": "^0.17.0", - "url": "^0.11.1", "valtio": "^1.11.1", "minecraft-assets": "^1.9.1", "workbox-build": "^7.0.0" @@ -65,22 +57,16 @@ "assert": "^2.0.0", "browserify-zlib": "^0.2.0", "buffer": "^6.0.3", - "clean-webpack-plugin": "^4.0.0", "constants-browserify": "^1.0.0", "contro-max": "^0.1.1", - "copy-webpack-plugin": "^11.0.0", "crypto-browserify": "^3.12.0", - "css-loader": "^6.8.1", "cypress": "^9.5.4", "cypress-esbuild-preprocessor": "^1.0.2", "events": "^3.3.0", "filesize": "^10.0.12", - "html-webpack-plugin": "^5.5.3", "http-browserify": "^1.7.0", "http-server": "^14.1.1", "https-browserify": "^1.0.0", - "lodash-webpack-plugin": "^0.11.6", - "memfs": "^3.5.3", "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next", "mineflayer": "github:zardoy/mineflayer#custom", "mineflayer-pathfinder": "^2.4.4", @@ -91,19 +77,10 @@ "process": "github:PrismarineJS/node-process", "rimraf": "^5.0.1", "stream-browserify": "^3.0.0", - "style-loader": "^3.3.3", "three": "0.128.0", "timers-browserify": "^2.0.12", "typescript": "^5.2.2", - "url-loader": "^4.1.1", "use-typed-event-listener": "^4.0.2", - "vite": "^4.4.9", - "webpack": "^5.88.2", - "webpack-cli": "^5.1.4", - "webpack-dev-middleware": "^6.1.1", - "webpack-dev-server": "^4.15.1", - "webpack-merge": "^5.9.0", - "workbox-webpack-plugin": "^6.6.0", "yaml": "^2.3.2" }, "pnpm": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 20046a04a..73e3feee3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,12 +18,6 @@ importers: '@dimaka/interface': specifier: 0.0.3-alpha.0 version: 0.0.3-alpha.0(@babel/core@7.22.11)(@popperjs/core@2.11.8)(@types/react@18.2.20)(react-dom@18.2.0)(react@18.2.0) - '@emotion/css': - specifier: ^11.11.2 - version: 11.11.2 - '@pmmmwh/react-refresh-webpack-plugin': - specifier: ^0.5.11 - version: 0.5.11(react-refresh@0.14.0)(webpack-dev-server@4.15.1)(webpack@5.88.2) '@types/react': specifier: ^18.2.20 version: 18.2.20 @@ -51,18 +45,12 @@ importers: debug: specifier: ^4.3.4 version: 4.3.4(supports-color@8.1.1) - diamond-square: - specifier: ^1.2.0 - version: 1.2.0 eruda: specifier: ^3.0.1 version: 3.0.1 esbuild: specifier: ^0.19.3 version: 0.19.3 - esbuild-loader: - specifier: ^4.0.0 - version: 4.0.0(webpack@5.88.2) esbuild-plugin-polyfill-node: specifier: ^0.3.0 version: 0.3.0(esbuild@0.19.3) @@ -111,18 +99,9 @@ importers: react-dom: specifier: ^18.2.0 version: 18.2.0(react@18.2.0) - react-refresh: - specifier: ^0.14.0 - version: 0.14.0 - speed-measure-webpack-plugin: - specifier: ^1.5.0 - version: 1.5.0(webpack@5.88.2) stats.js: specifier: ^0.17.0 version: 0.17.0 - url: - specifier: ^0.11.1 - version: 0.11.1 valtio: specifier: ^1.11.1 version: 1.11.1(react@18.2.0) @@ -142,24 +121,15 @@ importers: buffer: specifier: ^6.0.3 version: 6.0.3 - clean-webpack-plugin: - specifier: ^4.0.0 - version: 4.0.0(webpack@5.88.2) constants-browserify: specifier: ^1.0.0 version: 1.0.0 contro-max: specifier: ^0.1.1 version: 0.1.1(typescript@5.2.2) - copy-webpack-plugin: - specifier: ^11.0.0 - version: 11.0.0(webpack@5.88.2) crypto-browserify: specifier: ^3.12.0 version: 3.12.0 - css-loader: - specifier: ^6.8.1 - version: 6.8.1(webpack@5.88.2) cypress: specifier: ^9.5.4 version: 9.5.4 @@ -172,9 +142,6 @@ importers: filesize: specifier: ^10.0.12 version: 10.0.12 - html-webpack-plugin: - specifier: ^5.5.3 - version: 5.5.3(webpack@5.88.2) http-browserify: specifier: ^1.7.0 version: 1.7.0 @@ -184,12 +151,6 @@ importers: https-browserify: specifier: ^1.0.0 version: 1.0.0 - lodash-webpack-plugin: - specifier: ^0.11.6 - version: 0.11.6(webpack@5.88.2) - memfs: - specifier: ^3.5.3 - version: 3.5.3 minecraft-inventory-gui: specifier: github:zardoy/minecraft-inventory-gui#next version: github.com/zardoy/minecraft-inventory-gui/c1331c91fb39bd562dc48eeb33321240d4870edd(@types/react@18.2.20)(react@18.2.0) @@ -220,9 +181,6 @@ importers: stream-browserify: specifier: ^3.0.0 version: 3.0.0 - style-loader: - specifier: ^3.3.3 - version: 3.3.3(webpack@5.88.2) three: specifier: 0.128.0 version: 0.128.0 @@ -232,33 +190,9 @@ importers: typescript: specifier: ^5.2.2 version: 5.2.2 - url-loader: - specifier: ^4.1.1 - version: 4.1.1(webpack@5.88.2) use-typed-event-listener: specifier: ^4.0.2 version: 4.0.2(react@18.2.0)(typescript@5.2.2) - vite: - specifier: ^4.4.9 - version: 4.4.9 - webpack: - specifier: ^5.88.2 - version: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - webpack-cli: - specifier: ^5.1.4 - version: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) - webpack-dev-middleware: - specifier: ^6.1.1 - version: 6.1.1(webpack@5.88.2) - webpack-dev-server: - specifier: ^4.15.1 - version: 4.15.1(debug@4.3.4)(webpack-cli@5.1.4)(webpack@5.88.2) - webpack-merge: - specifier: ^5.9.0 - version: 5.9.0 - workbox-webpack-plugin: - specifier: ^6.6.0 - version: 6.6.0(webpack@5.88.2) yaml: specifier: ^2.3.2 version: 2.3.2 @@ -358,7 +292,7 @@ importers: version: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) webpack-cli: specifier: ^5.1.1 - version: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) + version: 5.1.4(webpack@5.88.2) packages: @@ -384,6 +318,7 @@ packages: json-schema: 0.4.0 jsonpointer: 5.0.1 leven: 3.1.0 + dev: false /@azure/msal-common@13.3.0: resolution: {integrity: sha512-/VFWTicjcJbrGp3yQP7A24xU95NiDMe23vxIU1U6qdRPFsprMDNUohMudclnd+WSHE4/McqkZs/nUU3sAKkVjg==} @@ -444,12 +379,14 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.11 + dev: false /@babel/helper-builder-binary-assignment-operator-visitor@7.22.10: resolution: {integrity: sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.11 + dev: false /@babel/helper-compilation-targets@7.22.10: resolution: {integrity: sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==} @@ -477,6 +414,7 @@ packages: '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 semver: 6.3.1 + dev: false /@babel/helper-create-regexp-features-plugin@7.22.9(@babel/core@7.22.11): resolution: {integrity: sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==} @@ -488,6 +426,7 @@ packages: '@babel/helper-annotate-as-pure': 7.22.5 regexpu-core: 5.3.2 semver: 6.3.1 + dev: false /@babel/helper-define-polyfill-provider@0.4.2(@babel/core@7.22.11): resolution: {integrity: sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==} @@ -502,6 +441,7 @@ packages: resolve: 1.22.4 transitivePeerDependencies: - supports-color + dev: false /@babel/helper-environment-visitor@7.22.5: resolution: {integrity: sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==} @@ -525,6 +465,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.11 + dev: false /@babel/helper-module-imports@7.22.5: resolution: {integrity: sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==} @@ -550,6 +491,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.11 + dev: false /@babel/helper-plugin-utils@7.22.5: resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==} @@ -565,6 +507,7 @@ packages: '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-environment-visitor': 7.22.5 '@babel/helper-wrap-function': 7.22.10 + dev: false /@babel/helper-replace-supers@7.22.9(@babel/core@7.22.11): resolution: {integrity: sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==} @@ -576,6 +519,7 @@ packages: '@babel/helper-environment-visitor': 7.22.5 '@babel/helper-member-expression-to-functions': 7.22.5 '@babel/helper-optimise-call-expression': 7.22.5 + dev: false /@babel/helper-simple-access@7.22.5: resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==} @@ -588,6 +532,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.11 + dev: false /@babel/helper-split-export-declaration@7.22.6: resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} @@ -614,6 +559,7 @@ packages: '@babel/helper-function-name': 7.22.5 '@babel/template': 7.22.5 '@babel/types': 7.22.11 + dev: false /@babel/helpers@7.22.11: resolution: {integrity: sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==} @@ -648,6 +594,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==} @@ -659,6 +606,7 @@ packages: '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 '@babel/plugin-transform-optional-chaining': 7.22.12(@babel/core@7.22.11) + dev: false /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.22.11): resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==} @@ -667,6 +615,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.22.11 + dev: false /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.22.11): resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} @@ -701,6 +650,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.22.11): resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==} @@ -709,6 +659,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.22.11): resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==} @@ -717,6 +668,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==} @@ -726,6 +678,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-syntax-import-attributes@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==} @@ -735,6 +688,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.22.11): resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} @@ -808,6 +762,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.22.11): resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} @@ -837,6 +792,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-arrow-functions@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==} @@ -846,6 +802,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-async-generator-functions@7.22.11(@babel/core@7.22.11): resolution: {integrity: sha512-0pAlmeRJn6wU84zzZsEOx1JV1Jf8fqO9ok7wofIJwUnplYo247dcd24P+cMJht7ts9xkzdtB0EPHmOb7F+KzXw==} @@ -858,6 +815,7 @@ packages: '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.22.11) '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==} @@ -869,6 +827,7 @@ packages: '@babel/helper-module-imports': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-block-scoped-functions@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==} @@ -878,6 +837,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-block-scoping@7.22.10(@babel/core@7.22.11): resolution: {integrity: sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==} @@ -887,6 +847,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==} @@ -897,6 +858,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-class-static-block@7.22.11(@babel/core@7.22.11): resolution: {integrity: sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==} @@ -908,6 +870,7 @@ packages: '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-classes@7.22.6(@babel/core@7.22.11): resolution: {integrity: sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==} @@ -925,6 +888,7 @@ packages: '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.11) '@babel/helper-split-export-declaration': 7.22.6 globals: 11.12.0 + dev: false /@babel/plugin-transform-computed-properties@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==} @@ -935,6 +899,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 '@babel/template': 7.22.5 + dev: false /@babel/plugin-transform-destructuring@7.22.10(@babel/core@7.22.11): resolution: {integrity: sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==} @@ -944,6 +909,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-dotall-regex@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==} @@ -954,6 +920,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-duplicate-keys@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==} @@ -963,6 +930,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-dynamic-import@7.22.11(@babel/core@7.22.11): resolution: {integrity: sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==} @@ -973,6 +941,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-exponentiation-operator@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==} @@ -983,6 +952,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.10 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-export-namespace-from@7.22.11(@babel/core@7.22.11): resolution: {integrity: sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==} @@ -993,6 +963,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-for-of@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==} @@ -1002,6 +973,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-function-name@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==} @@ -1013,6 +985,7 @@ packages: '@babel/helper-compilation-targets': 7.22.10 '@babel/helper-function-name': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-json-strings@7.22.11(@babel/core@7.22.11): resolution: {integrity: sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==} @@ -1023,6 +996,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-literals@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==} @@ -1032,6 +1006,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-logical-assignment-operators@7.22.11(@babel/core@7.22.11): resolution: {integrity: sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==} @@ -1042,6 +1017,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-member-expression-literals@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==} @@ -1051,6 +1027,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-modules-amd@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==} @@ -1061,6 +1038,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-modules-commonjs@7.22.11(@babel/core@7.22.11): resolution: {integrity: sha512-o2+bg7GDS60cJMgz9jWqRUsWkMzLCxp+jFDeDUT5sjRlAxcJWZ2ylNdI7QQ2+CH5hWu7OnN+Cv3htt7AkSf96g==} @@ -1072,6 +1050,7 @@ packages: '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-simple-access': 7.22.5 + dev: false /@babel/plugin-transform-modules-systemjs@7.22.11(@babel/core@7.22.11): resolution: {integrity: sha512-rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA==} @@ -1084,6 +1063,7 @@ packages: '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-validator-identifier': 7.22.5 + dev: false /@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==} @@ -1094,6 +1074,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==} @@ -1104,6 +1085,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-new-target@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==} @@ -1113,6 +1095,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-nullish-coalescing-operator@7.22.11(@babel/core@7.22.11): resolution: {integrity: sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==} @@ -1123,6 +1106,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-numeric-separator@7.22.11(@babel/core@7.22.11): resolution: {integrity: sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==} @@ -1133,6 +1117,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-object-rest-spread@7.22.11(@babel/core@7.22.11): resolution: {integrity: sha512-nX8cPFa6+UmbepISvlf5jhQyaC7ASs/7UxHmMkuJ/k5xSHvDPPaibMo+v3TXwU/Pjqhep/nFNpd3zn4YR59pnw==} @@ -1146,6 +1131,7 @@ packages: '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.11) '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-object-super@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==} @@ -1156,6 +1142,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-optional-catch-binding@7.22.11(@babel/core@7.22.11): resolution: {integrity: sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==} @@ -1166,6 +1153,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-optional-chaining@7.22.12(@babel/core@7.22.11): resolution: {integrity: sha512-7XXCVqZtyFWqjDsYDY4T45w4mlx1rf7aOgkc/Ww76xkgBiOlmjPkx36PBLHa1k1rwWvVgYMPsbuVnIamx2ZQJw==} @@ -1177,6 +1165,7 @@ packages: '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-parameters@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==} @@ -1186,6 +1175,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==} @@ -1196,6 +1186,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-private-property-in-object@7.22.11(@babel/core@7.22.11): resolution: {integrity: sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==} @@ -1208,6 +1199,7 @@ packages: '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.22.11) + dev: false /@babel/plugin-transform-property-literals@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==} @@ -1217,6 +1209,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-regenerator@7.22.10(@babel/core@7.22.11): resolution: {integrity: sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==} @@ -1227,6 +1220,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 regenerator-transform: 0.15.2 + dev: false /@babel/plugin-transform-reserved-words@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==} @@ -1236,6 +1230,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-shorthand-properties@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==} @@ -1245,6 +1240,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-spread@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==} @@ -1255,6 +1251,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 + dev: false /@babel/plugin-transform-sticky-regex@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==} @@ -1264,6 +1261,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-template-literals@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==} @@ -1273,6 +1271,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-typeof-symbol@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==} @@ -1282,6 +1281,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-unicode-escapes@7.22.10(@babel/core@7.22.11): resolution: {integrity: sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==} @@ -1291,6 +1291,7 @@ packages: dependencies: '@babel/core': 7.22.11 '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-unicode-property-regex@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==} @@ -1301,6 +1302,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-unicode-regex@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==} @@ -1311,6 +1313,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-unicode-sets-regex@7.22.5(@babel/core@7.22.11): resolution: {integrity: sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==} @@ -1321,6 +1324,7 @@ packages: '@babel/core': 7.22.11 '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11) '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/preset-env@7.22.10(@babel/core@7.22.11): resolution: {integrity: sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==} @@ -1411,6 +1415,7 @@ packages: semver: 6.3.1 transitivePeerDependencies: - supports-color + dev: false /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.22.11): resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==} @@ -1421,9 +1426,11 @@ packages: '@babel/helper-plugin-utils': 7.22.5 '@babel/types': 7.22.11 esutils: 2.0.3 + dev: false /@babel/regjsgen@0.8.0: resolution: {integrity: sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==} + dev: false /@babel/runtime@7.22.11: resolution: {integrity: sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==} @@ -1579,6 +1586,7 @@ packages: /@discoveryjs/json-ext@0.5.7: resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==} engines: {node: '>=10.0.0'} + dev: true /@emotion/babel-plugin@11.11.0: resolution: {integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==} @@ -1606,16 +1614,6 @@ packages: stylis: 4.2.0 dev: false - /@emotion/css@11.11.2: - resolution: {integrity: sha512-VJxe1ucoMYMS7DkiMdC2T7PWNbrEI0a39YRiyDvK2qq4lXwjRbVP/z4lpG+odCsRzadlR+1ywwrTzhdm5HNdew==} - dependencies: - '@emotion/babel-plugin': 11.11.0 - '@emotion/cache': 11.11.0 - '@emotion/serialize': 1.1.2 - '@emotion/sheet': 1.2.2 - '@emotion/utils': 1.2.1 - dev: false - /@emotion/css@11.5.0(@babel/core@7.22.11): resolution: {integrity: sha512-mqjz/3aqR9rp40M+pvwdKYWxlQK4Nj3cnNjo3Tx6SM14dSsEn7q/4W2/I7PlgG+mb27iITHugXuBIHH/QwUBVQ==} peerDependencies: @@ -1666,15 +1664,6 @@ packages: resolution: {integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==} dev: false - /@esbuild/android-arm64@0.18.20: - resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-arm64@0.19.3: resolution: {integrity: sha512-w+Akc0vv5leog550kjJV9Ru+MXMR2VuMrui3C61mnysim0gkFCPOUTAfzTP0qX+HpN9Syu3YA3p1hf3EPqObRw==} engines: {node: '>=12'} @@ -1683,15 +1672,6 @@ packages: requiresBuild: true optional: true - /@esbuild/android-arm@0.18.20: - resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-arm@0.19.3: resolution: {integrity: sha512-Lemgw4io4VZl9GHJmjiBGzQ7ONXRfRPHcUEerndjwiSkbxzrpq0Uggku5MxxrXdwJ+pTj1qyw4jwTu7hkPsgIA==} engines: {node: '>=12'} @@ -1700,15 +1680,6 @@ packages: requiresBuild: true optional: true - /@esbuild/android-x64@0.18.20: - resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-x64@0.19.3: resolution: {integrity: sha512-FKQJKkK5MXcBHoNZMDNUAg1+WcZlV/cuXrWCoGF/TvdRiYS4znA0m5Il5idUwfxrE20bG/vU1Cr5e1AD6IEIjQ==} engines: {node: '>=12'} @@ -1717,15 +1688,6 @@ packages: requiresBuild: true optional: true - /@esbuild/darwin-arm64@0.18.20: - resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@esbuild/darwin-arm64@0.19.3: resolution: {integrity: sha512-kw7e3FXU+VsJSSSl2nMKvACYlwtvZB8RUIeVShIEY6PVnuZ3c9+L9lWB2nWeeKWNNYDdtL19foCQ0ZyUL7nqGw==} engines: {node: '>=12'} @@ -1734,15 +1696,6 @@ packages: requiresBuild: true optional: true - /@esbuild/darwin-x64@0.18.20: - resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@esbuild/darwin-x64@0.19.3: resolution: {integrity: sha512-tPfZiwF9rO0jW6Jh9ipi58N5ZLoSjdxXeSrAYypy4psA2Yl1dAMhM71KxVfmjZhJmxRjSnb29YlRXXhh3GqzYw==} engines: {node: '>=12'} @@ -1751,15 +1704,6 @@ packages: requiresBuild: true optional: true - /@esbuild/freebsd-arm64@0.18.20: - resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/freebsd-arm64@0.19.3: resolution: {integrity: sha512-ERDyjOgYeKe0Vrlr1iLrqTByB026YLPzTytDTz1DRCYM+JI92Dw2dbpRHYmdqn6VBnQ9Bor6J8ZlNwdZdxjlSg==} engines: {node: '>=12'} @@ -1768,15 +1712,6 @@ packages: requiresBuild: true optional: true - /@esbuild/freebsd-x64@0.18.20: - resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/freebsd-x64@0.19.3: resolution: {integrity: sha512-nXesBZ2Ad1qL+Rm3crN7NmEVJ5uvfLFPLJev3x1j3feCQXfAhoYrojC681RhpdOph8NsvKBBwpYZHR7W0ifTTA==} engines: {node: '>=12'} @@ -1785,15 +1720,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-arm64@0.18.20: - resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-arm64@0.19.3: resolution: {integrity: sha512-qXvYKmXj8GcJgWq3aGvxL/JG1ZM3UR272SdPU4QSTzD0eymrM7leiZH77pvY3UetCy0k1xuXZ+VPvoJNdtrsWQ==} engines: {node: '>=12'} @@ -1802,15 +1728,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-arm@0.18.20: - resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-arm@0.19.3: resolution: {integrity: sha512-zr48Cg/8zkzZCzDHNxXO/89bf9e+r4HtzNUPoz4GmgAkF1gFAFmfgOdCbR8zMbzFDGb1FqBBhdXUpcTQRYS1cQ==} engines: {node: '>=12'} @@ -1819,15 +1736,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-ia32@0.18.20: - resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-ia32@0.19.3: resolution: {integrity: sha512-7XlCKCA0nWcbvYpusARWkFjRQNWNGlt45S+Q18UeS///K6Aw8bB2FKYe9mhVWy/XLShvCweOLZPrnMswIaDXQA==} engines: {node: '>=12'} @@ -1836,15 +1744,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-loong64@0.18.20: - resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-loong64@0.19.3: resolution: {integrity: sha512-qGTgjweER5xqweiWtUIDl9OKz338EQqCwbS9c2Bh5jgEH19xQ1yhgGPNesugmDFq+UUSDtWgZ264st26b3de8A==} engines: {node: '>=12'} @@ -1853,15 +1752,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-mips64el@0.18.20: - resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-mips64el@0.19.3: resolution: {integrity: sha512-gy1bFskwEyxVMFRNYSvBauDIWNggD6pyxUksc0MV9UOBD138dKTzr8XnM2R4mBsHwVzeuIH8X5JhmNs2Pzrx+A==} engines: {node: '>=12'} @@ -1870,15 +1760,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-ppc64@0.18.20: - resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-ppc64@0.19.3: resolution: {integrity: sha512-UrYLFu62x1MmmIe85rpR3qou92wB9lEXluwMB/STDzPF9k8mi/9UvNsG07Tt9AqwPQXluMQ6bZbTzYt01+Ue5g==} engines: {node: '>=12'} @@ -1887,15 +1768,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-riscv64@0.18.20: - resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-riscv64@0.19.3: resolution: {integrity: sha512-9E73TfyMCbE+1AwFOg3glnzZ5fBAFK4aawssvuMgCRqCYzE0ylVxxzjEfut8xjmKkR320BEoMui4o/t9KA96gA==} engines: {node: '>=12'} @@ -1904,15 +1776,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-s390x@0.18.20: - resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-s390x@0.19.3: resolution: {integrity: sha512-LlmsbuBdm1/D66TJ3HW6URY8wO6IlYHf+ChOUz8SUAjVTuaisfuwCOAgcxo3Zsu3BZGxmI7yt//yGOxV+lHcEA==} engines: {node: '>=12'} @@ -1921,15 +1784,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-x64@0.18.20: - resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-x64@0.19.3: resolution: {integrity: sha512-ogV0+GwEmvwg/8ZbsyfkYGaLACBQWDvO0Kkh8LKBGKj9Ru8VM39zssrnu9Sxn1wbapA2qNS6BiLdwJZGouyCwQ==} engines: {node: '>=12'} @@ -1938,15 +1792,6 @@ packages: requiresBuild: true optional: true - /@esbuild/netbsd-x64@0.18.20: - resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/netbsd-x64@0.19.3: resolution: {integrity: sha512-o1jLNe4uzQv2DKXMlmEzf66Wd8MoIhLNO2nlQBHLtWyh2MitDG7sMpfCO3NTcoTMuqHjfufgUQDFRI5C+xsXQw==} engines: {node: '>=12'} @@ -1955,15 +1800,6 @@ packages: requiresBuild: true optional: true - /@esbuild/openbsd-x64@0.18.20: - resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/openbsd-x64@0.19.3: resolution: {integrity: sha512-AZJCnr5CZgZOdhouLcfRdnk9Zv6HbaBxjcyhq0StNcvAdVZJSKIdOiPB9az2zc06ywl0ePYJz60CjdKsQacp5Q==} engines: {node: '>=12'} @@ -1972,15 +1808,6 @@ packages: requiresBuild: true optional: true - /@esbuild/sunos-x64@0.18.20: - resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: true - optional: true - /@esbuild/sunos-x64@0.19.3: resolution: {integrity: sha512-Acsujgeqg9InR4glTRvLKGZ+1HMtDm94ehTIHKhJjFpgVzZG9/pIcWW/HA/DoMfEyXmANLDuDZ2sNrWcjq1lxw==} engines: {node: '>=12'} @@ -1989,15 +1816,6 @@ packages: requiresBuild: true optional: true - /@esbuild/win32-arm64@0.18.20: - resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-arm64@0.19.3: resolution: {integrity: sha512-FSrAfjVVy7TifFgYgliiJOyYynhQmqgPj15pzLyJk8BUsnlWNwP/IAy6GAiB1LqtoivowRgidZsfpoYLZH586A==} engines: {node: '>=12'} @@ -2006,15 +1824,6 @@ packages: requiresBuild: true optional: true - /@esbuild/win32-ia32@0.18.20: - resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-ia32@0.19.3: resolution: {integrity: sha512-xTScXYi12xLOWZ/sc5RBmMN99BcXp/eEf7scUC0oeiRoiT5Vvo9AycuqCp+xdpDyAU+LkrCqEpUS9fCSZF8J3Q==} engines: {node: '>=12'} @@ -2023,15 +1832,6 @@ packages: requiresBuild: true optional: true - /@esbuild/win32-x64@0.18.20: - resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-x64@0.19.3: resolution: {integrity: sha512-FbUN+0ZRXsypPyWE2IwIkVjDkDnJoMJARWOcFZn4KPPli+QnKqF0z1anvfaYe3ev5HFCpRDLLBDHyOALLppWHw==} engines: {node: '>=12'} @@ -2774,9 +2574,6 @@ packages: resolution: {integrity: sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw==} dev: false - /@leichtgewicht/ip-codec@2.0.4: - resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==} - /@lit-labs/ssr-dom-shim@1.1.1: resolution: {integrity: sha512-kXOeFbfCm4fFf2A3WwVEeQj55tMZa8c8/f9AKHMobQMkzNUfUj+antR3fRPaZJawsa1aZiP/Da3ndpZrwEe4rQ==} dev: false @@ -2838,46 +2635,6 @@ packages: dev: true optional: true - /@pmmmwh/react-refresh-webpack-plugin@0.5.11(react-refresh@0.14.0)(webpack-dev-server@4.15.1)(webpack@5.88.2): - resolution: {integrity: sha512-7j/6vdTym0+qZ6u4XbSAxrWBGYSdCfTzySkj7WAFgDLmSyWlOrWvpyzxlFh5jtw9dn0oL/jtW+06XfFiisN3JQ==} - engines: {node: '>= 10.13'} - peerDependencies: - '@types/webpack': 4.x || 5.x - react-refresh: '>=0.10.0 <1.0.0' - sockjs-client: ^1.4.0 - type-fest: '>=0.17.0 <5.0.0' - webpack: '>=4.43.0 <6.0.0' - webpack-dev-server: 3.x || 4.x - webpack-hot-middleware: 2.x - webpack-plugin-serve: 0.x || 1.x - peerDependenciesMeta: - '@types/webpack': - optional: true - sockjs-client: - optional: true - type-fest: - optional: true - webpack-dev-server: - optional: true - webpack-hot-middleware: - optional: true - webpack-plugin-serve: - optional: true - dependencies: - ansi-html-community: 0.0.8 - common-path-prefix: 3.0.0 - core-js-pure: 3.32.1 - error-stack-parser: 2.1.4 - find-up: 5.0.0 - html-entities: 2.4.0 - loader-utils: 2.0.4 - react-refresh: 0.14.0 - schema-utils: 3.3.0 - source-map: 0.7.4 - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - webpack-dev-server: 4.15.1(debug@4.3.4)(webpack-cli@5.1.4)(webpack@5.88.2) - dev: false - /@popperjs/core@2.11.8: resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} dev: false @@ -2897,6 +2654,7 @@ packages: '@babel/helper-module-imports': 7.22.5 '@rollup/pluginutils': 3.1.0(rollup@2.79.1) rollup: 2.79.1 + dev: false /@rollup/plugin-node-resolve@11.2.1(rollup@2.79.1): resolution: {integrity: sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==} @@ -2911,6 +2669,7 @@ packages: is-module: 1.0.0 resolve: 1.22.4 rollup: 2.79.1 + dev: false /@rollup/plugin-replace@2.4.2(rollup@2.79.1): resolution: {integrity: sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==} @@ -2920,6 +2679,7 @@ packages: '@rollup/pluginutils': 3.1.0(rollup@2.79.1) magic-string: 0.25.9 rollup: 2.79.1 + dev: false /@rollup/pluginutils@3.1.0(rollup@2.79.1): resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} @@ -2931,6 +2691,7 @@ packages: estree-walker: 1.0.1 picomatch: 2.3.1 rollup: 2.79.1 + dev: false /@sideway/address@4.1.4: resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==} @@ -2968,6 +2729,7 @@ packages: json5: 2.2.3 magic-string: 0.25.9 string.prototype.matchall: 4.0.8 + dev: false /@tootallnate/once@1.1.2: resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==} @@ -3006,28 +2768,6 @@ packages: '@babel/types': 7.22.11 dev: true - /@types/body-parser@1.19.2: - resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} - dependencies: - '@types/connect': 3.4.35 - '@types/node': 20.5.7 - - /@types/bonjour@3.5.10: - resolution: {integrity: sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==} - dependencies: - '@types/node': 20.5.7 - - /@types/connect-history-api-fallback@1.5.0: - resolution: {integrity: sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==} - dependencies: - '@types/express-serve-static-core': 4.17.36 - '@types/node': 20.5.7 - - /@types/connect@3.4.35: - resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} - dependencies: - '@types/node': 20.6.4 - /@types/cookie@0.4.1: resolution: {integrity: sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==} @@ -3041,40 +2781,21 @@ packages: dependencies: '@types/eslint': 8.44.2 '@types/estree': 1.0.1 + dev: true /@types/eslint@8.44.2: resolution: {integrity: sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==} dependencies: '@types/estree': 1.0.1 '@types/json-schema': 7.0.12 + dev: true /@types/estree@0.0.39: resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==} + dev: false /@types/estree@1.0.1: resolution: {integrity: sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==} - - /@types/express-serve-static-core@4.17.36: - resolution: {integrity: sha512-zbivROJ0ZqLAtMzgzIUC4oNqDG9iF0lSsAqpOD9kbs5xcIM3dTiyuHvBc7R8MtWBp3AAWGaovJa+wzWPjLYW7Q==} - dependencies: - '@types/node': 20.5.7 - '@types/qs': 6.9.7 - '@types/range-parser': 1.2.4 - '@types/send': 0.17.1 - - /@types/express@4.17.17: - resolution: {integrity: sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==} - dependencies: - '@types/body-parser': 1.19.2 - '@types/express-serve-static-core': 4.17.36 - '@types/qs': 6.9.7 - '@types/serve-static': 1.15.2 - - /@types/glob@7.2.0: - resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} - dependencies: - '@types/minimatch': 5.1.2 - '@types/node': 20.5.7 dev: true /@types/graceful-fs@4.1.6: @@ -3083,18 +2804,6 @@ packages: '@types/node': 20.6.2 dev: true - /@types/html-minifier-terser@6.1.0: - resolution: {integrity: sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==} - dev: true - - /@types/http-errors@2.0.1: - resolution: {integrity: sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==} - - /@types/http-proxy@1.17.11: - resolution: {integrity: sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==} - dependencies: - '@types/node': 20.5.7 - /@types/istanbul-lib-coverage@2.0.4: resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==} dev: true @@ -3117,21 +2826,12 @@ packages: /@types/json-schema@7.0.12: resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==} + dev: true /@types/json5@0.0.29: resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} dev: true - /@types/mime@1.3.2: - resolution: {integrity: sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==} - - /@types/mime@3.0.1: - resolution: {integrity: sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==} - - /@types/minimatch@5.1.2: - resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==} - dev: true - /@types/node@14.18.56: resolution: {integrity: sha512-+k+57NVS9opgrEn5l9c0gvD1r6C+PtyhVE4BTnMMRwiEA8ZO8uFcs6Yy2sXIy0eC95ZurBtRSvhZiHXBysbl6w==} @@ -3156,12 +2856,6 @@ packages: /@types/prop-types@15.7.5: resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==} - /@types/qs@6.9.7: - resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==} - - /@types/range-parser@1.2.4: - resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==} - /@types/react-dom@18.2.7: resolution: {integrity: sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==} dependencies: @@ -3185,42 +2879,17 @@ packages: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: '@types/node': 20.6.4 - - /@types/retry@0.12.0: - resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==} + dev: false /@types/scheduler@0.16.3: resolution: {integrity: sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==} - /@types/send@0.17.1: - resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} - dependencies: - '@types/mime': 1.3.2 - '@types/node': 20.6.4 - - /@types/serve-index@1.9.1: - resolution: {integrity: sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==} - dependencies: - '@types/express': 4.17.17 - - /@types/serve-static@1.15.2: - resolution: {integrity: sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==} - dependencies: - '@types/http-errors': 2.0.1 - '@types/mime': 3.0.1 - '@types/node': 20.5.7 - /@types/sinonjs__fake-timers@8.1.1: resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==} /@types/sizzle@2.3.3: resolution: {integrity: sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==} - /@types/sockjs@0.3.33: - resolution: {integrity: sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==} - dependencies: - '@types/node': 20.5.7 - /@types/stack-utils@2.0.1: resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} dev: true @@ -3231,16 +2900,12 @@ packages: /@types/trusted-types@2.0.3: resolution: {integrity: sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==} + dev: false /@types/wicg-file-system-access@2020.9.6: resolution: {integrity: sha512-6hogE75Hl2Ov/jgp8ZhDaGmIF/q3J07GtXf8nCJCwKTHq7971po5+DId7grft09zG7plBwpF6ZU0yx9Du4/e1A==} dev: false - /@types/ws@8.5.5: - resolution: {integrity: sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==} - dependencies: - '@types/node': 20.5.7 - /@types/yargs-parser@21.0.0: resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} dev: true @@ -3263,15 +2928,19 @@ packages: dependencies: '@webassemblyjs/helper-numbers': 1.11.6 '@webassemblyjs/helper-wasm-bytecode': 1.11.6 + dev: true /@webassemblyjs/floating-point-hex-parser@1.11.6: resolution: {integrity: sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==} + dev: true /@webassemblyjs/helper-api-error@1.11.6: resolution: {integrity: sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==} + dev: true /@webassemblyjs/helper-buffer@1.11.6: resolution: {integrity: sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==} + dev: true /@webassemblyjs/helper-numbers@1.11.6: resolution: {integrity: sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==} @@ -3279,9 +2948,11 @@ packages: '@webassemblyjs/floating-point-hex-parser': 1.11.6 '@webassemblyjs/helper-api-error': 1.11.6 '@xtuc/long': 4.2.2 + dev: true /@webassemblyjs/helper-wasm-bytecode@1.11.6: resolution: {integrity: sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==} + dev: true /@webassemblyjs/helper-wasm-section@1.11.6: resolution: {integrity: sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==} @@ -3290,19 +2961,23 @@ packages: '@webassemblyjs/helper-buffer': 1.11.6 '@webassemblyjs/helper-wasm-bytecode': 1.11.6 '@webassemblyjs/wasm-gen': 1.11.6 + dev: true /@webassemblyjs/ieee754@1.11.6: resolution: {integrity: sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==} dependencies: '@xtuc/ieee754': 1.2.0 + dev: true /@webassemblyjs/leb128@1.11.6: resolution: {integrity: sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==} dependencies: '@xtuc/long': 4.2.2 + dev: true /@webassemblyjs/utf8@1.11.6: resolution: {integrity: sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==} + dev: true /@webassemblyjs/wasm-edit@1.11.6: resolution: {integrity: sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==} @@ -3315,6 +2990,7 @@ packages: '@webassemblyjs/wasm-opt': 1.11.6 '@webassemblyjs/wasm-parser': 1.11.6 '@webassemblyjs/wast-printer': 1.11.6 + dev: true /@webassemblyjs/wasm-gen@1.11.6: resolution: {integrity: sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==} @@ -3324,6 +3000,7 @@ packages: '@webassemblyjs/ieee754': 1.11.6 '@webassemblyjs/leb128': 1.11.6 '@webassemblyjs/utf8': 1.11.6 + dev: true /@webassemblyjs/wasm-opt@1.11.6: resolution: {integrity: sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==} @@ -3332,6 +3009,7 @@ packages: '@webassemblyjs/helper-buffer': 1.11.6 '@webassemblyjs/wasm-gen': 1.11.6 '@webassemblyjs/wasm-parser': 1.11.6 + dev: true /@webassemblyjs/wasm-parser@1.11.6: resolution: {integrity: sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==} @@ -3342,12 +3020,14 @@ packages: '@webassemblyjs/ieee754': 1.11.6 '@webassemblyjs/leb128': 1.11.6 '@webassemblyjs/utf8': 1.11.6 + dev: true /@webassemblyjs/wast-printer@1.11.6: resolution: {integrity: sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==} dependencies: '@webassemblyjs/ast': 1.11.6 '@xtuc/long': 4.2.2 + dev: true /@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.88.2): resolution: {integrity: sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==} @@ -3357,7 +3037,8 @@ packages: webpack-cli: 5.x.x dependencies: webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) + webpack-cli: 5.1.4(webpack@5.88.2) + dev: true /@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.88.2): resolution: {integrity: sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==} @@ -3367,9 +3048,10 @@ packages: webpack-cli: 5.x.x dependencies: webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) + webpack-cli: 5.1.4(webpack@5.88.2) + dev: true - /@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@4.15.1)(webpack@5.88.2): + /@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack@5.88.2): resolution: {integrity: sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==} engines: {node: '>=14.15.0'} peerDependencies: @@ -3381,8 +3063,8 @@ packages: optional: true dependencies: webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) - webpack-dev-server: 4.15.1(debug@4.3.4)(webpack-cli@5.1.4)(webpack@5.88.2) + webpack-cli: 5.1.4(webpack@5.88.2) + dev: true /@xboxreplay/errors@0.1.0: resolution: {integrity: sha512-Tgz1d/OIPDWPeyOvuL5+aai5VCcqObhPnlI3skQuf80GVF3k1I0lPCnGC+8Cm5PV9aLBT5m8qPcJoIUQ2U4y9g==} @@ -3401,9 +3083,11 @@ packages: /@xtuc/ieee754@1.2.0: resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} + dev: true /@xtuc/long@4.2.2: resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==} + dev: true /@zardoy/react-util@0.2.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-glABtx54mh4XSaK6BNALWE3mlshPjcPwPsRj/GnOXEA7WJY/6n43iJoukbaYF3758mGZRU5Fq6gklyFjBg0yHQ==} @@ -3464,6 +3148,7 @@ packages: acorn: ^8 dependencies: acorn: 8.10.0 + dev: true /acorn-jsx@5.3.2(acorn@8.10.0): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} @@ -3512,30 +3197,13 @@ packages: clean-stack: 2.2.0 indent-string: 4.0.0 - /ajv-formats@2.1.1(ajv@8.12.0): - resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} - peerDependencies: - ajv: ^8.0.0 - peerDependenciesMeta: - ajv: - optional: true - dependencies: - ajv: 8.12.0 - /ajv-keywords@3.5.2(ajv@6.12.6): resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} peerDependencies: ajv: ^6.9.1 dependencies: ajv: 6.12.6 - - /ajv-keywords@5.1.0(ajv@8.12.0): - resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==} - peerDependencies: - ajv: ^8.8.2 - dependencies: - ajv: 8.12.0 - fast-deep-equal: 3.1.3 + dev: true /ajv@6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} @@ -3552,6 +3220,7 @@ packages: json-schema-traverse: 1.0.0 require-from-string: 2.0.2 uri-js: 4.4.1 + dev: false /animejs@3.2.1: resolution: {integrity: sha512-sWno3ugFryK5nhiDm/2BKeFCpZv7vzerWUcUPyAZLDhMek3+S/p418ldZJbJXo5ZUOpfm2kP2XRO4NJcULMy9A==} @@ -3567,11 +3236,6 @@ packages: dependencies: type-fest: 0.21.3 - /ansi-html-community@0.0.8: - resolution: {integrity: sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==} - engines: {'0': node >= 0.8.0} - hasBin: true - /ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} @@ -3617,6 +3281,7 @@ packages: dependencies: normalize-path: 3.0.0 picomatch: 2.3.1 + dev: true /aproba@2.0.0: resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} @@ -3657,9 +3322,6 @@ packages: /array-flatten@1.1.1: resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==} - /array-flatten@2.1.2: - resolution: {integrity: sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==} - /array-includes@3.1.6: resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==} engines: {node: '>= 0.4'} @@ -3671,18 +3333,6 @@ packages: is-string: 1.0.7 dev: true - /array-union@1.0.2: - resolution: {integrity: sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==} - engines: {node: '>=0.10.0'} - dependencies: - array-uniq: 1.0.3 - dev: true - - /array-uniq@1.0.3: - resolution: {integrity: sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==} - engines: {node: '>=0.10.0'} - dev: true - /array.prototype.findlastindex@1.2.2: resolution: {integrity: sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==} engines: {node: '>= 0.4'} @@ -3889,6 +3539,7 @@ packages: semver: 6.3.1 transitivePeerDependencies: - supports-color + dev: false /babel-plugin-polyfill-corejs3@0.8.3(@babel/core@7.22.11): resolution: {integrity: sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==} @@ -3900,6 +3551,7 @@ packages: core-js-compat: 3.32.1 transitivePeerDependencies: - supports-color + dev: false /babel-plugin-polyfill-regenerator@0.5.2(@babel/core@7.22.11): resolution: {integrity: sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==} @@ -3910,6 +3562,7 @@ packages: '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.22.11) transitivePeerDependencies: - supports-color + dev: false /babel-preset-current-node-syntax@1.0.1(@babel/core@7.22.11): resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==} @@ -3968,21 +3621,11 @@ packages: safe-buffer: 5.1.2 dev: true - /batch@0.6.1: - resolution: {integrity: sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==} - /bcrypt-pbkdf@1.0.2: resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==} dependencies: tweetnacl: 0.14.5 - /big.js@5.2.2: - resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} - - /binary-extensions@2.2.0: - resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} - engines: {node: '>=8'} - /bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} dependencies: @@ -4052,18 +3695,6 @@ packages: - supports-color dev: false - /bonjour-service@1.1.1: - resolution: {integrity: sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==} - dependencies: - array-flatten: 2.1.2 - dns-equal: 1.0.0 - fast-deep-equal: 3.1.3 - multicast-dns: 7.2.5 - - /boolbase@1.0.0: - resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} - dev: true - /brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} dependencies: @@ -4080,6 +3711,7 @@ packages: engines: {node: '>=8'} dependencies: fill-range: 7.0.1 + dev: true /brorand@1.1.0: resolution: {integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==} @@ -4197,6 +3829,7 @@ packages: /builtin-modules@3.3.0: resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} engines: {node: '>=6'} + dev: false /builtins@5.0.1: resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} @@ -4231,6 +3864,7 @@ packages: dependencies: pascal-case: 3.1.2 tslib: 2.6.2 + dev: false /camelcase@5.3.1: resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==} @@ -4332,20 +3966,6 @@ packages: resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==} engines: {node: '>= 0.8.0'} - /chokidar@3.5.3: - resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} - engines: {node: '>= 8.10.0'} - dependencies: - anymatch: 3.1.3 - braces: 3.0.2 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 - /chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} dev: true @@ -4358,6 +3978,7 @@ packages: /chrome-trace-event@1.0.3: resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==} engines: {node: '>=6.0'} + dev: true /ci-info@3.8.0: resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==} @@ -4378,27 +3999,10 @@ packages: resolution: {integrity: sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==} dev: false - /clean-css@5.3.2: - resolution: {integrity: sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==} - engines: {node: '>= 10.0'} - dependencies: - source-map: 0.6.1 - dev: true - /clean-stack@2.2.0: resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==} engines: {node: '>=6'} - /clean-webpack-plugin@4.0.0(webpack@5.88.2): - resolution: {integrity: sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==} - engines: {node: '>=10.0.0'} - peerDependencies: - webpack: '>=4.0.0 <6.0.0' - dependencies: - del: 4.1.1 - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - dev: true - /cli-cursor@3.1.0: resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==} engines: {node: '>=8'} @@ -4455,6 +4059,7 @@ packages: is-plain-object: 2.0.4 kind-of: 6.0.3 shallow-clone: 3.0.1 + dev: true /clsx@1.1.1: resolution: {integrity: sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==} @@ -4509,6 +4114,7 @@ packages: /commander@10.0.1: resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==} engines: {node: '>=14'} + dev: true /commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} @@ -4517,15 +4123,6 @@ packages: resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==} engines: {node: '>= 6'} - /commander@8.3.0: - resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} - engines: {node: '>= 12'} - dev: true - - /common-path-prefix@3.0.0: - resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==} - dev: false - /common-tags@1.8.2: resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==} engines: {node: '>=4.0.0'} @@ -4569,10 +4166,6 @@ packages: /concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - /connect-history-api-fallback@2.0.0: - resolution: {integrity: sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==} - engines: {node: '>=0.8'} - /console-control-strings@1.1.0: resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==} dev: true @@ -4631,29 +4224,10 @@ packages: toggle-selection: 1.0.6 dev: false - /copy-webpack-plugin@11.0.0(webpack@5.88.2): - resolution: {integrity: sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==} - engines: {node: '>= 14.15.0'} - peerDependencies: - webpack: ^5.1.0 - dependencies: - fast-glob: 3.3.1 - glob-parent: 6.0.2 - globby: 13.2.2 - normalize-path: 3.0.0 - schema-utils: 4.2.0 - serialize-javascript: 6.0.1 - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - dev: true - /core-js-compat@3.32.1: resolution: {integrity: sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==} dependencies: browserslist: 4.21.10 - - /core-js-pure@3.32.1: - resolution: {integrity: sha512-f52QZwkFVDPf7UEQZGHKx6NYxsxmVGJe5DIvbzOdRMJlmT6yv0KDjR8rmy3ngr/t5wU54c7Sp/qIJH0ppbhVpQ==} - requiresBuild: true dev: false /core-js@3.32.1: @@ -4666,6 +4240,7 @@ packages: /core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} + dev: false /cors@2.8.5: resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==} @@ -4764,6 +4339,7 @@ packages: /crypto-random-string@2.0.0: resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} engines: {node: '>=8'} + dev: false /css-in-js-utils@3.1.0: resolution: {integrity: sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A==} @@ -4771,33 +4347,6 @@ packages: hyphenate-style-name: 1.0.4 dev: false - /css-loader@6.8.1(webpack@5.88.2): - resolution: {integrity: sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==} - engines: {node: '>= 12.13.0'} - peerDependencies: - webpack: ^5.0.0 - dependencies: - icss-utils: 5.1.0(postcss@8.4.28) - postcss: 8.4.28 - postcss-modules-extract-imports: 3.0.0(postcss@8.4.28) - postcss-modules-local-by-default: 4.0.3(postcss@8.4.28) - postcss-modules-scope: 3.0.0(postcss@8.4.28) - postcss-modules-values: 4.0.0(postcss@8.4.28) - postcss-value-parser: 4.2.0 - semver: 7.5.4 - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - dev: true - - /css-select@4.3.0: - resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==} - dependencies: - boolbase: 1.0.0 - css-what: 6.1.0 - domhandler: 4.3.1 - domutils: 2.8.0 - nth-check: 2.1.1 - dev: true - /css-tree@1.1.3: resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==} engines: {node: '>=8.0.0'} @@ -4806,17 +4355,6 @@ packages: source-map: 0.6.1 dev: false - /css-what@6.1.0: - resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==} - engines: {node: '>= 6'} - dev: true - - /cssesc@3.0.0: - resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==} - engines: {node: '>=4'} - hasBin: true - dev: true - /cssom@0.3.8: resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==} dev: true @@ -5025,16 +4563,6 @@ packages: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} - /default-gateway@6.0.3: - resolution: {integrity: sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==} - engines: {node: '>= 10'} - dependencies: - execa: 5.1.1 - - /define-lazy-prop@2.0.0: - resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} - engines: {node: '>=8'} - /define-properties@1.2.0: resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==} engines: {node: '>= 0.4'} @@ -5042,19 +4570,6 @@ packages: has-property-descriptors: 1.0.0 object-keys: 1.1.1 - /del@4.1.1: - resolution: {integrity: sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==} - engines: {node: '>=6'} - dependencies: - '@types/glob': 7.2.0 - globby: 6.1.0 - is-path-cwd: 2.2.0 - is-path-in-cwd: 2.1.0 - p-map: 2.1.0 - pify: 4.0.1 - rimraf: 2.7.1 - dev: true - /delayed-stream@1.0.0: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} @@ -5063,10 +4578,6 @@ packages: resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} dev: true - /depd@1.1.2: - resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==} - engines: {node: '>= 0.6'} - /depd@2.0.0: resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} engines: {node: '>= 0.8'} @@ -5097,9 +4608,6 @@ packages: engines: {node: '>=8'} dev: true - /detect-node@2.1.0: - resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==} - /devtools-protocol@0.0.1019158: resolution: {integrity: sha512-wvq+KscQ7/6spEV7czhnZc9RM/woz1AY+/Vpd8/h2HFMwJSdTliu7f/yr1A6vDdJfKICZsShqsYpEQbdhg8AFQ==} dev: true @@ -5146,25 +4654,9 @@ packages: randombytes: 2.1.0 dev: true - /dir-glob@3.0.1: - resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} - engines: {node: '>=8'} - dependencies: - path-type: 4.0.0 - dev: true - /discontinuous-range@1.0.0: resolution: {integrity: sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==} - /dns-equal@1.0.0: - resolution: {integrity: sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==} - - /dns-packet@5.6.1: - resolution: {integrity: sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==} - engines: {node: '>=6'} - dependencies: - '@leichtgewicht/ip-codec': 2.0.4 - /doctrine@2.1.0: resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==} engines: {node: '>=0.10.0'} @@ -5179,28 +4671,10 @@ packages: esutils: 2.0.3 dev: true - /dom-converter@0.2.0: - resolution: {integrity: sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==} - dependencies: - utila: 0.4.0 - dev: true - - /dom-serializer@1.4.1: - resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==} - dependencies: - domelementtype: 2.3.0 - domhandler: 4.3.1 - entities: 2.2.0 - dev: true - /dom-walk@0.1.2: resolution: {integrity: sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==} dev: false - /domelementtype@2.3.0: - resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==} - dev: true - /domexception@2.0.1: resolution: {integrity: sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==} engines: {node: '>=8'} @@ -5208,26 +4682,12 @@ packages: webidl-conversions: 5.0.0 dev: true - /domhandler@4.3.1: - resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==} - engines: {node: '>= 4'} - dependencies: - domelementtype: 2.3.0 - dev: true - - /domutils@2.8.0: - resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==} - dependencies: - dom-serializer: 1.4.1 - domelementtype: 2.3.0 - domhandler: 4.3.1 - dev: true - /dot-case@3.0.4: resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==} dependencies: no-case: 3.0.4 tslib: 2.6.2 + dev: false /eastasianwidth@0.2.0: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} @@ -5253,6 +4713,7 @@ packages: hasBin: true dependencies: jake: 10.8.7 + dev: false /electron-to-chromium@1.4.504: resolution: {integrity: sha512-cSMwIAd8yUh54VwitVRVvHK66QqHWE39C3DRj8SWiXitEpVSY3wNPD9y1pxQtLIi4w3UdzF9klLsmuPshz09DQ==} @@ -5291,10 +4752,6 @@ packages: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} dev: true - /emojis-list@3.0.0: - resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} - engines: {node: '>= 4'} - /encodeurl@1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} engines: {node: '>= 0.8'} @@ -5395,6 +4852,7 @@ packages: dependencies: graceful-fs: 4.2.11 tapable: 2.2.1 + dev: true /enquirer@2.4.1: resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} @@ -5403,14 +4861,11 @@ packages: ansi-colors: 4.1.3 strip-ansi: 6.0.1 - /entities@2.2.0: - resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==} - dev: true - /envinfo@7.10.0: resolution: {integrity: sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==} engines: {node: '>=4'} hasBin: true + dev: true /error-ex@1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} @@ -5492,6 +4947,7 @@ packages: /es-module-lexer@1.3.0: resolution: {integrity: sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==} + dev: true /es-set-tostringtag@2.0.1: resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==} @@ -5529,18 +4985,6 @@ packages: es6-promise: 4.2.8 dev: true - /esbuild-loader@4.0.0(webpack@5.88.2): - resolution: {integrity: sha512-J7TJWyHV2YHmflZaXLZ0Vf4wYmixDyGTw26bt4Ok+XOqSyYA4VWAVt2zJGqIfCA7TwZRDKN8hvus4akN2yAbmA==} - peerDependencies: - webpack: ^4.40.0 || ^5.0.0 - dependencies: - esbuild: 0.19.3 - get-tsconfig: 4.7.0 - loader-utils: 2.0.4 - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - webpack-sources: 1.4.3 - dev: false - /esbuild-plugin-polyfill-node@0.3.0(esbuild@0.19.3): resolution: {integrity: sha512-SHG6CKUfWfYyYXGpW143NEZtcVVn8S/WHcEOxk62LuDXnY4Zpmc+WmxJKN6GMTgTClXJXhEM5KQlxKY6YjbucQ==} peerDependencies: @@ -5551,36 +4995,6 @@ packages: import-meta-resolve: 3.0.0 dev: false - /esbuild@0.18.20: - resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/android-arm': 0.18.20 - '@esbuild/android-arm64': 0.18.20 - '@esbuild/android-x64': 0.18.20 - '@esbuild/darwin-arm64': 0.18.20 - '@esbuild/darwin-x64': 0.18.20 - '@esbuild/freebsd-arm64': 0.18.20 - '@esbuild/freebsd-x64': 0.18.20 - '@esbuild/linux-arm': 0.18.20 - '@esbuild/linux-arm64': 0.18.20 - '@esbuild/linux-ia32': 0.18.20 - '@esbuild/linux-loong64': 0.18.20 - '@esbuild/linux-mips64el': 0.18.20 - '@esbuild/linux-ppc64': 0.18.20 - '@esbuild/linux-riscv64': 0.18.20 - '@esbuild/linux-s390x': 0.18.20 - '@esbuild/linux-x64': 0.18.20 - '@esbuild/netbsd-x64': 0.18.20 - '@esbuild/openbsd-x64': 0.18.20 - '@esbuild/sunos-x64': 0.18.20 - '@esbuild/win32-arm64': 0.18.20 - '@esbuild/win32-ia32': 0.18.20 - '@esbuild/win32-x64': 0.18.20 - dev: true - /esbuild@0.19.3: resolution: {integrity: sha512-UlJ1qUUA2jL2nNib1JTSkifQTcYTroFqRjwCFW4QYEKEsixXD5Tik9xML7zh2gTxkYTBKGHNH9y7txMwVyPbjw==} engines: {node: '>=12'} @@ -5806,6 +5220,7 @@ packages: dependencies: esrecurse: 4.3.0 estraverse: 4.3.0 + dev: true /eslint-scope@7.2.2: resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==} @@ -5920,17 +5335,21 @@ packages: engines: {node: '>=4.0'} dependencies: estraverse: 5.3.0 + dev: true /estraverse@4.3.0: resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==} engines: {node: '>=4.0'} + dev: true /estraverse@5.3.0: resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} engines: {node: '>=4.0'} + dev: true /estree-walker@1.0.1: resolution: {integrity: sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==} + dev: false /esutils@2.0.3: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} @@ -5994,6 +5413,7 @@ packages: onetime: 5.1.2 signal-exit: 3.0.7 strip-final-newline: 2.0.0 + dev: true /executable@4.1.1: resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==} @@ -6110,17 +5530,6 @@ packages: /fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - /fast-glob@3.3.1: - resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==} - engines: {node: '>=8.6.0'} - dependencies: - '@nodelib/fs.stat': 2.0.5 - '@nodelib/fs.walk': 1.2.8 - glob-parent: 5.1.2 - merge2: 1.4.1 - micromatch: 4.0.5 - dev: true - /fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} @@ -6139,6 +5548,7 @@ packages: /fastest-levenshtein@1.0.16: resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==} engines: {node: '>= 4.9.1'} + dev: true /fastest-stable-stringify@2.0.2: resolution: {integrity: sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q==} @@ -6150,12 +5560,6 @@ packages: reusify: 1.0.4 dev: true - /faye-websocket@0.11.4: - resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==} - engines: {node: '>=0.8.0'} - dependencies: - websocket-driver: 0.7.4 - /fb-watchman@2.0.2: resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==} dependencies: @@ -6189,6 +5593,7 @@ packages: resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==} dependencies: minimatch: 5.1.6 + dev: false /filesize@10.0.12: resolution: {integrity: sha512-6RS9gDchbn+qWmtV2uSjo5vmKizgfCQeb5jKmqx8HyzA3MoLqqyQxN+QcjkGBJt7FjJ9qFce67Auyya5rRRbpw==} @@ -6200,6 +5605,7 @@ packages: engines: {node: '>=8'} dependencies: to-regex-range: 5.0.1 + dev: true /finalhandler@1.2.0: resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==} @@ -6258,6 +5664,7 @@ packages: dependencies: locate-path: 5.0.0 path-exists: 4.0.0 + dev: true /find-up@5.0.0: resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} @@ -6265,6 +5672,7 @@ packages: dependencies: locate-path: 6.0.0 path-exists: 4.0.0 + dev: true /flat-cache@3.1.0: resolution: {integrity: sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==} @@ -6292,6 +5700,7 @@ packages: optional: true dependencies: debug: 4.3.4(supports-color@8.1.1) + dev: true /follow-redirects@1.15.3(debug@4.3.4): resolution: {integrity: sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==} @@ -6404,9 +5813,6 @@ packages: minipass: 3.3.6 dev: true - /fs-monkey@1.0.4: - resolution: {integrity: sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==} - /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -6465,6 +5871,7 @@ packages: /get-own-enumerable-property-symbols@3.0.2: resolution: {integrity: sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==} + dev: false /get-package-type@0.1.0: resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==} @@ -6485,6 +5892,7 @@ packages: /get-stream@6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} + dev: true /get-symbol-description@1.0.0: resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==} @@ -6493,12 +5901,6 @@ packages: call-bind: 1.0.2 get-intrinsic: 1.2.1 - /get-tsconfig@4.7.0: - resolution: {integrity: sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw==} - dependencies: - resolve-pkg-maps: 1.0.0 - dev: false - /getos@3.2.1: resolution: {integrity: sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==} dependencies: @@ -6509,12 +5911,6 @@ packages: dependencies: assert-plus: 1.0.0 - /glob-parent@5.1.2: - resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} - engines: {node: '>= 6'} - dependencies: - is-glob: 4.0.3 - /glob-parent@6.0.2: resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} engines: {node: '>=10.13.0'} @@ -6524,6 +5920,7 @@ packages: /glob-to-regexp@0.4.1: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} + dev: true /glob@10.3.3: resolution: {integrity: sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==} @@ -6595,28 +5992,6 @@ packages: dependencies: define-properties: 1.2.0 - /globby@13.2.2: - resolution: {integrity: sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dependencies: - dir-glob: 3.0.1 - fast-glob: 3.3.1 - ignore: 5.2.4 - merge2: 1.4.1 - slash: 4.0.0 - dev: true - - /globby@6.1.0: - resolution: {integrity: sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==} - engines: {node: '>=0.10.0'} - dependencies: - array-union: 1.0.2 - glob: 7.2.3 - object-assign: 4.1.1 - pify: 2.3.0 - pinkie-promise: 2.0.1 - dev: true - /gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: @@ -6629,9 +6004,6 @@ packages: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} dev: true - /handle-thing@2.0.1: - resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==} - /har-schema@2.0.0: resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==} engines: {node: '>=4'} @@ -6751,14 +6123,6 @@ packages: resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==} dev: true - /hpack.js@2.1.6: - resolution: {integrity: sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==} - dependencies: - inherits: 2.0.4 - obuf: 1.1.2 - readable-stream: 2.3.8 - wbuf: 1.7.3 - /html-encoding-sniffer@2.0.1: resolution: {integrity: sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==} engines: {node: '>=10'} @@ -6773,50 +6137,10 @@ packages: whatwg-encoding: 2.0.0 dev: true - /html-entities@2.4.0: - resolution: {integrity: sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==} - /html-escaper@2.0.2: resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} dev: true - /html-minifier-terser@6.1.0: - resolution: {integrity: sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==} - engines: {node: '>=12'} - hasBin: true - dependencies: - camel-case: 4.1.2 - clean-css: 5.3.2 - commander: 8.3.0 - he: 1.2.0 - param-case: 3.0.4 - relateurl: 0.2.7 - terser: 5.19.2 - dev: true - - /html-webpack-plugin@5.5.3(webpack@5.88.2): - resolution: {integrity: sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==} - engines: {node: '>=10.13.0'} - peerDependencies: - webpack: ^5.20.0 - dependencies: - '@types/html-minifier-terser': 6.1.0 - html-minifier-terser: 6.1.0 - lodash: 4.17.21 - pretty-error: 4.0.0 - tapable: 2.2.1 - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - dev: true - - /htmlparser2@6.1.0: - resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==} - dependencies: - domelementtype: 2.3.0 - domhandler: 4.3.1 - domutils: 2.8.0 - entities: 2.2.0 - dev: true - /http-browserify@1.7.0: resolution: {integrity: sha512-Irf/LJXmE3cBzU1eaR4+NEX6bmVLqt1wkmDiA7kBwH7zmb0D8kBAXsDmQ88hhj/qv9iEZKlyGx/hrMcFi8sOHw==} dependencies: @@ -6824,18 +6148,6 @@ packages: inherits: 2.0.4 dev: true - /http-deceiver@1.2.7: - resolution: {integrity: sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==} - - /http-errors@1.6.3: - resolution: {integrity: sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==} - engines: {node: '>= 0.6'} - dependencies: - depd: 1.1.2 - inherits: 2.0.3 - setprototypeof: 1.1.0 - statuses: 1.5.0 - /http-errors@2.0.0: resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==} engines: {node: '>= 0.8'} @@ -6846,9 +6158,6 @@ packages: statuses: 2.0.1 toidentifier: 1.0.1 - /http-parser-js@0.5.8: - resolution: {integrity: sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==} - /http-proxy-agent@4.0.1: resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==} engines: {node: '>= 6'} @@ -6860,24 +6169,6 @@ packages: - supports-color dev: true - /http-proxy-middleware@2.0.6(@types/express@4.17.17)(debug@4.3.4): - resolution: {integrity: sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==} - engines: {node: '>=12.0.0'} - peerDependencies: - '@types/express': ^4.17.13 - peerDependenciesMeta: - '@types/express': - optional: true - dependencies: - '@types/express': 4.17.17 - '@types/http-proxy': 1.17.11 - http-proxy: 1.18.1(debug@4.3.4) - is-glob: 4.0.3 - is-plain-obj: 3.0.0 - micromatch: 4.0.5 - transitivePeerDependencies: - - debug - /http-proxy@1.18.1(debug@4.3.4): resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==} engines: {node: '>=8.0.0'} @@ -6887,6 +6178,7 @@ packages: requires-port: 1.0.0 transitivePeerDependencies: - debug + dev: true /http-server@14.1.1(debug@4.3.4): resolution: {integrity: sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A==} @@ -6949,6 +6241,7 @@ packages: /human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} + dev: true /hyphenate-style-name@1.0.4: resolution: {integrity: sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==} @@ -6973,17 +6266,9 @@ packages: safer-buffer: 2.1.2 dev: true - /icss-utils@5.1.0(postcss@8.4.28): - resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==} - engines: {node: ^10 || ^12 || >= 14} - peerDependencies: - postcss: ^8.1.0 - dependencies: - postcss: 8.4.28 - dev: true - /idb@7.1.1: resolution: {integrity: sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==} + dev: false /ieee754@1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} @@ -7017,6 +6302,7 @@ packages: dependencies: pkg-dir: 4.2.0 resolve-cwd: 3.0.0 + dev: true /import-meta-resolve@3.0.0: resolution: {integrity: sha512-4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg==} @@ -7041,9 +6327,6 @@ packages: once: 1.4.0 wrappy: 1.0.2 - /inherits@2.0.3: - resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==} - /inherits@2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} @@ -7073,15 +6356,12 @@ packages: /interpret@3.1.1: resolution: {integrity: sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==} engines: {node: '>=10.13.0'} + dev: true /ipaddr.js@1.9.1: resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} engines: {node: '>= 0.10'} - /ipaddr.js@2.1.0: - resolution: {integrity: sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==} - engines: {node: '>= 10'} - /is-arguments@1.1.1: resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==} engines: {node: '>= 0.4'} @@ -7112,12 +6392,6 @@ packages: dependencies: has-bigints: 1.0.2 - /is-binary-path@2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} - engines: {node: '>=8'} - dependencies: - binary-extensions: 2.2.0 - /is-boolean-object@1.1.2: resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} engines: {node: '>= 0.4'} @@ -7150,11 +6424,6 @@ packages: dependencies: has-tostringtag: 1.0.0 - /is-docker@2.2.1: - resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==} - engines: {node: '>=8'} - hasBin: true - /is-extendable@0.1.1: resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==} engines: {node: '>=0.10.0'} @@ -7163,6 +6432,7 @@ packages: /is-extglob@2.1.1: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} + dev: true /is-finalizationregistry@1.0.2: resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==} @@ -7195,6 +6465,7 @@ packages: engines: {node: '>=0.10.0'} dependencies: is-extglob: 2.1.1 + dev: true /is-installed-globally@0.4.0: resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==} @@ -7209,6 +6480,7 @@ packages: /is-module@1.0.0: resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==} + dev: false /is-nan@1.3.2: resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==} @@ -7231,43 +6503,23 @@ packages: /is-number@7.0.0: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} + dev: true /is-obj@1.0.1: resolution: {integrity: sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==} engines: {node: '>=0.10.0'} - - /is-path-cwd@2.2.0: - resolution: {integrity: sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==} - engines: {node: '>=6'} - dev: true - - /is-path-in-cwd@2.1.0: - resolution: {integrity: sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==} - engines: {node: '>=6'} - dependencies: - is-path-inside: 2.1.0 - dev: true - - /is-path-inside@2.1.0: - resolution: {integrity: sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==} - engines: {node: '>=6'} - dependencies: - path-is-inside: 1.0.2 - dev: true + dev: false /is-path-inside@3.0.3: resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} engines: {node: '>=8'} - /is-plain-obj@3.0.0: - resolution: {integrity: sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==} - engines: {node: '>=10'} - /is-plain-object@2.0.4: resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==} engines: {node: '>=0.10.0'} dependencies: isobject: 3.0.1 + dev: true /is-potential-custom-element-name@1.0.1: resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} @@ -7283,6 +6535,7 @@ packages: /is-regexp@1.0.0: resolution: {integrity: sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==} engines: {node: '>=0.10.0'} + dev: false /is-set@2.0.2: resolution: {integrity: sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==} @@ -7343,14 +6596,9 @@ packages: engines: {node: '>=0.10.0'} dev: true - /is-wsl@2.2.0: - resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==} - engines: {node: '>=8'} - dependencies: - is-docker: 2.2.1 - /isarray@1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} + dev: false /isarray@2.0.1: resolution: {integrity: sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ==} @@ -7365,6 +6613,7 @@ packages: /isobject@3.0.1: resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==} engines: {node: '>=0.10.0'} + dev: true /isstream@0.1.2: resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==} @@ -7443,6 +6692,7 @@ packages: chalk: 4.1.2 filelist: 1.0.4 minimatch: 3.1.2 + dev: false /jest-changed-files@27.5.1: resolution: {integrity: sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==} @@ -7928,6 +7178,7 @@ packages: '@types/node': 20.6.4 merge-stream: 2.0.0 supports-color: 7.2.0 + dev: false /jest-worker@27.5.1: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} @@ -7936,6 +7187,7 @@ packages: '@types/node': 20.5.7 merge-stream: 2.0.0 supports-color: 8.1.1 + dev: true /jest@27.0.4(canvas@2.11.2): resolution: {integrity: sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA==} @@ -8061,6 +7313,7 @@ packages: /jsesc@0.5.0: resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==} hasBin: true + dev: false /jsesc@2.5.2: resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} @@ -8083,6 +7336,7 @@ packages: /json-schema-traverse@1.0.0: resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} + dev: false /json-schema@0.4.0: resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==} @@ -8122,6 +7376,7 @@ packages: /jsonpointer@5.0.1: resolution: {integrity: sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==} engines: {node: '>=0.10.0'} + dev: false /jsonwebtoken@9.0.2: resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==} @@ -8212,18 +7467,13 @@ packages: /kind-of@6.0.3: resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==} engines: {node: '>=0.10.0'} + dev: true /kleur@3.0.3: resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==} engines: {node: '>=6'} dev: true - /launch-editor@2.6.0: - resolution: {integrity: sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==} - dependencies: - picocolors: 1.0.0 - shell-quote: 1.8.1 - /lazy-ass@1.6.0: resolution: {integrity: sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==} engines: {node: '> 0.8'} @@ -8337,14 +7587,7 @@ packages: /loader-runner@4.3.0: resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==} engines: {node: '>=6.11.5'} - - /loader-utils@2.0.4: - resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==} - engines: {node: '>=8.9.0'} - dependencies: - big.js: 5.2.2 - emojis-list: 3.0.0 - json5: 2.2.3 + dev: true /locate-path@3.0.0: resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==} @@ -8359,32 +7602,26 @@ packages: engines: {node: '>=8'} dependencies: p-locate: 4.1.0 + dev: true /locate-path@6.0.0: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} dependencies: p-locate: 5.0.0 + dev: true /lodash-es@4.17.21: resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} dev: true - /lodash-webpack-plugin@0.11.6(webpack@5.88.2): - resolution: {integrity: sha512-nsHN/+IxZK/C425vGC8pAxkKJ8KQH2+NJnhDul14zYNWr6HJcA95w+oRR7Cp0oZpOdMplDZXmjVROp8prPk7ig==} - peerDependencies: - webpack: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.1.0 - dependencies: - lodash: 4.17.21 - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - dev: true - /lodash.compact@3.0.1: resolution: {integrity: sha512-2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ==} dev: false /lodash.debounce@4.0.8: resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==} + dev: false /lodash.get@4.4.2: resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==} @@ -8418,6 +7655,7 @@ packages: /lodash.sortby@4.7.0: resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} + dev: false /lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} @@ -8452,6 +7690,7 @@ packages: resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==} dependencies: tslib: 2.6.2 + dev: false /lru-cache@10.0.1: resolution: {integrity: sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==} @@ -8476,6 +7715,7 @@ packages: resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==} dependencies: sourcemap-codec: 1.4.8 + dev: false /make-dir@3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} @@ -8519,12 +7759,6 @@ packages: resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} engines: {node: '>= 0.6'} - /memfs@3.5.3: - resolution: {integrity: sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==} - engines: {node: '>= 4.0.0'} - dependencies: - fs-monkey: 1.0.4 - /memorystream@0.3.1: resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==} engines: {node: '>= 0.10.0'} @@ -8545,11 +7779,6 @@ packages: /merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} - /merge2@1.4.1: - resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} - engines: {node: '>= 8'} - dev: true - /merge@1.2.1: resolution: {integrity: sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==} dev: false @@ -8564,6 +7793,7 @@ packages: dependencies: braces: 3.0.2 picomatch: 2.3.1 + dev: true /miller-rabin@4.0.1: resolution: {integrity: sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==} @@ -8715,6 +7945,7 @@ packages: /minimalistic-assert@1.0.1: resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==} + dev: true /minimalistic-crypto-utils@1.0.1: resolution: {integrity: sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==} @@ -8730,6 +7961,7 @@ packages: engines: {node: '>=10'} dependencies: brace-expansion: 2.0.1 + dev: false /minimatch@9.0.3: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} @@ -8816,13 +8048,6 @@ packages: /ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - /multicast-dns@7.2.5: - resolution: {integrity: sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==} - hasBin: true - dependencies: - dns-packet: 5.6.1 - thunky: 1.1.0 - /mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} dependencies: @@ -8853,12 +8078,6 @@ packages: stylis: 4.2.0 dev: false - /nanoid@3.3.6: - resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==} - engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} - hasBin: true - dev: true - /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true @@ -8890,6 +8109,7 @@ packages: /neo-async@2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} + dev: true /nice-try@1.0.5: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} @@ -8900,6 +8120,7 @@ packages: dependencies: lower-case: 2.0.2 tslib: 2.6.2 + dev: false /node-fetch@2.6.7: resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==} @@ -8924,10 +8145,6 @@ packages: dependencies: whatwg-url: 5.0.0 - /node-forge@1.3.1: - resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==} - engines: {node: '>= 6.13.0'} - /node-gyp-build-optional-packages@5.0.3: resolution: {integrity: sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==} hasBin: true @@ -8978,6 +8195,7 @@ packages: /normalize-path@3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} + dev: true /npm-run-all@4.1.5: resolution: {integrity: sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==} @@ -9010,12 +8228,6 @@ packages: set-blocking: 2.0.0 dev: true - /nth-check@2.1.1: - resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} - dependencies: - boolbase: 1.0.0 - dev: true - /nwsapi@2.2.7: resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==} dev: true @@ -9095,9 +8307,6 @@ packages: es-abstract: 1.22.1 dev: true - /obuf@1.1.2: - resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==} - /omggif@1.0.10: resolution: {integrity: sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==} dev: false @@ -9123,14 +8332,6 @@ packages: dependencies: mimic-fn: 2.1.0 - /open@8.4.2: - resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==} - engines: {node: '>=12'} - dependencies: - define-lazy-prop: 2.0.0 - is-docker: 2.2.1 - is-wsl: 2.2.0 - /opener@1.5.2: resolution: {integrity: sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==} hasBin: true @@ -9165,12 +8366,14 @@ packages: engines: {node: '>=6'} dependencies: p-try: 2.2.0 + dev: true /p-limit@3.1.0: resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} engines: {node: '>=10'} dependencies: yocto-queue: 0.1.0 + dev: true /p-locate@3.0.0: resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==} @@ -9184,16 +8387,13 @@ packages: engines: {node: '>=8'} dependencies: p-limit: 2.3.0 + dev: true /p-locate@5.0.0: resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} engines: {node: '>=10'} dependencies: p-limit: 3.1.0 - - /p-map@2.1.0: - resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==} - engines: {node: '>=6'} dev: true /p-map@4.0.0: @@ -9202,16 +8402,10 @@ packages: dependencies: aggregate-error: 3.1.0 - /p-retry@4.6.2: - resolution: {integrity: sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==} - engines: {node: '>=8'} - dependencies: - '@types/retry': 0.12.0 - retry: 0.13.1 - /p-try@2.2.0: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} + dev: true /pako@1.0.11: resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==} @@ -9221,6 +8415,7 @@ packages: dependencies: dot-case: 3.0.4 tslib: 2.6.2 + dev: false /parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} @@ -9300,6 +8495,7 @@ packages: dependencies: no-case: 3.0.4 tslib: 2.6.2 + dev: false /path-browserify@1.0.1: resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==} @@ -9320,15 +8516,12 @@ packages: /path-exists@4.0.0: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} + dev: true /path-is-absolute@1.0.1: resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} engines: {node: '>=0.10.0'} - /path-is-inside@1.0.2: - resolution: {integrity: sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==} - dev: true - /path-key@2.0.1: resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==} engines: {node: '>=4'} @@ -9362,6 +8555,7 @@ packages: /path-type@4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} + dev: false /pbkdf2@3.1.2: resolution: {integrity: sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==} @@ -9427,18 +8621,6 @@ packages: engines: {node: '>=6'} dev: true - /pinkie-promise@2.0.1: - resolution: {integrity: sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==} - engines: {node: '>=0.10.0'} - dependencies: - pinkie: 2.0.4 - dev: true - - /pinkie@2.0.4: - resolution: {integrity: sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==} - engines: {node: '>=0.10.0'} - dev: true - /pirates@4.0.6: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} @@ -9464,6 +8646,7 @@ packages: engines: {node: '>=8'} dependencies: find-up: 4.1.0 + dev: true /pngjs@3.4.0: resolution: {integrity: sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==} @@ -9481,68 +8664,6 @@ packages: - supports-color dev: true - /postcss-modules-extract-imports@3.0.0(postcss@8.4.28): - resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==} - engines: {node: ^10 || ^12 || >= 14} - peerDependencies: - postcss: ^8.1.0 - dependencies: - postcss: 8.4.28 - dev: true - - /postcss-modules-local-by-default@4.0.3(postcss@8.4.28): - resolution: {integrity: sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==} - engines: {node: ^10 || ^12 || >= 14} - peerDependencies: - postcss: ^8.1.0 - dependencies: - icss-utils: 5.1.0(postcss@8.4.28) - postcss: 8.4.28 - postcss-selector-parser: 6.0.13 - postcss-value-parser: 4.2.0 - dev: true - - /postcss-modules-scope@3.0.0(postcss@8.4.28): - resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==} - engines: {node: ^10 || ^12 || >= 14} - peerDependencies: - postcss: ^8.1.0 - dependencies: - postcss: 8.4.28 - postcss-selector-parser: 6.0.13 - dev: true - - /postcss-modules-values@4.0.0(postcss@8.4.28): - resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==} - engines: {node: ^10 || ^12 || >= 14} - peerDependencies: - postcss: ^8.1.0 - dependencies: - icss-utils: 5.1.0(postcss@8.4.28) - postcss: 8.4.28 - dev: true - - /postcss-selector-parser@6.0.13: - resolution: {integrity: sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==} - engines: {node: '>=4'} - dependencies: - cssesc: 3.0.0 - util-deprecate: 1.0.2 - dev: true - - /postcss-value-parser@4.2.0: - resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} - dev: true - - /postcss@8.4.28: - resolution: {integrity: sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==} - engines: {node: ^10 || ^12 || >=14} - dependencies: - nanoid: 3.3.6 - picocolors: 1.0.0 - source-map-js: 1.0.2 - dev: true - /prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} @@ -9563,13 +8684,6 @@ packages: engines: {node: ^14.13.1 || >=16.0.0} dev: false - /pretty-error@4.0.0: - resolution: {integrity: sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==} - dependencies: - lodash: 4.17.21 - renderkid: 3.0.0 - dev: true - /pretty-format@27.5.1: resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -9708,6 +8822,7 @@ packages: /process-nextick-args@2.0.1: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} + dev: false /process@0.11.10: resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==} @@ -9796,10 +8911,6 @@ packages: end-of-stream: 1.4.4 once: 1.4.0 - /punycode@1.4.1: - resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==} - dev: false - /punycode@2.3.0: resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} engines: {node: '>=6'} @@ -9854,6 +8965,7 @@ packages: engines: {node: '>=0.6'} dependencies: side-channel: 1.0.4 + dev: true /qs@6.5.3: resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==} @@ -9974,11 +9086,6 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /react-refresh@0.14.0: - resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==} - engines: {node: '>=0.10.0'} - dev: false - /react-universal-interface@0.6.2(react@18.2.0)(tslib@2.6.2): resolution: {integrity: sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==} peerDependencies: @@ -10059,6 +9166,7 @@ packages: safe-buffer: 5.1.2 string_decoder: 1.1.1 util-deprecate: 1.0.2 + dev: false /readable-stream@3.6.2: resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} @@ -10078,12 +9186,6 @@ packages: process: 0.11.10 string_decoder: 1.3.0 - /readdirp@3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} - engines: {node: '>=8.10.0'} - dependencies: - picomatch: 2.3.1 - /readline@1.3.0: resolution: {integrity: sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==} dev: false @@ -10093,6 +9195,7 @@ packages: engines: {node: '>= 10.13.0'} dependencies: resolve: 1.22.4 + dev: true /reflect.getprototypeof@1.0.3: resolution: {integrity: sha512-TTAOZpkJ2YLxl7mVHWrNo3iDMEkYlva/kgFcXndqMgbo/AZUmmavEkdXV+hXtE4P8xdyEKRzalaFqZVuwIk/Nw==} @@ -10111,9 +9214,11 @@ packages: engines: {node: '>=4'} dependencies: regenerate: 1.4.2 + dev: false /regenerate@1.4.2: resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==} + dev: false /regenerator-runtime@0.13.11: resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} @@ -10126,6 +9231,7 @@ packages: resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==} dependencies: '@babel/runtime': 7.22.11 + dev: false /regexp.prototype.flags@1.5.0: resolution: {integrity: sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==} @@ -10150,27 +9256,14 @@ packages: regjsparser: 0.9.1 unicode-match-property-ecmascript: 2.0.0 unicode-match-property-value-ecmascript: 2.1.0 + dev: false /regjsparser@0.9.1: resolution: {integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==} hasBin: true dependencies: jsesc: 0.5.0 - - /relateurl@0.2.7: - resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==} - engines: {node: '>= 0.10'} - dev: true - - /renderkid@3.0.0: - resolution: {integrity: sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==} - dependencies: - css-select: 4.3.0 - dom-converter: 0.2.0 - htmlparser2: 6.1.0 - lodash: 4.17.21 - strip-ansi: 6.0.1 - dev: true + dev: false /request-progress@3.0.0: resolution: {integrity: sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==} @@ -10235,6 +9328,7 @@ packages: /require-from-string@2.0.2: resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} engines: {node: '>=0.10.0'} + dev: false /requires-port@1.0.0: resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} @@ -10248,6 +9342,7 @@ packages: engines: {node: '>=8'} dependencies: resolve-from: 5.0.0 + dev: true /resolve-dir@0.1.1: resolution: {integrity: sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==} @@ -10264,10 +9359,7 @@ packages: /resolve-from@5.0.0: resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==} engines: {node: '>=8'} - - /resolve-pkg-maps@1.0.0: - resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} - dev: false + dev: true /resolve.exports@1.1.1: resolution: {integrity: sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==} @@ -10302,10 +9394,6 @@ packages: resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==} engines: {node: '>=0.12'} - /retry@0.13.1: - resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==} - engines: {node: '>= 4'} - /reusify@1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} @@ -10319,6 +9407,7 @@ packages: hasBin: true dependencies: glob: 7.2.3 + dev: false /rimraf@3.0.2: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} @@ -10352,6 +9441,7 @@ packages: rollup: 2.79.1 serialize-javascript: 4.0.0 terser: 5.19.2 + dev: false /rollup@2.79.1: resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==} @@ -10359,14 +9449,7 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.3 - - /rollup@3.28.1: - resolution: {integrity: sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==} - engines: {node: '>=14.18.0', npm: '>=8.0.0'} - hasBin: true - optionalDependencies: - fsevents: 2.3.3 - dev: true + dev: false /rtl-css-js@1.16.1: resolution: {integrity: sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg==} @@ -10441,15 +9524,7 @@ packages: '@types/json-schema': 7.0.12 ajv: 6.12.6 ajv-keywords: 3.5.2(ajv@6.12.6) - - /schema-utils@4.2.0: - resolution: {integrity: sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==} - engines: {node: '>= 12.13.0'} - dependencies: - '@types/json-schema': 7.0.12 - ajv: 8.12.0 - ajv-formats: 2.1.1(ajv@8.12.0) - ajv-keywords: 5.1.0(ajv@8.12.0) + dev: true /screenfull@5.2.0: resolution: {integrity: sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==} @@ -10464,15 +9539,6 @@ packages: resolution: {integrity: sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw==} dev: true - /select-hose@2.0.0: - resolution: {integrity: sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==} - - /selfsigned@2.1.1: - resolution: {integrity: sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==} - engines: {node: '>=10'} - dependencies: - node-forge: 1.3.1 - /semver@5.7.2: resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==} hasBin: true @@ -10521,25 +9587,13 @@ packages: resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==} dependencies: randombytes: 2.1.0 + dev: false /serialize-javascript@6.0.1: resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==} dependencies: randombytes: 2.1.0 - - /serve-index@1.9.1: - resolution: {integrity: sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==} - engines: {node: '>= 0.8.0'} - dependencies: - accepts: 1.3.8 - batch: 0.6.1 - debug: 2.6.9 - escape-html: 1.0.3 - http-errors: 1.6.3 - mime-types: 2.1.35 - parseurl: 1.3.3 - transitivePeerDependencies: - - supports-color + dev: true /serve-static@1.15.0: resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==} @@ -10564,9 +9618,6 @@ packages: /setimmediate@1.0.5: resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==} - /setprototypeof@1.1.0: - resolution: {integrity: sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==} - /setprototypeof@1.2.0: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} @@ -10593,6 +9644,7 @@ packages: engines: {node: '>=8'} dependencies: kind-of: 6.0.3 + dev: true /shebang-command@1.2.0: resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==} @@ -10618,6 +9670,7 @@ packages: /shell-quote@1.8.1: resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==} + dev: true /side-channel@1.0.4: resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} @@ -10655,11 +9708,6 @@ packages: engines: {node: '>=8'} dev: true - /slash@4.0.0: - resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==} - engines: {node: '>=12'} - dev: true - /slice-ansi@3.0.0: resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==} engines: {node: '>=8'} @@ -10793,21 +9841,6 @@ packages: - supports-color - utf-8-validate - /sockjs@0.3.24: - resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==} - dependencies: - faye-websocket: 0.11.4 - uuid: 8.3.2 - websocket-driver: 0.7.4 - - /source-list-map@2.0.1: - resolution: {integrity: sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==} - - /source-map-js@1.0.2: - resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} - engines: {node: '>=0.10.0'} - dev: true - /source-map-support@0.5.21: resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} dependencies: @@ -10831,16 +9864,19 @@ packages: /source-map@0.7.4: resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==} engines: {node: '>= 8'} + dev: true /source-map@0.8.0-beta.0: resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} engines: {node: '>= 8'} dependencies: whatwg-url: 7.1.0 + dev: false /sourcemap-codec@1.4.8: resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==} deprecated: Please use @jridgewell/sourcemap-codec instead + dev: false /spawnd@6.2.0: resolution: {integrity: sha512-qX/I4lQy4KgVEcNle0kuc4FxFWHISzBhZW1YemPfwmrmQjyZmfTK/OhBKkhrD2ooAaFZEm1maEBLE6/6enwt+g==} @@ -10872,40 +9908,6 @@ packages: resolution: {integrity: sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==} dev: true - /spdy-transport@3.0.0: - resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==} - dependencies: - debug: 4.3.4(supports-color@8.1.1) - detect-node: 2.1.0 - hpack.js: 2.1.6 - obuf: 1.1.2 - readable-stream: 3.6.2 - wbuf: 1.7.3 - transitivePeerDependencies: - - supports-color - - /spdy@4.0.2: - resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==} - engines: {node: '>=6.0.0'} - dependencies: - debug: 4.3.4(supports-color@8.1.1) - handle-thing: 2.0.1 - http-deceiver: 1.2.7 - select-hose: 2.0.0 - spdy-transport: 3.0.0 - transitivePeerDependencies: - - supports-color - - /speed-measure-webpack-plugin@1.5.0(webpack@5.88.2): - resolution: {integrity: sha512-Re0wX5CtM6gW7bZA64ONOfEPEhwbiSF/vz6e2GvadjuaPrQcHTQdRGsD8+BE7iUOysXH8tIenkPCQBEcspXsNg==} - engines: {node: '>=6.0.0'} - peerDependencies: - webpack: ^1 || ^2 || ^3 || ^4 || ^5 - dependencies: - chalk: 4.1.2 - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - dev: false - /spiralloop@1.0.2: resolution: {integrity: sha512-arrGOnli7tXoLWMqK8xXdV0qXLj3zd0OtgeME5SL/Nub0ssSYD27m9SlEsYcJGNi+VvEzVQIoBnAHOOhdZqc5Q==} dev: false @@ -10995,10 +9997,6 @@ packages: resolution: {integrity: sha512-hNKz8phvYLPEcRkeG1rsGmV5ChMjKDAWU7/OJJdDErPBNChQXxCo3WZurGpnWc6gZhAzEPFad1aVgyOANH1sMw==} dev: false - /statuses@1.5.0: - resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==} - engines: {node: '>= 0.6'} - /statuses@2.0.1: resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} engines: {node: '>= 0.8'} @@ -11087,6 +10085,7 @@ packages: resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} dependencies: safe-buffer: 5.1.2 + dev: false /string_decoder@1.3.0: resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==} @@ -11100,6 +10099,7 @@ packages: get-own-enumerable-property-symbols: 3.0.2 is-obj: 1.0.1 is-regexp: 1.0.0 + dev: false /strip-ansi@6.0.1: resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} @@ -11127,6 +10127,7 @@ packages: /strip-comments@2.0.1: resolution: {integrity: sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==} engines: {node: '>=10'} + dev: false /strip-final-newline@2.0.0: resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} @@ -11137,15 +10138,6 @@ packages: engines: {node: '>=8'} dev: true - /style-loader@3.3.3(webpack@5.88.2): - resolution: {integrity: sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==} - engines: {node: '>= 12.13.0'} - peerDependencies: - webpack: ^5.0.0 - dependencies: - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - dev: true - /stylis@4.2.0: resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==} dev: false @@ -11187,6 +10179,7 @@ packages: /tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} + dev: true /tar-fs@2.1.1: resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} @@ -11223,6 +10216,7 @@ packages: /temp-dir@2.0.0: resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==} engines: {node: '>=8'} + dev: false /tempy@0.6.0: resolution: {integrity: sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==} @@ -11232,6 +10226,7 @@ packages: temp-dir: 2.0.0 type-fest: 0.16.0 unique-string: 2.0.0 + dev: false /terminal-link@2.1.1: resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==} @@ -11264,6 +10259,7 @@ packages: serialize-javascript: 6.0.1 terser: 5.19.2 webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) + dev: true /terser@5.19.2: resolution: {integrity: sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==} @@ -11322,9 +10318,6 @@ packages: /through@2.3.8: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} - /thunky@1.1.0: - resolution: {integrity: sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==} - /timers-browserify@2.0.12: resolution: {integrity: sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==} engines: {node: '>=0.6.0'} @@ -11363,6 +10356,7 @@ packages: engines: {node: '>=8.0'} dependencies: is-number: 7.0.0 + dev: true /toggle-selection@1.0.6: resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==} @@ -11396,6 +10390,7 @@ packages: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} dependencies: punycode: 2.3.0 + dev: false /tr46@2.1.0: resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==} @@ -11454,6 +10449,7 @@ packages: /type-fest@0.16.0: resolution: {integrity: sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==} engines: {node: '>=10'} + dev: false /type-fest@0.20.2: resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} @@ -11557,6 +10553,7 @@ packages: /unicode-canonical-property-names-ecmascript@2.0.0: resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==} engines: {node: '>=4'} + dev: false /unicode-match-property-ecmascript@2.0.0: resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==} @@ -11564,14 +10561,17 @@ packages: dependencies: unicode-canonical-property-names-ecmascript: 2.0.0 unicode-property-aliases-ecmascript: 2.1.0 + dev: false /unicode-match-property-value-ecmascript@2.1.0: resolution: {integrity: sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==} engines: {node: '>=4'} + dev: false /unicode-property-aliases-ecmascript@2.1.0: resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==} engines: {node: '>=4'} + dev: false /unidiff@1.0.2: resolution: {integrity: sha512-2sbEzki5fBmjgAqoafwxRenfMcumMlmVAoJDwYJa3CI4ZVugkdR6qjTw5sVsl29/4JfBBXhWEAd5ars8nRdqXg==} @@ -11591,6 +10591,7 @@ packages: engines: {node: '>=8'} dependencies: crypto-random-string: 2.0.0 + dev: false /universalify@0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} @@ -11616,6 +10617,7 @@ packages: /upath@1.2.0: resolution: {integrity: sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==} engines: {node: '>=4'} + dev: false /update-browserslist-db@1.0.11(browserslist@4.21.10): resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==} @@ -11648,35 +10650,12 @@ packages: resolution: {integrity: sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==} dev: true - /url-loader@4.1.1(webpack@5.88.2): - resolution: {integrity: sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==} - engines: {node: '>= 10.13.0'} - peerDependencies: - file-loader: '*' - webpack: ^4.0.0 || ^5.0.0 - peerDependenciesMeta: - file-loader: - optional: true - dependencies: - loader-utils: 2.0.4 - mime-types: 2.1.35 - schema-utils: 3.3.0 - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - dev: true - /url-parse@1.5.10: resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} dependencies: querystringify: 2.2.0 requires-port: 1.0.0 - /url@0.11.1: - resolution: {integrity: sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==} - dependencies: - punycode: 1.4.1 - qs: 6.11.2 - dev: false - /use-deep-compare@1.1.0(react@17.0.2): resolution: {integrity: sha512-6yY3zmKNCJ1jjIivfZMZMReZjr8e6iC6Uqtp701jvWJ6ejC/usXD+JjmslZDPJQgX8P4B1Oi5XSLHkOLeYSJsA==} peerDependencies: @@ -11759,10 +10738,6 @@ packages: which-typed-array: 1.1.11 dev: true - /utila@0.4.0: - resolution: {integrity: sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==} - dev: true - /utils-merge@1.0.1: resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} engines: {node: '>= 0.4.0'} @@ -11844,41 +10819,6 @@ packages: core-util-is: 1.0.2 extsprintf: 1.3.0 - /vite@4.4.9: - resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} - engines: {node: ^14.18.0 || >=16.0.0} - hasBin: true - peerDependencies: - '@types/node': '>= 14' - less: '*' - lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - esbuild: 0.18.20 - postcss: 8.4.28 - rollup: 3.28.1 - optionalDependencies: - fsevents: 2.3.3 - dev: true - /w3c-hr-time@1.0.2: resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} deprecated: Use your platform's native performance.now() and performance.timeOrigin. @@ -11925,17 +10865,14 @@ packages: dependencies: glob-to-regexp: 0.4.1 graceful-fs: 4.2.11 - - /wbuf@1.7.3: - resolution: {integrity: sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==} - dependencies: - minimalistic-assert: 1.0.1 + dev: true /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} /webidl-conversions@4.0.2: resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} + dev: false /webidl-conversions@5.0.0: resolution: {integrity: sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==} @@ -11947,7 +10884,7 @@ packages: engines: {node: '>=10.4'} dev: true - /webpack-cli@5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2): + /webpack-cli@5.1.4(webpack@5.88.2): resolution: {integrity: sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==} engines: {node: '>=14.15.0'} hasBin: true @@ -11967,7 +10904,7 @@ packages: '@discoveryjs/json-ext': 0.5.7 '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4)(webpack@5.88.2) '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4)(webpack@5.88.2) - '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack-dev-server@4.15.1)(webpack@5.88.2) + '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack@5.88.2) colorette: 2.0.20 commander: 10.0.1 cross-spawn: 7.0.3 @@ -11977,106 +10914,21 @@ packages: interpret: 3.1.1 rechoir: 0.8.0 webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - webpack-dev-server: 4.15.1(debug@4.3.4)(webpack-cli@5.1.4)(webpack@5.88.2) webpack-merge: 5.9.0 - - /webpack-dev-middleware@5.3.3(webpack@5.88.2): - resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==} - engines: {node: '>= 12.13.0'} - peerDependencies: - webpack: ^4.0.0 || ^5.0.0 - dependencies: - colorette: 2.0.20 - memfs: 3.5.3 - mime-types: 2.1.35 - range-parser: 1.2.1 - schema-utils: 4.2.0 - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - - /webpack-dev-middleware@6.1.1(webpack@5.88.2): - resolution: {integrity: sha512-y51HrHaFeeWir0YO4f0g+9GwZawuigzcAdRNon6jErXy/SqV/+O6eaVAzDqE6t3e3NpGeR5CS+cCDaTC+V3yEQ==} - engines: {node: '>= 14.15.0'} - peerDependencies: - webpack: ^5.0.0 - peerDependenciesMeta: - webpack: - optional: true - dependencies: - colorette: 2.0.20 - memfs: 3.5.3 - mime-types: 2.1.35 - range-parser: 1.2.1 - schema-utils: 4.2.0 - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) dev: true - /webpack-dev-server@4.15.1(debug@4.3.4)(webpack-cli@5.1.4)(webpack@5.88.2): - resolution: {integrity: sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==} - engines: {node: '>= 12.13.0'} - hasBin: true - peerDependencies: - webpack: ^4.37.0 || ^5.0.0 - webpack-cli: '*' - peerDependenciesMeta: - webpack: - optional: true - webpack-cli: - optional: true - dependencies: - '@types/bonjour': 3.5.10 - '@types/connect-history-api-fallback': 1.5.0 - '@types/express': 4.17.17 - '@types/serve-index': 1.9.1 - '@types/serve-static': 1.15.2 - '@types/sockjs': 0.3.33 - '@types/ws': 8.5.5 - ansi-html-community: 0.0.8 - bonjour-service: 1.1.1 - chokidar: 3.5.3 - colorette: 2.0.20 - compression: 1.7.4 - connect-history-api-fallback: 2.0.0 - default-gateway: 6.0.3 - express: 4.18.2 - graceful-fs: 4.2.11 - html-entities: 2.4.0 - http-proxy-middleware: 2.0.6(@types/express@4.17.17)(debug@4.3.4) - ipaddr.js: 2.1.0 - launch-editor: 2.6.0 - open: 8.4.2 - p-retry: 4.6.2 - rimraf: 3.0.2 - schema-utils: 4.2.0 - selfsigned: 2.1.1 - serve-index: 1.9.1 - sockjs: 0.3.24 - spdy: 4.0.2 - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) - webpack-dev-middleware: 5.3.3(webpack@5.88.2) - ws: 8.13.0 - transitivePeerDependencies: - - bufferutil - - debug - - supports-color - - utf-8-validate - /webpack-merge@5.9.0: resolution: {integrity: sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==} engines: {node: '>=10.0.0'} dependencies: clone-deep: 4.0.1 wildcard: 2.0.1 - - /webpack-sources@1.4.3: - resolution: {integrity: sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==} - dependencies: - source-list-map: 2.0.1 - source-map: 0.6.1 + dev: true /webpack-sources@3.2.3: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} + dev: true /webpack@5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4): resolution: {integrity: sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==} @@ -12111,12 +10963,13 @@ packages: tapable: 2.2.1 terser-webpack-plugin: 5.3.9(esbuild@0.19.3)(webpack@5.88.2) watchpack: 2.4.0 - webpack-cli: 5.1.4(webpack-dev-server@4.15.1)(webpack@5.88.2) + webpack-cli: 5.1.4(webpack@5.88.2) webpack-sources: 3.2.3 transitivePeerDependencies: - '@swc/core' - esbuild - uglify-js + dev: true /webrtc-adapter@8.2.3: resolution: {integrity: sha512-gnmRz++suzmvxtp3ehQts6s2JtAGPuDPjA1F3a9ckNpG1kYdYuHWYpazoAnL9FS5/B21tKlhkorbdCXat0+4xQ==} @@ -12125,18 +10978,6 @@ packages: sdp: 3.2.0 dev: false - /websocket-driver@0.7.4: - resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} - engines: {node: '>=0.8.0'} - dependencies: - http-parser-js: 0.5.8 - safe-buffer: 5.2.1 - websocket-extensions: 0.1.4 - - /websocket-extensions@0.1.4: - resolution: {integrity: sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==} - engines: {node: '>=0.8.0'} - /whatwg-encoding@1.0.5: resolution: {integrity: sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==} dependencies: @@ -12170,6 +11011,7 @@ packages: lodash.sortby: 4.7.0 tr46: 1.0.1 webidl-conversions: 4.0.2 + dev: false /whatwg-url@8.7.0: resolution: {integrity: sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==} @@ -12248,12 +11090,6 @@ packages: /wildcard@2.0.1: resolution: {integrity: sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==} - - /workbox-background-sync@6.6.0: - resolution: {integrity: sha512-jkf4ZdgOJxC9u2vztxLuPT/UjlH7m/nWRQ/MgGL0v8BJHoZdVGJd18Kck+a0e55wGXdqyHO+4IQTk0685g4MUw==} - dependencies: - idb: 7.1.1 - workbox-core: 6.6.0 dev: true /workbox-background-sync@7.0.0: @@ -12263,64 +11099,12 @@ packages: workbox-core: 7.0.0 dev: false - /workbox-broadcast-update@6.6.0: - resolution: {integrity: sha512-nm+v6QmrIFaB/yokJmQ/93qIJ7n72NICxIwQwe5xsZiV2aI93MGGyEyzOzDPVz5THEr5rC3FJSsO3346cId64Q==} - dependencies: - workbox-core: 6.6.0 - dev: true - /workbox-broadcast-update@7.0.0: resolution: {integrity: sha512-oUuh4jzZrLySOo0tC0WoKiSg90bVAcnE98uW7F8GFiSOXnhogfNDGZelPJa+6KpGBO5+Qelv04Hqx2UD+BJqNQ==} dependencies: workbox-core: 7.0.0 dev: false - /workbox-build@6.6.0: - resolution: {integrity: sha512-Tjf+gBwOTuGyZwMz2Nk/B13Fuyeo0Q84W++bebbVsfr9iLkDSo6j6PST8tET9HYA58mlRXwlMGpyWO8ETJiXdQ==} - engines: {node: '>=10.0.0'} - dependencies: - '@apideck/better-ajv-errors': 0.3.6(ajv@8.12.0) - '@babel/core': 7.22.11 - '@babel/preset-env': 7.22.10(@babel/core@7.22.11) - '@babel/runtime': 7.22.11 - '@rollup/plugin-babel': 5.3.1(@babel/core@7.22.11)(rollup@2.79.1) - '@rollup/plugin-node-resolve': 11.2.1(rollup@2.79.1) - '@rollup/plugin-replace': 2.4.2(rollup@2.79.1) - '@surma/rollup-plugin-off-main-thread': 2.2.3 - ajv: 8.12.0 - common-tags: 1.8.2 - fast-json-stable-stringify: 2.1.0 - fs-extra: 9.1.0 - glob: 7.2.3 - lodash: 4.17.21 - pretty-bytes: 5.6.0 - rollup: 2.79.1 - rollup-plugin-terser: 7.0.2(rollup@2.79.1) - source-map: 0.8.0-beta.0 - stringify-object: 3.3.0 - strip-comments: 2.0.1 - tempy: 0.6.0 - upath: 1.2.0 - workbox-background-sync: 6.6.0 - workbox-broadcast-update: 6.6.0 - workbox-cacheable-response: 6.6.0 - workbox-core: 6.6.0 - workbox-expiration: 6.6.0 - workbox-google-analytics: 6.6.0 - workbox-navigation-preload: 6.6.0 - workbox-precaching: 6.6.0 - workbox-range-requests: 6.6.0 - workbox-recipes: 6.6.0 - workbox-routing: 6.6.0 - workbox-strategies: 6.6.0 - workbox-streams: 6.6.0 - workbox-sw: 6.6.0 - workbox-window: 6.6.0 - transitivePeerDependencies: - - '@types/babel__core' - - supports-color - dev: true - /workbox-build@7.0.0: resolution: {integrity: sha512-CttE7WCYW9sZC+nUYhQg3WzzGPr4IHmrPnjKiu3AMXsiNQKx+l4hHl63WTrnicLmKEKHScWDH8xsGBdrYgtBzg==} engines: {node: '>=16.0.0'} @@ -12367,34 +11151,16 @@ packages: - supports-color dev: false - /workbox-cacheable-response@6.6.0: - resolution: {integrity: sha512-JfhJUSQDwsF1Xv3EV1vWzSsCOZn4mQ38bWEBR3LdvOxSPgB65gAM6cS2CX8rkkKHRgiLrN7Wxoyu+TuH67kHrw==} - deprecated: workbox-background-sync@6.6.0 - dependencies: - workbox-core: 6.6.0 - dev: true - /workbox-cacheable-response@7.0.0: resolution: {integrity: sha512-0lrtyGHn/LH8kKAJVOQfSu3/80WDc9Ma8ng0p2i/5HuUndGttH+mGMSvOskjOdFImLs2XZIimErp7tSOPmu/6g==} dependencies: workbox-core: 7.0.0 dev: false - /workbox-core@6.6.0: - resolution: {integrity: sha512-GDtFRF7Yg3DD859PMbPAYPeJyg5gJYXuBQAC+wyrWuuXgpfoOrIQIvFRZnQ7+czTIQjIr1DhLEGFzZanAT/3bQ==} - dev: true - /workbox-core@7.0.0: resolution: {integrity: sha512-81JkAAZtfVP8darBpfRTovHg8DGAVrKFgHpOArZbdFd78VqHr5Iw65f2guwjE2NlCFbPFDoez3D3/6ZvhI/rwQ==} dev: false - /workbox-expiration@6.6.0: - resolution: {integrity: sha512-baplYXcDHbe8vAo7GYvyAmlS4f6998Jff513L4XvlzAOxcl8F620O91guoJ5EOf5qeXG4cGdNZHkkVAPouFCpw==} - dependencies: - idb: 7.1.1 - workbox-core: 6.6.0 - dev: true - /workbox-expiration@7.0.0: resolution: {integrity: sha512-MLK+fogW+pC3IWU9SFE+FRStvDVutwJMR5if1g7oBJx3qwmO69BNoJQVaMXq41R0gg3MzxVfwOGKx3i9P6sOLQ==} dependencies: @@ -12402,15 +11168,6 @@ packages: workbox-core: 7.0.0 dev: false - /workbox-google-analytics@6.6.0: - resolution: {integrity: sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==} - dependencies: - workbox-background-sync: 6.6.0 - workbox-core: 6.6.0 - workbox-routing: 6.6.0 - workbox-strategies: 6.6.0 - dev: true - /workbox-google-analytics@7.0.0: resolution: {integrity: sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==} dependencies: @@ -12420,26 +11177,12 @@ packages: workbox-strategies: 7.0.0 dev: false - /workbox-navigation-preload@6.6.0: - resolution: {integrity: sha512-utNEWG+uOfXdaZmvhshrh7KzhDu/1iMHyQOV6Aqup8Mm78D286ugu5k9MFD9SzBT5TcwgwSORVvInaXWbvKz9Q==} - dependencies: - workbox-core: 6.6.0 - dev: true - /workbox-navigation-preload@7.0.0: resolution: {integrity: sha512-juWCSrxo/fiMz3RsvDspeSLGmbgC0U9tKqcUPZBCf35s64wlaLXyn2KdHHXVQrb2cqF7I0Hc9siQalainmnXJA==} dependencies: workbox-core: 7.0.0 dev: false - /workbox-precaching@6.6.0: - resolution: {integrity: sha512-eYu/7MqtRZN1IDttl/UQcSZFkHP7dnvr/X3Vn6Iw6OsPMruQHiVjjomDFCNtd8k2RdjLs0xiz9nq+t3YVBcWPw==} - dependencies: - workbox-core: 6.6.0 - workbox-routing: 6.6.0 - workbox-strategies: 6.6.0 - dev: true - /workbox-precaching@7.0.0: resolution: {integrity: sha512-EC0vol623LJqTJo1mkhD9DZmMP604vHqni3EohhQVwhJlTgyKyOkMrZNy5/QHfOby+39xqC01gv4LjOm4HSfnA==} dependencies: @@ -12448,29 +11191,12 @@ packages: workbox-strategies: 7.0.0 dev: false - /workbox-range-requests@6.6.0: - resolution: {integrity: sha512-V3aICz5fLGq5DpSYEU8LxeXvsT//mRWzKrfBOIxzIdQnV/Wj7R+LyJVTczi4CQ4NwKhAaBVaSujI1cEjXW+hTw==} - dependencies: - workbox-core: 6.6.0 - dev: true - /workbox-range-requests@7.0.0: resolution: {integrity: sha512-SxAzoVl9j/zRU9OT5+IQs7pbJBOUOlriB8Gn9YMvi38BNZRbM+RvkujHMo8FOe9IWrqqwYgDFBfv6sk76I1yaQ==} dependencies: workbox-core: 7.0.0 dev: false - /workbox-recipes@6.6.0: - resolution: {integrity: sha512-TFi3kTgYw73t5tg73yPVqQC8QQjxJSeqjXRO4ouE/CeypmP2O/xqmB/ZFBBQazLTPxILUQ0b8aeh0IuxVn9a6A==} - dependencies: - workbox-cacheable-response: 6.6.0 - workbox-core: 6.6.0 - workbox-expiration: 6.6.0 - workbox-precaching: 6.6.0 - workbox-routing: 6.6.0 - workbox-strategies: 6.6.0 - dev: true - /workbox-recipes@7.0.0: resolution: {integrity: sha512-DntcK9wuG3rYQOONWC0PejxYYIDHyWWZB/ueTbOUDQgefaeIj1kJ7pdP3LZV2lfrj8XXXBWt+JDRSw1lLLOnww==} dependencies: @@ -12482,37 +11208,18 @@ packages: workbox-strategies: 7.0.0 dev: false - /workbox-routing@6.6.0: - resolution: {integrity: sha512-x8gdN7VDBiLC03izAZRfU+WKUXJnbqt6PG9Uh0XuPRzJPpZGLKce/FkOX95dWHRpOHWLEq8RXzjW0O+POSkKvw==} - dependencies: - workbox-core: 6.6.0 - dev: true - /workbox-routing@7.0.0: resolution: {integrity: sha512-8YxLr3xvqidnbVeGyRGkaV4YdlKkn5qZ1LfEePW3dq+ydE73hUUJJuLmGEykW3fMX8x8mNdL0XrWgotcuZjIvA==} dependencies: workbox-core: 7.0.0 dev: false - /workbox-strategies@6.6.0: - resolution: {integrity: sha512-eC07XGuINAKUWDnZeIPdRdVja4JQtTuc35TZ8SwMb1ztjp7Ddq2CJ4yqLvWzFWGlYI7CG/YGqaETntTxBGdKgQ==} - dependencies: - workbox-core: 6.6.0 - dev: true - /workbox-strategies@7.0.0: resolution: {integrity: sha512-dg3qJU7tR/Gcd/XXOOo7x9QoCI9nk74JopaJaYAQ+ugLi57gPsXycVdBnYbayVj34m6Y8ppPwIuecrzkpBVwbA==} dependencies: workbox-core: 7.0.0 dev: false - /workbox-streams@6.6.0: - resolution: {integrity: sha512-rfMJLVvwuED09CnH1RnIep7L9+mj4ufkTyDPVaXPKlhi9+0czCu+SJggWCIFbPpJaAZmp2iyVGLqS3RUmY3fxg==} - dependencies: - workbox-core: 6.6.0 - workbox-routing: 6.6.0 - dev: true - /workbox-streams@7.0.0: resolution: {integrity: sha512-moVsh+5to//l6IERWceYKGiftc+prNnqOp2sgALJJFbnNVpTXzKISlTIsrWY+ogMqt+x1oMazIdHj25kBSq/HQ==} dependencies: @@ -12520,38 +11227,10 @@ packages: workbox-routing: 7.0.0 dev: false - /workbox-sw@6.6.0: - resolution: {integrity: sha512-R2IkwDokbtHUE4Kus8pKO5+VkPHD2oqTgl+XJwh4zbF1HyjAbgNmK/FneZHVU7p03XUt9ICfuGDYISWG9qV/CQ==} - dev: true - /workbox-sw@7.0.0: resolution: {integrity: sha512-SWfEouQfjRiZ7GNABzHUKUyj8pCoe+RwjfOIajcx6J5mtgKkN+t8UToHnpaJL5UVVOf5YhJh+OHhbVNIHe+LVA==} dev: false - /workbox-webpack-plugin@6.6.0(webpack@5.88.2): - resolution: {integrity: sha512-xNZIZHalboZU66Wa7x1YkjIqEy1gTR+zPM+kjrYJzqN7iurYZBctBLISyScjhkJKYuRrZUP0iqViZTh8rS0+3A==} - engines: {node: '>=10.0.0'} - peerDependencies: - webpack: ^4.4.0 || ^5.9.0 - dependencies: - fast-json-stable-stringify: 2.1.0 - pretty-bytes: 5.6.0 - upath: 1.2.0 - webpack: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) - webpack-sources: 1.4.3 - workbox-build: 6.6.0 - transitivePeerDependencies: - - '@types/babel__core' - - supports-color - dev: true - - /workbox-window@6.6.0: - resolution: {integrity: sha512-L4N9+vka17d16geaJXXRjENLFldvkWy7JyGxElRD0JvBxvFEd8LOhr+uXCcar/NzAmIBRv9EZ+M+Qr4mOoBITw==} - dependencies: - '@types/trusted-types': 2.0.3 - workbox-core: 6.6.0 - dev: true - /workbox-window@7.0.0: resolution: {integrity: sha512-j7P/bsAWE/a7sxqTzXo3P2ALb1reTfZdvVp6OJ/uLr/C2kZAMvjeWGm8V4htQhor7DOvYg0sSbFN2+flT5U0qA==} dependencies: @@ -12648,18 +11327,6 @@ packages: utf-8-validate: optional: true - /ws@8.13.0: - resolution: {integrity: sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==} - engines: {node: '>=10.0.0'} - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: '>=5.0.2' - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - /ws@8.8.1: resolution: {integrity: sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==} engines: {node: '>=10.0.0'} @@ -12806,6 +11473,7 @@ packages: /yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} + dev: true /zustand@3.6.5(react@18.2.0): resolution: {integrity: sha512-/WfLJuXiEJimt61KGMHebrFBwckkCHGhAgVXTgPQHl6IMzjqm6MREb1OnDSnCRiSmRdhgdFCctceg6tSm79hiw==} diff --git a/scripts/build.js b/scripts/build.js index 9bf00355a..c149e30da 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -10,15 +10,15 @@ const path = require('path') const prismarineViewerBase = "./node_modules/prismarine-viewer" // these files could be copied at build time eg with copy plugin, but copy plugin slows down the config so we copy them there, alternative we could inline it in esbuild config -const webpackFilesToCopy = [ +const filesToCopy = [ { from: `${prismarineViewerBase}/public/blocksStates/`, to: 'dist/blocksStates/' }, { from: `${prismarineViewerBase}/public/worker.js`, to: 'dist/worker.js' }, { from: './assets/', to: './dist/' }, { from: './config.json', to: 'dist/config.json' }, { from: `${prismarineViewerBase}/public/textures/1.16.4/entity`, to: 'dist/textures/1.16.4/entity' }, ] -exports.webpackFilesToCopy = webpackFilesToCopy -exports.copyFiles = (isDev = false) => { +exports.filesToCopy = filesToCopy +exports.copyFiles = () => { console.time('copy files') // copy glob const cwd = `${prismarineViewerBase}/public/textures/` @@ -29,7 +29,7 @@ exports.copyFiles = (isDev = false) => { fs.copyFileSync(path.join(cwd, file), copyDest) } - webpackFilesToCopy.forEach(file => { + filesToCopy.forEach(file => { fsExtra.copySync(file.from, file.to) }) @@ -38,7 +38,7 @@ exports.copyFiles = (isDev = false) => { exports.copyFilesDev = () => { if (fsExtra.existsSync('dist/config.json')) return - exports.copyFiles(true) + exports.copyFiles() } exports.getSwAdditionalEntries = () => { diff --git a/webpack.common.js b/webpack.common.js deleted file mode 100644 index 0d4308685..000000000 --- a/webpack.common.js +++ /dev/null @@ -1,127 +0,0 @@ -const webpack = require('webpack') -const path = require('path') -const CopyPlugin = require('copy-webpack-plugin') -const HtmlWebpackPlugin = require('html-webpack-plugin') -// https://webpack.js.org/guides/production/ - -/** @type {import('webpack').Configuration} */ -const config = { - entry: path.resolve(__dirname, './src/index.js'), - output: { - path: path.resolve(__dirname, './dist'), - filename: './[name].js', - publicPath: './', - hotUpdateChunkFilename: 'hot/hot-update.[name].js', - hotUpdateMainFilename: 'hot/hot-update.json' - }, - resolve: { - alias: { - 'browserfs$': 'browserfs/dist/browserfs.mjs', - 'bfsGlobal': 'browserfs', - 'fs': 'browserfs/dist/shims/fs.js', - 'buffer': 'browserfs/dist/shims/buffer.js', - 'path': 'browserfs/dist/shims/path.js', - buffer: require.resolve('buffer/'), - - 'minecraft-protocol$': path.resolve( - __dirname, - 'node_modules/minecraft-protocol/src/index.js' - ), // Hack to allow creating the client in a browser - express: false, - net: 'net-browserify', - 'valtio$': require.resolve('./valtio.js'), - 'valtio/vanilla$': require.resolve('./valtio.js'), - 'valtio/utils$': require.resolve('./valtio.js'), - jose: false - }, - fallback: { - jose: false, - zlib: require.resolve('browserify-zlib'), - stream: require.resolve('stream-browserify'), - buffer: require.resolve('buffer/'), - events: require.resolve('events/'), - assert: require.resolve('assert/'), - crypto: require.resolve('crypto-browserify'), - path: require.resolve('path-browserify'), - constants: require.resolve('constants-browserify'), - os: require.resolve('os-browserify/browser'), - http: require.resolve('http-browserify'), - https: require.resolve('https-browserify'), - timers: require.resolve('timers-browserify'), - child_process: false, - tls: false, - perf_hooks: path.resolve(__dirname, 'src/perf_hooks_replacement.js'), - dns: path.resolve(__dirname, 'src/dns.js') - }, - extensions: [ - '.js', - '.ts', - '.json', - '.jsx', - '.tsx' - ], - }, - module: { - rules: [ - { - test: /\.(tsx?)|(jsx)$/, - loader: 'esbuild-loader', - // options: { - // // JavaScript version to compile to - // target: 'es2015' - // } - }, - { - test: /\.(png|jpg|gif|svg)$/i, - use: [ - { - loader: 'url-loader', - options: { - limit: true, - }, - }, - ], - }, - { - test: /\.css$/i, - use: ["style-loader", { - loader: 'css-loader', - options: { url: false } - }], - }, - ], - parser: { - javascript: { - commonjsMagicComments: true, - }, - }, - }, - plugins: [ - new HtmlWebpackPlugin({ - template: 'index.html', - // adding hash will make stop service worker from caching! - hash: process.argv.includes('webpack.prod.js') ? false : true, - minify: false, - chunks: ['main', 'vendors'], - }), - new webpack.ProvidePlugin({ - process: 'process/browser.js', - BrowserFS: 'bfsGlobal', - Buffer: ['buffer', 'Buffer'] - }), - // new webpack.ProvidePlugin({ - // Buffer: ['buffer', 'Buffer'] - // }), - new webpack.NormalModuleReplacementPlugin( - /prismarine-viewer[/|\\]viewer[/|\\]lib[/|\\]utils/, - './utils.web.js' - ), - new CopyPlugin({ - patterns: [ - { from: path.join(__dirname, 'src/styles.css'), to: './index.css' }, - ] - }) - ] -} - -module.exports = config diff --git a/webpack.dev.js b/webpack.dev.js deleted file mode 100644 index 4ec0913b7..000000000 --- a/webpack.dev.js +++ /dev/null @@ -1,51 +0,0 @@ -const { merge } = require('webpack-merge') -const common = require('./webpack.common.js') -const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin') - -/** @type {import('webpack-dev-server').Configuration['rel']} */ -module.exports = merge(common, - /** @type {import('webpack').Configuration} */ - { - mode: 'development', - devtool: 'inline-source-map', - cache: true, - // experiments: { - // cacheUnaffected: true, - // }, - devServer: { - // contentBase: path.resolve(__dirname, './public'), - compress: true, - // inline: true, - // open: true, - hot: true, - // liveReload: true, - devMiddleware: { - writeToDisk: true, - }, - port: 8081, - }, - optimization: { - splitChunks: { - chunks: 'all', - maxAsyncRequests: 10, - maxInitialRequests: 10, - cacheGroups: { - minecraftData: { - test: /[\\/]node_modules[\\/]minecraft-data[\\/]/, - name: "minecraftData", - priority: 15, - chunks: 'all' - }, - vendors: { - test: /[\\/]node_modules[\\/]/, - name: "vendors", - priority: 10, - chunks: 'all' - } - } - } - }, - plugins: [ - new ReactRefreshWebpackPlugin() - ], - }) diff --git a/webpack.prod.js b/webpack.prod.js deleted file mode 100644 index d1f41f692..000000000 --- a/webpack.prod.js +++ /dev/null @@ -1,51 +0,0 @@ -const { merge } = require('webpack-merge') -const common = require('./webpack.common.js') -const { EsbuildPlugin } = require('esbuild-loader') - -const LodashModuleReplacementPlugin = require('lodash-webpack-plugin') -const WorkboxPlugin = require('workbox-webpack-plugin') -const webpack = require('webpack') -const fs = require('fs') -const CopyPlugin = require('copy-webpack-plugin') -const { webpackFilesToCopy, getSwAdditionalEntries } = require('./scripts/build.js') - -const buildingVersion = new Date().toISOString().split(':')[0] -fs.writeFileSync('public/version.txt', buildingVersion, 'utf-8') - -module.exports = merge(common, { - output: { - filename: './[name].js', - }, - mode: 'production', - optimization: { - minimizer: [ - new EsbuildPlugin({ - // would be better to use 2019 with polyfilling bigints (disabling them?) - target: 'es2021' // Syntax to transpile to (see options below for possible values) - }) - ] - }, - devtool: 'source-map', - plugins: [ - new webpack.optimize.ModuleConcatenationPlugin(), - new LodashModuleReplacementPlugin(), - new WorkboxPlugin.GenerateSW({ - // these options encourage the ServiceWorkers to get in there fast - // and not allow any straggling "old" SWs to hang around - clientsClaim: true, - skipWaiting: true, - maximumFileSizeToCacheInBytes: 35_000_000, // todo will be lowered - additionalManifestEntries: getSwAdditionalEntries(), - exclude: [/\.map$/, 'version.txt'] - }), - // new CopyPlugin({ - // patterns: webpackFilesToCopy - // }), - new webpack.DefinePlugin({ - // get from github actions or vercel env - 'process.env.BUILD_VERSION': JSON.stringify(buildingVersion), - 'process.env.GITHUB_URL': - JSON.stringify(`https://github.com/${process.env.GITHUB_REPOSITORY || `${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}`}`) - }) - ], -}) From b38ec08d8a84d7c77709050d5f74f81d85adda1e Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 26 Sep 2023 04:07:42 +0300 Subject: [PATCH 298/318] cleanup unused code --- src/index.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/index.ts b/src/index.ts index fb90fc261..a440cced8 100644 --- a/src/index.ts +++ b/src/index.ts @@ -152,7 +152,6 @@ watchValue(options, (o) => { renderInterval = o.frameLimit && 1000 / o.frameLimit }) -let nextFrameFn = [] let postRenderFrameFn = () => { } let delta = 0 let lastTime = performance.now() @@ -175,12 +174,6 @@ const renderFrame = (time: DOMHighResTimeStamp) => { viewer.update() renderer.render(viewer.scene, viewer.camera) postRenderFrameFn() - if (nextFrameFn.length) { - for (const fn of nextFrameFn) { - fn() - } - nextFrameFn = [] - } stats?.end() stats2?.end() } @@ -505,7 +498,6 @@ async function connect(connectOptions: { handleError(err) } if (!bot) return - // bot.on('move', () => updateCursor()) let p2pConnectTimeout = p2pMultiplayer ? setTimeout(() => { throw new Error('Spawn timeout. There might be error on other side, check console.') }, 20_000) : undefined hud.preload(bot) @@ -680,7 +672,6 @@ async function connect(connectOptions: { activateCameraMove: false, time: Date.now() } - console.log('capture!') virtualClickTimeout ??= setTimeout(() => { virtualClickActive = true document.dispatchEvent(new MouseEvent('mousedown', { button: 0 })) From 38e2621f0c5955f12dc5675ce96abb5c933c078b Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 26 Sep 2023 08:01:17 +0300 Subject: [PATCH 299/318] add massive eslint config and big number of fixes for it! thx to ext --- .eslintrc.json | 52 +++ .github/workflows/ci.yml | 1 + cypress/integration/index.spec.ts | 1 + package.json | 5 +- pnpm-lock.yaml | 674 +++++++++++++++++++++++++++++- src/browserfs.ts | 65 ++- src/builtinCommands.ts | 12 +- src/controls.ts | 6 +- src/downloadAndOpenFile.ts | 13 +- src/dragndrop.ts | 8 +- src/globalState.ts | 16 +- src/globals.d.ts | 6 +- src/index.ts | 117 ++---- src/inventory.ts | 16 +- src/loadSave.ts | 21 +- src/localServerMultiplayer.ts | 4 +- src/optionsStorage.ts | 4 +- src/panorama.js | 7 +- src/reactUi.jsx | 10 +- src/texturePack.ts | 32 +- src/updateTime.ts | 9 +- src/utils.ts | 22 +- src/utilsTs.ts | 6 +- 23 files changed, 893 insertions(+), 214 deletions(-) create mode 100644 .eslintrc.json diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 000000000..d4a10b20d --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,52 @@ +{ + "extends": "zardoy", + "rules": { + // perf + "import/no-deprecated": "off", + // --- + "@typescript-eslint/prefer-nullish-coalescing": "off", + "@typescript-eslint/naming-convention": "off", + "prefer-template": "off", + // intentional: improve readability in some cases + "no-else-return": "off", + "@typescript-eslint/padding-line-between-statements": "off", + "arrow-body-style": "off", + "unicorn/prefer-ternary": "off", + "unicorn/switch-case-braces": "off", + "@typescript-eslint/consistent-type-definitions": "off", + "unicorn/explicit-length-check": "off", + "unicorn/prefer-dom-node-append": "off", + "typescript-eslint/no-confusing-void-expression": "off", + "unicorn/no-lonely-if": "off", + "no-multi-assign": "off", + "sonarjs/no-duplicate-string": "off", + "new-cap": "off", + "unicorn/consistent-destructuring": "off", + "unicorn/no-await-expression-member": "off", + "unicorn/prefer-add-event-listener": "off", + "unicorn/prefer-top-level-await": "off", + "default-case": "off", + // I guess it would better to fix + "node/prefer-global/buffer": "off", + "unicorn/prefer-optional-catch-binding": "off", // still useful for debugging + "no-alert": "off", // todo once replaced with ui, enable + "@typescript-eslint/restrict-plus-operands": "off", + // --- + "@typescript-eslint/no-throw-literal": "off", // disabling because of "rule expansion" + "no-empty-function": "off", + "@typescript-eslint/no-explicit-any": "off", + "import/no-extraneous-dependencies": "off", + "@typescript-eslint/ban-types": "off", + "unicorn/prefer-query-selector": "off", + "@typescript-eslint/dot-notation": "off", // trick prop type-checking + "@typescript-eslint/consistent-type-imports": "off", + "no-negated-condition": "off", + "@typescript-eslint/no-require-imports": "off", + "unicorn/prefer-number-properties": "off", + "@typescript-eslint/no-confusing-void-expression": "off", + // needs to be fixed actually + "@typescript-eslint/no-floating-promises": "warn", + "no-async-promise-executor": "off", + "no-bitwise": "off" + } +} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c132fa563..c53d6061e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,7 @@ jobs: - name: Install pnpm run: npm i -g pnpm - run: pnpm install + - run: pnpm lint - run: pnpm check-build - run: nohup pnpm prod-start & - run: nohup node cypress/minecraft-server.mjs & diff --git a/cypress/integration/index.spec.ts b/cypress/integration/index.spec.ts index c4f239178..3c184b46d 100644 --- a/cypress/integration/index.spec.ts +++ b/cypress/integration/index.spec.ts @@ -43,6 +43,7 @@ it('Loads & renders singleplayer', () => { localServerOptions: { generation: { name: 'superflat', + // eslint-disable-next-line unicorn/numeric-separators-style options: { seed: 250869072 } }, }, diff --git a/package.json b/package.json index 35a086683..d57e4f354 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "test:cypress": "cypress run", "test:e2e": "start-test http-get://localhost:8080 test:cypress", "prod-start": "node server.js", - "postinstall": "node scripts/gen-texturepack-files.mjs" + "postinstall": "node scripts/gen-texturepack-files.mjs", + "lint": "eslint \"{src,cypress}/**/*.{ts,js,jsx,tsx}\"" }, "keywords": [ "prismarine", @@ -62,6 +63,8 @@ "crypto-browserify": "^3.12.0", "cypress": "^9.5.4", "cypress-esbuild-preprocessor": "^1.0.2", + "eslint": "^8.50.0", + "eslint-config-zardoy": "^0.2.17", "events": "^3.3.0", "filesize": "^10.0.12", "http-browserify": "^1.7.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 73e3feee3..25d4635b1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -136,6 +136,12 @@ importers: cypress-esbuild-preprocessor: specifier: ^1.0.2 version: 1.0.2 + eslint: + specifier: ^8.50.0 + version: 8.50.0 + eslint-config-zardoy: + specifier: ^0.2.17 + version: 0.2.17(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.33.2)(eslint@8.50.0)(typescript@5.2.2) events: specifier: ^3.3.0 version: 3.3.0 @@ -286,7 +292,7 @@ importers: version: 16.0.0 standard: specifier: ^17.0.0 - version: 17.0.0 + version: 17.0.0(@typescript-eslint/parser@6.7.3) webpack: specifier: ^5.10.2 version: 5.88.2(esbuild@0.19.3)(webpack-cli@5.1.4) @@ -1850,6 +1856,16 @@ packages: eslint-visitor-keys: 3.4.3 dev: true + /@eslint-community/eslint-utils@4.4.0(eslint@8.50.0): + resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + dependencies: + eslint: 8.50.0 + eslint-visitor-keys: 3.4.3 + dev: true + /@eslint-community/regexpp@4.8.0: resolution: {integrity: sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} @@ -1877,6 +1893,11 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true + /@eslint/js@8.50.0: + resolution: {integrity: sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true + /@hapi/hoek@9.3.0: resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==} dev: true @@ -1898,6 +1919,17 @@ packages: - supports-color dev: true + /@humanwhocodes/config-array@0.11.11: + resolution: {integrity: sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==} + engines: {node: '>=10.10.0'} + dependencies: + '@humanwhocodes/object-schema': 1.2.1 + debug: 4.3.4(supports-color@8.1.1) + minimatch: 3.1.2 + transitivePeerDependencies: + - supports-color + dev: true + /@humanwhocodes/module-importer@1.0.1: resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} engines: {node: '>=12.22'} @@ -2693,6 +2725,10 @@ packages: rollup: 2.79.1 dev: false + /@rushstack/eslint-patch@1.4.0: + resolution: {integrity: sha512-cEjvTPU32OM9lUFegJagO0mRnIn+rbqrG89vV8/xLnLFX0DoR0r1oy5IlTga71Q7uT3Qus7qm7wgeiMT/+Irlg==} + dev: true + /@sideway/address@4.1.4: resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==} dependencies: @@ -2845,6 +2881,10 @@ packages: /@types/node@20.6.4: resolution: {integrity: sha512-nU6d9MPY0NBUMiE/nXd2IIoC4OLvsLpwAjheoAeuzgvDZA1Cb10QYg+91AF6zQiKWRN5i1m07x6sMe0niBznoQ==} + /@types/normalize-package-data@2.4.2: + resolution: {integrity: sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A==} + dev: true + /@types/parse-json@4.0.0: resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} dev: false @@ -2884,6 +2924,10 @@ packages: /@types/scheduler@0.16.3: resolution: {integrity: sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==} + /@types/semver@7.5.3: + resolution: {integrity: sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==} + dev: true + /@types/sinonjs__fake-timers@8.1.1: resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==} @@ -2923,6 +2967,180 @@ packages: '@types/node': 20.5.7 optional: true + /@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.7.3)(eslint@8.50.0)(typescript@5.2.2): + resolution: {integrity: sha512-qg7Bm5TyP/I7iilGyp6DRqqkt8na00lI6HbjWZObgk3FFSzH5ypRwAHXJhJkwiRtTcfn+xYQIMOR5kJgpo6upw==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha + eslint: ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@eslint-community/regexpp': 4.8.0 + '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.2.2) + '@typescript-eslint/scope-manager': 6.1.0 + '@typescript-eslint/type-utils': 6.1.0(eslint@8.50.0)(typescript@5.2.2) + '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.2.2) + '@typescript-eslint/visitor-keys': 6.1.0 + debug: 4.3.4(supports-color@8.1.1) + eslint: 8.50.0 + graphemer: 1.4.0 + ignore: 5.2.4 + natural-compare: 1.4.0 + natural-compare-lite: 1.4.0 + semver: 7.5.4 + ts-api-utils: 1.0.3(typescript@5.2.2) + typescript: 5.2.2 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.2.2): + resolution: {integrity: sha512-TlutE+iep2o7R8Lf+yoer3zU6/0EAUc8QIBB3GYBc1KGz4c4TRm83xwXUZVPlZ6YCLss4r77jbu6j3sendJoiQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/scope-manager': 6.7.3 + '@typescript-eslint/types': 6.7.3 + '@typescript-eslint/typescript-estree': 6.7.3(typescript@5.2.2) + '@typescript-eslint/visitor-keys': 6.7.3 + debug: 4.3.4(supports-color@8.1.1) + eslint: 8.50.0 + typescript: 5.2.2 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/scope-manager@6.1.0: + resolution: {integrity: sha512-AxjgxDn27hgPpe2rQe19k0tXw84YCOsjDJ2r61cIebq1t+AIxbgiXKvD4999Wk49GVaAcdJ/d49FYel+Pp3jjw==} + engines: {node: ^16.0.0 || >=18.0.0} + dependencies: + '@typescript-eslint/types': 6.1.0 + '@typescript-eslint/visitor-keys': 6.1.0 + dev: true + + /@typescript-eslint/scope-manager@6.7.3: + resolution: {integrity: sha512-wOlo0QnEou9cHO2TdkJmzF7DFGvAKEnB82PuPNHpT8ZKKaZu6Bm63ugOTn9fXNJtvuDPanBc78lGUGGytJoVzQ==} + engines: {node: ^16.0.0 || >=18.0.0} + dependencies: + '@typescript-eslint/types': 6.7.3 + '@typescript-eslint/visitor-keys': 6.7.3 + dev: true + + /@typescript-eslint/type-utils@6.1.0(eslint@8.50.0)(typescript@5.2.2): + resolution: {integrity: sha512-kFXBx6QWS1ZZ5Ni89TyT1X9Ag6RXVIVhqDs0vZE/jUeWlBv/ixq2diua6G7ece6+fXw3TvNRxP77/5mOMusx2w==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.2.2) + '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.2.2) + debug: 4.3.4(supports-color@8.1.1) + eslint: 8.50.0 + ts-api-utils: 1.0.3(typescript@5.2.2) + typescript: 5.2.2 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/types@6.1.0: + resolution: {integrity: sha512-+Gfd5NHCpDoHDOaU/yIF3WWRI2PcBRKKpP91ZcVbL0t5tQpqYWBs3z/GGhvU+EV1D0262g9XCnyqQh19prU0JQ==} + engines: {node: ^16.0.0 || >=18.0.0} + dev: true + + /@typescript-eslint/types@6.7.3: + resolution: {integrity: sha512-4g+de6roB2NFcfkZb439tigpAMnvEIg3rIjWQ+EM7IBaYt/CdJt6em9BJ4h4UpdgaBWdmx2iWsafHTrqmgIPNw==} + engines: {node: ^16.0.0 || >=18.0.0} + dev: true + + /@typescript-eslint/typescript-estree@6.1.0(typescript@5.2.2): + resolution: {integrity: sha512-nUKAPWOaP/tQjU1IQw9sOPCDavs/iU5iYLiY/6u7gxS7oKQoi4aUxXS1nrrVGTyBBaGesjkcwwHkbkiD5eBvcg==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 6.1.0 + '@typescript-eslint/visitor-keys': 6.1.0 + debug: 4.3.4(supports-color@8.1.1) + globby: 11.1.0 + is-glob: 4.0.3 + semver: 7.5.4 + ts-api-utils: 1.0.3(typescript@5.2.2) + typescript: 5.2.2 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/typescript-estree@6.7.3(typescript@5.2.2): + resolution: {integrity: sha512-YLQ3tJoS4VxLFYHTw21oe1/vIZPRqAO91z6Uv0Ss2BKm/Ag7/RVQBcXTGcXhgJMdA4U+HrKuY5gWlJlvoaKZ5g==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 6.7.3 + '@typescript-eslint/visitor-keys': 6.7.3 + debug: 4.3.4(supports-color@8.1.1) + globby: 11.1.0 + is-glob: 4.0.3 + semver: 7.5.4 + ts-api-utils: 1.0.3(typescript@5.2.2) + typescript: 5.2.2 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/utils@6.1.0(eslint@8.50.0)(typescript@5.2.2): + resolution: {integrity: sha512-wp652EogZlKmQoMS5hAvWqRKplXvkuOnNzZSE0PVvsKjpexd/XznRVHAtrfHFYmqaJz0DFkjlDsGYC9OXw+OhQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.50.0) + '@types/json-schema': 7.0.12 + '@types/semver': 7.5.3 + '@typescript-eslint/scope-manager': 6.1.0 + '@typescript-eslint/types': 6.1.0 + '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.2.2) + eslint: 8.50.0 + semver: 7.5.4 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + + /@typescript-eslint/visitor-keys@6.1.0: + resolution: {integrity: sha512-yQeh+EXhquh119Eis4k0kYhj9vmFzNpbhM3LftWQVwqVjipCkwHBQOZutcYW+JVkjtTG9k8nrZU1UoNedPDd1A==} + engines: {node: ^16.0.0 || >=18.0.0} + dependencies: + '@typescript-eslint/types': 6.1.0 + eslint-visitor-keys: 3.4.3 + dev: true + + /@typescript-eslint/visitor-keys@6.7.3: + resolution: {integrity: sha512-HEVXkU9IB+nk9o63CeICMHxFWbHWr3E1mpilIQBe9+7L/lH97rleFLVtYsfnWB+JVMaiFnEaxvknvmIzX+CqVg==} + engines: {node: ^16.0.0 || >=18.0.0} + dependencies: + '@typescript-eslint/types': 6.7.3 + eslint-visitor-keys: 3.4.3 + dev: true + /@webassemblyjs/ast@1.11.6: resolution: {integrity: sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==} dependencies: @@ -3333,6 +3551,11 @@ packages: is-string: 1.0.7 dev: true + /array-union@2.1.0: + resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} + engines: {node: '>=8'} + dev: true + /array.prototype.findlastindex@1.2.2: resolution: {integrity: sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==} engines: {node: '>= 0.4'} @@ -3829,7 +4052,6 @@ packages: /builtin-modules@3.3.0: resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} engines: {node: '>=6'} - dev: false /builtins@5.0.1: resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} @@ -3999,6 +4221,13 @@ packages: resolution: {integrity: sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==} dev: false + /clean-regexp@1.0.0: + resolution: {integrity: sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==} + engines: {node: '>=4'} + dependencies: + escape-string-regexp: 1.0.5 + dev: true + /clean-stack@2.2.0: resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==} engines: {node: '>=6'} @@ -4166,6 +4395,10 @@ packages: /concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + /confusing-browser-globals@1.0.11: + resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==} + dev: true + /console-control-strings@1.1.0: resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==} dev: true @@ -4654,6 +4887,13 @@ packages: randombytes: 2.1.0 dev: true + /dir-glob@3.0.1: + resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} + engines: {node: '>=8'} + dependencies: + path-type: 4.0.0 + dev: true + /discontinuous-range@1.0.0: resolution: {integrity: sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==} @@ -5056,6 +5296,15 @@ packages: source-map: 0.6.1 dev: true + /eslint-config-prettier@8.10.0(eslint@8.50.0): + resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==} + hasBin: true + peerDependencies: + eslint: '>=7.0.0' + dependencies: + eslint: 8.50.0 + dev: true + /eslint-config-standard-jsx@11.0.0(eslint-plugin-react@7.33.2)(eslint@8.48.0): resolution: {integrity: sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==} peerDependencies: @@ -5075,11 +5324,85 @@ packages: eslint-plugin-promise: ^6.0.0 dependencies: eslint: 8.48.0 - eslint-plugin-import: 2.28.1(eslint@8.48.0) + eslint-plugin-import: 2.28.1(@typescript-eslint/parser@6.7.3)(eslint@8.48.0) eslint-plugin-n: 15.7.0(eslint@8.48.0) eslint-plugin-promise: 6.1.1(eslint@8.48.0) dev: true + /eslint-config-xo-react@0.27.0(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.33.2)(eslint@8.50.0): + resolution: {integrity: sha512-wiV215xQIn71XZyyVfaOXHaFpR1B14IJttwOjMi/eqUK1s+ojJdHr7eHqTLaGUfh6FKgWha1QNwePlIXx7mBUg==} + engines: {node: '>=12'} + peerDependencies: + eslint: '>=8.6.0' + eslint-plugin-react: '>=7.29.0' + eslint-plugin-react-hooks: '>=4.3.0' + dependencies: + eslint: 8.50.0 + eslint-plugin-react: 7.33.2(eslint@8.50.0) + eslint-plugin-react-hooks: 4.6.0(eslint@8.50.0) + dev: true + + /eslint-config-xo-typescript@1.0.1(@typescript-eslint/eslint-plugin@6.1.0)(@typescript-eslint/parser@6.7.3)(eslint@8.50.0)(typescript@5.2.2): + resolution: {integrity: sha512-vPQssnRSUgBFOEfB/KY12CXwltwFSn4RSCfa+w7gjBC2PFQ7Yfgmyei+1XUZ3K+8LRGef2NMJUcxts7PldhDjg==} + engines: {node: '>=16'} + peerDependencies: + '@typescript-eslint/eslint-plugin': '>=6.0.0' + '@typescript-eslint/parser': '>=6.0.0' + eslint: '>=8.0.0' + typescript: '>=4.7' + dependencies: + '@typescript-eslint/eslint-plugin': 6.1.0(@typescript-eslint/parser@6.7.3)(eslint@8.50.0)(typescript@5.2.2) + '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.2.2) + eslint: 8.50.0 + typescript: 5.2.2 + dev: true + + /eslint-config-xo@0.43.1(eslint@8.50.0): + resolution: {integrity: sha512-azv1L2PysRA0NkZOgbndUpN+581L7wPqkgJOgxxw3hxwXAbJgD6Hqb/SjHRiACifXt/AvxCzE/jIKFAlI7XjvQ==} + engines: {node: '>=12'} + peerDependencies: + eslint: '>=8.27.0' + dependencies: + confusing-browser-globals: 1.0.11 + eslint: 8.50.0 + dev: true + + /eslint-config-zardoy@0.2.17(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.33.2)(eslint@8.50.0)(typescript@5.2.2): + resolution: {integrity: sha512-d31WsjyVSQqHbzTpBSmH96+nw5gwY2yhDbZatU89gr+U8ou1FRUkJSApYJUgmcINt8AQocj1RDDAVYmVSILZgQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + peerDependencies: + eslint: ^8.5.0 + eslint-plugin-vue: ^8.4.1 + typescript: ^4.5.2 + vue-eslint-parser: ^8.2.0 + peerDependenciesMeta: + eslint-plugin-vue: + optional: true + vue-eslint-parser: + optional: true + dependencies: + '@rushstack/eslint-patch': 1.4.0 + '@typescript-eslint/eslint-plugin': 6.1.0(@typescript-eslint/parser@6.7.3)(eslint@8.50.0)(typescript@5.2.2) + '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.2.2) + eslint: 8.50.0 + eslint-config-prettier: 8.10.0(eslint@8.50.0) + eslint-config-xo: 0.43.1(eslint@8.50.0) + eslint-config-xo-react: 0.27.0(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.33.2)(eslint@8.50.0) + eslint-config-xo-typescript: 1.0.1(@typescript-eslint/eslint-plugin@6.1.0)(@typescript-eslint/parser@6.7.3)(eslint@8.50.0)(typescript@5.2.2) + eslint-plugin-eslint-comments: 3.2.0(eslint@8.50.0) + eslint-plugin-import: 2.27.5(@typescript-eslint/parser@6.7.3)(eslint@8.50.0) + eslint-plugin-node: 11.1.0(eslint@8.50.0) + eslint-plugin-sonarjs: 0.19.0(eslint@8.50.0) + eslint-plugin-unicorn: 48.0.0(eslint@8.50.0) + typescript: 5.2.2 + transitivePeerDependencies: + - eslint-import-resolver-typescript + - eslint-import-resolver-webpack + - eslint-plugin-react + - eslint-plugin-react-hooks + - supports-color + dev: true + /eslint-import-resolver-node@0.3.9: resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} dependencies: @@ -5090,7 +5413,7 @@ packages: - supports-color dev: true - /eslint-module-utils@2.8.0(eslint-import-resolver-node@0.3.9)(eslint@8.48.0): + /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.7.3)(eslint-import-resolver-node@0.3.9)(eslint@8.48.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} engines: {node: '>=4'} peerDependencies: @@ -5111,6 +5434,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: + '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.2.2) debug: 3.2.7(supports-color@8.1.1) eslint: 8.48.0 eslint-import-resolver-node: 0.3.9 @@ -5118,6 +5442,46 @@ packages: - supports-color dev: true + /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.7.3)(eslint-import-resolver-node@0.3.9)(eslint@8.50.0): + resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} + engines: {node: '>=4'} + peerDependencies: + '@typescript-eslint/parser': '*' + eslint: '*' + eslint-import-resolver-node: '*' + eslint-import-resolver-typescript: '*' + eslint-import-resolver-webpack: '*' + peerDependenciesMeta: + '@typescript-eslint/parser': + optional: true + eslint: + optional: true + eslint-import-resolver-node: + optional: true + eslint-import-resolver-typescript: + optional: true + eslint-import-resolver-webpack: + optional: true + dependencies: + '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.2.2) + debug: 3.2.7(supports-color@8.1.1) + eslint: 8.50.0 + eslint-import-resolver-node: 0.3.9 + transitivePeerDependencies: + - supports-color + dev: true + + /eslint-plugin-es@3.0.1(eslint@8.50.0): + resolution: {integrity: sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==} + engines: {node: '>=8.10.0'} + peerDependencies: + eslint: '>=4.19.1' + dependencies: + eslint: 8.50.0 + eslint-utils: 2.1.0 + regexpp: 3.2.0 + dev: true + /eslint-plugin-es@4.1.0(eslint@8.48.0): resolution: {integrity: sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==} engines: {node: '>=8.10.0'} @@ -5129,7 +5493,51 @@ packages: regexpp: 3.2.0 dev: true - /eslint-plugin-import@2.28.1(eslint@8.48.0): + /eslint-plugin-eslint-comments@3.2.0(eslint@8.50.0): + resolution: {integrity: sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==} + engines: {node: '>=6.5.0'} + peerDependencies: + eslint: '>=4.19.1' + dependencies: + escape-string-regexp: 1.0.5 + eslint: 8.50.0 + ignore: 5.2.4 + dev: true + + /eslint-plugin-import@2.27.5(@typescript-eslint/parser@6.7.3)(eslint@8.50.0): + resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==} + engines: {node: '>=4'} + peerDependencies: + '@typescript-eslint/parser': '*' + eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 + peerDependenciesMeta: + '@typescript-eslint/parser': + optional: true + dependencies: + '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.2.2) + array-includes: 3.1.6 + array.prototype.flat: 1.3.1 + array.prototype.flatmap: 1.3.1 + debug: 3.2.7(supports-color@8.1.1) + doctrine: 2.1.0 + eslint: 8.50.0 + eslint-import-resolver-node: 0.3.9 + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.7.3)(eslint-import-resolver-node@0.3.9)(eslint@8.50.0) + has: 1.0.3 + is-core-module: 2.13.0 + is-glob: 4.0.3 + minimatch: 3.1.2 + object.values: 1.1.7 + resolve: 1.22.4 + semver: 6.3.1 + tsconfig-paths: 3.14.2 + transitivePeerDependencies: + - eslint-import-resolver-typescript + - eslint-import-resolver-webpack + - supports-color + dev: true + + /eslint-plugin-import@2.28.1(@typescript-eslint/parser@6.7.3)(eslint@8.48.0): resolution: {integrity: sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==} engines: {node: '>=4'} peerDependencies: @@ -5139,6 +5547,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: + '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.2.2) array-includes: 3.1.6 array.prototype.findlastindex: 1.2.2 array.prototype.flat: 1.3.1 @@ -5147,7 +5556,7 @@ packages: doctrine: 2.1.0 eslint: 8.48.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(eslint-import-resolver-node@0.3.9)(eslint@8.48.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.7.3)(eslint-import-resolver-node@0.3.9)(eslint@8.48.0) has: 1.0.3 is-core-module: 2.13.0 is-glob: 4.0.3 @@ -5180,6 +5589,21 @@ packages: semver: 7.5.4 dev: true + /eslint-plugin-node@11.1.0(eslint@8.50.0): + resolution: {integrity: sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==} + engines: {node: '>=8.10.0'} + peerDependencies: + eslint: '>=5.16.0' + dependencies: + eslint: 8.50.0 + eslint-plugin-es: 3.0.1(eslint@8.50.0) + eslint-utils: 2.1.0 + ignore: 5.2.4 + minimatch: 3.1.2 + resolve: 1.22.4 + semver: 6.3.1 + dev: true + /eslint-plugin-promise@6.1.1(eslint@8.48.0): resolution: {integrity: sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -5189,6 +5613,15 @@ packages: eslint: 8.48.0 dev: true + /eslint-plugin-react-hooks@4.6.0(eslint@8.50.0): + resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==} + engines: {node: '>=10'} + peerDependencies: + eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 + dependencies: + eslint: 8.50.0 + dev: true + /eslint-plugin-react@7.33.2(eslint@8.48.0): resolution: {integrity: sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==} engines: {node: '>=4'} @@ -5214,6 +5647,64 @@ packages: string.prototype.matchall: 4.0.8 dev: true + /eslint-plugin-react@7.33.2(eslint@8.50.0): + resolution: {integrity: sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==} + engines: {node: '>=4'} + peerDependencies: + eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 + dependencies: + array-includes: 3.1.6 + array.prototype.flatmap: 1.3.1 + array.prototype.tosorted: 1.1.1 + doctrine: 2.1.0 + es-iterator-helpers: 1.0.14 + eslint: 8.50.0 + estraverse: 5.3.0 + jsx-ast-utils: 3.3.5 + minimatch: 3.1.2 + object.entries: 1.1.7 + object.fromentries: 2.0.6 + object.hasown: 1.1.3 + object.values: 1.1.7 + prop-types: 15.8.1 + resolve: 2.0.0-next.4 + semver: 6.3.1 + string.prototype.matchall: 4.0.8 + dev: true + + /eslint-plugin-sonarjs@0.19.0(eslint@8.50.0): + resolution: {integrity: sha512-6+s5oNk5TFtVlbRxqZN7FIGmjdPCYQKaTzFPmqieCmsU1kBYDzndTeQav0xtQNwZJWu5awWfTGe8Srq9xFOGnw==} + engines: {node: '>=14'} + peerDependencies: + eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 + dependencies: + eslint: 8.50.0 + dev: true + + /eslint-plugin-unicorn@48.0.0(eslint@8.50.0): + resolution: {integrity: sha512-8fk/v3p1ro34JSVDBEmtOq6EEQRpMR0iTir79q69KnXFZ6DJyPkT3RAi+ZoTqhQMdDSpGh8BGR68ne1sP5cnAA==} + engines: {node: '>=16'} + peerDependencies: + eslint: '>=8.44.0' + dependencies: + '@babel/helper-validator-identifier': 7.22.5 + '@eslint-community/eslint-utils': 4.4.0(eslint@8.50.0) + ci-info: 3.8.0 + clean-regexp: 1.0.0 + eslint: 8.50.0 + esquery: 1.5.0 + indent-string: 4.0.0 + is-builtin-module: 3.2.1 + jsesc: 3.0.2 + lodash: 4.17.21 + pluralize: 8.0.0 + read-pkg-up: 7.0.1 + regexp-tree: 0.1.27 + regjsparser: 0.10.0 + semver: 7.5.4 + strip-indent: 3.0.0 + dev: true + /eslint-scope@5.1.1: resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} engines: {node: '>=8.0.0'} @@ -5308,6 +5799,52 @@ packages: - supports-color dev: true + /eslint@8.50.0: + resolution: {integrity: sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + hasBin: true + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.50.0) + '@eslint-community/regexpp': 4.8.0 + '@eslint/eslintrc': 2.1.2 + '@eslint/js': 8.50.0 + '@humanwhocodes/config-array': 0.11.11 + '@humanwhocodes/module-importer': 1.0.1 + '@nodelib/fs.walk': 1.2.8 + ajv: 6.12.6 + chalk: 4.1.2 + cross-spawn: 7.0.3 + debug: 4.3.4(supports-color@8.1.1) + doctrine: 3.0.0 + escape-string-regexp: 4.0.0 + eslint-scope: 7.2.2 + eslint-visitor-keys: 3.4.3 + espree: 9.6.1 + esquery: 1.5.0 + esutils: 2.0.3 + fast-deep-equal: 3.1.3 + file-entry-cache: 6.0.1 + find-up: 5.0.0 + glob-parent: 6.0.2 + globals: 13.21.0 + graphemer: 1.4.0 + ignore: 5.2.4 + imurmurhash: 0.1.4 + is-glob: 4.0.3 + is-path-inside: 3.0.3 + js-yaml: 4.1.0 + json-stable-stringify-without-jsonify: 1.0.1 + levn: 0.4.1 + lodash.merge: 4.6.2 + minimatch: 3.1.2 + natural-compare: 1.4.0 + optionator: 0.9.3 + strip-ansi: 6.0.1 + text-table: 0.2.0 + transitivePeerDependencies: + - supports-color + dev: true + /espree@9.6.1: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -5530,6 +6067,17 @@ packages: /fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} + /fast-glob@3.3.1: + resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==} + engines: {node: '>=8.6.0'} + dependencies: + '@nodelib/fs.stat': 2.0.5 + '@nodelib/fs.walk': 1.2.8 + glob-parent: 5.1.2 + merge2: 1.4.1 + micromatch: 4.0.5 + dev: true + /fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} @@ -5911,6 +6459,13 @@ packages: dependencies: assert-plus: 1.0.0 + /glob-parent@5.1.2: + resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} + engines: {node: '>= 6'} + dependencies: + is-glob: 4.0.3 + dev: true + /glob-parent@6.0.2: resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} engines: {node: '>=10.13.0'} @@ -5992,6 +6547,18 @@ packages: dependencies: define-properties: 1.2.0 + /globby@11.1.0: + resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} + engines: {node: '>=10'} + dependencies: + array-union: 2.1.0 + dir-glob: 3.0.1 + fast-glob: 3.3.1 + ignore: 5.2.4 + merge2: 1.4.1 + slash: 3.0.0 + dev: true + /gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: @@ -6403,6 +6970,13 @@ packages: resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==} dev: true + /is-builtin-module@3.2.1: + resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==} + engines: {node: '>=6'} + dependencies: + builtin-modules: 3.3.0 + dev: true + /is-callable@1.2.7: resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} engines: {node: '>= 0.4'} @@ -7313,13 +7887,18 @@ packages: /jsesc@0.5.0: resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==} hasBin: true - dev: false /jsesc@2.5.2: resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} engines: {node: '>=4'} hasBin: true + /jsesc@3.0.2: + resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==} + engines: {node: '>=6'} + hasBin: true + dev: true + /json-buffer@3.0.1: resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} dev: true @@ -7779,6 +8358,11 @@ packages: /merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} + /merge2@1.4.1: + resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} + engines: {node: '>= 8'} + dev: true + /merge@1.2.1: resolution: {integrity: sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==} dev: false @@ -7833,6 +8417,11 @@ packages: dom-walk: 0.1.2 dev: false + /min-indent@1.0.1: + resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} + engines: {node: '>=4'} + dev: true + /minecraft-assets@1.9.0: resolution: {integrity: sha512-KtvIRd9gcKlxbvrswGv1Ap9k7tVs//QW2ukp+8vJ28miYwkhUmYfjTZyElIG8KUXV/46wL2kDzLH8SJbXQ56Mg==} dev: true @@ -8078,6 +8667,10 @@ packages: stylis: 4.2.0 dev: false + /natural-compare-lite@1.4.0: + resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==} + dev: true + /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true @@ -8555,7 +9148,6 @@ packages: /path-type@4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} - dev: false /pbkdf2@3.1.2: resolution: {integrity: sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==} @@ -8648,6 +9240,11 @@ packages: find-up: 4.1.0 dev: true + /pluralize@8.0.0: + resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==} + engines: {node: '>=4'} + dev: true + /pngjs@3.4.0: resolution: {integrity: sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==} engines: {node: '>=4.0.0'} @@ -9147,6 +9744,15 @@ packages: dependencies: loose-envify: 1.4.0 + /read-pkg-up@7.0.1: + resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==} + engines: {node: '>=8'} + dependencies: + find-up: 4.1.0 + read-pkg: 5.2.0 + type-fest: 0.8.1 + dev: true + /read-pkg@3.0.0: resolution: {integrity: sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==} engines: {node: '>=4'} @@ -9156,6 +9762,16 @@ packages: path-type: 3.0.0 dev: true + /read-pkg@5.2.0: + resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==} + engines: {node: '>=8'} + dependencies: + '@types/normalize-package-data': 2.4.2 + normalize-package-data: 2.5.0 + parse-json: 5.2.0 + type-fest: 0.6.0 + dev: true + /readable-stream@2.3.8: resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==} dependencies: @@ -9233,6 +9849,11 @@ packages: '@babel/runtime': 7.22.11 dev: false + /regexp-tree@0.1.27: + resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==} + hasBin: true + dev: true + /regexp.prototype.flags@1.5.0: resolution: {integrity: sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==} engines: {node: '>= 0.4'} @@ -9258,6 +9879,13 @@ packages: unicode-match-property-value-ecmascript: 2.1.0 dev: false + /regjsparser@0.10.0: + resolution: {integrity: sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==} + hasBin: true + dependencies: + jsesc: 0.5.0 + dev: true + /regjsparser@0.9.1: resolution: {integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==} hasBin: true @@ -9973,7 +10601,7 @@ packages: xdg-basedir: 4.0.0 dev: true - /standard@17.0.0: + /standard@17.0.0(@typescript-eslint/parser@6.7.3): resolution: {integrity: sha512-GlCM9nzbLUkr+TYR5I2WQoIah4wHA2lMauqbyPLV/oI5gJxqhHzhjl9EG2N0lr/nRqI3KCbCvm/W3smxvLaChA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true @@ -9981,7 +10609,7 @@ packages: eslint: 8.48.0 eslint-config-standard: 17.0.0(eslint-plugin-import@2.28.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.48.0) eslint-config-standard-jsx: 11.0.0(eslint-plugin-react@7.33.2)(eslint@8.48.0) - eslint-plugin-import: 2.28.1(eslint@8.48.0) + eslint-plugin-import: 2.28.1(@typescript-eslint/parser@6.7.3)(eslint@8.48.0) eslint-plugin-n: 15.7.0(eslint@8.48.0) eslint-plugin-promise: 6.1.1(eslint@8.48.0) eslint-plugin-react: 7.33.2(eslint@8.48.0) @@ -10133,6 +10761,13 @@ packages: resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} engines: {node: '>=6'} + /strip-indent@3.0.0: + resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==} + engines: {node: '>=8'} + dependencies: + min-indent: 1.0.1 + dev: true + /strip-json-comments@3.1.1: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} @@ -10410,6 +11045,15 @@ packages: utf8-byte-length: 1.0.4 dev: false + /ts-api-utils@1.0.3(typescript@5.2.2): + resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==} + engines: {node: '>=16.13.0'} + peerDependencies: + typescript: '>=4.2.0' + dependencies: + typescript: 5.2.2 + dev: true + /ts-easing@0.2.0: resolution: {integrity: sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==} dev: false @@ -10465,6 +11109,16 @@ packages: engines: {node: '>=6'} dev: true + /type-fest@0.6.0: + resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==} + engines: {node: '>=8'} + dev: true + + /type-fest@0.8.1: + resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==} + engines: {node: '>=8'} + dev: true + /type-fest@2.19.0: resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==} engines: {node: '>=12.20'} diff --git a/src/browserfs.ts b/src/browserfs.ts index ed2f7eba7..bac4d5dc5 100644 --- a/src/browserfs.ts +++ b/src/browserfs.ts @@ -1,13 +1,13 @@ //@ts-check -import { fsState, loadSave } from './loadSave' +import { join } from 'path' +import { promisify } from 'util' +import fs from 'fs' import { oneOf } from '@zardoy/utils' import JSZip from 'jszip' -import { join } from 'path' +import * as browserfs from 'browserfs' import { options } from './optionsStorage' -import { promisify } from 'util' -import * as browserfs from 'browserfs' -import fs from 'fs' +import { fsState, loadSave } from './loadSave' import { installTexturePack, updateTexturePackInstalledState } from './texturePack' browserfs.install(window) @@ -15,7 +15,7 @@ browserfs.install(window) const deafultMountablePoints = { "/world": { fs: "LocalStorage" }, '/userData': { fs: 'IndexedDB' }, -}; +} browserfs.configure({ fs: 'MountableFileSystem', options: deafultMountablePoints, @@ -26,10 +26,9 @@ browserfs.configure({ export const forceCachedDataPaths = {} -//@ts-ignore +//@ts-expect-error fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat', 'mkdir', 'rmdir', 'unlink', 'rename', /* 'copyFile', */'readdir'].map(key => [key, promisify(fs[key])])), { - get(target, p, receiver) { - //@ts-ignore + get(target, p: string, receiver) { if (!target[p]) throw new Error(`Not implemented fs.promises.${p}`) return (...args) => { // browser fs bug: if path doesn't start with / dirname will return . which would cause infinite loop, so we need to normalize paths @@ -50,20 +49,20 @@ fs.promises = new Proxy(Object.fromEntries(['readFile', 'writeFile', 'stat', 'mk if (p === 'open' && fsState.isReadonly) { args[1] = 'r' // read-only, zipfs throw otherwise } - //@ts-ignore return target[p](...args) } } }) -//@ts-ignore +//@ts-expect-error fs.promises.open = async (...args) => { const fd = await promisify(fs.open)(...args) return { ...Object.fromEntries(['read', 'write', 'close'].map(x => [x, async (...args) => { - return await new Promise(resolve => { + return new Promise(resolve => { // todo it results in world corruption on interactions eg block placements if (x === 'write' && fsState.isReadonly) { - return resolve({ buffer: Buffer.from([]), bytesRead: 0 }) + resolve({ buffer: Buffer.from([]), bytesRead: 0 }) + return } fs[x](fd, ...args, (err, bytesRead, buffer) => { @@ -80,7 +79,7 @@ fs.promises.open = async (...args) => { // for debugging fd, filename: args[0], - close: () => { + async close() { return new Promise(resolve => { fs.close(fd, (err) => { if (err) { @@ -96,7 +95,7 @@ fs.promises.open = async (...args) => { // for testing purposes, todo move it to core patch const removeFileRecursiveSync = (path) => { - fs.readdirSync(path).forEach((file) => { + for (const file of fs.readdirSync(path)) { const curPath = join(path, file) if (fs.lstatSync(curPath).isDirectory()) { // recurse @@ -106,30 +105,26 @@ const removeFileRecursiveSync = (path) => { // delete file fs.unlinkSync(curPath) } - }) + } } window.removeFileRecursiveSync = removeFileRecursiveSync // todo it still doesnt clean the storage, need to debug export async function removeFileRecursiveAsync(path) { - try { - const files = await fs.promises.readdir(path); - for (const file of files) { - const curPath = join(path, file); - const stats = await fs.promises.stat(curPath); - if (stats.isDirectory()) { - // Recurse - await removeFileRecursiveAsync(curPath); - } else { - // Delete file - await fs.promises.unlink(curPath); - } + const files = await fs.promises.readdir(path) + for (const file of files) { + const curPath = join(path, file) + const stats = await fs.promises.stat(curPath) + if (stats.isDirectory()) { + // Recurse + await removeFileRecursiveAsync(curPath) + } else { + // Delete file + await fs.promises.unlink(curPath) } - await fs.promises.rmdir(path); - } catch (error) { - throw error; } + await fs.promises.rmdir(path) } @@ -181,9 +176,9 @@ export const openWorldDirectory = async (dragndropHandle?: FileSystemDirectoryHa const tryToDetectResourcePack = async (file: File | ArrayBuffer) => { const askInstall = async () => { return alert('ATM You can install texturepacks only via options menu. WIll be fixed') - if (confirm('Resource pack detected, do you want to install it?')) { - await installTexturePack(file) - } + // if (confirm('Resource pack detected, do you want to install it?')) { + // await installTexturePack(file) + // } } if (fs.existsSync('/world/pack.mcmeta')) { @@ -243,7 +238,7 @@ const openWorldZipInner = async (file: File | ArrayBuffer, name = file['name']) await loadSave() } else { const dirs = fs.readdirSync('/world') - let availableWorlds: string[] = [] + const availableWorlds: string[] = [] for (const dir of dirs) { if (fs.existsSync(`/world/${dir}/level.dat`)) { availableWorlds.push(dir) diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts index 2168655bb..197ebb004 100644 --- a/src/builtinCommands.ts +++ b/src/builtinCommands.ts @@ -1,6 +1,6 @@ -import JSZip from 'jszip' import fs from 'fs' import { join } from 'path' +import JSZip from 'jszip' import { fsState } from './loadSave' import { closeWan, openToWanAndCopyJoinLink } from './localServerMultiplayer' @@ -32,7 +32,7 @@ async function addFolderToZip(folderPath, zip, relativePath) { const exportWorld = async () => { // todo issue into chat warning if fs is writable! const zip = new JSZip() - let worldFolder: string = localServer.options.worldFolder + let {worldFolder} = localServer.options if (!worldFolder.startsWith('/')) worldFolder = `/${worldFolder}` await addFolderToZip(worldFolder, zip, '') @@ -64,21 +64,21 @@ const commands = [ }, { command: ['/publish', '/share'], - invoke: async () => { + async invoke() { const text = await openToWanAndCopyJoinLink(writeText) if (text) writeText(text) } }, { command: ['/close'], - invoke: () => { + invoke() { const text = closeWan() if (text) writeText(text) } }, { command: '/reset-world -y', - invoke: async () => { + async invoke() { if (fsState.inMemorySave) return // todo for testing purposes sessionStorage.oldData = localStorage @@ -90,7 +90,7 @@ const commands = [ }, { command: ['/save'], - invoke: () => { + invoke() { saveWorld() } } diff --git a/src/controls.ts b/src/controls.ts index 7b7017fa4..1f573eea3 100644 --- a/src/controls.ts +++ b/src/controls.ts @@ -1,12 +1,12 @@ //@ts-check import { Vec3 } from 'vec3' -import { isGameActive, showModal, gameAdditionalState, activeModalStack, hideCurrentModal } from './globalState' import { proxy, subscribe } from 'valtio' import { ControMax } from 'contro-max/build/controMax' import { CommandEventArgument, SchemaCommandInput } from 'contro-max/build/types' import { stringStartsWith } from 'contro-max/build/stringUtils' +import { isGameActive, showModal, gameAdditionalState, activeModalStack, hideCurrentModal } from './globalState' import { reloadChunks } from './utils' // doesnt seem to work for now @@ -137,6 +137,7 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => { } if (stringStartsWith(command, 'general')) { // handle general commands + // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check switch (command) { case 'general.jump': bot.setControlState('jump', pressed) @@ -189,6 +190,7 @@ contro.on('trigger', ({ command }) => { onTriggerOrReleased(command, true) if (stringStartsWith(command, 'general')) { + // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check switch (command) { case 'general.inventory': document.exitPointerLock?.() @@ -225,7 +227,7 @@ document.addEventListener('keydown', (e) => { if (hardcodedPressedKeys.has('F3')) { // reload chunks if (e.code === 'KeyA') { - //@ts-ignore + //@ts-expect-error const loadedChunks = Object.entries(worldView.loadedChunks).filter(([, v]) => v).map(([key]) => key.split(',').map(Number)) for (const [x, z] of loadedChunks) { worldView.unloadChunk({ x, z }) diff --git a/src/downloadAndOpenFile.ts b/src/downloadAndOpenFile.ts index 0192ab4c3..66e2cbd5b 100644 --- a/src/downloadAndOpenFile.ts +++ b/src/downloadAndOpenFile.ts @@ -1,7 +1,7 @@ +import prettyBytes from 'pretty-bytes' import { openWorldZip } from './browserfs' import { getResourcePackName, installTexturePack, resourcePackState, updateTexturePackInstalledState } from './texturePack' import { setLoadingScreenStatus } from './utils' -import prettyBytes from 'pretty-bytes' const getConstantFilesize = (bytes: number) => { return prettyBytes(bytes, { minimumFractionDigits: 2, maximumFractionDigits: 2 }) @@ -15,14 +15,14 @@ export default async () => { if (texturepack) mapUrl = texturepack if (!mapUrl) return false - if (!texturepack) { - const menu = document.getElementById('play-screen') - menu.style = 'display: none;' - } else { + if (texturepack) { await updateTexturePackInstalledState() if (resourcePackState.resourcePackInstalled) { - if (!confirm(`You are going to install a new texturepack which would override a current one: ${getResourcePackName()} Continue?`)) return + if (!confirm(`You are going to install a new texturepack which would override a current one: ${await getResourcePackName()} Continue?`)) return } + } else { + const menu = document.getElementById('play-screen') + menu.style = 'display: none;' } const name = mapUrl.slice(mapUrl.lastIndexOf('/') + 1).slice(-25) const downloadThing = texturepack ? 'texturepack' : 'world' @@ -42,6 +42,7 @@ export default async () => { async start(controller) { const reader = response.body.getReader() + // eslint-disable-next-line no-constant-condition while (true) { const { done, value } = await reader.read() diff --git a/src/dragndrop.ts b/src/dragndrop.ts index bcb8d5711..5a1145531 100644 --- a/src/dragndrop.ts +++ b/src/dragndrop.ts @@ -1,5 +1,5 @@ -import * as nbt from 'prismarine-nbt' import { promisify } from 'util' +import * as nbt from 'prismarine-nbt' import { showNotification } from './menus/notification' import { openWorldDirectory, openWorldZip } from './browserfs' import { isGameActive } from './globalState' @@ -8,7 +8,7 @@ const parseNbt = promisify(nbt.parse) window.nbt = nbt; // todo display drop zone -["drag", "dragstart", "dragend", "dragover", "dragenter", "dragleave", "drop"].forEach(event => { +for (const event of ["drag", "dragstart", "dragend", "dragover", "dragenter", "dragleave", "drop"]) { window.addEventListener(event, (e: any) => { if (e.dataTransfer && !e.dataTransfer.types.includes("Files")) { // e.dataTransfer.effectAllowed = "none" @@ -16,7 +16,7 @@ window.nbt = nbt; } e.preventDefault() }) -}) +} window.addEventListener("drop", async e => { if (!e.dataTransfer?.files.length) return const { items } = e.dataTransfer @@ -32,7 +32,7 @@ window.addEventListener("drop", async e => { alert('Exit current world first, before loading a new one.') return } - await openWorldDirectory(filehandle as FileSystemDirectoryHandle) + await openWorldDirectory(filehandle ) } } else { await handleDroppedFile(item.getAsFile()) diff --git a/src/globalState.ts b/src/globalState.ts index 50cbde65f..0257ca232 100644 --- a/src/globalState.ts +++ b/src/globalState.ts @@ -45,7 +45,7 @@ const showModalInner = (modal: Modal) => { export const showModal = (elem: (HTMLElement & Record) | { reactType: string }) => { const resolved = elem instanceof HTMLElement ? { elem: ref(elem) } : elem - const curModal = activeModalStack.slice(-1)[0] + const curModal = activeModalStack.at(-1) if (elem === curModal?.elem || !showModalInner(resolved)) return if (curModal) defaultModalActions.hide(curModal) activeModalStack.push(resolved) @@ -55,7 +55,7 @@ export const showModal = (elem: (HTMLElement & Record) | { reactTyp * * @returns true if previous modal was restored */ -export const hideModal = (modal = activeModalStack.slice(-1)[0], data: any = undefined, options: { force?: boolean; restorePrevious?: boolean } = {}) => { +export const hideModal = (modal = activeModalStack.at(-1), data: any = undefined, options: { force?: boolean; restorePrevious?: boolean } = {}) => { const { force = false, restorePrevious = true } = options if (!modal) return let cancel = modal.elem?.hide?.(data) @@ -66,7 +66,7 @@ export const hideModal = (modal = activeModalStack.slice(-1)[0], data: any = und if (!cancel || cancel === customDisplayManageKeyword) { if (cancel !== customDisplayManageKeyword) defaultModalActions.hide(modal) activeModalStack.pop() - const newModal = activeModalStack.slice(-1)[0] + const newModal = activeModalStack.at(-1) if (newModal && restorePrevious) { // would be great to ignore cancel I guess? showModalInner(newModal) @@ -79,10 +79,10 @@ export const hideCurrentModal = (_data = undefined, restoredActions = undefined) if (hideModal(undefined, undefined)) { restoredActions?.() if (activeModalStack.length === 0) { - if (!isGameActive(false)) { - showModal(document.getElementById('title-screen')) - } else { + if (isGameActive(false)) { pointerLock.requestPointerLock() + } else { + showModal(document.getElementById('title-screen')) } } } @@ -149,8 +149,8 @@ window.inspectPlayer = () => require('fs').promises.readFile('/world/playerdata/ window.addEventListener('beforeunload', (event) => { // todo-low maybe exclude chat? if (!isGameActive(true) && activeModalStack.at(-1)?.elem.id !== 'chat') return - if (sessionStorage.lastReload && options.preventDevReloadWhilePlaying === false) return - if (options.closeConfirmation === false) return + if (sessionStorage.lastReload && !options.preventDevReloadWhilePlaying) return + if (!options.closeConfirmation) return // For major browsers doning only this is enough event.preventDefault() diff --git a/src/globals.d.ts b/src/globals.d.ts index 434333911..7b849b914 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -30,10 +30,10 @@ type StringKeys = Extract interface ObjectConstructor { - keys(obj: T): StringKeys[] - entries(obj: T): [StringKeys, T[keyof T]][] + keys(obj: T): Array> + entries(obj: T): Array<[StringKeys, T[keyof T]]> // todo review https://stackoverflow.com/questions/57390305/trying-to-get-fromentries-type-right - fromEntries(obj: T): Record + fromEntries>(obj: T): Record assign, K extends Record>(target: T, source: K): asserts target is T & K } diff --git a/src/index.ts b/src/index.ts index a440cced8..2b1e551df 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,4 @@ +/* eslint-disable import/order */ import './importsWorkaround' import './styles.css' import './globals' @@ -25,9 +26,9 @@ import './menus/advanced_options_screen' import { notification } from './menus/notification' import './menus/title_screen' -import './optionsStorage' +import { options, watchValue } from './optionsStorage' import './reactUi.jsx' -import './controls' +import { contro } from './controls' import './dragndrop' import './browserfs' import './eruda' @@ -75,25 +76,24 @@ import { import { startLocalServer, unsupportedLocalServerFeatures } from './createLocalServer' import serverOptions from './defaultLocalServerOptions' import updateTime from './updateTime' -import { options, watchValue } from './optionsStorage' + import { subscribeKey } from 'valtio/utils' import _ from 'lodash' -import { contro } from './controls' + import { genTexturePackTextures, watchTexturepackInViewer } from './texturePack' import { connectToPeer } from './localServerMultiplayer' import CustomChannelClient from './customClient' import debug from 'debug' window.debug = debug -//@ts-ignore window.THREE = THREE if ('serviceWorker' in navigator && !isCypress() && process.env.NODE_ENV !== 'development') { window.addEventListener('load', () => { navigator.serviceWorker.register('./service-worker.js').then(registration => { - console.log('SW registered: ', registration) + console.log('SW registered:', registration) }).catch(registrationError => { - console.log('SW registration failed: ', registrationError) + console.log('SW registration failed:', registrationError) }) }) } @@ -101,10 +101,8 @@ if ('serviceWorker' in navigator && !isCypress() && process.env.NODE_ENV !== 'de // ACTUAL CODE // todo stats-gl -let stats -let stats2 -stats = new Stats() -stats2 = new Stats() +const stats = new Stats() +const stats2 = new Stats() stats2.showPanel(2) document.body.appendChild(stats.dom) @@ -121,19 +119,6 @@ if (localStorage.hideStats || isCypress()) { stats2.dom.style.display = 'none' } -// const debugPitch = document.createElement('span') -// debugPitch.style.cssText = ` -// position: absolute; -// top: 0; -// right: 0; -// z-index: 100; -// color:white; -// ` -// document.body.appendChild(debugPitch) - -const maxPitch = 0.5 * Math.PI -const minPitch = -0.5 * Math.PI - // Create three.js context, add to page const renderer = new THREE.WebGLRenderer() renderer.setPixelRatio(window.devicePixelRatio || 1) // todo this value is too high on ios, need to check, probably we should use avg, also need to make it configurable @@ -163,7 +148,7 @@ const renderFrame = (time: DOMHighResTimeStamp) => { delta += time - lastTime lastTime = time if (delta > renderInterval) { - delta = delta % renderInterval + delta %= renderInterval // continue rendering } else { return @@ -207,7 +192,6 @@ function onCameraMove(e) { lastMouseMove = now let { mouseSensX, mouseSensY } = options if (mouseSensY === true) mouseSensY = mouseSensX - // debugPitch.innerText = +debugPitch.innerText + e.movementX mouseMovePostHandle({ x: e.movementX * mouseSensX * 0.0001, y: e.movementY * mouseSensY * 0.0001 @@ -234,7 +218,7 @@ async function main() { connect({ server: '', port: '', proxy: '', singleplayer: true, username: options.localUsername, password: '', serverOverrides }) } document.querySelector('#title-screen').addEventListener('singleplayer', (e) => { - //@ts-ignore + //@ts-expect-error connectSingleplayer(e.detail) }) const qs = new URLSearchParams(window.location.search) @@ -247,9 +231,7 @@ async function main() { } let listeners = [] -let disposables = [] let timeouts = [] -let intervals = [] // only for dom listeners (no removeAllListeners) // todo refactor them out of connect fn instead const registerListener: import('./utilsTs').RegisterListener = (target, event, callback) => { @@ -257,16 +239,14 @@ const registerListener: import('./utilsTs').RegisterListener = (target, event, c listeners.push({ target, event, callback }) } const removeAllListeners = () => { - listeners.forEach(({ target, event, callback }) => { + for (const { target, event, callback } of listeners) { target.removeEventListener(event, callback) - }) - listeners = [] - for (const disposable of disposables) { - disposable() } - disposables = [] + listeners = [] } +// todo +// eslint-disable-next-line complexity async function connect(connectOptions: { server: any; port?: string; singleplayer?: any; username: any; password: any; proxy: any; botVersion?: any; serverOverrides?; peerId?: string }) { @@ -278,15 +258,8 @@ async function connect(connectOptions: { const p2pMultiplayer = !!connectOptions.peerId miscUiState.singleplayer = singeplayer miscUiState.flyingSquid = singeplayer || p2pMultiplayer - const oldSetInterval = window.setInterval - // @ts-ignore - window.setInterval = (callback, ms) => { - const id = oldSetInterval.call(window, callback, ms) - timeouts.push(id) - return id - } const oldSetTimeout = window.setTimeout - //@ts-ignore + //@ts-expect-error window.setTimeout = (callback, ms) => { const id = oldSetTimeout.call(window, callback, ms) timeouts.push(id) @@ -295,24 +268,24 @@ async function connect(connectOptions: { const { renderDistance, maxMultiplayerRenderDistance } = options const hostprompt = connectOptions.server const proxyprompt = connectOptions.proxy - const username = connectOptions.username - const password = connectOptions.password + const { username } = connectOptions + const { password } = connectOptions - let host, port, proxy, proxyport - if (!hostprompt.includes(':')) { - host = hostprompt - port = 25565 - } else { + let host; let port; let proxy; let proxyport + if (hostprompt.includes(':')) { [host, port] = hostprompt.split(':') port = parseInt(port, 10) + } else { + host = hostprompt + port = 25_565 } - if (!proxyprompt.includes(':')) { - proxy = proxyprompt - proxyport = undefined - } else { + if (proxyprompt.includes(':')) { [proxy, proxyport] = proxyprompt.split(':') proxyport = parseInt(proxyport, 10) + } else { + proxy = proxyprompt + proxyport = undefined } console.log(`connecting to ${host} ${port} with ${username}`) @@ -338,10 +311,6 @@ async function connect(connectOptions: { clearTimeout(timeout) } timeouts = [] - for (const interval of intervals) { - clearInterval(interval) - } - intervals = [] } const handleError = (err) => { console.log('Encountered error!', err) @@ -389,7 +358,7 @@ async function connect(connectOptions: { // console.error(err) // throw new Error(`Proxy server ${proxy}:${proxyport} is not available`) // } - //@ts-ignore + //@ts-expect-error net.setProxy({ hostname: proxy, port: proxyport }) } @@ -444,7 +413,7 @@ async function connect(connectOptions: { bot = mineflayer.createBot({ host, port, - version: !connectOptions.botVersion ? false : connectOptions.botVersion, + version: connectOptions.botVersion || false, ...p2pMultiplayer ? { stream: await connectToPeer(connectOptions.peerId), } : {}, @@ -483,7 +452,7 @@ async function connect(connectOptions: { } else { bot._client.socket.on('connect', () => { console.log('TCP connection established') - //@ts-ignore + //@ts-expect-error bot._client.socket._ws.addEventListener('close', () => { console.log('TCP connection closed') setTimeout(() => { @@ -499,7 +468,7 @@ async function connect(connectOptions: { } if (!bot) return - let p2pConnectTimeout = p2pMultiplayer ? setTimeout(() => { throw new Error('Spawn timeout. There might be error on other side, check console.') }, 20_000) : undefined + const p2pConnectTimeout = p2pMultiplayer ? setTimeout(() => { throw new Error('Spawn timeout. There might be error on other side, check console.') }, 20_000) : undefined hud.preload(bot) // bot.on('inject_allowed', () => { @@ -539,7 +508,7 @@ async function connect(connectOptions: { console.log('bot spawned - starting viewer') - const version = bot.version + const { version } = bot const center = bot.entity.position @@ -611,6 +580,8 @@ async function connect(connectOptions: { setLoadingScreenStatus('Setting callbacks') + const maxPitch = 0.5 * Math.PI + const minPitch = -0.5 * Math.PI mouseMovePostHandle = ({ x, y }) => { bot.entity.pitch -= y bot.entity.pitch = Math.max(minPitch, Math.min(maxPitch, bot.entity.pitch)) @@ -743,7 +714,7 @@ async function connect(connectOptions: { hud.style.display = 'block' blockInteraction.init() - setTimeout(function () { + setTimeout(() => { errorAbortController.abort() if (loadingScreen.hasError) return // remove loading screen, wait a second to make sure a frame has properly rendered @@ -769,15 +740,13 @@ window.addEventListener('keydown', (e) => { pointerLock.justHitEscape = true } }) - } else { - if (pointerLock.hasPointerLock) { - document.exitPointerLock() - if (options.autoExitFullscreen) { - document.exitFullscreen() - } - } else { - document.dispatchEvent(new Event('pointerlockchange')) + } else if (pointerLock.hasPointerLock) { + document.exitPointerLock() + if (options.autoExitFullscreen) { + document.exitFullscreen() } + } else { + document.dispatchEvent(new Event('pointerlockchange')) } }) @@ -793,9 +762,9 @@ window.addEventListener('keydown', (e) => { addPanoramaCubeMap() showModal(document.getElementById('title-screen')) -main() +void main() downloadAndOpenFile().then((downloadAction) => { - if (downloadAction !== false) return + if (downloadAction) return window.addEventListener('hud-ready', (e) => { // try to connect to peer diff --git a/src/inventory.ts b/src/inventory.ts index 2efce7fca..e4dd2d859 100644 --- a/src/inventory.ts +++ b/src/inventory.ts @@ -1,16 +1,16 @@ import { subscribe } from 'valtio' -import { activeModalStack, hideCurrentModal, miscUiState } from './globalState' import { showInventory } from 'minecraft-inventory-gui/web/ext.mjs' import InventoryGui from 'minecraft-assets/minecraft-assets/data/1.17.1/gui/container/inventory.png' import Dirt from 'minecraft-assets/minecraft-assets/data/1.17.1/blocks/dirt.png' import { subscribeKey } from 'valtio/utils' import MinecraftData from 'minecraft-data' -import invspriteJson from './invsprite.json' import { getVersion } from 'prismarine-viewer/viewer/lib/version' +import invspriteJson from './invsprite.json' +import { activeModalStack, hideCurrentModal, miscUiState } from './globalState' const loadedImages = new Map() export type BlockStates = Record + }>> }> let blockStates: BlockStates @@ -37,7 +37,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => { // on game load version = getVersion(bot.version) - blockStates = await fetch(`blocksStates/${version}.json`).then(res => res.json()) + blockStates = await fetch(`blocksStates/${version}.json`).then(async res => res.json()) getImage({ path: 'blocks', } as any) getImage({ path: 'invsprite', } as any) mcData = MinecraftData(version) @@ -53,7 +53,7 @@ const findBlockStateTexturesAtlas = (name) => { const getBlockData = (name) => { const blocksImg = loadedImages.get('blocks') - if (!blocksImg || !blocksImg.width) return + if (!blocksImg?.width) return const data = findBlockStateTexturesAtlas(name) if (!data) return @@ -79,7 +79,7 @@ const getBlockData = (name) => { const getItemSlice = (name) => { const invspriteImg = loadedImages.get('invsprite') - if (!invspriteImg || !invspriteImg.width) return + if (!invspriteImg?.width) return const { x, y } = invspriteJson[name] ?? /* unknown item */ { x: 0, y: 0 } const sprite = [x, y, 32, 32] @@ -131,7 +131,7 @@ const upInventory = () => { } subscribe(activeModalStack, () => { - const inventoryOpened = activeModalStack.slice(-1)[0]?.reactType === 'inventory' + const inventoryOpened = activeModalStack.at(-1)?.reactType === 'inventory' if (inventoryOpened) { const inv = showInventory(undefined, getImage, {}, bot) inv.canvas.style.zIndex = 10 diff --git a/src/loadSave.ts b/src/loadSave.ts index 4edcafd44..22aff77d0 100644 --- a/src/loadSave.ts +++ b/src/loadSave.ts @@ -1,12 +1,12 @@ import fs from 'fs' +import { promisify } from 'util' import { supportedVersions } from 'flying-squid/src/lib/version' import * as nbt from 'prismarine-nbt' -import { promisify } from 'util' -import { options } from './optionsStorage' import { proxy } from 'valtio' +import { gzip } from 'node-gzip' +import { options } from './optionsStorage' import { nameToMcOfflineUUID } from './utils' import { forceCachedDataPaths } from './browserfs' -import { gzip } from 'node-gzip' const parseNbt = promisify(nbt.parse) @@ -20,11 +20,14 @@ export const fsState = proxy({ const PROPOSE_BACKUP = true +// eslint-disable-next-line complexity export const loadSave = async (root = '/world') => { const disablePrompts = options.disableLoadPrompts // todo do it in singleplayer as well + // eslint-disable-next-line guard-for-in for (const key in forceCachedDataPaths) { + // eslint-disable-next-line @typescript-eslint/no-dynamic-delete delete forceCachedDataPaths[key] } @@ -35,10 +38,10 @@ export const loadSave = async (root = '/world') => { levelDatContent = await fs.promises.readFile(`${root}/level.dat`) } catch (err) { if (err.code === 'ENOENT') { - if (!fsState.isReadonly) { - warnings.push('level.dat not found, world in current folder will be created') - } else { + if (fsState.isReadonly) { throw new Error('level.dat not found, ensure you are loading world folder') + } else { + warnings.push('level.dat not found, world in current folder will be created') } } else { throw err @@ -54,7 +57,7 @@ export const loadSave = async (root = '/world') => { const qs = new URLSearchParams(window.location.search) version = levelDat.Version?.Name ?? qs.get('mapVersion') if (!version) { - const newVersion = disablePrompts ? '1.8.8' : prompt(`In 1.8 and before world save doesn\'t contain version info, please enter version you want to use to load the world.\nSupported versions ${supportedVersions.join(', ')}`, '1.8.8') + const newVersion = disablePrompts ? '1.8.8' : prompt(`In 1.8 and before world save doesn't contain version info, please enter version you want to use to load the world.\nSupported versions ${supportedVersions.join(', ')}`, '1.8.8') if (!newVersion) return version = newVersion } @@ -131,9 +134,9 @@ export const loadSave = async (root = '/world') => { name: 'superflat' } } : {}, - ...root !== '/world' ? { + ...root === '/world' ? {} : { 'worldFolder': root - } : {} + } }, })) } diff --git a/src/localServerMultiplayer.ts b/src/localServerMultiplayer.ts index a63822846..71efd25bd 100644 --- a/src/localServerMultiplayer.ts +++ b/src/localServerMultiplayer.ts @@ -84,7 +84,7 @@ export const openToWanAndCopyJoinLink = async (writeText: (text) => void, doCopy console.error(error) writeText(error.message) }) - return await new Promise(resolve => { + return new Promise(resolve => { peer.on('open', async () => { await copyJoinLink() resolve('Copied join link to clipboard') @@ -120,7 +120,7 @@ export const connectToPeer = async (peerId: string) => { connection.once('error', (error) => { console.log(error.type, error.name) console.log(error) - return reject(error.message) + reject(error.message); }) connection.once('open', resolve) })) diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts index 51aeb35d5..64850314b 100644 --- a/src/optionsStorage.ts +++ b/src/optionsStorage.ts @@ -62,11 +62,11 @@ export const watchValue: WatchValue = (proxy, callback) => { return Reflect.get(target, p, receiver) }, })) - watchedProps.forEach(prop => { + for (const prop of watchedProps) { subscribeKey(proxy, prop, () => { callback(proxy) }) - }) + } } watchValue(options, o => { diff --git a/src/panorama.js b/src/panorama.js index 1c67df825..21d01359f 100644 --- a/src/panorama.js +++ b/src/panorama.js @@ -37,7 +37,7 @@ const possiblyLoadPanoramaFromResourcePack = async (file) => { else return join('extra-textures/background', file) } -const updateResourecePackSupportPanorama = async () => { +const updateResourcePackSupportPanorama = async () => { try { await fs.promises.readFile(fromTexturePackPath(join(panoramaResourcePackPath, panoramaFiles[0])), 'base64') panoramaUsesResourePack = true @@ -48,7 +48,7 @@ const updateResourecePackSupportPanorama = async () => { subscribeKey(resourcePackState, 'resourcePackInstalled', async () => { const oldState = panoramaUsesResourePack - const newState = resourcePackState.resourcePackInstalled && (await updateResourecePackSupportPanorama(), panoramaUsesResourePack) + const newState = resourcePackState.resourcePackInstalled && (await updateResourcePackSupportPanorama(), panoramaUsesResourePack) if (newState === oldState) return removePanorama() addPanoramaCubeMap() @@ -56,6 +56,7 @@ subscribeKey(resourcePackState, 'resourcePackInstalled', async () => { // Menu panorama background export async function addPanoramaCubeMap () { + if (panoramaCubeMap) return // remove all existing object in the viewer.scene // viewer.scene.children = [] @@ -68,7 +69,7 @@ export async function addPanoramaCubeMap () { const loader = new THREE.TextureLoader() let panorMaterials = [] - await updateResourecePackSupportPanorama() + await updateResourcePackSupportPanorama() for (const file of panoramaFiles) { panorMaterials.push(new THREE.MeshBasicMaterial({ map: loader.load(await possiblyLoadPanoramaFromResourcePack(file)), diff --git a/src/reactUi.jsx b/src/reactUi.jsx index efe49792e..136fcb8b4 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -3,12 +3,12 @@ import { renderToDom } from '@zardoy/react-util' import { LeftTouchArea, RightTouchArea, useUsingTouch, useInterfaceState } from '@dimaka/interface' import { css } from '@emotion/css' -import { activeModalStack, isGameActive, miscUiState } from './globalState' // import DeathScreen from './react/DeathScreen' import { useSnapshot } from 'valtio' -import { contro } from './controls' import { QRCodeSVG } from 'qrcode.react' import { createPortal } from 'react-dom' +import { contro } from './controls' +import { activeModalStack, isGameActive, miscUiState } from './globalState' import { options, watchValue } from './optionsStorage' // todo @@ -17,7 +17,7 @@ useInterfaceState.setState({ uiCustomization: { touchButtonSize: 40, }, - updateCoord: ([coord, state]) => { + updateCoord([coord, state]) { const coordToAction = [ ['z', -1, 'KeyW'], ['z', 1, 'KeyS'], @@ -27,14 +27,14 @@ useInterfaceState.setState({ ['y', -1, 'ShiftLeft'], // todo jump ] // todo refactor - const actionAndState = state !== 0 ? coordToAction.find(([axis, value]) => axis === coord && value === state) : coordToAction.filter(([axis]) => axis === coord) + const actionAndState = state === 0 ? coordToAction.filter(([axis]) => axis === coord) : coordToAction.find(([axis, value]) => axis === coord && value === state) if (!bot) return if (state === 0) { for (const action of actionAndState) { contro.pressedKeyOrButtonChanged({code: action[2],}, false) } } else { - //@ts-ignore + //@ts-expect-error contro.pressedKeyOrButtonChanged({code: actionAndState[2],}, true) } } diff --git a/src/texturePack.ts b/src/texturePack.ts index 0f54e2961..df58ceead 100644 --- a/src/texturePack.ts +++ b/src/texturePack.ts @@ -1,14 +1,14 @@ -import { setLoadingScreenStatus } from './utils' -import blocksFileNames from '../generated/blocks.json' -import JSZip from 'jszip' import { join, dirname } from 'path' import fs from 'fs' -import type { BlockStates } from './inventory' +import JSZip from 'jszip' import type { Viewer } from 'prismarine-viewer/viewer/lib/viewer' -import { removeFileRecursiveAsync } from './browserfs' import { subscribeKey } from 'valtio/utils' -import { showNotification } from './menus/notification' import { proxy, ref } from 'valtio' +import blocksFileNames from '../generated/blocks.json' +import { showNotification } from './menus/notification' +import type { BlockStates } from './inventory' +import { removeFileRecursiveAsync } from './browserfs' +import { setLoadingScreenStatus } from './utils' export const resourcePackState = proxy({ resourcePackInstalled: false, @@ -130,7 +130,7 @@ const applyTexturePackData = async (version: string, { blockSize }: TextureResol for (const v of x) { processObj(v) } - return + } else { const actual = Object.keys(x) const needed = ['u', 'v', 'su', 'sv'] @@ -161,7 +161,7 @@ const getSizeFromImage = async (filePath: string) => { const file = await fs.promises.readFile(filePath, 'base64') probeImg.src = `data:image/png;base64,${file}` await new Promise((resolve, reject) => { - probeImg.onload = resolve + probeImg.addEventListener('load', resolve) }) if (probeImg.width !== probeImg.height) throw new Error(`Probe texture ${filePath} is not square`) return probeImg.width @@ -174,14 +174,14 @@ export const genTexturePackTextures = async (version: string) => { const blocksBasePathAlt = '/userData/resourcePacks/default/assets/minecraft/textures/blocks' const blocksGenereatedPath = `/userData/resourcePacks/default/${version}.png` const genereatedPathData = `/userData/resourcePacks/default/${version}.json` - if (await existsAsync(blocksBasePath) === false) { - if (await existsAsync(blocksBasePathAlt) === false) { - return - } else { + if (!(await existsAsync(blocksBasePath))) { + if (await existsAsync(blocksBasePathAlt)) { blocksBasePath = blocksBasePathAlt + } else { + return } } - if (await existsAsync(blocksGenereatedPath) === true) { + if (await existsAsync(blocksGenereatedPath)) { applyTexturePackData(version, JSON.parse(await fs.promises.readFile(genereatedPathData, 'utf8')), await fs.promises.readFile(blocksGenereatedPath, 'utf8')) return } @@ -214,7 +214,7 @@ export const genTexturePackTextures = async (version: string) => { img.src = src await new Promise((resolve, reject) => { img.onerror = reject - img.onload = resolve + img.addEventListener('load', resolve) }) for (const [i, fileName] of textureFiles.entries()) { const x = (i % texSize) * tileSize @@ -226,10 +226,10 @@ export const genTexturePackTextures = async (version: string) => { const fileBase64 = await fs.promises.readFile(join(blocksBasePath, fileName), 'base64') const _imgCustom = new Image() await new Promise(resolve => { - _imgCustom.onload = () => { + _imgCustom.addEventListener('load', () => { imgCustom = _imgCustom resolve() - } + }) _imgCustom.onerror = () => { console.log('Skipping issued texture', fileName) resolve() diff --git a/src/updateTime.ts b/src/updateTime.ts index 3d871ff5f..6ba296ad9 100644 --- a/src/updateTime.ts +++ b/src/updateTime.ts @@ -2,15 +2,16 @@ export default (bot: import('mineflayer').Bot) => { bot.on('time', () => { // 0 morning const dayTotal = 24_000 - const evening = 12542 / dayTotal - const night = 17843 / dayTotal - const morningStart = 22300 / dayTotal - const morningEnd = 23961 / dayTotal + const evening = 12_542 / dayTotal + const night = 17_843 / dayTotal + const morningStart = 22_300 / dayTotal + const morningEnd = 23_961 / dayTotal const timeProgress = bot.time.time / dayTotal // todo check actual colors const dayColorRainy = { r: 111 / 255, g: 156 / 255, b: 236 / 255 } // todo yes, we should make animations (and rain) + // eslint-disable-next-line unicorn/numeric-separators-style const dayColor = bot.isRaining ? dayColorRainy : { r: 0.6784313725490196, g: 0.8470588235294118, b: 0.9019607843137255 } // lightblue // let newColor = dayColor let int = 1 diff --git a/src/utils.ts b/src/utils.ts index 03e6df790..40e05463c 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,7 +1,7 @@ -import { activeModalStack, hideModal, miscUiState, showModal } from './globalState' -import { notification } from './menus/notification' import * as crypto from 'crypto' import UUID from 'uuid-1345' +import { activeModalStack, hideModal, miscUiState, showModal } from './globalState' +import { notification } from './menus/notification' import { options } from './optionsStorage' import { saveWorld } from './builtinCommands' import { openWorldZip } from './browserfs' @@ -12,7 +12,7 @@ export const goFullscreen = async (doToggle = false) => { // todo display a message or repeat? await document.documentElement.requestFullscreen().catch(() => { }) // request full keyboard access - //@ts-ignore + //@ts-expect-error navigator.keyboard?.lock?.(['Escape', 'KeyW']) } else if (doToggle) { await document.exitFullscreen().catch(() => { }) @@ -43,7 +43,7 @@ export const pointerLock = { if (!(document.fullscreenElement && navigator['keyboard']) && this.justHitEscape) { displayBrowserProblem() } else { - //@ts-ignore + //@ts-expect-error const promise: any = document.documentElement.requestPointerLock({ unadjustedMovement: options.mouseRawInput }) @@ -68,7 +68,7 @@ window.getScreenRefreshRate = getScreenRefreshRate /** * Allows to obtain the estimated Hz of the primary monitor in the system. */ -export function getScreenRefreshRate(): Promise { +export async function getScreenRefreshRate(): Promise { let requestId = null let callbackTriggered = false let resolve @@ -79,8 +79,8 @@ export function getScreenRefreshRate(): Promise { DOMHighResTimeStampCollection.unshift(DOMHighResTimeStamp) if (DOMHighResTimeStampCollection.length > 10) { - let t0 = DOMHighResTimeStampCollection.pop() - let fps = Math.floor(1000 * 10 / (DOMHighResTimeStamp - t0)) + const t0 = DOMHighResTimeStampCollection.pop() + const fps = Math.floor(1000 * 10 / (DOMHighResTimeStamp - t0)) if (!callbackTriggered) { resolve(fps/* , DOMHighResTimeStampCollection */) @@ -177,9 +177,9 @@ export const loadScript = async function (scriptSrc: string) { scriptElement.src = scriptSrc scriptElement.async = true - scriptElement.onload = () => { + scriptElement.addEventListener('load', () => { resolve(scriptElement) - } + }) scriptElement.onerror = (error) => { reject(error) @@ -191,7 +191,7 @@ export const loadScript = async function (scriptSrc: string) { // doesn't support snapshots export const toMajorVersion = (version) => { - const [a, b] = (version + '').split('.') + const [a, b] = (String(version)).split('.') return `${a}.${b}` } @@ -239,7 +239,7 @@ export const openFilePicker = (specificCase?: 'resourcepack') => { picker.click() } -export const resolveTimeout = (promise, timeout = 10000) => { +export const resolveTimeout = async (promise, timeout = 10_000) => { return new Promise((resolve, reject) => { promise.then(resolve, reject) setTimeout(() => { diff --git a/src/utilsTs.ts b/src/utilsTs.ts index 75cd623a3..5c5f0999e 100644 --- a/src/utilsTs.ts +++ b/src/utilsTs.ts @@ -3,29 +3,25 @@ type Options = boolean | Readonly | undefined function registerListener( element: Readonly | null | undefined, eventType: KD, - // eslint-disable-next-line functional/prefer-immutable-types listener: (this: Document, evt: DocumentEventMap[KD]) => void, options?: Options, ): void function registerListener( element: Readonly | null | undefined, eventType: KH, - // eslint-disable-next-line functional/prefer-immutable-types listener: (this: HTMLElement, evt: HTMLElementEventMap[KH]) => void, options?: Options, ): void function registerListener( element: Readonly | null | undefined, eventType: KW, - // eslint-disable-next-line functional/prefer-immutable-types listener: (this: Window, evt: WindowEventMap[KW]) => void, options?: Options, ): void -//@ts-ignore +//@ts-expect-error function registerListener( element: Readonly | null | undefined, eventType: string, - // eslint-disable-next-line functional/prefer-immutable-types listener: (evt: Event) => void, options?: Options, ): void From f8ae3e17d721b778c777aa52bb1544204668dc74 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 26 Sep 2023 08:26:20 +0300 Subject: [PATCH 300/318] enforce style that was used in repo! indent back to 2 --- .eslintrc.json | 21 ++ cypress/integration/index.spec.ts | 94 ++++---- src/browserfs.ts | 16 +- src/builtinCommands.ts | 6 +- src/controls.ts | 68 +++--- src/dragndrop.ts | 8 +- src/inventory.ts | 6 +- src/loadSave.ts | 2 +- src/localServerMultiplayer.ts | 232 +++++++++--------- src/reactUi.jsx | 142 +++++------ src/texturePack.ts | 386 +++++++++++++++--------------- src/utils.ts | 12 +- 12 files changed, 507 insertions(+), 486 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index d4a10b20d..3e0781152 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,6 +1,27 @@ { "extends": "zardoy", "rules": { + "semi": [ + "error", + "never" + ], + "indent": [ + "error", + 2, + { + "SwitchCase": 2, + "ignoredNodes": [ + "TemplateLiteral" + ] + } + ], + "quotes": [ + "error", + "single", + { + "allowTemplateLiterals": true + } + ], // perf "import/no-deprecated": "off", // --- diff --git a/cypress/integration/index.spec.ts b/cypress/integration/index.spec.ts index 3c184b46d..d8744a4e9 100644 --- a/cypress/integration/index.spec.ts +++ b/cypress/integration/index.spec.ts @@ -2,78 +2,78 @@ import type { AppOptions } from '../../src/optionsStorage' const cleanVisit = () => { - window.localStorage.clear() - visit() + window.localStorage.clear() + visit() } const visit = (url = '/') => { - window.localStorage.cypress = 'true' - cy.visit(url) + window.localStorage.cypress = 'true' + cy.visit(url) } // todo use ssl const compareRenderedFlatWorld = () => { - // wait for render - // cy.wait(6000) - // cy.get('body').toMatchImageSnapshot({ - // name: 'superflat-world', - // }) + // wait for render + // cy.wait(6000) + // cy.get('body').toMatchImageSnapshot({ + // name: 'superflat-world', + // }) } const testWorldLoad = () => { - cy.document().then({ timeout: 20_000, }, doc => { - return new Cypress.Promise(resolve => { - doc.addEventListener('cypress-world-ready', resolve) - }) - }).then(() => { - compareRenderedFlatWorld() + cy.document().then({ timeout: 20_000, }, doc => { + return new Cypress.Promise(resolve => { + doc.addEventListener('cypress-world-ready', resolve) }) + }).then(() => { + compareRenderedFlatWorld() + }) } const setOptions = (options: Partial) => { - cy.window().then(win => { - Object.assign(win['options'], options) - }) + cy.window().then(win => { + Object.assign(win['options'], options) + }) } it('Loads & renders singleplayer', () => { - cleanVisit() - setOptions({ - localServerOptions: { - generation: { - name: 'superflat', - // eslint-disable-next-line unicorn/numeric-separators-style - options: { seed: 250869072 } - }, - }, - renderDistance: 2 - }) - cy.get('#title-screen').find('[data-test-id="singleplayer-button"]', { includeShadowDom: true, }).click() - testWorldLoad() + cleanVisit() + setOptions({ + localServerOptions: { + generation: { + name: 'superflat', + // eslint-disable-next-line unicorn/numeric-separators-style + options: { seed: 250869072 } + }, + }, + renderDistance: 2 + }) + cy.get('#title-screen').find('[data-test-id="singleplayer-button"]', { includeShadowDom: true, }).click() + testWorldLoad() }) it('Joins to server', () => { - // visit('/?version=1.16.1') - window.localStorage.version = '1.16.1' - visit() - // todo replace with data-test - cy.get('#title-screen').find('[data-test-id="connect-screen-button"]', { includeShadowDom: true, }).click() - cy.get('input#serverip', { includeShadowDom: true, }).clear().focus().type('localhost') - cy.get('[data-test-id="connect-to-server"]', { includeShadowDom: true, }).click() - testWorldLoad() + // visit('/?version=1.16.1') + window.localStorage.version = '1.16.1' + visit() + // todo replace with data-test + cy.get('#title-screen').find('[data-test-id="connect-screen-button"]', { includeShadowDom: true, }).click() + cy.get('input#serverip', { includeShadowDom: true, }).clear().focus().type('localhost') + cy.get('[data-test-id="connect-to-server"]', { includeShadowDom: true, }).click() + testWorldLoad() }) it('Loads & renders zip world', () => { - cleanVisit() - cy.get('#title-screen').find('[data-test-id="select-file-folder"]', { includeShadowDom: true, }).click({ shiftKey: true }) - cy.get('input[type="file"]').selectFile('cypress/superflat.zip', { force: true }) - testWorldLoad() + cleanVisit() + cy.get('#title-screen').find('[data-test-id="select-file-folder"]', { includeShadowDom: true, }).click({ shiftKey: true }) + cy.get('input[type="file"]').selectFile('cypress/superflat.zip', { force: true }) + testWorldLoad() }) it.skip('Performance test', () => { - // select that world - // from -2 85 24 - // await bot.loadPlugin(pathfinder.pathfinder) - // bot.pathfinder.goto(new pathfinder.goals.GoalXZ(28, -28)) + // select that world + // from -2 85 24 + // await bot.loadPlugin(pathfinder.pathfinder) + // bot.pathfinder.goto(new pathfinder.goals.GoalXZ(28, -28)) }) diff --git a/src/browserfs.ts b/src/browserfs.ts index bac4d5dc5..26316b58f 100644 --- a/src/browserfs.ts +++ b/src/browserfs.ts @@ -13,7 +13,7 @@ import { installTexturePack, updateTexturePackInstalledState } from './texturePa browserfs.install(window) // todo migrate to StorageManager API for localsave as localstorage has only 5mb limit, when localstorage is fallback test limit warning on 4mb const deafultMountablePoints = { - "/world": { fs: "LocalStorage" }, + '/world': { fs: 'LocalStorage' }, '/userData': { fs: 'IndexedDB' }, } browserfs.configure({ @@ -154,8 +154,8 @@ export const openWorldDirectory = async (dragndropHandle?: FileSystemDirectoryHa // todo fs: 'MountableFileSystem', options: { - "/world": { - fs: "FileSystemAccess", + '/world': { + fs: 'FileSystemAccess', options: { handle: directoryHandle } @@ -215,8 +215,8 @@ const openWorldZipInner = async (file: File | ArrayBuffer, name = file['name']) fs: 'MountableFileSystem', options: { ...deafultMountablePoints, - "/world": { - fs: "ZipFS", + '/world': { + fs: 'ZipFS', options: { zipData: Buffer.from(file instanceof File ? (await file.arrayBuffer()) : file), name @@ -276,12 +276,12 @@ export async function generateAndDownloadWorldZip() { zip.folder('world') // Generate the ZIP archive content - const zipContent = await zip.generateAsync({ type: "blob" }) + const zipContent = await zip.generateAsync({ type: 'blob' }) // Create a download link and trigger the download - const downloadLink = document.createElement("a") + const downloadLink = document.createElement('a') downloadLink.href = URL.createObjectURL(zipContent) - downloadLink.download = "prismarine-world.zip" + downloadLink.download = 'prismarine-world.zip' downloadLink.click() // Clean up the URL object after download diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts index 197ebb004..34abe8eea 100644 --- a/src/builtinCommands.ts +++ b/src/builtinCommands.ts @@ -37,12 +37,12 @@ const exportWorld = async () => { await addFolderToZip(worldFolder, zip, '') // Generate the ZIP archive content - const zipContent = await zip.generateAsync({ type: "blob" }) + const zipContent = await zip.generateAsync({ type: 'blob' }) // Create a download link and trigger the download - const downloadLink = document.createElement("a") + const downloadLink = document.createElement('a') downloadLink.href = URL.createObjectURL(zipContent) - downloadLink.download = "world-exported.zip" + downloadLink.download = 'world-exported.zip' downloadLink.click() // Clean up the URL object after download diff --git a/src/controls.ts b/src/controls.ts index 1f573eea3..3ca9a329b 100644 --- a/src/controls.ts +++ b/src/controls.ts @@ -139,22 +139,22 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => { // handle general commands // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check switch (command) { - case 'general.jump': - bot.setControlState('jump', pressed) - break - case 'general.sneak': - gameAdditionalState.isSneaking = pressed - bot.setControlState('sneak', pressed) - break - case 'general.sprint': + case 'general.jump': + bot.setControlState('jump', pressed) + break + case 'general.sneak': + gameAdditionalState.isSneaking = pressed + bot.setControlState('sneak', pressed) + break + case 'general.sprint': // todo add setting to change behavior - if (pressed) { - setSprinting(pressed) - } - break - case 'general.attackDestroy': - document.dispatchEvent(new MouseEvent(pressed ? 'mousedown' : 'mouseup', { button: 0 })) - break + if (pressed) { + setSprinting(pressed) + } + break + case 'general.attackDestroy': + document.dispatchEvent(new MouseEvent(pressed ? 'mousedown' : 'mouseup', { button: 0 })) + break } } } @@ -192,26 +192,26 @@ contro.on('trigger', ({ command }) => { if (stringStartsWith(command, 'general')) { // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check switch (command) { - case 'general.inventory': - document.exitPointerLock?.() - showModal({ reactType: 'inventory' }) - break - case 'general.drop': - if (bot.heldItem) bot.tossStack(bot.heldItem) - break - case 'general.chat': - document.getElementById('hud').shadowRoot.getElementById('chat').enableChat() - break - case 'general.command': - document.getElementById('hud').shadowRoot.getElementById('chat').enableChat('/') - break - case 'general.interactPlace': - document.dispatchEvent(new MouseEvent('mousedown', { button: 2 })) - setTimeout(() => { + case 'general.inventory': + document.exitPointerLock?.() + showModal({ reactType: 'inventory' }) + break + case 'general.drop': + if (bot.heldItem) bot.tossStack(bot.heldItem) + break + case 'general.chat': + document.getElementById('hud').shadowRoot.getElementById('chat').enableChat() + break + case 'general.command': + document.getElementById('hud').shadowRoot.getElementById('chat').enableChat('/') + break + case 'general.interactPlace': + document.dispatchEvent(new MouseEvent('mousedown', { button: 2 })) + setTimeout(() => { // todo cleanup - document.dispatchEvent(new MouseEvent('mouseup', { button: 2 })) - }) - break + document.dispatchEvent(new MouseEvent('mouseup', { button: 2 })) + }) + break } } }) diff --git a/src/dragndrop.ts b/src/dragndrop.ts index 5a1145531..46a20788c 100644 --- a/src/dragndrop.ts +++ b/src/dragndrop.ts @@ -5,19 +5,19 @@ import { openWorldDirectory, openWorldZip } from './browserfs' import { isGameActive } from './globalState' const parseNbt = promisify(nbt.parse) -window.nbt = nbt; +window.nbt = nbt // todo display drop zone -for (const event of ["drag", "dragstart", "dragend", "dragover", "dragenter", "dragleave", "drop"]) { +for (const event of ['drag', 'dragstart', 'dragend', 'dragover', 'dragenter', 'dragleave', 'drop']) { window.addEventListener(event, (e: any) => { - if (e.dataTransfer && !e.dataTransfer.types.includes("Files")) { + if (e.dataTransfer && !e.dataTransfer.types.includes('Files')) { // e.dataTransfer.effectAllowed = "none" return } e.preventDefault() }) } -window.addEventListener("drop", async e => { +window.addEventListener('drop', async e => { if (!e.dataTransfer?.files.length) return const { items } = e.dataTransfer const item = items[0] diff --git a/src/inventory.ts b/src/inventory.ts index e4dd2d859..c5212215c 100644 --- a/src/inventory.ts +++ b/src/inventory.ts @@ -88,9 +88,9 @@ const getItemSlice = (name) => { const getImageSrc = (path) => { switch (path) { - case 'gui/container/inventory': return InventoryGui - case 'blocks': return globalThis.texturePackDataUrl || `textures/${version}.png` - case 'invsprite': return `invsprite.png` + case 'gui/container/inventory': return InventoryGui + case 'blocks': return globalThis.texturePackDataUrl || `textures/${version}.png` + case 'invsprite': return `invsprite.png` } return Dirt } diff --git a/src/loadSave.ts b/src/loadSave.ts index 22aff77d0..9167197ab 100644 --- a/src/loadSave.ts +++ b/src/loadSave.ts @@ -121,7 +121,7 @@ export const loadSave = async (root = '/world') => { if (!fsState.isReadonly) { // todo allow also to ctrl+s - alert("Note: the world is saved only on /save or disconnect! ENSURE YOU HAVE BACKUP!") + alert('Note: the world is saved only on /save or disconnect! ENSURE YOU HAVE BACKUP!') } fsState.saveLoaded = true diff --git a/src/localServerMultiplayer.ts b/src/localServerMultiplayer.ts index 71efd25bd..3096e9321 100644 --- a/src/localServerMultiplayer.ts +++ b/src/localServerMultiplayer.ts @@ -5,146 +5,146 @@ import { resolveTimeout, setLoadingScreenStatus } from './utils' import { miscUiState } from './globalState' class CustomDuplex extends Duplex { - constructor(options, public writeAction) { - super(options) - } + constructor(options, public writeAction) { + super(options) + } - _read() { } + _read() { } - _write(chunk, encoding, callback) { - this.writeAction(chunk) - callback() - } + _write(chunk, encoding, callback) { + this.writeAction(chunk) + callback() + } } let peerInstance: Peer | undefined export const getJoinLink = () => { - if (!peerInstance) return - const url = new URL(window.location.href) - url.searchParams.set('connectPeer', peerInstance.id) - url.searchParams.set('peerVersion', localServer.options.version) - return url.toString() + if (!peerInstance) return + const url = new URL(window.location.href) + url.searchParams.set('connectPeer', peerInstance.id) + url.searchParams.set('peerVersion', localServer.options.version) + return url.toString() } const copyJoinLink = async () => { - miscUiState.wanOpened = true - const joinLink = getJoinLink() - if (navigator.clipboard) { - await navigator.clipboard.writeText(joinLink) - } else { - window.prompt('Copy to clipboard: Ctrl+C, Enter', joinLink) - } + miscUiState.wanOpened = true + const joinLink = getJoinLink() + if (navigator.clipboard) { + await navigator.clipboard.writeText(joinLink) + } else { + window.prompt('Copy to clipboard: Ctrl+C, Enter', joinLink) + } } export const openToWanAndCopyJoinLink = async (writeText: (text) => void, doCopy = true) => { - if (!localServer) return - if (peerInstance) { - if (doCopy) await copyJoinLink() - return 'Already opened to wan. Join link copied' - } - const peer = new Peer({ - debug: 3, - }) - peerInstance = peer - peer.on('connection', (connection) => { - console.log('connection') - const serverDuplex = new CustomDuplex({}, (data) => connection.send(data)) - const client = new Client(true, localServer.options.version, undefined) - client.setSocket(serverDuplex) - localServer._server.emit('connection', client) - - connection.on('data', (data: any) => { - serverDuplex.push(Buffer.from(data)) - }) - // our side disconnect - const endConnection = () => { - console.log('connection.close') - serverDuplex.end() - connection.close() - } - serverDuplex.on('end', endConnection) - serverDuplex.on('force-close', endConnection) - client.on('end', endConnection) + if (!localServer) return + if (peerInstance) { + if (doCopy) await copyJoinLink() + return 'Already opened to wan. Join link copied' + } + const peer = new Peer({ + debug: 3, + }) + peerInstance = peer + peer.on('connection', (connection) => { + console.log('connection') + const serverDuplex = new CustomDuplex({}, (data) => connection.send(data)) + const client = new Client(true, localServer.options.version, undefined) + client.setSocket(serverDuplex) + localServer._server.emit('connection', client) - const disconnected = () => { - serverDuplex.end() - client.end() - } - connection.on('iceStateChanged', (state) => { - console.log('iceStateChanged', state) - if (state === 'disconnected') { - disconnected() - } - }) - connection.on('close', disconnected) - connection.on('error', disconnected) + connection.on('data', (data: any) => { + serverDuplex.push(Buffer.from(data)) }) - peer.on('error', (error) => { - console.error(error) - writeText(error.message) + // our side disconnect + const endConnection = () => { + console.log('connection.close') + serverDuplex.end() + connection.close() + } + serverDuplex.on('end', endConnection) + serverDuplex.on('force-close', endConnection) + client.on('end', endConnection) + + const disconnected = () => { + serverDuplex.end() + client.end() + } + connection.on('iceStateChanged', (state) => { + console.log('iceStateChanged', state) + if (state === 'disconnected') { + disconnected() + } }) - return new Promise(resolve => { - peer.on('open', async () => { - await copyJoinLink() - resolve('Copied join link to clipboard') - }) - setTimeout(() => { - resolve('Failed to open to wan (timeout)') - }, 5000) + connection.on('close', disconnected) + connection.on('error', disconnected) + }) + peer.on('error', (error) => { + console.error(error) + writeText(error.message) + }) + return new Promise(resolve => { + peer.on('open', async () => { + await copyJoinLink() + resolve('Copied join link to clipboard') }) + setTimeout(() => { + resolve('Failed to open to wan (timeout)') + }, 5000) + }) } export const closeWan = () => { - if (!peerInstance) return - peerInstance.destroy() - peerInstance = undefined - miscUiState.wanOpened = false - return 'Closed to wan' + if (!peerInstance) return + peerInstance.destroy() + peerInstance = undefined + miscUiState.wanOpened = false + return 'Closed to wan' } export const connectToPeer = async (peerId: string) => { - setLoadingScreenStatus('Connecting to peer server') - // todo destroy connection on error - const peer = new Peer({ - debug: 3, + setLoadingScreenStatus('Connecting to peer server') + // todo destroy connection on error + const peer = new Peer({ + debug: 3, + }) + await resolveTimeout(new Promise(resolve => { + peer.once('open', resolve) + })) + setLoadingScreenStatus('Connecting to the peer') + const connection = peer.connect(peerId, { + serialization: 'raw', + }) + await resolveTimeout(new Promise((resolve, reject) => { + connection.once('error', (error) => { + console.log(error.type, error.name) + console.log(error) + reject(error.message) }) - await resolveTimeout(new Promise(resolve => { - peer.once('open', resolve) - })) - setLoadingScreenStatus('Connecting to the peer') - const connection = peer.connect(peerId, { - serialization: 'raw', - }) - await resolveTimeout(new Promise((resolve, reject) => { - connection.once('error', (error) => { - console.log(error.type, error.name) - console.log(error) - reject(error.message); - }) - connection.once('open', resolve) - })) + connection.once('open', resolve) + })) - const clientDuplex = new CustomDuplex({}, (data) => { - // todo rm debug - console.debug('sending', data.toString()) - connection.send(data) - }) - connection.on('data', (data: any) => { - console.debug('received', Buffer.from(data).toString()) - clientDuplex.push(Buffer.from(data)) - }) - connection.on('close', () => { - console.log('connection closed') - clientDuplex.end() - // bot._client.end() - // bot.end() - bot.emit('end', 'Disconnected.') - }) - connection.on('error', (error) => { - console.error(error) - clientDuplex.end() - }) + const clientDuplex = new CustomDuplex({}, (data) => { + // todo rm debug + console.debug('sending', data.toString()) + connection.send(data) + }) + connection.on('data', (data: any) => { + console.debug('received', Buffer.from(data).toString()) + clientDuplex.push(Buffer.from(data)) + }) + connection.on('close', () => { + console.log('connection closed') + clientDuplex.end() + // bot._client.end() + // bot.end() + bot.emit('end', 'Disconnected.') + }) + connection.on('error', (error) => { + console.error(error) + clientDuplex.end() + }) - return clientDuplex + return clientDuplex } diff --git a/src/reactUi.jsx b/src/reactUi.jsx index 136fcb8b4..64713aa67 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -13,49 +13,49 @@ import { options, watchValue } from './optionsStorage' // todo useInterfaceState.setState({ - isFlying: false, - uiCustomization: { - touchButtonSize: 40, - }, - updateCoord([coord, state]) { - const coordToAction = [ - ['z', -1, 'KeyW'], - ['z', 1, 'KeyS'], - ['x', -1, 'KeyA'], - ['x', 1, 'KeyD'], - ['y', 1, 'Space'], // todo jump - ['y', -1, 'ShiftLeft'], // todo jump - ] - // todo refactor - const actionAndState = state === 0 ? coordToAction.filter(([axis]) => axis === coord) : coordToAction.find(([axis, value]) => axis === coord && value === state) - if (!bot) return - if (state === 0) { - for (const action of actionAndState) { - contro.pressedKeyOrButtonChanged({code: action[2],}, false) - } - } else { - //@ts-expect-error - contro.pressedKeyOrButtonChanged({code: actionAndState[2],}, true) - } + isFlying: false, + uiCustomization: { + touchButtonSize: 40, + }, + updateCoord([coord, state]) { + const coordToAction = [ + ['z', -1, 'KeyW'], + ['z', 1, 'KeyS'], + ['x', -1, 'KeyA'], + ['x', 1, 'KeyD'], + ['y', 1, 'Space'], // todo jump + ['y', -1, 'ShiftLeft'], // todo jump + ] + // todo refactor + const actionAndState = state === 0 ? coordToAction.filter(([axis]) => axis === coord) : coordToAction.find(([axis, value]) => axis === coord && value === state) + if (!bot) return + if (state === 0) { + for (const action of actionAndState) { + contro.pressedKeyOrButtonChanged({code: action[2],}, false) + } + } else { + //@ts-expect-error + contro.pressedKeyOrButtonChanged({code: actionAndState[2],}, true) } + } }) watchValue(options, (o) => { - useInterfaceState.setState({ - uiCustomization: { - touchButtonSize: o.touchButtonsSize, - }, - }) + useInterfaceState.setState({ + uiCustomization: { + touchButtonSize: o.touchButtonsSize, + }, + }) }) const TouchControls = () => { - // todo setting - const usingTouch = useUsingTouch() + // todo setting + const usingTouch = useUsingTouch() - if (!usingTouch) return null - return ( -
    { pointer-events: auto; } `} - > - -
    - -
    - ) + > + +
    + +
    + ) } function useIsBotAvailable() { - const stack = useSnapshot(activeModalStack) + const stack = useSnapshot(activeModalStack) - return isGameActive(false) + return isGameActive(false) } const DisplayQr = () => { - const { currentDisplayQr } = useSnapshot(miscUiState) + const { currentDisplayQr } = useSnapshot(miscUiState) - if (!currentDisplayQr) return null + if (!currentDisplayQr) return null - return createPortal(
    { - miscUiState.currentDisplayQr = null - }} - > - -
    , document.body) + return createPortal(
    { + miscUiState.currentDisplayQr = null + }} + > + +
    , document.body) } const App = () => { - const isBotAvailable = useIsBotAvailable() - if (!isBotAvailable) return null + const isBotAvailable = useIsBotAvailable() + if (!isBotAvailable) return null - return
    - - -
    + return
    + + +
    } renderToDom(, { - strictMode: false, - selector: '#react-root', + strictMode: false, + selector: '#react-root', }) diff --git a/src/texturePack.ts b/src/texturePack.ts index df58ceead..83a783186 100644 --- a/src/texturePack.ts +++ b/src/texturePack.ts @@ -11,262 +11,262 @@ import { removeFileRecursiveAsync } from './browserfs' import { setLoadingScreenStatus } from './utils' export const resourcePackState = proxy({ - resourcePackInstalled: false, - currentTexturesDataUrl: undefined as string | undefined, - currentTexturesBlockStates: undefined as BlockStates | undefined, + resourcePackInstalled: false, + currentTexturesDataUrl: undefined as string | undefined, + currentTexturesBlockStates: undefined as BlockStates | undefined, }) function nextPowerOfTwo(n) { - if (n === 0) return 1 - n-- - n |= n >> 1 - n |= n >> 2 - n |= n >> 4 - n |= n >> 8 - n |= n >> 16 - return n + 1 + if (n === 0) return 1 + n-- + n |= n >> 1 + n |= n >> 2 + n |= n >> 4 + n |= n >> 8 + n |= n >> 16 + return n + 1 } const mkdirRecursive = async (path) => { - const parts = path.split('/') - let current = '' - for (const part of parts) { - current += part + '/' - try { - await fs.promises.mkdir(current) - } catch (err) { - } + const parts = path.split('/') + let current = '' + for (const part of parts) { + current += part + '/' + try { + await fs.promises.mkdir(current) + } catch (err) { } + } } const texturePackBasePath = '/userData/resourcePacks/default' export const uninstallTexturePack = async () => { - await removeFileRecursiveAsync(texturePackBasePath) - setCustomTexturePackData(undefined, undefined) + await removeFileRecursiveAsync(texturePackBasePath) + setCustomTexturePackData(undefined, undefined) } export const getResourcePackName = async () => { - // temp - try { - return await fs.promises.readFile(join(texturePackBasePath, 'name.txt'), 'utf8') - } catch (err) { - return '???' - } + // temp + try { + return await fs.promises.readFile(join(texturePackBasePath, 'name.txt'), 'utf8') + } catch (err) { + return '???' + } } export const fromTexturePackPath = (path) => { - return join(texturePackBasePath, path) + return join(texturePackBasePath, path) } export const updateTexturePackInstalledState = async () => { - try { - resourcePackState.resourcePackInstalled = await existsAsync(texturePackBasePath) - } catch { - } + try { + resourcePackState.resourcePackInstalled = await existsAsync(texturePackBasePath) + } catch { + } } export const installTexturePack = async (file: File | ArrayBuffer) => { - try { - await uninstallTexturePack() - } catch (err) { - } - const status = 'Installing resource pack: copying all files' - setLoadingScreenStatus(status) - // extract the zip and write to fs every file in it - const zip = new JSZip() - const zipFile = await zip.loadAsync(file) - if (!zipFile.file('pack.mcmeta')) throw new Error('Not a resource pack: missing pack.mcmeta') - await mkdirRecursive(texturePackBasePath) + try { + await uninstallTexturePack() + } catch (err) { + } + const status = 'Installing resource pack: copying all files' + setLoadingScreenStatus(status) + // extract the zip and write to fs every file in it + const zip = new JSZip() + const zipFile = await zip.loadAsync(file) + if (!zipFile.file('pack.mcmeta')) throw new Error('Not a resource pack: missing pack.mcmeta') + await mkdirRecursive(texturePackBasePath) - const allFilesArr = Object.entries(zipFile.files) - let done = 0 - const upStatus = () => { - setLoadingScreenStatus(`${status} ${Math.round(++done / allFilesArr.length * 100)}%`) - } - await Promise.all(allFilesArr.map(async ([path, file]) => { - const writePath = join(texturePackBasePath, path) - if (path.endsWith('/')) return - await mkdirRecursive(dirname(writePath)) - await fs.promises.writeFile(writePath, Buffer.from(await file.async('arraybuffer'))) - done++ - upStatus() - })) - await fs.promises.writeFile(join(texturePackBasePath, 'name.txt'), file['name'] ?? '??', 'utf8') + const allFilesArr = Object.entries(zipFile.files) + let done = 0 + const upStatus = () => { + setLoadingScreenStatus(`${status} ${Math.round(++done / allFilesArr.length * 100)}%`) + } + await Promise.all(allFilesArr.map(async ([path, file]) => { + const writePath = join(texturePackBasePath, path) + if (path.endsWith('/')) return + await mkdirRecursive(dirname(writePath)) + await fs.promises.writeFile(writePath, Buffer.from(await file.async('arraybuffer'))) + done++ + upStatus() + })) + await fs.promises.writeFile(join(texturePackBasePath, 'name.txt'), file['name'] ?? '??', 'utf8') - if (viewer?.world.active) { - await genTexturePackTextures(viewer.version) - } - setLoadingScreenStatus(undefined) - showNotification({ - message: 'Texturepack installed!', - }) + if (viewer?.world.active) { + await genTexturePackTextures(viewer.version) + } + setLoadingScreenStatus(undefined) + showNotification({ + message: 'Texturepack installed!', + }) } const existsAsync = async (path) => { - try { - await fs.promises.stat(path) - return true - } catch (err) { - return false - } + try { + await fs.promises.stat(path) + return true + } catch (err) { + return false + } } type TextureResolvedData = { - blockSize: number - // itemsUrlContent: string + blockSize: number + // itemsUrlContent: string } const arrEqual = (a: any[], b: any[]) => a.length === b.length && a.every((x) => b.includes(x)) const applyTexturePackData = async (version: string, { blockSize }: TextureResolvedData, blocksUrlContent: string) => { - const result = await fetch(`blocksStates/${version}.json`) - const blockStates: BlockStates = await result.json() - const factor = blockSize / 16 + const result = await fetch(`blocksStates/${version}.json`) + const blockStates: BlockStates = await result.json() + const factor = blockSize / 16 - // this will be refactored with generateTextures refactor - const processObj = (x) => { - if (typeof x !== 'object' || !x) return - if (Array.isArray(x)) { - for (const v of x) { - processObj(v) - } + // this will be refactored with generateTextures refactor + const processObj = (x) => { + if (typeof x !== 'object' || !x) return + if (Array.isArray(x)) { + for (const v of x) { + processObj(v) + } - } else { - const actual = Object.keys(x) - const needed = ['u', 'v', 'su', 'sv'] + } else { + const actual = Object.keys(x) + const needed = ['u', 'v', 'su', 'sv'] - if (!arrEqual(actual, needed)) { - for (const v of Object.values(x)) { - processObj(v) - } - return - } - for (const k of needed) { - x[k] *= factor - } + if (!arrEqual(actual, needed)) { + for (const v of Object.values(x)) { + processObj(v) } + return + } + for (const k of needed) { + x[k] *= factor + } } - processObj(blockStates) - setCustomTexturePackData(blocksUrlContent, blockStates) + } + processObj(blockStates) + setCustomTexturePackData(blocksUrlContent, blockStates) } const setCustomTexturePackData = (blockTextures, blockStates) => { - resourcePackState.currentTexturesBlockStates = blockStates && ref(blockStates) - resourcePackState.currentTexturesDataUrl = blockTextures - resourcePackState.resourcePackInstalled = blockTextures !== undefined + resourcePackState.currentTexturesBlockStates = blockStates && ref(blockStates) + resourcePackState.currentTexturesDataUrl = blockTextures + resourcePackState.resourcePackInstalled = blockTextures !== undefined } const getSizeFromImage = async (filePath: string) => { - const probeImg = new Image() - const file = await fs.promises.readFile(filePath, 'base64') - probeImg.src = `data:image/png;base64,${file}` - await new Promise((resolve, reject) => { - probeImg.addEventListener('load', resolve) - }) - if (probeImg.width !== probeImg.height) throw new Error(`Probe texture ${filePath} is not square`) - return probeImg.width + const probeImg = new Image() + const file = await fs.promises.readFile(filePath, 'base64') + probeImg.src = `data:image/png;base64,${file}` + await new Promise((resolve, reject) => { + probeImg.addEventListener('load', resolve) + }) + if (probeImg.width !== probeImg.height) throw new Error(`Probe texture ${filePath} is not square`) + return probeImg.width } export const genTexturePackTextures = async (version: string) => { - setCustomTexturePackData(undefined, undefined) - let blocksBasePath = '/userData/resourcePacks/default/assets/minecraft/textures/block' - // todo not clear why this is needed - const blocksBasePathAlt = '/userData/resourcePacks/default/assets/minecraft/textures/blocks' - const blocksGenereatedPath = `/userData/resourcePacks/default/${version}.png` - const genereatedPathData = `/userData/resourcePacks/default/${version}.json` - if (!(await existsAsync(blocksBasePath))) { - if (await existsAsync(blocksBasePathAlt)) { - blocksBasePath = blocksBasePathAlt - } else { - return - } - } - if (await existsAsync(blocksGenereatedPath)) { - applyTexturePackData(version, JSON.parse(await fs.promises.readFile(genereatedPathData, 'utf8')), await fs.promises.readFile(blocksGenereatedPath, 'utf8')) - return + setCustomTexturePackData(undefined, undefined) + let blocksBasePath = '/userData/resourcePacks/default/assets/minecraft/textures/block' + // todo not clear why this is needed + const blocksBasePathAlt = '/userData/resourcePacks/default/assets/minecraft/textures/blocks' + const blocksGenereatedPath = `/userData/resourcePacks/default/${version}.png` + const genereatedPathData = `/userData/resourcePacks/default/${version}.json` + if (!(await existsAsync(blocksBasePath))) { + if (await existsAsync(blocksBasePathAlt)) { + blocksBasePath = blocksBasePathAlt + } else { + return } + } + if (await existsAsync(blocksGenereatedPath)) { + applyTexturePackData(version, JSON.parse(await fs.promises.readFile(genereatedPathData, 'utf8')), await fs.promises.readFile(blocksGenereatedPath, 'utf8')) + return + } - setLoadingScreenStatus('Generating custom textures') + setLoadingScreenStatus('Generating custom textures') - const textureFiles = blocksFileNames.indexes[version].map(k => blocksFileNames.blockNames[k]) - textureFiles.unshift('missing_texture.png') + const textureFiles = blocksFileNames.indexes[version].map(k => blocksFileNames.blockNames[k]) + textureFiles.unshift('missing_texture.png') - const texSize = nextPowerOfTwo(Math.ceil(Math.sqrt(textureFiles.length))) - const originalTileSize = 16 + const texSize = nextPowerOfTwo(Math.ceil(Math.sqrt(textureFiles.length))) + const originalTileSize = 16 - const firstBlockFile = (await fs.promises.readdir(blocksBasePath)).find(f => f.endsWith('.png')) - if (!firstBlockFile) { - return - } + const firstBlockFile = (await fs.promises.readdir(blocksBasePath)).find(f => f.endsWith('.png')) + if (!firstBlockFile) { + return + } - // we get the size of image from the first block file, which is not ideal but works in 99% cases - const tileSize = await getSizeFromImage(join(blocksBasePath, firstBlockFile)) + // we get the size of image from the first block file, which is not ideal but works in 99% cases + const tileSize = await getSizeFromImage(join(blocksBasePath, firstBlockFile)) - const imgSize = texSize * tileSize - - const canvas = document.createElement('canvas') - canvas.width = imgSize - canvas.height = imgSize - const src = `textures/${version}.png` - const ctx = canvas.getContext('2d') - ctx.imageSmoothingEnabled = false - const img = new Image() - img.src = src - await new Promise((resolve, reject) => { - img.onerror = reject - img.addEventListener('load', resolve) - }) - for (const [i, fileName] of textureFiles.entries()) { - const x = (i % texSize) * tileSize - const y = Math.floor(i / texSize) * tileSize - const xOrig = (i % texSize) * originalTileSize - const yOrig = Math.floor(i / texSize) * originalTileSize - let imgCustom: HTMLImageElement - try { - const fileBase64 = await fs.promises.readFile(join(blocksBasePath, fileName), 'base64') - const _imgCustom = new Image() - await new Promise(resolve => { - _imgCustom.addEventListener('load', () => { - imgCustom = _imgCustom - resolve() - }) - _imgCustom.onerror = () => { - console.log('Skipping issued texture', fileName) - resolve() - } - _imgCustom.src = `data:image/png;base64,${fileBase64}` - }) - } catch { - console.log('Skipping not found texture', fileName) - } + const imgSize = texSize * tileSize - if (imgCustom) { - ctx.drawImage(imgCustom, x, y, tileSize, tileSize) - } else { - // todo this involves incorrect mappings for existing textures when the size is different - ctx.drawImage(img, xOrig, yOrig, originalTileSize, originalTileSize, x, y, tileSize, tileSize) + const canvas = document.createElement('canvas') + canvas.width = imgSize + canvas.height = imgSize + const src = `textures/${version}.png` + const ctx = canvas.getContext('2d') + ctx.imageSmoothingEnabled = false + const img = new Image() + img.src = src + await new Promise((resolve, reject) => { + img.onerror = reject + img.addEventListener('load', resolve) + }) + for (const [i, fileName] of textureFiles.entries()) { + const x = (i % texSize) * tileSize + const y = Math.floor(i / texSize) * tileSize + const xOrig = (i % texSize) * originalTileSize + const yOrig = Math.floor(i / texSize) * originalTileSize + let imgCustom: HTMLImageElement + try { + const fileBase64 = await fs.promises.readFile(join(blocksBasePath, fileName), 'base64') + const _imgCustom = new Image() + await new Promise(resolve => { + _imgCustom.addEventListener('load', () => { + imgCustom = _imgCustom + resolve() + }) + _imgCustom.onerror = () => { + console.log('Skipping issued texture', fileName) + resolve() } + _imgCustom.src = `data:image/png;base64,${fileBase64}` + }) + } catch { + console.log('Skipping not found texture', fileName) } - const blockDataUrl = canvas.toDataURL('image/png') - const newData: TextureResolvedData = { - blockSize: tileSize, + + if (imgCustom) { + ctx.drawImage(imgCustom, x, y, tileSize, tileSize) + } else { + // todo this involves incorrect mappings for existing textures when the size is different + ctx.drawImage(img, xOrig, yOrig, originalTileSize, originalTileSize, x, y, tileSize, tileSize) } - await fs.promises.writeFile(genereatedPathData, JSON.stringify(newData), 'utf8') - await fs.promises.writeFile(blocksGenereatedPath, blockDataUrl, 'utf8') - await applyTexturePackData(version, newData, blockDataUrl) + } + const blockDataUrl = canvas.toDataURL('image/png') + const newData: TextureResolvedData = { + blockSize: tileSize, + } + await fs.promises.writeFile(genereatedPathData, JSON.stringify(newData), 'utf8') + await fs.promises.writeFile(blocksGenereatedPath, blockDataUrl, 'utf8') + await applyTexturePackData(version, newData, blockDataUrl) - // const a = document.createElement('a') - // a.href = dataUrl - // a.download = 'pack.png' - // a.click() + // const a = document.createElement('a') + // a.href = dataUrl + // a.download = 'pack.png' + // a.click() } export const watchTexturepackInViewer = (viewer: Viewer) => { - subscribeKey(resourcePackState, 'currentTexturesDataUrl', () => { - console.log('applying resourcepack world data') - viewer.world.texturesDataUrl = resourcePackState.currentTexturesDataUrl - viewer.world.blockStatesData = resourcePackState.currentTexturesBlockStates - if (!viewer?.world.active) return - viewer.world.updateTexturesData() - }) + subscribeKey(resourcePackState, 'currentTexturesDataUrl', () => { + console.log('applying resourcepack world data') + viewer.world.texturesDataUrl = resourcePackState.currentTexturesDataUrl + viewer.world.blockStatesData = resourcePackState.currentTexturesBlockStates + if (!viewer?.world.active) return + viewer.world.updateTexturesData() + }) } diff --git a/src/utils.ts b/src/utils.ts index 40e05463c..706f2f638 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -48,7 +48,7 @@ export const pointerLock = { unadjustedMovement: options.mouseRawInput }) promise?.catch((error) => { - if (error.name === "NotSupportedError") { + if (error.name === 'NotSupportedError') { // Some platforms may not support unadjusted movement, request again a regular pointer lock. document.documentElement.requestPointerLock() } else if (error.name === 'SecurityError') { @@ -106,11 +106,11 @@ export async function getScreenRefreshRate(): Promise { export const getGamemodeNumber = (bot) => { switch (bot.game.gameMode) { - case 'survival': return 0 - case 'creative': return 1 - case 'adventure': return 2 - case 'spectator': return 3 - default: return -1 + case 'survival': return 0 + case 'creative': return 1 + case 'adventure': return 2 + case 'spectator': return 3 + default: return -1 } } From a99a8ff5d0cba2bee7e5dfd4b84e96566a44f508 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 26 Sep 2023 08:43:54 +0300 Subject: [PATCH 301/318] resolve pr todo comments --- package.json | 1 + src/index.ts | 4 ++-- src/loadSave.ts | 2 +- src/menus/hud.js | 8 +++----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index d57e4f354..989df06d5 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "web", "client" ], + "bin": "./server.js", "author": "PrismarineJS", "license": "MIT", "dependencies": { diff --git a/src/index.ts b/src/index.ts index 2b1e551df..b1f8d8bd0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -707,7 +707,6 @@ async function connect(connectOptions: { }, false) setLoadingScreenStatus('Done!') - miscUiState.gameLoaded = true console.log('Done!') hud.init(renderer, bot, host) @@ -720,10 +719,11 @@ async function connect(connectOptions: { // remove loading screen, wait a second to make sure a frame has properly rendered setLoadingScreenStatus(undefined) hideCurrentScreens() - viewer.waitForChunksToRender().then(() => { + void viewer.waitForChunksToRender().then(() => { console.log('All done and ready!') document.dispatchEvent(new Event('cypress-world-ready')) }) + miscUiState.gameLoaded = true }, singeplayer ? 0 : 2500) }) } diff --git a/src/loadSave.ts b/src/loadSave.ts index 9167197ab..c0260279c 100644 --- a/src/loadSave.ts +++ b/src/loadSave.ts @@ -55,7 +55,7 @@ export const loadSave = async (root = '/world') => { const levelDat: import('./mcTypes').LevelDat = nbt.simplify(parsedRaw).Data const qs = new URLSearchParams(window.location.search) - version = levelDat.Version?.Name ?? qs.get('mapVersion') + version = qs.get('mapVersion') ?? levelDat.Version?.Name if (!version) { const newVersion = disablePrompts ? '1.8.8' : prompt(`In 1.8 and before world save doesn't contain version info, please enter version you want to use to load the world.\nSupported versions ${supportedVersions.join(', ')}`, '1.8.8') if (!newVersion) return diff --git a/src/menus/hud.js b/src/menus/hud.js index 590085a43..bd7e567f0 100644 --- a/src/menus/hud.js +++ b/src/menus/hud.js @@ -240,11 +240,9 @@ class Hud extends LitElement { hotbar.bot = bot debugMenu.bot = bot - if (bot._client) { - hotbar.init() - chat.init(bot._client) - playerList.init(bot, host) - } + hotbar.init() + chat.init(bot._client) + playerList.init(bot, host) bot.on('entityHurt', (entity) => { if (entity !== bot.entity) return From 18e50227e382d94bae1a5e5bffa7ac7227da1db0 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 26 Sep 2023 19:30:07 +0300 Subject: [PATCH 302/318] fix(important): fix connect to servers by domain fix: finally display readable errors on proxy connect errors --- cypress/integration/index.spec.ts | 2 +- package.json | 2 +- pnpm-lock.yaml | 32 +++++++++++++-------------- src/index.ts | 33 +++++++++++++++++++--------- src/menus/loading_or_error_screen.js | 2 +- 5 files changed, 42 insertions(+), 29 deletions(-) diff --git a/cypress/integration/index.spec.ts b/cypress/integration/index.spec.ts index d8744a4e9..bfc5ff8c9 100644 --- a/cypress/integration/index.spec.ts +++ b/cypress/integration/index.spec.ts @@ -55,7 +55,7 @@ it('Loads & renders singleplayer', () => { it('Joins to server', () => { // visit('/?version=1.16.1') - window.localStorage.version = '1.16.1' + window.localStorage.version = '' visit() // todo replace with data-test cy.get('#title-screen').find('[data-test-id="connect-screen-button"]', { includeShadowDom: true, }).click() diff --git a/package.json b/package.json index 989df06d5..6b63080bd 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "lit": "^2.8.0", "lodash": "^4.17.21", "minecraft-data": "^3.0.0", - "net-browserify": "github:PrismarineJS/net-browserify", + "net-browserify": "github:zardoy/prismarinejs-net-browserify", "peerjs": "^1.5.0", "pretty-bytes": "^6.1.1", "qrcode.react": "^3.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 25d4635b1..c0c8beea3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -82,8 +82,8 @@ importers: specifier: 3.45.0 version: 3.45.0 net-browserify: - specifier: github:PrismarineJS/net-browserify - version: github.com/PrismarineJS/net-browserify/0acebf76d5a14991e6b2586f83f707be5171579c + specifier: github:zardoy/prismarinejs-net-browserify + version: github.com/zardoy/prismarinejs-net-browserify/51262fe139a6a4856ffd4a6dc7b9145c3d6d8039 peerjs: specifier: ^1.5.0 version: 1.5.0 @@ -12164,20 +12164,6 @@ packages: - utf-8-validate dev: true - github.com/PrismarineJS/net-browserify/0acebf76d5a14991e6b2586f83f707be5171579c: - resolution: {tarball: https://codeload.github.com/PrismarineJS/net-browserify/tar.gz/0acebf76d5a14991e6b2586f83f707be5171579c} - name: net-browserify - version: 0.2.4 - dependencies: - body-parser: 1.20.2 - express: 4.18.2 - express-ws: 4.0.0(express@4.18.2) - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - dev: false - github.com/PrismarineJS/node-process/380d0b4f4c86f1b65b216c311bf00431f314e88e: resolution: {tarball: https://codeload.github.com/PrismarineJS/node-process/tar.gz/380d0b4f4c86f1b65b216c311bf00431f314e88e} name: process @@ -12320,6 +12306,20 @@ packages: dependencies: vec3: 0.1.8 + github.com/zardoy/prismarinejs-net-browserify/51262fe139a6a4856ffd4a6dc7b9145c3d6d8039: + resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/51262fe139a6a4856ffd4a6dc7b9145c3d6d8039} + name: net-browserify + version: 0.2.4 + dependencies: + body-parser: 1.20.2 + express: 4.18.2 + express-ws: 4.0.0(express@4.18.2) + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: false + github.com/zardoy/space-squid/eec886b7a881eb40dd8efc6d48fa52e638e07693: resolution: {tarball: https://codeload.github.com/zardoy/space-squid/tar.gz/eec886b7a881eb40dd8efc6d48fa52e638e07693} name: flying-squid diff --git a/src/index.ts b/src/index.ts index b1f8d8bd0..a494890e9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -450,18 +450,31 @@ async function connect(connectOptions: { bot.emit('inject_allowed') bot._client.emit('connect') } else { - bot._client.socket.on('connect', () => { - console.log('TCP connection established') - //@ts-expect-error - bot._client.socket._ws.addEventListener('close', () => { - console.log('TCP connection closed') - setTimeout(() => { - if (bot) { - bot.emit('end', 'TCP connection closed with unknown reason') - } + const setupConnectHandlers = () => { + bot._client.socket.on('connect', () => { + console.log('TCP connection established') + //@ts-expect-error + bot._client.socket._ws.addEventListener('close', () => { + console.log('TCP connection closed') + setTimeout(() => { + if (bot) { + bot.emit('end', 'TCP connection closed with unknown reason') + } + }) }) }) - }) + } + // socket setup actually can be delayed because of dns lookup + if (bot._client.socket) { + setupConnectHandlers() + } else { + const originalSetSocket = bot._client.setSocket.bind(bot._client) + bot._client.setSocket = (socket) => { + originalSetSocket(socket) + setupConnectHandlers() + } + } + } } catch (err) { handleError(err) diff --git a/src/menus/loading_or_error_screen.js b/src/menus/loading_or_error_screen.js index d2259d42d..7a9588d85 100644 --- a/src/menus/loading_or_error_screen.js +++ b/src/menus/loading_or_error_screen.js @@ -79,7 +79,7 @@ class LoadingErrorScreen extends LitElement { return html`
    -
    ${this.status}${this.hasError || this.hideDots ? '' : this._loadingDots} +
    ${this.status}${this.hasError || this.hideDots ? '' : this._loadingDots}

    ${this.hasError ? guessProblem(this.status) : ''}

    ${this.lastStatus ? `Last status: ${this.lastStatus}` : this.lastStatus}

    From fa564bfab71bb4b9069379d86a35cdf5247a3998 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 26 Sep 2023 19:39:52 +0300 Subject: [PATCH 303/318] include deployment url to release --- .github/workflows/publish.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 13c5e68d4..0a6378a93 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,8 +19,13 @@ jobs: - run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} # will install + build to .vercel/output/static - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod - - run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} --prod - - run: pnpx zardoy-release node + - name: Deploy Project to Vercel + uses: mathiasvr/command-output@v2.0.0 + with: + run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} --prod + id: deploy + - run: | + pnpx zardoy-release node --footer "This release URL: ${{ steps.deploy.outputs.stdout }}" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: cp vercel.json .vercel/output/static/vercel.json From 7a77b2d9aaec0032b423da1eebf15077250d7393 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 26 Sep 2023 19:43:04 +0300 Subject: [PATCH 304/318] dont crash on mousedown --- src/controls.ts | 1 + src/globals.d.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/controls.ts b/src/controls.ts index 3ca9a329b..8b887736c 100644 --- a/src/controls.ts +++ b/src/controls.ts @@ -320,6 +320,7 @@ const toggleFly = () => { } // #endregion addEventListener('mousedown', (e) => { + if (!bot) return // wheel click // todo support ctrl+wheel (+nbt) if (e.button === 1) { diff --git a/src/globals.d.ts b/src/globals.d.ts index 7b849b914..641a85cff 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -1,7 +1,7 @@ /// declare const THREE: typeof import('three') -// todo +// todo make optional declare const bot: import('mineflayer').Bot declare const viewer: import('prismarine-viewer/viewer/lib/viewer').Viewer | undefined declare const worldView: import('prismarine-viewer/viewer/lib/worldView').WorldView | undefined From 9dde8f01736a91435d834b4f80101e63471da7c8 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 26 Sep 2023 19:51:34 +0300 Subject: [PATCH 305/318] small comments cleanup --- src/index.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/index.ts b/src/index.ts index a494890e9..618ae5477 100644 --- a/src/index.ts +++ b/src/index.ts @@ -350,14 +350,6 @@ async function connect(connectOptions: { if (proxy) { console.log(`using proxy ${proxy} ${proxyport}`) - // check proxy server availability for proper error message - // todo fix correctly - // try { - // await fetch(`http://${proxy}:${proxyport}/api/vm/net`, { method: 'GET' }) - // } catch (err) { - // console.error(err) - // throw new Error(`Proxy server ${proxy}:${proxyport} is not available`) - // } //@ts-expect-error net.setProxy({ hostname: proxy, port: proxyport }) } @@ -514,7 +506,6 @@ async function connect(connectOptions: { bot.once('spawn', () => { if (p2pConnectTimeout) clearTimeout(p2pConnectTimeout) - // todo display notification if not critical const mcData = require('minecraft-data')(bot.version) setLoadingScreenStatus('Placing blocks (starting viewer)') From 9d9e774e5183cae391f861cbfdd4c10dbf501e1b Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 27 Sep 2023 05:37:19 +0300 Subject: [PATCH 306/318] also lint js, improve style rules --- .eslintrc.json | 20 +++++- cypress/integration/index.spec.ts | 12 ++-- cypress/plugins/index.js | 38 +++++----- src/blockInteraction.js | 21 +++--- src/builtinCommands.ts | 2 +- src/chat.js | 88 ++++++++++++------------ src/controls.ts | 74 ++++++++++---------- src/customClient.js | 5 +- src/defaultLocalServerOptions.js | 3 +- src/dns.js | 6 +- src/globalState.ts | 4 +- src/index.ts | 2 +- src/inventory.ts | 10 +-- src/menus/advanced_options_screen.js | 8 +-- src/menus/components/bossbars_overlay.js | 23 ++++--- src/menus/components/breath_bar.js | 6 +- src/menus/components/button.js | 27 ++++---- src/menus/components/food_bar.js | 6 +- src/menus/components/health_bar.js | 6 +- src/menus/components/hotbar.js | 36 +++++----- src/menus/components/slider.js | 24 +++---- src/menus/hud.js | 24 +++---- src/menus/keybinds_screen.js | 34 ++++----- src/menus/loading_or_error_screen.js | 45 ++++++------ src/menus/options_screen.js | 48 ++++++------- src/menus/pause_screen.js | 24 ++++--- src/menus/play_screen.js | 10 +-- src/menus/title_screen.js | 62 ++++++++--------- src/panorama.js | 4 +- src/reactUi.jsx | 6 +- src/utils.ts | 12 ++-- 31 files changed, 358 insertions(+), 332 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 3e0781152..c9aae9638 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,15 +1,27 @@ { "extends": "zardoy", + "ignorePatterns": [ + "!*.js" + ], "rules": { + "object-curly-spacing": [ + "error", + "always" + ], "semi": [ "error", "never" ], + "comma-dangle": [ + "error", + // todo maybe "always-multiline"? + "only-multiline" + ], "indent": [ "error", 2, { - "SwitchCase": 2, + "SwitchCase": 1, "ignoredNodes": [ "TemplateLiteral" ] @@ -65,9 +77,13 @@ "@typescript-eslint/no-require-imports": "off", "unicorn/prefer-number-properties": "off", "@typescript-eslint/no-confusing-void-expression": "off", + "unicorn/no-empty-file": "off", + "unicorn/prefer-event-target": "off", // needs to be fixed actually "@typescript-eslint/no-floating-promises": "warn", "no-async-promise-executor": "off", - "no-bitwise": "off" + "no-bitwise": "off", + "unicorn/filename-case": "off", + "max-depth": "off" } } diff --git a/cypress/integration/index.spec.ts b/cypress/integration/index.spec.ts index bfc5ff8c9..ad285954d 100644 --- a/cypress/integration/index.spec.ts +++ b/cypress/integration/index.spec.ts @@ -22,7 +22,7 @@ const compareRenderedFlatWorld = () => { } const testWorldLoad = () => { - cy.document().then({ timeout: 20_000, }, doc => { + cy.document().then({ timeout: 20_000 }, doc => { return new Cypress.Promise(resolve => { doc.addEventListener('cypress-world-ready', resolve) }) @@ -49,7 +49,7 @@ it('Loads & renders singleplayer', () => { }, renderDistance: 2 }) - cy.get('#title-screen').find('[data-test-id="singleplayer-button"]', { includeShadowDom: true, }).click() + cy.get('#title-screen').find('[data-test-id="singleplayer-button"]', { includeShadowDom: true }).click() testWorldLoad() }) @@ -58,15 +58,15 @@ it('Joins to server', () => { window.localStorage.version = '' visit() // todo replace with data-test - cy.get('#title-screen').find('[data-test-id="connect-screen-button"]', { includeShadowDom: true, }).click() - cy.get('input#serverip', { includeShadowDom: true, }).clear().focus().type('localhost') - cy.get('[data-test-id="connect-to-server"]', { includeShadowDom: true, }).click() + cy.get('#title-screen').find('[data-test-id="connect-screen-button"]', { includeShadowDom: true }).click() + cy.get('input#serverip', { includeShadowDom: true }).clear().focus().type('localhost') + cy.get('[data-test-id="connect-to-server"]', { includeShadowDom: true }).click() testWorldLoad() }) it('Loads & renders zip world', () => { cleanVisit() - cy.get('#title-screen').find('[data-test-id="select-file-folder"]', { includeShadowDom: true, }).click({ shiftKey: true }) + cy.get('#title-screen').find('[data-test-id="select-file-folder"]', { includeShadowDom: true }).click({ shiftKey: true }) cy.get('input[type="file"]').selectFile('cypress/superflat.zip', { force: true }) testWorldLoad() }) diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js index 0b90f554c..35dc29891 100644 --- a/cypress/plugins/index.js +++ b/cypress/plugins/index.js @@ -4,23 +4,23 @@ const { initPlugin } = require('cypress-plugin-snapshots/plugin') const polyfill = require('esbuild-plugin-polyfill-node') module.exports = (on, config) => { - initPlugin(on, config) - on('file:preprocessor', cypressEsbuildPreprocessor({ - esbuildOptions: { - plugins: [ - polyfill.polyfillNode({ - polyfills: { - crypto: true, - }, - }) - ], - }, - })) - on('task', { - log (message) { - console.log(message) - return null - }, - }) - return config + initPlugin(on, config) + on('file:preprocessor', cypressEsbuildPreprocessor({ + esbuildOptions: { + plugins: [ + polyfill.polyfillNode({ + polyfills: { + crypto: true, + }, + }) + ], + }, + })) + on('task', { + log (message) { + console.log(message) + return null + }, + }) + return config } diff --git a/src/blockInteraction.js b/src/blockInteraction.js index 5b94ca571..c36acdacc 100644 --- a/src/blockInteraction.js +++ b/src/blockInteraction.js @@ -25,6 +25,8 @@ function getViewDirection (pitch, yaw) { class BlockInteraction { static instance = null + /** @type {null | {blockPos,mesh}} */ + interactionLines = null init () { bot.on('physicsTick', () => { if (this.lastBlockPlaced < 4) this.lastBlockPlaced++ }) @@ -103,8 +105,6 @@ class BlockInteraction { }) } - /** @type {null | {blockPos,mesh}} */ - interactionLines = null updateBlockInteractionLines (/** @type {Vec3 | null} */blockPos, /** @type {{position, width, height, depth}[]} */shapePositions = undefined) { if (this.interactionLines !== null) { viewer.scene.remove(this.interactionLines.mesh) @@ -127,6 +127,7 @@ class BlockInteraction { } // todo this shouldnt be done in the render loop, migrate the code to dom events to avoid delays on lags + // eslint-disable-next-line complexity update () { const cursorBlock = bot.blockAtCursor(5) let cursorBlockDiggable = cursorBlock @@ -137,13 +138,13 @@ class BlockInteraction { cursorChanged = !cursorBlock.position.equals(this.cursorBlock.position) } - // Place - if (cursorBlock && this.buttons[2] && (!this.lastButtons[2] || cursorChanged) && this.lastBlockPlaced >= 4) { + // Place / interact + if (this.buttons[2] && (!this.lastButtons[2] || cursorChanged) && this.lastBlockPlaced >= 4) { const vecArray = [new Vec3(0, -1, 0), new Vec3(0, 1, 0), new Vec3(0, 0, -1), new Vec3(0, 0, 1), new Vec3(-1, 0, 0), new Vec3(1, 0, 0)] - //@ts-ignore + //@ts-expect-error const delta = cursorBlock.intersect.minus(cursorBlock.position) - // check instead? - //@ts-ignore + + //@ts-expect-error bot._placeBlockWithOptions(cursorBlock, vecArray[cursorBlock.face], { delta, forceLook: 'ignore' }).catch(console.warn) this.lastBlockPlaced = 0 } @@ -167,9 +168,7 @@ class BlockInteraction { } // Show cursor - if (!cursorBlock) { - this.updateBlockInteractionLines(null) - } else { + if (cursorBlock) { const allShapes = [...cursorBlock.shapes, ...cursorBlock['interactionShapes'] ?? []] this.updateBlockInteractionLines(cursorBlock.position, allShapes.map(shape => { return getDataFromShape(shape) @@ -191,6 +190,8 @@ class BlockInteraction { position.add(cursorBlock.position) this.blockBreakMesh.position.set(position.x, position.y, position.z) } + } else { + this.updateBlockInteractionLines(null) } // Show break animation diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts index 34abe8eea..4de46bd44 100644 --- a/src/builtinCommands.ts +++ b/src/builtinCommands.ts @@ -32,7 +32,7 @@ async function addFolderToZip(folderPath, zip, relativePath) { const exportWorld = async () => { // todo issue into chat warning if fs is writable! const zip = new JSZip() - let {worldFolder} = localServer.options + let { worldFolder } = localServer.options if (!worldFolder.startsWith('/')) worldFolder = `/${worldFolder}` await addFolderToZip(worldFolder, zip, '') diff --git a/src/chat.js b/src/chat.js index 318e8889f..ca84e3426 100644 --- a/src/chat.js +++ b/src/chat.js @@ -1,13 +1,12 @@ //@ts-check -const { LitElement, html, css } = require('lit') -const { isMobile } = require('./menus/components/common') -const { activeModalStack, hideCurrentModal, showModal, miscUiState } = require('./globalState') import { repeat } from 'lit/directives/repeat.js' import { classMap } from 'lit/directives/class-map.js' +import { LitElement, html, css } from 'lit' import { isCypress } from './utils' import { getBuiltinCommandsList, tryHandleBuiltinCommand } from './builtinCommands' import { notification } from './menus/notification' import { options } from './optionsStorage' +import { activeModalStack, hideCurrentModal, showModal, miscUiState } from './globalState' const styles = { black: 'color:#000000', @@ -35,11 +34,11 @@ const styles = { function colorShadow (hex, dim = 0.25) { const color = parseInt(hex.replace('#', ''), 16) - const r = (color >> 16 & 0xFF) * dim | 0 - const g = (color >> 8 & 0xFF) * dim | 0 - const b = (color & 0xFF) * dim | 0 + const r = Math.trunc((color >> 16 & 0xFF) * dim) + const g = Math.trunc((color >> 8 & 0xFF) * dim) + const b = Math.trunc((color & 0xFF) * dim) - const f = (c) => ('00' + c.toString(16)).substr(-2) + const f = (c) => ('00' + c.toString(16)).slice(-2) return `#${f(r)}${f(g)}${f(b)}` } @@ -259,7 +258,7 @@ class ChatBox extends LitElement { notification.show = false const chat = this.shadowRoot.getElementById('chat-messages') /** @type {HTMLInputElement} */ - // @ts-ignore + // @ts-expect-error const chatInput = this.shadowRoot.getElementById('chatinput') showModal(this) @@ -281,7 +280,7 @@ class ChatBox extends LitElement { } get inChat () { - return activeModalStack.find(m => m.elem === this) !== undefined + return activeModalStack.some(m => m.elem === this) } /** @@ -290,7 +289,7 @@ class ChatBox extends LitElement { init (client) { const chat = this.shadowRoot.getElementById('chat-messages') /** @type {HTMLInputElement} */ - // @ts-ignore + // @ts-expect-error const chatInput = this.shadowRoot.getElementById('chatinput') this.chatInput = chatInput @@ -300,7 +299,7 @@ class ChatBox extends LitElement { let savedCurrentValue // Chat events document.addEventListener('keydown', e => { - if (activeModalStack.slice(-1)[0]?.elem !== this) return + if (activeModalStack.at(-1)?.elem !== this) return if (e.code === 'ArrowUp') { if (this.chatHistoryPos === 0) return if (this.chatHistoryPos === this.chatHistory.length) { @@ -379,7 +378,7 @@ class ChatBox extends LitElement { const splitted = tText.split(/%s|%\d+\$s/g) let i = 0 - splitted.forEach((part, j) => { + for (const [j, part] of splitted.entries()) { msglist.push({ text: part, ...styles }) if (j + 1 < splitted.length) { @@ -398,7 +397,7 @@ class ChatBox extends LitElement { } i++ } - }) + } } else { msglist.push({ ...msg, @@ -409,9 +408,9 @@ class ChatBox extends LitElement { } if (msg.extra) { - msg.extra.forEach(ex => { + for (const ex of msg.extra) { readMsg({ ...styles, ...ex }) - }) + } } } @@ -441,9 +440,9 @@ class ChatBox extends LitElement { // todo remove window.dummyMessage = () => { client.emit('chat', { - message: "{\"color\":\"yellow\",\"translate\":\"multiplayer.player.joined\",\"with\":[{\"insertion\":\"pviewer672\",\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"/tell pviewer672 \"},\"hoverEvent\":{\"action\":\"show_entity\",\"contents\":{\"type\":\"minecraft:player\",\"id\":\"ecd0eeb1-625e-3fea-b16e-cb449dcfa434\",\"name\":{\"text\":\"pviewer672\"}}},\"text\":\"pviewer672\"}]}", + message: '{"color":"yellow","translate":"multiplayer.player.joined","with":[{"insertion":"pviewer672","clickEvent":{"action":"suggest_command","value":"/tell pviewer672 "},"hoverEvent":{"action":"show_entity","contents":{"type":"minecraft:player","id":"ecd0eeb1-625e-3fea-b16e-cb449dcfa434","name":{"text":"pviewer672"}}},"text":"pviewer672"}]}', position: 1, - sender: "00000000-0000-0000-0000-000000000000", + sender: '00000000-0000-0000-0000-000000000000', }) } // window.dummyMessage() @@ -493,7 +492,7 @@ class ChatBox extends LitElement { this.completeRequestValue = value let items = await bot.tabComplete(value, true, true) if (typeof items[0] === 'object') { - // @ts-ignore + // @ts-expect-error if (items[0].match) items = items.map(i => i.match) } if (value !== this.completeRequestValue) return @@ -518,10 +517,11 @@ class ChatBox extends LitElement { ].filter(Boolean) return html` - ${text}` + ${text} + ` } renderMessage (/** @type {Message} */message) { @@ -565,29 +565,31 @@ class ChatBox extends LitElement { render () { return html` -
    -
    - - ${repeat(isCypress() ? [] : this.messages, (m) => m.id, (m) => this.renderMessage(m))} +
    +
    + + ${repeat(isCypress() ? [] : this.messages, (m) => m.id, (m) => this.renderMessage(m))} +
    -
    -
    -
    - ${this.completionItems.length ? html`
    -
    ${this.completePadText}
    -
    - ${repeat(this.completionItems, (i) => i, (i) => html`
    this.acceptComplete(i)}>${i}
    `)} -
    -
    ` : ''} - { - this.auxInputFocus('ArrowUp') - }}> - - { - this.auxInputFocus('ArrowDown') - }}> +
    +
    + ${this.completionItems.length ? html` +
    +
    ${this.completePadText}
    +
    + ${repeat(this.completionItems, (i) => i, (i) => html`
    this.acceptComplete(i)}>${i}
    `)} +
    +
    + ` : ''} + { + this.auxInputFocus('ArrowUp') + }}> + + { + this.auxInputFocus('ArrowDown') + }}> +
    -
    ` } } diff --git a/src/controls.ts b/src/controls.ts index 8b887736c..5809042fb 100644 --- a/src/controls.ts +++ b/src/controls.ts @@ -139,22 +139,22 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => { // handle general commands // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check switch (command) { - case 'general.jump': - bot.setControlState('jump', pressed) - break - case 'general.sneak': - gameAdditionalState.isSneaking = pressed - bot.setControlState('sneak', pressed) - break - case 'general.sprint': + case 'general.jump': + bot.setControlState('jump', pressed) + break + case 'general.sneak': + gameAdditionalState.isSneaking = pressed + bot.setControlState('sneak', pressed) + break + case 'general.sprint': // todo add setting to change behavior - if (pressed) { - setSprinting(pressed) - } - break - case 'general.attackDestroy': - document.dispatchEvent(new MouseEvent(pressed ? 'mousedown' : 'mouseup', { button: 0 })) - break + if (pressed) { + setSprinting(pressed) + } + break + case 'general.attackDestroy': + document.dispatchEvent(new MouseEvent(pressed ? 'mousedown' : 'mouseup', { button: 0 })) + break } } } @@ -192,26 +192,26 @@ contro.on('trigger', ({ command }) => { if (stringStartsWith(command, 'general')) { // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check switch (command) { - case 'general.inventory': - document.exitPointerLock?.() - showModal({ reactType: 'inventory' }) - break - case 'general.drop': - if (bot.heldItem) bot.tossStack(bot.heldItem) - break - case 'general.chat': - document.getElementById('hud').shadowRoot.getElementById('chat').enableChat() - break - case 'general.command': - document.getElementById('hud').shadowRoot.getElementById('chat').enableChat('/') - break - case 'general.interactPlace': - document.dispatchEvent(new MouseEvent('mousedown', { button: 2 })) - setTimeout(() => { + case 'general.inventory': + document.exitPointerLock?.() + showModal({ reactType: 'inventory' }) + break + case 'general.drop': + if (bot.heldItem) bot.tossStack(bot.heldItem) + break + case 'general.chat': + document.getElementById('hud').shadowRoot.getElementById('chat').enableChat() + break + case 'general.command': + document.getElementById('hud').shadowRoot.getElementById('chat').enableChat('/') + break + case 'general.interactPlace': + document.dispatchEvent(new MouseEvent('mousedown', { button: 2 })) + setTimeout(() => { // todo cleanup - document.dispatchEvent(new MouseEvent('mouseup', { button: 2 })) - }) - break + document.dispatchEvent(new MouseEvent('mouseup', { button: 2 })) + }) + break } } }) @@ -319,16 +319,16 @@ const toggleFly = () => { gameAdditionalState.isFlying = isFlying() } // #endregion -addEventListener('mousedown', (e) => { +addEventListener('mousedown', async (e) => { if (!bot) return // wheel click // todo support ctrl+wheel (+nbt) if (e.button === 1) { - const block = bot.blockAtCursor(/* 6 */5) + const block = bot.blockAtCursor(5) if (!block) return const Item = require('prismarine-item')(bot.version) const item = new Item(block.type, 1, 0) - bot.creative.setInventorySlot(bot.inventory.hotbarStart + bot.quickBarSlot, item) + await bot.creative.setInventorySlot(bot.inventory.hotbarStart + bot.quickBarSlot, item) bot.updateHeldItem() } }) diff --git a/src/customClient.js b/src/customClient.js index 7f673bd78..3b1a06c48 100644 --- a/src/customClient.js +++ b/src/customClient.js @@ -1,18 +1,16 @@ //@ts-check -const EventEmitter = require('events').EventEmitter +const { EventEmitter } = require('events') const debug = require('debug')('minecraft-protocol') const states = require('minecraft-protocol/src/states') window.serverDataChannel ??= {} export const customCommunication = { sendData (data) { - //@ts-ignore setTimeout(() => { window.serverDataChannel[this.isServer ? 'emitClient' : 'emitServer'](data) }) }, receiverSetup (processData) { - //@ts-ignore window.serverDataChannel[this.isServer ? 'emitServer' : 'emitClient'] = (data) => { processData(data) } @@ -39,6 +37,7 @@ class CustomChannelClient extends EventEmitter { }) } + // eslint-disable-next-line @typescript-eslint/adjacent-overload-signatures, grouped-accessor-pairs set state (newProperty) { const oldProperty = this.protocolState this.protocolState = newProperty diff --git a/src/defaultLocalServerOptions.js b/src/defaultLocalServerOptions.js index 2a1e90564..8e2946164 100644 --- a/src/defaultLocalServerOptions.js +++ b/src/defaultLocalServerOptions.js @@ -1,6 +1,7 @@ module.exports = { 'motd': 'A Minecraft Server \nRunning flying-squid', // host: '', + // eslint-disable-next-line unicorn/numeric-separators-style 'port': 25565, 'max-players': 10, 'online-mode': false, @@ -21,7 +22,7 @@ module.exports = { // 'worldHeight': 80 // } }, - 'kickTimeout': 10000, + 'kickTimeout': 10_000, 'plugins': {}, 'modpe': false, 'view-distance': 2, diff --git a/src/dns.js b/src/dns.js index be7206ae3..0bbe5320d 100644 --- a/src/dns.js +++ b/src/dns.js @@ -10,7 +10,7 @@ module.exports.resolveSrv = function (hostname, callback) { Http.send() Http.onload = function () { - const response = Http.response + const { response } = Http if (response.Status === 3) { const err = new Error('querySrv ENOTFOUND') err.code = 'ENOTFOUND' @@ -24,7 +24,7 @@ module.exports.resolveSrv = function (hostname, callback) { return } const willreturn = [] - response.Answer.forEach(function (object) { + for (const object of response.Answer) { const data = object.data.split(' ') willreturn.push({ priority: data[0], @@ -32,7 +32,7 @@ module.exports.resolveSrv = function (hostname, callback) { port: data[2], name: data[3] }) - }) + } console.log(willreturn) callback(null, willreturn) } diff --git a/src/globalState.ts b/src/globalState.ts index 0257ca232..42cc0bf88 100644 --- a/src/globalState.ts +++ b/src/globalState.ts @@ -13,7 +13,7 @@ type ContextMenuItem = { callback; label } export const activeModalStack: Modal[] = proxy([]) export const replaceActiveModalStack = (name: string, newModalStack = activeModalStacks[name]) => { - hideModal(undefined, undefined, { restorePrevious: false, force: true, }) + hideModal(undefined, undefined, { restorePrevious: false, force: true }) activeModalStack.splice(0, activeModalStack.length, ...newModalStack) // todo restore previous } @@ -90,7 +90,7 @@ export const hideCurrentModal = (_data = undefined, restoredActions = undefined) // --- -export const currentContextMenu = proxy({ items: [] as ContextMenuItem[] | null, x: 0, y: 0, }) +export const currentContextMenu = proxy({ items: [] as ContextMenuItem[] | null, x: 0, y: 0 }) export const showContextmenu = (items: ContextMenuItem[], { clientX, clientY }) => { Object.assign(currentContextMenu, { diff --git a/src/index.ts b/src/index.ts index 618ae5477..b5fff0f87 100644 --- a/src/index.ts +++ b/src/index.ts @@ -632,7 +632,7 @@ async function connect(connectOptions: { } screenTouches++ if (screenTouches === 3) { - window.dispatchEvent(new MouseEvent('mousedown', { button: 1, })) + window.dispatchEvent(new MouseEvent('mousedown', { button: 1 })) } if (capturedPointer) { return diff --git a/src/inventory.ts b/src/inventory.ts index c5212215c..d8e513e9e 100644 --- a/src/inventory.ts +++ b/src/inventory.ts @@ -38,8 +38,8 @@ subscribeKey(miscUiState, 'gameLoaded', async () => { // on game load version = getVersion(bot.version) blockStates = await fetch(`blocksStates/${version}.json`).then(async res => res.json()) - getImage({ path: 'blocks', } as any) - getImage({ path: 'invsprite', } as any) + getImage({ path: 'blocks' } as any) + getImage({ path: 'invsprite' } as any) mcData = MinecraftData(version) }) @@ -88,9 +88,9 @@ const getItemSlice = (name) => { const getImageSrc = (path) => { switch (path) { - case 'gui/container/inventory': return InventoryGui - case 'blocks': return globalThis.texturePackDataUrl || `textures/${version}.png` - case 'invsprite': return `invsprite.png` + case 'gui/container/inventory': return InventoryGui + case 'blocks': return globalThis.texturePackDataUrl || `textures/${version}.png` + case 'invsprite': return `invsprite.png` } return Dirt } diff --git a/src/menus/advanced_options_screen.js b/src/menus/advanced_options_screen.js index 7efa690a1..8d2c99b63 100644 --- a/src/menus/advanced_options_screen.js +++ b/src/menus/advanced_options_screen.js @@ -1,10 +1,10 @@ //@ts-check const { html, css, LitElement } = require('lit') -const { commonCss, openURL } = require('./components/common') +const { subscribe } = require('valtio') const { hideCurrentModal } = require('../globalState') const { getScreenRefreshRate } = require('../utils') -const { subscribe } = require('valtio') const { options } = require('../optionsStorage') +const { commonCss, openURL } = require('./components/common') class AdvancedOptionsScreen extends LitElement { /** @type {null | number} */ @@ -55,8 +55,8 @@ class AdvancedOptionsScreen extends LitElement {
    { - options.alwaysShowMobileControls = !options.alwaysShowMobileControls - } + options.alwaysShowMobileControls = !options.alwaysShowMobileControls + } }> openURL('https://gist.github.com/zardoy/6e5ce377d2b4c1e322e660973da069cd')}> diff --git a/src/menus/components/bossbars_overlay.js b/src/menus/components/bossbars_overlay.js index 213fe1409..5c22fa9a2 100644 --- a/src/menus/components/bossbars_overlay.js +++ b/src/menus/components/bossbars_overlay.js @@ -57,14 +57,15 @@ class BossBar extends LitElement { this.updateBar(this.bar) return html` -
    -
    ${this.title}
    -
    -
    -
    -
    -
    -
    ` +
    +
    ${this.title}
    +
    +
    +
    +
    +
    +
    + ` } setTitle (bar) { @@ -121,9 +122,11 @@ class BossBars extends LitElement { } render () { - return html`
    + return html` +
    ${[...this.bossBars.values()]} -
    ` +
    + ` } init () { diff --git a/src/menus/components/breath_bar.js b/src/menus/components/breath_bar.js index 3c03602c3..407fee12b 100644 --- a/src/menus/components/breath_bar.js +++ b/src/menus/components/breath_bar.js @@ -46,9 +46,9 @@ class BreathBar extends LitElement { const breaths = breathbar.children - for (let i = 0; i < breaths.length; i++) { - breaths[i].classList.remove('full') - breaths[i].classList.remove('half') + for (const breath of breaths) { + breath.classList.remove('full') + breath.classList.remove('half') } for (let i = 0; i < Math.ceil(hValue / 2); i++) { diff --git a/src/menus/components/button.js b/src/menus/components/button.js index 6ccc6bad5..1db48824e 100644 --- a/src/menus/components/button.js +++ b/src/menus/components/button.js @@ -8,7 +8,7 @@ let audioContext const sounds = {} // load as many resources on page load as possible instead on demand as user can disable internet connection after he thinks the page is loaded -let loadingSounds = [] +const loadingSounds = [] async function loadSound (path) { loadingSounds.push(path) const res = await window.fetch(path) @@ -151,22 +151,23 @@ class Button extends LitElement { render () { return html` - ` + + ` } onBtnClick (e) { playSound('button_click.mp3') - this.dispatchEvent(new window.CustomEvent('pmui-click', { detail: e, })) + this.dispatchEvent(new window.CustomEvent('pmui-click', { detail: e })) } } diff --git a/src/menus/components/food_bar.js b/src/menus/components/food_bar.js index 7f71ad0fa..f64413fe8 100644 --- a/src/menus/components/food_bar.js +++ b/src/menus/components/food_bar.js @@ -83,9 +83,9 @@ class FoodBar extends LitElement { const foods = foodbar.children - for (let i = 0; i < foods.length; i++) { - foods[i].classList.remove('full') - foods[i].classList.remove('half') + for (const food of foods) { + food.classList.remove('full') + food.classList.remove('half') } // if (d) this.onHungerUpdate() diff --git a/src/menus/components/health_bar.js b/src/menus/components/health_bar.js index ace2641af..4c0306716 100644 --- a/src/menus/components/health_bar.js +++ b/src/menus/components/health_bar.js @@ -120,9 +120,9 @@ class HealthBar extends LitElement { const hearts = health.children - for (let i = 0; i < hearts.length; i++) { - hearts[i].classList.remove('full') - hearts[i].classList.remove('half') + for (const heart of hearts) { + heart.classList.remove('full') + heart.classList.remove('half') } if (d) this.onDamage() diff --git a/src/menus/components/hotbar.js b/src/menus/components/hotbar.js index 95744da69..c4dd7477d 100644 --- a/src/menus/components/hotbar.js +++ b/src/menus/components/hotbar.js @@ -1,9 +1,9 @@ const { LitElement, html, css, unsafeCSS } = require('lit') +const widgetsTexture = require('minecraft-assets/minecraft-assets/data/1.16.4/gui/widgets.png') +const { subscribeKey } = require('valtio/utils') const invsprite = require('../../invsprite.json') const { isGameActive, miscUiState, showModal } = require('../../globalState') -const widgetsTexture = require('minecraft-assets/minecraft-assets/data/1.16.4/gui/widgets.png') -const { subscribeKey } = require('valtio/utils') const { isProbablyIphone } = require('./common') class Hotbar extends LitElement { @@ -139,7 +139,7 @@ class Hotbar extends LitElement { document.addEventListener('keydown', (e) => { if (!isGameActive(true)) return - const numPressed = +(e.code.match(/Digit(\d)/)?.[1] ?? -1) + const numPressed = +((/Digit(\d)/.exec(e.code))?.[1] ?? -1) if (numPressed < 1 || numPressed > 9) return this.reloadHotbarSelected(numPressed - 1) }) @@ -188,21 +188,21 @@ class Hotbar extends LitElement {

    ${this.activeItemName}

    { - if (!e.target.id.startsWith('hotbar')) return - const slot = +e.target.id.split('-')[1] - this.reloadHotbarSelected(slot) - }}> - ${Array.from({ length: 9 }).map((_, i) => html` -
    { - this.reloadHotbarSelected(i) - }}> -
    - -
    - `)} - ${miscUiState.currentTouch ? html`
    { - showModal({ reactType: 'inventory', }) - }}>` : undefined} + if (!e.target.id.startsWith('hotbar')) return + const slot = +e.target.id.split('-')[1] + this.reloadHotbarSelected(slot) + }}> + ${Array.from({ length: 9 }).map((_, i) => html` +
    { + this.reloadHotbarSelected(i) + }}> +
    + +
    + `)} + ${miscUiState.currentTouch ? html`
    { + showModal({ reactType: 'inventory' }) + }}>` : undefined}
    diff --git a/src/menus/components/slider.js b/src/menus/components/slider.js index bb72f9f29..77aed7a28 100644 --- a/src/menus/components/slider.js +++ b/src/menus/components/slider.js @@ -187,20 +187,20 @@ class Slider extends LitElement { value="${this.value}" ?disabled=${!!this.disabled} @input=${(e) => { - const range = e.target - this.ratio = (range.value - range.min) / (range.max - range.min) - this.value = range.value - }} + const range = e.target + this.ratio = (range.value - range.min) / (range.max - range.min) + this.value = range.value + }} @pointerdown=${() => { - window.addEventListener('pointerup', (e) => { - this.dispatchEvent(new InputEvent('change')) - }, { - once: true, - }) - }} - @keyup=${() => { + window.addEventListener('pointerup', (e) => { this.dispatchEvent(new InputEvent('change')) - }}> + }, { + once: true, + }) + }} + @keyup=${() => { + this.dispatchEvent(new InputEvent('change')) + }}>
    { - // @ts-ignore + // @ts-expect-error this.shadowRoot.querySelector('#xp-bar-bg').firstElementChild.style.width = `${182 * bot.experience.progress}px` xpLabel.innerHTML = String(bot.experience.level) xpLabel.style.display = bot.experience.level > 0 ? 'block' : 'none' @@ -307,19 +307,19 @@ class Hud extends LitElement { return html`
    + window.dispatchEvent(new MouseEvent('mousedown', { button: 1 })) + }}>Select + this.shadowRoot.getElementById('debug-overlay').showOverlay = !this.shadowRoot.getElementById('debug-overlay').showOverlay + }}>F3 + e.stopPropagation() + this.shadowRoot.querySelector('#chat').enableChat() + }}> + e.stopPropagation() + showModal(document.getElementById('pause-screen')) + }}>
    diff --git a/src/menus/keybinds_screen.js b/src/menus/keybinds_screen.js index 5cdb37640..d82f02104 100644 --- a/src/menus/keybinds_screen.js +++ b/src/menus/keybinds_screen.js @@ -1,6 +1,6 @@ const { LitElement, html, css } = require('lit') -const { commonCss } = require('./components/common') const { hideCurrentModal } = require('../globalState') +const { commonCss } = require('./components/common') class KeyBindsScreen extends LitElement { static get styles () { @@ -135,23 +135,23 @@ class KeyBindsScreen extends LitElement {
    ${this.keymaps.map((m, i) => html` -
    - ${m.name} - -
    - { - e.target.setAttribute('pmui-label', `> ${m.key} <`) - this.selected = i - this.requestUpdate() - }}> - { - this.keymaps[i].key = this.keymaps[i].defaultKey - this.requestUpdate() - this.selected = -1 - }}> +
    + ${m.name} + +
    + { + e.target.setAttribute('pmui-label', `> ${m.key} <`) + this.selected = i + this.requestUpdate() + }}> + { + this.keymaps[i].key = this.keymaps[i].defaultKey + this.requestUpdate() + this.selected = -1 + }}> +
    -
    - `)} + `)}
    diff --git a/src/menus/loading_or_error_screen.js b/src/menus/loading_or_error_screen.js index 7a9588d85..55ee92792 100644 --- a/src/menus/loading_or_error_screen.js +++ b/src/menus/loading_or_error_screen.js @@ -1,10 +1,10 @@ //@ts-check const { LitElement, html, css } = require('lit') -const { commonCss } = require('./components/common') const { addPanoramaCubeMap } = require('../panorama') const { hideModal, activeModalStacks, activeModalStack, replaceActiveModalStack, miscUiState } = require('../globalState') const { guessProblem } = require('../guessProblem') const { fsState } = require('../loadSave') +const { commonCss } = require('./components/common') class LoadingErrorScreen extends LitElement { static get styles () { @@ -58,9 +58,10 @@ class LoadingErrorScreen extends LitElement { async statusRunner () { const array = ['.', '..', '...', ''] - const timer = ms => new Promise((resolve) => setTimeout(resolve, ms)) + const timer = async ms => new Promise((resolve) => {setTimeout(resolve, ms)}) const load = async () => { + // eslint-disable-next-line no-constant-condition for (let i = 0; true; i = ((i + 1) % array.length)) { this._loadingDots = array[i] await timer(500) @@ -84,27 +85,27 @@ class LoadingErrorScreen extends LitElement {

    ${this.lastStatus ? `Last status: ${this.lastStatus}` : this.lastStatus}

    ${this.hasError - ? html`
    { - this.hasError = false - this.lastStatus = '' - miscUiState.gameLoaded = false - if (activeModalStacks['main-menu']) { - replaceActiveModalStack('main-menu') - } else { - hideModal(undefined, undefined, { force: true }) - } - document.getElementById('play-screen').style.display = 'block' - addPanoramaCubeMap() - }}> { - if (!confirm('Are you sure you want to delete all local world content?')) return - for (const key of Object.keys(localStorage)) { - if (/^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/g.test(key) || key === '/') { - localStorage.removeItem(key) - } + ? html`
    { + this.hasError = false + this.lastStatus = '' + miscUiState.gameLoaded = false + if (activeModalStacks['main-menu']) { + replaceActiveModalStack('main-menu') + } else { + hideModal(undefined, undefined, { force: true }) + } + document.getElementById('play-screen').style.display = 'block' + addPanoramaCubeMap() + }}> { + if (!confirm('Are you sure you want to delete all local world content?')) return + for (const key of Object.keys(localStorage)) { + if (/^[\da-fA-F]{8}(?:\b-[\da-fA-F]{4}){3}\b-[\da-fA-F]{12}$/g.test(key) || key === '/') { + localStorage.removeItem(key) } - window.location.reload() - }}> window.location.reload()} pmui-label="Full Reload" pmui-width="200px">
    ` - : '' + } + window.location.reload() + }}>     window.location.reload()} pmui-label="Full Reload" pmui-width="200px">
    ` + : '' } ` } diff --git a/src/menus/options_screen.js b/src/menus/options_screen.js index bc946bef4..208ed0cae 100644 --- a/src/menus/options_screen.js +++ b/src/menus/options_screen.js @@ -1,12 +1,12 @@ const { LitElement, html, css } = require('lit') -const { commonCss, isMobile } = require('./components/common') +const { subscribe } = require('valtio') +const { subscribeKey } = require('valtio/utils') const { showModal, hideCurrentModal, isGameActive, miscUiState } = require('../globalState') const { toNumber, openFilePicker, setLoadingScreenStatus } = require('../utils') const { options, watchValue } = require('../optionsStorage') -const { subscribe } = require('valtio') -const { subscribeKey } = require('valtio/utils') const { getResourcePackName, uninstallTexturePack, resourcePackState } = require('../texturePack') const { fsState } = require('../loadSave') +const { commonCss, isMobile } = require('./components/common') class OptionsScreen extends LitElement { static get styles () { @@ -69,47 +69,47 @@ class OptionsScreen extends LitElement {
    { - options.mouseSensX = +e.target.value - }}> + options.mouseSensX = +e.target.value + }}> { - options.mouseSensY = +e.target.value - }}> + options.mouseSensY = +e.target.value + }}>
    { - options.chatWidth = +e.target.value - }}> + options.chatWidth = +e.target.value + }}> { - options.chatHeight = +e.target.value - }}> + options.chatHeight = +e.target.value + }}>
    { - options.chatScale = +e.target.value - }}> + options.chatScale = +e.target.value + }}> { - options.volume = +e.target.value - }}> + options.volume = +e.target.value + }}>
    showModal(document.getElementById('keybinds-screen'))}> { - options.guiScale = +e.target.value - }}> + options.guiScale = +e.target.value + }}>
    { - options.renderDistance = +e.target.value - }}> + options.renderDistance = +e.target.value + }}> { - options.fov = +e.target.value - }}> + options.fov = +e.target.value + }}>
    { - showModal(document.querySelector('pmui-advanced-optionsscreen')) - } + showModal(document.querySelector('pmui-advanced-optionsscreen')) + } }> { options.mouseRawInput = !options.mouseRawInput @@ -117,7 +117,7 @@ class OptionsScreen extends LitElement { }>
    - { + { options.autoFullScreen = !options.autoFullScreen } }> diff --git a/src/menus/pause_screen.js b/src/menus/pause_screen.js index 1d31ac599..9a9dacf0a 100644 --- a/src/menus/pause_screen.js +++ b/src/menus/pause_screen.js @@ -1,14 +1,14 @@ //@ts-check const { LitElement, html, css } = require('lit') -const { openURL } = require('./components/common') +const { subscribe } = require('valtio') +const { subscribeKey } = require('valtio/utils') const { hideCurrentModal, showModal, miscUiState } = require('../globalState') const { fsState } = require('../loadSave') -const { subscribe } = require('valtio') const { saveWorld } = require('../builtinCommands') -const { notification } = require('./notification') const { disconnect } = require('../utils') -const { subscribeKey } = require('valtio/utils') const { closeWan, openToWanAndCopyJoinLink, getJoinLink } = require('../localServerMultiplayer') +const { notification } = require('./notification') +const { openURL } = require('./components/common') class PauseScreen extends LitElement { static get styles () { @@ -80,13 +80,15 @@ class PauseScreen extends LitElement { showModal(document.getElementById('options-screen'))}> - ${joinButton ? html`
    - this.clickJoinLinkButton()}> - this.clickJoinLinkButton(true)}> -
    ` : ''} + ${joinButton ? html` +
    + this.clickJoinLinkButton()}> + this.clickJoinLinkButton(true)}> +
    + ` : ''} { - disconnect() - }}> + disconnect() + }}>
    ` } @@ -102,7 +104,7 @@ class PauseScreen extends LitElement { if (qr) { const joinLink = getJoinLink() miscUiState.currentDisplayQr = joinLink - return + } } diff --git a/src/menus/play_screen.js b/src/menus/play_screen.js index 923d6d2fb..5001c307d 100644 --- a/src/menus/play_screen.js +++ b/src/menus/play_screen.js @@ -1,9 +1,9 @@ //@ts-check const { LitElement, html, css } = require('lit') -const { commonCss } = require('./components/common') -const { hideCurrentModal } = require('../globalState') const mineflayer = require('mineflayer') const viewerSupportedVersions = require('prismarine-viewer/public/supportedVersions.json') +const { hideCurrentModal } = require('../globalState') +const { commonCss } = require('./components/common') const fullySupporedVersions = viewerSupportedVersions const partiallySupportVersions = mineflayer.supportedVersions @@ -84,7 +84,7 @@ class PlayScreen extends LitElement { super() this.version = '' // todo set them sooner add indicator - window.fetch('config.json').then(res => res.json()).then(c => c, (error) => { + window.fetch('config.json').then(async res => res.json()).then(c => c, (error) => { console.error('Failed to load config.json', error) return {} }).then(config => { @@ -100,7 +100,7 @@ class PlayScreen extends LitElement { } this.server = getParam('server', 'ip') ?? config.defaultHost - this.serverport = getParam('serverport', false) ?? config.defaultHostPort ?? 25565 + this.serverport = getParam('serverport', false) ?? config.defaultHostPort ?? 25_565 this.proxy = getParam('proxy') ?? config.defaultProxy this.proxyport = getParam('proxyport', false) ?? (!config.defaultProxy && !config.defaultProxyPort ? '' : config.defaultProxyPort ?? 443) this.version = getParam('version') || (window.localStorage.getItem('version') ?? config.defaultVersion) @@ -203,7 +203,7 @@ class PlayScreen extends LitElement { this.dispatchEvent(new window.CustomEvent('connect', { detail: { server: `${this.server}:${this.serverport}`, - proxy: `${this.proxy}${this.proxy !== '' ? `:${this.proxyport}` : ''}`, + proxy: `${this.proxy}${this.proxy === '' ? '' : `:${this.proxyport}`}`, username: this.username, password: this.password, botVersion: this.version diff --git a/src/menus/title_screen.js b/src/menus/title_screen.js index 10b11bec8..d1828ef90 100644 --- a/src/menus/title_screen.js +++ b/src/menus/title_screen.js @@ -1,14 +1,14 @@ -const { openWorldDirectory, openWorldZip } = require('../browserfs') -const { showModal } = require('../globalState') -const { fsState } = require('../loadSave') -const { openURL } = require('./components/common') -const { LitElement, html, css, unsafeCSS } = require('lit') const fs = require('fs') +const { LitElement, html, css, unsafeCSS } = require('lit') const mcImage = require('minecraft-assets/minecraft-assets/data/1.17.1/gui/title/minecraft.png') +const { fsState } = require('../loadSave') +const { showModal } = require('../globalState') +const { openWorldDirectory, openWorldZip } = require('../browserfs') const { options } = require('../optionsStorage') const defaultLocalServerOptions = require('../defaultLocalServerOptions') const { openFilePicker } = require('../utils') +const { openURL } = require('./components/common') // const SUPPORT_WORLD_LOADING = !!window.showDirectoryPicker const SUPPORT_WORLD_LOADING = true @@ -121,14 +121,6 @@ class TitleScreen extends LitElement { } } - reload () { - navigator.serviceWorker.getRegistration().then(registration => { - registration.unregister().then(() => { - window.location.reload() - }) - }) - } - constructor () { super() this.versionStatus = '' @@ -147,6 +139,14 @@ class TitleScreen extends LitElement { } } + reload () { + navigator.serviceWorker.getRegistration().then(registration => { + registration.unregister().then(() => { + window.location.reload() + }) + }) + } + render () { return html`
    @@ -160,25 +160,25 @@ class TitleScreen extends LitElement { showModal(document.getElementById('play-screen'))}>
    { - this.style.display = 'none' - fsState.isReadonly = false - fsState.syncFs = true - fsState.inMemorySave = true - const notFirstTime = fs.existsSync('./world/level.dat') - if (notFirstTime && !options.localServerOptions.version) { - options.localServerOptions.version = '1.16.1' // legacy version - } else { - options.localServerOptions.version ??= defaultLocalServerOptions.version - } - this.dispatchEvent(new window.CustomEvent('singleplayer', {})) - }}> + this.style.display = 'none' + fsState.isReadonly = false + fsState.syncFs = true + fsState.inMemorySave = true + const notFirstTime = fs.existsSync('./world/level.dat') + if (notFirstTime && !options.localServerOptions.version) { + options.localServerOptions.version = '1.16.1' // legacy version + } else { + options.localServerOptions.version ??= defaultLocalServerOptions.version + } + this.dispatchEvent(new window.CustomEvent('singleplayer', {})) + }}> ${SUPPORT_WORLD_LOADING ? html` { - if (!!window.showDirectoryPicker && !e.shiftKey) { - openWorldDirectory() - } else { - openFilePicker() - } - }}>` : ''} + if (!!window.showDirectoryPicker && !e.shiftKey) { + openWorldDirectory() + } else { + openFilePicker() + } + }}>` : ''}
    showModal(document.getElementById('options-screen'))}>
    diff --git a/src/panorama.js b/src/panorama.js index 21d01359f..3ae0f0a8c 100644 --- a/src/panorama.js +++ b/src/panorama.js @@ -1,9 +1,9 @@ //@ts-check import { join } from 'path' -import { fromTexturePackPath, resourcePackState } from './texturePack' import fs from 'fs' import { subscribeKey } from 'valtio/utils' +import { fromTexturePackPath, resourcePackState } from './texturePack' import { options } from './optionsStorage' let panoramaCubeMap @@ -68,7 +68,7 @@ export async function addPanoramaCubeMap () { const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000) const loader = new THREE.TextureLoader() - let panorMaterials = [] + const panorMaterials = [] await updateResourcePackSupportPanorama() for (const file of panoramaFiles) { panorMaterials.push(new THREE.MeshBasicMaterial({ diff --git a/src/reactUi.jsx b/src/reactUi.jsx index 64713aa67..dc6323222 100644 --- a/src/reactUi.jsx +++ b/src/reactUi.jsx @@ -31,11 +31,11 @@ useInterfaceState.setState({ if (!bot) return if (state === 0) { for (const action of actionAndState) { - contro.pressedKeyOrButtonChanged({code: action[2],}, false) + contro.pressedKeyOrButtonChanged({ code: action[2] }, false) } } else { //@ts-expect-error - contro.pressedKeyOrButtonChanged({code: actionAndState[2],}, true) + contro.pressedKeyOrButtonChanged({ code: actionAndState[2] }, true) } } }) @@ -104,7 +104,7 @@ const DisplayQr = () => { miscUiState.currentDisplayQr = null }} > - +
    , document.body) } diff --git a/src/utils.ts b/src/utils.ts index 706f2f638..8413df8b6 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -106,11 +106,11 @@ export async function getScreenRefreshRate(): Promise { export const getGamemodeNumber = (bot) => { switch (bot.game.gameMode) { - case 'survival': return 0 - case 'creative': return 1 - case 'adventure': return 2 - case 'spectator': return 3 - default: return -1 + case 'survival': return 0 + case 'creative': return 1 + case 'adventure': return 2 + case 'spectator': return 3 + default: return -1 } } @@ -137,7 +137,7 @@ export const setLoadingScreenStatus = function (status: string | undefined, isEr if (status === undefined) { loadingScreen.status = '' - hideModal({ elem: loadingScreen, }, null, { force: true }) + hideModal({ elem: loadingScreen }, null, { force: true }) return } From 7f67f8be86af867a2fb0eb9aba605cb207307fd1 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 27 Sep 2023 06:25:41 +0300 Subject: [PATCH 307/318] fix: dont activate fly mode when double pressed space not that fast --- src/controls.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/controls.ts b/src/controls.ts index 5809042fb..fe49a55dd 100644 --- a/src/controls.ts +++ b/src/controls.ts @@ -101,7 +101,7 @@ contro.on('movementUpdate', ({ vector, gamepadIndex }) => { let lastCommandTrigger = null as { command: string, time: number } | null -const secondActionActivationTimeout = 600 +const secondActionActivationTimeout = 300 const secondActionCommands = { 'general.jump'() { toggleFly() @@ -155,6 +155,9 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => { case 'general.attackDestroy': document.dispatchEvent(new MouseEvent(pressed ? 'mousedown' : 'mouseup', { button: 0 })) break + case 'general.interactPlace': + document.dispatchEvent(new MouseEvent(pressed ? 'mousedown' : 'mouseup', { button: 2 })) + break } } } @@ -205,13 +208,6 @@ contro.on('trigger', ({ command }) => { case 'general.command': document.getElementById('hud').shadowRoot.getElementById('chat').enableChat('/') break - case 'general.interactPlace': - document.dispatchEvent(new MouseEvent('mousedown', { button: 2 })) - setTimeout(() => { - // todo cleanup - document.dispatchEvent(new MouseEvent('mouseup', { button: 2 })) - }) - break } } }) From 3be311d2f26f837f5a15b7078461c8899a589c2c Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 27 Sep 2023 06:25:58 +0300 Subject: [PATCH 308/318] fix: always allow to activate block eg lever --- src/blockInteraction.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/blockInteraction.js b/src/blockInteraction.js index c36acdacc..836a652d1 100644 --- a/src/blockInteraction.js +++ b/src/blockInteraction.js @@ -144,8 +144,13 @@ class BlockInteraction { //@ts-expect-error const delta = cursorBlock.intersect.minus(cursorBlock.position) + // workaround so blocks can be activated with empty hand + const oldHeldItem = bot.heldItem + //@ts-expect-error + bot.heldItem = true //@ts-expect-error bot._placeBlockWithOptions(cursorBlock, vecArray[cursorBlock.face], { delta, forceLook: 'ignore' }).catch(console.warn) + bot.heldItem = oldHeldItem this.lastBlockPlaced = 0 } From 4910354317e4efff675598ca34150ed56dd75559 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 27 Sep 2023 06:42:49 +0300 Subject: [PATCH 309/318] fix: blocks should be placed until left click is released (regression) --- src/blockInteraction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/blockInteraction.js b/src/blockInteraction.js index 836a652d1..d8aa0dc82 100644 --- a/src/blockInteraction.js +++ b/src/blockInteraction.js @@ -139,7 +139,7 @@ class BlockInteraction { } // Place / interact - if (this.buttons[2] && (!this.lastButtons[2] || cursorChanged) && this.lastBlockPlaced >= 4) { + if (cursorBlock && this.buttons[2] && this.lastBlockPlaced >= 4) { const vecArray = [new Vec3(0, -1, 0), new Vec3(0, 1, 0), new Vec3(0, 0, -1), new Vec3(0, 0, 1), new Vec3(-1, 0, 0), new Vec3(1, 0, 0)] //@ts-expect-error const delta = cursorBlock.intersect.minus(cursorBlock.position) From 6f56bab423079934e1073a3e439e1d8ca9d61a66 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 27 Sep 2023 07:23:23 +0300 Subject: [PATCH 310/318] refactor stats to display gpu / cpu stats feat: add an option to use dedicated gpu for render on laptop (high-perf) --- package.json | 1 + pnpm-lock.yaml | 7 ++++ src/index.ts | 34 +++++------------- src/menus/advanced_options_screen.js | 3 ++ src/optionsStorage.ts | 1 + src/rightTopStats.ts | 52 ++++++++++++++++++++++++++++ 6 files changed, 72 insertions(+), 26 deletions(-) create mode 100644 src/rightTopStats.ts diff --git a/package.json b/package.json index 6b63080bd..c4583de80 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "qrcode.react": "^3.1.0", "react": "^18.2.0", "react-dom": "^18.2.0", + "stats-gl": "^1.0.5", "stats.js": "^0.17.0", "valtio": "^1.11.1", "minecraft-assets": "^1.9.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c0c8beea3..22df00cfe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -99,6 +99,9 @@ importers: react-dom: specifier: ^18.2.0 version: 18.2.0(react@18.2.0) + stats-gl: + specifier: ^1.0.5 + version: 1.0.5 stats.js: specifier: ^0.17.0 version: 0.17.0 @@ -10621,6 +10624,10 @@ packages: - supports-color dev: true + /stats-gl@1.0.5: + resolution: {integrity: sha512-XimMxvwnf1Qf5KwebhcoA34kcX+fWEkIl0QjNkCbu4IpoyDMMsOajExn7FIq5w569k45+LhmsuRlGSrsvmGdNw==} + dev: false + /stats.js@0.17.0: resolution: {integrity: sha512-hNKz8phvYLPEcRkeG1rsGmV5ChMjKDAWU7/OJJdDErPBNChQXxCo3WZurGpnWc6gZhAzEPFad1aVgyOANH1sMw==} dev: false diff --git a/src/index.ts b/src/index.ts index b5fff0f87..57dec2ef5 100644 --- a/src/index.ts +++ b/src/index.ts @@ -25,6 +25,7 @@ import './menus/options_screen' import './menus/advanced_options_screen' import { notification } from './menus/notification' import './menus/title_screen' +import { initWithRenderer, statsEnd, statsStart } from './rightTopStats' import { options, watchValue } from './optionsStorage' import './reactUi.jsx' @@ -36,7 +37,6 @@ import './watchOptions' import downloadAndOpenFile from './downloadAndOpenFile' import net from 'net' -import Stats from 'stats.js' import mineflayer from 'mineflayer' import { WorldView, Viewer } from 'prismarine-viewer/viewer' import pathfinder from 'mineflayer-pathfinder' @@ -100,27 +100,12 @@ if ('serviceWorker' in navigator && !isCypress() && process.env.NODE_ENV !== 'de // ACTUAL CODE -// todo stats-gl -const stats = new Stats() -const stats2 = new Stats() -stats2.showPanel(2) - -document.body.appendChild(stats.dom) -stats.dom.style.left = '' -stats.dom.style.right = '0px' -stats.dom.style.width = '80px' -stats2.dom.style.width = '80px' -stats2.dom.style.right = '80px' -stats2.dom.style.left = '' -document.body.appendChild(stats2.dom) - -if (localStorage.hideStats || isCypress()) { - stats.dom.style.display = 'none' - stats2.dom.style.display = 'none' -} - // Create three.js context, add to page -const renderer = new THREE.WebGLRenderer() +const renderer = new THREE.WebGLRenderer({ + powerPreference: options.highPerformanceGpu ? 'high-performance' : 'default', +}) +initWithRenderer(renderer.domElement) +window.renderer = renderer renderer.setPixelRatio(window.devicePixelRatio || 1) // todo this value is too high on ios, need to check, probably we should use avg, also need to make it configurable renderer.setSize(window.innerWidth, window.innerHeight) renderer.domElement.id = 'viewer-canvas' @@ -154,13 +139,11 @@ const renderFrame = (time: DOMHighResTimeStamp) => { return } } - stats?.begin() - stats2?.begin() + statsStart() viewer.update() renderer.render(viewer.scene, viewer.camera) postRenderFrameFn() - stats?.end() - stats2?.end() + statsEnd() } renderFrame(performance.now()) @@ -550,7 +533,6 @@ async function connect(connectOptions: { window.Vec3 = Vec3 window.pathfinder = pathfinder window.debugMenu = debugMenu - window.renderer = renderer initVR(bot, renderer, viewer) diff --git a/src/menus/advanced_options_screen.js b/src/menus/advanced_options_screen.js index 8d2c99b63..ce7762dee 100644 --- a/src/menus/advanced_options_screen.js +++ b/src/menus/advanced_options_screen.js @@ -78,6 +78,9 @@ class AdvancedOptionsScreen extends LitElement { { options.touchButtonsSize = +e.target.value }}> + { + options.highPerformanceGpu = !options.highPerformanceGpu + }}>
    hideCurrentModal()}> diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts index 64850314b..969c40140 100644 --- a/src/optionsStorage.ts +++ b/src/optionsStorage.ts @@ -25,6 +25,7 @@ const defaultOptions = { guiScale: 3, autoRequestCompletions: true, touchButtonsSize: 40, + highPerformanceGpu: false, frameLimit: false as number | false, alwaysBackupWorldBeforeLoading: undefined as boolean | undefined | null, diff --git a/src/rightTopStats.ts b/src/rightTopStats.ts new file mode 100644 index 000000000..6ca5fbaa6 --- /dev/null +++ b/src/rightTopStats.ts @@ -0,0 +1,52 @@ +import Stats from 'stats.js' +import StatsGl from 'stats-gl' +import { isCypress } from './utils' + +const stats = new Stats() +const stats2 = new Stats() +// in my case values are good: gpu: < 0.5, cpu < 0.15 +const statsGl = new StatsGl() +stats2.showPanel(2) + +let total = 0 +const addStat = (dom, size = 80) => { + dom.style.left = '' + dom.style.right = `${total}px` + dom.style.width = '80px' + document.body.appendChild(dom) + total += size +} +addStat(stats.dom) +addStat(stats2.dom) +addStat(statsGl.container) + +if (localStorage.hideStats || isCypress()) { + stats.dom.style.display = 'none' + stats2.dom.style.display = 'none' + statsGl.container.style.display = 'none' +} + +export const initWithRenderer = (canvas) => { + statsGl.init(canvas) + statsGl.container.style.display = 'flex' + statsGl.container.style.justifyContent = 'flex-end' + let i = 0 + for (const _child of statsGl.container.children) { + const child = _child as HTMLElement + if (i++ === 0) { + child.style.display = 'none' + } + child.style.position = '' + } +} + +export const statsStart = () => { + stats.begin() + stats2.begin() + statsGl.begin() +} +export const statsEnd = () => { + stats.end() + stats2.end() + statsGl.end() +} From f081d16362407ef77d5b2cc57eec99a51b34c2a5 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 27 Sep 2023 18:21:41 +0300 Subject: [PATCH 311/318] fix eslint in more js files --- src/menus/components/hotbar.js | 4 ++-- src/menus/keybinds_screen.js | 4 ++-- src/menus/notification.js | 32 ++++++++++++++++---------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/menus/components/hotbar.js b/src/menus/components/hotbar.js index c4dd7477d..57f0274b9 100644 --- a/src/menus/components/hotbar.js +++ b/src/menus/components/hotbar.js @@ -154,7 +154,7 @@ class Hotbar extends LitElement { const slotStack = slotEl.children[1] slotIcon.style['background-position-x'] = `-${sprite.x}px` slotIcon.style['background-position-y'] = `-${sprite.y}px` - slotStack.innerText = newItem?.count > 1 ? newItem.count : '' + slotStack.textContent = newItem?.count > 1 ? newItem.count : '' }) } @@ -167,7 +167,7 @@ class Hotbar extends LitElement { const slotStack = slotEl.children[1] slotIcon.style['background-position-x'] = `-${sprite.x}px` slotIcon.style['background-position-y'] = `-${sprite.y}px` - slotStack.innerText = item?.count > 1 ? item.count : '' + slotStack.textContent = item?.count > 1 ? item.count : '' } } diff --git a/src/menus/keybinds_screen.js b/src/menus/keybinds_screen.js index d82f02104..739199d97 100644 --- a/src/menus/keybinds_screen.js +++ b/src/menus/keybinds_screen.js @@ -163,8 +163,8 @@ class KeyBindsScreen extends LitElement { } onResetAllPress () { - for (let i = 0; i < this.keymaps.length; i++) { - this.keymaps[i].key = this.keymaps[i].defaultKey + for (const keymap of this.keymaps) { + keymap.key = keymap.defaultKey } this.requestUpdate() } diff --git a/src/menus/notification.js b/src/menus/notification.js index fb42ade00..4982fd6f3 100644 --- a/src/menus/notification.js +++ b/src/menus/notification.js @@ -27,6 +27,22 @@ class Notification extends LitElement { } } + constructor () { + super() + this.renderHtml = false + let timeout + subscribe(notification, () => { + if (timeout) clearTimeout(timeout) + this.requestUpdate() + if (!notification.show) return + this.renderHtml = true + if (!notification.autoHide) return + timeout = setTimeout(() => { + notification.show = false + }, 3000) + }) + } + render () { if (!this.renderHtml) return const show = notification.show && notification.message @@ -45,22 +61,6 @@ class Notification extends LitElement { } } - constructor () { - super() - this.renderHtml = false - let timeout - subscribe(notification, () => { - if (timeout) clearTimeout(timeout) - this.requestUpdate() - if (!notification.show) return - this.renderHtml = true - if (!notification.autoHide) return - timeout = setTimeout(() => { - notification.show = false - }, 3000) - }) - } - static get styles () { return css` .notification { From bcb10e368be81823d33edac792c2944ab44ef66c Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 27 Sep 2023 18:21:56 +0300 Subject: [PATCH 312/318] use excludeCommunicationDebugEvents for local server --- src/customClient.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/customClient.js b/src/customClient.js index 3b1a06c48..9bdc725b3 100644 --- a/src/customClient.js +++ b/src/customClient.js @@ -1,3 +1,5 @@ +import { options } from './optionsStorage' + //@ts-check const { EventEmitter } = require('events') const debug = require('debug')('minecraft-protocol') @@ -31,7 +33,9 @@ class CustomChannelClient extends EventEmitter { setSerializer (state) { customCommunication.receiverSetup.call(this, (/** @type {{name, params, state?}} */parsed) => { - debug(`receive in ${this.isServer ? 'server' : 'client'}: ${parsed.name}`) + if (!options.excludeCommunicationDebugEvents.includes(parsed.name)) { + debug(`receive in ${this.isServer ? 'server' : 'client'}: ${parsed.name}`) + } this.emit(parsed.name, parsed.params, parsed) this.emit('packet_name', parsed.name, parsed.params, parsed) }) @@ -52,8 +56,10 @@ class CustomChannelClient extends EventEmitter { } write (name, params) { - debug(`[${this.state}] from ${this.isServer ? 'server' : 'client'}: ` + name) - debug(params) + if(!options.excludeCommunicationDebugEvents.includes(name)) { + debug(`[${this.state}] from ${this.isServer ? 'server' : 'client'}: ` + name) + debug(params) + } customCommunication.sendData.call(this, { name, params, state: this.state }) } From 443d89b48ddb11fd660dbb7892153d5ccb05537d Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 27 Sep 2023 18:22:17 +0300 Subject: [PATCH 313/318] fix: include local commands only in singleplayer --- src/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chat.js b/src/chat.js index ca84e3426..d62332487 100644 --- a/src/chat.js +++ b/src/chat.js @@ -496,7 +496,7 @@ class ChatBox extends LitElement { if (items[0].match) items = items.map(i => i.match) } if (value !== this.completeRequestValue) return - if (this.completeRequestValue === '/') items = [...items, ...getBuiltinCommandsList()] + if (this.completeRequestValue === '/' && localServer) items = [...items, ...getBuiltinCommandsList()] this.completionItems = items this.completionItemsSource = items } From 5bdf62606741b886c30c7568d5abda16164d7ec7 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 27 Sep 2023 18:43:02 +0300 Subject: [PATCH 314/318] fix most annoying ts-js issue here I guess --- package.json | 4 +++- pnpm-lock.yaml | 23 +++++++++++++++++++++-- src/index.ts | 2 +- src/inventory.ts | 2 +- tsconfig.json | 5 ++++- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index c4583de80..c5dea3be7 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "iconify-icon": "^1.0.8", "jszip": "^3.10.1", "lit": "^2.8.0", - "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "minecraft-data": "^3.0.0", "net-browserify": "github:zardoy/prismarinejs-net-browserify", "peerjs": "^1.5.0", @@ -56,6 +56,8 @@ "workbox-build": "^7.0.0" }, "devDependencies": { + "@types/lodash-es": "^4.17.9", + "@types/stats.js": "^0.17.1", "@types/three": "0.128.0", "assert": "^2.0.0", "browserify-zlib": "^0.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 22df00cfe..b227fcb79 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,7 +72,7 @@ importers: lit: specifier: ^2.8.0 version: 2.8.0 - lodash: + lodash-es: specifier: ^4.17.21 version: 4.17.21 minecraft-assets: @@ -112,6 +112,12 @@ importers: specifier: ^7.0.0 version: 7.0.0 devDependencies: + '@types/lodash-es': + specifier: ^4.17.9 + version: 4.17.9 + '@types/stats.js': + specifier: ^0.17.1 + version: 0.17.1 '@types/three': specifier: 0.128.0 version: 0.128.0 @@ -2871,6 +2877,16 @@ packages: resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} dev: true + /@types/lodash-es@4.17.9: + resolution: {integrity: sha512-ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ==} + dependencies: + '@types/lodash': 4.14.199 + dev: true + + /@types/lodash@4.14.199: + resolution: {integrity: sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg==} + dev: true + /@types/node@14.18.56: resolution: {integrity: sha512-+k+57NVS9opgrEn5l9c0gvD1r6C+PtyhVE4BTnMMRwiEA8ZO8uFcs6Yy2sXIy0eC95ZurBtRSvhZiHXBysbl6w==} @@ -2941,6 +2957,10 @@ packages: resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} dev: true + /@types/stats.js@0.17.1: + resolution: {integrity: sha512-OgfYE1x2w1jRUXzzKABX+kOdwz2y9PE0uSwnZabkWfJTWOzm7Pvfm4JI2xqRE0q2nwUe2jZLWcrcnhd9lQU63w==} + dev: true + /@types/three@0.128.0: resolution: {integrity: sha512-Jwq5XYUkzAcPTo34hlGAQGUyAI0b2F3aCCFWG/v7ZhJBEG5HGcusMSr70GhDlT8Gs0f02QnSPZ2RCA1MrCOa/w==} dev: true @@ -8195,7 +8215,6 @@ packages: /lodash-es@4.17.21: resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} - dev: true /lodash.compact@3.0.1: resolution: {integrity: sha512-2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ==} diff --git a/src/index.ts b/src/index.ts index 57dec2ef5..72c97dcb8 100644 --- a/src/index.ts +++ b/src/index.ts @@ -78,7 +78,7 @@ import serverOptions from './defaultLocalServerOptions' import updateTime from './updateTime' import { subscribeKey } from 'valtio/utils' -import _ from 'lodash' +import _ from 'lodash-es' import { genTexturePackTextures, watchTexturepackInViewer } from './texturePack' import { connectToPeer } from './localServerMultiplayer' diff --git a/src/inventory.ts b/src/inventory.ts index d8e513e9e..72b712190 100644 --- a/src/inventory.ts +++ b/src/inventory.ts @@ -134,7 +134,7 @@ subscribe(activeModalStack, () => { const inventoryOpened = activeModalStack.at(-1)?.reactType === 'inventory' if (inventoryOpened) { const inv = showInventory(undefined, getImage, {}, bot) - inv.canvas.style.zIndex = 10 + inv.canvas.style.zIndex = '10' inv.canvas.style.position = 'fixed' inv.canvas.style.inset = '0' // todo scaling diff --git a/tsconfig.json b/tsconfig.json index 754ae40e4..1665bf346 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,7 +14,10 @@ "allowUnreachableCode": true, "forceConsistentCasingInFileNames": true, "useUnknownInCatchVariables": false, - "skipLibCheck": true + "skipLibCheck": true, + // this the only options that allows smooth transition from js to ts (by not dropping types from js files) + // however might need to consider includeing *only needed libraries* instead of using this + "maxNodeModuleJsDepth": 1 // "strictNullChecks": true }, "include": [ From f60e3638ae7c9dde00d11e1ea20809f6553eaefa Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 27 Sep 2023 18:51:05 +0300 Subject: [PATCH 315/318] manual build fixes --- pnpm-lock.yaml | 7 ++++--- scripts/build.js | 1 - src/index.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b227fcb79..30351b627 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2819,7 +2819,7 @@ packages: /@types/cors@2.8.13: resolution: {integrity: sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==} dependencies: - '@types/node': 20.6.2 + '@types/node': 20.6.4 /@types/eslint-scope@3.7.4: resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==} @@ -2892,6 +2892,7 @@ packages: /@types/node@20.5.7: resolution: {integrity: sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==} + requiresBuild: true /@types/node@20.6.2: resolution: {integrity: sha512-Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw==} @@ -5096,7 +5097,7 @@ packages: dependencies: '@types/cookie': 0.4.1 '@types/cors': 2.8.13 - '@types/node': 20.6.2 + '@types/node': 20.6.4 accepts: 1.3.8 base64id: 2.0.0 cookie: 0.4.2 @@ -12310,7 +12311,7 @@ packages: compression: 1.7.4 express: 4.18.2 minecraft-data: 3.45.0 - prismarine-block: github.com/zardoy/prismarine-block/100f3e3be7927b8144e19a71c8d06f6218021a02 + prismarine-block: github.com/zardoy/prismarine-block/753cf1fe507f7647063c69d5c124d40f85b29cc2 prismarine-chunk: 1.35.0(minecraft-data@3.45.0) prismarine-world: github.com/zardoy/prismarine-world/c358222204d21fe7d45379fbfcefb047f926c786 socket.io: 4.7.2 diff --git a/scripts/build.js b/scripts/build.js index c149e30da..90cc36c4f 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -1,5 +1,4 @@ //@ts-check -//@ts-check const fsExtra = require('fs-extra') const defaultLocalServerOptions = require('../src/defaultLocalServerOptions') const glob = require('glob') diff --git a/src/index.ts b/src/index.ts index 72c97dcb8..1dd929fc6 100644 --- a/src/index.ts +++ b/src/index.ts @@ -112,7 +112,7 @@ renderer.domElement.id = 'viewer-canvas' document.body.appendChild(renderer.domElement) // Create viewer -const viewer: import('prismarine-viewer/viewer/lib/viewer').Viewer = new Viewer(renderer, options.numWorkers) +const viewer: import('prismarine-viewer/viewer/lib/viewer').Viewer = new Viewer(renderer) window.viewer = viewer initPanoramaOptions(viewer) watchTexturepackInViewer(viewer) From 295253ce201ea6bc50469df2a3489c692aefcf91 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 27 Sep 2023 18:51:27 +0300 Subject: [PATCH 316/318] remove my links --- src/menus/advanced_options_screen.js | 2 -- src/menus/play_screen.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/menus/advanced_options_screen.js b/src/menus/advanced_options_screen.js index ce7762dee..f87e8797f 100644 --- a/src/menus/advanced_options_screen.js +++ b/src/menus/advanced_options_screen.js @@ -58,8 +58,6 @@ class AdvancedOptionsScreen extends LitElement { options.alwaysShowMobileControls = !options.alwaysShowMobileControls } }> - - openURL('https://gist.github.com/zardoy/6e5ce377d2b4c1e322e660973da069cd')}>
    -

    Enter proxy url you want to use. Learn more.

    +

    Enter proxy url you want to use.

    Date: Wed, 27 Sep 2023 18:51:49 +0300 Subject: [PATCH 317/318] run preview on every pr commit --- .github/workflows/preview.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index bc5d5ecd1..e62f4f770 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -3,17 +3,10 @@ env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} on: - issue_comment: - types: [created] + pull_request: jobs: deploy: runs-on: ubuntu-latest - # todo skip already created deploys on that commit - if: >- - github.event.issue.pull_request != '' && - ( - contains(github.event.comment.body, '/deploy') - ) permissions: pull-requests: write steps: From 9bb29a3a80bc7cf6a0a26fdff172179ac0b4f2a5 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 27 Sep 2023 18:57:18 +0300 Subject: [PATCH 318/318] preview: simplify checkout --- .github/workflows/preview.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index e62f4f770..c51df9b31 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -12,9 +12,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - with: - fetch-depth: 0 - ref: refs/pull/${{ github.event.issue.number }}/head - name: Install Global Dependencies run: npm install --global vercel pnpm - name: Pull Vercel Environment Information