Merge branch 'master' into universal-inline

Author: mlrawlings

package-lock.json

@@ -67,28 +67,28 @@
     "eslint": "5.16.0",
     "eslint-config-prettier": "4.1.0",
     "eslint-config-webpack": "1.2.5",
-    "eslint-plugin-import": "2.16.0",
+    "eslint-plugin-import": "2.17.0",
     "eslint-plugin-prettier": "3.0.1",
     "execa": "1.0.0",
     "file-loader": "3.0.1",
     "html-loader": "0.5.5",
     "html-webpack-plugin": "3.2.0",
     "husky": "1.3.1",
     "jest": "24.7.1",
-    "jquery": "3.3.1",
+    "jquery": "3.4.0",
     "less": "3.9.0",
     "less-loader": "4.1.0",
     "lint-staged": "8.1.5",
     "marked": "0.6.2",
     "nyc": "13.3.0",
-    "prettier": "1.16.4",
+    "prettier": "1.17.0",
     "puppeteer": "1.14.0",
     "rimraf": "2.6.3",
     "standard-version": "5.0.2",
     "style-loader": "0.23.1",
     "supertest": "4.0.2",
     "url-loader": "1.1.2",
-    "webpack": "4.29.6",
+    "webpack": "4.30.0",
     "webpack-cli": "3.3.0",
     "ws": "6.2.1"
   },