Merge commit '8d1008482aeca288d180368ea30573dd6e454b48'

package.json

@@ -39,9 +39,9 @@
  "devDependencies": {
  "@babel/core": "^7.6.0",
  "@babel/preset-env": "^7.4.5",
- "@vuepress/plugin-back-to-top": "1.3.0",
- "@vuepress/plugin-google-analytics": "1.3.0",
- "@vuepress/plugin-pwa": "1.3.0",
+ "@vuepress/plugin-back-to-top": "1.4.1",
+ "@vuepress/plugin-google-analytics": "1.4.1",
+ "@vuepress/plugin-pwa": "1.4.1",
  "art-template": "4.13.2",
  "art-template-loader": "1.4.3",
  "autoprefixer": "^9.6.1",
@@ -51,24 +51,24 @@
  "cssnano": "^4.1.10",
  "eslint": "^6.4.0",
  "eslint-config-prettier": "^6.3.0",
- "eslint-loader": "^3.0.0",
+ "eslint-loader": "^4.0.0",
  "eslint-plugin-prettier": "^3.1.1",
  "exports-loader": "^0.7.0",
  "file-loader": "^5.0.2",
  "git-revision-webpack-plugin": "^3.0.3",
  "mini-css-extract-plugin": "0.9.0",
  "node-sass": "^4.12.0",
  "postcss-loader": "^3.0.0",
- "prettier": "^1.18.2",
+ "prettier": "^2.0.4",
  "prettier-check": "^2.0.0",
  "pretty-quick": "^2.0.0",
  "sass-loader": "^8.0.0",
  "strip-loader": "^0.1.2",
  "style-loader": "^1.0.0",
- "svg-inline-loader": "0.8.0",
+ "svg-inline-loader": "0.8.2",
  "template-string-optimize-loader": "^3.0.0",
- "url-loader": "^3.0.0",
- "vuepress": "1.3.0",
+ "url-loader": "^4.1.0",
+ "vuepress": "1.4.1",
  "webpack": "^4.40.2",
  "webpack-cli": "3.3.11",
  "webpack-dev-server": "^3.8.1",