diff --git a/package-lock.json b/package-lock.json
index f57badfc51..93179c4275 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -176,22 +176,22 @@
}
},
"node_modules/@babel/core": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.20.tgz",
- "integrity": "sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz",
+ "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==",
"dev": true,
"dependencies": {
"@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.22.13",
- "@babel/generator": "^7.22.15",
+ "@babel/generator": "^7.23.0",
"@babel/helper-compilation-targets": "^7.22.15",
- "@babel/helper-module-transforms": "^7.22.20",
- "@babel/helpers": "^7.22.15",
- "@babel/parser": "^7.22.16",
+ "@babel/helper-module-transforms": "^7.23.0",
+ "@babel/helpers": "^7.23.0",
+ "@babel/parser": "^7.23.0",
"@babel/template": "^7.22.15",
- "@babel/traverse": "^7.22.20",
- "@babel/types": "^7.22.19",
- "convert-source-map": "^1.7.0",
+ "@babel/traverse": "^7.23.0",
+ "@babel/types": "^7.23.0",
+ "convert-source-map": "^2.0.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
"json5": "^2.2.3",
@@ -205,12 +205,6 @@
"url": "https://opencollective.com/babel"
}
},
- "node_modules/@babel/core/node_modules/convert-source-map": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
- "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
- "dev": true
- },
"node_modules/@babel/core/node_modules/semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -221,12 +215,12 @@
}
},
"node_modules/@babel/generator": {
- "version": "7.22.15",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz",
- "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+ "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.22.15",
+ "@babel/types": "^7.23.0",
"@jridgewell/gen-mapping": "^0.3.2",
"@jridgewell/trace-mapping": "^0.3.17",
"jsesc": "^2.5.1"
@@ -329,13 +323,13 @@
}
},
"node_modules/@babel/helper-function-name": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
- "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+ "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
"dev": true,
"dependencies": {
- "@babel/template": "^7.22.5",
- "@babel/types": "^7.22.5"
+ "@babel/template": "^7.22.15",
+ "@babel/types": "^7.23.0"
},
"engines": {
"node": ">=6.9.0"
@@ -354,12 +348,12 @@
}
},
"node_modules/@babel/helper-member-expression-to-functions": {
- "version": "7.22.15",
- "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.15.tgz",
- "integrity": "sha512-qLNsZbgrNh0fDQBCPocSL8guki1hcPvltGDv/NxvUoABwFq7GkKSu1nRXeJkVZc+wJvne2E0RKQz+2SQrz6eAA==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
+ "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.22.15"
+ "@babel/types": "^7.23.0"
},
"engines": {
"node": ">=6.9.0"
@@ -378,9 +372,9 @@
}
},
"node_modules/@babel/helper-module-transforms": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz",
- "integrity": "sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz",
+ "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==",
"dev": true,
"dependencies": {
"@babel/helper-environment-visitor": "^7.22.20",
@@ -528,14 +522,14 @@
}
},
"node_modules/@babel/helpers": {
- "version": "7.22.15",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz",
- "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==",
+ "version": "7.23.1",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz",
+ "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==",
"dev": true,
"dependencies": {
"@babel/template": "^7.22.15",
- "@babel/traverse": "^7.22.15",
- "@babel/types": "^7.22.15"
+ "@babel/traverse": "^7.23.0",
+ "@babel/types": "^7.23.0"
},
"engines": {
"node": ">=6.9.0"
@@ -619,9 +613,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.22.16",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz",
- "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+ "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
"dev": true,
"bin": {
"parser": "bin/babel-parser.js"
@@ -780,9 +774,9 @@
}
},
"node_modules/@babel/plugin-transform-block-scoping": {
- "version": "7.22.15",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz",
- "integrity": "sha512-G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz",
+ "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==",
"dev": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5"
@@ -843,9 +837,9 @@
}
},
"node_modules/@babel/plugin-transform-destructuring": {
- "version": "7.22.15",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz",
- "integrity": "sha512-HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz",
+ "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==",
"dev": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.22.5"
@@ -951,12 +945,12 @@
}
},
"node_modules/@babel/plugin-transform-modules-amd": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
- "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz",
+ "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==",
"dev": true,
"dependencies": {
- "@babel/helper-module-transforms": "^7.22.5",
+ "@babel/helper-module-transforms": "^7.23.0",
"@babel/helper-plugin-utils": "^7.22.5"
},
"engines": {
@@ -1112,9 +1106,9 @@
"dev": true
},
"node_modules/@babel/runtime": {
- "version": "7.22.15",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz",
- "integrity": "sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==",
+ "version": "7.23.1",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.1.tgz",
+ "integrity": "sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==",
"dev": true,
"dependencies": {
"regenerator-runtime": "^0.14.0"
@@ -1144,19 +1138,19 @@
}
},
"node_modules/@babel/traverse": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.20.tgz",
- "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz",
+ "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==",
"dev": true,
"dependencies": {
"@babel/code-frame": "^7.22.13",
- "@babel/generator": "^7.22.15",
+ "@babel/generator": "^7.23.0",
"@babel/helper-environment-visitor": "^7.22.20",
- "@babel/helper-function-name": "^7.22.5",
+ "@babel/helper-function-name": "^7.23.0",
"@babel/helper-hoist-variables": "^7.22.5",
"@babel/helper-split-export-declaration": "^7.22.6",
- "@babel/parser": "^7.22.16",
- "@babel/types": "^7.22.19",
+ "@babel/parser": "^7.23.0",
+ "@babel/types": "^7.23.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
},
@@ -1174,13 +1168,13 @@
}
},
"node_modules/@babel/types": {
- "version": "7.22.19",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz",
- "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==",
+ "version": "7.23.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+ "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
"dev": true,
"dependencies": {
"@babel/helper-string-parser": "^7.22.5",
- "@babel/helper-validator-identifier": "^7.22.19",
+ "@babel/helper-validator-identifier": "^7.22.20",
"to-fast-properties": "^2.0.0"
},
"engines": {
@@ -1237,9 +1231,9 @@
}
},
"node_modules/@eslint-community/regexpp": {
- "version": "4.8.1",
- "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.1.tgz",
- "integrity": "sha512-PWiOzLIUAjN/w5K17PoF4n6sKBw0gqLHPhywmYHP4t1VFQQVYeb1yWsJwnMVEMl3tUHME7X/SJPZLmtG7XBDxQ==",
+ "version": "4.9.1",
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
+ "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
"dev": true,
"engines": {
"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -2531,9 +2525,9 @@
}
},
"node_modules/@reduxjs/toolkit": {
- "version": "1.9.5",
- "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.5.tgz",
- "integrity": "sha512-Rt97jHmfTeaxL4swLRNPD/zV4OxTes4la07Xc4hetpUW/vc75t5m1ANyxG6ymnEQ2FsLQsoMlYB2vV1sO3m8tQ==",
+ "version": "1.9.6",
+ "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.6.tgz",
+ "integrity": "sha512-Gc4ikl90ORF4viIdAkY06JNUnODjKfGxZRwATM30EdHq8hLSVoSrwXne5dd739yenP5bJxAX7tLuOWK5RPGtrw==",
"dev": true,
"dependencies": {
"immer": "^9.0.21",
@@ -2636,11 +2630,6 @@
"resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
"integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="
},
- "node_modules/@tweenjs/tween.js": {
- "version": "18.6.4",
- "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-18.6.4.tgz",
- "integrity": "sha512-lB9lMjuqjtuJrx7/kOkqQBtllspPIN+96OvTCeJ2j5FEzinoAXTdAMFnDAQT1KVPRlnYfBrqxtqP66vDM40xxQ=="
- },
"node_modules/@types/accepts": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz",
@@ -2824,9 +2813,9 @@
"dev": true
},
"node_modules/@types/express": {
- "version": "4.17.17",
- "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
- "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
+ "version": "4.17.18",
+ "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.18.tgz",
+ "integrity": "sha512-Sxv8BSLLgsBYmcnGdGjjEjqET2U+AKAdCRODmMiq02FgjwuV75Ut85DRpvFjyw/Mk0vgUOliGRU0UUmuuZHByQ==",
"dev": true,
"dependencies": {
"@types/body-parser": "*",
@@ -2836,9 +2825,9 @@
}
},
"node_modules/@types/express-serve-static-core": {
- "version": "4.17.36",
- "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.36.tgz",
- "integrity": "sha512-zbivROJ0ZqLAtMzgzIUC4oNqDG9iF0lSsAqpOD9kbs5xcIM3dTiyuHvBc7R8MtWBp3AAWGaovJa+wzWPjLYW7Q==",
+ "version": "4.17.37",
+ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.37.tgz",
+ "integrity": "sha512-ZohaCYTgGFcOP7u6aJOhY9uIZQgZ2vxC2yWoArY+FeDXlqeH66ZVBjgvg+RLVAS/DWNq4Ap9ZXu1+SUQiiWYMg==",
"dev": true,
"dependencies": {
"@types/node": "*",
@@ -2921,18 +2910,18 @@
"dev": true
},
"node_modules/@types/istanbul-lib-report": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
- "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+ "integrity": "sha512-gPQuzaPR5h/djlAv2apEG1HVOyj1IUs7GpfMZixU0/0KXT3pm64ylHuMUI1/Akh+sq/iikxg6Z2j+fcMDXaaTQ==",
"dev": true,
"dependencies": {
"@types/istanbul-lib-coverage": "*"
}
},
"node_modules/@types/istanbul-reports": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
- "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
+ "integrity": "sha512-kv43F9eb3Lhj+lr/Hn6OcLCs/sSM8bt+fIaP11rCYngfV6NVjzWXJ17owQtDQTL9tQ8WSLUrGsSJ6rJz0F1w1A==",
"dev": true,
"dependencies": {
"@types/istanbul-lib-report": "*"
@@ -2976,9 +2965,9 @@
}
},
"node_modules/@types/mime": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
- "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.3.tgz",
+ "integrity": "sha512-Ys+/St+2VF4+xuY6+kDIXGxbNRO0mesVg0bbxEfB97Od1Vjpjx9KD1qxs64Gcb3CWPirk9Xe+PT4YiiHQ9T+eg==",
"dev": true
},
"node_modules/@types/minimatch": {
@@ -3010,20 +2999,20 @@
}
},
"node_modules/@types/ndarray": {
- "version": "1.0.11",
- "resolved": "https://registry.npmjs.org/@types/ndarray/-/ndarray-1.0.11.tgz",
- "integrity": "sha512-hOZVTN24zDHwCHaW7mF9n1vHJt83fZhNZ0YYRBwQGhA96yBWWDPTDDlqJatagHIOJB0a4xoNkNc+t/Cxd+6qUA==",
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/@types/ndarray/-/ndarray-1.0.12.tgz",
+ "integrity": "sha512-qe0W0zvfpLUK1xn+HyHvle3D+o8tJQvFzXt1heYOL8kC74rtAosY+I3ZR7SylVoD9690+x0peDhek6STWyn9nQ==",
"dev": true
},
"node_modules/@types/node": {
- "version": "20.6.3",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.3.tgz",
- "integrity": "sha512-HksnYH4Ljr4VQgEy2lTStbCKv/P590tmPe5HqOnv9Gprffgv5WXAY+Y5Gqniu0GGqeTCUdBnzC3QSrzPkBkAMA=="
+ "version": "20.8.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
+ "integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w=="
},
"node_modules/@types/pako": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/@types/pako/-/pako-1.0.4.tgz",
- "integrity": "sha512-Z+5bJSm28EXBSUJEgx29ioWeEEHUh6TiMkZHDhLwjc9wVFH+ressbkmX6waUZc5R3Gobn4Qu5llGxaoflZ+yhA=="
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/@types/pako/-/pako-1.0.5.tgz",
+ "integrity": "sha512-cg6x1RjMyCYoAdhOyNC/144EqhdHJXXZiiTgN3o+ZtOu4+ZQVN5msZgNyxzDI1w+dMYDdRamDzto3+bkR3FFQQ=="
},
"node_modules/@types/parse5": {
"version": "6.0.3",
@@ -3032,15 +3021,15 @@
"dev": true
},
"node_modules/@types/path-is-inside": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@types/path-is-inside/-/path-is-inside-1.0.0.tgz",
- "integrity": "sha512-hfnXRGugz+McgX2jxyy5qz9sB21LRzlGn24zlwN2KEgoPtEvjzNRrLtUkOOebPDPZl3Rq7ywKxYvylVcEZDnEw==",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@types/path-is-inside/-/path-is-inside-1.0.1.tgz",
+ "integrity": "sha512-2oyg5lddg/5PEZV8QwDO0ewgYcS9um8VZl+DaQw6DvgdHwxMEsnynat3B879MZPR+EQz0B0eT0V3r/KnElfJWw==",
"dev": true
},
"node_modules/@types/picomatch": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-2.3.0.tgz",
- "integrity": "sha512-O397rnSS9iQI4OirieAtsDqvCj4+3eY1J+EPdNTKuHuRWIfUoGyzX294o8C4KJYaLqgSrd2o60c5EqCU8Zv02g==",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-Ejq9/KBsgfZZafGGdr9R7011EZhDzcAEMjoBl2W4eGNcZGhsUFMbUA0D+sHxjtAA1ldk3e6wapzXeyp0NSuM8Q==",
"dev": true
},
"node_modules/@types/pngjs": {
@@ -3052,9 +3041,9 @@
}
},
"node_modules/@types/prismjs": {
- "version": "1.26.0",
- "resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.26.0.tgz",
- "integrity": "sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ=="
+ "version": "1.26.1",
+ "resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.26.1.tgz",
+ "integrity": "sha512-Q7jDsRbzcNHIQje15CS/piKhu6lMLb9jwjxSfEIi4KcFKXW23GoJMkwQiJ8VObyfx+VmUaDcJxXaWN+cTCjVog=="
},
"node_modules/@types/puppeteer": {
"version": "5.4.7",
@@ -3071,21 +3060,21 @@
"dev": true
},
"node_modules/@types/range-parser": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
- "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.5.tgz",
+ "integrity": "sha512-xrO9OoVPqFuYyR/loIHjnbvvyRZREYKLjxV4+dY6v3FQR3stQ9ZxIGkaclF7YhI9hfjpuTbu14hZEy94qKLtOA==",
"dev": true
},
"node_modules/@types/relateurl": {
- "version": "0.2.29",
- "resolved": "https://registry.npmjs.org/@types/relateurl/-/relateurl-0.2.29.tgz",
- "integrity": "sha512-QSvevZ+IRww2ldtfv1QskYsqVVVwCKQf1XbwtcyyoRvLIQzfyPhj/C+3+PKzSDRdiyejaiLgnq//XTkleorpLg==",
+ "version": "0.2.30",
+ "resolved": "https://registry.npmjs.org/@types/relateurl/-/relateurl-0.2.30.tgz",
+ "integrity": "sha512-OzTBOmeBmS6FV7uFdbbUaE/rqWNcTrOTfRpDMWMczHa8nvNZi4exDD7d3ZKcxHH2GbgZ50dJkNhx9spRxSxmGg==",
"dev": true
},
"node_modules/@types/remote-redux-devtools": {
- "version": "0.5.5",
- "resolved": "https://registry.npmjs.org/@types/remote-redux-devtools/-/remote-redux-devtools-0.5.5.tgz",
- "integrity": "sha512-Xuya1TegRPAe92+nnEeYpfufE/mtfN99+GH272edaoWohbMA+yP6r+wYqK4sq/fvmoUPtPHtwZR2Mkk+6uHeBQ==",
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/@types/remote-redux-devtools/-/remote-redux-devtools-0.5.6.tgz",
+ "integrity": "sha512-sKWxr4qTsDdrY0Q4PKxkGq0qm0yy3Jnmv5BeX1SJgGwnH1D6xgEOiE+ShpQkw9E8XfrUFl0G2tUKwTUSbp0MfQ==",
"dev": true,
"dependencies": {
"redux": "^4.0.0"
@@ -3110,15 +3099,15 @@
}
},
"node_modules/@types/semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw==",
+ "version": "7.5.3",
+ "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz",
+ "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==",
"dev": true
},
"node_modules/@types/send": {
- "version": "0.17.1",
- "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
- "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
+ "version": "0.17.2",
+ "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.2.tgz",
+ "integrity": "sha512-aAG6yRf6r0wQ29bkS+x97BIs64ZLxeE/ARwyS6wrldMm3C1MdKwCcnnEwMC1slI8wuxJOpiUH9MioC0A0i+GJw==",
"dev": true,
"dependencies": {
"@types/mime": "^1",
@@ -3126,9 +3115,9 @@
}
},
"node_modules/@types/serve-static": {
- "version": "1.15.2",
- "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz",
- "integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==",
+ "version": "1.15.3",
+ "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.3.tgz",
+ "integrity": "sha512-yVRvFsEMrv7s0lGhzrggJjNOSmZCdgCjw9xWrPr/kNNLp6FaDfMC1KaYl3TSJ0c58bECwNBMoQrZJ8hA8E1eFg==",
"dev": true,
"dependencies": {
"@types/http-errors": "*",
@@ -3137,29 +3126,27 @@
}
},
"node_modules/@types/stats.js": {
- "version": "0.17.0",
- "resolved": "https://registry.npmjs.org/@types/stats.js/-/stats.js-0.17.0.tgz",
- "integrity": "sha512-9w+a7bR8PeB0dCT/HBULU2fMqf6BAzvKbxFboYhmDtDkKPiyXYbjoe2auwsXlEFI7CFNMF1dCv3dFH5Poy9R1w=="
+ "version": "0.17.1",
+ "resolved": "https://registry.npmjs.org/@types/stats.js/-/stats.js-0.17.1.tgz",
+ "integrity": "sha512-OgfYE1x2w1jRUXzzKABX+kOdwz2y9PE0uSwnZabkWfJTWOzm7Pvfm4JI2xqRE0q2nwUe2jZLWcrcnhd9lQU63w=="
},
"node_modules/@types/streamx": {
- "version": "2.9.1",
- "resolved": "https://registry.npmjs.org/@types/streamx/-/streamx-2.9.1.tgz",
- "integrity": "sha512-9bywzhouyedmci7WCIPFwJ8zASDnxt2gaVUy52X0p0Tt085IJSAEP0L6j4SSNeDMSLzpYu6cPz0GrJZ7kPJ6Bg==",
+ "version": "2.9.2",
+ "resolved": "https://registry.npmjs.org/@types/streamx/-/streamx-2.9.2.tgz",
+ "integrity": "sha512-HmO0hbPVLzr6HIcc86QQPjJRLpBDQmC+c/qd1jG3vpH1ZgGxl9R9xhofm19vh7Xm8wHUcKBek1Ef1OHrwipmiA==",
"dev": true,
"dependencies": {
"@types/node": "*"
}
},
"node_modules/@types/three": {
- "version": "0.154.0",
- "resolved": "https://registry.npmjs.org/@types/three/-/three-0.154.0.tgz",
- "integrity": "sha512-IioqpGhch6FdLDh4zazRn3rXHj6Vn2nVOziJdXVbJFi9CaI65LtP9qqUtpzbsHK2Ezlox8NtsLNHSw3AQzucjA==",
+ "version": "0.156.0",
+ "resolved": "https://registry.npmjs.org/@types/three/-/three-0.156.0.tgz",
+ "integrity": "sha512-733bXDSRdlrxqOmQuOmfC1UBRuJ2pREPk8sWnx9MtIJEVDQMx8U0NQO5MVVaOrjzDPyLI+cFPim2X/ss9v0+LQ==",
"dependencies": {
- "@tweenjs/tween.js": "~18.6.4",
"@types/stats.js": "*",
"@types/webxr": "*",
- "fflate": "~0.6.9",
- "lil-gui": "~0.17.0",
+ "fflate": "~0.6.10",
"meshoptimizer": "~0.18.1"
}
},
@@ -3205,9 +3192,9 @@
"dev": true
},
"node_modules/@types/vinyl": {
- "version": "2.0.7",
- "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.7.tgz",
- "integrity": "sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==",
+ "version": "2.0.8",
+ "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.8.tgz",
+ "integrity": "sha512-bls3EAsYVnVoPKoqgFC4Rtq7Kzte4MCk8xMA9UEPPVncJFsov9FJWYj0uxqJRwNEi9b4i4zX13FydaDrhadmHg==",
"dev": true,
"dependencies": {
"@types/expect": "^1.20.4",
@@ -3226,9 +3213,9 @@
}
},
"node_modules/@types/webxr": {
- "version": "0.5.4",
- "resolved": "https://registry.npmjs.org/@types/webxr/-/webxr-0.5.4.tgz",
- "integrity": "sha512-41gfGLTtqXZhcmoDlLDHqMJDuwAMwhHwXf9Q2job3TUBsvkNfPNI/3IWVEtLH4tyY1ElWtfwIaoNeqeEX238/Q=="
+ "version": "0.5.5",
+ "resolved": "https://registry.npmjs.org/@types/webxr/-/webxr-0.5.5.tgz",
+ "integrity": "sha512-HVOsSRTQYx3zpVl0c0FBmmmcY/60BkQLzVnpE9M1aG4f2Z0aKlBWfj4XZ2zr++XNBfkQWYcwhGlmuu44RJPDqg=="
},
"node_modules/@types/whatwg-url": {
"version": "6.4.0",
@@ -3249,9 +3236,9 @@
}
},
"node_modules/@types/yauzl": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
- "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+ "version": "2.10.1",
+ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.1.tgz",
+ "integrity": "sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==",
"optional": true,
"dependencies": {
"@types/node": "*"
@@ -3598,9 +3585,9 @@
}
},
"node_modules/@web/dev-server-rollup/node_modules/@types/estree": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
- "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.2.tgz",
+ "integrity": "sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==",
"dev": true
},
"node_modules/@web/dev-server-rollup/node_modules/@types/resolve": {
@@ -3610,9 +3597,9 @@
"dev": true
},
"node_modules/@web/dev-server-rollup/node_modules/rollup": {
- "version": "3.29.2",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.2.tgz",
- "integrity": "sha512-CJouHoZ27v6siztc21eEQGo0kIcE5D1gVPA571ez0mMYb25LGYGKnVNXpEj5MGlepmDWGXNjDB5q7uNiPHC11A==",
+ "version": "3.29.4",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
+ "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
"dev": true,
"bin": {
"rollup": "dist/bin/rollup"
@@ -3777,9 +3764,9 @@
}
},
"node_modules/@web/test-runner-mocha/node_modules/@types/mocha": {
- "version": "10.0.1",
- "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz",
- "integrity": "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==",
+ "version": "10.0.2",
+ "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.2.tgz",
+ "integrity": "sha512-NaHL0+0lLNhX6d9rs+NSt97WH/gIlRHmszXbQ/8/MV/eVcFNdeJ/GYhrFuUc8K7WuPhRhTSdMkCp8VMzhUq85w==",
"dev": true
},
"node_modules/@web/test-runner-playwright": {
@@ -4851,9 +4838,9 @@
"dev": true
},
"node_modules/browserslist": {
- "version": "4.21.11",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.11.tgz",
- "integrity": "sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ==",
+ "version": "4.22.1",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
+ "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
"dev": true,
"funding": [
{
@@ -4870,8 +4857,8 @@
}
],
"dependencies": {
- "caniuse-lite": "^1.0.30001538",
- "electron-to-chromium": "^1.4.526",
+ "caniuse-lite": "^1.0.30001541",
+ "electron-to-chromium": "^1.4.535",
"node-releases": "^2.0.13",
"update-browserslist-db": "^1.0.13"
},
@@ -5033,9 +5020,9 @@
"dev": true
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001538",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz",
- "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==",
+ "version": "1.0.30001543",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001543.tgz",
+ "integrity": "sha512-qxdO8KPWPQ+Zk6bvNpPeQIOH47qZSYdFZd6dXQzb2KzhnSXju4Kd7H1PkSJx6NICSMgo/IhRZRhhfPTHYpJUCA==",
"dev": true,
"funding": [
{
@@ -5071,18 +5058,18 @@
"dev": true
},
"node_modules/chai": {
- "version": "4.3.8",
- "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.8.tgz",
- "integrity": "sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ==",
+ "version": "4.3.10",
+ "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
+ "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==",
"dev": true,
"dependencies": {
"assertion-error": "^1.1.0",
- "check-error": "^1.0.2",
- "deep-eql": "^4.1.2",
- "get-func-name": "^2.0.0",
- "loupe": "^2.3.1",
+ "check-error": "^1.0.3",
+ "deep-eql": "^4.1.3",
+ "get-func-name": "^2.0.2",
+ "loupe": "^2.3.6",
"pathval": "^1.1.1",
- "type-detect": "^4.0.5"
+ "type-detect": "^4.0.8"
},
"engines": {
"node": ">=4"
@@ -5119,10 +5106,13 @@
}
},
"node_modules/check-error": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
- "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+ "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
"dev": true,
+ "dependencies": {
+ "get-func-name": "^2.0.2"
+ },
"engines": {
"node": "*"
}
@@ -6264,9 +6254,9 @@
"dev": true
},
"node_modules/electron-to-chromium": {
- "version": "1.4.528",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.528.tgz",
- "integrity": "sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA==",
+ "version": "1.4.540",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.540.tgz",
+ "integrity": "sha512-aoCqgU6r9+o9/S7wkcSbmPRFi7OWZWiXS9rtjEd+Ouyu/Xyw5RSq2XN8s5Qp8IaFOLiRrhQCphCIjAxgG3eCAg==",
"dev": true
},
"node_modules/emitter-component": {
@@ -6543,13 +6533,13 @@
}
},
"node_modules/eslint-plugin-mocha": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.1.0.tgz",
- "integrity": "sha512-xLqqWUF17llsogVOC+8C6/jvQ+4IoOREbN7ZCHuOHuD6cT5cDD4h7f2LgsZuzMAiwswWE21tO7ExaknHVDrSkw==",
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.2.0.tgz",
+ "integrity": "sha512-ZhdxzSZnd1P9LqDPF0DBcFLpRIGdh1zkF2JHnQklKQOvrQtT73kdP5K9V2mzvbLR+cCAO9OI48NXK/Ax9/ciCQ==",
"dev": true,
"dependencies": {
"eslint-utils": "^3.0.0",
- "rambda": "^7.1.0"
+ "rambda": "^7.4.0"
},
"engines": {
"node": ">=14.0.0"
@@ -7373,9 +7363,9 @@
}
},
"node_modules/get-func-name": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
- "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+ "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
"dev": true,
"engines": {
"node": "*"
@@ -7467,12 +7457,12 @@
}
},
"node_modules/get-uri": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.1.tgz",
- "integrity": "sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q==",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.2.tgz",
+ "integrity": "sha512-5KLucCJobh8vBY1K07EFV4+cPZH3mrV9YeAruUseCQKHB58SGjjT2l9/eA9LD082IiuMjSlFJEcdJ27TXvbZNw==",
"dependencies": {
"basic-ftp": "^5.0.2",
- "data-uri-to-buffer": "^5.0.1",
+ "data-uri-to-buffer": "^6.0.0",
"debug": "^4.3.4",
"fs-extra": "^8.1.0"
},
@@ -7481,9 +7471,9 @@
}
},
"node_modules/get-uri/node_modules/data-uri-to-buffer": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz",
- "integrity": "sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.1.tgz",
+ "integrity": "sha512-MZd3VlchQkp8rdend6vrx7MmVDJzSNTBvghvKjirLkD+WTChA3KUf0jkE68Q4UyctNqI11zZO9/x2Yx+ub5Cvg==",
"engines": {
"node": ">= 14"
}
@@ -7983,12 +7973,9 @@
}
},
"node_modules/has": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
- "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
- "dependencies": {
- "function-bind": "^1.1.1"
- },
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
+ "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
"engines": {
"node": ">= 0.4.0"
}
@@ -9524,11 +9511,6 @@
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"dev": true
},
- "node_modules/lil-gui": {
- "version": "0.17.0",
- "resolved": "https://registry.npmjs.org/lil-gui/-/lil-gui-0.17.0.tgz",
- "integrity": "sha512-MVBHmgY+uEbmJNApAaPbtvNh1RCAeMnKym82SBjtp5rODTYKWtM+MXHCifLe2H2Ti1HuBGBtK/5SyG4ShQ3pUQ=="
- },
"node_modules/lines-and-columns": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
@@ -11791,14 +11773,14 @@
}
},
"node_modules/postprocessing": {
- "version": "6.33.1",
- "resolved": "https://registry.npmjs.org/postprocessing/-/postprocessing-6.33.1.tgz",
- "integrity": "sha512-dUxDGNgBzkTYjzkDVDBIFqZ6zLbzeaqwk8r3ZCMrv08MBX1c68goS8CKvwYvZtltacKnSSBv5f66HQgSSEOEBQ==",
+ "version": "6.33.2",
+ "resolved": "https://registry.npmjs.org/postprocessing/-/postprocessing-6.33.2.tgz",
+ "integrity": "sha512-xGirHyjArISGVfmjCwXyvuhZm9JpLxEkjdE+ZOSq+7SmSetqFfdpaGfkEjbbFxWShwgwXWmgtcPxvrg9BP+r8g==",
"engines": {
"node": ">= 0.13.2"
},
"peerDependencies": {
- "three": ">= 0.138.0 < 0.157.0"
+ "three": ">= 0.138.0 < 0.158.0"
}
},
"node_modules/prelude-ls": {
@@ -11933,14 +11915,14 @@
}
},
"node_modules/puppeteer": {
- "version": "21.3.4",
- "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-21.3.4.tgz",
- "integrity": "sha512-kE67k1KR6hQs3g0Yf/i3GYOhTU8zC2dtcpHhtcSC9bGoVxRgqDo/hwVkDqlNKxJsJHuVX+qviWC7F0FdSjcFTA==",
+ "version": "21.3.6",
+ "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-21.3.6.tgz",
+ "integrity": "sha512-ulK9+KLvdaVsG0EKbKyw/DCXCz88rsnrvIJg9tY8AmkGR01AxI4ZJTH9BJl1OE7cLfh2vxjBvY+xfvJod6rfgw==",
"hasInstallScript": true,
"dependencies": {
"@puppeteer/browsers": "1.7.1",
"cosmiconfig": "8.3.6",
- "puppeteer-core": "21.3.4"
+ "puppeteer-core": "21.3.6"
},
"engines": {
"node": ">=16.3.0"
@@ -12258,9 +12240,9 @@
}
},
"node_modules/puppeteer/node_modules/puppeteer-core": {
- "version": "21.3.4",
- "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.3.4.tgz",
- "integrity": "sha512-iaG7ScTXOm9hlsBTBGGtr5dAAsA8IiWTx8E0Ghr0b5Ntl42bdcPS8EXjcERKocDhua2YqdlnFGs/cBxHY+VNyA==",
+ "version": "21.3.6",
+ "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.3.6.tgz",
+ "integrity": "sha512-ZH6tjTdRXwW2fx5W3jBbG+yUVQdDfZW1kjfwvWwMzsnKEli5ZwV70Zp97GOebHQHrK8zM3vX5VqI9sd48c9PnQ==",
"dependencies": {
"@puppeteer/browsers": "1.7.1",
"chromium-bidi": "0.4.28",
@@ -14204,9 +14186,9 @@
}
},
"node_modules/terser": {
- "version": "5.20.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.20.0.tgz",
- "integrity": "sha512-e56ETryaQDyebBwJIWYB2TT6f2EZ0fL0sW/JRXNMN26zZdKi2u/E/5my5lG6jNxym6qsrVXfFRmOdV42zlAgLQ==",
+ "version": "5.21.0",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.21.0.tgz",
+ "integrity": "sha512-WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw==",
"dev": true,
"dependencies": {
"@jridgewell/source-map": "^0.3.3",
@@ -14261,9 +14243,9 @@
}
},
"node_modules/three": {
- "version": "0.148.0",
- "resolved": "https://registry.npmjs.org/three/-/three-0.148.0.tgz",
- "integrity": "sha512-8uzVV+qhTPi0bOFs/3te3RW6hb3urL8jYEl6irjCWo/l6sr8MPNMcClFev/MMYeIxr0gmDcoXTy/8LXh/LXkfw=="
+ "version": "0.157.0",
+ "resolved": "https://registry.npmjs.org/three/-/three-0.157.0.tgz",
+ "integrity": "sha512-CeAwQrf4x3z0/e+MC4F+nXLW5t0gh3pw+L6CCBqpHvOq3bGYIgRYub7Pv0j/9wR+d++OiEglyZzWyuSYbwWGOA=="
},
"node_modules/three-gpu-pathtracer": {
"version": "0.0.13",
@@ -14986,25 +14968,19 @@
}
},
"node_modules/v8-to-istanbul": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
- "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
+ "version": "9.1.2",
+ "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.2.tgz",
+ "integrity": "sha512-ZGBe7VAivuuoQXTeckpbYKTdtjXGcm3ZUHXC0PAk0CzFyuYvwi73a58iEKI3GkGD1c3EHc+EgfR1w5pgbfzJlQ==",
"dev": true,
"dependencies": {
"@jridgewell/trace-mapping": "^0.3.12",
"@types/istanbul-lib-coverage": "^2.0.1",
- "convert-source-map": "^1.6.0"
+ "convert-source-map": "^2.0.0"
},
"engines": {
"node": ">=10.12.0"
}
},
- "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
- "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
- "dev": true
- },
"node_modules/vali-date": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
@@ -15596,7 +15572,7 @@
"@types/chai": "^4.3.1",
"@types/mocha": "^9.1.1",
"@types/pngjs": "^6.0.1",
- "@types/three": "^0.154.0",
+ "@types/three": "^0.156.0",
"@ungap/event-target": "^0.2.3",
"@web/test-runner": "^0.16.1",
"@web/test-runner-playwright": "^0.10.0",
@@ -15608,14 +15584,14 @@
"rollup-plugin-dts": "^4.2.2",
"rollup-plugin-polyfill": "^3.0.0",
"rollup-plugin-terser": "^7.0.2",
- "three": "^0.156.1",
+ "three": "^0.157.0",
"typescript": "4.8.4"
},
"engines": {
"node": ">=6.0.0"
},
"peerDependencies": {
- "three": "^0.156.1"
+ "three": "^0.157.0"
}
},
"packages/model-viewer-effects": {
@@ -15624,7 +15600,7 @@
"license": "Apache-2.0",
"dependencies": {
"lit": "^2.2.3",
- "postprocessing": "^6.30.2"
+ "postprocessing": "^6.33.2"
},
"devDependencies": {
"@esm-bundle/chai": "4.3.4",
@@ -15635,7 +15611,7 @@
"@types/chai": "^4.3.1",
"@types/mocha": "^9.1.1",
"@types/pngjs": "^6.0.1",
- "@types/three": "^0.154.0",
+ "@types/three": "^0.156.0",
"@ungap/event-target": "^0.2.3",
"@web/test-runner": "^0.16.1",
"@web/test-runner-playwright": "^0.10.0",
@@ -15649,6 +15625,7 @@
"rollup-plugin-dts": "^4.2.2",
"rollup-plugin-polyfill": "^3.0.0",
"rollup-plugin-terser": "^7.0.2",
+ "three": "^0.157.0",
"typescript": "4.8.4"
},
"engines": {
@@ -15659,29 +15636,23 @@
}
},
"packages/model-viewer-effects/node_modules/@types/pngjs": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/@types/pngjs/-/pngjs-6.0.1.tgz",
- "integrity": "sha512-J39njbdW1U/6YyVXvC9+1iflZghP8jgRf2ndYghdJb5xL49LYDB+1EuAxfbuJ2IBbWIL3AjHPQhgaTxT3YaYeg==",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/@types/pngjs/-/pngjs-6.0.2.tgz",
+ "integrity": "sha512-GO2/2guBQrrb4g+93j55VR30xaMCgmSXa/ifPbHS5MgheDRJy5x12fFB61Hn0juCo+VBFhYMFkJd6CBt8HRx4w==",
"dev": true,
"dependencies": {
"@types/node": "*"
}
},
"packages/model-viewer/node_modules/@types/pngjs": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/@types/pngjs/-/pngjs-6.0.1.tgz",
- "integrity": "sha512-J39njbdW1U/6YyVXvC9+1iflZghP8jgRf2ndYghdJb5xL49LYDB+1EuAxfbuJ2IBbWIL3AjHPQhgaTxT3YaYeg==",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/@types/pngjs/-/pngjs-6.0.2.tgz",
+ "integrity": "sha512-GO2/2guBQrrb4g+93j55VR30xaMCgmSXa/ifPbHS5MgheDRJy5x12fFB61Hn0juCo+VBFhYMFkJd6CBt8HRx4w==",
"dev": true,
"dependencies": {
"@types/node": "*"
}
},
- "packages/model-viewer/node_modules/three": {
- "version": "0.156.1",
- "resolved": "https://registry.npmjs.org/three/-/three-0.156.1.tgz",
- "integrity": "sha512-kP7H0FK9d/k6t/XvQ9FO6i+QrePoDcNhwl0I02+wmUJRNSLCUIDMcfObnzQvxb37/0Uc9TDT0T1HgsRRrO6SYQ==",
- "dev": true
- },
"packages/modelviewer.dev": {
"name": "@google/model-viewer-docs",
"version": "0.0.1",
@@ -15722,7 +15693,7 @@
"@types/pngjs": "^3.4.0",
"@types/puppeteer": "^5.4.6",
"@types/rimraf": "^3.0.1",
- "@types/three": "^0.154.0",
+ "@types/three": "^0.156.0",
"filament": "1.31.5",
"http-server": "^14.1.1",
"lit": "^2.7.2",
@@ -15730,7 +15701,7 @@
"pngjs": "^6.0.0",
"puppeteer": "^21.3.4",
"rimraf": "^3.0.2",
- "three": "^0.148.0",
+ "three": "^0.157.0",
"three-gpu-pathtracer": "^0.0.13"
},
"devDependencies": {
diff --git a/packages/model-viewer-effects/README.md b/packages/model-viewer-effects/README.md
index 747ecd3d20..48849619a7 100644
--- a/packages/model-viewer-effects/README.md
+++ b/packages/model-viewer-effects/README.md
@@ -52,7 +52,7 @@ npm install three @google/model-viewer @google/model-viewer-effects
diff --git a/packages/model-viewer-effects/package.json b/packages/model-viewer-effects/package.json
index aea875867f..c00954d9bb 100644
--- a/packages/model-viewer-effects/package.json
+++ b/packages/model-viewer-effects/package.json
@@ -72,7 +72,7 @@
],
"dependencies": {
"lit": "^2.2.3",
- "postprocessing": "^6.30.2"
+ "postprocessing": "^6.33.2"
},
"peerDependencies": {
"@google/model-viewer": "^3.2.1"
@@ -85,7 +85,7 @@
"@types/chai": "^4.3.1",
"@types/mocha": "^9.1.1",
"@types/pngjs": "^6.0.1",
- "@types/three": "^0.154.0",
+ "@types/three": "^0.156.0",
"@ungap/event-target": "^0.2.3",
"@web/test-runner": "^0.16.1",
"@web/test-runner-playwright": "^0.10.0",
@@ -100,6 +100,7 @@
"rollup-plugin-dts": "^4.2.2",
"rollup-plugin-polyfill": "^3.0.0",
"rollup-plugin-terser": "^7.0.2",
+ "three": "^0.157.0",
"typescript": "4.8.4"
},
"publishConfig": {
diff --git a/packages/model-viewer-effects/src/test/utilities.ts b/packages/model-viewer-effects/src/test/utilities.ts
index e718bc2b88..5ba8174319 100644
--- a/packages/model-viewer-effects/src/test/utilities.ts
+++ b/packages/model-viewer-effects/src/test/utilities.ts
@@ -189,10 +189,10 @@ export const waitForEvent = (
function handler(event: AnyEvent) {
if (!predicate || predicate(event as T)) {
resolve(event as T);
- target.removeEventListener(eventName, handler);
+ target.removeEventListener(eventName, handler as any);
}
}
- target.addEventListener(eventName, handler);
+ target.addEventListener(eventName, handler as any);
});
export interface TypedArray {
diff --git a/packages/model-viewer/package.json b/packages/model-viewer/package.json
index 28c6d5ca2a..7ab28d9ffd 100644
--- a/packages/model-viewer/package.json
+++ b/packages/model-viewer/package.json
@@ -86,7 +86,7 @@
"lit": "^2.7.2"
},
"peerDependencies": {
- "three": "^0.156.1"
+ "three": "^0.157.0"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^22.0.1",
@@ -95,7 +95,7 @@
"@types/chai": "^4.3.1",
"@types/mocha": "^9.1.1",
"@types/pngjs": "^6.0.1",
- "@types/three": "^0.154.0",
+ "@types/three": "^0.156.0",
"@ungap/event-target": "^0.2.3",
"@web/test-runner": "^0.16.1",
"@web/test-runner-playwright": "^0.10.0",
@@ -109,7 +109,7 @@
"rollup-plugin-polyfill": "^3.0.0",
"rollup-plugin-terser": "^7.0.2",
"typescript": "4.8.4",
- "three": "^0.156.1"
+ "three": "^0.157.0"
},
"publishConfig": {
"access": "public"
diff --git a/packages/model-viewer/src/features/ar.ts b/packages/model-viewer/src/features/ar.ts
index 58f6f37450..82d8a93516 100644
--- a/packages/model-viewer/src/features/ar.ts
+++ b/packages/model-viewer/src/features/ar.ts
@@ -14,7 +14,6 @@
*/
import {property} from 'lit/decorators.js';
-import {Event as ThreeEvent} from 'three';
import {USDZExporter} from 'three/examples/jsm/exporters/USDZExporter.js';
import {IS_AR_QUICKLOOK_CANDIDATE, IS_SCENEVIEWER_CANDIDATE, IS_WEBXR_AR_CANDIDATE} from '../constants.js';
@@ -117,7 +116,7 @@ export const ARMixin = >(
this.activateAR();
};
- private[$onARStatus] = ({status}: ThreeEvent) => {
+ private[$onARStatus] = ({status}: {status: ARStatus}) => {
if (status === ARStatus.NOT_PRESENTING ||
this[$renderer].arRenderer.presentedScene === this[$scene]) {
this.setAttribute('ar-status', status);
@@ -131,7 +130,7 @@ export const ARMixin = >(
}
};
- private[$onARTracking] = ({status}: ThreeEvent) => {
+ private[$onARTracking] = ({status}: {status: ARTracking}) => {
this.setAttribute('ar-tracking', status);
this.dispatchEvent(new CustomEvent(
'ar-tracking', {detail: {status}}));
@@ -306,7 +305,8 @@ configuration or device capabilities');
const location = self.location.toString();
const locationUrl = new URL(location);
const modelUrl = new URL(this.src!, location);
- if( modelUrl.hash ) modelUrl.hash = '';
+ if (modelUrl.hash)
+ modelUrl.hash = '';
const params = new URLSearchParams(modelUrl.search);
locationUrl.hash = noArViewerSigil;
@@ -399,9 +399,11 @@ configuration or device capabilities');
anchor.setAttribute('download', 'model.usdz');
}
- // attach anchor to shadow DOM to ensure iOS16 ARQL banner click message event propagation
+ // attach anchor to shadow DOM to ensure iOS16 ARQL banner click message
+ // event propagation
anchor.style.display = 'none';
- if(!anchor.isConnected) this.shadowRoot!.appendChild(anchor);
+ if (!anchor.isConnected)
+ this.shadowRoot!.appendChild(anchor);
console.log('Attempting to present in AR with Quick Look...');
anchor.click();
diff --git a/packages/model-viewer/src/features/environment.ts b/packages/model-viewer/src/features/environment.ts
index f89586ff08..9200f92991 100644
--- a/packages/model-viewer/src/features/environment.ts
+++ b/packages/model-viewer/src/features/environment.ts
@@ -130,7 +130,6 @@ export const EnvironmentMixin = >(
this[$scene].setEnvironmentAndSkybox(
this[$currentEnvironmentMap], this[$currentBackground]);
- this[$scene].dispatchEvent({type: 'envmap-update'});
} catch (errorOrPromise) {
if (errorOrPromise instanceof Error) {
this[$scene].setEnvironmentAndSkybox(null, null);
diff --git a/packages/model-viewer/src/test/features/environment-spec.ts b/packages/model-viewer/src/test/features/environment-spec.ts
index 183dd456dd..795bcdfe44 100644
--- a/packages/model-viewer/src/test/features/environment-spec.ts
+++ b/packages/model-viewer/src/test/features/environment-spec.ts
@@ -34,7 +34,7 @@ const MODEL_URL = assetPath('models/reflective-sphere.gltf');
*/
const waitForLoadAndEnvMap = (element: ModelViewerElementBase) => {
const load = waitForEvent(element, 'poster-dismissed');
- const envMap = waitForEvent(element[$scene], 'envmap-update');
+ const envMap = waitForEvent(element, 'environment-change');
return Promise.all([load, envMap]);
};
@@ -77,7 +77,7 @@ suite('Environment', () => {
document.body.insertBefore(element, document.body.firstChild);
environmentChanges = 0;
- scene.addEventListener('envmap-update', () => {
+ element.addEventListener('environment-change', () => {
environmentChanges++;
});
await onLoad;
@@ -162,7 +162,7 @@ suite('Environment', () => {
suite('and environment-image subsequently removed', () => {
setup(async () => {
- const envMapChanged = waitForEvent(scene, 'envmap-update');
+ const envMapChanged = waitForEvent(element, 'environment-change');
element.removeAttribute('environment-image');
await envMapChanged;
});
@@ -220,9 +220,9 @@ suite('Environment', () => {
suite('and skybox-image subsequently removed', () => {
setup(async () => {
- const envMapChanged = waitForEvent(scene, 'envmap-update');
element.removeAttribute('skybox-image');
- await envMapChanged;
+ await element.updateComplete;
+ await rafPasses();
});
test('continues using environment-image as environment map', () => {
@@ -237,7 +237,7 @@ suite('Environment', () => {
suite('and skybox-image subsequently removed', () => {
setup(async () => {
- const envMapChanged = waitForEvent(scene, 'envmap-update');
+ const envMapChanged = waitForEvent(element, 'environment-change');
element.removeAttribute('skybox-image');
await envMapChanged;
});
diff --git a/packages/model-viewer/src/three-components/ARRenderer.ts b/packages/model-viewer/src/three-components/ARRenderer.ts
index 5d092c5719..7ed218842a 100644
--- a/packages/model-viewer/src/three-components/ARRenderer.ts
+++ b/packages/model-viewer/src/three-components/ARRenderer.ts
@@ -77,7 +77,8 @@ const matrix4 = new Matrix4();
const hitPosition = new Vector3();
const camera = new PerspectiveCamera(45, 1, 0.1, 100);
-export class ARRenderer extends EventDispatcher {
+export class ARRenderer extends EventDispatcher<
+ {status: {status: ARStatus}, tracking: {status: ARTracking}}> {
public threeRenderer: WebGLRenderer;
public currentSession: XRSession|null = null;
public placeOnWall = false;
diff --git a/packages/model-viewer/src/three-components/CachingGLTFLoader.ts b/packages/model-viewer/src/three-components/CachingGLTFLoader.ts
index b407e620ec..ca2367d767 100644
--- a/packages/model-viewer/src/three-components/CachingGLTFLoader.ts
+++ b/packages/model-viewer/src/three-components/CachingGLTFLoader.ts
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-import {Event as ThreeEvent, EventDispatcher, Texture, WebGLRenderer} from 'three';
+import {EventDispatcher, Texture, WebGLRenderer} from 'three';
import {DRACOLoader} from 'three/examples/jsm/loaders/DRACOLoader.js';
import {GLTF, GLTFLoader} from 'three/examples/jsm/loaders/GLTFLoader.js';
import {KTX2Loader} from 'three/examples/jsm/loaders/KTX2Loader.js';
@@ -26,12 +26,6 @@ import {GLTFInstance, GLTFInstanceConstructor} from './GLTFInstance.js';
export type ProgressCallback = (progress: number) => void;
-export interface PreloadEvent extends ThreeEvent {
- type: 'preload';
- element: ModelViewerElementBase;
- src: String;
-}
-
(Texture as any).DEFAULT_ANISOTROPY = 4;
/**
@@ -90,7 +84,8 @@ const $GLTFInstance = Symbol('GLTFInstance');
export class CachingGLTFLoader extends
- EventDispatcher {
+ EventDispatcher<
+ {'preload': {element: ModelViewerElementBase, src: String}}> {
static withCredentials: boolean;
static setDRACODecoderLocation(url: string) {
@@ -194,8 +189,7 @@ export class CachingGLTFLoader {}) {
this[$loader].setWithCredentials(CachingGLTFLoader.withCredentials);
- this.dispatchEvent(
- {type: 'preload', element: element, src: url} as PreloadEvent);
+ this.dispatchEvent({type: 'preload', element: element, src: url});
if (!cache.has(url)) {
if (meshoptDecoder != null) {
this[$loader].setMeshoptDecoder(await meshoptDecoder);
diff --git a/packages/model-viewer/src/three-components/Renderer.ts b/packages/model-viewer/src/three-components/Renderer.ts
index b05cb1c36a..6a13114b6d 100644
--- a/packages/model-viewer/src/three-components/Renderer.ts
+++ b/packages/model-viewer/src/three-components/Renderer.ts
@@ -57,7 +57,7 @@ export const DEFAULT_POWER_PREFERENCE: string = 'high-performance';
* Canvas2DRenderingContext if supported for cheaper transferring of
* the texture.
*/
-export class Renderer extends EventDispatcher {
+export class Renderer extends EventDispatcher<{contextlost:{sourceEvent:WebGLContextEvent}}> {
private static _singleton = new Renderer({
powerPreference:
(((self as any).ModelViewerElement || {}) as ModelViewerGlobalConfig)
diff --git a/packages/model-viewer/src/three-components/SmoothControls.ts b/packages/model-viewer/src/three-components/SmoothControls.ts
index 8d942a4615..5bb3b7baa2 100644
--- a/packages/model-viewer/src/three-components/SmoothControls.ts
+++ b/packages/model-viewer/src/three-components/SmoothControls.ts
@@ -125,7 +125,11 @@ export interface PointerChangeEvent extends ThreeEvent {
* has been set in terms of position, rotation and scale, so it is important to
* ensure that the camera's matrixWorld is in sync before using SmoothControls.
*/
-export class SmoothControls extends EventDispatcher {
+export class SmoothControls extends EventDispatcher<{
+ 'user-interaction': {},
+ 'pointer-change-start': {},
+ 'pointer-change-end': {}
+}> {
public orbitSensitivity = 1;
public zoomSensitivity = 1;
public panSensitivity = 1;
@@ -586,7 +590,8 @@ export class SmoothControls extends EventDispatcher {
private initializePan() {
const {theta, phi} = this.spherical;
const psi = theta - this.scene.yaw;
- this.panPerPixel = PAN_SENSITIVITY * this.panSensitivity / this.scene.height;
+ this.panPerPixel =
+ PAN_SENSITIVITY * this.panSensitivity / this.scene.height;
this.panProjection.set(
-Math.cos(psi),
-Math.cos(phi) * Math.sin(psi),
@@ -821,7 +826,8 @@ export class SmoothControls extends EventDispatcher {
this.changeSource = ChangeSource.USER_INTERACTION;
const deltaZoom = (event as WheelEvent).deltaY *
- ((event as WheelEvent).deltaMode == 1 ? 18 : 1) * ZOOM_SENSITIVITY * this.zoomSensitivity / 30;
+ ((event as WheelEvent).deltaMode == 1 ? 18 : 1) * ZOOM_SENSITIVITY *
+ this.zoomSensitivity / 30;
this.userAdjustOrbit(0, 0, deltaZoom);
event.preventDefault();
@@ -860,7 +866,8 @@ export class SmoothControls extends EventDispatcher {
this.userAdjustOrbit(0, 0, ZOOM_SENSITIVITY * this.zoomSensitivity);
break;
case 'PageDown':
- this.userAdjustOrbit(0, 0, -1 * ZOOM_SENSITIVITY * this.zoomSensitivity);
+ this.userAdjustOrbit(
+ 0, 0, -1 * ZOOM_SENSITIVITY * this.zoomSensitivity);
break;
case 'ArrowUp':
this.userAdjustOrbit(0, -KEYBOARD_ORBIT_INCREMENT, 0);
diff --git a/packages/model-viewer/src/three-components/TextureUtils.ts b/packages/model-viewer/src/three-components/TextureUtils.ts
index b0283c10a7..2123c74464 100644
--- a/packages/model-viewer/src/three-components/TextureUtils.ts
+++ b/packages/model-viewer/src/three-components/TextureUtils.ts
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-import {BackSide, BoxGeometry, CubeCamera, CubeTexture, EquirectangularReflectionMapping, EventDispatcher, HalfFloatType, LinearSRGBColorSpace, Loader, Mesh, NoBlending, NoToneMapping, RGBAFormat, Scene, ShaderMaterial, sRGBEncoding, Texture, TextureLoader, Vector3, WebGLCubeRenderTarget, WebGLRenderer} from 'three';
+import {BackSide, BoxGeometry, CubeCamera, CubeTexture, EquirectangularReflectionMapping, HalfFloatType, LinearSRGBColorSpace, Loader, Mesh, NoBlending, NoToneMapping, RGBAFormat, Scene, ShaderMaterial, sRGBEncoding, Texture, TextureLoader, Vector3, WebGLCubeRenderTarget, WebGLRenderer} from 'three';
import {RGBELoader} from 'three/examples/jsm/loaders/RGBELoader.js';
import {deserializeUrl, timePasses} from '../utilities.js';
@@ -33,7 +33,7 @@ const MAX_SAMPLES = 20;
const HDR_FILE_RE = /\.hdr(\.js)?$/;
-export default class TextureUtils extends EventDispatcher {
+export default class TextureUtils {
public lottieLoaderUrl = '';
public withCredentials = false;
@@ -50,7 +50,6 @@ export default class TextureUtils extends EventDispatcher {
private blurScene: Scene|null = null;
constructor(private threeRenderer: WebGLRenderer) {
- super();
}
get ldrLoader(): TextureLoader {
@@ -72,7 +71,8 @@ export default class TextureUtils extends EventDispatcher {
async getLottieLoader(): Promise {
if (this._lottieLoader == null) {
- const {LottieLoader} = await import(/* webpackIgnore: true */ this.lottieLoaderUrl);
+ const {LottieLoader} =
+ await import(/* webpackIgnore: true */ this.lottieLoaderUrl);
this._lottieLoader = new LottieLoader() as Loader;
}
this._lottieLoader.setWithCredentials(this.withCredentials);
diff --git a/packages/model-viewer/src/utilities.ts b/packages/model-viewer/src/utilities.ts
index a4786256d1..6d937531bb 100644
--- a/packages/model-viewer/src/utilities.ts
+++ b/packages/model-viewer/src/utilities.ts
@@ -258,8 +258,8 @@ export const waitForEvent = (
function handler(event: AnyEvent) {
if (!predicate || predicate(event as T)) {
resolve(event as T);
- target.removeEventListener(eventName, handler);
+ target.removeEventListener(eventName, handler as any);
}
}
- target.addEventListener(eventName, handler);
+ target.addEventListener(eventName, handler as any);
});
\ No newline at end of file
diff --git a/packages/modelviewer.dev/examples/postprocessing/index.html b/packages/modelviewer.dev/examples/postprocessing/index.html
index 8470d4de71..38db756de9 100644
--- a/packages/modelviewer.dev/examples/postprocessing/index.html
+++ b/packages/modelviewer.dev/examples/postprocessing/index.html
@@ -32,7 +32,7 @@
@@ -104,7 +104,7 @@ Setup Post Processing
diff --git a/packages/render-fidelity-tools/package.json b/packages/render-fidelity-tools/package.json
index 2c5c185e8f..071d29dc26 100644
--- a/packages/render-fidelity-tools/package.json
+++ b/packages/render-fidelity-tools/package.json
@@ -35,7 +35,7 @@
"@types/pngjs": "^3.4.0",
"@types/puppeteer": "^5.4.6",
"@types/rimraf": "^3.0.1",
- "@types/three": "^0.154.0",
+ "@types/three": "^0.156.0",
"filament": "1.31.5",
"http-server": "^14.1.1",
"lit": "^2.7.2",
@@ -43,7 +43,7 @@
"pngjs": "^6.0.0",
"puppeteer": "^21.3.4",
"rimraf": "^3.0.2",
- "three": "^0.148.0",
+ "three": "^0.157.0",
"three-gpu-pathtracer": "^0.0.13"
},
"devDependencies": {