Upgrade engagement_view to Yarn v2, Typescript 3.8.0 (#574)

* Almost done, gotta fix a react testing scripts thing * update ts version * Update pre_replace * Add gratuitous timeouts and retries to yarnrc * Okay, fixed dockerfile
grapl-security · Feb 3, 2021 · 1047e46 · 1047e46
1 parent ee602d3
commit 1047e46
Show file tree

Hide file tree

Showing 16 changed files with 17,870 additions and 13,506 deletions.
diff --git a/src/js/engagement_view/.gitignore b/src/js/engagement_view/.gitignore
@@ -0,0 +1,7 @@
+# As recommended by https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+.yarn/*
+!.yarn/cache
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
diff --git a/src/js/engagement_view/.yarn/releases/yarn-berry.cjs b/src/js/engagement_view/.yarn/releases/yarn-berry.cjs
diff --git a/src/js/engagement_view/.yarnrc.yml b/src/js/engagement_view/.yarnrc.yml
@@ -0,0 +1,4 @@
+yarnPath: ".yarn/releases/yarn-berry.cjs"
+nodeLinker: node-modules
+httpTimeout: 60000
+httpRetry: 3
diff --git a/src/js/engagement_view/Dockerfile b/src/js/engagement_view/Dockerfile
@@ -6,6 +6,8 @@ WORKDIR /grapl
 # install deps as separate steps to leverage build cache
 COPY package.json package.json
 COPY yarn.lock yarn.lock
+COPY .yarnrc.yml .yarnrc.yml
+COPY .yarn/releases .yarn/releases
 RUN yarn install
 
 # now copy all sources

diff --git a/src/js/engagement_view/package.json b/src/js/engagement_view/package.json
@@ -7,12 +7,12 @@
     "@material-ui/icons": "^4.9.1",
     "@stardust-ui/docs-components": "^0.40.0",
     "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.3.2",
+    "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^7.1.2",
     "@trendmicro/react-sidenav": "^0.5.0",
-    "@types/jest": "^24.0.0",
-    "@types/node": "^12.12.34",
-    "@types/react-dom": "^16.9.8",
+    "@types/jest": "^26.0.20",
+    "@types/node": "^14.14.22",
+    "@types/react-dom": "^17.0.0",
     "@types/react-router": "^5.1.8",
     "@types/react-router-dom": "^5.1.3",
     "@types/react-sidebar": "^3.0.0",
@@ -31,7 +31,7 @@
     "react-router-dom": "^5.2.0",
     "react-scripts": "3.4.4",
     "semantic-ui-react": "^0.88.2",
-    "typescript": "~3.7.2",
+    "typescript": "^4.1.3",
     "yup": "^0.29.1"
   },
   "scripts": {
@@ -56,6 +56,6 @@
     ]
   },
   "devDependencies": {
-    "@types/react": "^16.9.32"
+    "@types/react": "^17.0.1"
   }
 }
diff --git a/src/js/engagement_view/yarn.lock b/src/js/engagement_view/yarn.lock
diff --git a/src/js/grapl-cdk/edge_ux_pre_replace/asset-manifest.json b/src/js/grapl-cdk/edge_ux_pre_replace/asset-manifest.json
@@ -1,23 +1,23 @@
 {
   "files": {
     "main.css": "/static/css/main.c328d195.chunk.css",
-    "main.js": "/static/js/main.a5c1738c.chunk.js",
-    "main.js.map": "/static/js/main.a5c1738c.chunk.js.map",
+    "main.js": "/static/js/main.b9d7f0ab.chunk.js",
+    "main.js.map": "/static/js/main.b9d7f0ab.chunk.js.map",
     "runtime-main.js": "/static/js/runtime-main.f4c0327b.js",
     "runtime-main.js.map": "/static/js/runtime-main.f4c0327b.js.map",
-    "static/js/2.26323649.chunk.js": "/static/js/2.26323649.chunk.js",
-    "static/js/2.26323649.chunk.js.map": "/static/js/2.26323649.chunk.js.map",
+    "static/js/2.ddfe57f6.chunk.js": "/static/js/2.ddfe57f6.chunk.js",
+    "static/js/2.ddfe57f6.chunk.js.map": "/static/js/2.ddfe57f6.chunk.js.map",
     "index.html": "/index.html",
-    "precache-manifest.e6049728c1fcd26017b55122111ba2a5.js": "/precache-manifest.e6049728c1fcd26017b55122111ba2a5.js",
+    "precache-manifest.3df44f3dbb8682bfc7d1163b22f65661.js": "/precache-manifest.3df44f3dbb8682bfc7d1163b22f65661.js",
     "service-worker.js": "/service-worker.js",
     "static/css/main.c328d195.chunk.css.map": "/static/css/main.c328d195.chunk.css.map",
-    "static/js/2.26323649.chunk.js.LICENSE.txt": "/static/js/2.26323649.chunk.js.LICENSE.txt",
+    "static/js/2.ddfe57f6.chunk.js.LICENSE.txt": "/static/js/2.ddfe57f6.chunk.js.LICENSE.txt",
     "static/media/LogIn.css": "/static/media/nodes.803a6c66.jpg"
   },
   "entrypoints": [
     "static/js/runtime-main.f4c0327b.js",
-    "static/js/2.26323649.chunk.js",
+    "static/js/2.ddfe57f6.chunk.js",
     "static/css/main.c328d195.chunk.css",
-    "static/js/main.a5c1738c.chunk.js"
+    "static/js/main.b9d7f0ab.chunk.js"
   ]
 }
