Skip to content

Commit 32b06d2

Browse files
Kshitij-Katiyarabbas-dependable-naqviraghavaggarwal2308
authored
[MM-945]: Converting user_attribute component and client files to TS and Upgrade mattermost-redux to 10.8.0 (#853)
* [MM-944]: Typescript migration and converting github_label_selector to TS * [MM-944] * [MM-945]: Converting user_attribute component and client files to TS * Fixed CI * Updated package-lock file * Upgraded the mattermost-redux to version 10.8.0 * [MM-945] Update jest version * [MM-945] Upgrade enzyme-to-json version * [MM-945] Fix jest config * [MM-945] Update jest config * [MM-945] Update jest config * [MM-945] Fix jest config and added testEnvironmentOptions * [MM-945] Added cheerio dependency and fix version of jest packages * [MM-945] Fix failing test * [MM-945] Downgrade the @mattermost/client version for ci snyk issue * [MM-945] Fix package versions --------- Co-authored-by: Abbas Naqvi <[email protected]> Co-authored-by: raghavaggarwal2308 <[email protected]>
1 parent 8ef1e43 commit 32b06d2

File tree

23 files changed

+21287
-27844
lines changed

23 files changed

+21287
-27844
lines changed

webapp/package-lock.json

Lines changed: 20710 additions & 27389 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webapp/package.json

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"devDependencies": {
1616
"@babel/cli": "7.20.7",
17-
"@babel/core": "7.11.6",
17+
"@babel/core": "7.28.0",
1818
"@babel/plugin-proposal-class-properties": "7.10.4",
1919
"@babel/plugin-proposal-object-rest-spread": "7.11.0",
2020
"@babel/plugin-proposal-optional-chaining": "7.11.0",
@@ -26,9 +26,12 @@
2626
"@babel/runtime": "7.27.1",
2727
"@emotion/babel-preset-css-prop": "10.0.27",
2828
"@emotion/core": "10.0.35",
29+
"@mattermost/client": "10.9.0",
30+
"@mattermost/types": "10.9.0",
31+
"@types/cheerio": "0.22.30",
2932
"@types/enzyme": "3.10.6",
3033
"@types/enzyme-adapter-react-16": "1.0.9",
31-
"@types/jest": "26.0.14",
34+
"@types/jest": "29.5.11",
3235
"@types/node": "14.11.1",
3336
"@types/react": "16.9.49",
3437
"@types/react-dom": "16.9.8",
@@ -40,13 +43,14 @@
4043
"@typescript-eslint/eslint-plugin": "4.1.1",
4144
"@typescript-eslint/parser": "4.1.1",
4245
"babel-eslint": "10.1.0",
43-
"babel-jest": "26.3.0",
44-
"babel-loader": "8.1.0",
45-
"babel-plugin-typescript-to-proptypes": "1.4.1",
46-
"css-loader": "4.3.0",
47-
"enzyme": "3.11.0",
48-
"enzyme-adapter-react-16": "1.15.4",
49-
"enzyme-to-json": "3.5.0",
46+
"babel-jest": "29.7.0",
47+
"babel-loader": "9.1.3",
48+
"babel-plugin-typescript-to-proptypes": "2.1.0",
49+
"cheerio": "0.22.0",
50+
"css-loader": "6.11.0",
51+
"enzyme": "3.10.0",
52+
"enzyme-adapter-react-16": "1.15.1",
53+
"enzyme-to-json": "3.6.2",
5054
"eslint": "7.9.0",
5155
"eslint-import-resolver-typescript": "3.6.1",
5256
"eslint-import-resolver-webpack": "0.12.2",
@@ -56,22 +60,25 @@
5660
"eslint-plugin-react-hooks": "4.1.2",
5761
"file-loader": "6.1.0",
5862
"identity-obj-proxy": "3.0.0",
59-
"jest": "26.4.2",
63+
"jest": "29.7.0",
6064
"jest-canvas-mock": "2.2.0",
61-
"jest-junit": "11.1.0",
65+
"jest-config": "30.0.4",
66+
"jest-environment-jsdom": "29.7.0",
67+
"jest-junit": "16.0.0",
68+
"react-test-renderer": "16.13.1",
6269
"sass": "1.60.0",
6370
"sass-loader": "10.4.1",
6471
"style-loader": "1.2.1",
65-
"typescript": "4.2.3",
66-
"webpack": "4.44.2",
67-
"webpack-cli": "3.3.12"
72+
"typescript": "5.6.3",
73+
"webpack": "5.96.1",
74+
"webpack-cli": "5.1.4"
6875
},
6976
"dependencies": {
7077
"@primer/octicons-react": "10.1.0",
7178
"core-js": "3.6.5",
7279
"csstype": "3.0.3",
7380
"debounce-promise": "3.1.2",
74-
"mattermost-redux": "5.33.1",
81+
"mattermost-redux": "10.9.0",
7582
"node-fetch": "2.6.7",
7683
"prop-types": "15.7.2",
7784
"react": "16.13.1",
@@ -81,11 +88,12 @@
8188
"react-markdown": "^8.0.5",
8289
"react-redux": "7.2.1",
8390
"react-select": "3.1.0",
84-
"redux": "4.0.5"
91+
"redux": "4.0.5",
92+
"reselect": "4.1.8"
8593
},
8694
"jest": {
8795
"snapshotSerializers": [
88-
"<rootDir>/node_modules/enzyme-to-json/serializer"
96+
"enzyme-to-json/serializer"
8997
],
9098
"testPathIgnorePatterns": [
9199
"/node_modules/",
@@ -107,23 +115,28 @@
107115
"^bundle-loader\\?lazy\\!(.*)$": "$1"
108116
},
109117
"moduleDirectories": [
110-
"",
111118
"node_modules",
112119
"non_npm_dependencies"
113120
],
114121
"reporters": [
115122
"default",
116123
"jest-junit"
117124
],
125+
"transform": {
126+
"^.+\\.[jt]sx?$": "babel-jest"
127+
},
118128
"transformIgnorePatterns": [
119-
"node_modules/(?!react-native|react-router|mattermost-webapp)"
129+
"node_modules/(?!react-native|react-router|mattermost-webapp|enzyme|cheerio)"
120130
],
121131
"setupFiles": [
122132
"jest-canvas-mock"
123133
],
124134
"setupFilesAfterEnv": [
125135
"<rootDir>/tests/setup.tsx"
126136
],
127-
"testURL": "http://localhost:8065"
137+
"testEnvironment": "jsdom",
138+
"testEnvironmentOptions": {
139+
"url": "http://localhost:8065"
140+
}
128141
}
129142
}

0 commit comments

Comments
 (0)