Merge pull request #380 from FuelRats/develop

v2.14.1

CHANGELOG.md

@@ -23,10 +23,21 @@ For detailed rules of this file, see  [Changelog Rules](#changelog-rules)
 ### ⚙ Tasks
 *
 
-[Unreleased]: https://github.com/FuelRats/fuelrats.com/compare/v2.14.0...HEAD
+[Unreleased]: https://github.com/FuelRats/fuelrats.com/compare/v2.14.1...HEAD
 
 
 
+## [2.14.1][] - 2021-11-07
+
+### 🐛 Fixed
+* Removed redundant error handlers to allow errors to be properly conveyed.
+
+### ⚙ Tasks
+* Upgraded dependencies to fix security header issues and migrate to Next 12
+
+[2.14.1]: https://github.com/FuelRats/fuelrats.com/compare/v2.14.0...v2.14.1
+
+
 
 
 ## [2.14.0][] - 2021-10-17

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fuelrats.com",
-  "version": "2.14.0",
+  "version": "2.14.1",
   "description": "The primary website of The Fuel Rats!",
   "homepage": "https://fuelrats.com/",
   "bugs": {
@@ -28,12 +28,12 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-brands-svg-icons": "^5.15.4",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@fortawesome/react-fontawesome": "^0.1.15",
+    "@fortawesome/react-fontawesome": "^0.1.16",
     "@fuelrats/next-adorable-avatars": "^0.3.0",
     "@fuelrats/validation-util": "^1.2.0",
     "@fuelrats/web-util": "^0.3.3",
-    "@next/eslint-plugin-next": "^11.1.2",
-    "axios": "^0.23.0",
+    "@next/eslint-plugin-next": "^12.0.3",
+    "axios": "^0.24.0",
     "clsx": "^1.1.1",
     "date-fns": "^2.25.0",
     "date-fns-tz": "^1.1.6",
@@ -43,17 +43,17 @@
     "hoist-non-react-statics": "^3.3.2",
     "http-proxy-middleware": "^2.0.1",
     "immer": "^9.0.6",
-    "ip6addr": "^0.2.3",
+    "ip6addr": "^0.2.4",
     "js-cookie": "^3.0.1",
     "jsonfile": "^6.1.0",
     "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",
-    "next": "^11.1.2",
+    "next": "^12.0.3",
     "next-cookies": "^2.0.3",
     "next-redux-wrapper": "5.0.0",
-    "next-safe": "^3.1.0",
+    "next-safe": "^3.1.1",
     "nprogress": "^0.2.0",
-    "postcss": "^8.3.9",
+    "postcss": "^8.3.11",
     "postcss-easy-import": "^3.0.0",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-preset-env": "^6.7.0",
@@ -67,59 +67,60 @@
     "react-dom": "^17.0.2",
     "react-easy-crop": "^3.5.3",
     "react-is": "^17.0.2",
-    "react-redux": "^7.2.5",
+    "react-redux": "^7.2.6",
     "react-table-6": "^6.11.0",
-    "redux": "^4.1.1",
+    "redux": "^4.1.2",
     "redux-devtools-extension": "^2.13.9",
     "redux-immutable-state-invariant": "^2.1.0",
-    "redux-thunk": "^2.3.0",
-    "reselect": "^4.0.0",
-    "stripe": "^8.183.0",
-    "ua-parser-js": "^0.7.28",
+    "redux-thunk": "^2.4.0",
+    "reselect": "^4.1.2",
+    "stripe": "^8.186.1",
+    "ua-parser-js": "1.0.2",
     "use-immer": "^0.6.0",
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.8",
-    "@babel/eslint-parser": "^7.15.8",
+    "@babel/core": "^7.16.0",
+    "@babel/eslint-parser": "^7.16.0",
     "@babel/eslint-plugin": "^7.14.5",
-    "@babel/plugin-proposal-decorators": "^7.15.8",
+    "@babel/plugin-proposal-decorators": "^7.16.0",
     "@fuelrats/babel-plugin-classnames": "^0.3.0",
-    "@fuelrats/eslint-config": "^2.4.0-canary.19",
+    "@fuelrats/eslint-config": "^2.4.0-canary.20",
     "@fuelrats/eslint-config-react": "^2.4.0-canary.19",
     "@fuelrats/eslint-plugin": "^2.4.0-canary.11",
-    "@fuelrats/stylelint-config": "^1.2.3",
+    "@fuelrats/stylelint-config": "^2.0.0",
     "@svgr/webpack": "^5.5.0",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/ip6addr": "^0.2.3",
     "@types/js-cookie": "^3.0.0",
     "@types/jsonfile": "^6.0.1",
-    "@types/lodash": "^4.14.175",
+    "@types/lodash": "^4.14.176",
     "@types/qs": "^6.9.7",
-    "@types/react": "^17.0.30",
-    "@types/react-dom": "^17.0.9",
-    "@types/react-is": "^17.0.2",
-    "@types/react-redux": "^7.1.19",
+    "@types/react": "^17.0.34",
+    "@types/react-dom": "^17.0.11",
+    "@types/react-is": "^17.0.3",
+    "@types/react-redux": "^7.1.20",
     "@types/ua-parser-js": "^0.7.36",
     "@types/webpack": "^5.28.0",
     "@types/zxcvbn": "^4.4.1",
-    "babel-loader": "8.2.2",
+    "babel-loader": "8.2.3",
     "builtin-modules": "^3.2.0",
     "doctoc": "^2.1.0",
     "eslint": "^7.32.0",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-import": "^2.25.2",
-    "eslint-plugin-jsdoc": "^36.1.1",
+    "eslint-plugin-jsdoc": "^37.0.3",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "sass": "^1.43.2",
+    "postcss-scss": "^4.0.2",
+    "sass": "^1.43.4",
     "semver": "^7.3.5",
-    "stylelint": "^13.13.1",
-    "stylelint-order": "^4.1.0",
-    "stylelint-scss": "^3.21.0",
-    "webpack": "^5.58.2",
+    "stylelint": "^14.0.1",
+    "stylelint-order": "^5.0.0",
+    "stylelint-scss": "^4.0.0",
+    "webpack": "^5.62.1",
     "worker-loader": "^3.0.8"
   },
   "engines": {

src/pages/api/qms/queue.js

@@ -1,4 +1,3 @@
-import { InternalServerAPIError } from '~/util/server/errors'
 import getEnv from '~/util/server/getEnv'
 import acceptMethod from '~/util/server/middleware/acceptMethod'
 import jsonApiRoute from '~/util/server/middleware/jsonApiRoute'
@@ -25,15 +24,6 @@ function getQueueLength (ctx) {
         return !rescue.pending && !rescue.in_progress
       }).length
     },
-    ({ response }) => {
-      ctx.error(new InternalServerAPIError(null, {
-        internalError: {
-          url: 'qms/api/v1/queue/',
-          status: response.status,
-          statusText: response.statusText,
-        },
-      }))
-    },
   )
 }
 
@@ -51,9 +41,6 @@ function getMaxQueueLength (ctx) {
     ({ data }) => {
       return data.max_active_clients
     },
-    (error) => {
-      ctx.error(error)
-    },
   )
 }