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

build: upgrade frappe-ui & related packages between both the workspaces #2370

Merged
merged 3 commits into from
Oct 31, 2024

Conversation

ruchamahabal
Copy link
Member

frappe-ui is being used as a git submodule. It was upgraded to the latest version in both the yarn workspaces (frontend & roster) when roster got merged but submodule still pointed to a very old commit. So DateTimePicker import was failing.

Also, yarn "hoists" common dependencies and relies on a single lockfile for each submodule.
Started getting errors in PWA due to conflicting versions of vue installed:

[Vue warn]: Missing ref owner context. ref cannot be used on hoisted vnodes. A vnode with ref must be created inside the render function

This was because I had two different versions of Vue in node_modules (monorepo with multiple package.json with different versions of Vue)

so I am upgrading common packages to the same version with:

yarn upgrade-interactive --latest <package-name>

- submodule was pointing to an old commit but package.json had new version after roster update
@ruchamahabal ruchamahabal merged commit 2a9b9c8 into frappe:develop Oct 31, 2024
8 checks passed
@ruchamahabal
Copy link
Member Author

@Mergifyio backport version-15-hotfix

Copy link
Contributor

mergify bot commented Oct 31, 2024

backport version-15-hotfix

❌ No backport have been created

  • Backport to branch version-15-hotfix failed

Git reported the following error:

Failed to merge submodule frappe-ui (not checked out)
CONFLICT (submodule): Merge conflict in frappe-ui
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
 - come back to superproject and run:

      git add frappe-ui

   to record the above merge or update
 - resolve any other conflicts in the superproject
 - commit the resulting index in the superproject
error: could not apply c6e62e6fd... build: upgrade frappe-ui
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant