Skip to content
This repository has been archived by the owner on Dec 26, 2022. It is now read-only.

Upgrade engagement_view to Yarn v2, Typescript 3.8.0 #574

Merged
merged 5 commits into from
Feb 3, 2021
Merged

Upgrade engagement_view to Yarn v2, Typescript 3.8.0 #574

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71c1099
Almost done, gotta fix a react testing scripts thing
wimax-grapl Feb 3, 2021
77b0f24
update ts version
wimax-grapl Feb 3, 2021
e05504f
Update pre_replace
wimax-grapl Feb 3, 2021
04ef8a5
Add gratuitous timeouts and retries to yarnrc
wimax-grapl Feb 3, 2021
328bac5
Okay, fixed dockerfile
wimax-grapl Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/js/engagement_view/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
55 changes: 55 additions & 0 deletions src/js/engagement_view/.yarn/releases/yarn-berry.cjs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/js/engagement_view/.yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
yarnPath: ".yarn/releases/yarn-berry.cjs"
nodeLinker: node-modules
12 changes: 6 additions & 6 deletions src/js/engagement_view/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand All @@ -56,6 +56,6 @@
]
},
"devDependencies": {
"@types/react": "^16.9.32"
"@types/react": "^17.0.1"
}
}
31,248 changes: 17,772 additions & 13,476 deletions src/js/engagement_view/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions src/js/grapl-cdk/edge_ux_pre_replace/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
]
}
2 changes: 1 addition & 1 deletion src/js/grapl-cdk/edge_ux_pre_replace/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
14 changes: 7 additions & 7 deletions ...ifest.e6049728c1fcd26017b55122111ba2a5.js → ...ifest.3df44f3dbb8682bfc7d1163b22f65661.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/js/grapl-cdk/edge_ux_pre_replace/service-worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
3 changes: 0 additions & 3 deletions src/js/grapl-cdk/edge_ux_pre_replace/static/js/2.26323649.chunk.js
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions src/js/grapl-cdk/edge_ux_pre_replace/static/js/2.ddfe57f6.chunk.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...static/js/2.26323649.chunk.js.LICENSE.txt → ...static/js/2.ddfe57f6.chunk.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...replace/static/js/2.26323649.chunk.js.map → ...replace/static/js/2.ddfe57f6.chunk.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ..._replace/static/js/main.a5c1738c.chunk.js → ..._replace/static/js/main.b9d7f0ab.chunk.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...lace/static/js/main.a5c1738c.chunk.js.map → ...lace/static/js/main.b9d7f0ab.chunk.js.map
View file
Open in desktop

Large diffs are not rendered by default.