@uppy/core: add instance ID to generated IDs

[Murderlon]

Fixes #5019

[github-actions]

Diff output files

diff --git a/packages/@uppy/core/lib/Uppy.js b/packages/@uppy/core/lib/Uppy.js
index 000d498..6dd129b 100644
--- a/packages/@uppy/core/lib/Uppy.js
+++ b/packages/@uppy/core/lib/Uppy.js
@@ -1100,7 +1100,7 @@ function _transformFile2(fileDescriptorOrFile) {
   const fileType = getFileType(file);
   const fileName = getFileName(fileType, file);
   const fileExtension = getFileNameAndExtension(fileName).extension;
-  const id = getSafeFileId(file);
+  const id = getSafeFileId(file, this.getID());
   const meta = file.meta || {};
   meta.name = fileName;
   meta.type = fileType;
diff --git a/packages/@uppy/provider-views/lib/ProviderView/ProviderView.js b/packages/@uppy/provider-views/lib/ProviderView/ProviderView.js
index 8f626fd..1e150f0 100644
--- a/packages/@uppy/provider-views/lib/ProviderView/ProviderView.js
+++ b/packages/@uppy/provider-views/lib/ProviderView/ProviderView.js
@@ -281,7 +281,7 @@ export default class ProviderView extends View {
             const onFiles = files => {
               for (const newFile of files) {
                 const tagFile = this.getTagFile(newFile);
-                const id = getSafeFileId(tagFile);
+                const id = getSafeFileId(tagFile, this.plugin.uppy.getID());
                 if (!this.plugin.uppy.checkIfFileAlreadyExists(id)) {
                   newFiles.push(withRelDirPath(newFile));
                   numNewFiles++;
diff --git a/packages/@uppy/utils/lib/generateFileID.js b/packages/@uppy/utils/lib/generateFileID.js
index f8b9c24..ffbdf14 100644
--- a/packages/@uppy/utils/lib/generateFileID.js
+++ b/packages/@uppy/utils/lib/generateFileID.js
@@ -9,8 +9,8 @@ function encodeFilename(name) {
     return "/";
   }) + suffix;
 }
-export default function generateFileID(file) {
-  let id = "uppy";
+export default function generateFileID(file, instanceId) {
+  let id = instanceId || "uppy";
   if (typeof file.name === "string") {
     id += `-${encodeFilename(file.name.toLowerCase())}`;
   }
@@ -33,11 +33,11 @@ function hasFileStableId(file) {
   const stableIdProviders = new Set(["box", "dropbox", "drive", "facebook", "unsplash"]);
   return stableIdProviders.has(file.remote.provider);
 }
-export function getSafeFileId(file) {
+export function getSafeFileId(file, instanceId) {
   if (hasFileStableId(file)) return file.id;
   const fileType = getFileType(file);
   return generateFileID({
     ...file,
     type: fileType,
-  });
+  }, instanceId);
 }

[arturi]

Breaking change if someone relies on fileId being consistent in their app? Maybe a very niche possibility, but maybe enough to wait for a major just in case.

[Murderlon]

It remains consistent in everyone's app in the case of using one Uppy instance. This is a fix for the edge case of when people use two instances in order to do a duplicate upload on the client. That's quite rare and discouraged, you generally want to handle duplicate destinations on the server, but sometimes you have to.