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

bower.json fixes #2144

Closed
wants to merge 4 commits into from
Closed

bower.json fixes #2144

wants to merge 4 commits into from

Conversation

cvrebert
Copy link
Contributor

@heff
Copy link
Member

heff commented May 13, 2015

Ah, makes sense, thanks! We'll need to remove the bower.json from the grunt version update task too.

@mmcc
Copy link
Member

mmcc commented May 13, 2015

@cvrebert I realized after merging #2145 that bower.json doesn't match our new naming in dist. Mind updating this PR to fix that as well?

It should just be dist/video.js and dist/video-js.css for the entry points.

@cvrebert cvrebert changed the title bower.json: remove moot version field bower.json fixes May 13, 2015
@cvrebert
Copy link
Contributor Author

There are some additional complications, but this should now fix main.

@heff
Copy link
Member

heff commented May 14, 2015

Thanks!

cvrebert and others added 4 commits May 13, 2015 22:49
Per bower/spec#43 :
> Use source files with module exports and imports over pre-built distribution files.

Also, the example in that PR includes
/sass/motion.scss in and excludes
/dist/movement.css & /dist/movement.min.css
from its `main`.
@cvrebert
Copy link
Contributor Author

@heff And rebased again to merge cleanly. Please merge soon, as every version number bump you guys do causes a fresh merge conflict.

@heff
Copy link
Member

heff commented May 14, 2015

heh, was just working on that

@heff heff closed this in 2bf0be7 May 14, 2015
@heff
Copy link
Member

heff commented May 14, 2015

Merged! Thanks.

@cvrebert cvrebert deleted the patch-2 branch May 14, 2015 06:05
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.

3 participants