merge from upstream next

Author: usu

package-lock.json

@@ -52,8 +52,8 @@
     "@babel/preset-typescript": "7.16.7",
     "@nuxt/types": "2.15.8",
     "@types/url-template": "2.0.28",
-    "@typescript-eslint/eslint-plugin": "5.10.0",
-    "@typescript-eslint/parser": "5.10.0",
+    "@typescript-eslint/eslint-plugin": "5.10.1",
+    "@typescript-eslint/parser": "5.10.1",
     "@vue/eslint-config-standard": "6.1.0",
     "@vue/test-utils": "1.3.0",
     "axios": "0.25.0",
@@ -81,7 +81,7 @@
     "vue-template-compiler": "2.6.14",
     "vuex": "3.6.2",
     "webpack": "5.67.0",
-    "webpack-cli": "4.9.1",
+    "webpack-cli": "4.9.2",
     "webpack-node-externals": "3.0.0"
   }
 }