Visualize Your Ideas With Code
refactor: improve render time
aarthificialc97184e7f2c2
diff --git a/package-lock.json b/package-lock.jsonindex f74bb7ca..43ebd5ec 100644--- a/package-lock.json+++ b/package-lock.json@@ -13,6 +13,7 @@"canvas": "^2.9.1","image-size": "^1.0.1","konva": "^8.3.2",+ "meow": "^10.1.2","mix-color": "^1.1.2","preact": "^10.7.1","strongly-typed-events": "^3.0.1",@@ -29,6 +30,7 @@"mc-serve": "tools/serve.mjs"},"devDependencies": {+ "@types/dom-webcodecs": "^0.1.4","@types/node-sass": "^4.11.2","@types/three": "^0.138.0","css-loader": "^6.7.1",@@ -44,7 +46,6 @@"version": "7.16.7","resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz","integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",- "dev": true,"dependencies": {"@babel/highlight": "^7.16.7"},@@ -56,16 +57,14 @@"version": "7.16.7","resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz","integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",- "dev": true,"engines": {"node": ">=6.9.0"}},"node_modules/@babel/highlight": {- "version": "7.17.9",- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",- "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",- "dev": true,+ "version": "7.17.12",+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",+ "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==","dependencies": {"@babel/helper-validator-identifier": "^7.16.7","chalk": "^2.0.0",@@ -79,7 +78,6 @@"version": "3.2.1","resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz","integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",- "dev": true,"dependencies": {"color-convert": "^1.9.0"},@@ -91,7 +89,6 @@"version": "2.4.2","resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz","integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",- "dev": true,"dependencies": {"ansi-styles": "^3.2.1","escape-string-regexp": "^1.0.5",@@ -105,7 +102,6 @@"version": "1.9.3","resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz","integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",- "dev": true,"dependencies": {"color-name": "1.1.3"}@@ -113,14 +109,12 @@"node_modules/@babel/highlight/node_modules/color-name": {"version": "1.1.3","resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",- "dev": true+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="},"node_modules/@babel/highlight/node_modules/has-flag": {"version": "3.0.0","resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz","integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",- "dev": true,"engines": {"node": ">=4"}@@ -129,7 +123,6 @@"version": "5.5.0","resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz","integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",- "dev": true,"dependencies": {"has-flag": "^3.0.0"},@@ -269,6 +262,12 @@"@types/node": "*"}},+ "node_modules/@types/dom-webcodecs": {+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/@types/dom-webcodecs/-/dom-webcodecs-0.1.4.tgz",+ "integrity": "sha512-dc+xSUnCaCdi/hExZArnLhiavS3E1Rdpp2+zCI6TcmJvz4qgDPBbpvCM7DsQhwRXIIpVMHO6c3s+t+JyCSqYBA==",+ "dev": true+ },"node_modules/@types/eslint": {"version": "8.4.1","resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",@@ -334,8 +333,7 @@"node_modules/@types/minimist": {"version": "1.2.2","resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",- "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",- "dev": true+ "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="},"node_modules/@types/node": {"version": "17.0.10",@@ -354,8 +352,7 @@"node_modules/@types/normalize-package-data": {"version": "2.4.1","resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",- "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",- "dev": true+ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="},"node_modules/@types/qs": {"version": "6.9.7",@@ -804,7 +801,6 @@"version": "1.0.1","resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz","integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",- "dev": true,"engines": {"node": ">=0.10.0"}@@ -1056,26 +1052,28 @@}},"node_modules/camelcase": {- "version": "5.3.1",- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",- "dev": true,+ "version": "6.3.0",+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",+ "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==","engines": {- "node": ">=6"+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"}},"node_modules/camelcase-keys": {- "version": "6.2.2",- "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",- "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",- "dev": true,+ "version": "7.0.2",+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz",+ "integrity": "sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==","dependencies": {- "camelcase": "^5.3.1",- "map-obj": "^4.0.0",- "quick-lru": "^4.0.1"+ "camelcase": "^6.3.0",+ "map-obj": "^4.1.0",+ "quick-lru": "^5.1.1",+ "type-fest": "^1.2.1"},"engines": {- "node": ">=8"+ "node": ">=12"},"funding": {"url": "https://github.com/sponsors/sindresorhus"@@ -1441,7 +1439,6 @@"version": "1.2.0","resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz","integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",- "dev": true,"engines": {"node": ">=0.10.0"}@@ -1450,7 +1447,6 @@"version": "1.1.0","resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz","integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",- "dev": true,"dependencies": {"decamelize": "^1.1.0","map-obj": "^1.0.0"@@ -1463,7 +1459,6 @@"version": "1.0.1","resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz","integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",- "dev": true,"engines": {"node": ">=0.10.0"}@@ -1724,7 +1719,6 @@"version": "1.3.2","resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz","integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",- "dev": true,"dependencies": {"is-arrayish": "^0.2.1"}@@ -1751,7 +1745,6 @@"version": "1.0.5","resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz","integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",- "dev": true,"engines": {"node": ">=0.8.0"}@@ -2319,7 +2312,6 @@"version": "2.1.0","resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz","integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",- "dev": true,"engines": {"node": ">=6"}@@ -2377,7 +2369,6 @@"version": "4.1.0","resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz","integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",- "dev": true,"dependencies": {"lru-cache": "^6.0.0"},@@ -2694,8 +2685,7 @@"node_modules/is-arrayish": {"version": "0.2.1","resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",- "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",- "dev": true+ "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="},"node_modules/is-binary-path": {"version": "2.1.0",@@ -2712,7 +2702,6 @@"version": "2.8.1","resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz","integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",- "dev": true,"dependencies": {"has": "^1.0.3"},@@ -2918,8 +2907,7 @@"node_modules/js-tokens": {"version": "4.0.0","resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",- "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",- "dev": true+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="},"node_modules/jsbn": {"version": "0.1.1",@@ -2935,8 +2923,7 @@"node_modules/json-parse-even-better-errors": {"version": "2.3.1","resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",- "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",- "dev": true+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="},"node_modules/json-schema": {"version": "0.4.0",@@ -2988,7 +2975,6 @@"version": "6.0.3","resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz","integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",- "dev": true,"engines": {"node": ">=0.10.0"}@@ -3024,8 +3010,7 @@"node_modules/lines-and-columns": {"version": "1.2.4","resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",- "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",- "dev": true+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="},"node_modules/loader-runner": {"version": "4.2.0",@@ -3129,7 +3114,6 @@"version": "4.3.0","resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz","integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",- "dev": true,"engines": {"node": ">=8"},@@ -3157,24 +3141,34 @@}},"node_modules/meow": {- "version": "9.0.0",- "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",- "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",- "dev": true,+ "version": "10.1.2",+ "resolved": "https://registry.npmjs.org/meow/-/meow-10.1.2.tgz",+ "integrity": "sha512-zbuAlN+V/sXlbGchNS9WTWjUzeamwMt/BApKCJi7B0QyZstZaMx0n4Unll/fg0njGtMdC9UP5SAscvOCLYdM+Q==","dependencies": {- "@types/minimist": "^1.2.0",- "camelcase-keys": "^6.2.2",- "decamelize": "^1.2.0",+ "@types/minimist": "^1.2.2",+ "camelcase-keys": "^7.0.0",+ "decamelize": "^5.0.0","decamelize-keys": "^1.1.0","hard-rejection": "^2.1.0","minimist-options": "4.1.0",- "normalize-package-data": "^3.0.0",- "read-pkg-up": "^7.0.1",- "redent": "^3.0.0",- "trim-newlines": "^3.0.0",- "type-fest": "^0.18.0",- "yargs-parser": "^20.2.3"+ "normalize-package-data": "^3.0.2",+ "read-pkg-up": "^8.0.0",+ "redent": "^4.0.0",+ "trim-newlines": "^4.0.2",+ "type-fest": "^1.2.2",+ "yargs-parser": "^20.2.9"},+ "engines": {+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/meow/node_modules/decamelize": {+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz",+ "integrity": "sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==","engines": {"node": ">=10"},@@ -3273,7 +3267,6 @@"version": "1.0.1","resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz","integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",- "dev": true,"engines": {"node": ">=4"}@@ -3303,7 +3296,6 @@"version": "4.1.0","resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz","integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",- "dev": true,"dependencies": {"arrify": "^1.0.1","is-plain-obj": "^1.1.0",@@ -3317,7 +3309,6 @@"version": "1.1.0","resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz","integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",- "dev": true,"engines": {"node": ">=0.10.0"}@@ -3630,6 +3621,190 @@"node": ">=12"}},+ "node_modules/node-sass/node_modules/camelcase": {+ "version": "5.3.1",+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",+ "dev": true,+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/node-sass/node_modules/camelcase-keys": {+ "version": "6.2.2",+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",+ "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",+ "dev": true,+ "dependencies": {+ "camelcase": "^5.3.1",+ "map-obj": "^4.0.0",+ "quick-lru": "^4.0.1"+ },+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/node-sass/node_modules/hosted-git-info": {+ "version": "2.8.9",+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",+ "dev": true+ },+ "node_modules/node-sass/node_modules/meow": {+ "version": "9.0.0",+ "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",+ "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",+ "dev": true,+ "dependencies": {+ "@types/minimist": "^1.2.0",+ "camelcase-keys": "^6.2.2",+ "decamelize": "^1.2.0",+ "decamelize-keys": "^1.1.0",+ "hard-rejection": "^2.1.0",+ "minimist-options": "4.1.0",+ "normalize-package-data": "^3.0.0",+ "read-pkg-up": "^7.0.1",+ "redent": "^3.0.0",+ "trim-newlines": "^3.0.0",+ "type-fest": "^0.18.0",+ "yargs-parser": "^20.2.3"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/node-sass/node_modules/quick-lru": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",+ "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",+ "dev": true,+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/node-sass/node_modules/read-pkg": {+ "version": "5.2.0",+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",+ "dev": true,+ "dependencies": {+ "@types/normalize-package-data": "^2.4.0",+ "normalize-package-data": "^2.5.0",+ "parse-json": "^5.0.0",+ "type-fest": "^0.6.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/node-sass/node_modules/read-pkg-up": {+ "version": "7.0.1",+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",+ "dev": true,+ "dependencies": {+ "find-up": "^4.1.0",+ "read-pkg": "^5.2.0",+ "type-fest": "^0.8.1"+ },+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/node-sass/node_modules/read-pkg-up/node_modules/type-fest": {+ "version": "0.8.1",+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",+ "dev": true,+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/node-sass/node_modules/read-pkg/node_modules/normalize-package-data": {+ "version": "2.5.0",+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",+ "dev": true,+ "dependencies": {+ "hosted-git-info": "^2.1.4",+ "resolve": "^1.10.0",+ "semver": "2 || 3 || 4 || 5",+ "validate-npm-package-license": "^3.0.1"+ }+ },+ "node_modules/node-sass/node_modules/read-pkg/node_modules/type-fest": {+ "version": "0.6.0",+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",+ "dev": true,+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/node-sass/node_modules/redent": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",+ "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",+ "dev": true,+ "dependencies": {+ "indent-string": "^4.0.0",+ "strip-indent": "^3.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/node-sass/node_modules/semver": {+ "version": "5.7.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",+ "dev": true,+ "bin": {+ "semver": "bin/semver"+ }+ },+ "node_modules/node-sass/node_modules/strip-indent": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",+ "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",+ "dev": true,+ "dependencies": {+ "min-indent": "^1.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/node-sass/node_modules/trim-newlines": {+ "version": "3.0.1",+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",+ "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",+ "dev": true,+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/node-sass/node_modules/type-fest": {+ "version": "0.18.1",+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",+ "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",+ "dev": true,+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/nopt": {"version": "5.0.0","resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",@@ -3648,7 +3823,6 @@"version": "3.0.3","resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz","integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",- "dev": true,"dependencies": {"hosted-git-info": "^4.0.1","is-core-module": "^2.5.0",@@ -3857,7 +4031,6 @@"version": "5.2.0","resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz","integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",- "dev": true,"dependencies": {"@babel/code-frame": "^7.0.0","error-ex": "^1.3.1",@@ -3883,7 +4056,6 @@"version": "4.0.0","resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz","integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",- "dev": true,"engines": {"node": ">=8"}@@ -4218,12 +4390,14 @@]},"node_modules/quick-lru": {- "version": "4.0.1",- "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",- "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",- "dev": true,+ "version": "5.1.1",+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",+ "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==","engines": {- "node": ">=8"+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"}},"node_modules/randombytes": {@@ -4265,80 +4439,93 @@}},"node_modules/read-pkg": {- "version": "5.2.0",- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",- "dev": true,+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz",+ "integrity": "sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==","dependencies": {"@types/normalize-package-data": "^2.4.0",- "normalize-package-data": "^2.5.0",- "parse-json": "^5.0.0",- "type-fest": "^0.6.0"+ "normalize-package-data": "^3.0.2",+ "parse-json": "^5.2.0",+ "type-fest": "^1.0.1"},"engines": {- "node": ">=8"+ "node": ">=12"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"}},"node_modules/read-pkg-up": {- "version": "7.0.1",- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",- "dev": true,+ "version": "8.0.0",+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz",+ "integrity": "sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==","dependencies": {- "find-up": "^4.1.0",- "read-pkg": "^5.2.0",- "type-fest": "^0.8.1"+ "find-up": "^5.0.0",+ "read-pkg": "^6.0.0",+ "type-fest": "^1.0.1"},"engines": {- "node": ">=8"+ "node": ">=12"},"funding": {"url": "https://github.com/sponsors/sindresorhus"}},- "node_modules/read-pkg-up/node_modules/type-fest": {- "version": "0.8.1",- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",- "dev": true,+ "node_modules/read-pkg-up/node_modules/find-up": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",+ "dependencies": {+ "locate-path": "^6.0.0",+ "path-exists": "^4.0.0"+ },"engines": {- "node": ">=8"+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"}},- "node_modules/read-pkg/node_modules/hosted-git-info": {- "version": "2.8.9",- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",- "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",- "dev": true- },- "node_modules/read-pkg/node_modules/normalize-package-data": {- "version": "2.5.0",- "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",- "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",- "dev": true,+ "node_modules/read-pkg-up/node_modules/locate-path": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",+ "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==","dependencies": {- "hosted-git-info": "^2.1.4",- "resolve": "^1.10.0",- "semver": "2 || 3 || 4 || 5",- "validate-npm-package-license": "^3.0.1"+ "p-locate": "^5.0.0"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"}},- "node_modules/read-pkg/node_modules/semver": {- "version": "5.7.1",- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",- "dev": true,- "bin": {- "semver": "bin/semver"+ "node_modules/read-pkg-up/node_modules/p-limit": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",+ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",+ "dependencies": {+ "yocto-queue": "^0.1.0"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"}},- "node_modules/read-pkg/node_modules/type-fest": {- "version": "0.6.0",- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",- "dev": true,+ "node_modules/read-pkg-up/node_modules/p-locate": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",+ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",+ "dependencies": {+ "p-limit": "^3.0.2"+ },"engines": {- "node": ">=8"+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"}},"node_modules/readable-stream": {@@ -4378,16 +4565,29 @@}},"node_modules/redent": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",- "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",- "dev": true,+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz",+ "integrity": "sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==","dependencies": {- "indent-string": "^4.0.0",- "strip-indent": "^3.0.0"+ "indent-string": "^5.0.0",+ "strip-indent": "^4.0.0"+ },+ "engines": {+ "node": ">=12"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/redent/node_modules/indent-string": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",+ "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",+ "engines": {+ "node": ">=12"},- "engines": {- "node": ">=8"+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"}},"node_modules/regexp.prototype.flags": {@@ -4993,7 +5193,6 @@"version": "3.1.1","resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz","integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",- "dev": true,"dependencies": {"spdx-expression-parse": "^3.0.0","spdx-license-ids": "^3.0.0"@@ -5002,14 +5201,12 @@"node_modules/spdx-exceptions": {"version": "2.3.0","resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",- "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",- "dev": true+ "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="},"node_modules/spdx-expression-parse": {"version": "3.0.1","resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz","integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",- "dev": true,"dependencies": {"spdx-exceptions": "^2.1.0","spdx-license-ids": "^3.0.0"@@ -5018,8 +5215,7 @@"node_modules/spdx-license-ids": {"version": "3.0.11","resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",- "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",- "dev": true+ "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="},"node_modules/spdy": {"version": "4.0.2",@@ -5248,15 +5444,17 @@}},"node_modules/strip-indent": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",- "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",- "dev": true,+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz",+ "integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==","dependencies": {- "min-indent": "^1.0.0"+ "min-indent": "^1.0.1"},"engines": {- "node": ">=8"+ "node": ">=12"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"}},"node_modules/strongly-typed-events": {@@ -5455,12 +5653,14 @@"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="},"node_modules/trim-newlines": {- "version": "3.0.1",- "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",- "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",- "dev": true,+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.0.2.tgz",+ "integrity": "sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew==","engines": {- "node": ">=8"+ "node": ">=12"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"}},"node_modules/true-case-path": {@@ -5509,10 +5709,9 @@"dev": true},"node_modules/type-fest": {- "version": "0.18.1",- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",- "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",- "dev": true,+ "version": "1.4.0",+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",+ "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==","engines": {"node": ">=10"},@@ -5629,7 +5828,6 @@"version": "3.0.4","resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz","integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",- "dev": true,"dependencies": {"spdx-correct": "^3.0.0","spdx-expression-parse": "^3.0.0"@@ -6139,7 +6337,6 @@"version": "20.2.9","resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz","integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",- "dev": true,"engines": {"node": ">=10"}@@ -6152,6 +6349,17 @@"engines": {"node": ">=12"}+ },+ "node_modules/yocto-queue": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",+ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }}},"dependencies": {@@ -6159,7 +6367,6 @@"version": "7.16.7","resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz","integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",- "dev": true,"requires": {"@babel/highlight": "^7.16.7"}@@ -6167,14 +6374,12 @@"@babel/helper-validator-identifier": {"version": "7.16.7","resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",- "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",- "dev": true+ "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="},"@babel/highlight": {- "version": "7.17.9",- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",- "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",- "dev": true,+ "version": "7.17.12",+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",+ "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==","requires": {"@babel/helper-validator-identifier": "^7.16.7","chalk": "^2.0.0",@@ -6185,7 +6390,6 @@"version": "3.2.1","resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz","integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",- "dev": true,"requires": {"color-convert": "^1.9.0"}@@ -6194,7 +6398,6 @@"version": "2.4.2","resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz","integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",- "dev": true,"requires": {"ansi-styles": "^3.2.1","escape-string-regexp": "^1.0.5",@@ -6205,7 +6408,6 @@"version": "1.9.3","resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz","integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",- "dev": true,"requires": {"color-name": "1.1.3"}@@ -6213,20 +6415,17 @@"color-name": {"version": "1.1.3","resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",- "dev": true+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="},"has-flag": {"version": "3.0.0","resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",- "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",- "dev": true+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="},"supports-color": {"version": "5.5.0","resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz","integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",- "dev": true,"requires": {"has-flag": "^3.0.0"}@@ -6344,6 +6543,12 @@"@types/node": "*"}},+ "@types/dom-webcodecs": {+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/@types/dom-webcodecs/-/dom-webcodecs-0.1.4.tgz",+ "integrity": "sha512-dc+xSUnCaCdi/hExZArnLhiavS3E1Rdpp2+zCI6TcmJvz4qgDPBbpvCM7DsQhwRXIIpVMHO6c3s+t+JyCSqYBA==",+ "dev": true+ },"@types/eslint": {"version": "8.4.1","resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",@@ -6409,8 +6614,7 @@"@types/minimist": {"version": "1.2.2","resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",- "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",- "dev": true+ "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="},"@types/node": {"version": "17.0.10",@@ -6429,8 +6633,7 @@"@types/normalize-package-data": {"version": "2.4.1","resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",- "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",- "dev": true+ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="},"@types/qs": {"version": "6.9.7",@@ -6805,8 +7008,7 @@"arrify": {"version": "1.0.1","resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",- "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",- "dev": true+ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="},"asn1": {"version": "0.2.6",@@ -7014,20 +7216,19 @@}},"camelcase": {- "version": "5.3.1",- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",- "dev": true+ "version": "6.3.0",+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",+ "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="},"camelcase-keys": {- "version": "6.2.2",- "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",- "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",- "dev": true,+ "version": "7.0.2",+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz",+ "integrity": "sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==","requires": {- "camelcase": "^5.3.1",- "map-obj": "^4.0.0",- "quick-lru": "^4.0.1"+ "camelcase": "^6.3.0",+ "map-obj": "^4.1.0",+ "quick-lru": "^5.1.1",+ "type-fest": "^1.2.1"}},"caniuse-lite": {@@ -7296,14 +7497,12 @@"decamelize": {"version": "1.2.0","resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",- "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",- "dev": true+ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="},"decamelize-keys": {"version": "1.1.0","resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz","integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",- "dev": true,"requires": {"decamelize": "^1.1.0","map-obj": "^1.0.0"@@ -7312,8 +7511,7 @@"map-obj": {"version": "1.0.1","resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",- "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",- "dev": true+ "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="}}},@@ -7521,7 +7719,6 @@"version": "1.3.2","resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz","integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",- "dev": true,"requires": {"is-arrayish": "^0.2.1"}@@ -7544,8 +7741,7 @@"escape-string-regexp": {"version": "1.0.5","resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",- "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",- "dev": true+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="},"eslint-scope": {"version": "5.1.1",@@ -7984,8 +8180,7 @@"hard-rejection": {"version": "2.1.0","resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",- "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",- "dev": true+ "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA=="},"has": {"version": "1.0.3",@@ -8022,7 +8217,6 @@"version": "4.1.0","resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz","integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",- "dev": true,"requires": {"lru-cache": "^6.0.0"}@@ -8264,8 +8458,7 @@"is-arrayish": {"version": "0.2.1","resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",- "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",- "dev": true+ "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="},"is-binary-path": {"version": "2.1.0",@@ -8279,7 +8472,6 @@"version": "2.8.1","resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz","integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",- "dev": true,"requires": {"has": "^1.0.3"}@@ -8419,8 +8611,7 @@"js-tokens": {"version": "4.0.0","resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",- "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",- "dev": true+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="},"jsbn": {"version": "0.1.1",@@ -8436,8 +8627,7 @@"json-parse-even-better-errors": {"version": "2.3.1","resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",- "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",- "dev": true+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="},"json-schema": {"version": "0.4.0",@@ -8479,8 +8669,7 @@"kind-of": {"version": "6.0.3","resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",- "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",- "dev": true+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="},"klona": {"version": "2.0.5",@@ -8496,8 +8685,7 @@"lines-and-columns": {"version": "1.2.4","resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",- "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",- "dev": true+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="},"loader-runner": {"version": "4.2.0",@@ -8578,8 +8766,7 @@"map-obj": {"version": "4.3.0","resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",- "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",- "dev": true+ "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="},"media-typer": {"version": "0.3.0",@@ -8595,23 +8782,29 @@}},"meow": {- "version": "9.0.0",- "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",- "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",- "dev": true,+ "version": "10.1.2",+ "resolved": "https://registry.npmjs.org/meow/-/meow-10.1.2.tgz",+ "integrity": "sha512-zbuAlN+V/sXlbGchNS9WTWjUzeamwMt/BApKCJi7B0QyZstZaMx0n4Unll/fg0njGtMdC9UP5SAscvOCLYdM+Q==","requires": {- "@types/minimist": "^1.2.0",- "camelcase-keys": "^6.2.2",- "decamelize": "^1.2.0",+ "@types/minimist": "^1.2.2",+ "camelcase-keys": "^7.0.0",+ "decamelize": "^5.0.0","decamelize-keys": "^1.1.0","hard-rejection": "^2.1.0","minimist-options": "4.1.0",- "normalize-package-data": "^3.0.0",- "read-pkg-up": "^7.0.1",- "redent": "^3.0.0",- "trim-newlines": "^3.0.0",- "type-fest": "^0.18.0",- "yargs-parser": "^20.2.3"+ "normalize-package-data": "^3.0.2",+ "read-pkg-up": "^8.0.0",+ "redent": "^4.0.0",+ "trim-newlines": "^4.0.2",+ "type-fest": "^1.2.2",+ "yargs-parser": "^20.2.9"+ },+ "dependencies": {+ "decamelize": {+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz",+ "integrity": "sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA=="+ }}},"merge-descriptors": {@@ -8674,8 +8867,7 @@"min-indent": {"version": "1.0.1","resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",- "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",- "dev": true+ "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="},"minimalistic-assert": {"version": "1.0.1",@@ -8699,7 +8891,6 @@"version": "4.1.0","resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz","integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",- "dev": true,"requires": {"arrify": "^1.0.1","is-plain-obj": "^1.1.0",@@ -8709,8 +8900,7 @@"is-plain-obj": {"version": "1.1.0","resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",- "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",- "dev": true+ "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="}}},@@ -8935,6 +9125,145 @@"sass-graph": "4.0.0","stdout-stream": "^1.4.0","true-case-path": "^1.0.2"+ },+ "dependencies": {+ "camelcase": {+ "version": "5.3.1",+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",+ "dev": true+ },+ "camelcase-keys": {+ "version": "6.2.2",+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",+ "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",+ "dev": true,+ "requires": {+ "camelcase": "^5.3.1",+ "map-obj": "^4.0.0",+ "quick-lru": "^4.0.1"+ }+ },+ "hosted-git-info": {+ "version": "2.8.9",+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",+ "dev": true+ },+ "meow": {+ "version": "9.0.0",+ "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",+ "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",+ "dev": true,+ "requires": {+ "@types/minimist": "^1.2.0",+ "camelcase-keys": "^6.2.2",+ "decamelize": "^1.2.0",+ "decamelize-keys": "^1.1.0",+ "hard-rejection": "^2.1.0",+ "minimist-options": "4.1.0",+ "normalize-package-data": "^3.0.0",+ "read-pkg-up": "^7.0.1",+ "redent": "^3.0.0",+ "trim-newlines": "^3.0.0",+ "type-fest": "^0.18.0",+ "yargs-parser": "^20.2.3"+ }+ },+ "quick-lru": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",+ "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",+ "dev": true+ },+ "read-pkg": {+ "version": "5.2.0",+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",+ "dev": true,+ "requires": {+ "@types/normalize-package-data": "^2.4.0",+ "normalize-package-data": "^2.5.0",+ "parse-json": "^5.0.0",+ "type-fest": "^0.6.0"+ },+ "dependencies": {+ "normalize-package-data": {+ "version": "2.5.0",+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",+ "dev": true,+ "requires": {+ "hosted-git-info": "^2.1.4",+ "resolve": "^1.10.0",+ "semver": "2 || 3 || 4 || 5",+ "validate-npm-package-license": "^3.0.1"+ }+ },+ "type-fest": {+ "version": "0.6.0",+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",+ "dev": true+ }+ }+ },+ "read-pkg-up": {+ "version": "7.0.1",+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",+ "dev": true,+ "requires": {+ "find-up": "^4.1.0",+ "read-pkg": "^5.2.0",+ "type-fest": "^0.8.1"+ },+ "dependencies": {+ "type-fest": {+ "version": "0.8.1",+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",+ "dev": true+ }+ }+ },+ "redent": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",+ "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",+ "dev": true,+ "requires": {+ "indent-string": "^4.0.0",+ "strip-indent": "^3.0.0"+ }+ },+ "semver": {+ "version": "5.7.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",+ "dev": true+ },+ "strip-indent": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",+ "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",+ "dev": true,+ "requires": {+ "min-indent": "^1.0.0"+ }+ },+ "trim-newlines": {+ "version": "3.0.1",+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",+ "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",+ "dev": true+ },+ "type-fest": {+ "version": "0.18.1",+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",+ "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",+ "dev": true+ }}},"nopt": {@@ -8949,7 +9278,6 @@"version": "3.0.3","resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz","integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",- "dev": true,"requires": {"hosted-git-info": "^4.0.1","is-core-module": "^2.5.0",@@ -9095,7 +9423,6 @@"version": "5.2.0","resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz","integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",- "dev": true,"requires": {"@babel/code-frame": "^7.0.0","error-ex": "^1.3.1",@@ -9111,8 +9438,7 @@"path-exists": {"version": "4.0.0","resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",- "dev": true+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="},"path-is-absolute": {"version": "1.0.1",@@ -9342,10 +9668,9 @@"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="},"quick-lru": {- "version": "4.0.1",- "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",- "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",- "dev": true+ "version": "5.1.1",+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",+ "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="},"randombytes": {"version": "2.1.0",@@ -9379,65 +9704,58 @@}},"read-pkg": {- "version": "5.2.0",- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",- "dev": true,+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz",+ "integrity": "sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==","requires": {"@types/normalize-package-data": "^2.4.0",- "normalize-package-data": "^2.5.0",- "parse-json": "^5.0.0",- "type-fest": "^0.6.0"+ "normalize-package-data": "^3.0.2",+ "parse-json": "^5.2.0",+ "type-fest": "^1.0.1"+ }+ },+ "read-pkg-up": {+ "version": "8.0.0",+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz",+ "integrity": "sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==",+ "requires": {+ "find-up": "^5.0.0",+ "read-pkg": "^6.0.0",+ "type-fest": "^1.0.1"},"dependencies": {- "hosted-git-info": {- "version": "2.8.9",- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",- "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",- "dev": true+ "find-up": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",+ "requires": {+ "locate-path": "^6.0.0",+ "path-exists": "^4.0.0"+ }},- "normalize-package-data": {- "version": "2.5.0",- "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",- "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",- "dev": true,+ "locate-path": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",+ "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==","requires": {- "hosted-git-info": "^2.1.4",- "resolve": "^1.10.0",- "semver": "2 || 3 || 4 || 5",- "validate-npm-package-license": "^3.0.1"+ "p-locate": "^5.0.0"}},- "semver": {- "version": "5.7.1",- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",- "dev": true+ "p-limit": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",+ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",+ "requires": {+ "yocto-queue": "^0.1.0"+ }},- "type-fest": {- "version": "0.6.0",- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",- "dev": true- }- }- },- "read-pkg-up": {- "version": "7.0.1",- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",- "dev": true,- "requires": {- "find-up": "^4.1.0",- "read-pkg": "^5.2.0",- "type-fest": "^0.8.1"- },- "dependencies": {- "type-fest": {- "version": "0.8.1",- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",- "dev": true+ "p-locate": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",+ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",+ "requires": {+ "p-limit": "^3.0.2"+ }}}},@@ -9469,13 +9787,19 @@}},"redent": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",- "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",- "dev": true,+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz",+ "integrity": "sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==","requires": {- "indent-string": "^4.0.0",- "strip-indent": "^3.0.0"+ "indent-string": "^5.0.0",+ "strip-indent": "^4.0.0"+ },+ "dependencies": {+ "indent-string": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",+ "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg=="+ }}},"regexp.prototype.flags": {@@ -9907,7 +10231,6 @@"version": "3.1.1","resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz","integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",- "dev": true,"requires": {"spdx-expression-parse": "^3.0.0","spdx-license-ids": "^3.0.0"@@ -9916,14 +10239,12 @@"spdx-exceptions": {"version": "2.3.0","resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",- "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",- "dev": true+ "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="},"spdx-expression-parse": {"version": "3.0.1","resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz","integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",- "dev": true,"requires": {"spdx-exceptions": "^2.1.0","spdx-license-ids": "^3.0.0"@@ -9932,8 +10253,7 @@"spdx-license-ids": {"version": "3.0.11","resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",- "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",- "dev": true+ "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="},"spdy": {"version": "4.0.2",@@ -10117,12 +10437,11 @@"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="},"strip-indent": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",- "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",- "dev": true,+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz",+ "integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==","requires": {- "min-indent": "^1.0.0"+ "min-indent": "^1.0.1"}},"strongly-typed-events": {@@ -10246,10 +10565,9 @@"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="},"trim-newlines": {- "version": "3.0.1",- "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",- "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",- "dev": true+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.0.2.tgz",+ "integrity": "sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew=="},"true-case-path": {"version": "1.0.3",@@ -10287,10 +10605,9 @@"dev": true},"type-fest": {- "version": "0.18.1",- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",- "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",- "dev": true+ "version": "1.4.0",+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",+ "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA=="},"type-is": {"version": "1.6.18",@@ -10366,7 +10683,6 @@"version": "3.0.4","resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz","integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",- "dev": true,"requires": {"spdx-correct": "^3.0.0","spdx-expression-parse": "^3.0.0"@@ -10733,8 +11049,12 @@"yargs-parser": {"version": "20.2.9","resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",- "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",- "dev": true+ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="+ },+ "yocto-queue": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",+ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="}}}diff --git a/package.json b/package.jsonindex 82f6a2e2..37023286 100644--- a/package.json+++ b/package.json@@ -15,6 +15,7 @@"canvas": "^2.9.1","image-size": "^1.0.1","konva": "^8.3.2",+ "meow": "^10.1.2","mix-color": "^1.1.2","preact": "^10.7.1","strongly-typed-events": "^3.0.1",diff --git a/src/Project.ts b/src/Project.tsindex d0d67616..0d5b2da1 100644--- a/src/Project.ts+++ b/src/Project.ts@@ -26,7 +26,7 @@ export class Project extends Stage {}public readonly background: Rect;- public readonly foreground: Layer;+ public readonly master: Layer;public readonly center: Vector2d;public threadsCallback: ThreadsCallback;public framesPerSeconds = 30;@@ -76,12 +76,10 @@ export class Project extends Stage {fill: '#141414',});- const backgroundLayer = new Layer({name: 'background'});- backgroundLayer.add(this.background);- this.add(backgroundLayer);-- this.foreground = new Layer({name: 'foreground'});- this.add(this.foreground);+ this.master = new Layer({name: 'master'});+ this.master.canvas.pixelRatio = 1;+ this.master.add(this.background);+ this.add(this.master);for (const scene of scenes) {if (@@ -106,9 +104,7 @@ export class Project extends Stage {}public draw(): this {- this.previousScene?.drawScene();- this.currentScene?.drawScene();-+ this.master.drawScene();return this;}@@ -136,8 +132,7 @@ export class Project extends Stage {this.currentScene = this.getNextScene(this.previousScene);if (this.currentScene) {await this.currentScene.reset(this.previousScene);- this.add(this.currentScene);- this.foreground.moveToTop();+ this.master.add(this.currentScene);}}}@@ -196,8 +191,7 @@ export class Project extends Stage {this.currentScene = scene;this.frame = this.currentScene.firstFrame;- this.add(this.currentScene);- this.foreground.moveToTop();+ this.master.add(this.currentScene);await this.currentScene.reset();} else if (this.frame >= frame) {this.previousScene?.remove();diff --git a/src/Scene.ts b/src/Scene.tsindex 4ad5c2e5..92ef8ab8 100644--- a/src/Scene.ts+++ b/src/Scene.ts@@ -35,7 +35,7 @@ export interface TimeEvent {}@KonvaNode()-export class Scene extends Layer {+export class Scene extends Group {public threadsCallback: ThreadsCallback = null;public firstFrame: number = 0;public transitionDuration: number = 0;diff --git a/src/components/Connection.ts b/src/components/Connection.tsindex 19640003..67079c1e 100644--- a/src/components/Connection.ts+++ b/src/components/Connection.ts@@ -6,6 +6,7 @@ import {Group} from 'konva/lib/Group';import {ContainerConfig} from 'konva/lib/Container';import {Arrow} from './Arrow';import {map} from '../tweening';+import {useScene} from '../utils';export interface ConnectionConfig extends ContainerConfig {start?: Pin;@@ -174,16 +175,17 @@ export class Connection extends Group {return;}+ const scene = useScene();const crossing = this.crossing- ? this.crossing.getAbsolutePosition(this.getLayer())+ ? this.crossing.getAbsolutePosition(scene): {x: 0.5, y: 0.5};- const fromRect = this.start.getClientRect({relativeTo: this.getLayer()});+ const fromRect = this.start.getClientRect({relativeTo: scene});fromRect.width /= 2;fromRect.height /= 2;fromRect.x += fromRect.width;fromRect.y += fromRect.height;- const toRect = this.end.getClientRect({relativeTo: this.getLayer()});+ const toRect = this.end.getClientRect({relativeTo: scene});toRect.width /= 2;toRect.height /= 2;diff --git a/src/components/Debug.ts b/src/components/Debug.tsindex 09b8fde6..437d576c 100644--- a/src/components/Debug.ts+++ b/src/components/Debug.ts@@ -3,6 +3,7 @@ import {Node} from 'konva/lib/Node';import {Context} from 'konva/lib/Context';import {GetSet} from 'konva/lib/types';import {getset} from '../decorators';+import {useScene} from '../utils';export interface DebugConfig extends ShapeConfig {target: Node;@@ -24,9 +25,10 @@ export class Debug extends Shape<DebugConfig> {const target = this.target();if (!target) return;- const rect = target.getClientRect({relativeTo: this.getLayer()});- const position = target.getAbsolutePosition(this.getLayer());- const scale = target.getAbsoluteScale(this.getLayer());+ const scene = useScene();+ const rect = target.getClientRect({relativeTo: scene});+ const position = target.getAbsolutePosition(scene);+ const scale = target.getAbsoluteScale(scene);const ctx = context._context;const contentRect = target.getPadd().scale(scale).shrink(rect);diff --git a/src/components/Pin.ts b/src/components/Pin.tsindex 648a2f85..a2280a2c 100644--- a/src/components/Pin.ts+++ b/src/components/Pin.ts@@ -5,6 +5,7 @@ import {GetSet, IRect} from 'konva/lib/types';import {getset, KonvaNode} from '../decorators';import {Node} from 'konva/lib/Node';import {bind} from '../decorators/bind';+import {useScene} from '../utils';export interface PinConfig extends ContainerConfig {target?: Node;@@ -40,7 +41,7 @@ export class Pin extends Group {const attach = this.attach();if (attach) {const attachDirection = flipOrigin(attach.getOrigin(), this.direction());- const rect = this.getClientRect({relativeTo: attach.getLayer()});+ const rect = this.getClientRect({relativeTo: useScene()});const offset = getOriginDelta(rect, Origin.TopLeft, attachDirection);attach.position({x: rect.x + offset.x,diff --git a/src/player/Player.ts b/src/player/Player.tsindex 436734e8..ab162e21 100644--- a/src/player/Player.ts+++ b/src/player/Player.ts@@ -36,7 +36,7 @@ interface PlayerCommands {export interface PlayerRenderEvent {frame: number;- blob: Blob;+ data: string;}const STORAGE_KEY = 'player-state';@@ -140,8 +140,8 @@ export class Player {public constructor(public readonly project: Project,public readonly audio?: {- src: string,- meta: Waveform,+ src: string;+ meta: Waveform;},public readonly labels?: Record<string, number>,) {@@ -182,26 +182,23 @@ export class Player {public requestSeek(value: number): void {this.commands.seek = this.inRange(value, this.state);- // if (value < this.state.startFrame) {- // this.updateState({startFrame: value});- // }}- public togglePlayback(value?: boolean): void {+ public togglePlayback(value: boolean = this.state.paused): void {this.updateState({- paused: !(value ?? this.state.paused),+ paused: !value,});}- public toggleRendering(value?: boolean): void {+ public toggleRendering(value: boolean = !this.state.render): void {this.updateState({- render: !(value ?? this.state.render),+ render: value,});}- public toggleAudio(value?: boolean): void {+ public toggleAudio(value: boolean = this.state.muted): void {this.updateState({- muted: !(value ?? this.state.muted),+ muted: !value,});}@@ -261,17 +258,16 @@ export class Player {if (state.render) {state.finished = await this.project.next();this.project.draw();- await this.renderChanged.dispatch({+ await this.renderChanged.dispatchAsync({frame: this.project.frame,- blob: await this.getContent(),+ data: this.project.master.getNativeCanvasElement().toDataURL(),});if (state.finished || this.project.frame >= state.endFrame) {- state.render = false;+ this.toggleRendering(false);}this.updateState({finished: state.finished,- render: state.render,});this.updateFrame(this.project.frame);this.request();@@ -303,7 +299,9 @@ export class Player {state.speed === 1 &&this.project.time < this.audioElement.currentTime - MAX_AUDIO_DESYNC) {- const seekFrame = this.project.secondsToFrames(this.audioElement.currentTime);+ const seekFrame = this.project.secondsToFrames(+ this.audioElement.currentTime,+ );state.finished = await this.project.seek(seekFrame, state.speed);}// Simply move forward one frame@@ -374,10 +372,4 @@ export class Player {}});}-- private async getContent(): Promise<Blob> {- return new Promise<Blob>(resolve =>- this.project.toCanvas().toBlob(resolve, 'image/png'),- );- }}diff --git a/src/utils/pop.ts b/src/utils/pop.tsindex e56dcf6e..3b16550a 100644--- a/src/utils/pop.ts+++ b/src/utils/pop.ts@@ -1,8 +1,9 @@import {Node} from 'konva/lib/Node';+import {useScene} from './useScene';export function pop<T extends Node>(node: T): [T, () => void] {const clone: T = node.clone();- clone.moveTo(node.getLayer());+ clone.moveTo(useScene());clone.position(node.absolutePosition());node.hide();diff --git a/tools/serve.mjs b/tools/serve.mjsindex 9ad4c723..49ae995c 100644--- a/tools/serve.mjs+++ b/tools/serve.mjs@@ -1,16 +1,33 @@#!/usr/bin/env nodeimport path from 'path';+import fs from 'fs';import {fileURLToPath} from 'url';import webpack from 'webpack';import WebpackDevServer from 'webpack-dev-server';+import meow from 'meow';-const projectFile = path.resolve(process.cwd(), process.argv[2]);+const cli = meow({+ importMeta: import.meta,+ flags: {+ ui: {+ type: 'boolean',+ default: false,+ },+ output: {+ type: 'string',+ alias: 'o',+ default: 'output',+ },+ },+});++const projectFile = path.resolve(process.cwd(), cli.input[0]);+const renderOutput = path.resolve(process.cwd(), cli.flags.output);const __dirname = path.dirname(fileURLToPath(import.meta.url));-const withUI = process.argv[3] === '--ui';const compiler = webpack({- entry: withUI+ entry: cli.flags.ui? {index: projectFile,ui: path.resolve(__dirname, '../../ui/src/index.ts'),@@ -130,6 +147,23 @@ const server = new WebpackDevServer(compress: true,port: 9000,hot: true,+ setupMiddlewares: (middlewares, devServer) => {+ middlewares.unshift({+ name: 'render',+ path: '/render/:name',+ middleware: (req, res) => {+ const stream = fs.createWriteStream(+ path.join(renderOutput, req.params.name),+ {encoding: 'base64'},+ );+ req.setEncoding('utf8');+ req.pipe(stream);+ req.on('end', () => res.end());+ },+ });++ return middlewares;+ },},compiler,);