fix: update dependencies

2026-04-24 03:00:21 -04:00 · 2021-02-07 15:14:10 +10:00
parent d4ca8a5197
commit 87b652f1da
11 changed files with 4407 additions and 12426 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -34,42 +34,64 @@
  "license": "PolyForm Perimeter License 1.0.0",
  "devDependencies": {
    "@brettstack/serverless-amplify-plugin": "^1.7.0",
+    "@commitlint/config-conventional": "^11.0.0",
    "@semantic-release/changelog": "^5.0.1",
    "@semantic-release/commit-analyzer": "^8.0.1",
    "@semantic-release/git": "^9.0.0",
-    "@semantic-release/github": "^7.0.5",
-    "@semantic-release/npm": "^7.0.5",
+    "@semantic-release/github": "^7.2.0",
+    "@semantic-release/npm": "^7.0.10",
    "@semantic-release/release-notes-generator": "^9.0.1",
-    "@wizeline/serverless-amplify-plugin": "^1.6.2",
-    "eslint-config-airbnb": "^18.0.1",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-react": "^7.14.3",
-    "eslint-plugin-react-hooks": "^1.7.0",
-    "husky": "^4.3.6",
-    "nodemon": "^2.0.3",
-    "replace-in-file": "^6.0.0",
-    "semantic-release": "^17.0.4",
-    "serverless": "^2.17.0",
+    "commitizen": "^4.2.3",
+    "commitlint": "^11.0.0",
+    "cz-conventional-changelog": "^3.3.0",
+    "eslint": "^7.19.0",
+    "eslint-config-airbnb": "^18.2.1",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-react": "^7.22.0",
+    "eslint-plugin-react-hooks": "^4.2.0",
+    "husky": "^4.3.8",
+    "lint-staged": "^10.5.4",
+    "semantic-release": "^17.3.7",
+    "serverless": "^2.22.0",
    "serverless-apigateway-service-proxy": "^1.14.0",
    "serverless-cloudside-plugin": "^1.0.3",
    "serverless-domain-manager": "^5.1.0",
-    "serverless-dotenv-plugin": "^2.4.2",
-    "serverless-iam-roles-per-function": "^3.1.0-d68046e",
-    "serverless-offline": "^6.1.5",
-    "serverless-plugin-aws-alerts": "^1.4.0",
+    "serverless-dotenv-plugin": "^3.1.0",
+    "serverless-iam-roles-per-function": "^3.1.0",
+    "serverless-offline": "^6.8.0",
+    "serverless-plugin-aws-alerts": "^1.6.1",
    "serverless-plugin-metric": "^1.2.2",
    "serverless-plugin-tracing": "^2.0.0",
-    "serverless-prune-plugin": "^1.4.2",
+    "serverless-prune-plugin": "^1.4.3",
    "serverless-stack-output": "^0.2.3",
    "serverless-stack-termination-protection": "^1.0.4",
-    "serverless-webpack": "^5.3.2",
-    "webpack": "^4.43.0"
+    "serverless-webpack": "^5.3.5",
+    "webpack": "^5.21.1"
  },
  "dependencies": {},
  "husky": {
    "hooks": {
-      "pre-push": "cd packages/api && npm test"
+      "pre-commit": "lint-staged",
+      "pre-push": "npm test",
+      "commit-msg": "commitlint -e $GIT_PARAMS"
+    }
+  },
+  "lint-staged": {
+    "*.js": [
+      "eslint --fix"
+    ]
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ],
+    "rules": {
+      "body-max-line-length": [
+        2,
+        "always",
+        240
+      ]
    }
  }
-}
+}
--- a/packages/api/dynamodb-init.js
+++ b/packages/api/dynamodb-init.js
@@ -4,8 +4,8 @@ import { Table } from 'dynamodb-toolbox'

 const { AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, NODE_ENV } = process.env

-if (NODE_ENV != 'test' && (!AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY)) {
-  const credentials = new AWS.SharedIniFileCredentials({profile: 'civ6_dev'})
+if (NODE_ENV !== 'test' && (!AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY)) {
+  const credentials = new AWS.SharedIniFileCredentials({ profile: 'civ6_dev' })
  AWS.config.credentials = credentials
 }

@@ -28,5 +28,5 @@ export const MainTable = new Table({
  DocumentClient: dynamoDbDocumentClient,
  indexes: {
    GSI1: { partitionKey: 'sk', sortKey: 'data' },
-  }
-})
+  },
+})
--- a/packages/api/functions/express/lambda.js
+++ b/packages/api/functions/express/lambda.js
@@ -3,10 +3,13 @@ import serverlessExpress from '@vendia/serverless-express'
 import app from './app'
 import { log, addLogMetadata } from '../../utils/logger'

