Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@cmdcolin
cmdcolin committed Jul 2, 2024
1 parent 88a094b commit 16b79ae
Show file tree
Hide file tree
Showing 10 changed files with 329 additions and 283 deletions.
8 changes: 8 additions & 0 deletions plugins/linear-comparative-view/src/LinearComparativeView/model.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,14 @@ function stateModelFactory(pluginManager: PluginManager) {
)
},
}))
.preProcessSnapshot(snap => {
// @ts-expect-error
const { tracks, levels = [{ tracks, level: 0 }], ...rest } = snap || {}
return {
...rest,
levels,
}
})
}

export type LinearComparativeViewStateModel = ReturnType<
Expand Down
2 changes: 1 addition & 1 deletion plugins/linear-comparative-view/src/LinearSyntenyView/svgcomponents/SVGLinearGenomeView.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function SVGLinearGenomeView({
</text>
<SVGRuler model={displayResults.view} fontSize={fontSize} />
</g>
<g transform={`translate(0 ${rulerHeight})`}>
<g transform={`translate(0 ${rulerHeight + fontSize})`}>
<SVGTracks
textHeight={textHeight}
trackLabels={trackLabels}
Expand Down
2 changes: 1 addition & 1 deletion ...ts/jbrowse-web/src/tests/__image_snapshots__/breakpoint_split_view_snapshot.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion products/jbrowse-web/src/tests/__image_snapshots__/lgv_snapshot.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion products/jbrowse-web/src/tests/__image_snapshots__/synteny_snapshot.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions products/jbrowse-web/src/tests/__snapshots__/ExportSvg.test.tsx.snap
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion products/jbrowse-web/src/tests/__snapshots__/ExportSvgBreakpointSplitView.test.tsx.snap
View file

Large diffs are not rendered by default.

41 changes: 40 additions & 1 deletion test_data/config_demo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3957,7 +3957,6 @@
}
]
},

{
"type": "SyntenyTrack",
"trackId": "hg19ToHg38.over.chain.gz-1645073157673",
Expand Down Expand Up @@ -4326,6 +4325,46 @@
}
},
"assemblyNames": ["chm13v2.0"]
},
{
"type": "FeatureTrack",
"trackId": "hprc-v1.0-minigraph-grch38.bb.bed",
"name": "hprc-v1.0-minigraph-grch38.bb.bed",
"adapter": {
"type": "BedTabixAdapter",
"bedGzLocation": {
"uri": "hprc-v1.0-minigraph-grch38.bb.bed.gz",
"locationType": "UriLocation"
},
"index": {
"location": {
"uri": "hprc-v1.0-minigraph-grch38.bb.bed.gz.tbi",
"locationType": "UriLocation"
},
"indexType": "TBI"
}
},
"assemblyNames": ["hg38"]
},
{
"type": "VariantTrack",
"trackId": "hprc-v1.1-mc-grch38.vcfbub.a100k.wave.vcf",
"name": "hprc-v1.1-mc-grch38.vcfbub.a100k.wave.vcf",
"adapter": {
"type": "VcfTabixAdapter",
"vcfGzLocation": {
"uri": "hprc-v1.1-mc-grch38.vcfbub.a100k.wave.vcf.gz",
"locationType": "UriLocation"
},
"index": {
"location": {
"uri": "hprc-v1.1-mc-grch38.vcfbub.a100k.wave.vcf.gz.tbi",
"locationType": "UriLocation"
},
"indexType": "TBI"
}
},
"assemblyNames": ["hg38"]
}
],
"connections": [],
Expand Down
405 changes: 202 additions & 203 deletions website/yarn.lock
View file

Large diffs are not rendered by default.

144 changes: 72 additions & 72 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@
tslib "^2.6.2"