diff --git a/src/js/grapl-cdk/edge_ux_pre_replace/index.html b/src/js/grapl-cdk/edge_ux_pre_replace/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./grapl_logo.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="manifest" href="./manifest.json"/><link rel="icon" href="./grapl_logo.png"><title>Grapl</title><link href="/static/css/main.c328d195.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,l,f=r[0],a=r[1],p=r[2],c=0,s=[];c<f.length;c++)l=f[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(i&&i(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,f=1;f<t.length;f++){var a=t[f];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var f=this["webpackJsonpgrapl-fe"]=this["webpackJsonpgrapl-fe"]||[],a=f.push.bind(f);f.push=r,f=f.slice();for(var p=0;p<f.length;p++)r(f[p]);var i=a;t()}([])</script><script src="/static/js/2.26323649.chunk.js"></script><script src="/static/js/main.a5c1738c.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./grapl_logo.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="manifest" href="./manifest.json"/><link rel="icon" href="./grapl_logo.png"><title>Grapl</title><link href="/static/css/main.c328d195.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,l,f=r[0],a=r[1],p=r[2],c=0,s=[];c<f.length;c++)l=f[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(i&&i(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,f=1;f<t.length;f++){var a=t[f];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var f=this["webpackJsonpgrapl-fe"]=this["webpackJsonpgrapl-fe"]||[],a=f.push.bind(f);f.push=r,f=f.slice();for(var p=0;p<f.length;p++)r(f[p]);var i=a;t()}([])</script><script src="/static/js/2.ddfe57f6.chunk.js"></script><script src="/static/js/main.b9d7f0ab.chunk.js"></script></body></html>
diff --git a/...ifest.e6049728c1fcd26017b55122111ba2a5.js → ...ifest.3df44f3dbb8682bfc7d1163b22f65661.js b/...ifest.e6049728c1fcd26017b55122111ba2a5.js → ...ifest.3df44f3dbb8682bfc7d1163b22f65661.js
@@ -1,23 +1,23 @@
 self.__precacheManifest = (self.__precacheManifest || []).concat([
   {
-    "revision": "e149186f4ef519072e2ca163437f1227",
+    "revision": "f7159db19a487087a6ff5a6323339794",
     "url": "/index.html"
   },
   {
-    "revision": "aaea1ec1ce3b1fbea27e",
+    "revision": "7656308499b602ba733a",
     "url": "/static/css/main.c328d195.chunk.css"
   },
   {
-    "revision": "5e3f08f5e5b659fef875",
-    "url": "/static/js/2.26323649.chunk.js"
+    "revision": "37dfbb11b48e2974b93f",
+    "url": "/static/js/2.ddfe57f6.chunk.js"
   },
   {
     "revision": "5ae0f76582f211776655eda6978b7713",
-    "url": "/static/js/2.26323649.chunk.js.LICENSE.txt"
+    "url": "/static/js/2.ddfe57f6.chunk.js.LICENSE.txt"
   },
   {
-    "revision": "aaea1ec1ce3b1fbea27e",
-    "url": "/static/js/main.a5c1738c.chunk.js"
+    "revision": "7656308499b602ba733a",
+    "url": "/static/js/main.b9d7f0ab.chunk.js"
   },
   {
     "revision": "59379d73f145341cdd6f",

diff --git a/src/js/grapl-cdk/edge_ux_pre_replace/service-worker.js b/src/js/grapl-cdk/edge_ux_pre_replace/service-worker.js
@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "/precache-manifest.e6049728c1fcd26017b55122111ba2a5.js"
+  "/precache-manifest.3df44f3dbb8682bfc7d1163b22f65661.js"
 );
 
 self.addEventListener('message', (event) => {

diff --git a/src/js/grapl-cdk/edge_ux_pre_replace/static/js/2.26323649.chunk.js b/src/js/grapl-cdk/edge_ux_pre_replace/static/js/2.26323649.chunk.js
diff --git a/src/js/grapl-cdk/edge_ux_pre_replace/static/js/2.ddfe57f6.chunk.js b/src/js/grapl-cdk/edge_ux_pre_replace/static/js/2.ddfe57f6.chunk.js
diff --git a/...static/js/2.26323649.chunk.js.LICENSE.txt → ...static/js/2.ddfe57f6.chunk.js.LICENSE.txt b/...static/js/2.26323649.chunk.js.LICENSE.txt → ...static/js/2.ddfe57f6.chunk.js.LICENSE.txt
diff --git a/...replace/static/js/2.26323649.chunk.js.map → ...replace/static/js/2.ddfe57f6.chunk.js.map b/...replace/static/js/2.26323649.chunk.js.map → ...replace/static/js/2.ddfe57f6.chunk.js.map
diff --git a/..._replace/static/js/main.a5c1738c.chunk.js → ..._replace/static/js/main.b9d7f0ab.chunk.js b/..._replace/static/js/main.a5c1738c.chunk.js → ..._replace/static/js/main.b9d7f0ab.chunk.js
diff --git a/...lace/static/js/main.a5c1738c.chunk.js.map → ...lace/static/js/main.b9d7f0ab.chunk.js.map b/...lace/static/js/main.a5c1738c.chunk.js.map → ...lace/static/js/main.b9d7f0ab.chunk.js.map