Merge branch 'main' into das-349-sonarcloud

dataswift · Apr 15, 2021 · 51826c3 · 51826c3
2 parents 3fcd402 + 041481c
commit 51826c3
Show file tree

Hide file tree

Showing 6 changed files with 297 additions and 304 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,18 +17,18 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup SSH
-        uses: webfactory/ssh-agent@v0.4.1
+        uses: webfactory/ssh-agent@v0.5.2
         with:
           ssh-private-key: ${{ secrets.SSH_HMI_LIBRARY }}
 
       - name: Setup NODEJS
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2.1.5
         with:
           node-version: 12
           registry-url: https://npm.pkg.github.com
 
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -19,18 +19,18 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup SSH
-        uses: webfactory/ssh-agent@v0.4.1
+        uses: webfactory/ssh-agent@v0.5.2
         with:
           ssh-private-key: ${{ secrets.SSH_HMI_LIBRARY }}
 
       - name: Setup NODEJS
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2.1.5
         with:
           node-version: 12
           registry-url: https://npm.pkg.github.com
 
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml
@@ -18,18 +18,18 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup SSH
-        uses: webfactory/ssh-agent@v0.4.1
+        uses: webfactory/ssh-agent@v0.5.2
         with:
           ssh-private-key: ${{ secrets.SSH_HMI_LIBRARY }}
 
       - name: Setup NODEJS
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2.1.5
         with:
           node-version: 12
           registry-url: https://npm.pkg.github.com
 
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -18,18 +18,18 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup SSH
-        uses: webfactory/ssh-agent@v0.4.1
+        uses: webfactory/ssh-agent@v0.5.2
         with:
           ssh-private-key: ${{ secrets.SSH_HMI_LIBRARY }}
 
       - name: Setup NODEJS
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2.1.5
         with:
           node-version: 12
           registry-url: https://npm.pkg.github.com
 
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

diff --git a/package.json b/package.json
@@ -9,13 +9,13 @@
     "@reduxjs/toolkit": "^1.5.1",
     "@testing-library/jest-dom": "^5.11.10",
     "@testing-library/react": "^11.2.6",
-    "date-fns": "^2.19.0",
-    "hmi": "git+ssh://[email protected]:dataswift/hmi-react.git#v0.4.0",
+    "date-fns": "^2.20.1",
+    "hmi": "git+ssh://[email protected]:dataswift/hmi-react.git#v0.4.1",
     "js-cookie": "^2.2.1",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "markdown-to-jsx": "^7.1.2",
-    "material-icons": "^0.5.4",
+    "material-icons": "^0.6.1",
     "query-string": "^7.0.0",
     "react": "^17.0.2",
     "react-date-range": "^1.1.3",
@@ -27,7 +27,7 @@
     "react-scripts": "^4.0.3",
     "redux": "^4.0.5",
     "redux-thunk": "^2.3.0",
-    "typescript": "^4.2.3"
+    "typescript": "^4.2.4"
   },
   "scripts": {
     "start": "env-cmd -e development react-scripts start",
@@ -70,10 +70,10 @@
     "@types/react-redux": "^7.1.16",
     "@types/react-router": "^5.1.13",
     "@types/react-router-dom": "^5.1.7",
-    "@typescript-eslint/eslint-plugin": "^4.20.0",
-    "@typescript-eslint/parser": "^4.20.0",
+    "@typescript-eslint/eslint-plugin": "^4.21.0",
+    "@typescript-eslint/parser": "^4.21.0",
     "env-cmd": "^10.1.0",
-    "eslint-plugin-react": "^7.23.1",
+    "eslint-plugin-react": "^7.23.2",
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-standard": "^5.0.0",
     "husky": "^6.0.0",