Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Update Dependencies #1148

Merged
merged 25 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2a0fa26
Update patch-package
howard-e Jul 10, 2024
f43d425
Formatting and CI version updates
howard-e Jul 10, 2024
fd1eb49
Search for latest packages from root to avoid dependabot PR dupes
howard-e Jul 10, 2024
ca8d644
Update eslint, jest and prettier related dependencies
howard-e Jul 10, 2024
1114765
Update @apollo/client
howard-e Jul 10, 2024
5fa8822
Update @babel related dependencies on client
howard-e Jul 10, 2024
5f9880e
Remove unused moxios
howard-e Jul 10, 2024
b254bb4
Update frontend styling related dependencies
howard-e Jul 10, 2024
429b439
Update bootstrap and other related client dependencies
howard-e Jul 10, 2024
7d58833
Update additional client dependencies
howard-e Jul 10, 2024
023b446
Update react related dependencies
howard-e Jul 10, 2024
75dee23
Consolidate react imports
howard-e Jul 10, 2024
e2d5fc7
Update puppeteer
howard-e Jul 10, 2024
c51c27a
Update webpack related dependencies
howard-e Jul 10, 2024
12d8bbe
Additional updates
howard-e Jul 10, 2024
2229cf4
Update server testing dependencies
howard-e Jul 10, 2024
9489d98
Update sequelize dependencies
howard-e Jul 10, 2024
afa78b6
Update pg, nodemon, minimist, moment on server
howard-e Jul 10, 2024
016e093
Update fs-extra, graphql, js-base64, pg-hstore on server
howard-e Jul 10, 2024
060c2fa
Update express, express-handlebars, express-session on server
howard-e Jul 10, 2024
f42b352
Update dotenv, dotenv-cli dependencies on server
howard-e Jul 10, 2024
5797762
Update connect-pg-simple
howard-e Jul 10, 2024
622e0d1
Update apollo related dependencies on server
howard-e Jul 10, 2024
b7c4a0b
Limit dependabot PRs
howard-e Jul 10, 2024
d9cab39
Merge branch 'refs/heads/development' into update-dependencies
howard-e Jul 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 57 additions & 31 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,62 @@
{
"env": {
"browser": true,
"es6": true,
"node": true,
"jest/globals": true
"env": {
"browser": true,
"es6": true,
"node": true,
"jest/globals": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"prettier",
"plugin:prettier/recommended",
"plugin:jest/recommended"
],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"prettier",
"plugin:prettier/recommended",
"plugin:jest/recommended"
"ecmaVersion": 2020,
"sourceType": "module"
},
"plugins": [
"react",
"json",
"prettier",
"jest"
],
"rules": {
"linebreak-style": [
"error",
"unix"
],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2020,
"sourceType": "module"
},
"plugins": ["react", "json", "prettier", "jest"],
"rules": {
"linebreak-style": ["error", "unix"],
"semi": ["error", "always"],
"eol-last": ["error", "always"],
"no-console": ["error", { "allow": ["warn", "error"] }],
"no-use-before-define": ["off"],
"react/display-name": ["off"]
},
"settings": {
"react": {
"version": "detect"
}
"semi": [
"error",
"always"
],
"eol-last": [
"error",
"always"
],
"no-console": [
"error",
{
"allow": [
"warn",
"error"
]
}
],
"no-use-before-define": [
"off"
],
"react/display-name": [
"off"
]
},
"settings": {
"react": {
"version": "detect"
}
}
}
16 changes: 0 additions & 16 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,6 @@ updates:
schedule:
interval: "monthly"

- package-ecosystem: "npm"
open-pull-requests-limit: 5
directory: "/client"
schedule:
interval: "monthly"
commit-message:
prefix: "client"

- package-ecosystem: "npm"
open-pull-requests-limit: 5
directory: "/server"
schedule:
interval: "monthly"
commit-message:
prefix: "server"

