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

Loosen jquery dep #1778

Merged
merged 1 commit into from
Sep 1, 2014
Merged

Loosen jquery dep #1778

merged 1 commit into from
Sep 1, 2014

Conversation

samccone
Copy link
Member

Fixes #1762

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 3d7752f on sjs/bump-jquery-dep into 731c478 on minor.

@@ -68,7 +68,7 @@
"grunt-plato": "~0.1.4",
"grunt-preprocess": "~4.0.0",
"grunt-template": "^0.2.3",
"jquery": "^2.1.1",
"jquery": "^2.x",
Copy link
Member

Choose a reason for hiding this comment

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

so the 2.x change makes sense, but why doesn't this accept the same range as bower?

Copy link
Member Author

Choose a reason for hiding this comment

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

If i recall it is due to some contrived differences between how bower.json and package.json are parsed.

There is already an issue open about that and PLENTY of other issues discussing these things so heh lets dont worry about it in this PR

Copy link
Member

Choose a reason for hiding this comment

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

Why don't I ever remember why we went with something? This seems blatantly wrong.

@cmaher
Copy link
Member

cmaher commented Aug 30, 2014

👍

@samccone
Copy link
Member Author

@thejameskyle

@samccone
Copy link
Member Author

all updated

@samccone
Copy link
Member Author

Marionette Supports jQuery 1.8 up to 2.X, since jquery is following semver for the 2.x branch we are safe to assume that all is going to be fine using a range.

^1.2.3 is the same as >=1.2.3-0 <2.0.0-0

Ranges can be joined with either a space (which implies "and") or a || (which implies "or")

Thus we need

^1.8.0 || ^2.0.0

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 9716e06 on sjs/bump-jquery-dep into 00663d8 on minor.

@jamesplease
Copy link
Member

👍 Looks good!

@jamiebuilds
Copy link
Member

👍

jamiebuilds added a commit that referenced this pull request Sep 1, 2014
@jamiebuilds jamiebuilds merged commit 652c3a9 into minor Sep 1, 2014
@jamiebuilds jamiebuilds deleted the sjs/bump-jquery-dep branch September 1, 2014 02:57
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.

None yet

5 participants