node 20 updates / re

__test__/backend.test.js

@@ -623,7 +623,13 @@ describe("graphql test suite", () => {
           expect(parsedDate).toEqual(campaign.due_by);
         } else {
           if (isSqlite) {
-            // Currently an open issue w/ datetime being stored as a string in SQLite3 for Jest tests: https://github.com/TryGhost/node-sqlite3/issues/1355. This results in milliseconds being truncated when getting campaign due_by
+            // Currently an open issue w/ datetime being stored as a string in SQLite3 
+            // for Jest tests: https://github.com/TryGhost/node-sqlite3/issues/1355. 
+            // This results in milliseconds being truncated when getting campaign due_by
+
+            // 3.15.2024 => Fails in SQLite testing now, but passes in PG.
+            // copiedCampaign.due_by is an Invalid Date, and at some point
+            // uses Date.parse()
             const campaignDueBy = campaign.due_by;
 
             campaignDueBy.setMilliseconds(0);

__test__/components/IncomingMessageList/ConversationPreviewModal.test.js

@@ -24,6 +24,7 @@ import {
   createStartedCampaign
 } from "../../test_helpers";
 
+// Skipped because muiTheme is not set when called
 describe.skip("ConversationPreviewModal", () => {
   let startedCampaign;
   let optOutContact;

__test__/containers/CampaignList.test.js

@@ -43,7 +43,7 @@ describe("CampaignList", () => {
         campaigns: {
           campaigns: [campaignWithoutCreator],
           pageInfo: {
-            limit: 1000,
+            limit: 100,
             offset: 0,
             total: 1
           }
@@ -86,7 +86,7 @@ describe("CampaignList", () => {
         campaigns: {
           campaigns: [campaignWithCreator],
           pageInfo: {
-            limit: 1000,
+            limit: 100,
             offset: 0,
             total: 1
           }
@@ -127,7 +127,7 @@ describe("CampaignList", () => {
         campaigns: {
           campaigns: [campaignWithCreator],
           pageInfo: {
-            limit: 1000,
+            limit: 100,
             offset: 0,
             total: 1
           }

__test__/server/api/updateContactTags.test.js

@@ -159,7 +159,7 @@ describe("mutations.updateContactTags", () => {
 
       expect(result.errors[0].message).toEqual(
         expect.stringMatching(
-          /^The loader.load\(\) function must be called with a value,but got: undefined.*/
+          /^The loader.load\(\) function must be called with a value, but got: undefined.*/
         )
       );
 

__test__/setup.js

@@ -1,5 +1,8 @@
 import { configure } from "enzyme";
 import Adapter from "enzyme-adapter-react-16";
+import { TextEncoder, TextDecoder } from "util";
+
+Object.assign(global, { TextDecoder, TextEncoder });
 
 configure({ adapter: new Adapter() });
 

babel.config.js

@@ -0,0 +1,25 @@
+// The .babelrc config file takes priority for app compilation.
+// For running Jest tests, this file takes precedence over the settings in .babelrc
+
+module.exports = {
+  presets: [
+    "@babel/preset-react",
+    "@babel/preset-env",
+    ["@babel/preset-typescript", { allExtensions: true, isTSX: true }]
+  ],
+  only: ["./**/*.js", "./**/*.jsx"],
+  plugins: [
+    "@babel/plugin-proposal-export-default-from",
+    [
+      "@babel/plugin-transform-runtime",
+      {
+        regenerator: true
+      }
+    ]
+  ],
+  env: {
+    dev: {
+      plugins: ["react-hot-loader/babel"]
+    }
+  }
+};

jest.config.js

@@ -1,3 +1,13 @@
+const esModules = [
+  "bandwidth-sdk",
+  "axios", // bandwidth-sdk dependency
+  "filter-obj", // query-string dependency
+  "url-join",
+  "query-string",
+  "decode-uri-component",
+  "split-on-first"
+];
+
 module.exports = {
   verbose: true,
   testURL: "http://localhost:3000",
@@ -50,5 +60,8 @@ module.exports = {
   testPathIgnorePatterns: [
     "<rootDir>/node_modules/",
     "<rootDir>/__test__/cypress/"
-  ]
-};
+  ],
+  transformIgnorePatterns: esModules.length
+    ? [`/node_modules/(?!${esModules.join("|")})`]
+    : []
+};

lambda.js

@@ -1,5 +1,4 @@
-"use strict";
-const AWS = require("aws-sdk");
+"use strict";;
 const awsServerlessExpress = require("aws-serverless-express");
 let app, server, jobs, dispatcher;
 

package.json

@@ -81,15 +81,26 @@
   "homepage": "https://github.com/MoveOnOrg/Spoke/#readme",
   "dependencies": {
     "@aoberoi/passport-slack": "^1.0.5",
-    "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.19.6",
+    "@aws-sdk/client-cloudwatch": "^3.535.0",
+    "@aws-sdk/client-cloudwatch-events": "^3.535.0",
+    "@aws-sdk/client-lambda": "^3.535.0",
+    "@aws-sdk/client-s3": "^3.535.0",
+    "@aws-sdk/client-sqs": "^3.535.0",
+    "@aws-sdk/s3-request-presigner": "^3.535.0",
+    "@babel/cli": "^7.24.1",
+    "@babel/core": "^7.24.1",
     "@babel/plugin-proposal-export-default-from": "^7.18.10",
-    "@babel/plugin-transform-runtime": "^7.19.6",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/plugin-syntax-flow": "^7.14.5",
+    "@babel/plugin-transform-class-properties": "^7.23.3",
+    "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
+    "@babel/plugin-transform-optional-chaining": "^7.23.4",
+    "@babel/plugin-transform-react-jsx": "^7.14.9",
+    "@babel/plugin-transform-runtime": "^7.24.3",
+    "@babel/preset-env": "^7.23.9",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
-    "@babel/register": "^7.18.9",
-    "@bandwidth/messaging": "^3.0.0",
+    "@babel/register": "^7.23.7",
+    "@babel/traverse": "7.23.2",
     "@bandwidth/numbers": "^1.7.0",
     "@date-io/core": "^1.3.13",
     "@date-io/date-fns": "^1.3.13",
@@ -102,21 +113,22 @@
     "apollo-link-http": "^1.5.17",
     "apollo-server-express": "^1.2.0",
     "apollo-utilities": "^1.3.4",
-    "auth0-js": "^9.14.3",
+    "auth0-js": "^9.24.1",
     "aws-serverless-express": "^3.3.6",
-    "babel-loader": "^9.1.0",
+    "babel-loader": "^9.1.3",
     "babel-polyfill": "^6.26.0",
     "babel-runtime": "^6.26.0",
+    "bandwidth-sdk": "1.0.0",
     "body-parser": "^1.15.2",
     "browserify": "^17.0.0",
-    "camelcase-keys": "^4.1.0",
     "color-difference": "^0.3.4",
-    "cookie-session": "^2.0.0-alpha.1",
-    "dataloader": "^1.2.0",
+    "cookie-session": "^2.1.0",
+    "dataloader": "^2.2.2",
     "dotenv": "^2.0.0",
+    "eslint-plugin-react-hooks": "^4.3.0",
     "express": "^4.14.0",
     "fs": "^0.0.2",
-    "google-libphonenumber": "^3.0.0",
+    "google-libphonenumber": "^3.2.34",
     "googleapis": "^39.2.0",
     "graphql": "^0.13.2",
     "graphql-date": "^1.0.3",
@@ -126,68 +138,68 @@
     "heroku-ssl-redirect": "^0.1.1",
     "humps": "^1.1.0",
     "is-url": "^1.2.2",
-    "isomorphic-fetch": "^2.2.1",
+    "isomorphic-fetch": "^3.0.0",
     "jest-each": "^0.3.1",
     "json-loader": "^0.5.4",
     "jsonwebtoken": "^8.5.1",
-    "knex": "^2.3.0",
+    "knex": "^3.1.0",
     "lodash": "^4.13.1",
     "mailgun-js": "^0.20.0",
     "minilog": "^3.0.1",
     "moment": "2.29.4",
-    "moment-timezone": "^0.5.14",
+    "moment-timezone": "^0.5.45 ",
     "nexmo": "^2.3.2",
-    "node-abort-controller": "^1.0.4",
     "node-fetch": "^2.6.7",
-    "nodemailer": "^6.4.16",
+    "nodemailer": "^6.9.9",
     "omit-deep-lodash": "^1.1.4",
     "papaparse": "^5.1.1",
     "passport": "^0.3.2",
     "passport-auth0": "^0.6.1",
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0",
     "passport-local-authenticate": "^1.2.0",
-    "pg": "^8.0.3",
+    "pg": "^8.11.3",
     "pg-connection-string": "^2.4.0",
-    "pg-query-stream": "^1.1.1",
+    "pg-query-stream": "^4.5.3",
     "prop-types": "^15.6.0",
-    "query-string": "^4.1.0",
+    "query-string": "^9.0.0",
     "react": "16.14.0",
-    "redis": "3",
+    "react-dnd": "7.7.0",
+    "redis": "^4.6.13",
     "request": "^2.81.0",
     "rethink-knex-adapter": "0.4.20",
-    "rollbar": "^2.4.4",
-    "terser-webpack-plugin": "4",
+    "rollbar": "^2.26.4",
+    "terser-webpack-plugin": "^5.3.10",
     "thinky": "^2.3.3",
     "timezonecomplete": "^5.5.0",
-    "twilio": "^3.40.0",
-    "url-join": "^4.0.1",
+    "twilio": "^4.23.0",
+    "typescript": "^3.2.1",
     "us-area-codes": "^1.0.0",
     "uuid": "^3.1.0",
     "wait-for-expect": "^1.1.1",
-    "webpack": "^5.74.0",
+    "webpack": "^5.90.2",
     "webpack-manifest-plugin": "^5.0.0",
     "yup": "0.32.3"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.19.1",
+    "@babel/eslint-parser": "^7.24.1",
     "babel-jest": "^29.3.1",
     "babel-preset-es2017": "^6.24.1",
     "cypress": "5.6.0",
     "cypress-file-upload": "^4.0.6",
     "cypress-wait-until": "^1.7.1",
     "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.6",
-    "eslint": "^8.26.0",
+    "enzyme-adapter-react-16": "^1.15.8",
+    "eslint": "^8.56.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^6.10.0",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.6.1",
     "eslint-plugin-react": "^7.31.10",
     "fakeredis": "^2.0.0",
     "foreman": "^3.0.1",
     "husky": "4",
-    "jest-when": "^3.4.1",
+    "jest-when": "^3.6.0",
     "json2csv": "^3.6.2",
     "lint-staged": "^9.2.0",
     "mockdate": "^2.0.2",
@@ -198,11 +210,10 @@
     "react-scripts": "^5.0.1",
     "react-test-renderer": "16",
     "regenerator-runtime": "^0.10.5",
-    "selenium-webdriver": "^3.6.0",
     "sqlite3": "^5.1.2",
-    "supertest": "^6.2.3",
+    "supertest": "^6.3.4",
     "wait-on": "^2.1.0",
-    "webpack-cli": "^4.7.2",
+    "webpack-cli": "^4.10.0",
     "webpack-dev-server": "3"
   },
   "lint-staged": {
@@ -229,8 +240,6 @@
     "react-dom": "16.14.0",
     "react-formal": "2.2.2",
     "react-router": "^3.2.0",
-    "react-tooltip": "^4.2.13",
-    "recompose": "^0.30.0",
-    "webpack-cli": "^4.7.2"
+    "react-tooltip": "^4.2.13"
   }
 }

src/components/App.jsx

@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React, { useState } from "react";
 import { ThemeProvider } from "@material-ui/core/styles";
-import { createMuiTheme } from "@material-ui/core/styles";
+import { createTheme } from "@material-ui/core/styles";
 import CssBaseline from "@material-ui/core/CssBaseline";
 
 import { defaultTheme } from "../styles/mui-theme";
@@ -21,10 +21,10 @@ const formatTheme = newTheme => {
 
 const App = ({ children }) => {
   const [theme, setTheme] = useState(defaultTheme);
-  let muiTheme = createMuiTheme(defaultTheme);
+  let muiTheme = createTheme(defaultTheme);
   try {
     // if a bad value is saved this will fail.
-    muiTheme = createMuiTheme(theme);
+    muiTheme = createTheme(theme);
   } catch (e) {
     console.error("failed to create theme", theme);
   }

src/components/AssignmentSummary.jsx

@@ -1,7 +1,6 @@
 import PropTypes from "prop-types";
 import React, { Component } from "react";
 import { StyleSheet, css } from "aphrodite";
-import { compose } from "recompose";
 
 import Button from "@material-ui/core/Button";
 import Badge from "@material-ui/core/Badge";
@@ -276,4 +275,4 @@ AssignmentSummaryBase.propTypes = {
   todoLink: PropTypes.func
 };
 
-export default compose(withMuiTheme, withRouter)(AssignmentSummaryBase);
+export default withMuiTheme(withRouter(AssignmentSummaryBase));

src/components/AssignmentTexter/Controls.jsx

@@ -1,7 +1,6 @@
 import PropTypes from "prop-types";
 import React from "react";
 import { css } from "aphrodite";
-import { compose } from "recompose";
 import Toolbar from "./Toolbar";
 import MessageList from "./MessageList";
 import Survey from "./Survey";
@@ -603,9 +602,9 @@ export class AssignmentTexterContactControls extends React.Component {
             onClick={onClick("needsResponse")}
             style={{
               color: this.props.muiTheme.palette.text.primary,
-              backgroundColor: this.props.muiTheme.palette.background.default
+              backgroundColor: this.props.muiTheme.palette.background.default,
+              flex: "1 1 auto"
             }}
-            style={{ flex: "1 1 auto" }}
             disabled={!!this.props.contact.optOut}
             color="default"
             variant="contained"
@@ -770,7 +769,7 @@ export class AssignmentTexterContactControls extends React.Component {
             }}
             multiline
             fullWidth
-            rowsMax={6}
+            maxRows={6}
           />
         </GSForm>
       </div>
@@ -1278,4 +1277,4 @@ AssignmentTexterContactControls.propTypes = {
   updateCurrentContactById: PropTypes.func
 };
 
-export default compose(withMuiTheme)(AssignmentTexterContactControls);
+export default withMuiTheme(AssignmentTexterContactControls);

src/components/AssignmentTexter/MessageList.jsx

@@ -2,7 +2,6 @@ import PropTypes from "prop-types";
 import React from "react";
 import { Link as RouterLink } from "react-router";
 import moment from "moment";
-import { compose } from "recompose";
 
 import HeadsetIcon from "@material-ui/icons/Headset";
 import ImageIcon from "@material-ui/icons/Image";
@@ -218,4 +217,4 @@ MessageList.propTypes = {
   hideMedia: PropTypes.bool
 };
 
-export default compose(withMuiTheme)(MessageList);
+export default withMuiTheme(MessageList);