Skip to content

Commit 12c20f7

Browse files
committed
chore: bump and downgrade dependencies
> make react version equal to what is in argocd > bump argo-rollouts to use latest argo-ui Signed-off-by: Mayursinh Sarvaiya <[email protected]>
1 parent b7c952c commit 12c20f7

File tree

4 files changed

+3901
-3514
lines changed

4 files changed

+3901
-3514
lines changed

ui/package.json

+11-17
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,23 @@
66
"@fortawesome/fontawesome-svg-core": "^6.4.0",
77
"@fortawesome/free-solid-svg-icons": "^6.4.0",
88
"@fortawesome/react-fontawesome": "^0.2.0",
9-
"antd": "^5.4.2",
10-
"argo-rollouts": "git+https://github.com/argoproj/argo-rollouts.git",
11-
"argo-ui": "git+https://github.com/argoproj/argo-ui.git",
9+
"argo-rollouts": "git+https://github.com/argoproj/argo-rollouts.git#3a257e3740312fc826606d2fd408beb51f7900cf",
10+
"argo-ui": "git+https://github.com/argoproj/argo-ui.git#5ff344ac9692c14dd108468bd3c020c3c75181cb",
1211
"classnames": "2.2.6",
1312
"null-loader": "^4.0.1",
14-
"react": "^17.0.2",
15-
"react-dom": "^16.14.0",
13+
"react": "^16.9.3",
14+
"react-dom": "^16.9.3",
1615
"react-helmet": "^6.1.0",
1716
"react-router-dom": "5.2.0",
1817
"react-scripts": "4.0.3",
19-
"rxjs": "^7.1.0",
2018
"ts-loader": "^8.2.0",
2119
"typescript": "^4.9.5",
2220
"web-vitals": "^1.0.1"
2321
},
2422
"peerDeependencies": {
25-
"argo-ui": "git+https://github.com/argoproj/argo-ui.git",
26-
"@types/react": "^16.14.0",
27-
"@types/react-dom": "^17.0.2",
28-
"react": "^16.9.3",
29-
"rxjs": "^6.6.6"
23+
"argo-ui": "git+https://github.com/argoproj/argo-ui.git#5ff344ac9692c14dd108468bd3c020c3c75181cb",
24+
"@types/react": "^16.9.3",
25+
"react": "^16.9.3"
3026
},
3127
"scripts": {
3228
"start": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack.config.js --watch",
@@ -50,22 +46,20 @@
5046
]
5147
},
5248
"devDependencies": {
53-
"@types/react": "^17.0.19",
54-
"@types/react-dom": "^17.0.9",
49+
"@types/react": "^16.9.3",
50+
"@types/react-dom": "^16.9.3",
5551
"@types/react-helmet": "^6.1.0",
5652
"@types/react-router-dom": "^5.1.7",
57-
"argo-ui": "git+https://github.com/argoproj/argo-ui.git",
5853
"babel-preset-react": "^6.24.1",
5954
"portable-fetch": "^3.0.0",
60-
"raw-loader": "^0.5.1",
55+
"raw-loader": "^4.0.2",
6156
"react-keyhooks": "^0.2.3",
6257
"rxjs": "^7.1.0",
6358
"sass": "^1.34.1",
6459
"ts-loader": "8.2.0",
6560
"webpack-cli": "^4.9.2"
6661
},
6762
"resolutions": {
68-
"classnames": "2.2.6",
69-
"react-toastify": "5.0.1"
63+
"@types/react": "16.9.3"
7064
}
7165
}

ui/src/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"sourceMap": true,
55
"noImplicitAny": false,
66
"module": "commonjs",
7-
"target": "es5",
7+
"target": "es6",
88
"jsx": "react",
99
"moduleResolution": "node",
1010
"experimentalDecorators": true,
@@ -15,4 +15,4 @@
1515
},
1616
"include": ["./**/*"],
1717
"exclude": ["node_modules"]
18-
}
18+
}

ui/webpack.config.js

+6
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ const config = {
4141
test: /\.css$/,
4242
use: ['style-loader', 'raw-loader'],
4343
},
44+
// https://github.com/fkhadra/react-toastify/issues/775#issuecomment-1149569290
45+
{
46+
test: /\.mjs$/,
47+
include: /node_modules/,
48+
type: "javascript/auto"
49+
},
4450
],
4551
},
4652
};

0 commit comments

Comments
 (0)