-const serverlessExpressInstance = serverlessExpress({ app, log })
+const serverlessExpressInstance = serverlessExpress({
+  app,
+  log,
+})

 export const handler = (event, context) => {
  addLogMetadata({ metadata: { awsRequestId: context.awsRequestId } })

  return serverlessExpressInstance.handler(event, context)
-}
+}
--- a/packages/api/package-lock.json
+++ b/packages/api/package-lock.json
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -16,42 +16,29 @@
  "author": "",
  "license": "PolyForm Perimeter License 1.0.0",
  "devDependencies": {
-    "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.9.0",
-    "@babel/node": "^7.8.7",
-    "@babel/plugin-transform-async-to-generator": "^7.8.3",
-    "@babel/preset-env": "^7.9.5",
+    "@babel/cli": "^7.12.13",
+    "@babel/core": "^7.12.13",
+    "@babel/node": "^7.12.13",
+    "@babel/plugin-transform-async-to-generator": "^7.12.13",
+    "@babel/preset-env": "^7.12.13",
    "@serverless/event-mocks": "^1.1.1",
    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
    "jest": "^26.6.3",
-    "jest-dynalite": "^3.2.3",
-    "serverless": "^2.17.0",
-    "serverless-apigateway-service-proxy": "^1.7.0",
-    "serverless-domain-manager": "^3.3.1",
-    "serverless-iam-roles-per-function": "^2.0.2",
-    "serverless-offline": "^6.1.4",
-    "serverless-plugin-tracing": "^2.0.0",
-    "serverless-prune-plugin": "^1.4.2",
-    "serverless-webpack": "^5.3.1",
-    "webpack": "^4.42.1",
-    "webpack-cli": "^3.3.11"
+    "jest-dynalite": "^3.3.1"
  },
  "dependencies": {
-    "@dazn/lambda-powertools-middleware-correlation-ids": "^1.23.0",
-    "@dazn/lambda-powertools-middleware-log-timeout": "^1.23.0",
-    "@dazn/lambda-powertools-middleware-sample-logging": "^1.23.0",
-    "@middy/core": "^1.0.0-beta.10",
-    "@middy/sqs-partial-batch-failure": "^1.0.0-beta.10",
-    "@vendia/serverless-express": "^4.0.0",
-    "aws-sdk": "^2.656.0",
+    "@middy/core": "^1.5.2",
+    "@middy/sqs-partial-batch-failure": "^1.5.2",
+    "@vendia/serverless-express": "^4.1.3",
+    "aws-sdk": "^2.839.0",
    "body-parser": "^1.19.0",
    "cors": "^2.8.5",
-    "discord.js": "^12.1.1",
+    "discord.js": "^12.5.1",
    "dotenv": "^8.2.0",
-    "dynamodb-toolbox": "^0.3.0",
+    "dynamodb-toolbox": "^0.3.3",
    "express": "^4.17.1",
-    "lodash": "^4.17.19",
-    "node-fetch": "^2.6.0",
-    "shortid": "^2.2.15"
+    "lodash": "^4.17.20",
+    "node-fetch": "^2.6.1",
+    "shortid": "^2.2.16"
  }
 }
--- a/packages/api/scripts/send-webhook-request.js
+++ b/packages/api/scripts/send-webhook-request.js
@@ -1,4 +1,5 @@
 const path = require('path')
+
 const dotenvPath = path.resolve(__dirname, '../.env.development')
 require('dotenv').config({ path: dotenvPath })
 const fetch = require('node-fetch')
@@ -16,7 +17,7 @@ const WEBHOOK_REQUEST_VALUE = {
 async function main() {
  const endpoint = `webhook?gameId=${GAME_ID}`
  const url = `${API_GATEWAY_ENDPOINT}/${endpoint}`
-  
+
  const response = await fetch(url, {
    body: JSON.stringify(WEBHOOK_REQUEST_VALUE),
    method: 'POST',
--- a/packages/api/utils/logger.js
+++ b/packages/api/utils/logger.js
@@ -3,7 +3,7 @@ import { createLogger, format, transports } from 'winston'
 const NODE_ENV_LOG_LEVEL_MAP = {
  test: 'error',
  development: 'debug',
-  production: 'info' // Logs that are used for CloudWatch Metric Filters use log.info
+  production: 'info', // Logs that are used for CloudWatch Metric Filters use log.info
 }
 export const logger = createLogger({
  level: NODE_ENV_LOG_LEVEL_MAP[process.env.NODE_ENV],
@@ -18,16 +18,17 @@ export const logger = createLogger({
    handleExceptions: true,
    handleRejections: true,
  }),
-  exitOnError: false
+  exitOnError: false,
 })

 let logMetadata = { awsRequestId: null }
+// eslint-disable-next-line import/no-mutable-exports
 export let log = logger.child(logMetadata)

 export function addLogMetadata({ metadata }) {
  const newLogMetadata = {
    ...logMetadata,
-    ...metadata
+    ...metadata,
  }
  log = logger.child(newLogMetadata)
  logMetadata = newLogMetadata
--- a/packages/ui/.env
+++ b/packages/ui/.env
@@ -0,0 +1 @@
+SKIP_PREFLIGHT_CHECK=true
--- a/packages/ui/package-lock.json
+++ b/packages/ui/package-lock.json
@@ -8878,17 +8878,17 @@
      "integrity": "sha512-CsLk/r0C9dAzVPa9QF74HIXduxaucsaRfqiOYvIv2PRhvyC6EOqc/KbpgToQuDVgPf3sNAFZi3iBu4vpGOwGag=="
    },
    "elliptic": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
      "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
      },
      "dependencies": {
        "bn.js": {
@@ -8985,9 +8985,9 @@
      }
    },
    "enhanced-resolve": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz",
-      "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
+      "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
      "requires": {
        "graceful-fs": "^4.1.2",
        "memory-fs": "^0.5.0",
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -51,6 +51,7 @@
  },
  "devDependencies": {
    "@wizeline/serverless-amplify-plugin": "^1.2.1",
-    "serverless-dotenv-plugin": "^2.3.2"
+    "serverless-dotenv-plugin": "^2.3.2",
+    "webpack": "^4.44.2"
  }
 }