merge main

.changeset/proud-spies-train.md

@@ -0,0 +1,5 @@
+---
+"@uppy/transloadit": patch
+---
+
+emit updated AssemblyState in 'transloadit:assembly-cancelled' event

examples/aws-companion/server.cjs

@@ -66,4 +66,4 @@ const server = app.listen(3020, () => {
   console.log('listening on port 3020')
 })
 
-companion.socket(server)
+companion.socket(server, options)

examples/companion/server/index.js

@@ -71,7 +71,7 @@ app.use((err, req, res) => {
   res.status(500).json({ message: err.message, error: err })
 })
 
-companion.socket(app.listen(3020))
+companion.socket(app.listen(3020), companionOptions)
 
 console.log('Welcome to Companion!')
 console.log(`Listening on http://0.0.0.0:${3020}`)

packages/@uppy/angular/.eslintrc.json

@@ -1,45 +0,0 @@
-{
-  "ignorePatterns": ["projects/**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts"],
-      "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended",
-        "plugin:@angular-eslint/recommended",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
-      "rules": {
-        // eslint-disable-line import/newline-after-import
-        "@angular-eslint/directive-selector": [
-          "error",
-          {
-            "type": "attribute",
-            "prefix": "app",
-            "style": "camelCase"
-          }
-        ],
-        "@typescript-eslint/semi": ["error", "never"],
-        "import/no-unresolved": "off",
-        "import/prefer-default-export": "off",
-        "@angular-eslint/component-selector": [
-          "error",
-          {
-            "type": "element",
-            "prefix": "app",
-            "style": "kebab-case"
-          }
-        ],
-        "semi": ["error", "never"]
-      }
-    },
-    {
-      "files": ["*.html"],
-      "extends": [
-        "plugin:@angular-eslint/template/recommended",
-        "plugin:@angular-eslint/template/accessibility"
-      ],
-      "rules": {}
-    }
-  ]
-}

packages/@uppy/angular/package.json

@@ -23,16 +23,9 @@
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^19.0.0",
-    "@angular-eslint/eslint-plugin": "^18.0.1",
-    "@angular-eslint/eslint-plugin-template": "^18.0.1",
     "@angular/cli": "^19.0.0",
     "@angular/compiler-cli": "^19.2.17",
     "@types/jasmine": "~5.1.0",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
-    "@typescript-eslint/types": "^7.2.0",
-    "@typescript-eslint/utils": "^7.2.0",
-    "eslint": "^8.57.0",
     "jasmine-core": "~5.1.0",
     "karma": "~6.4.0",
     "karma-chrome-launcher": "~3.2.0",

packages/@uppy/angular/projects/uppy/angular/.eslintrc.json

@@ -1,46 +0,0 @@
-{
-  "extends": "../../../.eslintrc.json",
-  "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts"],
-      "parserOptions": {
-        "project": [
-          "packages/@uppy/angular/projects/angular/tsconfig.lib.json",
-          "packages/@uppy/angular/projects/angular/tsconfig.spec.json"
-        ],
-        "createDefaultProgram": true
-      },
-      "rules": {
-        "@angular-eslint/component-selector": [
-          "error",
-          {
-            "type": "element",
-            "prefix": "uppy",
-            "style": "kebab-case"
-          }
-        ],
-        "@angular-eslint/directive-selector": [
-          "error",
-          {
-            "type": "attribute",
-            "prefix": "uppy",
-            "style": "camelCase"
-          }
-        ],
-        "dot-notation": "error",
-        "indent": "error",
-        "no-empty-function": "off",
-        "no-shadow": "error",
-        "no-unused-expressions": "error",
-        "no-use-before-define": "off",
-        "quotes": "error",
-        "semi": "error"
-      }
-    },
-    {
-      "files": ["*.html"],
-      "rules": {}
-    }
-  ]
-}

packages/@uppy/companion/README.md

@@ -68,7 +68,10 @@ on, you call the `socket` method like so.
 // ...
 const server = app.listen(PORT)
 
-companion.socket(server)
+// Pass the same `options` object you passed to `companion.app(options)` —
+// `companion.socket` needs `options.server` to compute the external base path
+// for incoming WS URLs (important behind reverse proxies).
+companion.socket(server, options)
 ```
 
 ### Run as standalone server

packages/@uppy/transloadit/src/index.ts

@@ -658,7 +658,10 @@ export default class Transloadit<
   async #cancelAssembly(assembly: AssemblyResponse) {
     await this.client.cancelAssembly(assembly)
     // TODO bubble this through AssemblyWatcher so its event handlers can clean up correctly
-    this.uppy.emit('transloadit:assembly-cancelled', assembly)
+
+    // if assemblyStatus has been updated after the cancellation was triggered, emit the updated assemblyStatus - fallback to the method argument
+    const updatedAssemblyStatus = this.assembly?.status ?? assembly
+    this.uppy.emit('transloadit:assembly-cancelled', updatedAssemblyStatus)
     this.assembly = undefined
   }