- package-ecosystem: "github-actions"
open-pull-requests-limit: 99
directory: "/"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/runtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout the repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install NodeJS 18
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '18'
cache: 'npm'
Expand Down
9 changes: 7 additions & 2 deletions client/babel.config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{
"presets": ["@babel/env", "@babel/preset-react"],
"plugins": ["lodash"]
"presets": [
"@babel/preset-env",
"@babel/preset-react"
],
"plugins": [
"lodash"
]
}
104 changes: 48 additions & 56 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,43 +23,38 @@
},
"homepage": "https://github.com/bocoup/aria-at-app#readme",
"dependencies": {
"@apollo/client": "^3.7.9",
"@emotion/core": "^11.0.0",
"@emotion/react": "^11.10.6",
"@emotion/styled": "^11.10.6",
"@fortawesome/fontawesome-svg-core": "^6.2.1",
"@fortawesome/free-solid-svg-icons": "^6.2.1",
"@fortawesome/react-fontawesome": "^0.2.0",
"bootstrap": "^5.2.3",
"core-js": "^3.8.0",
"graphql": "^16.6.0",
"@apollo/client": "^3.10.8",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"bootstrap": "^5.3.3",
"core-js": "^3.37.1",
"graphql": "^16.9.0",
"lodash": "^4.17.21",
"moment": "^2.25.3",
"node-fetch": "^2.6.1",
"object-hash": "^3.0.0",
"octicons-react": "^1.0.4",
"prop-types": "^15.7.2",
"react": "^18.2.0",
"react-bootstrap": "^2.7.0",
"react-dom": "^18.2.0",
"react-helmet": "^6.0.0",
"moment": "^2.30.1",
"node-fetch": "^2.7.0",
"octicons-react": "^1.0.9",
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react-bootstrap": "^2.10.4",
"react-dom": "^18.3.1",
"react-helmet": "^6.1.0",
"react-html-parser": "^2.0.2",
"react-id-generator": "^3.0.0",
"react-responsive": "^9.0.0-beta.10",
"react-router-bootstrap": "^0.26.2",
"react-router-dom": "^6.8.1",
"react-id-generator": "^3.0.2",
"react-responsive": "^10.0.0",
"react-router-bootstrap": "^0.26.3",
"react-router-dom": "^6.24.1",
"shared": "1.0.0",
"turndown": "^7.1.1",
"ua-parser-js": "1.0.33"
"turndown": "^7.2.0",
"ua-parser-js": "1.0.38"
},
"devDependencies": {
"@babel/code-frame": "^7.8.3",
"@babel/core": "^7.21.4",
"@babel/plugin-proposal-class-properties": "^7.10.1",
"@babel/plugin-transform-runtime": "^7.21.0",
"@babel/preset-env": "^7.8.7",
"@babel/preset-react": "^7.8.3",
"@lhci/cli": "^0.11.0",
"@babel/core": "^7.24.7",
"@babel/preset-env": "^7.24.7",
"@babel/preset-react": "^7.24.7",
"@lhci/cli": "^0.11.1",
"@storybook/addon-a11y": "^6.5.16",
"@storybook/addon-actions": "^6.5.16",
"@storybook/addon-controls": "^6.5.16",
Expand All @@ -68,41 +63,38 @@
"@storybook/builder-webpack5": "^6.5.16",
"@storybook/manager-webpack5": "^6.5.16",
"@storybook/react": "^6.5.16",
"@testing-library/dom": "^9.0.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"babel-jest": "^29.4.3",
"babel-loader": "^9.1.2",
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/react": "^16.0.0",
"babel-jest": "^29.7.0",
"babel-loader": "^9.1.3",
"babel-plugin-lodash": "^3.3.4",
"babel-polyfill": "^6.26.0",
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^6.7.3",
"dotenv-webpack": "^8.0.1",
"css-loader": "^6.11.0",
"dotenv-webpack": "^8.1.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"eslint": "^8.31.0",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-jest": "^27.2.1",
"enzyme-adapter-react-16": "^1.15.8",
"eslint": "^8.57.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-jest": "^27.9.0",
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.31.11",
"eslint-plugin-react": "^7.34.3",
"file-loader": "^6.0.0",
"jest": "^29.4.1",
"jest-environment-jsdom": "^29.3.1",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-enzyme": "^7.1.2",
"moxios": "^0.4.0",
"prettier": "^2.8.4",
"puppeteer": "^21.7.0",
"storybook-addon-apollo-client": "^4.0.12",
"prettier": "^2.8.8",
"puppeteer": "^21.11.0",
"storybook-addon-apollo-client": "^4.1.4",
"storybook-react-router": "^1.0.8",
"style-loader": "^3.3.1",
"style-loader": "^3.3.4",
"tree-kill": "^1.2.2",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1",
"webpack-dev-server": "^4.11.1"
"webpack": "^5.92.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.2"
},
"resolutions": {
"jest-environment-jsdom": "^29.3.1"
"jest-environment-jsdom": "^29.7.0"
}
}
5 changes: 2 additions & 3 deletions client/tests/AssignTesterDropdown.test.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @jest-environment jsdom
*/
import React from 'react';
import React, { act } from 'react';
import {
render,
fireEvent,
Expand All @@ -17,7 +17,7 @@ import {
TEST_PLAN_REPORT_AT_BROWSER_QUERY
} from '@components/common/AssignTesterDropdown/queries';
import { SCHEDULE_COLLECTION_JOB_MUTATION } from '@components/AddTestToQueueWithConfirmation/queries';
import '@testing-library/jest-dom/extend-expect';
import '@testing-library/jest-dom';

jest.mock('@apollo/client', () => {
const original = jest.requireActual('@apollo/client');
Expand Down Expand Up @@ -55,7 +55,6 @@ const mockProps = {
};

import { useMutation } from '@apollo/client';
import { act } from 'react-dom/test-utils';

// Mock useMutation hook
useMutation.mockImplementation(mutation => {
Expand Down
2 changes: 1 addition & 1 deletion client/tests/BasicModal.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
import React from 'react';
import { render, fireEvent, screen } from '@testing-library/react';
import '@testing-library/jest-dom/extend-expect';
import '@testing-library/jest-dom';
import BasicModal from '../components/common/BasicModal';

const MockCustomComponent = ({ customProp }) => <button>{customProp}</button>; // eslint-disable-line react/prop-types
Expand Down
2 changes: 1 addition & 1 deletion client/tests/BotRunTestStatusList.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { render, waitFor } from '@testing-library/react';
import { MockedProvider } from '@apollo/client/testing';
import BotRunTestStatusList from '../components/BotRunTestStatusList';
import { TEST_PLAN_RUNS_TEST_RESULTS_QUERY } from '../components/BotRunTestStatusList/queries';
import '@testing-library/jest-dom/extend-expect';
import '@testing-library/jest-dom';
import { COLLECTION_JOB_STATUS } from '../../server/util/enums';

const getMocks = testPlanRuns => {
Expand Down
6 changes: 2 additions & 4 deletions client/tests/DataManagement.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@
* @jest-environment jsdom
*/

import React from 'react';
import React, { act } from 'react';
import { render, renderHook, waitFor } from '@testing-library/react';
import { InMemoryCache } from '@apollo/client';
import { MockedProvider } from '@apollo/client/testing';
import { BrowserRouter } from 'react-router-dom';
import '@testing-library/jest-dom/extend-expect';

import '@testing-library/jest-dom';
import DataManagement from '../components/DataManagement';

// eslint-disable-next-line jest/no-mocks-import
import { DATA_MANAGEMENT_PAGE_POPULATED_MOCK_DATA } from './__mocks__/GraphQLMocks';
import { act } from 'react-dom/test-utils';
import {
useDataManagementTableFiltering,
useDataManagementTableSorting,
Expand Down
2 changes: 1 addition & 1 deletion client/tests/TestQueue.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { render, waitFor, fireEvent } from '@testing-library/react';
import { InMemoryCache } from '@apollo/client';
import { MockedProvider } from '@apollo/client/testing';
import { BrowserRouter } from 'react-router-dom';
import '@testing-library/jest-dom/extend-expect';
import '@testing-library/jest-dom';

import TestQueue from '../components/TestQueue';

Expand Down
2 changes: 1 addition & 1 deletion client/tests/TestRenderer/OutputTextArea.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import React from 'react';
import { render, fireEvent, screen } from '@testing-library/react';
import OutputTextArea from '../../components/TestRenderer/OutputTextArea';
import '@testing-library/jest-dom/extend-expect';
import '@testing-library/jest-dom';
import { NO_OUTPUT_STRING } from '../../components/TestRenderer/OutputTextArea/constants';

describe('OutputTextArea', () => {
Expand Down
30 changes: 15 additions & 15 deletions config/config.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
module.exports = {
development: {
database: process.env.PGDATABASE,
username: process.env.PGUSER,
password: process.env.PGPASSWORD,
host: process.env.PGHOST,
port: process.env.PGPORT,
dialect: 'postgres',
dialectOption: {
ssl: true,
native: true,
multipleStatements: true
},
seederStorage: 'sequelize',
logging: false // console.log // eslint-disable-line no-console
}
development: {
database: process.env.PGDATABASE,
username: process.env.PGUSER,
password: process.env.PGPASSWORD,
host: process.env.PGHOST,
port: process.env.PGPORT,
dialect: 'postgres',
dialectOption: {
ssl: true,
native: true,
multipleStatements: true
},
seederStorage: 'sequelize',
logging: false // console.log // eslint-disable-line no-console
}
};
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ const { listener } = require('./server/server');
listener.use(history()).use(express.static('./client/dist'));

listener.get('*', (req, res) => {
res.sendFile(path.join(__dirname, './client/dist/index.html'));
res.sendFile(path.join(__dirname, './client/dist/index.html'));
});
Loading
Loading