Skip to content

Commit 75395e9

Browse files
authored
Merge pull request #985 from topcoder-platform/PM-459_upgrade-dependencies
PM-459 upgrade dependencies
2 parents 25aedff + ae2ef93 commit 75395e9

File tree

12 files changed

+3118
-2112
lines changed

12 files changed

+3118
-2112
lines changed

.circleci/config.yml

+7-48
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,21 @@ version: 2.1
22

33
defaults: &defaults
44
docker:
5-
- image: node:16.14
5+
- image: node:22.13
66

77
deploy_defaults: &deploy_defaults
88
docker:
9-
- image: cimg/python:3.10.2
10-
11-
test_defaults: &test_defaults
12-
docker:
13-
- image: cypress/browsers:node16.14.2-slim-chrome100-ff99-edge
9+
- image: cimg/python:3.12.1-browsers
1410

1511
install_build_dependency: &install_build_dependency
1612
name: Installation of build and deployment dependencies.
1713
command: |
1814
apt update
1915
apt install jq -y
20-
apt install python3-pip -y
21-
pip3 install awscli --upgrade
16+
apt install python3-pip python-is-python3 python3.11-venv -y
17+
curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
18+
unzip awscli-bundle.zip
19+
./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
2220
2321
install_dependency: &install_dependency
2422
name: Installation of build and deployment dependencies.
@@ -60,14 +58,6 @@ running_yarn_sb_build: &running_yarn_sb_build
6058
source buildenvvar
6159
yarn sb:build
6260
63-
running_yarn_test: &running_yarn_test
64-
name: Running Yarn Test Build
65-
command: |
66-
yarn install
67-
yarn cypress install
68-
yarn build
69-
yarn cy:ci
70-
7161
workspace_persist: &workspace_persist
7262
root: .
7363
paths:
@@ -98,26 +88,6 @@ build_steps: &build_steps # Initialization.
9888
- run: *running_yarn_sb_build
9989
- persist_to_workspace: *workspace_persist
10090

101-
test_steps: &test_steps # Initialization.
102-
- checkout
103-
- setup_remote_docker
104-
- restore_cache:
105-
key: test-node-modules-{{ checksum "yarn.lock" }}
106-
- run: *running_yarn_test
107-
- save_cache:
108-
key: test-node-modules-{{ checksum "yarn.lock" }}
109-
paths:
110-
- node_modules
111-
- /root/.cache/Cypress
112-
- store_test_results:
113-
path: cypress/test-report
114-
- store_artifacts:
115-
path: cypress/test-report
116-
- store_artifacts:
117-
path: cypress/videos
118-
- store_artifacts:
119-
path: cypress/screenshots
120-
12191
deploy_steps: &deploy_steps
12292
- checkout
12393
- attach_workspace: *workspace_attach
@@ -173,14 +143,6 @@ jobs:
173143
APPNAME: "platform-ui-mvp"
174144
steps: *build_steps
175145

176-
test-dev:
177-
<<: *test_defaults
178-
environment:
179-
DEPLOY_ENV: "DEV"
180-
LOGICAL_ENV: "dev"
181-
APPNAME: "platform-ui-mvp"
182-
steps: *test_steps
183-
184146
# Just tests commited code.
185147
deployDev:
186148
<<: *deploy_defaults
@@ -277,7 +239,4 @@ workflows:
277239
filters: &filters-prod
278240
branches:
279241
only:
280-
- master
281-
282-
- test-dev:
283-
context: org-global
242+
- master

.github/PULL_REQUEST_TEMPLATE.md

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
Related JIRA Ticket:
2-
https://topcoder.atlassian.net/browse/<!-- JIRA TICKET ID -->
1+
<!--
2+
NOTE: you can leave these comments as they are,
3+
no need to delete them as they won't appear in the final PR description
4+
-->
5+
<!-- Please make sure to link the JIRA ticket related to this PR, if any -->
6+
## Related JIRA Ticket:
7+
https://topcoder.atlassian.net/browse/
38

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

