refactor: upgrade dependencies and node version (argoproj#4461)

jstewart612 · Oct 1, 2020 · 8299e99 · 8299e99
1 parent 7b60548
commit 8299e99
Show file tree

Hide file tree

Showing 9 changed files with 1,211 additions and 812 deletions.
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -184,7 +184,7 @@ jobs:
       - name: Setup NodeJS
         uses: actions/setup-node@v1
         with:
-          node-version: '11.15.0'
+          node-version: '12.18.4'
       - name: Restore node dependency cache
         id: cache-dependencies
         uses: actions/cache@v1

diff --git a/Dockerfile b/Dockerfile
@@ -87,7 +87,7 @@ WORKDIR /home/argocd
 ####################################################################################################
 # Argo CD UI stage
 ####################################################################################################
-FROM node:11.15.0 as argocd-ui
+FROM node:12.18.4 as argocd-ui
 
 WORKDIR /src
 ADD ["ui/package.json", "ui/yarn.lock", "./"]

diff --git a/test/container/Dockerfile b/test/container/Dockerfile
@@ -1,6 +1,6 @@
 FROM redis:5.0.8 as redis
 
-FROM node:11.15.0 as node
+FROM node:12.18.4 as node
 
 FROM golang:1.14.1 as golang
 

diff --git a/ui/.nvmrc b/ui/.nvmrc
@@ -1 +1 @@
-v9.4.0
+v12.18.4
diff --git a/ui/package.json b/ui/package.json
@@ -31,7 +31,7 @@
     "classnames": "^2.2.5",
     "color": "^3.1.0",
     "cookie": "^0.3.1",
-    "copy-webpack-plugin": "^4.3.1",
+    "copy-webpack-plugin": "^6.1.1",
     "dagre": "^0.8.2",
     "deepmerge": "^3.2.0",
     "foundation-sites": "^6.4.3",
@@ -70,11 +70,11 @@
     "ts-node": "^4.1.0",
     "tslint": "^5.16.0",
     "tslint-react": "^3.4.0",
-    "typescript": "^3.4.5",
+    "typescript": "^4.0.3",
     "unidiff": "^1.0.2",
-    "webpack": "^4.41.2",
-    "webpack-cli": "^3.2.3",
-    "webpack-dev-server": "^3.2.1"
+    "webpack": "^4.44.2",
+    "webpack-cli": "^3.3.12",
+    "webpack-dev-server": "^3.11.0"
   },
   "resolutions": {
     "@types/react": "16.8.5",
@@ -91,7 +91,7 @@
     "add": "^2.0.6",
     "babel-jest": "^24.9.0",
     "babel-loader": "^8.0.6",
-    "codecov": "^3.6.1",
+    "codecov": "^3.7.2",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^24.9.0",
     "jest-transform-css": "^2.0.0",
@@ -101,6 +101,6 @@
     "ts-jest": "^24.1.0",
     "tslint-config-prettier": "^1.18.0",
     "tslint-plugin-prettier": "^2.0.1",
-    "yarn": "^1.16.0"
+    "yarn": "^1.22.10"
   }
 }
diff --git a/ui/src/app/applications/components/applications-sync-panel/applications-sync-panel.tsx b/ui/src/app/applications/components/applications-sync-panel/applications-sync-panel.tsx
@@ -40,7 +40,7 @@ export const ApplicationsSyncPanel = ({show, apps, hide}: {show: boolean; apps:
                                 ctx.notifications.show({content: `No apps selected`, type: NotificationType.Error});
                                 return;
                             }
-                            const syncStrategy = (params.applyOnly ? {apply: {force: params.force}} : {hook: {force: params.force}}) as models.SyncStrategy;
+                            const syncStrategy: models.SyncStrategy = params.applyOnly ? {apply: {force: params.force}} : {hook: {force: params.force}};
                             setProgress({percentage: 0, title: 'Starting...'});
                             let i = 0;
                             for (const app of selectedApps) {

diff --git a/ui/src/app/shared/models.ts b/ui/src/app/shared/models.ts
@@ -24,8 +24,8 @@ export interface SyncOperationResource {
 }
 
 export interface SyncStrategy {
-    apply: {force?: boolean} | null;
-    hook: {force?: boolean} | null;
+    apply?: {force?: boolean};
+    hook?: {force?: boolean};
 }
 
 export interface SyncOperation {

diff --git a/ui/src/app/webpack.config.js b/ui/src/app/webpack.config.js
@@ -61,13 +61,15 @@ const config = {
             }),
         }),
         new HtmlWebpackPlugin({ template: 'src/app/index.html' }),
-        new CopyWebpackPlugin([{
-            from: 'src/assets', to: 'assets'
-        }, {
-            from: 'node_modules/argo-ui/src/assets', to: 'assets'
-        }, {
-            from: 'node_modules/@fortawesome/fontawesome-free/webfonts', to: 'assets/fonts'
-        }]),
+        new CopyWebpackPlugin({
+            patterns: [{
+                from: 'src/assets', to: 'assets'
+            }, {
+                from: 'node_modules/argo-ui/src/assets', to: 'assets'
+            }, {
+                from: 'node_modules/@fortawesome/fontawesome-free/webfonts', to: 'assets/fonts'
+            }]
+        }),
         new MonacoWebpackPlugin(),
         new GoogleFontsPlugin({
             // config: https://github.com/beyonk-adventures/google-fonts-webpack-plugin