Merge pull request #53 from featurist/es5-check

fix es5 compat issues, add es5 check

browser.js

@@ -3,7 +3,7 @@ var xhr = require('./middleware/xhr')
 
 module.exports = client([
   require('./middleware/jsonp'),
-  require('./middleware/exception'),
+  require('./middleware/browserException'),
   require('./middleware/formBrowser'),
   require('./middleware/jsonBrowser'),
   require('./middleware/textBrowser'),

index.js

@@ -3,7 +3,7 @@ var http = require('./middleware/http')
 
 module.exports = client([
   require('./middleware/log'),
-  require('./middleware/exception'),
+  require('./middleware/serverException'),
   require('./middleware/textServer'),
   require('./middleware/formServer'),
   require('./middleware/jsonServer'),

middleware/browserException.js

@@ -0,0 +1,4 @@
+var middleware = require('./middleware')
+var exceptionMiddleware = require('./exception')()
+
+module.exports = middleware('exception', exceptionMiddleware)

middleware/exception.js

@@ -1,26 +1,29 @@
-var middleware = require('./middleware')
 var extend = require('../extend')
 var obfuscateUrlPassword = require('../obfuscateUrlPassword')
-var logError = require('debug')('httpism:error')
 var prepareForLogging = require('./prepareForLogging')
-var logDetailError = require('debug')('httpism:response:error')
 
-module.exports = middleware('exception', function (request, next) {
-  return next().then(function (response) {
-    var exceptions = request.options.exceptions
-    var isException = exceptions === false ? false : typeof exceptions === 'function' ? exceptions(response) : response.statusCode >= 400
+module.exports = function (logError, logDetailError) {
+  return function (request, next) {
+    return next().then(function (response) {
+      var exceptions = request.options.exceptions
+      var isException = exceptions === false ? false : typeof exceptions === 'function' ? exceptions(response) : response.statusCode >= 400
 
-    if (isException) {
-      var obfuscatedUrl = obfuscateUrlPassword(request.url)
-      var msg = request.method.toUpperCase() + ' ' + obfuscatedUrl + ' => ' + response.statusCode + ' ' + response.statusText
-      logError(msg)
-      var logResponse = prepareForLogging(response)
-      logDetailError(logResponse)
-      var error = extend(new Error(msg), response)
-      error.url = obfuscatedUrl
-      throw error
-    } else {
-      return response
-    }
-  })
-})
+      if (isException) {
+        var obfuscatedUrl = obfuscateUrlPassword(request.url)
+        var msg = request.method.toUpperCase() + ' ' + obfuscatedUrl + ' => ' + response.statusCode + ' ' + response.statusText
+        if (logError) {
+          logError(msg)
+        }
+        var logResponse = prepareForLogging(response)
+        if (logDetailError) {
+          logDetailError(logResponse)
+        }
+        var error = extend(new Error(msg), response)
+        error.url = obfuscatedUrl
+        throw error
+      } else {
+        return response
+      }
+    })
+  }
+}

middleware/serverException.js

@@ -0,0 +1,6 @@
+var middleware = require('./middleware')
+var logError = require('debug')('httpism:error')
+var logDetailError = require('debug')('httpism:response:error')
+var exceptionMiddleware = require('./exception')(logError, logDetailError)
+
+module.exports = middleware('exception', exceptionMiddleware)

package.json

@@ -26,6 +26,7 @@
     "cookie-parser": "1.4.4",
     "cors": "2.8.5",
     "electron": "6.0.12",
+    "es-check": "^5.0.0",
     "es6-promise": "4.2.8",
     "eslint": "6.5.1",
     "eslint-config-standard": "14.1.0",
@@ -54,16 +55,19 @@
     "uglify-js": "3.6.3",
     "url-template": "2.0.8",
     "watchify": "3.11.1",
-    "webpack": "4.41.2"
+    "webpack": "^4.41.2",
+    "webpack-cli": "^3.3.10"
   },
   "directories": {
     "test": "test"
   },
   "scripts": {
-    "test": "npm run test-mocha && npm run test-browser -- --single-run --browsers Electron && eslint .",
+    "test": "npm run test-mocha && npm run test-browser -- --single-run --browsers Electron && eslint . && yarn test-es5",
     "test-browser": "karma start",
+    "test-es5": "yarn webpack-build && es-check es5 _httpism.js && rm _httpism.js",
     "test-mocha": "DEBUG=httpism* mocha",
-    "size": "webpack browser.js _httpism.js && uglifyjs --compress warnings=false --mangle -- _httpism.js > _httpism.min.js && gzip < _httpism.min.js > _httpism.min.js.gz && ls -lh _httpism.*"
+    "webpack-build": "webpack-cli browser.js --mode production --output _httpism.js",
+    "size": "yarn webpack-build && uglifyjs --compress --mangle -- _httpism.js > _httpism.min.js && gzip < _httpism.min.js > _httpism.min.js.gz && ls -lh _httpism.* && rm _httpism.*"
   },
   "repository": {
     "type": "git",