Skip to content

PM-459 upgrade dependencies #985

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

Merged
merged 26 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
55 changes: 7 additions & 48 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,21 @@ version: 2.1

defaults: &defaults
docker:
- image: node:16.14
- image: node:22.13

deploy_defaults: &deploy_defaults
docker:
- image: cimg/python:3.10.2

test_defaults: &test_defaults
docker:
- image: cypress/browsers:node16.14.2-slim-chrome100-ff99-edge
- image: cimg/python:3.12.1-browsers

install_build_dependency: &install_build_dependency
name: Installation of build and deployment dependencies.
command: |
apt update
apt install jq -y
apt install python3-pip -y
pip3 install awscli --upgrade
apt install python3-pip python-is-python3 python3.11-venv -y
curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
unzip awscli-bundle.zip
./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws

install_dependency: &install_dependency
name: Installation of build and deployment dependencies.
Expand Down Expand Up @@ -60,14 +58,6 @@ running_yarn_sb_build: &running_yarn_sb_build
source buildenvvar
yarn sb:build

running_yarn_test: &running_yarn_test
name: Running Yarn Test Build
command: |
yarn install
yarn cypress install
yarn build
yarn cy:ci

workspace_persist: &workspace_persist
root: .
paths:
Expand Down Expand Up @@ -98,26 +88,6 @@ build_steps: &build_steps # Initialization.
- run: *running_yarn_sb_build
- persist_to_workspace: *workspace_persist

test_steps: &test_steps # Initialization.
- checkout
- setup_remote_docker
- restore_cache:
key: test-node-modules-{{ checksum "yarn.lock" }}
- run: *running_yarn_test
- save_cache:
key: test-node-modules-{{ checksum "yarn.lock" }}
paths:
- node_modules
- /root/.cache/Cypress
- store_test_results:
path: cypress/test-report
- store_artifacts:
path: cypress/test-report
- store_artifacts:
path: cypress/videos
- store_artifacts:
path: cypress/screenshots

deploy_steps: &deploy_steps
- checkout
- attach_workspace: *workspace_attach
Expand Down Expand Up @@ -173,14 +143,6 @@ jobs:
APPNAME: "platform-ui-mvp"
steps: *build_steps

test-dev:
<<: *test_defaults
environment:
DEPLOY_ENV: "DEV"
LOGICAL_ENV: "dev"
APPNAME: "platform-ui-mvp"
steps: *test_steps

# Just tests commited code.
deployDev:
<<: *deploy_defaults
Expand Down Expand Up @@ -277,7 +239,4 @@ workflows:
filters: &filters-prod
branches:
only:
- master

- test-dev:
context: org-global
- master
15 changes: 10 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
Related JIRA Ticket:
https://topcoder.atlassian.net/browse/<!-- JIRA TICKET ID -->
<!--
NOTE: you can leave these comments as they are,
no need to delete them as they won't appear in the final PR description
-->
<!-- Please make sure to link the JIRA ticket related to this PR, if any -->
## Related JIRA Ticket:
https://topcoder.atlassian.net/browse/

# What's in this PR?
<!-- Please add a brief description of what this PR accomplishes -->

