Skip to content

Commit 9a94084

Browse files
authored
Merge pull request #1368 from topcoder-platform/dev
[PROD] - Security, clean up & bug fixes
2 parents 21033f8 + 9ed7544 commit 9a94084

File tree

54 files changed

+1777
-5215
lines changed

Some content is hidden

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

54 files changed

+1777
-5215
lines changed

.circleci/config.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,7 @@ workflows:
226226
branches:
227227
only:
228228
- dev
229-
- LVT-256
230-
- CORE-635
231-
- feat/review
232-
- feat/system-admin
233-
- feat/v6
234-
- pm-2074_1
235-
- feat/ai-workflows
236-
- delete_user
229+
- pm-3141_3
237230

238231
- deployQa:
239232
context: org-global

package.json

Lines changed: 133 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -19,204 +19,207 @@
1919
"sb:build": "storybook build -o build/storybook"
2020
},
2121
"dependencies": {
22-
"@datadog/browser-logs": "^4.21.2",
22+
"@datadog/browser-logs": "^4.50.1",
2323
"@hello-pangea/dnd": "^18.0.1",
2424
"@heroicons/react": "^1.0.6",
25-
"@hookform/resolvers": "^4.1.2",
25+
"@hookform/resolvers": "^4.1.3",
2626
"@popperjs/core": "^2.11.8",
27-
"@sprig-technologies/sprig-browser": "^2.20.1",
28-
"@storybook/addon-actions": "7.6.10",
29-
"@storybook/react": "7.6.10",
30-
"@stripe/react-stripe-js": "1.13.0",
31-
"@stripe/stripe-js": "1.41.0",
32-
"@tinymce/tinymce-react": "^6.2.1",
33-
"@types/codemirror": "5.60.15",
27+
"@sprig-technologies/sprig-browser": "^2.39.0",
28+
"@storybook/addon-actions": "7.6.20",
29+
"@storybook/react": "7.6.20",
30+
"@stripe/react-stripe-js": "1.16.5",
31+
"@stripe/stripe-js": "1.54.2",
32+
"@tinymce/tinymce-react": "^6.3.0",
33+
"@types/codemirror": "5.60.17",
3434
"amazon-s3-uri": "^0.1.1",
35-
"apexcharts": "^3.36.0",
36-
"axios": "^1.12.0",
35+
"apexcharts": "^3.54.1",
36+
"axios": "^1.13.2",
3737
"browser-cookies": "^1.2.0",
38-
"city-timezones": "^1.2.1",
39-
"classnames": "^2.3.2",
38+
"city-timezones": "^1.3.2",
39+
"classnames": "^2.5.1",
4040
"contentful": "^9.3.7",
4141
"country-calling-code": "0.0.3",
4242
"crypto-js": "^4.2.0",
4343
"customize-cra": "^1.0.0",
4444
"date-fns": "^2.30.0",
45-
"dompurify": "^2.5.4",
46-
"draft-js": "^0.10.4",
47-
"draft-js-export-html": "^1.2.0",
48-
"draft-js-markdown-shortcuts-plugin": "^0.3.0",
49-
"draft-js-plugins-editor": "^2.0.3",
45+
"dompurify": "^2.5.8",
46+
"draft-js": "^0.11.7",
47+
"draft-js-export-html": "^1.4.1",
48+
"draft-js-markdown-shortcuts-plugin": "^0.6.1",
49+
"draft-js-plugins-editor": "^2.1.1",
5050
"easymde": "2.20.0",
51-
"express": "^4.21.2",
52-
"express-fileupload": "^1.4.0",
51+
"express": "^4.22.1",
52+
"express-fileupload": "^1.5.2",
5353
"express-interceptor": "^1.2.0",
54-
"filestack-js": "^3.42.0",
54+
"filestack-js": "^3.44.2",
5555
"highcharts": "^10.3.3",
56-
"highcharts-react-official": "^3.2.0",
57-
"highlight.js": "^11.6.0",
56+
"highcharts-react-official": "^3.2.3",
57+
"highlight.js": "^11.11.1",
5858
"html2canvas": "^1.4.1",
5959
"lodash": "^4.17.21",
6060
"markdown-it": "^13.0.2",
61-
"marked": "4.1.1",
62-
"moment": "^2.29.4",
61+
"marked": "4.3.0",
62+
"moment": "^2.30.1",
6363
"moment-duration-format": "^2.3.2",
64-
"moment-timezone": "^0.5.37",
64+
"moment-timezone": "^0.6.0",
6565
"money": "^0.2.0",
6666
"prop-types": "^15.8.1",
67-
"qrcode.react": "^3.1.0",
68-
"qs": "^6.11.0",
67+
"qrcode.react": "^3.2.0",
68+
"qs": "^6.14.0",
6969
"rc-checkbox": "^2.3.2",
70-
"react": "^18.2.0",
71-
"react-apexcharts": "^1.4.0",
72-
"react-color": "^2.13.8",
73-
"react-contenteditable": "^3.3.6",
74-
"react-css-super-themr": "^2.2.0",
75-
"react-datepicker": "^4.14.1",
76-
"react-dom": "^18.2.0",
77-
"react-dropzone": "^11.3.2",
70+
"react": "^18.3.1",
71+
"react-apexcharts": "^1.9.0",
72+
"react-color": "^2.19.3",
73+
"react-contenteditable": "^3.3.7",
74+
"react-css-super-themr": "^2.3.0",
75+
"react-datepicker": "^4.25.0",
76+
"react-dom": "^18.3.1",
77+
"react-dropzone": "^11.7.1",
7878
"react-elastic-carousel": "^0.11.5",
7979
"react-gtm-module": "^2.0.11",
8080
"react-helmet": "^6.1.0",
81-
"react-hook-form": "^7.54.2",
82-
"react-markdown": "8.0.6",
81+
"react-hook-form": "^7.68.0",
82+
"react-markdown": "8.0.7",
8383
"react-otp-input": "^3.1.1",
8484
"react-popper": "^2.3.0",
85-
"react-redux": "^8.0.4",
86-
"react-redux-toastr": "^7.6.10",
87-
"react-responsive": "^9.0.0-beta.5",
88-
"react-responsive-modal": "^6.2.0",
89-
"react-router-dom": "^6.4.2",
85+
"react-redux": "^8.1.3",
86+
"react-redux-toastr": "^7.6.13",
87+
"react-responsive": "^9.0.2",
88+
"react-responsive-modal": "^6.4.2",
89+
"react-router-dom": "^6.30.2",
9090
"react-scripts": "5.0.1",
91-
"react-select": "^5.8.0",
92-
"react-spinners": "^0.13.6",
93-
"react-toastify": "^9.0.8",
94-
"react-tooltip": "5.11.1",
95-
"redux": "^4.2.0",
91+
"react-select": "^5.10.2",
92+
"react-spinners": "^0.17.0",
93+
"react-toastify": "^9.1.3",
94+
"react-tooltip": "5.30.0",
95+
"redux": "^4.2.1",
9696
"redux-actions": "^2.6.5",
9797
"redux-logger": "^3.0.6",
9898
"redux-promise": "^0.6.0",
99-
"redux-promise-middleware": "^6.1.3",
100-
"redux-thunk": "^2.4.1",
99+
"redux-promise-middleware": "^6.2.0",
100+
"redux-thunk": "^2.4.2",
101101
"rehype-raw": "^7.0.0",
102102
"rehype-stringify": "^10.0.1",
103-
"remark-breaks": "^3.0.2",
103+
"remark-breaks": "^3.0.3",
104104
"remark-frontmatter": "^4.0.1",
105105
"remark-gfm": "^3.0.1",
106106
"remark-parse": "^11.0.0",
107107
"remove": "^0.1.5",
108-
"sanitize-html": "^2.12.1",
109-
"sass": "^1.79.0",
110-
"styled-components": "^5.3.6",
108+
"sanitize-html": "^2.17.0",
109+
"sass": "^1.95.0",
110+
"styled-components": "^5.3.11",
111111
"swr": "^1.3.0",
112112
"tc-auth-lib": "topcoder-platform/tc-auth-lib#v2.0",
113113
"tinymce": "^7.9.1",
114-
"typescript": "^4.8.4",
115-
"universal-navigation": "https://github.com/topcoder-platform/universal-navigation#9fc50d938be7182",
114+
"typescript": "^4.9.5",
115+
"universal-navigation": "https://github.com/topcoder-platform/universal-navigation#master",
116116
"uuid": "^11.1.0",
117-
"yup": "^1.6.1"
117+
"yup": "^1.7.1"
118118
},
119119
"devDependencies": {
120-
"@babel/core": "^7.19.3",
121-
"@babel/plugin-syntax-jsx": "^7.18.6",
122-
"@babel/plugin-transform-runtime": "^7.19.1",
123-
"@babel/preset-env": "^7.19.4",
124-
"@babel/preset-react": "^7.18.6",
125-
"@babel/preset-typescript": "^7.18.6",
126-
"@babel/runtime": "^7.19.4",
120+
"@babel/core": "^7.28.5",
121+
"@babel/plugin-syntax-jsx": "^7.27.1",
122+
"@babel/plugin-transform-runtime": "^7.28.5",
123+
"@babel/preset-env": "^7.28.5",
124+
"@babel/preset-react": "^7.28.5",
125+
"@babel/preset-typescript": "^7.28.5",
126+
"@babel/runtime": "^7.28.4",
127127
"@craco/craco": "^7.1.0",
128128
"@jackwilsdon/craco-use-babelrc": "1.0.0",
129-
"@storybook/addon-essentials": "7.6.10",
130-
"@storybook/addon-interactions": "7.6.10",
131-
"@storybook/addon-links": "7.6.10",
132-
"@storybook/blocks": "7.6.10",
133-
"@storybook/preset-create-react-app": "7.6.10",
134-
"@storybook/react-webpack5": "7.6.10",
135-
"@storybook/testing-library": "^0.0.14-next.2",
136-
"@testing-library/jest-dom": "^5.16.5",
129+
"@storybook/addon-essentials": "7.6.20",
130+
"@storybook/addon-interactions": "7.6.20",
131+
"@storybook/addon-links": "7.6.20",
132+
"@storybook/blocks": "7.6.20",
133+
"@storybook/preset-create-react-app": "7.6.20",
134+
"@storybook/react-webpack5": "7.6.20",
135+
"@storybook/testing-library": "^0.2.2",
136+
"@testing-library/jest-dom": "^5.17.0",
137137
"@testing-library/react": "^13.4.0",
138-
"@testing-library/user-event": "^14.4.3",
139-
"@types/axios": "^0.14.0",
140-
"@types/dompurify": "^2.3.4",
141-
"@types/highlightjs": "^9.12.2",
142-
"@types/jest": "^29.1.2",
143-
"@types/lodash": "^4.14.186",
138+
"@testing-library/user-event": "^14.6.1",
139+
"@types/axios": "^0.14.4",
140+
"@types/dompurify": "^2.4.0",
141+
"@types/highlightjs": "^9.12.6",
142+
"@types/jest": "^29.5.14",
143+
"@types/lodash": "^4.17.21",
144144
"@types/markdown-it": "^12.2.3",
145-
"@types/marked": "4.0.7",
146-
"@types/node": "^18.8.5",
147-
"@types/reach__router": "^1.3.11",
148-
"@types/react": "18.0.35",
149-
"@types/react-datepicker": "^4.11.2",
150-
"@types/react-dom": "^18.0.6",
151-
"@types/react-gtm-module": "^2.0.1",
152-
"@types/react-helmet": "^6.1.6",
153-
"@types/react-redux-toastr": "^7.6.2",
145+
"@types/marked": "4.3.2",
146+
"@types/node": "^18.19.130",
147+
"@types/reach__router": "^1.3.15",
148+
"@types/react": "18.3.27",
149+
"@types/react-datepicker": "^4.19.6",
150+
"@types/react-dom": "^18.3.7",
151+
"@types/react-gtm-module": "^2.0.4",
152+
"@types/react-helmet": "^6.1.11",
153+
"@types/react-redux-toastr": "^7.6.6",
154154
"@types/react-router-dom": "^5.3.3",
155-
"@types/redux-actions": "2.6.2",
156-
"@types/redux-logger": "^3.0.9",
157-
"@types/redux-promise": "^0.5.29",
158-
"@types/sanitize-html": "^2.6.2",
159-
"@types/systemjs": "^6.1.1",
160-
"@types/testing-library__jest-dom": "^5.14.5",
155+
"@types/redux-actions": "2.6.5",
156+
"@types/redux-logger": "^3.0.13",
157+
"@types/redux-promise": "^0.5.32",
158+
"@types/sanitize-html": "^2.16.0",
159+
"@types/systemjs": "^6.15.4",
160+
"@types/testing-library__jest-dom": "^5.14.9",
161161
"@types/uuid": "^8.3.4",
162-
"@typescript-eslint/eslint-plugin": "^5.30.6",
163-
"@typescript-eslint/parser": "^5.30.6",
164-
"@wdio/junit-reporter": "^7.25.1",
165-
"autoprefixer": "^10.4.12",
162+
"@typescript-eslint/eslint-plugin": "^5.62.0",
163+
"@typescript-eslint/parser": "^5.62.0",
164+
"@wdio/junit-reporter": "^7.40.0",
165+
"autoprefixer": "^10.4.22",
166166
"babel-eslint": "^11.0.0-beta.2",
167-
"babel-jest": "^29.2.0",
168-
"babel-plugin-inline-react-svg": "^2.0.1",
167+
"babel-jest": "^29.7.0",
168+
"babel-plugin-inline-react-svg": "^2.0.2",
169169
"babel-plugin-module-resolver": "^4.1.0",
170170
"babel-plugin-named-exports-order": "^0.0.2",
171171
"babel-plugin-react-css-modules": "^5.2.6",
172-
"concurrently": "^7.4.0",
173-
"craco-css-modules": "^1.0.5",
172+
"concurrently": "^7.6.0",
173+
"craco-css-modules": "^1.0.6",
174174
"craco-plugin-env": "^1.0.5",
175175
"craco-resolve-url-loader": "^1.0.0",
176176
"cross-env": "^7.0.3",
177-
"css-loader": "3.5.3",
178-
"eslint": "^8.25.0",
177+
"css-loader": "3.6.0",
178+
"eslint": "^8.57.1",
179179
"eslint-config-airbnb": "^19.0.4",
180180
"eslint-config-react-app": "^7.0.1",
181181
"eslint-config-react-important-stuff": "^3.0.0",
182-
"eslint-import-resolver-typescript": "^3.2.5",
183-
"eslint-plugin-import": "^2.25.3",
182+
"eslint-import-resolver-typescript": "^3.10.1",
183+
"eslint-plugin-import": "^2.32.0",
184184
"eslint-plugin-ordered-imports": "^0.6.0",
185-
"eslint-plugin-react": "^7.28.0",
186-
"eslint-plugin-react-hooks": "^4.3.0",
187-
"eslint-plugin-unicorn": "^46.0.0",
185+
"eslint-plugin-react": "^7.37.5",
186+
"eslint-plugin-react-hooks": "^4.6.2",
187+
"eslint-plugin-unicorn": "^46.0.1",
188188
"file-loader": "^6.2.0",
189-
"husky": "^8.0.1",
189+
"husky": "^8.0.3",
190190
"identity-obj-proxy": "^3.0.0",
191-
"istanbul-lib-coverage": "^3.2.0",
192-
"jest": "^29.2.0",
193-
"jest-cli": "^29.2.0",
194-
"lint-staged": "^13.0.3",
191+
"istanbul-lib-coverage": "^3.2.2",
192+
"jest": "^29.7.0",
193+
"jest-cli": "^29.7.0",
194+
"lint-staged": "^13.3.0",
195195
"nyc": "^15.1.0",
196-
"postcss-loader": "^4.0.4",
197-
"postcss-scss": "^3.0.2",
198-
"pretty-quick": "^3.1.3",
199-
"react-docgen-typescript": "^2.2.2",
200-
"react-hot-loader": "^4.3.3",
196+
"postcss-loader": "^4.3.0",
197+
"postcss-scss": "^3.0.5",
198+
"pretty-quick": "^3.3.1",
199+
"react-docgen-typescript": "^2.4.0",
200+
"react-hot-loader": "^4.13.1",
201201
"resolve-url-loader": "^5.0.0",
202-
"rimraf": "^6.0.1",
202+
"rimraf": "^6.1.2",
203203
"sass-loader": "^13.3.3",
204-
"serve": "^14.0.1",
205-
"start-server-and-test": "^1.14.0",
206-
"storybook": "7.6.10",
207-
"style-loader": "^3.3.1",
204+
"serve": "^14.2.5",
205+
"start-server-and-test": "^2.1.3",
206+
"storybook": "7.6.20",
207+
"style-loader": "^3.3.4",
208208
"systemjs-webpack-interop": "^2.3.7",
209-
"tsconfig-paths-webpack-plugin": "^4.0.1",
210-
"typed-scss-modules": "^7.0.1",
211-
"webpack": "^5.79.0",
209+
"tsconfig-paths-webpack-plugin": "^4.2.0",
210+
"typed-scss-modules": "^7.1.4",
211+
"webpack": "^5.103.0",
212212
"webpack-cli": "^4.10.0",
213-
"webpack-config-single-spa-react": "^4.0.3",
214-
"webpack-dev-server": "^4.11.1",
215-
"webpack-merge": "^5.8.0"
213+
"webpack-config-single-spa-react": "^4.0.5",
214+
"webpack-dev-server": "^4.15.2",
215+
"webpack-merge": "^5.10.0"
216216
},
217217
"resolutions": {
218218
"@types/react": "18.0.35",
219-
"string-width": "4.2.0"
219+
"string-width": "4.2.0",
220+
"node-fetch": "2.6.7",
221+
"nth-check": "2.0.1",
222+
"lodash.mergewith": "4.6.2"
220223
},
221224
"browserslist": {
222225
"production": [

src/apps/profiles/src/components/MemberBadgeModal/MemberBadgeModal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ const MemberBadgeModal: FC<MemberBadgeModalProps> = (props: MemberBadgeModalProp
3636
{' '}
3737
{format(new Date(props.selectedBadge.awarded_at), 'PPP')}
3838
</div>
39+
{/* @ts-expect-error: TS2786: ReactMarkdown cannot be used as a JSX component */}
3940
<ReactMarkdown
4041
remarkPlugins={[
4142
remarkFrontmatter,

0 commit comments

Comments
 (0)