Skip to content

Commit

Permalink
Merge branch 'main' into genomebrowser
Browse files Browse the repository at this point in the history
  • Loading branch information
@jordanvelezbomba
jordanvelezbomba authored Aug 18, 2023
2 parents bc83282 + 2fb819d commit 4f9939f
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 68 deletions.
6 changes: 3 additions & 3 deletions screen2.0/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@
"@mui/lab": "^5.0.0-alpha.137",
"@mui/material": "^5.14.2",
"@types/node": "^20.5.0",
"@types/react": "^18.2.19",
"@types/react": "^18.2.20",
"@types/react-dom": "18.2.7",
"@weng-lab/psychscreen-ui-components": "^0.7.8",
"@weng-lab/ts-ztable": "^4.0.1",
"autoprefixer": "10.4.14",
"autoprefixer": "10.4.15",
"eslint": "8.47.0",
"eslint-config-next": "13.4.10",
"graphql": "^16.7.1",
"jubilant-carnival": "^0.6.0",
"next": "13.4.12",
"next": "13.4.18",
"normalize.css": "^8.0.1",
"only": "^0.0.2",
"postcss": "8.4.27",
Expand Down
155 changes: 90 additions & 65 deletions screen2.0/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -857,10 +857,10 @@ __metadata:
languageName: node
linkType: hard

"@next/env@npm:13.4.12":
version: 13.4.12
resolution: "@next/env@npm:13.4.12"
checksum: 2ccb2e271b3c42697c1e807cdf988429fcb563f80fa0ca72512f65f47cbbcc46c44fc53bf055814d4b467f1394de8c1a1ef6aad14d35f9993004faa956466d02
"@next/env@npm:13.4.18":
version: 13.4.18
resolution: "@next/env@npm:13.4.18"
checksum: 7e9361df74d9dd3a9f691ba4f950fec68de0b0e392f7751dab3039ccea74261060440a6bb1b7e4f093ed2d8d0530fa51852285469eff2c9dc9c432e9a6a7f936
languageName: node
linkType: hard

Expand All @@ -873,65 +873,65 @@ __metadata:
languageName: node
linkType: hard

"@next/swc-darwin-arm64@npm:13.4.12":
version: 13.4.12
resolution: "@next/swc-darwin-arm64@npm:13.4.12"
"@next/swc-darwin-arm64@npm:13.4.18":
version: 13.4.18
resolution: "@next/swc-darwin-arm64@npm:13.4.18"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"@next/swc-darwin-x64@npm:13.4.12":
version: 13.4.12
resolution: "@next/swc-darwin-x64@npm:13.4.12"
"@next/swc-darwin-x64@npm:13.4.18":
version: 13.4.18
resolution: "@next/swc-darwin-x64@npm:13.4.18"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"@next/swc-linux-arm64-gnu@npm:13.4.12":
version: 13.4.12
resolution: "@next/swc-linux-arm64-gnu@npm:13.4.12"
"@next/swc-linux-arm64-gnu@npm:13.4.18":
version: 13.4.18
resolution: "@next/swc-linux-arm64-gnu@npm:13.4.18"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard

"@next/swc-linux-arm64-musl@npm:13.4.12":
version: 13.4.12
resolution: "@next/swc-linux-arm64-musl@npm:13.4.12"
"@next/swc-linux-arm64-musl@npm:13.4.18":
version: 13.4.18
resolution: "@next/swc-linux-arm64-musl@npm:13.4.18"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard

"@next/swc-linux-x64-gnu@npm:13.4.12":
version: 13.4.12
resolution: "@next/swc-linux-x64-gnu@npm:13.4.12"
"@next/swc-linux-x64-gnu@npm:13.4.18":
version: 13.4.18
resolution: "@next/swc-linux-x64-gnu@npm:13.4.18"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard

"@next/swc-linux-x64-musl@npm:13.4.12":
version: 13.4.12
resolution: "@next/swc-linux-x64-musl@npm:13.4.12"
"@next/swc-linux-x64-musl@npm:13.4.18":
version: 13.4.18
resolution: "@next/swc-linux-x64-musl@npm:13.4.18"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard

"@next/swc-win32-arm64-msvc@npm:13.4.12":
version: 13.4.12
resolution: "@next/swc-win32-arm64-msvc@npm:13.4.12"
"@next/swc-win32-arm64-msvc@npm:13.4.18":
version: 13.4.18
resolution: "@next/swc-win32-arm64-msvc@npm:13.4.18"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"@next/swc-win32-ia32-msvc@npm:13.4.12":
version: 13.4.12
resolution: "@next/swc-win32-ia32-msvc@npm:13.4.12"
"@next/swc-win32-ia32-msvc@npm:13.4.18":
version: 13.4.18
resolution: "@next/swc-win32-ia32-msvc@npm:13.4.18"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard

