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

Redo package-lock #4526

Merged
merged 1 commit into from Jul 5, 2023
Merged

Redo package-lock #4526

merged 1 commit into from Jul 5, 2023

Conversation

p2edwards
Copy link
Contributor

@p2edwards p2edwards commented Jul 4, 2023

Description

Recreate frontend package-lock file from an earlier version to fix build problems.

Details

A few divergent concurrent merges (#4387, #4503, #4520) resulted in frontend build failures from a package-lock.json.

This fix:

  • Branches from up-to-date beta, using its package.json
  • Takes a package-lock.json from before the divergent merges
  • Runs npm install (with npm@8.5.5) to update the package-lock.json with any packages that were added or removed.

Reviewer

It's a large diff, changing the lockfileVersion back from 3 to 2, compatible with npm@8.5.5, which we're still on until we can remove or change some dependencies.

Developers!

☝️ If your PR or feature branch has conflicts with package-lock.json after this change, please take the package-lock.json from upstream (use 'theirs') and run npm@8.5.5 to install your added/removed packages, then commit the updated lockfile.

Internal discussion: https://chat.kobotoolbox.org/#narrow/stream/4-Kobo-Dev/topic/Front-end.20building.20issues/near/245149

Checklist

  1. Write a description of your work suitable for publishing on our forum

Related issues

Related to #4366
Needed for #4505 (and active feature branches)

@p2edwards p2edwards merged commit d362280 into beta Jul 5, 2023
4 checks passed
@p2edwards p2edwards deleted the redo-package-lock branch October 26, 2023 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant