Merge pull request #1977 from GMOD/upgrade_react_scripts_datagrid

Upgrade @material-ui/data-grid
GMOD · May 19, 2021 · eea9bd2 · eea9bd2
2 parents f0b0019 + bfb8991
commit eea9bd2
Show file tree

Hide file tree

Showing 7 changed files with 130 additions and 133 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -4,28 +4,28 @@ on: pull_request
 
 jobs:
   lint:
-    name: Lint on node 10.x and ubuntu-latest
+    name: Lint on node 12 and ubuntu-latest
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 10.x
+      - name: Use Node.js 12
         uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: '12'
       - name: Install deps and build (with cache)
         uses: bahmutov/npm-install@v1
       - name: Lint codebase
         run: yarn eslint --config .eslintrc.base.json --no-eslintrc --report-unused-disable-directives --max-warnings 0 --ext .js,.ts,.jsx,.tsx .
 
   format:
-    name: Format on node 10.x and ubuntu-latest
+    name: Format on node 12 and ubuntu-latest
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 10.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 12
+        uses: actions/setup-node@v2
         with:
-          node-version: 10.x
+          node-version: '12'
       - name: Install deps and build (with cache)
         uses: bahmutov/npm-install@v1
       - name: Check codebase format

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -22,14 +22,14 @@ jobs:
         run: yarn typecheck
 
   buildwebsite:
-    name: Build website on node 12.x and ubuntu-latest
+    name: Build website on node 12 and ubuntu-latest
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 12
+        uses: actions/setup-node@v2
         with:
-          node-version: 12.x
+          node-version: '12'
       - name: Install website deps (with cache)
         uses: bahmutov/npm-install@v1
         with:
@@ -39,11 +39,11 @@ jobs:
           cd website/
           yarn build
   buildwholerepo:
-    name: Build whole repo on node 10.x and ubuntu-latest
+    name: Build whole repo on node 14 and ubuntu-latest
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 10.x
+      - name: Use Node.js 14
         uses: actions/setup-node@v2
         with:
           node-version: '14'
@@ -55,14 +55,14 @@ jobs:
         run: BUILT_TESTS=1 yarn built-test-ci
 
   buildjbrowseweb:
-    name: Build only jbrowse-web and upload to s3 on node 10.x and ubuntu-latest
+    name: Build only jbrowse-web and upload to s3 on node 14 and ubuntu-latest
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 10.x
+      - name: Use Node.js 14
         uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: '14'
       - name: Install deps (with cache)
         uses: bahmutov/npm-install@v1
       - name: Build project
@@ -87,7 +87,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 10.x
+      - name: Use Node.js 14
         uses: actions/setup-node@v2
         with:
           node-version: '14'

diff --git a/plugins/variants/package.json b/plugins/variants/package.json
@@ -37,7 +37,7 @@
   "dependencies": {
     "@gmod/tabix": "^1.5.0",
     "@gmod/vcf": "^4.0.3",
-    "@material-ui/data-grid": "^4.0.0-alpha.20",
+    "@material-ui/data-grid": "^4.0.0-alpha.27",
     "@material-ui/icons": "^4.11.2",
     "generic-filehandle": "^2.0.0"
   },

diff --git a/products/jbrowse-desktop/package.json b/products/jbrowse-desktop/package.json
@@ -62,7 +62,7 @@
     "@jbrowse/plugin-wiggle": "^1.2.0",
     "@librpc/web": "rbuels/librpc-web#737bb9706762a52a87169a12c9b59fb241febab0",
     "@material-ui/core": "^4.9.5",
-    "@material-ui/data-grid": "^4.0.0-alpha.20",
+    "@material-ui/data-grid": "^4.0.0-alpha.27",
     "@material-ui/icons": "^4.0.0",
     "@material-ui/lab": "^4.0.0-alpha.45",
     "clsx": "^1.0.4",

diff --git a/products/jbrowse-web/package.json b/products/jbrowse-web/package.json
@@ -41,7 +41,7 @@
     "@jbrowse/plugin-wiggle": "^1.2.0",
     "@librpc/web": "rbuels/librpc-web#737bb9706762a52a87169a12c9b59fb241febab0",
     "@material-ui/core": "^4.9.5",
-    "@material-ui/data-grid": "^4.0.0-alpha.20",
+    "@material-ui/data-grid": "^4.0.0-alpha.27",
     "@material-ui/icons": "^4.0.0",
     "@material-ui/lab": "^4.0.0-alpha.56",
     "clsx": "^1.0.4",

diff --git a/products/jbrowse-web/src/__snapshots__/rootModel.test.js.snap b/products/jbrowse-web/src/__snapshots__/rootModel.test.js.snap
@@ -9,7 +9,6 @@ Array [
         "icon": Object {
           "$$typeof": Symbol(react.memo),
           "compare": null,
-          "muiName": "SvgIcon",
           "type": Object {
             "$$typeof": Symbol(react.forward_ref),
             "render": [Function],
@@ -22,7 +21,6 @@ Array [
         "icon": Object {
           "$$typeof": Symbol(react.memo),
           "compare": null,
-          "muiName": "SvgIcon",
           "type": Object {
             "$$typeof": Symbol(react.forward_ref),
             "render": [Function],
@@ -45,7 +43,6 @@ Array [
         "icon": Object {
           "$$typeof": Symbol(react.memo),
           "compare": null,
-          "muiName": "SvgIcon",
           "type": Object {
             "$$typeof": Symbol(react.forward_ref),
             "render": [Function],
@@ -58,7 +55,6 @@ Array [
         "icon": Object {
           "$$typeof": Symbol(react.memo),
           "compare": null,
-          "muiName": "SvgIcon",
           "type": Object {
             "$$typeof": Symbol(react.forward_ref),
             "render": [Function],