@uppy/xhr-upload - npm Package Compare versions

Comparing version 0.27.4 to 0.28.0

lib/index.js

@@ -101,8 +101,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
     _this.opts = _extends({}, defaultOptions, opts);
-    _this.locale = _extends({}, defaultLocale, _this.opts.locale);
-    _this.locale.strings = _extends({}, defaultLocale.strings, _this.opts.locale.strings);
 
     // i18n
-    _this.translator = new Translator({ locale: _this.locale });
+    _this.translator = new Translator([defaultLocale, _this.uppy.locale, _this.opts.locale]);
     _this.i18n = _this.translator.translate.bind(_this.translator);
+    _this.i18nArray = _this.translator.translateArray.bind(_this.translator);
 
@@ -311,9 +310,2 @@ _this.handleUpload = _this.handleUpload.bind(_this);
 
-      _this2.uppy.on('upload-cancel', function (fileID) {
-        if (fileID === file.id) {
-          timer.done();
-          xhr.abort();
-        }
-      });
-
       _this2.uppy.on('cancel-all', function () {
@@ -320,0 +312,0 @@ timer.done();

package.json

 {
   "name": "@uppy/xhr-upload",
   "description": "Plain and simple classic HTML multipart form uploads with Uppy, as well as uploads using the HTTP PUT method.",
-  "version": "0.27.4",
+  "version": "0.28.0",
   "license": "MIT",
@@ -29,12 +29,12 @@ "main": "lib/index.js",
     "@uppy/companion-client": "0.27.2",
-    "@uppy/utils": "0.27.1",
+    "@uppy/utils": "0.28.0",
     "cuid": "^2.1.1"
   },
   "devDependencies": {
-    "@uppy/core": "0.27.3"
+    "@uppy/core": "0.28.0"
   },
   "peerDependencies": {
-    "@uppy/core": "^0.27.0"
+    "@uppy/core": "^0.28.0"
   },
-  "gitHead": "113d6f09bbe248ca156af87054244cd9e6ee9d8b"
+  "gitHead": "47a68a6148a41c7b8a1e10e78b6cd6794a53f7e5"
 }

src/index.js

@@ -82,8 +82,7 @@ const { Plugin } = require('@uppy/core')
     this.opts = Object.assign({}, defaultOptions, opts)
-    this.locale = Object.assign({}, defaultLocale, this.opts.locale)
-    this.locale.strings = Object.assign({}, defaultLocale.strings, this.opts.locale.strings)
 
     // i18n
-    this.translator = new Translator({ locale: this.locale })
+    this.translator = new Translator([ defaultLocale, this.uppy.locale, this.opts.locale ])
     this.i18n = this.translator.translate.bind(this.translator)
+    this.i18nArray = this.translator.translateArray.bind(this.translator)
 
@@ -292,9 +291,2 @@ this.handleUpload = this.handleUpload.bind(this)
 
-      this.uppy.on('upload-cancel', (fileID) => {
-        if (fileID === file.id) {
-          timer.done()
-          xhr.abort()
-        }
-      })
-
       this.uppy.on('cancel-all', () => {
@@ -301,0 +293,0 @@ timer.done()

No alert changes

Worsened metrics

Total package byte prevSize

36643

decreased by-1.13%

Lines of code

900

decreased by-1.53%

Dependency changes

• + Added@uppy/core@0.28.0(transitive)

• + Added@uppy/utils@0.28.0(transitive)

• - Removed@uppy/core@0.27.3(transitive)

• - Removed@uppy/utils@0.27.1(transitive)

• Updated@uppy/utils@0.28.0