2.2.1

Fixes #44
Fixes #45
Fixes #46
Closes #47

Author: jmdobry

AUTHORS

@@ -6,6 +6,7 @@
 #   # commits  Name or Organization <email address>
 # The email address is not required for organizations.
 InternalFX <bryan@internalfx.com>
+Ivan Voznyakovsky <ivan.voznyakovsky@gmail.com>
 Jason Dobry <jason.dobry@gmail.com>
 Josh Drake <m0nikr@gmail.com>
 RobertHerhold <reherhold@gmail.com>

CHANGELOG.md

@@ -1,3 +1,11 @@
+##### 2.2.1 - 17 March 2016
+
+###### Backwards compatible bug fixes
+- #44 - Angular/HTTP: Canceling requests with timeout promise does not work
+- #45 - Map file path in js-data-http.min.js is incorrect.
+- #46 - Sending large payloads takes huge amount of time - thanks @ivanvoznyakovsky
+- #47 - perf(http): speed up preparation of http config with large payload - thanks @ivanvoznyakovsky
+
 ##### 2.2.0 - 23 February 2016
 
 ###### Backwards compatible API changes

CONTRIBUTORS

@@ -5,7 +5,8 @@
 # Names should be added to this file as:
 #   [commit count] Name <email address>
      1	InternalFX <bryan@internalfx.com>
-    53	Jason Dobry <jason.dobry@gmail.com>
+     1	Ivan Voznyakovsky <ivan.voznyakovsky@gmail.com>
+    56	Jason Dobry <jason.dobry@gmail.com>
      1	Josh Drake <m0nikr@gmail.com>
      1	RobertHerhold <reherhold@gmail.com>
      3	Tomás Fox <tomas.c.fox@gmail.com>

dist/js-data-http.js

@@ -30,8 +30,7 @@ module.exports = function (config) {
 			'karma-phantomjs-launcher',
 			'karma-firefox-launcher',
 			'karma-coverage',
-			'karma-browserstack-launcher',
-			'karma-junit-reporter'
+			'karma-browserstack-launcher'
 		],
 		autoWatch: false,
 		autoWatchBatchDelay: 4000,
@@ -46,7 +45,7 @@ module.exports = function (config) {
 			'test/**/*.js'
 		],
 
-		reporters: ['dots', 'coverage', 'junit'],
+		reporters: ['dots', 'coverage'],
 
 		preprocessors: {
 			'dist/js-data-http.js': ['coverage']
@@ -58,14 +57,6 @@ module.exports = function (config) {
 			dir: 'coverage/'
 		},
 
-    // the default configuration
-    junitReporter: {
-      outputDir: process.env.CIRCLE_TEST_REPORTS || 'junit',
-      outputFile: undefined,
-      suite: 'js-data-http',
-      useBrowserName: false
-    },
-
 		browserStack: {
 			username: process.env.BROWSERSTACK_USERNAME,
 			accessKey: process.env.BROWSERSTACK_ACCESS_KEY

dist/js-data-http.js.map

@@ -1,7 +1,7 @@
 {
   "name": "js-data-http",
   "description": "HTTP adapter for js-data.",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "homepage": "https://github.com/js-data/js-data-http",
   "repository": {
     "type": "git",
@@ -23,41 +23,39 @@
   "scripts": {
     "lint": "standard src/**/*.js",
     "bundle": "webpack --config webpack.config.js --colors",
-    "min": "uglifyjs dist/js-data-http.js -o dist/js-data-http.min.js --source-map dist/js-data-http.min.map -v -m -c --screw-ie8",
+    "min": "uglifyjs dist/js-data-http.js -o dist/js-data-http.min.js --source-map dist/js-data-http.min.map --source-map-url js-data-http.min.map -v -m -c --screw-ie8",
     "version": "node scripts/version.js",
     "banner": "node scripts/banner.js",
     "gzip": "echo gzipped size: $(cat dist/js-data-http.min.js | gzip -f9 | wc -c)kb",
     "build": "npm run lint && npm run bundle && npm run min && npm run version && npm run banner",
     "karma": "karma start",
     "test": "npm run build && npm run karma",
     "release": "npm test && node scripts/authors.js",
-    "ci": "npm test && cat ./coverage/PhantomJS*/lcov.info | coveralls || true && cat ./coverage/PhantomJS*/lcov.info | codacy-coverage || true"
+    "ci": "npm test && cat ./coverage/PhantomJS*/lcov.info | coveralls || true"
   },
   "devDependencies": {
     "axios": "0.9.1",
-    "babel-core": "6.5.2",
+    "babel-core": "6.7.2",
     "babel-eslint": "5.0.0",
-    "babel-loader": "6.2.3",
-    "babel-preset-es2015": "6.5.0",
+    "babel-loader": "6.2.4",
+    "babel-preset-es2015": "6.6.0",
     "chai": "3.5.0",
-    "codacy-coverage": "1.1.3",
-    "coveralls": "2.11.6",
+    "coveralls": "2.11.8",
     "es6-promise": "3.1.2",
-    "karma": "0.13.21",
+    "karma": "0.13.22",
     "karma-browserstack-launcher": "0.1.10",
     "karma-chai": "0.1.0",
     "karma-chrome-launcher": "0.2.2",
     "karma-coverage": "0.5.3",
     "karma-firefox-launcher": "0.1.7",
-    "karma-junit-reporter": "0.3.8",
     "karma-mocha": "0.2.2",
-    "karma-phantomjs-launcher": "0.2.1",
+    "karma-phantomjs-launcher": "1.0.0",
     "karma-sinon": "1.0.4",
     "mocha": "2.4.5",
-    "mout": "0.11.1",
-    "phantomjs": "1.9.18",
-    "sinon": "1.17.2",
-    "standard": "6.0.7",
+    "mout": "0.12.0",
+    "phantomjs-prebuilt": "2.1.5",
+    "sinon": "1.17.3",
+    "standard": "6.0.8",
     "uglify-js": "2.6.2",
     "webpack": "1.12.14"
   },

dist/js-data-http.min.js

@@ -124,8 +124,13 @@ class DSHttpAdapter {
 
     // blacklist `data` as it can be large and will take a lot of time to copy
     let payload = config.data
-    config = copy(config, null, null, null, ['data'])
-    config = deepMixIn(config, _this.defaults.httpConfig, {data: payload})
+    let cache = config.cache
+    let timeout = config.timeout
+    config = copy(config, null, null, null, ['data', 'cache', 'timeout'])
+    config = deepMixIn(config, _this.defaults.httpConfig)
+    config.data = payload
+    config.cache = cache
+    config.timeout = timeout
     if (!('verbsUseBasePath' in config)) {
       config.verbsUseBasePath = _this.defaults.verbsUseBasePath
     }