7-
<!-- SEE [Pull Requests](../README.md#pull-requests) for more details about opening a PR -->
10+
<!-- Please add a brief description of what this PR accomplishes -->
11+
<!-- SEE [Pull Requests](../README.md#pull-requests) for more details about opening a PR -->
12+
# What's in this PR?

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.15.0
1+
22.13.0

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ e.g.: `PROD-001 #comment adding readme notes #time 45m`
8484
- Typescript
8585
- React Scripts
8686

87-
This app uses React 18, Typescript 4, and Node 16.
87+
This app uses React 18, Typescript 4, and Node 22.
8888

8989
### IDE
9090

@@ -103,13 +103,13 @@ Once nvm is installed, run:
103103
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.
104104
See [the nvm Github README](https://github.com/nvm-sh/nvm/blob/master/README.md#nvmrc) for more information on setting this up.
105105

106-
>**NOTE:** The current node version mentioned in the `.nvmrc` is `16.15.0`
106+
>**NOTE:** The current node version mentioned in the `.nvmrc` is `22.13.0`
107107
108108
You can verify the versions of `nvm`, `node`, and `npm` using the commands below.
109109
| Command | Supported Version |
110110
| ----------------- | -------- |
111111
| `% npm -v` | 8.5.5 |
112-
| `% node -v` | v16.15.0 |
112+
| `% node -v` | v22.13.0 |
113113
| `% nvm --version` | 0.39.1 |
114114
| `% nvm current` | v15.15.0 |
115115

cypress.config.ts

-32
This file was deleted.

cypress/.eslintrc

-3
This file was deleted.

cypress/e2e/home/home.spec.ts

-12
This file was deleted.

cypress/support/commands.ts

-8
This file was deleted.

cypress/support/e2e.ts

-2
This file was deleted.

cypress/tsconfig.json

-12
This file was deleted.

package.json

+26-28
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
"lint:fix": "yarn lint --fix",
1414
"test": "craco test --watchAll",
1515
"test:no-watch": "craco test --watchAll=false --passWithNoTests",
16-
"cy:run": "cypress run --reporter junit",
17-
"cy:ci": "start-server-and-test 'serve -s build -n -p 3000' http://localhost:3000 'cy:run'",
1816
"report:coverage": "nyc report --reporter=html",
1917
"report:coverage:text": "nyc report --reporter=text",
2018
"sb": "storybook dev -p 6006",
@@ -25,28 +23,27 @@
2523
"@heroicons/react": "^1.0.6",
2624
"@popperjs/core": "^2.11.8",
2725
"@sprig-technologies/sprig-browser": "^2.20.1",
28-
"@storybook/addon-actions": "^7.0.5",
29-
"@storybook/react": "^7.0.5",
26+
"@storybook/addon-actions": "7.6.10",
27+
"@storybook/react": "7.6.10",
3028
"@stripe/react-stripe-js": "1.13.0",
3129
"@stripe/stripe-js": "1.41.0",
3230
"@tanstack/react-table": "^8.11.7",
33-
"@types/testing-library__jest-dom": "^5.14.5",
3431
"apexcharts": "^3.36.0",
35-
"axios": "^1.1.2",
32+
"axios": "^1.7.9",
3633
"browser-cookies": "^1.2.0",
3734
"city-timezones": "^1.2.1",
3835
"classnames": "^2.3.2",
39-
"contentful": "^9.2.5",
36+
"contentful": "^9.3.7",
4037
"country-calling-code": "0.0.3",
41-
"crypto-js": "^4.1.1",
38+
"crypto-js": "^4.2.0",
4239
"customize-cra": "^1.0.0",
4340
"date-fns": "^2.30.0",
44-
"dompurify": "^2.4.0",
41+
"dompurify": "^2.5.4",
4542
"draft-js": "^0.10.4",
4643
"draft-js-export-html": "^1.2.0",
4744
"draft-js-markdown-shortcuts-plugin": "^0.3.0",
4845
"draft-js-plugins-editor": "^2.0.3",
49-
"express": "^4.18.2",
46+
"express": "^4.21.2",
5047
"express-fileupload": "^1.4.0",
5148
"express-interceptor": "^1.2.0",
5249
"fflate": "^0.7.4",
@@ -61,7 +58,7 @@
6158
"joi": "^17.4.0",
6259
"katex": "^0.16.4",
6360
"lodash": "^4.17.21",
64-
"markdown-it": "^13.0.1",
61+
"markdown-it": "^13.0.2",
6562
"marked": "4.1.1",
6663
"moment": "^2.29.4",
6764
"moment-duration-format": "^2.3.2",
@@ -112,8 +109,8 @@
112109
"remark-gfm": "^3.0.1",
113110
"remark-math": "^5.1.1",
114111
"remove": "^0.1.5",
115-
"sanitize-html": "^2.7.2",
116-
"sass": "^1.55.0",
112+
"sanitize-html": "^2.12.1",
113+
"sass": "^1.79.0",
117114
"shortid": "^2.2.16",
118115
"styled-components": "^5.3.6",
119116
"swr": "^1.3.0",
@@ -132,20 +129,18 @@
132129
"@babel/preset-typescript": "^7.18.6",
133130
"@babel/runtime": "^7.19.4",
134131
"@craco/craco": "^7.1.0",
135-
"@cypress/code-coverage": "^3.10.0",
136132
"@jackwilsdon/craco-use-babelrc": "1.0.0",
137-
"@storybook/addon-essentials": "^7.0.5",
138-
"@storybook/addon-interactions": "^7.0.5",
139-
"@storybook/addon-links": "^7.0.5",
140-
"@storybook/blocks": "^7.0.5",
141-
"@storybook/preset-create-react-app": "^7.0.5",
142-
"@storybook/react-webpack5": "^7.0.5",
133+
"@storybook/addon-essentials": "7.6.10",
134+
"@storybook/addon-interactions": "7.6.10",
135+
"@storybook/addon-links": "7.6.10",
136+
"@storybook/blocks": "7.6.10",
137+
"@storybook/preset-create-react-app": "7.6.10",
138+
"@storybook/react-webpack5": "7.6.10",
143139
"@storybook/testing-library": "^0.0.14-next.2",
144140
"@testing-library/jest-dom": "^5.16.5",
145141
"@testing-library/react": "^13.4.0",
146142
"@testing-library/user-event": "^14.4.3",
147143
"@types/axios": "^0.14.0",
148-
"@types/cypress": "^1.1.3",
149144
"@types/dompurify": "^2.3.4",
150145
"@types/highlightjs": "^9.12.2",
151146
"@types/jest": "^29.1.2",
@@ -154,7 +149,7 @@
154149
"@types/marked": "4.0.7",
155150
"@types/node": "^18.8.5",
156151
"@types/reach__router": "^1.3.11",
157-
"@types/react": "^18.0.21",
152+
"@types/react": "18.0.35",
158153
"@types/react-datepicker": "^4.11.2",
159154
"@types/react-dom": "^18.0.6",
160155
"@types/react-gtm-module": "^2.0.1",
@@ -166,6 +161,7 @@
166161
"@types/redux-promise": "^0.5.29",
167162
"@types/sanitize-html": "^2.6.2",
168163
"@types/systemjs": "^6.1.1",
164+
"@types/testing-library__jest-dom": "^5.14.5",
169165
"@types/uuid": "^8.3.4",
170166
"@typescript-eslint/eslint-plugin": "^5.30.6",
171167
"@typescript-eslint/parser": "^5.30.6",
@@ -183,13 +179,11 @@
183179
"craco-resolve-url-loader": "^1.0.0",
184180
"cross-env": "^7.0.3",
185181
"css-loader": "3.5.3",
186-
"cypress": "^10.10.0",
187182
"eslint": "^8.25.0",
188183
"eslint-config-airbnb": "^19.0.4",
189184
"eslint-config-react-app": "^7.0.1",
190185
"eslint-config-react-important-stuff": "^3.0.0",
191186
"eslint-import-resolver-typescript": "^3.2.5",
192-
"eslint-plugin-cypress": "^2.12.1",
193187
"eslint-plugin-import": "^2.25.3",
194188
"eslint-plugin-ordered-imports": "^0.6.0",
195189
"eslint-plugin-react": "^7.28.0",
@@ -209,10 +203,10 @@
209203
"react-docgen-typescript": "^2.2.2",
210204
"react-hot-loader": "^4.3.3",
211205
"resolve-url-loader": "^5.0.0",
212-
"sass-loader": "^13.1.0",
206+
"sass-loader": "^13.3.3",
213207
"serve": "^14.0.1",
214208
"start-server-and-test": "^1.14.0",
215-
"storybook": "^7.0.5",
209+
"storybook": "7.6.10",
216210
"style-loader": "^3.3.1",
217211
"systemjs-webpack-interop": "^2.3.7",
218212
"tsconfig-paths-webpack-plugin": "^4.0.1",
@@ -223,6 +217,10 @@
223217
"webpack-dev-server": "^4.11.1",
224218
"webpack-merge": "^5.8.0"
225219
},
220+
"resolutions": {
221+
"@types/react": "18.0.35",
222+
"string-width": "4.2.0"
223+
},
226224
"browserslist": {
227225
"production": [
228226
">0.2%",
@@ -249,7 +247,7 @@
249247
]
250248
},
251249
"volta": {
252-
"node": "16.15.0",
253-
"yarn": "1.22.19"
250+
"node": "22.13.0",
251+
"yarn": "1.22.22"
254252
}
255253
}

0 commit comments

Comments
 (0)