From ad99cc5512908cb85dfca2eaaadcc484bfae6c77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 00:26:29 +0000 Subject: [PATCH 1/3] chore(deps): bump auspice in /packages/nextclade-web Bumps [auspice](https://github.com/nextstrain/auspice) from 2.59.1 to 2.61.2. - [Release notes](https://github.com/nextstrain/auspice/releases) - [Changelog](https://github.com/nextstrain/auspice/blob/master/CHANGELOG.md) - [Commits](https://github.com/nextstrain/auspice/compare/v2.59.1...v2.61.2) --- updated-dependencies: - dependency-name: auspice dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/nextclade-web/package.json | 2 +- packages/nextclade-web/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/nextclade-web/package.json b/packages/nextclade-web/package.json index 83d2faf5f..4bedf44c8 100644 --- a/packages/nextclade-web/package.json +++ b/packages/nextclade-web/package.json @@ -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", diff --git a/packages/nextclade-web/yarn.lock b/packages/nextclade-web/yarn.lock index de1ad8afb..c8f0c1ddf 100644 --- a/packages/nextclade-web/yarn.lock +++ b/packages/nextclade-web/yarn.lock @@ -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" From 1294e1b3b627fad51f054d00edf6329a03304d4a Mon Sep 17 00:00:00 2001 From: ivan-aksamentov Date: Wed, 20 Nov 2024 01:34:33 +0100 Subject: [PATCH 2/3] fix: adjust typings for tree and treeToo --- packages/nextclade-web/src/state/reducer.ts | 2 +- .../types/auspice/src/reducers/{tree.d.ts => tree/index.d.ts} | 2 +- .../src/types/auspice/src/reducers/{ => tree}/treeToo.d.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename packages/nextclade-web/src/types/auspice/src/reducers/{tree.d.ts => tree/index.d.ts} (58%) rename packages/nextclade-web/src/types/auspice/src/reducers/{ => tree}/treeToo.d.ts (74%) diff --git a/packages/nextclade-web/src/state/reducer.ts b/packages/nextclade-web/src/state/reducer.ts index a28eee183..ab4e9c3fa 100644 --- a/packages/nextclade-web/src/state/reducer.ts +++ b/packages/nextclade-web/src/state/reducer.ts @@ -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 diff --git a/packages/nextclade-web/src/types/auspice/src/reducers/tree.d.ts b/packages/nextclade-web/src/types/auspice/src/reducers/tree/index.d.ts similarity index 58% rename from packages/nextclade-web/src/types/auspice/src/reducers/tree.d.ts rename to packages/nextclade-web/src/types/auspice/src/reducers/tree/index.d.ts index 1e6c7c057..a147a0beb 100644 --- a/packages/nextclade-web/src/types/auspice/src/reducers/tree.d.ts +++ b/packages/nextclade-web/src/types/auspice/src/reducers/tree/index.d.ts @@ -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 } diff --git a/packages/nextclade-web/src/types/auspice/src/reducers/treeToo.d.ts b/packages/nextclade-web/src/types/auspice/src/reducers/tree/treeToo.d.ts similarity index 74% rename from packages/nextclade-web/src/types/auspice/src/reducers/treeToo.d.ts rename to packages/nextclade-web/src/types/auspice/src/reducers/tree/treeToo.d.ts index 6bf240eba..5c235773d 100644 --- a/packages/nextclade-web/src/types/auspice/src/reducers/treeToo.d.ts +++ b/packages/nextclade-web/src/types/auspice/src/reducers/tree/treeToo.d.ts @@ -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 From 0b7468bbd260feb01b0007b0fb06358bc7b15d30 Mon Sep 17 00:00:00 2001 From: ivan-aksamentov Date: Wed, 20 Nov 2024 01:34:57 +0100 Subject: [PATCH 3/3] fix: make sure to patch both js and ts files in auspice --- packages/nextclade-web/tools/monkeyPatch.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nextclade-web/tools/monkeyPatch.ts b/packages/nextclade-web/tools/monkeyPatch.ts index 2e194479e..a2ec3185a 100644 --- a/packages/nextclade-web/tools/monkeyPatch.ts +++ b/packages/nextclade-web/tools/monkeyPatch.ts @@ -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, '')