Merge branch 'release-2.17.0' into release

Author: raclim

.eslintrc

@@ -16,13 +16,33 @@
     "import/no-unresolved": 0,
     "import/no-named-as-default": 0,
     "import/no-named-as-default-member": 0,
+    "import/no-useless-path-segments": 1,
+    "import/no-cycle":0, //temporarily off
+    "import/no-import-module-exports": 0, //temporarily off
+    "import/extensions": [ // override airbnb setting to allow imports of js, jsx, ts, and tsx files to auto-resolve instead of error
+      "error",
+      "ignorePackages",
+      {
+        "js": "never",
+        "jsx": "never",
+        "ts": "never",
+        "tsx": "never"
+      }
+    ],
     "comma-dangle": 0,  // not sure why airbnb turned this on. gross!
+    "default-param-last": 0,
+    "no-else-return" :0,
     "indent": 0,
     "no-console": 0,
     "no-alert": 0,
+    "no-import-assign": 2,
+    "no-promise-executor-return": 0, //temporarily off
+    "no-restricted-exports": 1,
     "no-underscore-dangle": 0,
     "no-useless-catch": 2,
+    "prefer-object-spread": 0,
     "max-len": [1, 120, 2, {"ignoreComments": true, "ignoreTemplateLiterals": true}],
+    "max-classes-per-file": 0,
     "quote-props": [1, "as-needed"],
     "no-unused-vars": [1, {"vars": "local", "args": "none"}],
     "consistent-return": ["error", { "treatUndefinedAsUnspecified": true }],
@@ -36,7 +56,19 @@
       { "ignorePureComponents": true
     }],
     "class-methods-use-this": 0,
-    "react/jsx-no-bind": [2, {"allowBind": true, "allowArrowFunctions": true}],
+    "react/button-has-type": 0,
+    "react/destructuring-assignment":0,
+    "react/function-component-definition": 0,
+    "react/jsx-curly-newline":0,
+    "react/jsx-fragments":0,
+    "react/jsx-no-useless-fragment":0, // temporarily off
+    "react/jsx-one-expression-per-line": 0,
+    "react/jsx-props-no-spreading": 0,
+    "react/jsx-wrap-multilines": 0,
+    "react/jsx-no-bind": [2, {"allowBind": true, "allowArrowFunctions": true, "allowFunctions": true}],
+    "react/no-deprecated": 0, //temporarily off
+    "react/no-unused-class-component-methods": 1,
+    "react/sort-comp": 0,
     "no-return-assign": [2, "except-parens"],
     "jsx-a11y/anchor-is-valid": [
       "error",
@@ -49,6 +81,8 @@
         ]
       }
     ],
+    "jsx-a11y/control-has-associated-label": 0, //temporarily off
+    "jsx-a11y/label-has-associated-control": 0, //temporarily off
     "jsx-a11y/label-has-for": [
       2,
       {
@@ -72,6 +106,11 @@
   ],
   "settings": {
     "import/parser": "@babel/eslint-parser",
+    "import/resolver": {
+      "node": {
+        "extensions": [".js", ".jsx", ".ts", ".tsx"]
+      }
+    },
     "import/resolve": {
       "moduleDirectory": ["node_modules"]
     }

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: '16.14.x'
+        node-version: '18.20.x'
     - run: npm install
     - run: npm run test
     - run: npm run lint

.nvmrc

@@ -1 +1 @@
-16.14.2
+18.20.8

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 language: node_js
 node_js:
- - "16.14.2"
+ - "18.20.8"
 
 cache:
   directories:

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.14.2 AS base
+FROM node:18.20.8 AS base
 ENV APP_HOME=/usr/src/app \
   TERM=xterm
 RUN mkdir -p $APP_HOME

client/common/useKeyDownHandlers.js

@@ -66,3 +66,7 @@ export const DocumentKeyDown = ({ handlers }) => {
 DocumentKeyDown.propTypes = {
   handlers: PropTypes.objectOf(PropTypes.func)
 };
+
+DocumentKeyDown.defaultProps = {
+  handlers: {}
+};

client/components/RootPage.jsx

@@ -2,18 +2,19 @@ import styled from 'styled-components';
 import { prop } from '../theme';
 
 const RootPage = styled.div`
-  min-height: 100%;
+  min-height: 100vh;
+  height: ${({ fixedHeight }) => fixedHeight || '100vh'};
   display: flex;
-  justify-content: start;
+  justify-content: flex-start;
   flex-direction: column;
   color: ${prop('primaryTextColor')};
   background-color: ${prop('backgroundColor')};
-  height: ${({ fixedHeight }) => fixedHeight || 'initial'};
 
   @media (max-width: 770px) {
     height: 100%;
     overflow: hidden;
   }
+
   @media print {
     @page {
       page-orientation: landscape;

client/index.jsx

@@ -35,12 +35,12 @@ script.src = 'https://foundation-donate-banner.netlify.app/static/js/main.js';
 document.body.appendChild(script);
 
 const App = () => (
-  <>
+  <div>
     <Router history={browserHistory}>
       <SkipLink targetId="play-sketch" text="PlaySketch" />
       <Routing />
     </Router>
-  </>
+  </div>
 );
 
 render(

client/modules/IDE/components/AssetList.jsx

@@ -46,7 +46,7 @@ const AssetList = () => {
               <th>{t('AssetList.HeaderName')}</th>
               <th>{t('AssetList.HeaderSize')}</th>
               <th>{t('AssetList.HeaderSketch')}</th>
-              <th scope="col"></th>
+              <th aria-label="dropdown" scope="col"></th>
             </tr>
           </thead>
           <tbody>

client/modules/IDE/components/Banner.jsx

@@ -36,7 +36,7 @@ const Banner = ({ onClose }) => {
     <div className="banner">
       <a href={bannerURL}>{bannerCopy}</a>
       <button className="banner-close-button" onClick={onClose}>
-        <CrossIcon Icon={{ default: '#000', hover: '#333' }} />
+        <CrossIcon icon={{ default: '#000', hover: '#333' }} />
       </button>
     </div>
   );