"@next/swc-win32-x64-msvc@npm:13.4.12":
version: 13.4.12
resolution: "@next/swc-win32-x64-msvc@npm:13.4.12"
"@next/swc-win32-x64-msvc@npm:13.4.18":
version: 13.4.18
resolution: "@next/swc-win32-x64-msvc@npm:13.4.18"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
Expand Down Expand Up @@ -1153,14 +1153,14 @@ __metadata:
languageName: node
linkType: hard

"@types/react@npm:^18.2.19":
version: 18.2.19
resolution: "@types/react@npm:18.2.19"
"@types/react@npm:^18.2.20":
version: 18.2.20
resolution: "@types/react@npm:18.2.20"
dependencies:
"@types/prop-types": "*"
"@types/scheduler": "*"
csstype: ^3.0.2
checksum: 1ef657b90c7413451bbac2fd2fbce4f8a093941bc5041d344ab9833bc113c8eebf6318dae8aeeb1a0f922f15bc772507e6aaa0c7b51847b5f7302921c8dd6740
checksum: 30f699c60e5e4bfef273ce64d320651cdd60f5c6a08361c6c7eca8cebcccda1ac953d2ee57c9f321b5ae87f8a62c72b6d35ca42df0e261d337849952daab2141
languageName: node
linkType: hard

Expand Down Expand Up @@ -1801,12 +1801,12 @@ __metadata:
languageName: node
linkType: hard

"autoprefixer@npm:10.4.14":
version: 10.4.14
resolution: "autoprefixer@npm:10.4.14"
"autoprefixer@npm:10.4.15":
version: 10.4.15
resolution: "autoprefixer@npm:10.4.15"
dependencies:
browserslist: ^4.21.5
caniuse-lite: ^1.0.30001464
browserslist: ^4.21.10
caniuse-lite: ^1.0.30001520
fraction.js: ^4.2.0
normalize-range: ^0.1.2
picocolors: ^1.0.0
Expand All @@ -1815,7 +1815,7 @@ __metadata:
postcss: ^8.1.0
bin:
autoprefixer: bin/autoprefixer
checksum: e9f18e664a4e4a54a8f4ec5f6b49ed228ec45afaa76efcae361c93721795dc5ab644f36d2fdfc0dea446b02a8067b9372f91542ea431994399e972781ed46d95
checksum: d490b14fb098c043e109fc13cd23628f146af99a493d35b9df3a26f8ec0b4dd8937c5601cdbaeb465b98ea31d3ea05aa7184711d4d93dfb52358d073dcb67032
languageName: node
linkType: hard

Expand Down Expand Up @@ -2006,7 +2006,7 @@ __metadata:
languageName: node
linkType: hard

"browserslist@npm:^4.14.5, browserslist@npm:^4.21.5":
"browserslist@npm:^4.14.5":
version: 4.21.9
resolution: "browserslist@npm:4.21.9"
dependencies:
Expand All @@ -2020,6 +2020,20 @@ __metadata:
languageName: node
linkType: hard

"browserslist@npm:^4.21.10":
version: 4.21.10
resolution: "browserslist@npm:4.21.10"
dependencies:
caniuse-lite: ^1.0.30001517
electron-to-chromium: ^1.4.477
node-releases: ^2.0.13
update-browserslist-db: ^1.0.11
bin:
browserslist: cli.js
checksum: 1e27c0f111a35d1dd0e8fc2c61781b0daefabc2c9471b0b10537ce54843014bceb2a1ce4571af1a82b2bf1e6e6e05d38865916689a158f03bc2c7a4ec2577db8
languageName: node
linkType: hard

"buffer-from@npm:^1.0.0":
version: 1.1.2
resolution: "buffer-from@npm:1.1.2"
Expand Down Expand Up @@ -2113,13 +2127,20 @@ __metadata:
languageName: node
linkType: hard

"caniuse-lite@npm:^1.0.30001406, caniuse-lite@npm:^1.0.30001464, caniuse-lite@npm:^1.0.30001503":
"caniuse-lite@npm:^1.0.30001406, caniuse-lite@npm:^1.0.30001503":
version: 1.0.30001515
resolution: "caniuse-lite@npm:1.0.30001515"
checksum: ec5d51785aea6af5cf62ca9d35821d36ab7fa0f85e3e7f752d532025ad59e07131fa3cb3a0a6c486b5ac8620c8c3440e761dc5b38c990d49c17655906f216123
languageName: node
linkType: hard

"caniuse-lite@npm:^1.0.30001517, caniuse-lite@npm:^1.0.30001520":
version: 1.0.30001521
resolution: "caniuse-lite@npm:1.0.30001521"
checksum: be2a2b2cd3be03401887aaa31b89f3e7c6230289e6ef704e224268389cc136480fca502ac9e5001a65ff1e50459d3d95f8c4b2d39f878ab9843af3d6f372c8bb
languageName: node
linkType: hard

