Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust Nextclade to Auspice 2.61+ #1555

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Adjust Nextclade to Auspice 2.61+ #1555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad99cc5
chore(deps): bump auspice in /packages/nextclade-web
dependabot[bot] Nov 19, 2024
1294e1b
fix: adjust typings for tree and treeToo
ivan-aksamentov Nov 20, 2024
0b7468b
fix: make sure to patch both js and ts files in auspice
ivan-aksamentov Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/nextclade-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"@hapi/accept": "6.0.3",
"@hapi/content": "6.0.0",
"animate.css": "4.1.1",
"auspice": "2.59.1",
"auspice": "2.61.2",
"autoprefixer": "10.4.5",
"awesomplete": "1.1.5",
"axios": "0.27.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/nextclade-web/src/state/reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import controls from 'auspice/src/reducers/controls'
import browserDimensions from 'auspice/src/reducers/browserDimensions'
import notifications from 'auspice/src/reducers/notifications'
import narrative from 'auspice/src/reducers/narrative'
import treeToo from 'auspice/src/reducers/treeToo'
import treeToo from 'auspice/src/reducers/tree/treeToo'
import measurements from 'auspice/src/reducers/measurements'
// END reducers from auspice

Expand Down
2 changes: 1 addition & 1 deletion .../src/types/auspice/src/reducers/tree.d.ts → ...ypes/auspice/src/reducers/tree/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
declare module 'auspice/src/reducers/tree' {
import { AuspiceTreeState } from 'auspice'

declare function tree(state?: TreeState): AuspiceTreeState | undefined
declare function tree(state?: AuspiceTreeState): AuspiceTreeState | undefined
export default tree
}
2 changes: 1 addition & 1 deletion ...c/types/auspice/src/reducers/treeToo.d.ts → ...es/auspice/src/reducers/tree/treeToo.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
declare module 'auspice/src/reducers/treeToo' {
declare module 'auspice/src/reducers/tree/treeToo' {
import { AuspiceTreeState } from 'auspice'

declare function treeToo(state?: AuspiceTreeState): AuspiceTreeState | undefined
Expand Down
2 changes: 1 addition & 1 deletion packages/nextclade-web/tools/monkeyPatch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export async function replace(filename: string, searchValue: string | RegExp, re
export async function removeAuspiceTimers() {
await fs.rm('node_modules/auspice/src/util/perf.js', { force: true })

const files = await promisify(glob)('node_modules/auspice/src/**/*.js')
const files = await promisify(glob)('node_modules/auspice/src/**/*.{js,ts}')

await serial.forEach(async (file) => {
await replace(file, /.*(timerStart|timerEnd)\(".+"\);.*\n/g, '')
Expand Down
8 changes: 4 additions & 4 deletions packages/nextclade-web/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4608,10 +4608,10 @@ attr-accept@^2.2.2:
resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b"
integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==

auspice@2.59.1:
version "2.59.1"
resolved "https://registry.yarnpkg.com/auspice/-/auspice-2.59.1.tgz#f18479b17d09b9f1cf39ef6d19f44c7f4e974f79"
integrity sha512-JdfCQ2waAY/BPeIZ58tAUIYWwopY28FuQ3JjG+esa5fPbp5+Ovbx4rl6LqWCscohyojdxgJvJX4l8a1Av2b9ZA==
auspice@2.61.2:
version "2.61.2"
resolved "https://registry.yarnpkg.com/auspice/-/auspice-2.61.2.tgz#bf0306f3c028bfffaf9f04270bf45c93d3fa811a"
integrity sha512-jVeUjD13RryH7WIVQPRfG7SKEbBYW9ZwW0mv9DedLL5Vpou67W7gw6tqCqhlU7imzeR7fy25dV6rN7UrlY0BrA==
dependencies:
"@babel/core" "^7.3.4"
"@babel/plugin-proposal-class-properties" "^7.3.4"
Expand Down