From 7140c7678386341c084549254aaadf9146f75935 Mon Sep 17 00:00:00 2001 From: Jonathan Fisher <49597360+jpfisher72@users.noreply.github.com> Date: Tue, 15 Aug 2023 07:44:34 -0700 Subject: [PATCH 1/3] Add mui/lab (#101) --- screen2.0/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/screen2.0/package.json b/screen2.0/package.json index c5a6bad6..3088bc8c 100644 --- a/screen2.0/package.json +++ b/screen2.0/package.json @@ -40,6 +40,7 @@ "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", "@mui/icons-material": "^5.14.3", + "@mui/lab": "^5.0.0-alpha.137", "@mui/material": "^5.14.2", "@types/node": "^20.4.9", "@types/react": "^18.2.19", From 37a8b3e89a7fe4899367d7e752b71839fb613250 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 09:33:00 -0400 Subject: [PATCH 2/3] Bump eslint from 8.46.0 to 8.47.0 in /screen2.0 (#94) * Bump eslint from 8.46.0 to 8.47.0 in /screen2.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.46.0 to 8.47.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.46.0...v8.47.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * retrigger checks --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jordan Velez-Bomba --- screen2.0/package.json | 2 +- screen2.0/yarn.lock | 161 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 142 insertions(+), 21 deletions(-) diff --git a/screen2.0/package.json b/screen2.0/package.json index 3088bc8c..ed47fb95 100644 --- a/screen2.0/package.json +++ b/screen2.0/package.json @@ -48,7 +48,7 @@ "@weng-lab/psychscreen-ui-components": "^0.7.8", "@weng-lab/ts-ztable": "^4.0.1", "autoprefixer": "10.4.14", - "eslint": "8.46.0", + "eslint": "8.47.0", "eslint-config-next": "13.4.10", "graphql": "^16.7.1", "jubilant-carnival": "^0.6.0", diff --git a/screen2.0/yarn.lock b/screen2.0/yarn.lock index d0cafcae..41adf601 100644 --- a/screen2.0/yarn.lock +++ b/screen2.0/yarn.lock @@ -312,9 +312,9 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.1.1": - version: 2.1.1 - resolution: "@eslint/eslintrc@npm:2.1.1" +"@eslint/eslintrc@npm:^2.1.2": + version: 2.1.2 + resolution: "@eslint/eslintrc@npm:2.1.2" dependencies: ajv: ^6.12.4 debug: ^4.3.2 @@ -325,14 +325,14 @@ __metadata: js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: bf909ea183d27238c257a82d4ffdec38ca94b906b4b8dfae02ecbe7ecc9e5a8182ef5e469c808bb8cb4fea4750f43ac4ca7c4b4a167b6cd7e3aaacd386b2bd25 + checksum: bc742a1e3b361f06fedb4afb6bf32cbd27171292ef7924f61c62f2aed73048367bcc7ac68f98c06d4245cd3fabc43270f844e3c1699936d4734b3ac5398814a7 languageName: node linkType: hard -"@eslint/js@npm:^8.46.0": - version: 8.46.0 - resolution: "@eslint/js@npm:8.46.0" - checksum: 7aed479832302882faf5bec37e9d068f270f84c19b3fb529646a7c1b031e73a312f730569c78806492bc09cfce3d7651dfab4ce09a56cbb06bc6469449e56377 +"@eslint/js@npm:^8.47.0": + version: 8.47.0 + resolution: "@eslint/js@npm:8.47.0" + checksum: 0ef57fe27b6d4c305b33f3b2d2fee1ab397a619006f1d6f4ce5ee4746b8f03d11a4e098805a7d78601ca534cf72917d37f0ac19896c992a32e26299ecb9f9de1 languageName: node linkType: hard @@ -450,6 +450,29 @@ __metadata: languageName: node linkType: hard +"@mui/base@npm:5.0.0-beta.11": + version: 5.0.0-beta.11 + resolution: "@mui/base@npm:5.0.0-beta.11" + dependencies: + "@babel/runtime": ^7.22.6 + "@emotion/is-prop-valid": ^1.2.1 + "@mui/types": ^7.2.4 + "@mui/utils": ^5.14.5 + "@popperjs/core": ^2.11.8 + clsx: ^2.0.0 + prop-types: ^15.8.1 + react-is: ^18.2.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 + checksum: 7a60421c427f3561d3e58abfa223a08ba6fc00e5587ff13c2ebbad52c3ea6bb45bdfa6e8a5cf673be4e90af0aef96b3253ec9098446ba94f5a414eb81e0c3d1a + languageName: node + linkType: hard + "@mui/base@npm:5.0.0-beta.7": version: 5.0.0-beta.7 resolution: "@mui/base@npm:5.0.0-beta.7" @@ -542,6 +565,36 @@ __metadata: languageName: node linkType: hard +"@mui/lab@npm:^5.0.0-alpha.137": + version: 5.0.0-alpha.140 + resolution: "@mui/lab@npm:5.0.0-alpha.140" + dependencies: + "@babel/runtime": ^7.22.6 + "@mui/base": 5.0.0-beta.11 + "@mui/system": ^5.14.5 + "@mui/types": ^7.2.4 + "@mui/utils": ^5.14.5 + clsx: ^2.0.0 + prop-types: ^15.8.1 + react-is: ^18.2.0 + peerDependencies: + "@emotion/react": ^11.5.0 + "@emotion/styled": ^11.3.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 + peerDependenciesMeta: + "@emotion/react": + optional: true + "@emotion/styled": + optional: true + "@types/react": + optional: true + checksum: 8eb8115b8def96b2a7da16dc4e5e80edd24ca9c0d62c450692668ac6eecd838fc7dd71e0b1a9b20575396f8c311518e6cc851f6c28b1690dff7fbb8e39a5dd63 + languageName: node + linkType: hard + "@mui/material@npm:^5.11.7": version: 5.14.0 resolution: "@mui/material@npm:5.14.0" @@ -625,6 +678,23 @@ __metadata: languageName: node linkType: hard +"@mui/private-theming@npm:^5.14.5": + version: 5.14.5 + resolution: "@mui/private-theming@npm:5.14.5" + dependencies: + "@babel/runtime": ^7.22.6 + "@mui/utils": ^5.14.5 + prop-types: ^15.8.1 + peerDependencies: + "@types/react": ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 0d42a858725ee52369689f51c5237cd7d296bf2af380954b7406b62f41a09c34820ac698e53475caf1115adb3849b346945fe2dd867d637be7ae182a84c92b56 + languageName: node + linkType: hard + "@mui/styled-engine@npm:^5.13.2": version: 5.13.2 resolution: "@mui/styled-engine@npm:5.13.2" @@ -702,6 +772,34 @@ __metadata: languageName: node linkType: hard +"@mui/system@npm:^5.14.5": + version: 5.14.5 + resolution: "@mui/system@npm:5.14.5" + dependencies: + "@babel/runtime": ^7.22.6 + "@mui/private-theming": ^5.14.5 + "@mui/styled-engine": ^5.13.2 + "@mui/types": ^7.2.4 + "@mui/utils": ^5.14.5 + clsx: ^2.0.0 + csstype: ^3.1.2 + prop-types: ^15.8.1 + peerDependencies: + "@emotion/react": ^11.5.0 + "@emotion/styled": ^11.3.0 + "@types/react": ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + "@emotion/react": + optional: true + "@emotion/styled": + optional: true + "@types/react": + optional: true + checksum: a177012914cf6f86af17e45e15ad489f5203ce5c055d40e77e5152ea0584fa01092c5b27fde956c8d7079b40d9ffd92270edf9c3a5249d4cd217b0dbccadd32d + languageName: node + linkType: hard + "@mui/types@npm:^7.2.4": version: 7.2.4 resolution: "@mui/types@npm:7.2.4" @@ -744,6 +842,21 @@ __metadata: languageName: node linkType: hard +"@mui/utils@npm:^5.14.5": + version: 5.14.5 + resolution: "@mui/utils@npm:5.14.5" + dependencies: + "@babel/runtime": ^7.22.6 + "@types/prop-types": ^15.7.5 + "@types/react-is": ^18.2.1 + prop-types: ^15.8.1 + react-is: ^18.2.0 + peerDependencies: + react: ^17.0.0 || ^18.0.0 + checksum: 7044d73ae41bdfd9c7c6287a3c1391ec4c5395c8f0092eac3ca4f1fd5359068fad29366f39d8072f68493eb5225399463935bbca266c879d630f8ebaa3db96d7 + languageName: node + linkType: hard + "@next/env@npm:13.4.12": version: 13.4.12 resolution: "@next/env@npm:13.4.12" @@ -2145,6 +2258,13 @@ __metadata: languageName: node linkType: hard +"clsx@npm:^2.0.0": + version: 2.0.0 + resolution: "clsx@npm:2.0.0" + checksum: a2cfb2351b254611acf92faa0daf15220f4cd648bdf96ce369d729813b85336993871a4bf6978ddea2b81b5a130478339c20d9d0b5c6fc287e5147f0c059276e + languageName: node + linkType: hard + "cluster-key-slot@npm:^1.1.0": version: 1.1.2 resolution: "cluster-key-slot@npm:1.1.2" @@ -3105,21 +3225,21 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.4.2": - version: 3.4.2 - resolution: "eslint-visitor-keys@npm:3.4.2" - checksum: 9e0e7e4aaea705c097ae37c97410e5f167d4d2193be2edcb1f0760762ede3df01545e4820ae314f42dcec687745f2c6dcaf6d83575c4a2a241eb0c8517d724f2 +"eslint-visitor-keys@npm:^3.4.3": + version: 3.4.3 + resolution: "eslint-visitor-keys@npm:3.4.3" + checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60 languageName: node linkType: hard -"eslint@npm:8.46.0": - version: 8.46.0 - resolution: "eslint@npm:8.46.0" +"eslint@npm:8.47.0": + version: 8.47.0 + resolution: "eslint@npm:8.47.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.6.1 - "@eslint/eslintrc": ^2.1.1 - "@eslint/js": ^8.46.0 + "@eslint/eslintrc": ^2.1.2 + "@eslint/js": ^8.47.0 "@humanwhocodes/config-array": ^0.11.10 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 @@ -3130,7 +3250,7 @@ __metadata: doctrine: ^3.0.0 escape-string-regexp: ^4.0.0 eslint-scope: ^7.2.2 - eslint-visitor-keys: ^3.4.2 + eslint-visitor-keys: ^3.4.3 espree: ^9.6.1 esquery: ^1.4.2 esutils: ^2.0.2 @@ -3155,7 +3275,7 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 7a7d36b1a3bbc12e08fbb5bc36fd482a7a5a1797e62e762499dd45601b9e45aaa53a129f31ce0b4444551a9639b8b681ad535f379893dd1e3ae37b31dccd82aa + checksum: 1988617f703eadc5c7540468d54dc8e5171cf2bb9483f6172799cd1ff54a9a5e4470f003784e8cef92687eaa14de37172732787040e67817581a20bcb9c15970 languageName: node linkType: hard @@ -6542,6 +6662,7 @@ __metadata: "@emotion/react": ^11.11.1 "@emotion/styled": ^11.11.0 "@mui/icons-material": ^5.14.3 + "@mui/lab": ^5.0.0-alpha.137 "@mui/material": ^5.14.2 "@types/node": ^20.4.9 "@types/react": ^18.2.19 @@ -6549,7 +6670,7 @@ __metadata: "@weng-lab/psychscreen-ui-components": ^0.7.8 "@weng-lab/ts-ztable": ^4.0.1 autoprefixer: 10.4.14 - eslint: 8.46.0 + eslint: 8.47.0 eslint-config-next: 13.4.10 file-loader: ^6.2.0 graphql: ^16.7.1 From 61d9c5cc234ddf3c4c45a3670a77da32f5bcfd9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 09:41:33 -0400 Subject: [PATCH 3/3] Bump @types/node from 20.4.9 to 20.5.0 in /screen2.0 (#96) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.4.9 to 20.5.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jordan <110398589+jordanvelezbomba@users.noreply.github.com> --- screen2.0/package.json | 2 +- screen2.0/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/screen2.0/package.json b/screen2.0/package.json index ed47fb95..5fd213f7 100644 --- a/screen2.0/package.json +++ b/screen2.0/package.json @@ -42,7 +42,7 @@ "@mui/icons-material": "^5.14.3", "@mui/lab": "^5.0.0-alpha.137", "@mui/material": "^5.14.2", - "@types/node": "^20.4.9", + "@types/node": "^20.5.0", "@types/react": "^18.2.19", "@types/react-dom": "18.2.7", "@weng-lab/psychscreen-ui-components": "^0.7.8", diff --git a/screen2.0/yarn.lock b/screen2.0/yarn.lock index 41adf601..6a818605 100644 --- a/screen2.0/yarn.lock +++ b/screen2.0/yarn.lock @@ -1094,10 +1094,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^20.4.9": - version: 20.4.9 - resolution: "@types/node@npm:20.4.9" - checksum: 504e3da96274f3865c1251830f4750bb0a8f6ef6f8648902cd3bba33370c5f219235471bfbf55cce726b25c8eacfcc8e2aad0ec3b13e27ea6708b00d4a9a46c8 +"@types/node@npm:^20.5.0": + version: 20.5.0 + resolution: "@types/node@npm:20.5.0" + checksum: 659bc5fc93b5c02bd88ca4bfae4f6b9dc307d45884d1dd9d69df85819a9943cdc00cd3c87eec3048866df6a67f52297f74d170e47a44f61edb3e8f770d94e85e languageName: node linkType: hard @@ -6664,7 +6664,7 @@ __metadata: "@mui/icons-material": ^5.14.3 "@mui/lab": ^5.0.0-alpha.137 "@mui/material": ^5.14.2 - "@types/node": ^20.4.9 + "@types/node": ^20.5.0 "@types/react": ^18.2.19 "@types/react-dom": 18.2.7 "@weng-lab/psychscreen-ui-components": ^0.7.8