"@aws-sdk/client-s3@^3.606.0":
version "3.606.0"
resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-3.606.0.tgz#ff9d7e029591387522783b7aae3d458d4cb0b473"
integrity sha512-IGM/E8kVk/NY/kZwLdmGRsX1QYtuPljoNutM5kBRdtGahQL5VwVAve5PElPUArcsTkfTyW+LfXpznDeeHxMCcA==
version "3.608.0"
resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-3.608.0.tgz#a1e5e688615088b694944a6a44a3f9fee4fd4d5f"
integrity sha512-la2R6QfUOmE4JMubxLD3OdnPTduAs5YekIvx68I5CbLudb5pbxkHDqnrWDhgK1lX4Cu19pXjgQXmS8oZMJPeLQ==
dependencies:
"@aws-crypto/sha1-browser" "5.2.0"
"@aws-crypto/sha256-browser" "5.2.0"
Expand Down Expand Up @@ -3231,9 +3231,9 @@
integrity sha512-8DD5BPa5YrxTOKL3HTAgEd+IXNqRtJfwvbrn2MbOMNMyoMG9Zi5yhFvTH/HTT9Tz6VUHvXP16QWYA3R7eFi7Gg==

"@oclif/core@^4", "@oclif/core@^4.0.0", "@oclif/core@^4.0.6":
version "4.0.7"
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-4.0.7.tgz#e624fa6e91ddcd84ebd0aa9e6efbe17b94f2dd1f"
integrity sha512-sU4Dx+RXCWAkrMw8tQFYAL6VfcHYKLPxVC9iKfgTXr4aDhcCssDwrbgpx0Di1dnNxvQlDGUhuCEInZuIY/nNfw==
version "4.0.8"
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-4.0.8.tgz#667caa6481682e34594a4df6faeb3137879652d8"
integrity sha512-9AzNoRlKfIeuqOin+HK9cyouELeup7sX+MGIFc5dR+bnG0sSzFnV1A/Z57E7KWrY5NdWULHYT5NhiL1YpEhG2w==
dependencies:
ansi-escapes "^4.3.2"
ansis "^3.1.1"
Expand All @@ -3246,7 +3246,7 @@
indent-string "^4.0.0"
is-wsl "^2.2.0"
lilconfig "^3.1.2"
minimatch "^9.0.4"
minimatch "^9.0.5"
string-width "^4.2.3"
supports-color "^8"
widest-line "^3.1.0"
Expand Down Expand Up @@ -4561,9 +4561,9 @@
ts-dedent "^2.0.0"

"@storybook/csf@^0.1.7":
version "0.1.9"
resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.1.9.tgz#9de06eb4d3b9fc8c03323597a68fac175872f236"
integrity sha512-JlZ6v/iFn+iKohKGpYXnMeNeTiiAMeFoDhYnPLIC8GnyyIWqEI9wJYrOK9i9rxlJ8NZAH/ojGC/u/xVC41qSgQ==
version "0.1.11"
resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.1.11.tgz#ad685a4fe564a47a6b73571c2e7c07b526f4f71b"
integrity sha512-dHYFQH3mA+EtnCkHXzicbLgsvzYjcDJ1JWsogbItZogkPHgSJM/Wr71uMkcvw8v9mmCyP4NpXJuu6bPoVsOnzg==
dependencies:
type-fest "^2.19.0"

Expand Down Expand Up @@ -4786,9 +4786,9 @@
defer-to-connect "^2.0.1"

"@testing-library/dom@^10.0.0":
version "10.2.0"
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-10.2.0.tgz#d3b22515bc0603a06f119c6ae6670669c3f2085f"
integrity sha512-CytIvb6tVOADRngTHGWNxH8LPgO/3hi/BdCEHOf7Qd2GvZVClhVP0Wo/QHzWhpki49Bk0b4VT6xpt3fx8HTSIw==
version "10.3.0"
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-10.3.0.tgz#f871a4776432c1bf196e643945800ea65c277aae"
integrity sha512-pT/TYB2+IyMYkkB6lqpkzD7VFbsR0JBJtflK3cS68sCNWxmOhWwRm1XvVHlseNEorsNcxkYsb4sRDV3aNIpttg==
dependencies:
"@babel/code-frame" "^7.10.4"
"@babel/runtime" "^7.12.5"
Expand Down Expand Up @@ -5558,84 +5558,84 @@
"@types/node" "*"

