@uppy/core: fix conflicts

package-lock.json

@@ -58960,6 +58960,14 @@
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-3.8.0.tgz",
       "integrity": "sha1-v77VbV6ad2ZF9LH/eqGjrE+jw4U="
     },
+    "node_modules/preact-transition-group": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/preact-transition-group/-/preact-transition-group-2.0.0.tgz",
+      "integrity": "sha512-jqmRNDDlDdzRigAOw16jcK6rYVJF1aPBbhcJMw/YMc5PDm+LYnCoBV/rBEwyuEvsqGkq2SDO6w1cAZx++YowVA==",
+      "peerDependencies": {
+        "preact": "*"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -75989,7 +75997,8 @@
       "license": "MIT",
       "dependencies": {
         "@uppy/utils": "file:../utils",
-        "preact": "^10.5.13"
+        "preact": "^10.5.13",
+        "preact-transition-group": "^2.0.0"
       },
       "peerDependencies": {
         "@uppy/core": "^1.0.0"
@@ -89807,7 +89816,8 @@
       "version": "file:packages/@uppy/informer",
       "requires": {
         "@uppy/utils": "file:../utils",
-        "preact": "^10.5.13"
+        "preact": "^10.5.13",
+        "preact-transition-group": "^2.0.0"
       }
     },
     "@uppy/instagram": {
@@ -125235,6 +125245,11 @@
         }
       }
     },
+    "preact-transition-group": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/preact-transition-group/-/preact-transition-group-2.0.0.tgz",
+      "integrity": "sha512-jqmRNDDlDdzRigAOw16jcK6rYVJF1aPBbhcJMw/YMc5PDm+LYnCoBV/rBEwyuEvsqGkq2SDO6w1cAZx++YowVA=="
+    },
     "prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",

packages/@uppy/core/src/index.js

@@ -640,7 +640,7 @@ class Uppy {
 
     if (this.checkIfFileAlreadyExists(fileID)) {
       const error = new RestrictionError(this.i18n('noDuplicates', { fileName }))
-      this.showOrLogErrorAndThrow(error, { file: fileDescriptor })
+      this.#showOrLogErrorAndThrow(error, { file: fileDescriptor })
     }
 
     const meta = fileDescriptor.meta || {}