Merge branch 'master' into feature/configs-selector-for-editor-options

Author: ponelat

dist/swagger-editor-bundle.js

@@ -1,7 +1,7 @@
 {
   "name": "swagger-editor",
   "description": "Swagger Editor",
-  "version": "3.1.13",
+  "version": "3.1.18",
   "main": "dist/swagger-editor.js",
   "repository": "[email protected]:swagger-api/swagger-editor.git",
   "license": "Apache-2.0",
@@ -23,8 +23,8 @@
     "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",
     "predev": "npm install",
-    "dev": "npm-run-all --parallel hot-server open-dev watch",
-    "hot-server": "webpack-dev-server --host 0.0.0.0 --config webpack-hot-dev-server.config.js --inline --hot --progress",
+    "dev": "npm-run-all --parallel hot-server open-dev",
+    "hot-server": "webpack-dev-server --host 0.0.0.0 --config webpack-hot-dev-server.config.js --inline --hot --progress --content-base dev-helpers/",
     "open-dev": "sleep 3 && node -e 'require(\"open\")(\"http://localhost:3200\")'",
     "open-static": "node -e 'require(\"open\")(\"http://localhost:3001\")'",
     "lint": "eslint --cache --ext '.js,.jsx' src test",
@@ -49,16 +49,17 @@
     "immutable": "^3.x.x",
     "js-yaml": "^3.5.5",
     "json-beautify": "^1.0.1",
-    "react": "^15.x",
+    "prop-types": "15.6.0",
+    "react": "^15.6.2",
     "react-addons-css-transition-group": "^15.4.2",
     "react-dd-menu": "^2.0.0",
-    "react-dom": "^15.x",
+    "react-dom": "^15.6.2",
     "react-file-download": "^0.3.2",
     "react-redux": "^4.x.x",
     "react-transition-group": "^1.1.1",
     "redux": "^3.x.x",
-    "swagger-client": "^3.3.0",
-    "swagger-ui": "^3.4.2",
+    "swagger-client": "^3.4.0",
+    "swagger-ui": "^3.6.0",
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {