Skip to content

Commit

Permalink
Merge pull request #2247 from h5bp/update-deps
Browse files Browse the repository at this point in the history
update deps (Modernizr, Apache Server Configs etc) + browserconfig  update
  • Loading branch information
roblarsen authored May 17, 2020
2 parents 97c6616 + 190b2d3 commit aa23e9a
Show file tree
Hide file tree
Showing 8 changed files with 1,156 additions and 893 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Contributing to HTML5 Boilerplate

[HTML5 Boilerplate](https://html5boilerplate.com/) and want to get involved?
Thanks! We're actively looking for folks interested in helping out and there
Thanks! We're actively looking for folks interested in helping out and there
are plenty of ways you can help!

Please take a moment to review this document in order to make the contribution
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.

Pull requests should be thought of as a conversation. There will be some back and forth when trying to get code merged into this or any other project. With all but the simplest changes you can and should expect that the maintainers of the project will request changes to your code. Please be aware of that and check in after you open your PR in order to get your code merged in cleanly.
Pull requests should be thought of as a conversation. There will be some back and forth when trying to get code merged into this or any other project. With all but the simplest changes you can and should expect that the maintainers of the project will request changes to your code. Please be aware of that and check in after you open your PR in order to get your code merged in cleanly.

Thanks!
2 changes: 1 addition & 1 deletion .github/SUPPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

For personal support requests with HTML5 Boilerplate please use Stack Overflow
([`html5boilerplate`](https://stackoverflow.com/questions/tagged/html5boilerplate) tag).

Please check the respective repository/website for support regarding the code in
[`.htaccess`](https://github.com/h5bp/server-configs-apache),
[`jQuery`](https://jquery.org/support/),
Expand Down
579 changes: 293 additions & 286 deletions dist/.htaccess

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<!-- Add your site or application content here -->
<p>Hello world! This is HTML5 Boilerplate.</p>
<script src="js/vendor/modernizr-3.11.0.min.js"></script>
<script src="js/vendor/modernizr-3.11.1.min.js"></script>
<script src="js/plugins.js"></script>
<script src="js/main.js"></script>

Expand Down

Large diffs are not rendered by default.

1,432 changes: 843 additions & 589 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,26 @@
"test": "gulp archive && mocha --require @babel/register --reporter spec --timeout 5000"
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@babel/preset-env": "^7.9.5",
"@babel/core": "^7.9.6",
"@babel/preset-env": "^7.9.6",
"@babel/register": "^7.9.0",
"apache-server-configs": "^3.2.1",
"archiver": "^3.1.1",
"apache-server-configs": "^4.0.0",
"archiver": "^4.0.1",
"del": "^5.1.0",
"eslint": "^6.8.0",
"eslint": "^7.0.0",
"eslint-config-recommended": "^4.0.0",
"eslint-plugin-mocha": "^6.3.0",
"eslint-plugin-mocha": "^7.0.0",
"glob": "^7.1.6",
"gulp": "^4.0.2",
"gulp-autoprefixer": "^7.0.1",
"gulp-eslint": "^6.0.0",
"gulp-header": "^2.0.9",
"gulp-load-plugins": "^2.0.3",
"gulp-rename": "^1.4.0",
"gulp-rename": "^2.0.0",
"gulp-replace": "^1.0.0",
"main.css": "2.1.0",
"mocha": "^6.2.3",
"modernizr": "3.11.0",
"mocha": "^7.1.2",
"modernizr": "3.11.1",
"normalize.css": "8.0.1",
"strip-json-comments": "^3.1.0"
},
Expand All @@ -54,9 +54,11 @@
]
},
"browserslist": [
"last 1 version",
"> 1%",
"IE 10"
"> 0.5%",
"last 2 versions",
"Firefox ESR",
"not dead",
"IE 11"
],
"h5bp-configs": {
"directories": {
Expand Down

0 comments on commit aa23e9a

Please sign in to comment.