This repository has been archived by the owner on Dec 21, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 675
Upgrade YUI Version inside AlloyUI
Maira Bello edited this page Mar 10, 2015
·
4 revisions
- Take a note of YUI version set on alloy.json dependencies.
- Navigate to
[ALLOY_ROOT]/../yui3
- Fetch the a pure copy of the used version of YUI, in this case v3.11.0:
git fetch https://github.com/yui/yui3.git v3.11.0:v3.11.0
- Fetch and checkout the latest YUI tag v3.15.0:
git fetch https://github.com/yui/yui3.git v3.15.0:patched-v3.15.0
git checkout patched-v3.15.0
- Generate the list of commits that differs between the current YUI version and AlloyUI patched branch, in this case v3.11.0 and patched-v3.11.0:
git log --oneline --reverse v3.11.0..patched-v3.11.0
- Let's assume the log difference outputed:
- 62757e6 Commit 2
- 62c3ac4 Commit 1
- Based on the list of different commits run:
git cherry-pick --allow-empty --strategy=recursive -X theirs 62757e6 62c3ac4
- Resolve all the cherry-pick possible conflicts, you may need to run
git cherry-pick --continue
several times.
- Once the commits are cherry-pick sucessfully, lower your node version to at most v0.11.13, since yui grunt tasks don't work with newer versions.
- Now build and test all modules:
npm install
grunt build
grunt import-pure
grunt test
- If all test are passed commit the built files:
git add . && git commit -m "Build files"
- And push the new branch to
liferay/yui3
repository:git push upstream patched-v3.15.0
- Update
[ALLOY_ROOT]/bower.json
"dependencies"
to use the newpatched-v3.15.0
branch. - Update
[ALLOY_ROOT]/alloy.json
"yuiversion"
topatched-v3.15.0
- Rebuild AllloyUI from
[ALLOY_ROOT]
folder:gulp build
gulp test