Skip to content

Commit 56136ea

Browse files
authored
Merge pull request #3555 from processing/upgrade-mongo-v8
Upgrade Mongo to Version 8
2 parents 00555ca + 7a45499 commit 56136ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3456
-3652
lines changed

.eslintrc

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
"import/no-unresolved": 0,
1717
"import/no-named-as-default": 0,
1818
"import/no-named-as-default-member": 0,
19+
"import/no-useless-path-segments": 1,
20+
"import/no-cycle":0, //temporarily off
21+
"import/no-import-module-exports": 0, //temporarily off
1922
"import/extensions": [ // override airbnb setting to allow imports of js, jsx, ts, and tsx files to auto-resolve instead of error
2023
"error",
2124
"ignorePackages",
@@ -27,12 +30,19 @@
2730
}
2831
],
2932
"comma-dangle": 0, // not sure why airbnb turned this on. gross!
33+
"default-param-last": 0,
34+
"no-else-return" :0,
3035
"indent": 0,
3136
"no-console": 0,
3237
"no-alert": 0,
38+
"no-import-assign": 2,
39+
"no-promise-executor-return": 0, //temporarily off
40+
"no-restricted-exports": 1,
3341
"no-underscore-dangle": 0,
3442
"no-useless-catch": 2,
43+
"prefer-object-spread": 0,
3544
"max-len": [1, 120, 2, {"ignoreComments": true, "ignoreTemplateLiterals": true}],
45+
"max-classes-per-file": 0,
3646
"quote-props": [1, "as-needed"],
3747
"no-unused-vars": [1, {"vars": "local", "args": "none"}],
3848
"consistent-return": ["error", { "treatUndefinedAsUnspecified": true }],
@@ -46,7 +56,19 @@
4656
{ "ignorePureComponents": true
4757
}],
4858
"class-methods-use-this": 0,
49-
"react/jsx-no-bind": [2, {"allowBind": true, "allowArrowFunctions": true}],
59+
"react/button-has-type": 0,
60+
"react/destructuring-assignment":0,
61+
"react/function-component-definition": 0,
62+
"react/jsx-curly-newline":0,
63+
"react/jsx-fragments":0,
64+
"react/jsx-no-useless-fragment":0, // temporarily off
65+
"react/jsx-one-expression-per-line": 0,
66+
"react/jsx-props-no-spreading": 0,
67+
"react/jsx-wrap-multilines": 0,
68+
"react/jsx-no-bind": [2, {"allowBind": true, "allowArrowFunctions": true, "allowFunctions": true}],
69+
"react/no-deprecated": 0, //temporarily off
70+
"react/no-unused-class-component-methods": 1,
71+
"react/sort-comp": 0,
5072
"no-return-assign": [2, "except-parens"],
5173
"jsx-a11y/anchor-is-valid": [
5274
"error",
@@ -59,6 +81,8 @@
5981
]
6082
}
6183
],
84+
"jsx-a11y/control-has-associated-label": 0, //temporarily off
85+
"jsx-a11y/label-has-associated-control": 0, //temporarily off
6286
"jsx-a11y/label-has-for": [
6387
2,
6488
{

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Use Node.js
1212
uses: actions/setup-node@v1
1313
with:
14-
node-version: '16.14.x'
14+
node-version: '18.20.x'
1515
- run: npm install
1616
- run: npm run test
1717
- run: npm run lint

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.14.2
1+
18.20.8

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
sudo: required
22
language: node_js
33
node_js:
4-
- "16.14.2"
4+
- "18.20.8"
55

66
cache:
77
directories:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:16.14.2 AS base
1+
FROM node:18.20.8 AS base
22
ENV APP_HOME=/usr/src/app \
33
TERM=xterm
44
RUN mkdir -p $APP_HOME

client/common/useKeyDownHandlers.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,7 @@ export const DocumentKeyDown = ({ handlers }) => {
6666
DocumentKeyDown.propTypes = {
6767
handlers: PropTypes.objectOf(PropTypes.func)
6868
};
69+
70+
DocumentKeyDown.defaultProps = {
71+
handlers: {}
72+
};

client/components/RootPage.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ import styled from 'styled-components';
22
import { prop } from '../theme';
33

44
const RootPage = styled.div`
5-
min-height: 100%;
5+
min-height: 100vh;
6+
height: ${({ fixedHeight }) => fixedHeight || '100vh'};
67
display: flex;
7-
justify-content: start;
8+
justify-content: flex-start;
89
flex-direction: column;
910
color: ${prop('primaryTextColor')};
1011
background-color: ${prop('backgroundColor')};
11-
height: ${({ fixedHeight }) => fixedHeight || 'initial'};
1212
1313
@media (max-width: 770px) {
1414
height: 100%;
1515
overflow: hidden;
1616
}
17+
1718
@media print {
1819
@page {
1920
page-orientation: landscape;

client/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ script.src = 'https://foundation-donate-banner.netlify.app/static/js/main.js';
3535
document.body.appendChild(script);
3636

3737
const App = () => (
38-
<>
38+
<div>
3939
<Router history={browserHistory}>
4040
<SkipLink targetId="play-sketch" text="PlaySketch" />
4141
<Routing />
4242
</Router>
43-
</>
43+
</div>
4444
);
4545

4646
render(

client/modules/IDE/components/AssetList.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const AssetList = () => {
4646
<th>{t('AssetList.HeaderName')}</th>
4747
<th>{t('AssetList.HeaderSize')}</th>
4848
<th>{t('AssetList.HeaderSketch')}</th>
49-
<th scope="col"></th>
49+
<th aria-label="dropdown" scope="col"></th>
5050
</tr>
5151
</thead>
5252
<tbody>

client/modules/IDE/components/Banner.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const Banner = ({ onClose }) => {
3636
<div className="banner">
3737
<a href={bannerURL}>{bannerCopy}</a>
3838
<button className="banner-close-button" onClick={onClose}>
39-
<CrossIcon Icon={{ default: '#000', hover: '#333' }} />
39+
<CrossIcon icon={{ default: '#000', hover: '#333' }} />
4040
</button>
4141
</div>
4242
);

0 commit comments

Comments
 (0)