diff --git a/puzzling-potions/.prettierrc.json b/puzzling-potions/.prettierrc similarity index 77% rename from puzzling-potions/.prettierrc.json rename to puzzling-potions/.prettierrc index e291c40..5738f88 100644 --- a/puzzling-potions/.prettierrc.json +++ b/puzzling-potions/.prettierrc @@ -2,5 +2,5 @@ "tabWidth": 4, "singleQuote": true, "trailingComma": "all", - "printWidth": 100 + "printWidth": 120 } diff --git a/puzzling-potions/package-lock.json b/puzzling-potions/package-lock.json index 03ff5b2..d82cae9 100644 --- a/puzzling-potions/package-lock.json +++ b/puzzling-potions/package-lock.json @@ -8,11 +8,11 @@ "name": "puzzling-potions", "version": "0.0.1", "dependencies": { - "@pixi/sound": "^5.2.2", - "@pixi/spine-pixi": "^1.0.4", - "@pixi/ui": "^0.10.2", - "gsap": "^3.12.2", - "pixi.js": "^8.0.0-rc.2" + "@pixi/sound": "^6.0.0", + "@pixi/spine-pixi": "^1.0.6", + "@pixi/ui": "^2.0.0", + "gsap": "^3.12.5", + "pixi.js": "^8.0.3" }, "devDependencies": { "@assetpack/cli": "^0.8.0", @@ -24,9 +24,10 @@ "@assetpack/plugin-texture-packer": "^0.8.0", "@assetpack/plugin-webfont": "^0.8.0", "npm-run-all": "^4.1.5", + "prettier": "^3.2.5", "rimraf": "^5.0.5", - "typescript": "^5.2.2", - "vite": "^5.0.11" + "typescript": "^5.4.3", + "vite": "^5.2.2" } }, "node_modules/@assetpack/cli": { @@ -206,9 +207,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.11.tgz", - "integrity": "sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", + "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", "cpu": [ "ppc64" ], @@ -222,9 +223,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.11.tgz", - "integrity": "sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", + "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", "cpu": [ "arm" ], @@ -238,9 +239,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.11.tgz", - "integrity": "sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", + "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", "cpu": [ "arm64" ], @@ -254,9 +255,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.11.tgz", - "integrity": "sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", + "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", "cpu": [ "x64" ], @@ -270,9 +271,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.11.tgz", - "integrity": "sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", + "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", "cpu": [ "arm64" ], @@ -286,9 +287,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.11.tgz", - "integrity": "sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", + "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", "cpu": [ "x64" ], @@ -302,9 +303,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.11.tgz", - "integrity": "sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", + "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", "cpu": [ "arm64" ], @@ -318,9 +319,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.11.tgz", - "integrity": "sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", + "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", "cpu": [ "x64" ], @@ -334,9 +335,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.11.tgz", - "integrity": "sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", + "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", "cpu": [ "arm" ], @@ -350,9 +351,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.11.tgz", - "integrity": "sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", + "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", "cpu": [ "arm64" ], @@ -366,9 +367,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.11.tgz", - "integrity": "sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", + "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", "cpu": [ "ia32" ], @@ -382,9 +383,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.11.tgz", - "integrity": "sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", + "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", "cpu": [ "loong64" ], @@ -398,9 +399,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.11.tgz", - "integrity": "sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", + "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", "cpu": [ "mips64el" ], @@ -414,9 +415,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.11.tgz", - "integrity": "sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", + "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", "cpu": [ "ppc64" ], @@ -430,9 +431,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.11.tgz", - "integrity": "sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", + "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", "cpu": [ "riscv64" ], @@ -446,9 +447,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.11.tgz", - "integrity": "sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", + "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", "cpu": [ "s390x" ], @@ -462,9 +463,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.11.tgz", - "integrity": "sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", + "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", "cpu": [ "x64" ], @@ -478,9 +479,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.11.tgz", - "integrity": "sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", + "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", "cpu": [ "x64" ], @@ -494,9 +495,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.11.tgz", - "integrity": "sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", + "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", "cpu": [ "x64" ], @@ -510,9 +511,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.11.tgz", - "integrity": "sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", + "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", "cpu": [ "x64" ], @@ -526,9 +527,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.11.tgz", - "integrity": "sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", + "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", "cpu": [ "arm64" ], @@ -542,9 +543,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.11.tgz", - "integrity": "sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", + "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", "cpu": [ "ia32" ], @@ -558,9 +559,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.11.tgz", - "integrity": "sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", + "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", "cpu": [ "x64" ], @@ -1347,240 +1348,47 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@pixi/assets": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/assets/-/assets-7.3.3.tgz", - "integrity": "sha512-KcLXVehdJ2kc2bSnTfatLPLL6sLD7dwU+EZ5bWQ/PZDSsfML3kLFvq84VXd4k8LKNX4RCvfy4yeeIUW1o5tnMg==", - "peer": true, - "dependencies": { - "@types/css-font-loading-module": "^0.0.12" - }, - "peerDependencies": { - "@pixi/core": "7.3.3" - } - }, - "node_modules/@pixi/color": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/color/-/color-7.3.3.tgz", - "integrity": "sha512-IiiFhNIqXt7yULe0Wkq5Hn38ymDoEen/6EvV2y2AQIOu6TyuET5PGswAdMfG7ZjfwBaCudK6yQEUjWaXbgRUmw==", - "peer": true, - "dependencies": { - "@pixi/colord": "^2.9.6" - } - }, "node_modules/@pixi/colord": { "version": "2.9.6", "resolved": "https://registry.npmjs.org/@pixi/colord/-/colord-2.9.6.tgz", "integrity": "sha512-nezytU2pw587fQstUu1AsJZDVEynjskwOL+kibwcdxsMBFqPsFFNA7xl0ii/gXuDi6M0xj3mfRJj8pBSc2jCfA==" }, - "node_modules/@pixi/constants": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/constants/-/constants-7.3.3.tgz", - "integrity": "sha512-ww1JdekmKBUqHyPq8A5L+86FkzpS4KidlBm9wkX1fcd+6QQzq/vbx1JOz6m3CmH5LnlmDZ+zysLezvpZlBcwwA==", - "peer": true - }, - "node_modules/@pixi/core": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/core/-/core-7.3.3.tgz", - "integrity": "sha512-064tuK6NoGIl/2Wf4EUlaLLlnRMZuDdLqnISsj2/A70towg2QUWgHhwZsCB4NvAssidWu/sIT+vk5IKDmh1LKA==", - "peer": true, - "dependencies": { - "@pixi/color": "7.3.3", - "@pixi/constants": "7.3.3", - "@pixi/extensions": "7.3.3", - "@pixi/math": "7.3.3", - "@pixi/runner": "7.3.3", - "@pixi/settings": "7.3.3", - "@pixi/ticker": "7.3.3", - "@pixi/utils": "7.3.3", - "@types/offscreencanvas": "^2019.6.4" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/pixijs" - } - }, - "node_modules/@pixi/display": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/display/-/display-7.3.3.tgz", - "integrity": "sha512-iULZ2E6Z4vhI0FypXpUbtA+CODnj/CuTt2pi9gsw00ILI12eEx76cAiazvhxnCNqcfmj1RRK2P6s9Vzr5WmEIg==", - "peer": true, - "peerDependencies": { - "@pixi/core": "7.3.3" - } - }, - "node_modules/@pixi/events": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/events/-/events-7.3.3.tgz", - "integrity": "sha512-1oDfdFtKsy0Z9ew09MrSYGIIeGnBXr/c7866A32Od3KXql0dhd7UpFFpaFKLCXydDHRgFkjOP7t0/Pp1luTvfg==", - "peer": true, - "peerDependencies": { - "@pixi/core": "7.3.3", - "@pixi/display": "7.3.3" - } - }, - "node_modules/@pixi/extensions": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/extensions/-/extensions-7.3.3.tgz", - "integrity": "sha512-Of44Wde0ZHYCuMoDLFl/8SOSPV2NiDBUB6QKBvYvNdhVslbO3pxrn9oQH9Fmsd8iGcGJ/YtyI5H2T/ky4Bo6AQ==", - "peer": true - }, - "node_modules/@pixi/graphics": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/graphics/-/graphics-7.3.3.tgz", - "integrity": "sha512-czX/SEQTSCI3kkH5DFAcchPaPYOAF7cz1P5K2hVvClE/bbbIWN0H2sBIF6pIY1ENkZ0aguQs36yDeXUDWXyoiQ==", - "peer": true, - "peerDependencies": { - "@pixi/core": "7.3.3", - "@pixi/display": "7.3.3", - "@pixi/sprite": "7.3.3" - } - }, - "node_modules/@pixi/math": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/math/-/math-7.3.3.tgz", - "integrity": "sha512-kaHN6iusINPS0wIbrhP82za+B2qNDWHPHip/QtmpQTp81ibOIfHlDMOlsnE6rSdelTFNhrNWoTWU8IvXUbvy8g==", - "peer": true - }, - "node_modules/@pixi/mesh": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/mesh/-/mesh-7.3.3.tgz", - "integrity": "sha512-8G3FO44wLDimNlCqXBKF+zQ3nBqJ4kMBbIjGxRaRkJmahcMYkY2zJpYsYh1YqKQztL9UmcP5V170VEIcPsmaJw==", - "peer": true, - "peerDependencies": { - "@pixi/core": "7.3.3", - "@pixi/display": "7.3.3" - } - }, "node_modules/@pixi/runner": { "version": "7.3.3", "resolved": "https://registry.npmjs.org/@pixi/runner/-/runner-7.3.3.tgz", "integrity": "sha512-LUObHyxM3tK504ChbioYySZhFhyNs779uA71fuWSFV04Ry0WNlbqVvwTbKGkyR6er6blfxdqk7d51WmuQtfLCg==", + "dev": true, "peer": true }, - "node_modules/@pixi/settings": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/settings/-/settings-7.3.3.tgz", - "integrity": "sha512-a1OePduDPOfnrCm1U1RL7JhuEAncA5/jNwF51urclXU6HNTHiJT41/S6KELPoV8NbLyJCKtnKwzbbPkzKwc0Yg==", - "peer": true, - "dependencies": { - "@pixi/constants": "7.3.3", - "@types/css-font-loading-module": "^0.0.12", - "ismobilejs": "^1.1.0" - } - }, "node_modules/@pixi/sound": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/@pixi/sound/-/sound-5.2.2.tgz", - "integrity": "sha512-WjUDD24nQaAA2+aHbvDbgB/9l/kni3aNlZSmunU99KBGrQ9NfGS/VvAUxA88b7eOLXNvskzW2cvEnGMbltRiFA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@pixi/sound/-/sound-6.0.0.tgz", + "integrity": "sha512-fEaCs2JmyYT1qqouFS3DydSccI35dyYD0pKK2hEbIGVDKUTvl224x0p4qme2YU9l465WRtM7gspLzP5fFf1mxQ==", "peerDependencies": { - "@pixi/assets": "^7.0.0", - "@pixi/core": "^7.0.0" + "pixi.js": "^8.0.0" } }, "node_modules/@pixi/spine-pixi": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@pixi/spine-pixi/-/spine-pixi-1.0.4.tgz", - "integrity": "sha512-lshifdnxNr1N2E3PAei73f3GmzNB2awxf/BprSUr3+1VSaQljr51LQWQGVjFevU76qiKSA26bx1g9V6MgqHLTw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@pixi/spine-pixi/-/spine-pixi-1.0.6.tgz", + "integrity": "sha512-9Qk8Pf1czlj2nSRgFz+I1XyC6zQi5A2Y2+Y8jCVSHJyyEgMMIbqCY0qNSlxWLoxTJDJzHfR+rNztlJ+K2uM6aw==", "dependencies": { "@esotericsoftware/spine-core": "~4.1.50" }, - "engines": { - "node": ">=16", - "npm": ">=8" - }, "peerDependencies": { - "pixi.js": "^8.0.0-0" - } - }, - "node_modules/@pixi/sprite": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/sprite/-/sprite-7.3.3.tgz", - "integrity": "sha512-P/RxnvNV0PiuyaT9HA8F1aX9krp1BgjllBQcn6KHVxyAP8tJE0TD9pfHOU1+xRuoX37swXRQiDFTF6YvWzozUQ==", - "peer": true, - "peerDependencies": { - "@pixi/core": "7.3.3", - "@pixi/display": "7.3.3" - } - }, - "node_modules/@pixi/text": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/text/-/text-7.3.3.tgz", - "integrity": "sha512-s9BLmiURYeJppPYB040jrGbtbsWM9PcXSRtr40xrbR0a+HPlxDEWCaHka9DiUFr/lIuOpA0y/YjmZskq5o5R7g==", - "peer": true, - "peerDependencies": { - "@pixi/core": "7.3.3", - "@pixi/sprite": "7.3.3" - } - }, - "node_modules/@pixi/text-bitmap": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/text-bitmap/-/text-bitmap-7.3.3.tgz", - "integrity": "sha512-2IOBoSHtb2e1aoxB/pfJPFW34XeY8HpDtGJKn3F9IUYpBo6nnnZ6DuJNZyFG2r/hiytjVvulqI66CzOH/eJJ4A==", - "peer": true, - "peerDependencies": { - "@pixi/assets": "7.3.3", - "@pixi/core": "7.3.3", - "@pixi/display": "7.3.3", - "@pixi/mesh": "7.3.3", - "@pixi/text": "7.3.3" - } - }, - "node_modules/@pixi/text-html": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/text-html/-/text-html-7.3.3.tgz", - "integrity": "sha512-z8vsgsqVJuFEVX07wh0IYAwQ5DBiel8Lhxo2Ly8594O0mIdQ1IPvtAPv+WRyG35WT0i26J7GL2BZxURouDP2WA==", - "peer": true, - "peerDependencies": { - "@pixi/core": "7.3.3", - "@pixi/display": "7.3.3", - "@pixi/sprite": "7.3.3", - "@pixi/text": "7.3.3" - } - }, - "node_modules/@pixi/ticker": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/ticker/-/ticker-7.3.3.tgz", - "integrity": "sha512-AxeMKP9vTcla+yYXCABc0uKUODjIsJRXk3DCHVpoPeeqRYPaKH291RtDw92QFw7FFgGBbRgsptBjF9Q+uO5hDA==", - "peer": true, - "dependencies": { - "@pixi/extensions": "7.3.3", - "@pixi/settings": "7.3.3", - "@pixi/utils": "7.3.3" + "pixi.js": "^8.0.0" } }, "node_modules/@pixi/ui": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/@pixi/ui/-/ui-0.10.2.tgz", - "integrity": "sha512-MI2cZ4wXmumIiFbpAe3JHRHTgmjxSI2QxUmeVcy/XT+gWsXEHSZ/Hoh54S0A8vGYcwBzBsxBAgdR2s9dXtIsBw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@pixi/ui/-/ui-2.0.0.tgz", + "integrity": "sha512-5RvAGSUFSFskU53gcPAkHvFlzqkzmS2hwjP2XPSn8+aE97ztW3YNnMXlx3tV0YAIXSQlfJyJevAImAxDGmn9oA==", "dependencies": { "tweedle.js": "^2.1.0", "typed-signals": "^2.5.0" }, "peerDependencies": { - "@pixi/core": "^7.3.1", - "@pixi/display": "^7.3.1", - "@pixi/events": "^7.3.1", - "@pixi/graphics": "^7.3.1", - "@pixi/sprite": "^7.3.1", - "@pixi/text": "^7.3.1", - "@pixi/text-bitmap": "^7.3.1", - "@pixi/text-html": "^7.3.1" - } - }, - "node_modules/@pixi/utils": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/@pixi/utils/-/utils-7.3.3.tgz", - "integrity": "sha512-rgWD0YV6oDKOVuQJ9ra6g3VdoN8usC6Kj/t3Ba1t9P+k9qUKIM0gCr9/bxFf7CJ/EUS8A2WTVfEmJVN2TwZfxg==", - "peer": true, - "dependencies": { - "@pixi/color": "7.3.3", - "@pixi/constants": "7.3.3", - "@pixi/settings": "7.3.3", - "@types/earcut": "^2.1.0", - "earcut": "^2.2.4", - "eventemitter3": "^4.0.0", - "url": "^0.11.0" + "pixi.js": "^8.0.2" } }, "node_modules/@pkgjs/parseargs": { @@ -1594,9 +1402,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.4.tgz", - "integrity": "sha512-ub/SN3yWqIv5CWiAZPHVS1DloyZsJbtXmX4HxUTIpS0BHm9pW5iYBo2mIZi+hE3AeiTzHz33blwSnhdUo+9NpA==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz", + "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==", "cpu": [ "arm" ], @@ -1607,9 +1415,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.4.tgz", - "integrity": "sha512-ehcBrOR5XTl0W0t2WxfTyHCR/3Cq2jfb+I4W+Ch8Y9b5G+vbAecVv0Fx/J1QKktOrgUYsIKxWAKgIpvw56IFNA==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz", + "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==", "cpu": [ "arm64" ], @@ -1620,9 +1428,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.4.tgz", - "integrity": "sha512-1fzh1lWExwSTWy8vJPnNbNM02WZDS8AW3McEOb7wW+nPChLKf3WG2aG7fhaUmfX5FKw9zhsF5+MBwArGyNM7NA==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz", + "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==", "cpu": [ "arm64" ], @@ -1633,9 +1441,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.4.tgz", - "integrity": "sha512-Gc6cukkF38RcYQ6uPdiXi70JB0f29CwcQ7+r4QpfNpQFVHXRd0DfWFidoGxjSx1DwOETM97JPz1RXL5ISSB0pA==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz", + "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==", "cpu": [ "x64" ], @@ -1646,9 +1454,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.4.tgz", - "integrity": "sha512-g21RTeFzoTl8GxosHbnQZ0/JkuFIB13C3T7Y0HtKzOXmoHhewLbVTFBQZu+z5m9STH6FZ7L/oPgU4Nm5ErN2fw==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz", + "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==", "cpu": [ "arm" ], @@ -1659,9 +1467,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.4.tgz", - "integrity": "sha512-TVYVWD/SYwWzGGnbfTkrNpdE4HON46orgMNHCivlXmlsSGQOx/OHHYiQcMIOx38/GWgwr/po2LBn7wypkWw/Mg==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz", + "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==", "cpu": [ "arm64" ], @@ -1672,9 +1480,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.4.tgz", - "integrity": "sha512-XcKvuendwizYYhFxpvQ3xVpzje2HHImzg33wL9zvxtj77HvPStbSGI9czrdbfrf8DGMcNNReH9pVZv8qejAQ5A==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz", + "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==", "cpu": [ "arm64" ], @@ -1685,9 +1493,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.4.tgz", - "integrity": "sha512-LFHS/8Q+I9YA0yVETyjonMJ3UA+DczeBd/MqNEzsGSTdNvSJa1OJZcSH8GiXLvcizgp9AlHs2walqRcqzjOi3A==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz", + "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==", "cpu": [ "riscv64" ], @@ -1698,9 +1506,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.4.tgz", - "integrity": "sha512-dIYgo+j1+yfy81i0YVU5KnQrIJZE8ERomx17ReU4GREjGtDW4X+nvkBak2xAUpyqLs4eleDSj3RrV72fQos7zw==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz", + "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==", "cpu": [ "x64" ], @@ -1711,9 +1519,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.4.tgz", - "integrity": "sha512-RoaYxjdHQ5TPjaPrLsfKqR3pakMr3JGqZ+jZM0zP2IkDtsGa4CqYaWSfQmZVgFUCgLrTnzX+cnHS3nfl+kB6ZQ==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz", + "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==", "cpu": [ "x64" ], @@ -1724,9 +1532,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.4.tgz", - "integrity": "sha512-T8Q3XHV+Jjf5e49B4EAaLKV74BbX7/qYBRQ8Wop/+TyyU0k+vSjiLVSHNWdVd1goMjZcbhDmYZUYW5RFqkBNHQ==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz", + "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==", "cpu": [ "arm64" ], @@ -1737,9 +1545,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.4.tgz", - "integrity": "sha512-z+JQ7JirDUHAsMecVydnBPWLwJjbppU+7LZjffGf+Jvrxq+dVjIE7By163Sc9DKc3ADSU50qPVw0KonBS+a+HQ==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz", + "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==", "cpu": [ "ia32" ], @@ -1750,9 +1558,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.4.tgz", - "integrity": "sha512-LfdGXCV9rdEify1oxlN9eamvDSjv9md9ZVMAbNHA87xqIfFCxImxan9qZ8+Un54iK2nnqPlbnSi4R54ONtbWBw==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz", + "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==", "cpu": [ "x64" ], @@ -1851,12 +1659,6 @@ "undici-types": "~5.26.4" } }, - "node_modules/@types/offscreencanvas": { - "version": "2019.7.3", - "resolved": "https://registry.npmjs.org/@types/offscreencanvas/-/offscreencanvas-2019.7.3.tgz", - "integrity": "sha512-ieXiYmgSRXUDeOntE1InxjWyvEelZGP63M+cGuquuRLuIKKT1osnkXjxev9B7d1nXSug5vpunx+gNlbVxMlC9A==", - "peer": true - }, "node_modules/@webgpu/types": { "version": "0.1.40", "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.40.tgz", @@ -2432,6 +2234,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", + "dev": true, "dependencies": { "function-bind": "^1.1.2", "get-intrinsic": "^1.2.1", @@ -2870,6 +2673,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dev": true, "dependencies": { "get-intrinsic": "^1.2.1", "gopd": "^1.0.1", @@ -3131,9 +2935,9 @@ "dev": true }, "node_modules/esbuild": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.11.tgz", - "integrity": "sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", + "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", "dev": true, "hasInstallScript": true, "bin": { @@ -3143,29 +2947,29 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.19.11", - "@esbuild/android-arm": "0.19.11", - "@esbuild/android-arm64": "0.19.11", - "@esbuild/android-x64": "0.19.11", - "@esbuild/darwin-arm64": "0.19.11", - "@esbuild/darwin-x64": "0.19.11", - "@esbuild/freebsd-arm64": "0.19.11", - "@esbuild/freebsd-x64": "0.19.11", - "@esbuild/linux-arm": "0.19.11", - "@esbuild/linux-arm64": "0.19.11", - "@esbuild/linux-ia32": "0.19.11", - "@esbuild/linux-loong64": "0.19.11", - "@esbuild/linux-mips64el": "0.19.11", - "@esbuild/linux-ppc64": "0.19.11", - "@esbuild/linux-riscv64": "0.19.11", - "@esbuild/linux-s390x": "0.19.11", - "@esbuild/linux-x64": "0.19.11", - "@esbuild/netbsd-x64": "0.19.11", - "@esbuild/openbsd-x64": "0.19.11", - "@esbuild/sunos-x64": "0.19.11", - "@esbuild/win32-arm64": "0.19.11", - "@esbuild/win32-ia32": "0.19.11", - "@esbuild/win32-x64": "0.19.11" + "@esbuild/aix-ppc64": "0.20.2", + "@esbuild/android-arm": "0.20.2", + "@esbuild/android-arm64": "0.20.2", + "@esbuild/android-x64": "0.20.2", + "@esbuild/darwin-arm64": "0.20.2", + "@esbuild/darwin-x64": "0.20.2", + "@esbuild/freebsd-arm64": "0.20.2", + "@esbuild/freebsd-x64": "0.20.2", + "@esbuild/linux-arm": "0.20.2", + "@esbuild/linux-arm64": "0.20.2", + "@esbuild/linux-ia32": "0.20.2", + "@esbuild/linux-loong64": "0.20.2", + "@esbuild/linux-mips64el": "0.20.2", + "@esbuild/linux-ppc64": "0.20.2", + "@esbuild/linux-riscv64": "0.20.2", + "@esbuild/linux-s390x": "0.20.2", + "@esbuild/linux-x64": "0.20.2", + "@esbuild/netbsd-x64": "0.20.2", + "@esbuild/openbsd-x64": "0.20.2", + "@esbuild/sunos-x64": "0.20.2", + "@esbuild/win32-arm64": "0.20.2", + "@esbuild/win32-ia32": "0.20.2", + "@esbuild/win32-x64": "0.20.2" } }, "node_modules/escape-goat": { @@ -3186,12 +2990,6 @@ "node": ">=0.8.0" } }, - "node_modules/eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "peer": true - }, "node_modules/exif-parser": { "version": "0.1.12", "resolved": "https://registry.npmjs.org/exif-parser/-/exif-parser-0.1.12.tgz", @@ -3520,6 +3318,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3574,6 +3373,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", + "dev": true, "dependencies": { "function-bind": "^1.1.2", "has-proto": "^1.0.1", @@ -3731,6 +3531,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -3788,9 +3589,9 @@ "dev": true }, "node_modules/gsap": { - "version": "3.12.4", - "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.12.4.tgz", - "integrity": "sha512-1ByAq8dD0W4aBZ/JArgaQvc0gyUfkGkP8mgAQa0qZGdpOKlSOhOf+WNXjoLimKaKG3Z4Iu6DKZtnyszqQeyqWQ==" + "version": "3.12.5", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.12.5.tgz", + "integrity": "sha512-srBfnk4n+Oe/ZnMIOXt3gT605BX9x5+rh/prT2F1SsNJsU1XuMiP0E2aptW481OnonOGACZWBqseH5Z7csHxhQ==" }, "node_modules/handlebars": { "version": "4.7.8", @@ -3867,6 +3668,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "dev": true, "dependencies": { "get-intrinsic": "^1.2.2" }, @@ -3878,6 +3680,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -3889,6 +3692,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -3930,6 +3734,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dev": true, "dependencies": { "function-bind": "^1.1.2" }, @@ -5550,6 +5355,7 @@ "version": "1.13.1", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -5951,9 +5757,9 @@ } }, "node_modules/pixi.js": { - "version": "8.0.0-rc.3", - "resolved": "https://registry.npmjs.org/pixi.js/-/pixi.js-8.0.0-rc.3.tgz", - "integrity": "sha512-IZp8wO6W5iOMv/UpVXsCMOyvOh23UG4XNqqbgq0nZz0aaT03njax7Nfj3i6J7r3HlfGTfLW0yWGAIq7VlVSvuA==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/pixi.js/-/pixi.js-8.0.3.tgz", + "integrity": "sha512-+G0hg6Mzl2WMD4KG1O6B3H3WIWOCik/9PK2F/WyKMQd/qcHE3tIFkebtGbLqsbc7kRzZM1xT1qcyx8anSsmnvg==", "dependencies": { "@pixi/colord": "^2.9.6", "@types/css-font-loading-module": "^0.0.12", @@ -5981,9 +5787,9 @@ } }, "node_modules/postcss": { - "version": "8.4.33", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", - "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", "dev": true, "funding": [ { @@ -6002,7 +5808,7 @@ "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "source-map-js": "^1.2.0" }, "engines": { "node": "^10 || ^12 || >=14" @@ -6086,6 +5892,21 @@ "node": ">=4" } }, + "node_modules/prettier": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", + "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "dev": true, + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -6465,9 +6286,9 @@ } }, "node_modules/rollup": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.4.tgz", - "integrity": "sha512-2ztU7pY/lrQyXSCnnoU4ICjT/tCG9cdH3/G25ERqE3Lst6vl2BCM5hL2Nw+sslAvAf+ccKsAq1SkKQALyqhR7g==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz", + "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==", "dev": true, "dependencies": { "@types/estree": "1.0.5" @@ -6480,19 +6301,19 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.9.4", - "@rollup/rollup-android-arm64": "4.9.4", - "@rollup/rollup-darwin-arm64": "4.9.4", - "@rollup/rollup-darwin-x64": "4.9.4", - "@rollup/rollup-linux-arm-gnueabihf": "4.9.4", - "@rollup/rollup-linux-arm64-gnu": "4.9.4", - "@rollup/rollup-linux-arm64-musl": "4.9.4", - "@rollup/rollup-linux-riscv64-gnu": "4.9.4", - "@rollup/rollup-linux-x64-gnu": "4.9.4", - "@rollup/rollup-linux-x64-musl": "4.9.4", - "@rollup/rollup-win32-arm64-msvc": "4.9.4", - "@rollup/rollup-win32-ia32-msvc": "4.9.4", - "@rollup/rollup-win32-x64-msvc": "4.9.4", + "@rollup/rollup-android-arm-eabi": "4.13.0", + "@rollup/rollup-android-arm64": "4.13.0", + "@rollup/rollup-darwin-arm64": "4.13.0", + "@rollup/rollup-darwin-x64": "4.13.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.13.0", + "@rollup/rollup-linux-arm64-gnu": "4.13.0", + "@rollup/rollup-linux-arm64-musl": "4.13.0", + "@rollup/rollup-linux-riscv64-gnu": "4.13.0", + "@rollup/rollup-linux-x64-gnu": "4.13.0", + "@rollup/rollup-linux-x64-musl": "4.13.0", + "@rollup/rollup-win32-arm64-msvc": "4.13.0", + "@rollup/rollup-win32-ia32-msvc": "4.13.0", + "@rollup/rollup-win32-x64-msvc": "4.13.0", "fsevents": "~2.3.2" } }, @@ -6603,6 +6424,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "dev": true, "dependencies": { "define-data-property": "^1.1.1", "get-intrinsic": "^1.2.1", @@ -6711,6 +6533,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, "dependencies": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -6834,9 +6657,9 @@ } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "dev": true, "engines": { "node": ">=0.10.0" @@ -7441,9 +7264,9 @@ } }, "node_modules/typescript": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", - "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz", + "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -7627,16 +7450,6 @@ "punycode": "^2.1.0" } }, - "node_modules/url": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz", - "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==", - "peer": true, - "dependencies": { - "punycode": "^1.4.1", - "qs": "^6.11.2" - } - }, "node_modules/url-parse-lax": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", @@ -7661,27 +7474,6 @@ "node": ">=0.10.0" } }, - "node_modules/url/node_modules/punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", - "peer": true - }, - "node_modules/url/node_modules/qs": { - "version": "6.11.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", - "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", - "peer": true, - "dependencies": { - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/utif": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/utif/-/utif-2.0.1.tgz", @@ -7738,14 +7530,14 @@ } }, "node_modules/vite": { - "version": "5.0.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.11.tgz", - "integrity": "sha512-XBMnDjZcNAw/G1gEiskiM1v6yzM4GE5aMGvhWTlHAYYhxb7S3/V1s3m2LDHa8Vh6yIWYYB0iJwsEaS523c4oYA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.2.tgz", + "integrity": "sha512-FWZbz0oSdLq5snUI0b6sULbz58iXFXdvkZfZWR/F0ZJuKTSPO7v72QPXt6KqYeMFb0yytNp6kZosxJ96Nr/wDQ==", "dev": true, "dependencies": { - "esbuild": "^0.19.3", - "postcss": "^8.4.32", - "rollup": "^4.2.0" + "esbuild": "^0.20.1", + "postcss": "^8.4.36", + "rollup": "^4.13.0" }, "bin": { "vite": "bin/vite.js" diff --git a/puzzling-potions/package.json b/puzzling-potions/package.json index 9531e88..58a71e0 100644 --- a/puzzling-potions/package.json +++ b/puzzling-potions/package.json @@ -11,14 +11,15 @@ "types": "tsc", "prepreview": "run-s build", "preview": "vite preview --open", - "clean": "rimraf public/assets/* dist/* .assetpack/*" + "clean": "rimraf public/assets/* dist/* .assetpack/*", + "lint:fix": "prettier --write src/**/*.ts" }, "dependencies": { - "@pixi/sound": "^5.2.2", - "@pixi/spine-pixi": "^1.0.4", - "@pixi/ui": "^0.10.2", - "gsap": "^3.12.2", - "pixi.js": "^8.0.0-rc.2" + "@pixi/sound": "^6.0.0", + "@pixi/spine-pixi": "^1.0.6", + "@pixi/ui": "^2.0.0", + "gsap": "^3.12.5", + "pixi.js": "^8.0.3" }, "devDependencies": { "@assetpack/cli": "^0.8.0", @@ -30,8 +31,9 @@ "@assetpack/plugin-texture-packer": "^0.8.0", "@assetpack/plugin-webfont": "^0.8.0", "npm-run-all": "^4.1.5", + "prettier": "^3.2.5", "rimraf": "^5.0.5", - "typescript": "^5.2.2", - "vite": "^5.0.11" + "typescript": "^5.4.3", + "vite": "^5.2.2" } } diff --git a/puzzling-potions/src/match3/Match3Actions.ts b/puzzling-potions/src/match3/Match3Actions.ts index 3376cce..89a49a5 100644 --- a/puzzling-potions/src/match3/Match3Actions.ts +++ b/puzzling-potions/src/match3/Match3Actions.ts @@ -87,9 +87,7 @@ export class Match3Actions { const type = match3GetPieceType(this.match3.board.grid, from); const specialFrom = this.match3.special.isSpecial(type); - const specialTo = this.match3.special.isSpecial( - match3GetPieceType(this.match3.board.grid, to), - ); + const specialTo = this.match3.special.isSpecial(match3GetPieceType(this.match3.board.grid, to)); // Always allow move that either or both are special pieces if (specialFrom || specialTo) return true; @@ -153,14 +151,10 @@ export class Match3Actions { pieceA.animateSwap(viewPositionA.x, viewPositionA.y), pieceB.animateSwap(viewPositionB.x, viewPositionB.y), ]); - } else if ( - this.match3.special.isSpecial(match3GetPieceType(this.match3.board.grid, positionA)) - ) { + } else if (this.match3.special.isSpecial(match3GetPieceType(this.match3.board.grid, positionA))) { // Pop piece A if is special await this.match3.board.popPiece(positionA); - } else if ( - this.match3.special.isSpecial(match3GetPieceType(this.match3.board.grid, positionB)) - ) { + } else if (this.match3.special.isSpecial(match3GetPieceType(this.match3.board.grid, positionB))) { // Pop piece B if is special await this.match3.board.popPiece(positionB); } diff --git a/puzzling-potions/src/match3/Match3Board.ts b/puzzling-potions/src/match3/Match3Board.ts index 492a7c8..f688422 100644 --- a/puzzling-potions/src/match3/Match3Board.ts +++ b/puzzling-potions/src/match3/Match3Board.ts @@ -46,9 +46,7 @@ export class Match3Board { this.piecesContainer = new Container(); this.match3.addChild(this.piecesContainer); - this.piecesMask = new Graphics() - .rect(-2, -2, 4, 4) - .fill({ color: 0xff0000, alpha: 0.5}); + this.piecesMask = new Graphics().rect(-2, -2, 4, 4).fill({ color: 0xff0000, alpha: 0.5 }); this.match3.addChild(this.piecesMask); this.piecesContainer.mask = this.piecesMask; } diff --git a/puzzling-potions/src/match3/Match3Config.ts b/puzzling-potions/src/match3/Match3Config.ts index 3b5dafe..a2da52f 100644 --- a/puzzling-potions/src/match3/Match3Config.ts +++ b/puzzling-potions/src/match3/Match3Config.ts @@ -2,7 +2,7 @@ export const match3ValidModes = ['test', 'easy', 'normal', 'hard'] as const; /** The game mode type */ -export type Match3Mode = typeof match3ValidModes[number]; +export type Match3Mode = (typeof match3ValidModes)[number]; /** * Map of all available blocks for the game, ordered by game mode. diff --git a/puzzling-potions/src/match3/Match3Piece.ts b/puzzling-potions/src/match3/Match3Piece.ts index c791848..2ee7ab6 100644 --- a/puzzling-potions/src/match3/Match3Piece.ts +++ b/puzzling-potions/src/match3/Match3Piece.ts @@ -1,12 +1,7 @@ import { Container, FederatedPointerEvent, Sprite, Texture } from 'pixi.js'; import gsap from 'gsap'; import { Match3Position } from './Match3Utility'; -import { - resolveAndKillTweens, - registerCustomEase, - pauseTweens, - resumeTweens, -} from '../utils/animation'; +import { resolveAndKillTweens, registerCustomEase, pauseTweens, resumeTweens } from '../utils/animation'; import { app } from '../main'; /** Default piece options */ diff --git a/puzzling-potions/src/match3/Match3Utility.ts b/puzzling-potions/src/match3/Match3Utility.ts index d0a4045..4665304 100644 --- a/puzzling-potions/src/match3/Match3Utility.ts +++ b/puzzling-potions/src/match3/Match3Utility.ts @@ -104,11 +104,7 @@ export function match3GetRandomType(types: Match3Type[], exclude?: Match3Type[]) * @param positionA The first piece to swap * @param positionB The second piece to swap */ -export function match3SwapPieces( - grid: Match3Grid, - positionA: Match3Position, - positionB: Match3Position, -) { +export function match3SwapPieces(grid: Match3Grid, positionA: Match3Position, positionB: Match3Position) { const typeA = match3GetPieceType(grid, positionA); const typeB = match3GetPieceType(grid, positionB); @@ -148,9 +144,7 @@ export function match3GetPieceType(grid: Match3Grid, position: Match3Position) { export function match3IsValidPosition(grid: Match3Grid, position: Match3Position) { const rows = grid.length; const cols = grid[0].length; - return ( - position.row >= 0 && position.row < rows && position.column >= 0 && position.column < cols - ); + return position.row >= 0 && position.row < rows && position.column >= 0 && position.column < cols; } /** @@ -158,10 +152,7 @@ export function match3IsValidPosition(grid: Match3Grid, position: Match3Position * @param grid The grid in context * @param fn Callback for each position in the grid */ -export function match3ForEach( - grid: Match3Grid, - fn: (position: Match3Position, type: Match3Type) => void, -) { +export function match3ForEach(grid: Match3Grid, fn: (position: Match3Position, type: Match3Type) => void) { for (let r = 0; r < grid.length; r++) { for (let c = 0; c < grid[r].length; c++) { fn({ row: r, column: c }, grid[r][c]); @@ -176,11 +167,7 @@ export function match3ForEach( * @param orientation If the search is horizontal or vertical * @returns */ -function match3GetMatchesByOrientation( - grid: Match3Grid, - matchSize: number, - orientation: Match3Orientation, -) { +function match3GetMatchesByOrientation(grid: Match3Grid, matchSize: number, orientation: Match3Orientation) { const matches = []; const rows = grid.length; const columns = grid[0].length; diff --git a/puzzling-potions/src/popups/InfoPopup.ts b/puzzling-potions/src/popups/InfoPopup.ts index 21f82c4..01ac8e0 100644 --- a/puzzling-potions/src/popups/InfoPopup.ts +++ b/puzzling-potions/src/popups/InfoPopup.ts @@ -67,8 +67,7 @@ export class InfoPopup extends Container { /** Dismiss the popup, animated */ public async hide() { if (navigation.currentScreen) { - // TODO: Fix filters type issue - (navigation.currentScreen as any).filters = null; + navigation.currentScreen.filters = []; } gsap.killTweensOf(this.bg); gsap.killTweensOf(this.panel.pivot); diff --git a/puzzling-potions/src/popups/PausePopup.ts b/puzzling-potions/src/popups/PausePopup.ts index 9a52408..c7d9542 100644 --- a/puzzling-potions/src/popups/PausePopup.ts +++ b/puzzling-potions/src/popups/PausePopup.ts @@ -67,8 +67,7 @@ export class PausePopup extends Container { /** Dismiss the popup, animated */ public async hide() { if (navigation.currentScreen) { - // TODO: Fix filters type issue - (navigation.currentScreen as any).filters = null; + navigation.currentScreen.filters = []; } gsap.killTweensOf(this.bg); gsap.killTweensOf(this.panel.pivot); diff --git a/puzzling-potions/src/popups/SettingsPopup.ts b/puzzling-potions/src/popups/SettingsPopup.ts index ae31fdd..a01a100 100644 --- a/puzzling-potions/src/popups/SettingsPopup.ts +++ b/puzzling-potions/src/popups/SettingsPopup.ts @@ -136,8 +136,7 @@ export class SettingsPopup extends Container { /** Dismiss the popup, animated */ public async hide() { if (navigation.currentScreen) { - // TODO: Fix filters type issue - (navigation.currentScreen as any).filters = null; + navigation.currentScreen.filters = []; } gsap.killTweensOf(this.bg); gsap.killTweensOf(this.panel.pivot); diff --git a/puzzling-potions/src/screens/HomeScreen.ts b/puzzling-potions/src/screens/HomeScreen.ts index 54194b1..92e41d3 100644 --- a/puzzling-potions/src/screens/HomeScreen.ts +++ b/puzzling-potions/src/screens/HomeScreen.ts @@ -56,7 +56,7 @@ export class HomeScreen extends Container { leftWidth: 32, topHeight: 32, rightWidth: 32, - bottomHeight: 32 + bottomHeight: 32, }); this.base.tint = 0x2c136c; this.addChild(this.base); diff --git a/puzzling-potions/src/ui/Dragon.ts b/puzzling-potions/src/ui/Dragon.ts index e3a5a1f..06cb27a 100644 --- a/puzzling-potions/src/ui/Dragon.ts +++ b/puzzling-potions/src/ui/Dragon.ts @@ -19,7 +19,7 @@ export class Dragon extends Container { this.spine = Spine.from({ skeleton: 'common/dragon-skeleton.json', - atlas: 'common/dragon-skeleton.atlas' + atlas: 'common/dragon-skeleton.atlas', }); // this.spine.autoUpdate = true; this.spine.scale.set(0.3); diff --git a/puzzling-potions/src/ui/GameEffects.ts b/puzzling-potions/src/ui/GameEffects.ts index 7d05eaf..2ec5517 100644 --- a/puzzling-potions/src/ui/GameEffects.ts +++ b/puzzling-potions/src/ui/GameEffects.ts @@ -13,19 +13,13 @@ import { waitFor } from '../utils/asyncUtils'; import { throttle } from '../utils/throttle'; /** Custom ease curve for x tweens of pieces flying to cauldron */ -const easeJumpToCauldronX = registerCustomEase( - 'M0,0,C0,0,0.063,-0.304,0.374,-0.27,0.748,-0.228,1,1,1,1', -); +const easeJumpToCauldronX = registerCustomEase('M0,0,C0,0,0.063,-0.304,0.374,-0.27,0.748,-0.228,1,1,1,1'); /** Custom ease curve for y tweens of pieces flying to cauldron */ -const easeJumpToCauldronY = registerCustomEase( - 'M0,0 C0,0 0.326,1.247 0.662,1.29 0.898,1.32 1,1 1,1 ', -); +const easeJumpToCauldronY = registerCustomEase('M0,0 C0,0 0.326,1.247 0.662,1.29 0.898,1.32 1,1 1,1 '); /** Custom ease curve for scale tweens of pieces flying to cauldron */ -const easeJumpToCauldronScale = registerCustomEase( - 'M0,0,C0,0,0.043,-1.694,0.356,-1.694,1.026,-1.694,1,1,1,1', -); +const easeJumpToCauldronScale = registerCustomEase('M0,0,C0,0,0.043,-1.694,0.356,-1.694,1.026,-1.694,1,1,1,1'); /** * All gameplay special effects, isolated on its own class in a way that can be changed freely, without affecting gameplay. @@ -162,9 +156,7 @@ export class GameEffects extends Container { animatedPiece.alpha = 1; this.addChild(animatedPiece); await waitFor(randomRange(0, 0.3)); - throttle('pieceExplosion', 100, () => - sfx.play('common/sfx-incorrect.wav', { volume: 0.5 }), - ); + throttle('pieceExplosion', 100, () => sfx.play('common/sfx-incorrect.wav', { volume: 0.5 })); this.playPopExplosion(position); const upTime = duration * 0.4; const downTime = duration * 0.6; diff --git a/puzzling-potions/src/ui/LargeButton.ts b/puzzling-potions/src/ui/LargeButton.ts index 5516473..1c67e7f 100644 --- a/puzzling-potions/src/ui/LargeButton.ts +++ b/puzzling-potions/src/ui/LargeButton.ts @@ -32,7 +32,7 @@ export class LargeButton extends FancyButton { height: opts.height, }); - const hoverView = new NineSliceSprite({ + const hoverView = new NineSliceSprite({ texture: Texture.from('button-large-hover'), leftWidth: 36, topHeight: 42, @@ -42,7 +42,7 @@ export class LargeButton extends FancyButton { height: opts.height, }); - const pressedView = new NineSliceSprite({ + const pressedView = new NineSliceSprite({ texture: Texture.from('button-large-press'), leftWidth: 36, topHeight: 42, diff --git a/puzzling-potions/src/ui/ModeSwitcher.ts b/puzzling-potions/src/ui/ModeSwitcher.ts index ee8e5eb..475fd85 100644 --- a/puzzling-potions/src/ui/ModeSwitcher.ts +++ b/puzzling-potions/src/ui/ModeSwitcher.ts @@ -51,7 +51,7 @@ export class ModeSwitcher extends RadioGroup { height - padding * 2, radius - padding, ) - .fill({ color: fillColor}), + .fill({ color: fillColor }), unchecked: new Graphics() .roundRect(0, 0, width, height, radius) .fill({ color: bgColor }) diff --git a/puzzling-potions/tsconfig.json b/puzzling-potions/tsconfig.json index eac16d1..08fa7f8 100644 --- a/puzzling-potions/tsconfig.json +++ b/puzzling-potions/tsconfig.json @@ -4,7 +4,7 @@ "useDefineForClassFields": true, "module": "ESNext", "lib": ["ESNext", "DOM"], - "moduleResolution": "Node", + "moduleResolution": "bundler", "strict": true, "resolveJsonModule": true, "isolatedModules": true,