"@typescript-eslint/eslint-plugin@^7.0.1":
version "7.14.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.14.1.tgz#90e2f76a5930d553ede124e1f541a39b4417465e"
integrity sha512-aAJd6bIf2vvQRjUG3ZkNXkmBpN+J7Wd0mfQiiVCJMu9Z5GcZZdcc0j8XwN/BM97Fl7e3SkTXODSk4VehUv7CGw==
version "7.15.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.15.0.tgz#8eaf396ac2992d2b8f874b68eb3fcd6b179cb7f3"
integrity sha512-uiNHpyjZtFrLwLDpHnzaDlP3Tt6sGMqTCiqmxaN4n4RP0EfYZDODJyddiFDF44Hjwxr5xAcaYxVKm9QKQFJFLA==
dependencies:
"@eslint-community/regexpp" "^4.10.0"
"@typescript-eslint/scope-manager" "7.14.1"
"@typescript-eslint/type-utils" "7.14.1"
"@typescript-eslint/utils" "7.14.1"
"@typescript-eslint/visitor-keys" "7.14.1"
"@typescript-eslint/scope-manager" "7.15.0"
"@typescript-eslint/type-utils" "7.15.0"
"@typescript-eslint/utils" "7.15.0"
"@typescript-eslint/visitor-keys" "7.15.0"
graphemer "^1.4.0"
ignore "^5.3.1"
natural-compare "^1.4.0"
ts-api-utils "^1.3.0"

"@typescript-eslint/parser@^7.0.1":
version "7.14.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.14.1.tgz#13d97f357aed3c5719f259a6cc3d1a1f065d3692"
integrity sha512-8lKUOebNLcR0D7RvlcloOacTOWzOqemWEWkKSVpMZVF/XVcwjPR+3MD08QzbW9TCGJ+DwIc6zUSGZ9vd8cO1IA==
dependencies:
"@typescript-eslint/scope-manager" "7.14.1"
"@typescript-eslint/types" "7.14.1"
"@typescript-eslint/typescript-estree" "7.14.1"
"@typescript-eslint/visitor-keys" "7.14.1"
version "7.15.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.15.0.tgz#f4a536e5fc6a1c05c82c4d263a2bfad2da235c80"
integrity sha512-k9fYuQNnypLFcqORNClRykkGOMOj+pV6V91R4GO/l1FDGwpqmSwoOQrOHo3cGaH63e+D3ZiCAOsuS/D2c99j/A==
dependencies:
"@typescript-eslint/scope-manager" "7.15.0"
"@typescript-eslint/types" "7.15.0"
"@typescript-eslint/typescript-estree" "7.15.0"
"@typescript-eslint/visitor-keys" "7.15.0"
debug "^4.3.4"

"@typescript-eslint/scope-manager@7.14.1":
version "7.14.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.14.1.tgz#63de7a577bc6fe8ee6e412a5b85499f654b93ee5"
integrity sha512-gPrFSsoYcsffYXTOZ+hT7fyJr95rdVe4kGVX1ps/dJ+DfmlnjFN/GcMxXcVkeHDKqsq6uAcVaQaIi3cFffmAbA==
"@typescript-eslint/scope-manager@7.15.0":
version "7.15.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.15.0.tgz#201b34b0720be8b1447df17b963941bf044999b2"
integrity sha512-Q/1yrF/XbxOTvttNVPihxh1b9fxamjEoz2Os/Pe38OHwxC24CyCqXxGTOdpb4lt6HYtqw9HetA/Rf6gDGaMPlw==
dependencies:
"@typescript-eslint/types" "7.14.1"
"@typescript-eslint/visitor-keys" "7.14.1"
"@typescript-eslint/types" "7.15.0"
"@typescript-eslint/visitor-keys" "7.15.0"

