Upgrade Yarn to 4.x

[Murderlon]

https://yarnpkg.com/blog/release/4.0

[Murderlon]

Companion tests are failing because we still run Node.js 14.x and 16.x but Yarn 4 only supports >18.x

[github-actions]

Diff output files

diff --git a/packages/@uppy/aws-s3/lib/index.js b/packages/@uppy/aws-s3/lib/index.js
index 035736b..d6aa397 100644
--- a/packages/@uppy/aws-s3/lib/index.js
+++ b/packages/@uppy/aws-s3/lib/index.js
@@ -1,4 +1,3 @@
-let _Symbol$for;
 function _classPrivateFieldLooseBase(receiver, privateKey) {
   if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) {
     throw new TypeError("attempted to use private field on non-instance");
@@ -77,7 +76,6 @@ var _upload = _classPrivateFieldLooseKey("upload");
 var _setCompanionHeaders = _classPrivateFieldLooseKey("setCompanionHeaders");
 var _setResumableUploadsCapability = _classPrivateFieldLooseKey("setResumableUploadsCapability");
 var _resetResumableCapability = _classPrivateFieldLooseKey("resetResumableCapability");
-_Symbol$for = Symbol.for("uppy test: getClient");
 export default class AwsS3Multipart extends BasePlugin {
   constructor(uppy, opts) {
     var _rateLimitedQueue;
@@ -236,7 +234,7 @@ export default class AwsS3Multipart extends BasePlugin {
     this.uploaderEvents = Object.create(null);
     this.uploaderSockets = Object.create(null);
   }
-  [_Symbol$for]() {
+  [Symbol.for("uppy test: getClient")]() {
     return _classPrivateFieldLooseBase(this, _client)[_client];
   }
   setOptions(newOptions) {
diff --git a/packages/@uppy/companion-client/lib/RequestClient.js b/packages/@uppy/companion-client/lib/RequestClient.js
index daa049e..5936b35 100644
--- a/packages/@uppy/companion-client/lib/RequestClient.js
+++ b/packages/@uppy/companion-client/lib/RequestClient.js
@@ -1,4 +1,3 @@
-let _Symbol$for;
 function _classPrivateFieldLooseBase(receiver, privateKey) {
   if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) {
     throw new TypeError("attempted to use private field on non-instance");
@@ -66,7 +65,6 @@ var _companionHeaders = _classPrivateFieldLooseKey("companionHeaders");
 var _getUrl = _classPrivateFieldLooseKey("getUrl");
 var _requestSocketToken = _classPrivateFieldLooseKey("requestSocketToken");
 var _awaitRemoteFileUpload = _classPrivateFieldLooseKey("awaitRemoteFileUpload");
-_Symbol$for = Symbol.for("uppy test: getCompanionHeaders");
 export default class RequestClient {
   constructor(uppy, opts) {
     Object.defineProperty(this, _awaitRemoteFileUpload, {
@@ -110,7 +108,7 @@ export default class RequestClient {
   setCompanionHeaders(headers) {
     _classPrivateFieldLooseBase(this, _companionHeaders)[_companionHeaders] = headers;
   }
-  [_Symbol$for]() {
+  [Symbol.for("uppy test: getCompanionHeaders")]() {
     return _classPrivateFieldLooseBase(this, _companionHeaders)[_companionHeaders];
   }
   get hostname() {
diff --git a/packages/@uppy/companion-client/lib/Socket.js b/packages/@uppy/companion-client/lib/Socket.js
index f4c26a9..c4fdfe9 100644
--- a/packages/@uppy/companion-client/lib/Socket.js
+++ b/packages/@uppy/companion-client/lib/Socket.js
@@ -1,4 +1,3 @@
-let _Symbol$for, _Symbol$for2;
 function _classPrivateFieldLooseBase(receiver, privateKey) {
   if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) {
     throw new TypeError("attempted to use private field on non-instance");
@@ -15,8 +14,6 @@ var _emitter = _classPrivateFieldLooseKey("emitter");
 var _isOpen = _classPrivateFieldLooseKey("isOpen");
 var _socket = _classPrivateFieldLooseKey("socket");
 var _handleMessage = _classPrivateFieldLooseKey("handleMessage");
-_Symbol$for = Symbol.for("uppy test: getSocket");
-_Symbol$for2 = Symbol.for("uppy test: getQueued");
 export default class UppySocket {
   constructor(opts) {
     Object.defineProperty(this, _queued, {
@@ -54,10 +51,10 @@ export default class UppySocket {
   get isOpen() {
     return _classPrivateFieldLooseBase(this, _isOpen)[_isOpen];
   }
-  [_Symbol$for]() {
+  [Symbol.for("uppy test: getSocket")]() {
     return _classPrivateFieldLooseBase(this, _socket)[_socket];
   }
-  [_Symbol$for2]() {
+  [Symbol.for("uppy test: getQueued")]() {
     return _classPrivateFieldLooseBase(this, _queued)[_queued];
   }
   open() {
diff --git a/packages/@uppy/companion/lib/server/Uploader.js b/packages/@uppy/companion/lib/server/Uploader.js
index de1d9db..aed14e0 100644
--- a/packages/@uppy/companion/lib/server/Uploader.js
+++ b/packages/@uppy/companion/lib/server/Uploader.js
@@ -637,7 +637,6 @@ class Uploader {
     });
     const data = await upload.done();
     return {
-      // @ts-expect-error For some reason `|| null` is not enough for TS
       url: data?.Location || null,
       extraData: {
         response: {
diff --git a/packages/@uppy/companion/lib/server/emitter/default-emitter.d.ts b/packages/@uppy/companion/lib/server/emitter/default-emitter.d.ts
index f4dd634..ed9de32 100644
--- a/packages/@uppy/companion/lib/server/emitter/default-emitter.d.ts
+++ b/packages/@uppy/companion/lib/server/emitter/default-emitter.d.ts
@@ -1,3 +1,3 @@
-declare function _exports(): EventEmitter;
+declare function _exports(): EventEmitter<[never]>;
 export = _exports;
 import { EventEmitter } from "events";
diff --git a/packages/@uppy/companion/lib/server/emitter/redis-emitter.d.ts b/packages/@uppy/companion/lib/server/emitter/redis-emitter.d.ts
index 929bfa2..ba7a709 100644
--- a/packages/@uppy/companion/lib/server/emitter/redis-emitter.d.ts
+++ b/packages/@uppy/companion/lib/server/emitter/redis-emitter.d.ts
@@ -1,9 +1,9 @@
 declare function _exports(redisClient: any, redisPubSubScope: any): {
-    on: (eventName: string, handler: any) => void | EventEmitter;
-    off: (eventName: string, handler: any) => Promise<void> | EventEmitter;
-    once: (eventName: string, handler: any) => void | EventEmitter;
+    on: (eventName: string, handler: any) => void | EventEmitter<[never]>;
+    off: (eventName: string, handler: any) => Promise<void> | EventEmitter<[never]>;
+    once: (eventName: string, handler: any) => void | EventEmitter<[never]>;
     emit: (eventName: string, ...args: any[]) => void;
-    removeListener: (eventName: string, handler: any) => Promise<void> | EventEmitter;
-    removeAllListeners: (eventName: string) => Promise<void> | EventEmitter;
+    removeListener: (eventName: string, handler: any) => Promise<void> | EventEmitter<[never]>;
+    removeAllListeners: (eventName: string) => Promise<void> | EventEmitter<[never]>;
 };
 export = _exports;
diff --git a/packages/@uppy/companion/lib/server/helpers/request.js b/packages/@uppy/companion/lib/server/helpers/request.js
index b898ce3..b0233ab 100644
--- a/packages/@uppy/companion/lib/server/helpers/request.js
+++ b/packages/@uppy/companion/lib/server/helpers/request.js
@@ -107,7 +107,7 @@ exports.getURLMeta = async (url, blockLocalIPs = false) => {
         // we add random string to avoid duplicate files
         const filename = response.headers["content-disposition"]
           ? contentDisposition.parse(response.headers["content-disposition"]).parameters.filename
-          : path.basename(response.request.requestUrl);
+          : path.basename(`${response.request.requestUrl}`);
         // No need to get the rest of the response, as we only want header (not really relevant for HEAD, but why not)
         stream.destroy();
         resolve({
diff --git a/packages/@uppy/core/lib/Uppy.js b/packages/@uppy/core/lib/Uppy.js
index 808a8e1..70dcf30 100644
--- a/packages/@uppy/core/lib/Uppy.js
+++ b/packages/@uppy/core/lib/Uppy.js
@@ -1,4 +1,3 @@
-let _Symbol$for, _Symbol$for2;
 function _classPrivateFieldLooseBase(receiver, privateKey) {
   if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) {
     throw new TypeError("attempted to use private field on non-instance");
@@ -52,8 +51,6 @@ var _createUpload = _classPrivateFieldLooseKey("createUpload");
 var _getUpload = _classPrivateFieldLooseKey("getUpload");
 var _removeUpload = _classPrivateFieldLooseKey("removeUpload");
 var _runUpload = _classPrivateFieldLooseKey("runUpload");
-_Symbol$for = Symbol.for("uppy test: getPlugins");
-_Symbol$for2 = Symbol.for("uppy test: createUpload");
 export class Uppy {
   constructor(_opts) {
     Object.defineProperty(this, _runUpload, {
@@ -832,7 +829,7 @@ export class Uppy {
     }
     return undefined;
   }
-  [_Symbol$for](type) {
+  [Symbol.for("uppy test: getPlugins")](type) {
     return _classPrivateFieldLooseBase(this, _plugins)[_plugins][type];
   }
   iteratePlugins(method) {
@@ -942,7 +939,7 @@ export class Uppy {
     }
     return _classPrivateFieldLooseBase(this, _runUpload)[_runUpload](uploadID);
   }
-  [_Symbol$for2]() {
+  [Symbol.for("uppy test: createUpload")]() {
     return _classPrivateFieldLooseBase(this, _createUpload)[_createUpload](...arguments);
   }
   addResultData(uploadID, data) {
diff --git a/packages/@uppy/dashboard/lib/components/AddFiles.js b/packages/@uppy/dashboard/lib/components/AddFiles.js
index 48fbe1b..07770cb 100644
--- a/packages/@uppy/dashboard/lib/components/AddFiles.js
+++ b/packages/@uppy/dashboard/lib/components/AddFiles.js
@@ -1,6 +1,4 @@
-let _Symbol$for;
 import { Component, Fragment, h } from "preact";
-_Symbol$for = Symbol.for("uppy test: disable unused locale key warning");
 class AddFiles extends Component {
   constructor() {
     super(...arguments);
@@ -335,7 +333,7 @@ class AddFiles extends Component {
       );
     };
   }
-  [_Symbol$for]() {
+  [Symbol.for("uppy test: disable unused locale key warning")]() {
     this.props.i18nArray("dropPasteBoth");
     this.props.i18nArray("dropPasteFiles");
     this.props.i18nArray("dropPasteFolders");
diff --git a/packages/@uppy/store-redux/lib/index.js b/packages/@uppy/store-redux/lib/index.js
index e69124d..cdef3c5 100644
--- a/packages/@uppy/store-redux/lib/index.js
+++ b/packages/@uppy/store-redux/lib/index.js
@@ -1,4 +1,3 @@
-let _Symbol$for;
 function _classPrivateFieldLooseBase(receiver, privateKey) {
   if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) {
     throw new TypeError("attempted to use private field on non-instance");
@@ -26,7 +25,6 @@ function getPatch(prev, next) {
 var _id = _classPrivateFieldLooseKey("id");
 var _selector = _classPrivateFieldLooseKey("selector");
 var _store = _classPrivateFieldLooseKey("store");
-_Symbol$for = Symbol.for("uppy test: get id");
 export class ReduxStore {
   constructor(opts) {
     Object.defineProperty(this, _id, {
@@ -70,7 +68,7 @@ export class ReduxStore {
       }
     });
   }
-  [_Symbol$for]() {
+  [Symbol.for("uppy test: get id")]() {
     return _classPrivateFieldLooseBase(this, _id)[_id];
   }
 }
diff --git a/packages/@uppy/svelte/lib/index.js b/packages/@uppy/svelte/lib/index.js
index 764ba71..16f9dcb 100644
--- a/packages/@uppy/svelte/lib/index.js
+++ b/packages/@uppy/svelte/lib/index.js
@@ -76,8 +76,7 @@ function element(name) {
  * @returns {void}
  */
 function attr(node, attribute, value) {
-  if (value == null) node.removeAttribute(attribute);
-  else if (node.getAttribute(attribute) !== value) node.setAttribute(attribute, value);
+  if (node.getAttribute(attribute) !== value) node.setAttribute(attribute, value);
 }
 
 /**
@@ -504,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.15 */
 
 function create_fragment$4(ctx) {
   let div;
@@ -586,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.15 */
 
 function create_fragment$3(ctx) {
   let div;
@@ -676,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.15 */
 
 function create_fragment$2(ctx) {
   let div;
@@ -745,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.15 */
 
 function create_fragment$1(ctx) {
   let div;
@@ -814,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.15 */
 
 function create_fragment(ctx) {
   let div;
diff --git a/packages/@uppy/url/lib/Url.js b/packages/@uppy/url/lib/Url.js
index 49e2ea9..0bd182b 100644
--- a/packages/@uppy/url/lib/Url.js
+++ b/packages/@uppy/url/lib/Url.js
@@ -1,4 +1,4 @@
-var _class;
+var _Url;
 import { RequestClient } from "@uppy/companion-client";
 import { UIPlugin } from "@uppy/core";
 import toArray from "@uppy/utils/lib/toArray";
@@ -165,7 +165,7 @@ export default class Url extends UIPlugin {
     this.unmount();
   }
 }
-_class = Url;
+_Url = Url;
 Url.VERSION = packageJson.version;
-Url.requestClientId = _class.name;
+Url.requestClientId = _Url.name;
 Url.prototype.canHandleRootDrop = canHandleRootDrop;

[socket-security]

👍 Dependency issues cleared. Learn more about Socket for GitHub ↗︎

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

View full report↗︎