From b3791d9e6b5c053841fa2cf1054326ad91be6dec Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Mon, 1 Jul 2024 18:11:27 +0000 Subject: [PATCH 1/3] chore: update mui --- site/package.json | 8 +- site/pnpm-lock.yaml | 203 ++++++++++++++++++++++---------------------- 2 files changed, 107 insertions(+), 104 deletions(-) diff --git a/site/package.json b/site/package.json index 22b8568339b83..70ce2a0840e43 100644 --- a/site/package.json +++ b/site/package.json @@ -40,10 +40,10 @@ "@fontsource/ibm-plex-mono": "5.0.5", "@monaco-editor/react": "4.6.0", "@mui/icons-material": "5.15.20", - "@mui/lab": "5.0.0-alpha.129", - "@mui/material": "5.14.0", - "@mui/system": "5.14.0", - "@mui/utils": "5.14.11", + "@mui/lab": "5.0.0-alpha.170", + "@mui/material": "5.15.21", + "@mui/system": "5.15.20", + "@mui/utils": "5.15.20", "@tanstack/react-query-devtools": "4.35.3", "@types/file-saver": "2.0.7", "ansi-to-html": "0.7.2", diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml index 0a6b2b14d40d5..852afaeb3fd90 100644 --- a/site/pnpm-lock.yaml +++ b/site/pnpm-lock.yaml @@ -38,19 +38,19 @@ dependencies: version: 4.6.0(monaco-editor@0.44.0)(react-dom@18.2.0)(react@18.2.0) '@mui/icons-material': specifier: 5.15.20 - version: 5.15.20(@mui/material@5.14.0)(@types/react@18.2.6)(react@18.2.0) + version: 5.15.20(@mui/material@5.15.21)(@types/react@18.2.6)(react@18.2.0) '@mui/lab': - specifier: 5.0.0-alpha.129 - version: 5.0.0-alpha.129(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/material@5.14.0)(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + specifier: 5.0.0-alpha.170 + version: 5.0.0-alpha.170(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/material@5.15.21)(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) '@mui/material': - specifier: 5.14.0 - version: 5.14.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + specifier: 5.15.21 + version: 5.15.21(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) '@mui/system': - specifier: 5.14.0 - version: 5.14.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react@18.2.0) + specifier: 5.15.20 + version: 5.15.20(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react@18.2.0) '@mui/utils': - specifier: 5.14.11 - version: 5.14.11(@types/react@18.2.6)(react@18.2.0) + specifier: 5.15.20 + version: 5.15.20(@types/react@18.2.6)(react@18.2.0) '@tanstack/react-query-devtools': specifier: 4.35.3 version: 4.35.3(@tanstack/react-query@4.35.3)(react-dom@18.2.0)(react@18.2.0) @@ -2277,13 +2277,6 @@ packages: dependencies: regenerator-runtime: 0.13.11 - /@babel/runtime@7.23.1: - resolution: {integrity: sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==} - engines: {node: '>=6.9.0'} - dependencies: - regenerator-runtime: 0.14.0 - dev: false - /@babel/runtime@7.23.2: resolution: {integrity: sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==} engines: {node: '>=6.9.0'} @@ -2827,6 +2820,34 @@ packages: tslib: 2.6.1 dev: false + /@floating-ui/core@1.6.4: + resolution: {integrity: sha512-a4IowK4QkXl4SCWTGUR0INAfEOX3wtsYw3rKK5InQEHMGObkR8Xk44qYQD9P4r6HHw0iIfK6GUKECmY8sTkqRA==} + dependencies: + '@floating-ui/utils': 0.2.4 + dev: false + + /@floating-ui/dom@1.6.7: + resolution: {integrity: sha512-wmVfPG5o2xnKDU4jx/m4w5qva9FWHcnZ8BvzEe90D/RpwsJaTAVYPEPdQ8sbr/N8zZTAHlZUTQdqg8ZUbzHmng==} + dependencies: + '@floating-ui/core': 1.6.4 + '@floating-ui/utils': 0.2.4 + dev: false + + /@floating-ui/react-dom@2.1.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-4h84MJt3CHrtG18mGsXuLCHMrug49d7DFkU0RMIyshRveBeyV2hmV/pDaF2Uxtu8kgq5r46llp5E5FQiR0K2Yg==} + peerDependencies: + react: '>=16.8.0' + react-dom: '>=16.8.0' + dependencies: + '@floating-ui/dom': 1.6.7 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: false + + /@floating-ui/utils@0.2.4: + resolution: {integrity: sha512-dWO2pw8hhi+WrXq1YJy2yCuWoL20PddgGaqTgVe4cOS9Q6qklXCiA1tJEqX6BEwRNSCP84/afac9hd4MS+zEUA==} + dev: false + /@fontsource-variable/inter@5.0.15: resolution: {integrity: sha512-CdQPQQgOVxg6ifmbrqYZeUqtQf7p2wPn6EvJ4M+vdNnsmYZgYwPPPQDNlIOU7LCUlSGaN26v6H0uA030WKn61g==} dev: false @@ -3305,32 +3326,8 @@ packages: strict-event-emitter: 0.5.1 dev: true - /@mui/base@5.0.0-alpha.128(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-wub3wxNN+hUp8hzilMlXX3sZrPo75vsy1cXEQpqdTfIFlE9HprP1jlulFiPg5tfPst2OKmygXr2hhmgvAKRrzQ==} - engines: {node: '>=12.0.0'} - peerDependencies: - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - react-dom: ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - dependencies: - '@babel/runtime': 7.24.7 - '@emotion/is-prop-valid': 1.2.1 - '@mui/types': 7.2.4(@types/react@18.2.6) - '@mui/utils': 5.14.11(@types/react@18.2.6)(react@18.2.0) - '@popperjs/core': 2.11.8 - '@types/react': 18.2.6 - clsx: 1.2.1 - prop-types: 15.8.1 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - react-is: 18.2.0 - dev: false - - /@mui/base@5.0.0-beta.7(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-Pjbwm6gjiS96kOMF7E5fjEJsenc0tZBesrLQ4rrdi3eT/c/yhSWnPbCUkHSz8bnS0l3/VQ8bA+oERSGSV2PK6A==} + /@mui/base@5.0.0-beta.40(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -3341,23 +3338,22 @@ packages: optional: true dependencies: '@babel/runtime': 7.24.7 - '@emotion/is-prop-valid': 1.2.1 - '@mui/types': 7.2.4(@types/react@18.2.6) - '@mui/utils': 5.14.11(@types/react@18.2.6)(react@18.2.0) + '@floating-ui/react-dom': 2.1.1(react-dom@18.2.0)(react@18.2.0) + '@mui/types': 7.2.14(@types/react@18.2.6) + '@mui/utils': 5.15.20(@types/react@18.2.6)(react@18.2.0) '@popperjs/core': 2.11.8 '@types/react': 18.2.6 - clsx: 1.2.1 + clsx: 2.1.1 prop-types: 15.8.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-is: 18.2.0 dev: false - /@mui/core-downloads-tracker@5.14.2: - resolution: {integrity: sha512-x+c/MgDL1t/IIy5lDbMlrDouFG5DYZbl3DP4dbbuhlpPFBnE9glYwmJEee/orVHQpOPwLxCAIWQs+2DKSaBVWQ==} + /@mui/core-downloads-tracker@5.15.21: + resolution: {integrity: sha512-dp9lXBaJZzJYeJfQY3Ow4Rb49QaCEdkl2KKYscdQHQm6bMJ+l4XPY3Cd9PCeeJTsHPIDJ60lzXbeRgs6sx/rpw==} dev: false - /@mui/icons-material@5.15.20(@mui/material@5.14.0)(@types/react@18.2.6)(react@18.2.0): + /@mui/icons-material@5.15.20(@mui/material@5.15.21)(@types/react@18.2.6)(react@18.2.0): resolution: {integrity: sha512-oGcKmCuHaYbAAoLN67WKSXtHmEgyWcJToT1uRtmPyxMj9N5uqwc/mRtEnst4Wj/eGr+zYH2FiZQ79v9k7kSk1Q==} engines: {node: '>=12.0.0'} peerDependencies: @@ -3369,18 +3365,18 @@ packages: optional: true dependencies: '@babel/runtime': 7.24.7 - '@mui/material': 5.14.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@mui/material': 5.15.21(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) '@types/react': 18.2.6 react: 18.2.0 dev: false - /@mui/lab@5.0.0-alpha.129(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/material@5.14.0)(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-niv2mFgSTgdrRJXbWoX9pIivhe80BaFXfdWajXe1bS8VYH3Y5WyJpk8KiU3rbHyJswbFEGd8N6EBBrq11X8yMA==} + /@mui/lab@5.0.0-alpha.170(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/material@5.15.21)(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-0bDVECGmrNjd3+bLdcLiwYZ0O4HP5j5WSQm5DV6iA/Z9kr8O6AnvZ1bv9ImQbbX7Gj3pX4o43EKwCutj3EQxQg==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 - '@mui/material': ^5.0.0 + '@mui/material': '>=5.15.0' '@types/react': ^17.0.0 || ^18.0.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 @@ -3392,24 +3388,23 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.22.6 + '@babel/runtime': 7.24.7 '@emotion/react': 11.11.1(@types/react@18.2.6)(react@18.2.0) '@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.2.6)(react@18.2.0) - '@mui/base': 5.0.0-alpha.128(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) - '@mui/material': 5.14.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) - '@mui/system': 5.14.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react@18.2.0) - '@mui/types': 7.2.4(@types/react@18.2.6) - '@mui/utils': 5.14.11(@types/react@18.2.6)(react@18.2.0) + '@mui/base': 5.0.0-beta.40(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@mui/material': 5.15.21(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@mui/system': 5.15.20(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react@18.2.0) + '@mui/types': 7.2.14(@types/react@18.2.6) + '@mui/utils': 5.15.20(@types/react@18.2.6)(react@18.2.0) '@types/react': 18.2.6 - clsx: 1.2.1 + clsx: 2.1.1 prop-types: 15.8.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-is: 18.2.0 dev: false - /@mui/material@5.14.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-HP7CP71NhMkui2HUIEKl2/JfuHMuoarSUWAKlNw6s17bl/Num9rN61EM6uUzc2A2zHjj/00A66GnvDnmixEJEw==} + /@mui/material@5.15.21(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-nTyCcgduKwHqiuQ/B03EQUa+utSMzn2sQp0QAibsnYe4tvc3zkMbO0amKpl48vhABIY3IvT6w9615BFIgMt0YA==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -3425,18 +3420,18 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.22.6 + '@babel/runtime': 7.24.7 '@emotion/react': 11.11.1(@types/react@18.2.6)(react@18.2.0) '@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.2.6)(react@18.2.0) - '@mui/base': 5.0.0-beta.7(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) - '@mui/core-downloads-tracker': 5.14.2 - '@mui/system': 5.14.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react@18.2.0) - '@mui/types': 7.2.4(@types/react@18.2.6) - '@mui/utils': 5.14.11(@types/react@18.2.6)(react@18.2.0) + '@mui/base': 5.0.0-beta.40(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@mui/core-downloads-tracker': 5.15.21 + '@mui/system': 5.15.20(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react@18.2.0) + '@mui/types': 7.2.14(@types/react@18.2.6) + '@mui/utils': 5.15.20(@types/react@18.2.6)(react@18.2.0) '@types/react': 18.2.6 - '@types/react-transition-group': 4.4.6 - clsx: 1.2.1 - csstype: 3.1.2 + '@types/react-transition-group': 4.4.10 + clsx: 2.1.1 + csstype: 3.1.3 prop-types: 15.8.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -3444,8 +3439,8 @@ packages: react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0) dev: false - /@mui/private-theming@5.13.7(@types/react@18.2.6)(react@18.2.0): - resolution: {integrity: sha512-qbSr+udcij5F9dKhGX7fEdx2drXchq7htLNr2Qg2Ma+WJ6q0ERlEqGSBiPiVDJkptcjeVL4DGmcf1wl5+vD4EA==} + /@mui/private-theming@5.15.20(@types/react@18.2.6)(react@18.2.0): + resolution: {integrity: sha512-BK8F94AIqSrnaPYXf2KAOjGZJgWfvqAVQ2gVR3EryvQFtuBnG6RwodxrCvd3B48VuMy6Wsk897+lQMUxJyk+6g==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -3455,14 +3450,14 @@ packages: optional: true dependencies: '@babel/runtime': 7.24.7 - '@mui/utils': 5.14.11(@types/react@18.2.6)(react@18.2.0) + '@mui/utils': 5.15.20(@types/react@18.2.6)(react@18.2.0) '@types/react': 18.2.6 prop-types: 15.8.1 react: 18.2.0 dev: false - /@mui/styled-engine@5.13.2(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0): - resolution: {integrity: sha512-VCYCU6xVtXOrIN8lcbuPmoG+u7FYuOERG++fpY74hPpEWkyFQG97F+/XfTQVYzlR2m7nPjnwVUgATcTCMEaMvw==} + /@mui/styled-engine@5.15.14(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0): + resolution: {integrity: sha512-RILkuVD8gY6PvjZjqnWhz8fu68dVkqhM5+jYWfB5yhlSQKg+2rHkmEwm75XIeAqI3qwOndK6zELK5H6Zxn4NHw==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.4.1 @@ -3478,13 +3473,13 @@ packages: '@emotion/cache': 11.11.0 '@emotion/react': 11.11.1(@types/react@18.2.6)(react@18.2.0) '@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.2.6)(react@18.2.0) - csstype: 3.1.2 + csstype: 3.1.3 prop-types: 15.8.1 react: 18.2.0 dev: false - /@mui/system@5.14.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react@18.2.0): - resolution: {integrity: sha512-0HZGkX8miJbiNw+rjlZ9l0Cfkz1bSqfSHQH0EH9J+nx0aAm5cBleg9piOlLdCNIWGgecCqsw4x62erGrGjjcJg==} + /@mui/system@5.15.20(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.6)(react@18.2.0): + resolution: {integrity: sha512-LoMq4IlAAhxzL2VNUDBTQxAb4chnBe8JvRINVNDiMtHE2PiPOoHlhOPutSxEbaL5mkECPVWSv6p8JEV+uykwIA==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -3499,24 +3494,24 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.22.6 + '@babel/runtime': 7.24.7 '@emotion/react': 11.11.1(@types/react@18.2.6)(react@18.2.0) '@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.2.6)(react@18.2.0) - '@mui/private-theming': 5.13.7(@types/react@18.2.6)(react@18.2.0) - '@mui/styled-engine': 5.13.2(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0) - '@mui/types': 7.2.4(@types/react@18.2.6) - '@mui/utils': 5.14.11(@types/react@18.2.6)(react@18.2.0) + '@mui/private-theming': 5.15.20(@types/react@18.2.6)(react@18.2.0) + '@mui/styled-engine': 5.15.14(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0) + '@mui/types': 7.2.14(@types/react@18.2.6) + '@mui/utils': 5.15.20(@types/react@18.2.6)(react@18.2.0) '@types/react': 18.2.6 - clsx: 1.2.1 - csstype: 3.1.2 + clsx: 2.1.1 + csstype: 3.1.3 prop-types: 15.8.1 react: 18.2.0 dev: false - /@mui/types@7.2.4(@types/react@18.2.6): - resolution: {integrity: sha512-LBcwa8rN84bKF+f5sDyku42w1NTxaPgPyYKODsh01U1fVstTClbUoSA96oyRBnSNyEiAVjKm6Gwx9vjR+xyqHA==} + /@mui/types@7.2.14(@types/react@18.2.6): + resolution: {integrity: sha512-MZsBZ4q4HfzBsywtXgM1Ksj6HDThtiwmOKUXH1pKYISI9gAVXCNHNpo7TlGoGrBaYWZTdNoirIN7JsQcQUjmQQ==} peerDependencies: - '@types/react': '*' + '@types/react': ^17.0.0 || ^18.0.0 peerDependenciesMeta: '@types/react': optional: true @@ -3524,8 +3519,8 @@ packages: '@types/react': 18.2.6 dev: false - /@mui/utils@5.14.11(@types/react@18.2.6)(react@18.2.0): - resolution: {integrity: sha512-fmkIiCPKyDssYrJ5qk+dime1nlO3dmWfCtaPY/uVBqCRMBZ11JhddB9m8sjI2mgqQQwRJG5bq3biaosNdU/s4Q==} + /@mui/utils@5.15.20(@types/react@18.2.6)(react@18.2.0): + resolution: {integrity: sha512-mAbYx0sovrnpAu1zHc3MDIhPqL8RPVC5W5xcO1b7PiSCJPtckIZmBkp8hefamAvUiAV8gpfMOM6Zb+eSisbI2A==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -3534,8 +3529,8 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.1 - '@types/prop-types': 15.7.5 + '@babel/runtime': 7.24.7 + '@types/prop-types': 15.7.12 '@types/react': 18.2.6 prop-types: 15.8.1 react: 18.2.0 @@ -5533,6 +5528,10 @@ packages: resolution: {integrity: sha512-nj39q0wAIdhwn7DGUyT9irmsKK1tV0bd5WFEhgpqNTMFZ8cE+jieuTphCW0tfdm47S2zVT5mr09B28b1chmQMA==} dev: true + /@types/prop-types@15.7.12: + resolution: {integrity: sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==} + dev: false + /@types/prop-types@15.7.5: resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==} @@ -5580,8 +5579,8 @@ packages: '@types/react': 18.2.6 dev: true - /@types/react-transition-group@4.4.6: - resolution: {integrity: sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==} + /@types/react-transition-group@4.4.10: + resolution: {integrity: sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==} dependencies: '@types/react': 18.2.6 dev: false @@ -6871,8 +6870,8 @@ packages: engines: {node: '>=0.8'} dev: true - /clsx@1.2.1: - resolution: {integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==} + /clsx@2.1.1: + resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==} engines: {node: '>=6'} dev: false @@ -7149,6 +7148,10 @@ packages: /csstype@3.1.2: resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==} + /csstype@3.1.3: + resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} + dev: false + /damerau-levenshtein@1.0.8: resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==} dev: true @@ -7428,7 +7431,7 @@ packages: resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==} dependencies: '@babel/runtime': 7.24.7 - csstype: 3.1.2 + csstype: 3.1.3 dev: false /dom-walk@0.1.2: From 6151e8077cd247f5d69cc992971c1b4aa8be11ed Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Tue, 2 Jul 2024 16:50:00 +0000 Subject: [PATCH 2/3] oh boy --- site/package.json | 5 +-- site/pnpm-lock.yaml | 74 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/site/package.json b/site/package.json index 8da5e1102bae2..bffe1092430da 100644 --- a/site/package.json +++ b/site/package.json @@ -40,17 +40,18 @@ "@fontsource/ibm-plex-mono": "5.0.5", "@monaco-editor/react": "4.6.0", "@mui/icons-material": "5.15.20", - "@mui/lab": "5.0.0-alpha.170", + "@mui/lab": "5.0.0-alpha.129", "@mui/material": "5.15.21", "@mui/system": "5.15.20", "@mui/utils": "5.15.20", + "@mui/x-tree-view": "7.8.0", "@tanstack/react-query-devtools": "4.35.3", - "@xterm/xterm": "5.5.0", "@xterm/addon-canvas": "0.7.0", "@xterm/addon-fit": "0.10.0", "@xterm/addon-unicode11": "0.8.0", "@xterm/addon-web-links": "0.11.0", "@xterm/addon-webgl": "0.18.0", + "@xterm/xterm": "5.5.0", "ansi-to-html": "0.7.2", "axios": "1.6.0", "canvas": "2.11.0", diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml index d64951b749706..8e594ad402352 100644 --- a/site/pnpm-lock.yaml +++ b/site/pnpm-lock.yaml @@ -40,8 +40,8 @@ dependencies: specifier: 5.15.20 version: 5.15.20(@mui/material@5.15.21)(@types/react@18.2.6)(react@18.3.1) '@mui/lab': - specifier: 5.0.0-alpha.170 - version: 5.0.0-alpha.170(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@mui/material@5.15.21)(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1) + specifier: 5.0.0-alpha.129 + version: 5.0.0-alpha.129(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@mui/material@5.15.21)(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1) '@mui/material': specifier: 5.15.21 version: 5.15.21(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1) @@ -51,6 +51,9 @@ dependencies: '@mui/utils': specifier: 5.15.20 version: 5.15.20(@types/react@18.2.6)(react@18.3.1) + '@mui/x-tree-view': + specifier: 7.8.0 + version: 7.8.0(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@mui/material@5.15.21)(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1) '@tanstack/react-query-devtools': specifier: 4.35.3 version: 4.35.3(@tanstack/react-query@4.35.3)(react-dom@18.3.1)(react@18.3.1) @@ -3348,6 +3351,30 @@ packages: strict-event-emitter: 0.5.1 dev: true + /@mui/base@5.0.0-alpha.128(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-wub3wxNN+hUp8hzilMlXX3sZrPo75vsy1cXEQpqdTfIFlE9HprP1jlulFiPg5tfPst2OKmygXr2hhmgvAKRrzQ==} + engines: {node: '>=12.0.0'} + peerDependencies: + '@types/react': ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 + react-dom: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@types/react': + optional: true + dependencies: + '@babel/runtime': 7.24.7 + '@emotion/is-prop-valid': 1.2.2 + '@mui/types': 7.2.14(@types/react@18.2.6) + '@mui/utils': 5.15.20(@types/react@18.2.6)(react@18.3.1) + '@popperjs/core': 2.11.8 + '@types/react': 18.2.6 + clsx: 1.2.1 + prop-types: 15.8.1 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + react-is: 18.2.0 + dev: false + /@mui/base@5.0.0-beta.40(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==} engines: {node: '>=12.0.0'} @@ -3392,13 +3419,13 @@ packages: react: 18.3.1 dev: false - /@mui/lab@5.0.0-alpha.170(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@mui/material@5.15.21)(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1): - resolution: {integrity: sha512-0bDVECGmrNjd3+bLdcLiwYZ0O4HP5j5WSQm5DV6iA/Z9kr8O6AnvZ1bv9ImQbbX7Gj3pX4o43EKwCutj3EQxQg==} + /@mui/lab@5.0.0-alpha.129(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@mui/material@5.15.21)(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-niv2mFgSTgdrRJXbWoX9pIivhe80BaFXfdWajXe1bS8VYH3Y5WyJpk8KiU3rbHyJswbFEGd8N6EBBrq11X8yMA==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 - '@mui/material': '>=5.15.0' + '@mui/material': ^5.0.0 '@types/react': ^17.0.0 || ^18.0.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 @@ -3413,16 +3440,17 @@ packages: '@babel/runtime': 7.24.7 '@emotion/react': 11.11.4(@types/react@18.2.6)(react@18.3.1) '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.6)(react@18.3.1) - '@mui/base': 5.0.0-beta.40(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1) + '@mui/base': 5.0.0-alpha.128(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1) '@mui/material': 5.15.21(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1) '@mui/system': 5.15.20(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.6)(react@18.3.1) '@mui/types': 7.2.14(@types/react@18.2.6) '@mui/utils': 5.15.20(@types/react@18.2.6)(react@18.3.1) '@types/react': 18.2.6 - clsx: 2.1.1 + clsx: 1.2.1 prop-types: 15.8.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) + react-is: 18.2.0 dev: false /@mui/material@5.15.21(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1): @@ -3559,6 +3587,33 @@ packages: react-is: 18.2.0 dev: false + /@mui/x-tree-view@7.8.0(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@mui/material@5.15.21)(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-+Kc4SSWNFe53ozCXprizNcRIUiYc/iBceFMJZJJcOQGqsQVnH3Y7uUx2dUgO4AMp4EQR3zUW+bjE8fqhBQcK9Q==} + engines: {node: '>=14.0.0'} + peerDependencies: + '@emotion/react': ^11.9.0 + '@emotion/styled': ^11.8.1 + '@mui/material': ^5.15.14 + react: ^17.0.0 || ^18.0.0 + react-dom: ^17.0.0 || ^18.0.0 + dependencies: + '@babel/runtime': 7.24.7 + '@emotion/react': 11.11.4(@types/react@18.2.6)(react@18.3.1) + '@emotion/styled': 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.6)(react@18.3.1) + '@mui/base': 5.0.0-beta.40(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1) + '@mui/material': 5.15.21(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.6)(react-dom@18.3.1)(react@18.3.1) + '@mui/system': 5.15.20(@emotion/react@11.11.4)(@emotion/styled@11.11.5)(@types/react@18.2.6)(react@18.3.1) + '@mui/utils': 5.15.20(@types/react@18.2.6)(react@18.3.1) + '@types/react-transition-group': 4.4.10 + clsx: 2.1.1 + prop-types: 15.8.1 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + react-transition-group: 4.4.5(react-dom@18.3.1)(react@18.3.1) + transitivePeerDependencies: + - '@types/react' + dev: false + /@ndelangen/get-tarball@3.0.9: resolution: {integrity: sha512-9JKTEik4vq+yGosHYhZ1tiH/3WpUS0Nh0kej4Agndhox8pAdWhEx5knFVRcb/ya9knCRCs1rPxNrSXTDdfVqpA==} dependencies: @@ -6956,6 +7011,11 @@ packages: engines: {node: '>=0.8'} dev: true + /clsx@1.2.1: + resolution: {integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==} + engines: {node: '>=6'} + dev: false + /clsx@2.1.1: resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==} engines: {node: '>=6'} From 8064232f13c5dfa62463ae6cd22fc6694f507c32 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Tue, 2 Jul 2024 16:58:56 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=A7=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site/src/modules/resources/AppLink/AppLink.tsx | 5 ++--- site/src/modules/resources/TerminalLink/TerminalLink.tsx | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/site/src/modules/resources/AppLink/AppLink.tsx b/site/src/modules/resources/AppLink/AppLink.tsx index 4e823bdc9acb4..db7b86b43286b 100644 --- a/site/src/modules/resources/AppLink/AppLink.tsx +++ b/site/src/modules/resources/AppLink/AppLink.tsx @@ -3,7 +3,7 @@ import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline"; import CircularProgress from "@mui/material/CircularProgress"; import Link from "@mui/material/Link"; import Tooltip from "@mui/material/Tooltip"; -import { type FC, useState } from "react"; +import { type FC, type MouseEvent, useState } from "react"; import { API } from "api/api"; import type * as TypesGen from "api/typesGenerated"; import { useProxy } from "contexts/ProxyContext"; @@ -119,12 +119,11 @@ export const AppLink: FC = ({ app, workspace, agent }) => { endIcon={isPrivateApp ? undefined : } disabled={!canClick} href={href} - target="_blank" css={{ pointerEvents: canClick ? undefined : "none", textDecoration: "none !important", }} - onClick={async (event) => { + onClick={async (event: MouseEvent) => { if (!canClick) { return; } diff --git a/site/src/modules/resources/TerminalLink/TerminalLink.tsx b/site/src/modules/resources/TerminalLink/TerminalLink.tsx index 370c5fe1d6550..c1825dedced47 100644 --- a/site/src/modules/resources/TerminalLink/TerminalLink.tsx +++ b/site/src/modules/resources/TerminalLink/TerminalLink.tsx @@ -1,5 +1,5 @@ import Link from "@mui/material/Link"; -import type { FC } from "react"; +import type { FC, MouseEvent } from "react"; import type * as TypesGen from "api/typesGenerated"; import { TerminalIcon } from "components/Icons/TerminalIcon"; import { generateRandomString } from "utils/random"; @@ -40,8 +40,7 @@ export const TerminalLink: FC = ({ component={AgentButton} startIcon={} href={href} - target="_blank" - onClick={(event) => { + onClick={(event: MouseEvent) => { event.preventDefault(); window.open( href,