Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

@uppy/core: resolve some (breaking) TODOs #4824

Merged
merged 2 commits into from May 21, 2024
Merged

Conversation

aduh95
Copy link
Member

@aduh95 aduh95 commented Dec 14, 2023

Opening as draft so we don't forget about those. It should probably not be merged until Dashboard has been typed

@aduh95 aduh95 added the 4.0 For the 4.0 major version label Dec 14, 2023
Copy link
Contributor

Diff output files
diff --git a/packages/@uppy/core/lib/Uppy.js b/packages/@uppy/core/lib/Uppy.js
index 7b7000b..3b2edee 100644
--- a/packages/@uppy/core/lib/Uppy.js
+++ b/packages/@uppy/core/lib/Uppy.js
@@ -304,7 +304,7 @@ export class Uppy {
   resetProgress() {
     const defaultProgress = {
       percentage: 0,
-      bytesUploaded: 0,
+      bytesUploaded: false,
       uploadComplete: false,
       uploadStarted: null,
     };
@@ -1143,7 +1143,7 @@ function _transformFile2(fileDescriptorOrFile) {
     data: file.data,
     progress: {
       percentage: 0,
-      bytesUploaded: 0,
+      bytesUploaded: false,
       bytesTotal: size,
       uploadComplete: false,
       uploadStarted: null,
@@ -1151,7 +1151,7 @@ function _transformFile2(fileDescriptorOrFile) {
     size,
     isGhost: false,
     isRemote: file.isRemote || false,
-    remote: file.remote || "",
+    remote: file.remote,
     preview: file.preview,
   };
 }

@aduh95 aduh95 marked this pull request as ready for review May 15, 2024 14:20
@aduh95 aduh95 added the safe to test Add this label on trustworthy PRs to spawn the e2e test suite label May 15, 2024
@github-actions github-actions bot removed pending end-to-end tests safe to test Add this label on trustworthy PRs to spawn the e2e test suite labels May 15, 2024
@aduh95 aduh95 merged commit b9bd7a5 into transloadit:4.x May 21, 2024
20 checks passed
@aduh95 aduh95 deleted the core-todos branch May 21, 2024 14:44
github-actions bot added a commit that referenced this pull request May 22, 2024
| Package              |      Version | Package              |      Version |
| -------------------- | ------------ | -------------------- | ------------ |
| @uppy/aws-s3         | 4.0.0-beta.4 | @uppy/status-bar     | 4.0.0-beta.8 |
| @uppy/companion      | 5.0.0-beta.7 | @uppy/svelte         | 4.0.0-beta.4 |
| @uppy/compressor     | 2.0.0-beta.8 | @uppy/tus            | 4.0.0-beta.5 |
| @uppy/core           | 4.0.0-beta.8 | @uppy/utils          | 6.0.0-beta.7 |
| @uppy/dashboard      | 4.0.0-beta.8 | @uppy/vue            | 2.0.0-beta.3 |
| @uppy/image-editor   | 3.0.0-beta.5 | @uppy/webcam         | 4.0.0-beta.7 |
| @uppy/provider-views | 4.0.0-beta.6 | uppy                 | 4.0.0-beta.8 |

- @uppy/core: resolve some (breaking) TODOs (Antoine du Hamel / #4824)
- @uppy/companion: encode `uploadId` (Mikael Finstad / #5168)
- @uppy/companion: bump `express-session` (Antoine du Hamel / #5177)
- @uppy/companion: remove dependency on `express-request-id` (Antoine du Hamel / #5176)
- @uppy/companion: bump prom to v15 (Antoine du Hamel / #5175)
- docs: fix linter (Antoine du Hamel)
- meta: remove `nodemon` from the deps (Antoine du Hamel / #5172)
- docs: update `@uppy/aws-s3` docs (Antoine du Hamel / #5093)
- meta: update more dependencies (Antoine du Hamel / #5171)
- @uppy/companion: upgrade deps (Antoine du Hamel / #5119)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4.0 For the 4.0 major version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants