Merge branch 'master' into ft/oas3-tio

Author: shockey

README.md

@@ -5,7 +5,7 @@ Swagger-JS
 
 ## New!
 
-**This is the new version of swagger-js, 3.x. Want to learn more? Check out our [FAQ](http://swagger.io/new-ui-faq/).**
+**This is the new version of swagger-js, 3.x. Want to learn more? Check out our [FAQ](https://github.com/swagger-api/swagger-js/blob/master/docs/MIGRATION_2_X.md).**
 
 For the older version of swagger-js, refer to the [*2.x branch*](https://github.com/swagger-api/swagger-js/tree/2.x).
 

package.json

@@ -16,12 +16,12 @@
     "deps_check_dir": ".deps_check"
   },
   "scripts": {
-    "build": "NODE_ENV=production webpack -p --config ./webpack.config.js",
-    "build-bundle": "NODE_ENV=production webpack -p --config ./webpack.bundle.config.js",
+    "build": "cross-env NODE_ENV=production webpack -p --config ./webpack.config.js",
+    "build-bundle": "cross-env NODE_ENV=production webpack -p --config ./webpack.bundle.config.js",
     "watch": "webpack --config webpack.config.js --watch --progress",
     "test": "npm run just-test && npm run lint",
-    "just-test": "NODE_ENV=test node ./node_modules/.bin/_mocha --recursive --compilers js:babel-core/register",
-    "test:watch": "npm run just-test -- -w",
+    "just-test": "cross-env NODE_ENV=test node ./node_modules/.bin/_mocha --recursive --compilers js:babel-core/register",
+    "test:watch": "npm run test -- -w",
     "lint": "eslint src/ test/",
     "deps-license": "license-checker --production --csv --out $npm_package_config_deps_check_dir/licenses.csv && license-checker --development --csv --out $npm_package_config_deps_check_dir/licenses-dev.csv",
     "deps-size": "webpack -p --config webpack.check.js --json | webpack-bundle-size-analyzer >| $npm_package_config_deps_check_dir/sizes.txt",
@@ -44,6 +44,7 @@
     "babel-plugin-transform-runtime": "6.15.0",
     "babel-preset-es2015": "^6.22.0",
     "clone": "^2.1.0",
+    "cross-env": "^5.0.5",
     "deepmerge": "^1.3.0",
     "eslint": "^3.18.0",
     "eslint-config-airbnb-base": "^11.1.1",