Fixed merge conflicts manually.

spine-ts/package-lock.json

@@ -53,9 +53,9 @@
       "dev": true
     },
     "node_modules/@types/three": {
-      "version": "0.131.1",
-      "resolved": "https://registry.npmjs.org/@types/three/-/three-0.131.1.tgz",
-      "integrity": "sha512-unnjsolcm7R90e4XK9qMq4JYEzly0XQNa0pG8RAOMZeVzj3FLIFPymAYUx4Osz0gY9jFZz8omIQplqiieEE7gw=="
+      "version": "0.133.1",
+      "resolved": "https://registry.npmjs.org/@types/three/-/three-0.133.1.tgz",
+      "integrity": "sha512-XqBrP/+kbs+o0CYRhCVVE95v7FaL2bO5Z7+3VQJE0nEyjo+9LoLfeNgZITOnndKHxM+7ltEciAIR7uE0SZlsOg=="
     },
     "node_modules/accepts": {
       "version": "1.3.7",
@@ -7551,9 +7551,9 @@
       }
     },
     "node_modules/three": {
-      "version": "0.132.2",
-      "resolved": "https://registry.npmjs.org/three/-/three-0.132.2.tgz",
-      "integrity": "sha512-0wcR7LxxkXMn6Gi58gEs3QvY8WpTVXA31L2VOvpjm4ZPYFRHCZC13UqynheFoS5OXDYgtBneN0dhbaNBE8iLhQ=="
+      "version": "0.133.1",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.133.1.tgz",
+      "integrity": "sha512-WydohO8ll949B0FTD6MGz59Yv2Lwj8hvObg/0Heh2r42S6+tQC1WByfCNRdmG4D7+odfGod+n8JPV1I2xrboWw=="
     },
     "node_modules/through": {
       "version": "2.3.8",
@@ -7974,8 +7974,8 @@
       "license": "LicenseRef-LICENSE",
       "dependencies": {
         "@esotericsoftware/spine-core": "^4.1.1",
-        "@types/three": "^0.131.0",
-        "three": "^0.132.0"
+        "@types/three": "^0.133.1",
+        "three": "^0.133.1"
       }
     },
     "spine-webgl": {
@@ -8007,8 +8007,8 @@
       "version": "file:spine-threejs",
       "requires": {
         "@esotericsoftware/spine-core": "^4.1.1",
-        "@types/three": "^0.131.0",
-        "three": "^0.132.0"
+        "@types/three": "^0.133.1",
+        "three": "^0.133.1"
       }
     },
     "@esotericsoftware/spine-webgl": {
@@ -8024,9 +8024,9 @@
       "dev": true
     },
     "@types/three": {
-      "version": "0.131.1",
-      "resolved": "https://registry.npmjs.org/@types/three/-/three-0.131.1.tgz",
-      "integrity": "sha512-unnjsolcm7R90e4XK9qMq4JYEzly0XQNa0pG8RAOMZeVzj3FLIFPymAYUx4Osz0gY9jFZz8omIQplqiieEE7gw=="
+      "version": "0.133.1",
+      "resolved": "https://registry.npmjs.org/@types/three/-/three-0.133.1.tgz",
+      "integrity": "sha512-XqBrP/+kbs+o0CYRhCVVE95v7FaL2bO5Z7+3VQJE0nEyjo+9LoLfeNgZITOnndKHxM+7ltEciAIR7uE0SZlsOg=="
     },
     "accepts": {
       "version": "1.3.7",
@@ -13936,9 +13936,9 @@
       }
     },
     "three": {
-      "version": "0.132.2",
-      "resolved": "https://registry.npmjs.org/three/-/three-0.132.2.tgz",
-      "integrity": "sha512-0wcR7LxxkXMn6Gi58gEs3QvY8WpTVXA31L2VOvpjm4ZPYFRHCZC13UqynheFoS5OXDYgtBneN0dhbaNBE8iLhQ=="
+      "version": "0.133.1",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.133.1.tgz",
+      "integrity": "sha512-WydohO8ll949B0FTD6MGz59Yv2Lwj8hvObg/0Heh2r42S6+tQC1WByfCNRdmG4D7+odfGod+n8JPV1I2xrboWw=="
     },
     "through": {
       "version": "2.3.8",

spine-ts/spine-threejs/package.json

@@ -30,8 +30,8 @@
   },
   "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme",
   "dependencies": {
-    "@types/three": "^0.131.0",
-    "three": "^0.132.0",
+    "@types/three": "^0.133.1",
+    "three": "^0.133.1",
     "@esotericsoftware/spine-core": "^4.1.1"
   }
 }