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

Use git commit ref for brave-ui dependency instead of npm-published version #1025

Merged
merged 1 commit into from
Dec 7, 2018

Conversation

petemill
Copy link
Member

@petemill petemill commented Dec 5, 2018

This is the minimum change necessary to have brave-ui go direct to a specific commit in github, rather than a specific version published to npm.
It clears the way for the branch strategy outlined in brave/brave-browser#2315.

Addresses brave/brave-browser#2315

Test Plan:

  • npm install in src/brave (don't remove node_modules first)
  • check that it installed the commit-version of brave-ui via:
    • cat ./node_modules/brave-ui/package.json | grep _from. You should see "_from": "github:brave/brave-ui#9be9bee9764c6a1fd329acbe348f91b85142dc33",
  • Check that web unit tests work: npm run test-unit
  • Check that webui builds work
    • Ensure all webuis re-build by simply re-saving the file at "components/webpack/webpack.config.js
    • run npm run build from brave-browser
    • should see no error
    • webuis should look ok

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@petemill
Copy link
Member Author

petemill commented Dec 6, 2018

If / when this is approved a merged, we should pick this up to as many branches as we're aiming to uplift future brave-ui updates to. But in each branch we should change the sha to the git commit ID of where that brave-core branch is currently pointing at brave-ui.

cezaraugusto
cezaraugusto previously approved these changes Dec 7, 2018
Copy link
Contributor

@cezaraugusto cezaraugusto left a comment

Choose a reason for hiding this comment

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

++

@petemill
Copy link
Member Author

petemill commented Dec 7, 2018

@cezaraugusto rebased because package.json had changed on master

@cezaraugusto cezaraugusto merged commit f99f7c6 into master Dec 7, 2018
@cezaraugusto cezaraugusto deleted the brave-ui-direct-to-github branch December 7, 2018 19:36
cezaraugusto added a commit that referenced this pull request Dec 7, 2018
Use git commit ref for brave-ui dependency instead of npm-published version
@cezaraugusto
Copy link
Contributor

master f99f7c6
0.59.x 296dac6

@petemill
Copy link
Member Author

petemill commented Dec 7, 2018

Thanks @cezaraugusto. FYI brave-core 0.58.x is on brave-ui 0.34.6 which is brave/brave-ui@5c2d8a0

@kjozwiak
Copy link
Member

@petemill approved uplift to 0.58.x after deliberating with @rebron 👍 Please add/remove all the needed labels and ensure that the appropriate issue is moved to the correct milestone.

petemill pushed a commit that referenced this pull request Dec 10, 2018
Use git commit ref for brave-ui dependency instead of npm-published version
@petemill
Copy link
Member Author

0.58 9e43e62

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.

4 participants