"chalk@npm:5.2.0":
version: 5.2.0
resolution: "chalk@npm:5.2.0"
Expand Down Expand Up @@ -2826,6 +2847,13 @@ __metadata:
languageName: node
linkType: hard

"electron-to-chromium@npm:^1.4.477":
version: 1.4.495
resolution: "electron-to-chromium@npm:1.4.495"
checksum: b076b1f5ef61f45ca03f4dce47ec280c705405b0cfd3741cc791ef0172a73122846bdf4bddddc4120dece693166e17fe0d6efc847664ecc5852fbec4df9c3153
languageName: node
linkType: hard

"emoji-regex@npm:^8.0.0":
version: 8.0.0
resolution: "emoji-regex@npm:8.0.0"
Expand Down Expand Up @@ -5295,20 +5323,20 @@ __metadata:
languageName: node
linkType: hard

"next@npm:13.4.12":
version: 13.4.12
resolution: "next@npm:13.4.12"
"next@npm:13.4.18":
version: 13.4.18
resolution: "next@npm:13.4.18"
dependencies:
"@next/env": 13.4.12
"@next/swc-darwin-arm64": 13.4.12
"@next/swc-darwin-x64": 13.4.12
"@next/swc-linux-arm64-gnu": 13.4.12
"@next/swc-linux-arm64-musl": 13.4.12
"@next/swc-linux-x64-gnu": 13.4.12
"@next/swc-linux-x64-musl": 13.4.12
"@next/swc-win32-arm64-msvc": 13.4.12
"@next/swc-win32-ia32-msvc": 13.4.12
"@next/swc-win32-x64-msvc": 13.4.12
"@next/env": 13.4.18
"@next/swc-darwin-arm64": 13.4.18
"@next/swc-darwin-x64": 13.4.18
"@next/swc-linux-arm64-gnu": 13.4.18
"@next/swc-linux-arm64-musl": 13.4.18
"@next/swc-linux-x64-gnu": 13.4.18
"@next/swc-linux-x64-musl": 13.4.18
"@next/swc-win32-arm64-msvc": 13.4.18
"@next/swc-win32-ia32-msvc": 13.4.18
"@next/swc-win32-x64-msvc": 13.4.18
"@swc/helpers": 0.5.1
busboy: 1.6.0
caniuse-lite: ^1.0.30001406
Expand All @@ -5318,7 +5346,6 @@ __metadata:
zod: 3.21.4
peerDependencies:
"@opentelemetry/api": ^1.1.0
fibers: ">= 3.1.0"
react: ^18.2.0
react-dom: ^18.2.0
sass: ^1.3.0
Expand All @@ -5344,13 +5371,11 @@ __metadata:
peerDependenciesMeta:
"@opentelemetry/api":
optional: true
fibers:
optional: true
sass:
optional: true
bin:
next: dist/bin/next
checksum: 50bd443ffe09424c1a94d6606d41886ccd1d65185e125aa199957ea92c5e4d1c226f1675f3e5ea92e88f43f8355824ba50db52a8aeae225f7a86b6c901d25527
checksum: cd3ac740d6111cabdfe8b8396c35314cf95d02df1b984e046f166b7d26fe5a0a99c58730d8b7d15da33eb6d8e5b6e3276e19c616417794b44681bf3ac1e669db
languageName: node
linkType: hard

Expand Down Expand Up @@ -5393,7 +5418,7 @@ __metadata:
languageName: node
linkType: hard

"node-releases@npm:^2.0.12":
"node-releases@npm:^2.0.12, node-releases@npm:^2.0.13":
version: 2.0.13
resolution: "node-releases@npm:2.0.13"
checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3
Expand Down Expand Up @@ -6664,19 +6689,19 @@ __metadata:
"@mui/icons-material": ^5.14.3
"@mui/lab": ^5.0.0-alpha.137
"@mui/material": ^5.14.2
"@types/node": ^20.5.0
"@types/react": ^18.2.19
"@types/node": ^20.4.9
"@types/react": ^18.2.20
"@types/react-dom": 18.2.7
"@weng-lab/psychscreen-ui-components": ^0.7.8
"@weng-lab/ts-ztable": ^4.0.1
autoprefixer: 10.4.14
autoprefixer: 10.4.15
eslint: 8.47.0
eslint-config-next: 13.4.10
file-loader: ^6.2.0
graphql: ^16.7.1
jubilant-carnival: ^0.6.0
lint-staged: ^13.2.3
next: 13.4.12
next: 13.4.18
normalize.css: ^8.0.1
only: ^0.0.2
postcss: 8.4.27
Expand Down

0 comments on commit 4f9939f

Please sign in to comment.