"@typescript-eslint/type-utils@7.14.1":
version "7.14.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.14.1.tgz#c183f2f28c4c8578eb80aebc4ac9ace400160af6"
integrity sha512-/MzmgNd3nnbDbOi3LfasXWWe292+iuo+umJ0bCCMCPc1jLO/z2BQmWUUUXvXLbrQey/JgzdF/OV+I5bzEGwJkQ==
"@typescript-eslint/type-utils@7.15.0":
version "7.15.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.15.0.tgz#5b83c904c6de91802fb399305a50a56d10472c39"
integrity sha512-SkgriaeV6PDvpA6253PDVep0qCqgbO1IOBiycjnXsszNTVQe5flN5wR5jiczoEoDEnAqYFSFFc9al9BSGVltkg==
dependencies:
"@typescript-eslint/typescript-estree" "7.14.1"
"@typescript-eslint/utils" "7.14.1"
"@typescript-eslint/typescript-estree" "7.15.0"
"@typescript-eslint/utils" "7.15.0"
debug "^4.3.4"
ts-api-utils "^1.3.0"

"@typescript-eslint/types@7.14.1":
version "7.14.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.14.1.tgz#a43a540dbe5df7f2a11269683d777fc50b4350aa"
integrity sha512-mL7zNEOQybo5R3AavY+Am7KLv8BorIv7HCYS5rKoNZKQD9tsfGUpO4KdAn3sSUvTiS4PQkr2+K0KJbxj8H9NDg==
"@typescript-eslint/types@7.15.0":
version "7.15.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.15.0.tgz#fb894373a6e3882cbb37671ffddce44f934f62fc"
integrity sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw==

"@typescript-eslint/typescript-estree@7.14.1":
version "7.14.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.14.1.tgz#ba7c9bac8744487749d19569e254d057754a1575"
integrity sha512-k5d0VuxViE2ulIO6FbxxSZaxqDVUyMbXcidC8rHvii0I56XZPv8cq+EhMns+d/EVIL41sMXqRbK3D10Oza1bbA==
"@typescript-eslint/typescript-estree@7.15.0":
version "7.15.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.15.0.tgz#e323bfa3966e1485b638ce751f219fc1f31eba37"
integrity sha512-gjyB/rHAopL/XxfmYThQbXbzRMGhZzGw6KpcMbfe8Q3nNQKStpxnUKeXb0KiN/fFDR42Z43szs6rY7eHk0zdGQ==
dependencies:
"@typescript-eslint/types" "7.14.1"
"@typescript-eslint/visitor-keys" "7.14.1"
"@typescript-eslint/types" "7.15.0"
"@typescript-eslint/visitor-keys" "7.15.0"
debug "^4.3.4"
globby "^11.1.0"
is-glob "^4.0.3"
minimatch "^9.0.4"
semver "^7.6.0"
ts-api-utils "^1.3.0"

"@typescript-eslint/utils@7.14.1":
version "7.14.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.14.1.tgz#3307b8226f99103dca2133d0ebcae38419d82c9d"
integrity sha512-CMmVVELns3nak3cpJhZosDkm63n+DwBlDX8g0k4QUa9BMnF+lH2lr3d130M1Zt1xxmB3LLk3NV7KQCq86ZBBhQ==
"@typescript-eslint/utils@7.15.0":
version "7.15.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.15.0.tgz#9e6253c4599b6e7da2fb64ba3f549c73eb8c1960"
integrity sha512-hfDMDqaqOqsUVGiEPSMLR/AjTSCsmJwjpKkYQRo1FNbmW4tBwBspYDwO9eh7sKSTwMQgBw9/T4DHudPaqshRWA==
dependencies:
"@eslint-community/eslint-utils" "^4.4.0"
"@typescript-eslint/scope-manager" "7.14.1"
"@typescript-eslint/types" "7.14.1"
"@typescript-eslint/typescript-estree" "7.14.1"
"@typescript-eslint/scope-manager" "7.15.0"
"@typescript-eslint/types" "7.15.0"
"@typescript-eslint/typescript-estree" "7.15.0"

