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.

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

Move Auspice dep from the server code to the auspice-client customizations #673

Merged
merged 2 commits into from
Apr 7, 2023

Conversation

tsibley
Copy link
Member

@tsibley tsibley commented Apr 6, 2023

See commit messages.

Related issue(s)

nextstrain/auspice#1661

Testing

  • Build works locally
  • Checks pass

Removes the only reason for the server code to depend on Auspice.

This function hasn't changed in Auspice in over 2 years and is unlikely
to in the future.  It seems to me that we're more likely to drop
backwards compat with v1 first.
@tsibley tsibley requested a review from a team April 6, 2023 23:38
@nextstrain-bot nextstrain-bot temporarily deployed to nextstrain-s-trs-move-a-91ygco April 6, 2023 23:38 Inactive
tsibley added a commit to nextstrain/auspice that referenced this pull request Apr 6, 2023
@tsibley tsibley force-pushed the trs/move-auspice-dep branch from 9ddce20 to 497b42c Compare April 6, 2023 23:42
@tsibley tsibley temporarily deployed to nextstrain-s-trs-move-a-91ygco April 6, 2023 23:42 Inactive
@tsibley tsibley force-pushed the trs/move-auspice-dep branch from 497b42c to 36e511c Compare April 6, 2023 23:47
@tsibley tsibley had a problem deploying to nextstrain-s-trs-move-a-91ygco April 6, 2023 23:47 Failure
Copy link
Member

@victorlin victorlin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Glad to see this! Looks good pending the CI fix.

build.sh Show resolved Hide resolved
@tsibley tsibley force-pushed the trs/move-auspice-dep branch from 36e511c to 6dc47dc Compare April 7, 2023 19:24
@tsibley tsibley temporarily deployed to nextstrain-s-trs-move-a-91ygco April 7, 2023 19:25 Inactive
…tions

Avoids bringing in all of Auspice's deps into the server code.  This is
generally useful, but it was also specifically useful in recent
prototyping to allow use of React 18 server components (as Auspice
requires React 16).  In any case, I think organizationally this makes
more sense anyway.

Related-to: <nextstrain/auspice#1661>
@tsibley tsibley force-pushed the trs/move-auspice-dep branch from 6dc47dc to 3205a85 Compare April 7, 2023 20:55
@tsibley tsibley temporarily deployed to nextstrain-s-trs-move-a-91ygco April 7, 2023 20:55 Inactive
@tsibley
Copy link
Member Author

tsibley commented Apr 7, 2023

So my first fix worked in CI… but failed locally when I tested it. That's because I tested it by doing:

rm -rf node_modules/ auspice-client/node_modules/ static-site/node_modules/
./build.sh

which failed when the Gatsby build couldn't find the iso-639-1 package. That's because it was still specified in the top-level deps instead of the auspice-client deps, and I'd removed the former. It worked in CI because npm ci was run before ./build.sh.

I fixed it again by moving that dep into auspice-client, which works locally with the above test.

As long as CI passes now, I'll merge.

@tsibley tsibley merged commit e2f3b62 into master Apr 7, 2023
@tsibley tsibley deleted the trs/move-auspice-dep branch April 7, 2023 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

3 participants