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

Ship v4.1 #25972

Closed
wants to merge 4 commits into from
Closed

Ship v4.1 #25972

wants to merge 4 commits into from

Conversation

mdo
Copy link
Member

@mdo mdo commented Mar 29, 2018

  • Updates the docs directory from docs/4.0/ to docs/4.1/
  • Runs the build/ship.sh script to updated version from 4.0.0 to 4.1.0

We need to check some of this out though—I'm seeing some -webkit prefixes being dropped and I can't recall if those are intentional.

@XhmikosR
Copy link
Member

XhmikosR commented Mar 29, 2018

@mdo: I pushed a patch to ignore vnu.jar's wrong language code warnings because we get false positives.

About the prefixes, https://github.com/browserslist/browserslist/blob/master/CHANGELOG.md#30

Regarding the rename, I don't think you should change the redirect_from parts. Unless this is intentional.

@@ -319,7 +319,7 @@ Our documentation received an upgrade across the board as well. Here's the low d

### Responsive utilities

All `@screen-` variables have been removed in v4.0.0. Use the `media-breakpoint-up()`, `media-breakpoint-down()`, or `media-breakpoint-only()` Sass mixins or the `$grid-breakpoints` Sass map instead.
All `@screen-` variables have been removed in v4.1.0. Use the `media-breakpoint-up()`, `media-breakpoint-down()`, or `media-breakpoint-only()` Sass mixins or the `$grid-breakpoints` Sass map instead.
Copy link
Member

Choose a reason for hiding this comment

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

The migration file shouldn't have the versions changed.

js/src/index.js Outdated
@@ -31,7 +31,7 @@ import Util from './util'
const maxMajor = 4

if (version[0] < ltMajor && version[1] < minMinor || version[0] === minMajor && version[1] === minMinor && version[2] < minPatch || version[0] >= maxMajor) {
throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0')
throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.1.0')
Copy link
Contributor

Choose a reason for hiding this comment

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

This also doesn't need to be changed.

@XhmikosR
Copy link
Member

@mdo: after you review let me know so that I rebase and clean up the branch before the final merge.

js/src/index.js Outdated
@@ -31,7 +31,7 @@ import Util from './util'
const maxMajor = 4

if (version[0] < ltMajor && version[1] < minMinor || version[0] === minMajor && version[1] === minMinor && version[2] < minPatch || version[0] >= maxMajor) {
throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0')
throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.1.0')
Copy link
Contributor

Choose a reason for hiding this comment

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

This is jQuery version, not Bootstrap.

@XhmikosR
Copy link
Member

XhmikosR commented Mar 30, 2018 via email

@mdo
Copy link
Member Author

mdo commented Mar 30, 2018

@XhmikosR Fwiw, I'm guessing @vsn4ik's comment was from looking at a different commit or not the full range of the diff. It's admittedly all too easy on GitHub to click into a notification and see a subset of the overall diff :).

@XhmikosR XhmikosR force-pushed the ship-v4.1 branch 2 times, most recently from ba95b06 to d6018b0 Compare April 2, 2018 16:24
@XhmikosR XhmikosR dismissed their stale review April 2, 2018 16:28

fixed

@XhmikosR XhmikosR force-pushed the ship-v4.1 branch 4 times, most recently from d9231f4 to f099c84 Compare April 5, 2018 10:24
@XhmikosR
Copy link
Member

XhmikosR commented Apr 5, 2018

@mdo: when you are back to this,

git fetch --prune
git checkout ship-v4.1
git reset --hard

Then run the build script as normal. If you run the release-version script again, we'll need to review the changes again because it will change stuff that shouldn't change like in your first patch here.

@mdo
Copy link
Member Author

mdo commented Apr 8, 2018

New PR coming in #26218.

@mdo mdo closed this Apr 8, 2018
@mdo mdo deleted the ship-v4.1 branch April 8, 2018 21:24
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