"@typescript-eslint/visitor-keys@7.14.1":
version "7.14.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.14.1.tgz#cc79b5ea154aea734b2a13b983670749f5742274"
integrity sha512-Crb+F75U1JAEtBeQGxSKwI60hZmmzaqA3z9sYsVm8X7W5cwLEm5bRe0/uXS6+MR/y8CVpKSR/ontIAIEPFcEkA==
"@typescript-eslint/visitor-keys@7.15.0":
version "7.15.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.15.0.tgz#1da0726201a859343fe6a05742a7c1792fff5b66"
integrity sha512-Hqgy/ETgpt2L5xueA/zHHIl4fJI2O4XUE9l4+OIfbJIRSnTJb/QscncdqqZzofQegIJugRIF57OJea1khw2SDw==
dependencies:
"@typescript-eslint/types" "7.14.1"
"@typescript-eslint/types" "7.15.0"
eslint-visitor-keys "^3.4.3"

"@ungap/structured-clone@^1.0.0", "@ungap/structured-clone@^1.2.0":
Expand Down Expand Up @@ -8601,9 +8601,9 @@ [email protected]:
mime "^2.5.2"

electron-to-chromium@^1.4.796:
version "1.4.815"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.815.tgz#e901b195c57c3e0fae8dc6d596e4188a33c3e82c"
integrity sha512-OvpTT2ItpOXJL7IGcYakRjHCt8L5GrrN/wHCQsRB4PQa1X9fe+X9oen245mIId7s14xvArCGSTIq644yPUKKLg==
version "1.4.816"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.816.tgz#3624649d1e7fde5cdbadf59d31a524245d8ee85f"
integrity sha512-EKH5X5oqC6hLmiS7/vYtZHZFTNdhsYG5NVPRN6Yn0kQHNBlT59+xSM8HBy66P5fxWpKgZbPqb+diC64ng295Jw==

electron-updater@^6.1.1:
version "6.2.1"
Expand Down Expand Up @@ -12622,7 +12622,7 @@ minimatch@^8.0.2:
dependencies:
brace-expansion "^2.0.1"

minimatch@^9.0.0, minimatch@^9.0.4:
minimatch@^9.0.0, minimatch@^9.0.4, minimatch@^9.0.5:
version "9.0.5"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
Expand Down Expand Up @@ -14385,9 +14385,9 @@ [email protected]:
side-channel "^1.0.4"

qs@^6.10.0, qs@^6.11.2:
version "6.12.1"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.1.tgz#39422111ca7cbdb70425541cba20c7d7b216599a"
integrity sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==
version "6.12.2"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.2.tgz#5443b587f3bf73ac68968de491e5b25bafe04478"
integrity sha512-x+NLUpx9SYrcwXtX7ob1gnkSems4i/mGZX5SlYxwIau6RrUSODO89TR/XDGGpn5RPWSYIB+aSfuSlV5+CmbTBg==
dependencies:
side-channel "^1.0.6"

Expand Down Expand Up @@ -16513,9 +16513,9 @@ typedarray@^0.0.6:
integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==

"typescript@>=3 < 6", typescript@^5.1.3, typescript@^5.3.3:
version "5.5.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507"
integrity sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==
version "5.5.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.3.tgz#e1b0a3c394190838a0b168e771b0ad56a0af0faa"
integrity sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==

ufo@^1.5.3:
version "1.5.3"
Expand Down

0 comments on commit 16b79ae

Please sign in to comment.