diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d7b097b7d..2f6f41716 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -610,7 +610,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - node: [16] + node: [17] steps: - uses: actions/checkout@v2 diff --git a/www/frontends/compiler_gym/package-lock.json b/www/frontends/compiler_gym/package-lock.json index b1d9ce8a0..da6c29df0 100644 --- a/www/frontends/compiler_gym/package-lock.json +++ b/www/frontends/compiler_gym/package-lock.json @@ -18,7 +18,7 @@ "highcharts-react-official": "^3.0.0", "node-sass": "^6.0.1", "react": "^17.0.2", - "react-bootstrap": "^2.0.0-beta.4", + "react-bootstrap": "^2.0.4", "react-d3-tree": "^3.1.1", "react-dom": "^17.0.2", "react-highlight": "^0.14.0", @@ -2783,26 +2783,29 @@ } }, "node_modules/@popperjs/core": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", - "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==", + "version": "2.11.4", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.4.tgz", + "integrity": "sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==", "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" } }, - "node_modules/@restart/context": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz", - "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q==", + "node_modules/@react-aria/ssr": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.1.2.tgz", + "integrity": "sha512-amXY11ImpokvkTMeKRHjsSsG7v1yzzs6yeqArCyBIk60J3Yhgxwx9Cah+Uu/804ATFwqzN22AXIo7SdtIaMP+g==", + "dependencies": { + "@babel/runtime": "^7.6.2" + }, "peerDependencies": { - "react": ">=16.3.2" + "react": "^16.8.0 || ^17.0.0-rc.1" } }, "node_modules/@restart/hooks": { - "version": "0.3.27", - "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.27.tgz", - "integrity": "sha512-s984xV/EapUIfkjlf8wz9weP2O9TNKR96C68FfMEy2bE69+H4cNv3RD4Mf97lW7Htt7PjZrYTjSC8f3SB9VCXw==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.5.tgz", + "integrity": "sha512-tLGtY0aHeIfT7aPwUkvQuhIy3+q3w4iqmUzFLPlOAf/vNUacLaBt1j/S//jv/dQhenRh8jvswyMojCwmLvJw8A==", "dependencies": { "dequal": "^2.0.2" }, @@ -2810,6 +2813,38 @@ "react": ">=16.8.0" } }, + "node_modules/@restart/ui": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.0.2.tgz", + "integrity": "sha512-vKGe0UBJLnbvNAjr8ljlDvphf2HkpjBjXsblmgKPvKdZBDn/mtAz89wmznaomIaEJ9VNoSEY0vA5T5MDi2jIcQ==", + "dependencies": { + "@babel/runtime": "^7.13.16", + "@popperjs/core": "^2.10.1", + "@react-aria/ssr": "^3.0.1", + "@restart/hooks": "^0.4.0", + "@types/warning": "^3.0.0", + "dequal": "^2.0.2", + "dom-helpers": "^5.2.0", + "prop-types": "^15.7.2", + "uncontrollable": "^7.2.1", + "warning": "^4.0.3" + }, + "peerDependencies": { + "react": ">=16.14.0", + "react-dom": ">=16.14.0" + } + }, + "node_modules/@restart/ui/node_modules/@babel/runtime": { + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz", + "integrity": "sha512-L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA==", + "dependencies": { + "regenerator-runtime": "^0.13.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@rollup/plugin-node-resolve": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz", @@ -3429,9 +3464,9 @@ "integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==" }, "node_modules/@types/invariant": { - "version": "2.2.34", - "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.34.tgz", - "integrity": "sha512-lYUtmJ9BqUN688fGY1U1HZoWT1/Jrmgigx2loq4ZcJpICECm/Om3V314BxdzypO0u5PORKGMM6x0OXaljV1YFg==" + "version": "2.2.35", + "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.35.tgz", + "integrity": "sha512-DxX1V9P8zdJPYQat1gHyY0xj3efl8gnMVjiM9iCY6y27lj+PoQWkgjt8jDqmovPqULkKVpKRg8J36iQiA+EtEg==" }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.3", @@ -3514,9 +3549,9 @@ "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==" }, "node_modules/@types/react": { - "version": "17.0.14", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.14.tgz", - "integrity": "sha512-0WwKHUbWuQWOce61UexYuWTGuGY/8JvtUe/dtQ6lR4sZ3UiylHotJeWpf3ArP9+DSGUoLY3wbU59VyMrJps5VQ==", + "version": "17.0.40", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.40.tgz", + "integrity": "sha512-UrXhD/JyLH+W70nNSufXqMZNuUD2cXHu6UjCllC6pmOQgBX4SGXOH8fjRka0O0Ee0HrFxapDD8Bwn81Kmiz6jQ==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -3524,9 +3559,9 @@ } }, "node_modules/@types/react-transition-group": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.2.tgz", - "integrity": "sha512-KibDWL6nshuOJ0fu8ll7QnV/LVTo3PzQ9aCPnRUYPfX7eZohHwLIdNHj7pftanREzHNP4/nJa8oeM73uSiavMQ==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz", + "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==", "dependencies": { "@types/react": "*" } @@ -17022,13 +17057,13 @@ } }, "node_modules/prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", - "react-is": "^16.8.1" + "react-is": "^16.13.1" } }, "node_modules/prop-types-extra": { @@ -17291,25 +17326,24 @@ } }, "node_modules/react-bootstrap": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.0.0-beta.4.tgz", - "integrity": "sha512-ETCvuZV78orCqGg4XA4WrhytXxTcnvshPDveSc3uK2mvnj6IRQue5O5188xsazbD3nnhX52T63uQjM4HjeRBEw==", - "dependencies": { - "@babel/runtime": "^7.14.0", - "@restart/context": "^2.1.4", - "@restart/hooks": "^0.3.26", - "@types/invariant": "^2.2.33", - "@types/prop-types": "^15.7.3", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.2.1.tgz", + "integrity": "sha512-x8lpVQflsbevphuWbTnTNCatcbKyPJNrP2WyQ1MJYmFEcVjbTbai1yZhdlXr0QUxLQLxA8g5hQWb5TwJtaZoCA==", + "dependencies": { + "@babel/runtime": "^7.17.2", + "@restart/hooks": "^0.4.5", + "@restart/ui": "^1.0.2", + "@types/invariant": "^2.2.35", + "@types/prop-types": "^15.7.4", "@types/react": ">=16.14.8", - "@types/react-transition-group": "^4.4.1", + "@types/react-transition-group": "^4.4.4", "@types/warning": "^3.0.0", "classnames": "^2.3.1", "dom-helpers": "^5.2.1", "invariant": "^2.2.4", - "prop-types": "^15.7.2", + "prop-types": "^15.8.1", "prop-types-extra": "^1.1.0", - "react-overlays": "^5.1.1", - "react-transition-group": "^4.4.1", + "react-transition-group": "^4.4.2", "uncontrollable": "^7.2.1", "warning": "^4.0.3" }, @@ -17319,9 +17353,9 @@ } }, "node_modules/react-bootstrap/node_modules/@babel/runtime": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz", - "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==", + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz", + "integrity": "sha512-L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA==", "dependencies": { "regenerator-runtime": "^0.13.4" }, @@ -17548,36 +17582,6 @@ "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, - "node_modules/react-overlays": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-5.1.1.tgz", - "integrity": "sha512-eCN2s2/+GVZzpnId4XVWtvDPYYBD2EtOGP74hE+8yDskPzFy9+pV1H3ZZihxuRdEbQzzacySaaDkR7xE0ydl4Q==", - "dependencies": { - "@babel/runtime": "^7.13.8", - "@popperjs/core": "^2.8.6", - "@restart/hooks": "^0.3.26", - "@types/warning": "^3.0.0", - "dom-helpers": "^5.2.0", - "prop-types": "^15.7.2", - "uncontrollable": "^7.2.1", - "warning": "^4.0.3" - }, - "peerDependencies": { - "react": ">=16.3.0", - "react-dom": ">=16.3.0" - } - }, - "node_modules/react-overlays/node_modules/@babel/runtime": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz", - "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==", - "dependencies": { - "regenerator-runtime": "^0.13.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/react-refresh": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz", @@ -25328,24 +25332,53 @@ } }, "@popperjs/core": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", - "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==" + "version": "2.11.4", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.4.tgz", + "integrity": "sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==" }, - "@restart/context": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz", - "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q==", - "requires": {} + "@react-aria/ssr": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.1.2.tgz", + "integrity": "sha512-amXY11ImpokvkTMeKRHjsSsG7v1yzzs6yeqArCyBIk60J3Yhgxwx9Cah+Uu/804ATFwqzN22AXIo7SdtIaMP+g==", + "requires": { + "@babel/runtime": "^7.6.2" + } }, "@restart/hooks": { - "version": "0.3.27", - "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.27.tgz", - "integrity": "sha512-s984xV/EapUIfkjlf8wz9weP2O9TNKR96C68FfMEy2bE69+H4cNv3RD4Mf97lW7Htt7PjZrYTjSC8f3SB9VCXw==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.5.tgz", + "integrity": "sha512-tLGtY0aHeIfT7aPwUkvQuhIy3+q3w4iqmUzFLPlOAf/vNUacLaBt1j/S//jv/dQhenRh8jvswyMojCwmLvJw8A==", "requires": { "dequal": "^2.0.2" } }, + "@restart/ui": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.0.2.tgz", + "integrity": "sha512-vKGe0UBJLnbvNAjr8ljlDvphf2HkpjBjXsblmgKPvKdZBDn/mtAz89wmznaomIaEJ9VNoSEY0vA5T5MDi2jIcQ==", + "requires": { + "@babel/runtime": "^7.13.16", + "@popperjs/core": "^2.10.1", + "@react-aria/ssr": "^3.0.1", + "@restart/hooks": "^0.4.0", + "@types/warning": "^3.0.0", + "dequal": "^2.0.2", + "dom-helpers": "^5.2.0", + "prop-types": "^15.7.2", + "uncontrollable": "^7.2.1", + "warning": "^4.0.3" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz", + "integrity": "sha512-L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, "@rollup/plugin-node-resolve": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz", @@ -25787,9 +25820,9 @@ "integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==" }, "@types/invariant": { - "version": "2.2.34", - "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.34.tgz", - "integrity": "sha512-lYUtmJ9BqUN688fGY1U1HZoWT1/Jrmgigx2loq4ZcJpICECm/Om3V314BxdzypO0u5PORKGMM6x0OXaljV1YFg==" + "version": "2.2.35", + "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.35.tgz", + "integrity": "sha512-DxX1V9P8zdJPYQat1gHyY0xj3efl8gnMVjiM9iCY6y27lj+PoQWkgjt8jDqmovPqULkKVpKRg8J36iQiA+EtEg==" }, "@types/istanbul-lib-coverage": { "version": "2.0.3", @@ -25872,9 +25905,9 @@ "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==" }, "@types/react": { - "version": "17.0.14", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.14.tgz", - "integrity": "sha512-0WwKHUbWuQWOce61UexYuWTGuGY/8JvtUe/dtQ6lR4sZ3UiylHotJeWpf3ArP9+DSGUoLY3wbU59VyMrJps5VQ==", + "version": "17.0.40", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.40.tgz", + "integrity": "sha512-UrXhD/JyLH+W70nNSufXqMZNuUD2cXHu6UjCllC6pmOQgBX4SGXOH8fjRka0O0Ee0HrFxapDD8Bwn81Kmiz6jQ==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -25882,9 +25915,9 @@ } }, "@types/react-transition-group": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.2.tgz", - "integrity": "sha512-KibDWL6nshuOJ0fu8ll7QnV/LVTo3PzQ9aCPnRUYPfX7eZohHwLIdNHj7pftanREzHNP4/nJa8oeM73uSiavMQ==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz", + "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==", "requires": { "@types/react": "*" } @@ -36311,13 +36344,13 @@ } }, "prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", "requires": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", - "react-is": "^16.8.1" + "react-is": "^16.13.1" }, "dependencies": { "react-is": { @@ -36532,33 +36565,32 @@ } }, "react-bootstrap": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.0.0-beta.4.tgz", - "integrity": "sha512-ETCvuZV78orCqGg4XA4WrhytXxTcnvshPDveSc3uK2mvnj6IRQue5O5188xsazbD3nnhX52T63uQjM4HjeRBEw==", - "requires": { - "@babel/runtime": "^7.14.0", - "@restart/context": "^2.1.4", - "@restart/hooks": "^0.3.26", - "@types/invariant": "^2.2.33", - "@types/prop-types": "^15.7.3", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.2.1.tgz", + "integrity": "sha512-x8lpVQflsbevphuWbTnTNCatcbKyPJNrP2WyQ1MJYmFEcVjbTbai1yZhdlXr0QUxLQLxA8g5hQWb5TwJtaZoCA==", + "requires": { + "@babel/runtime": "^7.17.2", + "@restart/hooks": "^0.4.5", + "@restart/ui": "^1.0.2", + "@types/invariant": "^2.2.35", + "@types/prop-types": "^15.7.4", "@types/react": ">=16.14.8", - "@types/react-transition-group": "^4.4.1", + "@types/react-transition-group": "^4.4.4", "@types/warning": "^3.0.0", "classnames": "^2.3.1", "dom-helpers": "^5.2.1", "invariant": "^2.2.4", - "prop-types": "^15.7.2", + "prop-types": "^15.8.1", "prop-types-extra": "^1.1.0", - "react-overlays": "^5.1.1", - "react-transition-group": "^4.4.1", + "react-transition-group": "^4.4.2", "uncontrollable": "^7.2.1", "warning": "^4.0.3" }, "dependencies": { "@babel/runtime": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz", - "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==", + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz", + "integrity": "sha512-L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -36739,31 +36771,6 @@ "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, - "react-overlays": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-5.1.1.tgz", - "integrity": "sha512-eCN2s2/+GVZzpnId4XVWtvDPYYBD2EtOGP74hE+8yDskPzFy9+pV1H3ZZihxuRdEbQzzacySaaDkR7xE0ydl4Q==", - "requires": { - "@babel/runtime": "^7.13.8", - "@popperjs/core": "^2.8.6", - "@restart/hooks": "^0.3.26", - "@types/warning": "^3.0.0", - "dom-helpers": "^5.2.0", - "prop-types": "^15.7.2", - "uncontrollable": "^7.2.1", - "warning": "^4.0.3" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz", - "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==", - "requires": { - "regenerator-runtime": "^0.13.4" - } - } - } - }, "react-refresh": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz", diff --git a/www/frontends/compiler_gym/package.json b/www/frontends/compiler_gym/package.json index aa3cd8dc7..768d47eeb 100644 --- a/www/frontends/compiler_gym/package.json +++ b/www/frontends/compiler_gym/package.json @@ -14,7 +14,7 @@ "highcharts-react-official": "^3.0.0", "node-sass": "^6.0.1", "react": "^17.0.2", - "react-bootstrap": "^2.0.0-beta.4", + "react-bootstrap": "^2.0.4", "react-d3-tree": "^3.1.1", "react-dom": "^17.0.2", "react-highlight": "^0.14.0", @@ -23,7 +23,7 @@ "web-vitals": "^1.1.2" }, "scripts": { - "start": "react-scripts start", + "start": "react-scripts --openssl-legacy-provider start", "build": "react-scripts --openssl-legacy-provider build", "test": "react-scripts test", "eject": "react-scripts eject" diff --git a/www/frontends/compiler_gym/public/apple-touch-icon.png b/www/frontends/compiler_gym/public/apple-touch-icon.png new file mode 100644 index 000000000..edc762100 Binary files /dev/null and b/www/frontends/compiler_gym/public/apple-touch-icon.png differ diff --git a/www/frontends/compiler_gym/public/favicon-16x16.png b/www/frontends/compiler_gym/public/favicon-16x16.png new file mode 100644 index 000000000..edc5d069d Binary files /dev/null and b/www/frontends/compiler_gym/public/favicon-16x16.png differ diff --git a/www/frontends/compiler_gym/public/favicon-32x32.png b/www/frontends/compiler_gym/public/favicon-32x32.png new file mode 100644 index 000000000..490ea8d8f Binary files /dev/null and b/www/frontends/compiler_gym/public/favicon-32x32.png differ diff --git a/www/frontends/compiler_gym/public/favicon.ico b/www/frontends/compiler_gym/public/favicon.ico index a11777cc4..350a07176 100644 Binary files a/www/frontends/compiler_gym/public/favicon.ico and b/www/frontends/compiler_gym/public/favicon.ico differ diff --git a/www/frontends/compiler_gym/public/index.html b/www/frontends/compiler_gym/public/index.html index cb13a4541..f3719697d 100644 --- a/www/frontends/compiler_gym/public/index.html +++ b/www/frontends/compiler_gym/public/index.html @@ -14,7 +14,9 @@ name="description" content="CompilerGym Explorer - compiler optimization problems for reinforcement learning" /> - + + + diff --git a/www/frontends/compiler_gym/src/App.js b/www/frontends/compiler_gym/src/App.js index 0a0828c29..961999ae0 100644 --- a/www/frontends/compiler_gym/src/App.js +++ b/www/frontends/compiler_gym/src/App.js @@ -44,7 +44,6 @@ function App() { INITIAL_SETTINGS.reward, "", ); - console.log(initSession); setCompilerGym(options); setSession(initSession); setIsLoading(false); diff --git a/www/frontends/compiler_gym/src/assets/scss/main_content.scss b/www/frontends/compiler_gym/src/assets/scss/main_content.scss index bab5157c4..6ca086069 100644 --- a/www/frontends/compiler_gym/src/assets/scss/main_content.scss +++ b/www/frontends/compiler_gym/src/assets/scss/main_content.scss @@ -75,20 +75,6 @@ // **** Custom dropdown **** -.cg-dropdown { - background-color: $dark; - height: 18vh; - overflow: auto; - border-radius: 5%; - padding: 0 0.4rem; - z-index: 4; - font-size: 0.75rem; - text-align: start; - ul { - padding-left: 0rem; - } -} - .search-bar { position: sticky; top: 0%; diff --git a/www/frontends/compiler_gym/src/assets/scss/searchtree.scss b/www/frontends/compiler_gym/src/assets/scss/searchtree.scss index d2b45bfce..c8826c9c3 100644 --- a/www/frontends/compiler_gym/src/assets/scss/searchtree.scss +++ b/www/frontends/compiler_gym/src/assets/scss/searchtree.scss @@ -4,12 +4,6 @@ * LICENSE file in the root directory of this source tree. */ -.searchtree-nav-wrapper { - position: sticky; - top: 5.4rem; - z-index: 1; -} - .search-tree-container { margin-top: 0rem; margin-left: 0rem; @@ -73,6 +67,7 @@ stroke-width: 0; font-size: 0.8rem; fill: black; + z-index: 1; } path { fill: none; @@ -87,8 +82,8 @@ .active-node-info { position: sticky; - border: 1px solid black; - border-radius: 5%; + border: 2px solid black; + border-radius: 5px; background-color: $secondary; padding: 0.45rem; z-index: 100; @@ -100,3 +95,7 @@ justify-content: center; align-items: center; } + +.dark-mode-spinner-wrap { + background-color: $dark; +} diff --git a/www/frontends/compiler_gym/src/components/Navbars/ActionsNavbar.js b/www/frontends/compiler_gym/src/components/Navbars/ActionsNavbar.js index 69f9736f3..5703d8f6d 100644 --- a/www/frontends/compiler_gym/src/components/Navbars/ActionsNavbar.js +++ b/www/frontends/compiler_gym/src/components/Navbars/ActionsNavbar.js @@ -23,33 +23,28 @@ import LargeModal from "../Modals/LargeModal"; import { getCommandLineArray } from "../../utils/Helpers"; const CustomMenu = forwardRef( - ({ children, style, "aria-labelledby": labeledBy }, ref) => { - const [value, setValue] = useState(""); - + ({children, style, className, "aria-labelledby": labeledBy}, ref) => { + const [value, setValue] = React.useState(""); return (
setValue(e.target.value)} value={value} />
-
diff --git a/www/frontends/compiler_gym/src/components/Sections/ControlsContainer.js b/www/frontends/compiler_gym/src/components/Sections/ControlsContainer.js index 1538900ed..d1c6c0b39 100644 --- a/www/frontends/compiler_gym/src/components/Sections/ControlsContainer.js +++ b/www/frontends/compiler_gym/src/components/Sections/ControlsContainer.js @@ -5,9 +5,11 @@ */ import React, { useState, useContext, useEffect } from "react"; +import classnames from "classnames"; import { useHistory, useLocation } from "react-router"; import { Spinner } from "react-bootstrap"; import ApiContext from "../../context/ApiContext"; +import ThemeContext from "../../context/ThemeContext"; import { makeSessionTreeData } from "../../utils/Helpers"; import ActionsNavbar from "../Navbars/ActionsNavbar"; import SearchTree from "./SearchTree"; @@ -17,6 +19,7 @@ import ActionsDict from "../../utils/ActionsDict"; const ControlsContainer = () => { const { compilerGym, session, params, api, setSession } = useContext(ApiContext); + const { darkTheme } = useContext(ThemeContext); const history = useHistory(); const location = useLocation(); const searchParams = new URLSearchParams(location.search); @@ -386,11 +389,16 @@ const ControlsContainer = () => { handleResetActionsTracker={handleResetActionsTracker} /> {isLoading ? ( -
+
) : ( diff --git a/www/frontends/compiler_gym/src/components/Sections/RewardHistoryChart.js b/www/frontends/compiler_gym/src/components/Sections/RewardHistoryChart.js index 0a1978081..eecc2430f 100644 --- a/www/frontends/compiler_gym/src/components/Sections/RewardHistoryChart.js +++ b/www/frontends/compiler_gym/src/components/Sections/RewardHistoryChart.js @@ -48,6 +48,7 @@ const RewardHistoryChart = ({ session, highlightedPoint, handleClickOnChart }) = type: "areaspline", height: 18 + "%", width: panel.current?.clientWidth, + animation: false, }, title: { text: "Rewards", diff --git a/www/frontends/compiler_gym/src/components/Sections/SearchTree.js b/www/frontends/compiler_gym/src/components/Sections/SearchTree.js index a755a43d3..fef3c1223 100644 --- a/www/frontends/compiler_gym/src/components/Sections/SearchTree.js +++ b/www/frontends/compiler_gym/src/components/Sections/SearchTree.js @@ -26,7 +26,7 @@ const RenderSvgNode = ({ handleMouseOutTree, layer, }) => { - const foreignObjectProps = { width: 150, height: 200, x: 20, y: 10 }; + const foreignObjectProps = { width: 180, height: 150, x: -190, y: -20 }; const nodeRef = useRef(); const [seeDescription, setSeeDescription] = useState(false) @@ -67,7 +67,7 @@ const RenderSvgNode = ({ {seeDescription && (
- + {nodeDatum.description}
diff --git a/www/frontends/compiler_gym/src/utils/Helpers.js b/www/frontends/compiler_gym/src/utils/Helpers.js index f9e12e211..10e8eb471 100644 --- a/www/frontends/compiler_gym/src/utils/Helpers.js +++ b/www/frontends/compiler_gym/src/utils/Helpers.js @@ -154,8 +154,8 @@ export const percIncrease = (a, b) => { }; /** - * This recursive function takes a tree object of parents and returns the translate Y position in canvas as a flat array. - * + * This recursive function takes a tree object of parents and + * returns the translate Y position in canvas as a flat array. * @param {*} obj the three object of parents * @param {*} y_deltas a memoized array with y deltas. * @returns