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

feat(badge): functional component #820

Merged
merged 3 commits into from Aug 12, 2017

Conversation

Projects
None yet
3 participants
@alexsasharegan
Contributor

alexsasharegan commented Aug 12, 2017

  • badge as functional component
  • updates badge tests
  • updates test helpers
  • adds vue-functional-data-merge
    • util for accurately merging component defined data with parent applied data
Alex Regan
@alexsasharegan

This comment has been minimized.

Contributor

alexsasharegan commented Aug 12, 2017

I'll need the changes here before I can start applying other components.

@alexsasharegan alexsasharegan requested a review from tmorehouse Aug 12, 2017

@@ -63,10 +63,11 @@
},
"dependencies": {
"bootstrap": "^4.0.0-beta",
"jquery": "jquery@>=3.0.0",

This comment has been minimized.

@tmorehouse

tmorehouse Aug 12, 2017

Member

I didn't realize we have a jQuery dependency now...

This comment has been minimized.

@alexsasharegan

alexsasharegan Aug 12, 2017

Contributor

Yeah... when did that get in there? Is that in master?

Nope, not in master. Is someone working on something that uses that? I'm gonna kill it and we'll find out later.

This comment has been minimized.

@tmorehouse

tmorehouse Aug 12, 2017

Member

Might be in there for a temp solution for something.

This comment has been minimized.

@tmorehouse

tmorehouse Aug 12, 2017

Member

not in dev branch either. only 1.x branch

This comment has been minimized.

@alexsasharegan

alexsasharegan Aug 12, 2017

Contributor

Say bye-bye 👋

Alex Regan
@codecov-io

This comment has been minimized.

codecov-io commented Aug 12, 2017

Codecov Report

Merging #820 into 1.x will increase coverage by 0.22%.
The diff coverage is 78.04%.

Impacted file tree graph

@@            Coverage Diff             @@
##              1.x     #820      +/-   ##
==========================================
+ Coverage   40.32%   40.54%   +0.22%     
==========================================
  Files          68       68              
  Lines        2185     2195      +10     
  Branches      621      621              
==========================================
+ Hits          881      890       +9     
- Misses       1146     1147       +1     
  Partials      158      158
Impacted Files Coverage Δ
lib/components/badge.js 100% <100%> (ø)
tests/helpers.js 84.48% <76.92%> (-4.71%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update de1de97...8e70584. Read the comment docs.

@tmorehouse

This comment has been minimized.

Member

tmorehouse commented Aug 12, 2017

No complaints with jQuery gone....

@alexsasharegan

This comment has been minimized.

Contributor

alexsasharegan commented Aug 12, 2017

I guess it satisfies the bootstrap beta's peer dependencies.
image

What to do about that... Leave it in? I guess it doesn't compile into the lib anyways.

Alex Regan
@tmorehouse

This comment has been minimized.

Member

tmorehouse commented Aug 12, 2017

So yeah, maybe put it back in for now...

@tmorehouse tmorehouse added this to the v1.0.0 milestone Aug 12, 2017

@alexsasharegan

This comment has been minimized.

Contributor

alexsasharegan commented Aug 12, 2017

How are you guys merging these? Squash and merge?

@tmorehouse

This comment has been minimized.

Member

tmorehouse commented Aug 12, 2017

Yep. Squash & merge

@alexsasharegan alexsasharegan merged commit 8c172c1 into 1.x Aug 12, 2017

1 check passed

ci/circleci Your tests passed on CircleCI!
Details

@alexsasharegan alexsasharegan deleted the feat/badge-fc branch Aug 12, 2017

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