<!-- SEE [Pull Requests](../README.md#pull-requests) for more details about opening a PR -->
<!-- Please add a brief description of what this PR accomplishes -->
<!-- SEE [Pull Requests](../README.md#pull-requests) for more details about opening a PR -->
# What's in this PR?
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.15.0
22.13.0
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ e.g.: `PROD-001 #comment adding readme notes #time 45m`
- Typescript
- React Scripts

This app uses React 18, Typescript 4, and Node 16.
This app uses React 18, Typescript 4, and Node 22.

### IDE

Expand All @@ -103,13 +103,13 @@ Once nvm is installed, run:
At the root of the project directory you'll notice a file called `.nvmrc` which specifies the node version used by the project. The command `nvm use` will use the version specified in the file if no version is supplied on the command line.
See [the nvm Github README](https://github.com/nvm-sh/nvm/blob/master/README.md#nvmrc) for more information on setting this up.

>**NOTE:** The current node version mentioned in the `.nvmrc` is `16.15.0`
>**NOTE:** The current node version mentioned in the `.nvmrc` is `22.13.0`

You can verify the versions of `nvm`, `node`, and `npm` using the commands below.
| Command | Supported Version |
| ----------------- | -------- |
| `% npm -v` | 8.5.5 |
| `% node -v` | v16.15.0 |
| `% node -v` | v22.13.0 |
| `% nvm --version` | 0.39.1 |
| `% nvm current` | v15.15.0 |

Expand Down
32 changes: 0 additions & 32 deletions cypress.config.ts

This file was deleted.

3 changes: 0 additions & 3 deletions cypress/.eslintrc

This file was deleted.

12 changes: 0 additions & 12 deletions cypress/e2e/home/home.spec.ts

This file was deleted.

8 changes: 0 additions & 8 deletions cypress/support/commands.ts

This file was deleted.

2 changes: 0 additions & 2 deletions cypress/support/e2e.ts

This file was deleted.

12 changes: 0 additions & 12 deletions cypress/tsconfig.json

This file was deleted.

54 changes: 26 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
"lint:fix": "yarn lint --fix",
"test": "craco test --watchAll",
"test:no-watch": "craco test --watchAll=false --passWithNoTests",
"cy:run": "cypress run --reporter junit",
"cy:ci": "start-server-and-test 'serve -s build -n -p 3000' http://localhost:3000 'cy:run'",
"report:coverage": "nyc report --reporter=html",
"report:coverage:text": "nyc report --reporter=text",
"sb": "storybook dev -p 6006",
Expand All @@ -25,28 +23,27 @@
"@heroicons/react": "^1.0.6",
"@popperjs/core": "^2.11.8",
"@sprig-technologies/sprig-browser": "^2.20.1",
"@storybook/addon-actions": "^7.0.5",
"@storybook/react": "^7.0.5",
"@storybook/addon-actions": "7.6.10",
"@storybook/react": "7.6.10",
"@stripe/react-stripe-js": "1.13.0",
"@stripe/stripe-js": "1.41.0",
"@tanstack/react-table": "^8.11.7",
"@types/testing-library__jest-dom": "^5.14.5",
"apexcharts": "^3.36.0",
"axios": "^1.1.2",
"axios": "^1.7.9",
"browser-cookies": "^1.2.0",
"city-timezones": "^1.2.1",
"classnames": "^2.3.2",
"contentful": "^9.2.5",
"contentful": "^9.3.7",
"country-calling-code": "0.0.3",
"crypto-js": "^4.1.1",
"crypto-js": "^4.2.0",
"customize-cra": "^1.0.0",
"date-fns": "^2.30.0",
"dompurify": "^2.4.0",
"dompurify": "^2.5.4",
"draft-js": "^0.10.4",
"draft-js-export-html": "^1.2.0",
"draft-js-markdown-shortcuts-plugin": "^0.3.0",
"draft-js-plugins-editor": "^2.0.3",
"express": "^4.18.2",
"express": "^4.21.2",
"express-fileupload": "^1.4.0",
"express-interceptor": "^1.2.0",
"fflate": "^0.7.4",
Expand All @@ -61,7 +58,7 @@
"joi": "^17.4.0",
"katex": "^0.16.4",
"lodash": "^4.17.21",
"markdown-it": "^13.0.1",
"markdown-it": "^13.0.2",
"marked": "4.1.1",
"moment": "^2.29.4",
"moment-duration-format": "^2.3.2",
Expand Down Expand Up @@ -112,8 +109,8 @@
"remark-gfm": "^3.0.1",
"remark-math": "^5.1.1",
"remove": "^0.1.5",
"sanitize-html": "^2.7.2",
"sass": "^1.55.0",
"sanitize-html": "^2.12.1",
"sass": "^1.79.0",
"shortid": "^2.2.16",
"styled-components": "^5.3.6",
"swr": "^1.3.0",
Expand All @@ -132,20 +129,18 @@
"@babel/preset-typescript": "^7.18.6",
"@babel/runtime": "^7.19.4",
"@craco/craco": "^7.1.0",
"@cypress/code-coverage": "^3.10.0",
"@jackwilsdon/craco-use-babelrc": "1.0.0",
"@storybook/addon-essentials": "^7.0.5",
"@storybook/addon-interactions": "^7.0.5",
"@storybook/addon-links": "^7.0.5",
"@storybook/blocks": "^7.0.5",
"@storybook/preset-create-react-app": "^7.0.5",
"@storybook/react-webpack5": "^7.0.5",
"@storybook/addon-essentials": "7.6.10",
"@storybook/addon-interactions": "7.6.10",
"@storybook/addon-links": "7.6.10",
"@storybook/blocks": "7.6.10",
"@storybook/preset-create-react-app": "7.6.10",
"@storybook/react-webpack5": "7.6.10",
"@storybook/testing-library": "^0.0.14-next.2",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^14.4.3",
"@types/axios": "^0.14.0",
"@types/cypress": "^1.1.3",
"@types/dompurify": "^2.3.4",
"@types/highlightjs": "^9.12.2",
"@types/jest": "^29.1.2",
Expand All @@ -154,7 +149,7 @@
"@types/marked": "4.0.7",
"@types/node": "^18.8.5",
"@types/reach__router": "^1.3.11",
"@types/react": "^18.0.21",
"@types/react": "18.0.35",
"@types/react-datepicker": "^4.11.2",
"@types/react-dom": "^18.0.6",
"@types/react-gtm-module": "^2.0.1",
Expand All @@ -166,6 +161,7 @@
"@types/redux-promise": "^0.5.29",
"@types/sanitize-html": "^2.6.2",
"@types/systemjs": "^6.1.1",
"@types/testing-library__jest-dom": "^5.14.5",
"@types/uuid": "^8.3.4",
"@typescript-eslint/eslint-plugin": "^5.30.6",
"@typescript-eslint/parser": "^5.30.6",
Expand All @@ -183,13 +179,11 @@
"craco-resolve-url-loader": "^1.0.0",
"cross-env": "^7.0.3",
"css-loader": "3.5.3",
"cypress": "^10.10.0",
"eslint": "^8.25.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-react-app": "^7.0.1",
"eslint-config-react-important-stuff": "^3.0.0",
"eslint-import-resolver-typescript": "^3.2.5",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-ordered-imports": "^0.6.0",
"eslint-plugin-react": "^7.28.0",
Expand All @@ -209,10 +203,10 @@
"react-docgen-typescript": "^2.2.2",
"react-hot-loader": "^4.3.3",
"resolve-url-loader": "^5.0.0",
"sass-loader": "^13.1.0",
"sass-loader": "^13.3.3",
"serve": "^14.0.1",
"start-server-and-test": "^1.14.0",
"storybook": "^7.0.5",
"storybook": "7.6.10",
"style-loader": "^3.3.1",
"systemjs-webpack-interop": "^2.3.7",
"tsconfig-paths-webpack-plugin": "^4.0.1",
Expand All @@ -223,6 +217,10 @@
"webpack-dev-server": "^4.11.1",
"webpack-merge": "^5.8.0"
},
"resolutions": {
"@types/react": "18.0.35",
"string-width": "4.2.0"
},
"browserslist": {
"production": [
">0.2%",
Expand All @@ -249,7 +247,7 @@
]
},
"volta": {
"node": "16.15.0",
"yarn": "1.22.19"
"node": "22.13.0",
"yarn": "1.22.22"
}
}
Loading