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/companion: upgrade deps #5119

Merged
merged 9 commits into from
May 15, 2024
Merged

@uppy/companion: upgrade deps #5119

merged 9 commits into from
May 15, 2024

Conversation

aduh95
Copy link
Contributor

@aduh95 aduh95 commented Apr 25, 2024

Now that we can depend on ESM dependency, we are able to upgrade (almost) all our deps. The only one that I didn't touch is escape-string-regexp, because it is used in sync paths only.

This is on top the upgrade-yarn branch, so publishing as draft for now.

@aduh95 aduh95 added the 4.0 For the 4.0 major version label Apr 25, 2024
@aduh95 aduh95 force-pushed the upgrade-yarn branch 2 times, most recently from e16cb06 to 985f71b Compare April 29, 2024 15:03
Base automatically changed from upgrade-yarn to 4.x April 29, 2024 16:49

This comment was marked as off-topic.

Copy link
Contributor

Diff output files
diff --git a/packages/@uppy/companion/lib/server/Uploader.js b/packages/@uppy/companion/lib/server/Uploader.js
index 27a21f1..d487105 100644
--- a/packages/@uppy/companion/lib/server/Uploader.js
+++ b/packages/@uppy/companion/lib/server/Uploader.js
@@ -16,11 +16,6 @@ const got = require("./got");
 const pipeline = promisify(pipelineCb);
 const { createReadStream, createWriteStream, ReadStream } = fs;
 const { stat, unlink } = fs.promises;
-/** @type {any} */
-// @ts-ignore - typescript resolves this this to a hoisted version of
-// serialize-error that ships with a declaration file, we are using a version
-// here that does not have a declaration file
-const serializeError = require("serialize-error"); // eslint-disable-line import/order
 const emitter = require("./emitter");
 const { jsonStringify, hasMatch } = require("./helpers/utils");
 const logger = require("./logger");
@@ -460,10 +455,11 @@ class Uploader {
   /**
    * @param {Error} err
    */
-  #emitError(err) {
+  async #emitError(err) {
     // delete stack to avoid sending server info to client
     // todo remove also extraData from serializedErr in next major,
     // see PR discussion https://github.com/transloadit/uppy/pull/3832
+    const { serializeError } = await import("serialize-error");
     const { stack, ...serializedErr } = serializeError(err);
     const dataToEmit = {
       action: "error",
diff --git a/packages/@uppy/svelte/lib/index.js b/packages/@uppy/svelte/lib/index.js
index 22cb7ba..7b43f08 100644
--- a/packages/@uppy/svelte/lib/index.js
+++ b/packages/@uppy/svelte/lib/index.js
@@ -503,7 +503,7 @@ if (typeof window !== "undefined") {
   (window.__svelte || (window.__svelte = { v: new Set() })).v.add(PUBLIC_VERSION);
 }
 
-/* src/components/Dashboard.svelte generated by Svelte v4.2.1 */
+/* src/components/Dashboard.svelte generated by Svelte v4.2.17 */
 
 function create_fragment$4(ctx) {
   let div;
@@ -585,7 +585,7 @@ class Dashboard extends SvelteComponent {
   }
 }
 
-/* src/components/DashboardModal.svelte generated by Svelte v4.2.1 */
+/* src/components/DashboardModal.svelte generated by Svelte v4.2.17 */
 
 function create_fragment$3(ctx) {
   let div;
@@ -675,7 +675,7 @@ class DashboardModal extends SvelteComponent {
   }
 }
 
-/* src/components/DragDrop.svelte generated by Svelte v4.2.1 */
+/* src/components/DragDrop.svelte generated by Svelte v4.2.17 */
 
 function create_fragment$2(ctx) {
   let div;
@@ -744,7 +744,7 @@ class DragDrop extends SvelteComponent {
   }
 }
 
-/* src/components/ProgressBar.svelte generated by Svelte v4.2.1 */
+/* src/components/ProgressBar.svelte generated by Svelte v4.2.17 */
 
 function create_fragment$1(ctx) {
   let div;
@@ -813,7 +813,7 @@ class ProgressBar extends SvelteComponent {
   }
 }
 
-/* src/components/StatusBar.svelte generated by Svelte v4.2.1 */
+/* src/components/StatusBar.svelte generated by Svelte v4.2.17 */
 
 function create_fragment(ctx) {
   let div;

@aduh95 aduh95 marked this pull request as ready for review May 15, 2024 14:54
@aduh95 aduh95 merged commit 928eff7 into 4.x May 15, 2024
21 checks passed
@aduh95 aduh95 deleted the bump-companion-deps branch May 15, 2024 16:13
Murderlon added a commit that referenced this pull request May 21, 2024
* 4.x: (24 commits)
  @uppy/companion: encode `uploadId` (#5168)
  @uppy/companion: bump `express-session` (#5177)
  @uppy/companion: remove dependency on `express-request-id` (#5176)
  @uppy/companion: bump prom to v15 (#5175)
  docs: fix linter
  meta: remove `nodemon` from the deps (#5172)
  docs: update `@uppy/aws-s3` docs (#5093)
  meta: update more dependencies (#5171)
  @uppy/companion: upgrade deps (#5119)
  Release: uppy@4.0.0-beta.7 (#5162)
  @uppy/companion: switch from `node-redis` to `ioredis` (#4623)
  Fix headings in xhr.mdx
  @uppy/xhr-upload: introduce hooks similar to tus (#5094)
  @uppy/core: close->destroy, clearUploadedFiles->clear (#5154)
  Use `title` consistently from locales (#5134)
  Release: uppy@4.0.0-beta.6 (#5152)
  Release: uppy@4.0.0-beta.5 (#5141)
  meta: run Prettier in the release workflow
  Release: uppy@3.25.1 (#5139)
  Bump ejs from 3.1.9 to 3.1.10 (#5135)
  ...
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.

1 participant