Merge branch 'master' into fix/InconsistenciesBoardNavigation

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image:  cimg/node:16.18
+      - image: cimg/node:18.18.1
     working_directory: ~/repo
     steps:
       - checkout
@@ -24,13 +24,13 @@ jobs:
             - ~/.cache/yarn
           key: yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
       # run tests
-      - run: 
+      - run:
           name: Run Unit Tests
-          command: yarn test -- --silent --updateSnapshot  --no-watchman --maxWorkers=50% --testPathPattern="/Board|Communicator|App|Settings|Account|UI/"
+          command: yarn test --silent --updateSnapshot --runInBand --no-watchman --testPathPattern="/Board|Communicator|App|Settings|Account|UI/"
   image:
     docker:
       # specify the version you desire here
-      - image:  cimg/node:16.18
+      - image: cimg/node:18.18.1
     working_directory: ~/repo
     steps:
       - checkout
@@ -49,10 +49,10 @@ jobs:
       # Build Docker Image
       # https://circleci.com/docs/2.0/building-docker-images/#overview
       - setup_remote_docker: # (2)
-          version: 19.03.13
+          version: default
           docker_layer_caching: false # (3)
       # build and push Docker image
-      - run: 
+      - run:
           name: Build Docker Image
           command: |
             TAG=0.1.$CIRCLE_BUILD_NUM

.nvmrc

@@ -1 +1 @@
-v16
+v18.18

.prettierrc

@@ -1,4 +1,4 @@
 {
   "printWidth": 80,
   "singleQuote": true
-}
+}

Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1 - the build process
-FROM node:16-alpine as build-deps
+FROM node:18.18.1 as build-deps
 WORKDIR /usr/src/app
 COPY package.json yarn.lock ./
 RUN yarn install

README.md

@@ -140,7 +140,7 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 
 ## :memo: Legal & licenses
 
-Copyright © 2017-2021, [OTTAA Project](https://ottaa-project.github.io/) & Cboard contributors.
+Copyright © 2017-2024, Assistive Technology LLC & Cboard contributors.
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3 as published by the Free Software Foundation.
 

craco.config.js

@@ -0,0 +1,24 @@
+const NodePolyfillPlugin = require('node-polyfill-webpack-plugin');
+
+module.exports = {
+  webpack: {
+    entry: './src/index.js',
+    plugins: [new NodePolyfillPlugin({ excludeAliases: ['console'] })],
+    resolve: {
+      extensions: ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx']
+    },
+    configure: {
+      ignoreWarnings: [
+        function ignoreSourcemapsloaderWarnings(warning) {
+          return (
+            warning.module?.resource.includes('node_modules') &&
+            warning.details?.includes('source-map-loader')
+          );
+        }
+      ]
+    }
+  },
+  babel: {
+    plugins: ['babel-plugin-transform-import-meta']
+  }
+};

package.json

@@ -18,26 +18,28 @@
   "license": "GPL-3.0-only",
   "dependencies": {
     "@cospired/i18n-iso-languages": "^2.2.0",
-    "@crowdin/crowdin-api-client": "^1.22.0",
-    "@ctrl/react-adsense": "^1.5.0",
+    "@crowdin/crowdin-api-client": "^1.28.1",
+    "@ctrl/react-adsense": "^1.7.0",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "4.0.0-alpha.57",
-    "@microsoft/applicationinsights-web": "^2.8.11",
+    "@microsoft/applicationinsights-web": "^2.8.16",
+    "@paypal/react-paypal-js": "^7.8.3",
     "@redux-beacon/google-analytics-gtag": "^1.1.0",
     "@redux-beacon/logger": "^1.0.0",
     "@redux-beacon/offline-web": "^1.0.0",
     "axios": "^0.26.1",
-    "browser-image-resizer": "^1.2.0",
+    "browser-image-resizer": "^2.4.1",
     "dom-to-image": "^2.6.0",
-    "dotenv": "^16.0.3",
-    "echarts": "5.3.2",
+    "dotenv": "^16.1.4",
+    "echarts": "5.4.3",
     "echarts-for-react": "^3.0.2",
     "file-saver": "^2.0.5",
     "fontsource-roboto": "^4.0.0",
     "formik": "^1.3.2",
     "history": "^4.10.1",
     "i18n-iso-countries": "4.3.1",
+    "idb": "^7.1.1",
     "intl": "^1.2.5",
     "is-url": "1.2.4",
     "ismobilejs": "^1.1.1",
@@ -49,34 +51,34 @@
     "keycode": "^2.2.1",
     "lodash": "^4.17.21",
     "mathjs": "7.6.0",
-    "microsoft-cognitiveservices-speech-sdk": "^1.26.0",
+    "microsoft-cognitiveservices-speech-sdk": "^1.34.0",
     "mime-types": "^2.1.35",
     "moment": "2.29.4",
-    "mongoose": "^6.10.2",
-    "opencollective": "^1.0.3",
-    "pdfmake": "^0.2.7",
+    "mongoose": "^6.12.3",
+    "ogv": "^1.8.9",
+    "pdfmake": "^0.2.8",
     "prop-types": "^15.8.1",
     "query-string": "^6.14.1",
-    "ramda": "^0.28.0",
+    "ramda": "^0.29.1",
     "react": "^17.0.2",
     "react-autosuggest": "^10.1.0",
-    "react-cropper": "^2.1.8",
+    "react-cropper": "^2.3.3",
     "react-dnd": "^11.1.3",
     "react-dnd-touch-backend": "^11.1.3",
     "react-dom": "^17.0.2",
     "react-grid-layout": "^0.16.6",
     "react-helmet": "^6.1.0",
-    "react-icons": "^4.8.0",
+    "react-icons": "^4.11.0",
     "react-intl": "^2.7.2",
-    "react-joyride": "^2.5.3",
+    "react-joyride": "^2.5.4",
     "react-markdown": "^5.0.3",
     "react-media-recorder": "^0.7.1",
     "react-redux": "^5.1.2",
     "react-router-dom": "^5.3.4",
     "react-scannable": "0.0.18",
     "react-share": "^2.3.1",
     "react-sizeme": "^3.0.2",
-    "react-social-login-buttons": "^3.6.1",
+    "react-social-login-buttons": "^3.9.1",
     "react-transition-group": "4.4.5",
     "redux": "^4.2.1",
     "redux-beacon": "^2.0.3",
@@ -88,19 +90,26 @@
     "yup": "^0.32.11"
   },
   "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "babel-plugin-transform-import-meta": "^2.2.1",
+    "@craco/craco": "^7.1.0",
+    "@types/mime-types": "^2.1.1",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.0",
     "decompress-zip": "^0.3.1",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "3.3.5",
+    "fake-indexeddb": "^4.0.1",
     "husky": "^1.1.4",
     "jest-mock-axios": "^3.2.0",
     "lint-staged": "^10.0.3",
+    "node-polyfill-webpack-plugin": "^2.0.1",
     "prettier": "1.15.3",
     "react-app-rewired": "^2.1.3",
-    "react-scripts": "^3.4.4",
+    "react-scripts": "5.0.1",
     "react-test-renderer": "^17.0.2",
     "redux-mock-store": "^1.5.4",
     "sw-precache": "^5.2.1",
+    "ts-loader": "^9.5.0",
     "typescript": "^4.6.4"
   },
   "husky": {
@@ -115,6 +124,12 @@
     ]
   },
   "jest": {
+    "transformIgnorePatterns": [
+      "node_modules/(?!idb|microsoft-cognitiveservices-speech-sdk)"
+    ],
+    "moduleNameMapper": {
+      "\\.(css|less)$": "<rootDir>/src/__mocks__/styleMock.js"
+    },
     "collectCoverageFrom": [
       "src/**/*.js",
       "!src/polyfills.js",
@@ -133,22 +148,21 @@
   },
   "scripts": {
     "analyze": "source-map-explorer build/static/js/**/*.js",
-    "start": "react-scripts --openssl-legacy-provider start",
-    "build": "react-scripts build && sw-precache --config=sw-precache-config.js",
+    "start": "craco start",
+    "build": "craco build  --verbose && sw-precache --config=sw-precache-config.js",
     "build-cordova-debug": "react-app-rewired build",
     "predeploy": "yarn build",
     "deploy": "gh-pages -d build",
-    "test": "react-scripts test",
+    "test": "craco test",
     "decrypt:local": "./scripts/decrypt-private.sh local",
     "encrypt:local": "./scripts/encrypt-private.sh local",
     "decrypt:prod": "./scripts/decrypt-private.sh prod",
     "encrypt:prod": "./scripts/encrypt-private.sh prod",
     "translations:pull": "CBOARD_ENV=local node ./scripts/crowdin-fetch-latest.js",
     "translations:push": "CBOARD_ENV=local node ./scripts/crowdin-push-changes.js",
-    "eject": "react-scripts eject",
-    "postinstall": "opencollective postinstall"
+    "eject": "craco eject"
   },
-  "collective": {
+  "funding": {
     "type": "opencollective",
     "url": "https://opencollective.com/cboard"
   },