From 269f72796fab92bb703520fdc0dca1cbcb7ecc92 Mon Sep 17 00:00:00 2001 From: Christian Oliff Date: Wed, 2 May 2018 01:36:59 +0900 Subject: [PATCH] Prepare 6.1 release (#2045) - Update `CHANGELOG.md` date - Update dev deps - Indenting on `index.html` to 2 space (was 4 space) --- CHANGELOG.md | 2 +- dist/css/main.css | 2 +- dist/index.html | 63 +++++++++++++++++++++++++---------------------- package-lock.json | 28 ++++++++++----------- package.json | 8 +++--- src/index.html | 63 +++++++++++++++++++++++++---------------------- 6 files changed, 85 insertions(+), 81 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4dcb3b165..d46c6b9893 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 6.1.0 (Unreleased) +### 6.1.0 (May 1, 2018) * [Update Apache Server Configs to `v3.0.0`.](https://github.com/h5bp/html5-boilerplate/pull/2042) * Migrate to eslint ([#2037](https://github.com/h5bp/html5-boilerplate/pull/2037)) diff --git a/dist/css/main.css b/dist/css/main.css index 5e76b2f53d..86293f5910 100644 --- a/dist/css/main.css +++ b/dist/css/main.css @@ -1,4 +1,4 @@ -/*! HTML5 Boilerplate v6.0.1 | MIT License | https://html5boilerplate.com/ */ +/*! HTML5 Boilerplate v6.1.0 | MIT License | https://html5boilerplate.com/ */ /* * What follows is the result of much research on cross-browser styling. diff --git a/dist/index.html b/dist/index.html index e503cf18c9..e669915938 100644 --- a/dist/index.html +++ b/dist/index.html @@ -1,37 +1,40 @@ - - - - - - - - - + + + + + + - - - - - + + + - -

Hello world! This is HTML5 Boilerplate.

- - - - - + + + + + + + + +

Hello world! This is HTML5 Boilerplate.

+ + + + + + + + + + - - - - diff --git a/package-lock.json b/package-lock.json index de43a91ce0..2472dae669 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "html5-boilerplate", - "version": "6.0.1", + "version": "6.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -439,9 +439,9 @@ } }, "babel-core": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz", - "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=", + "version": "6.26.3", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", + "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "dev": true, "requires": { "babel-code-frame": "6.26.0", @@ -1012,7 +1012,7 @@ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { - "babel-core": "6.26.0", + "babel-core": "6.26.3", "babel-runtime": "6.26.0", "core-js": "2.5.4", "home-or-tmp": "2.0.0", @@ -4603,9 +4603,9 @@ } }, "mocha": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz", - "integrity": "sha512-3MM3UjZ5p8EJrYpG7s+29HAI9G7sTzKEe4+w37Dg0QP7qL4XGsV+Q2xet2cE37AqdgN1OtYQB6Vl98YiPV3PgA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz", + "integrity": "sha512-kKKs/H1KrMMQIEsWNxGmb4/BGsmj0dkeyotEvbrAuQ01FcWRLssUNXCEUZk6SZtyJBi6EE7SL0zDDtItw1rGhw==", "dev": true, "requires": { "browser-stdout": "1.3.1", @@ -4616,6 +4616,7 @@ "glob": "7.1.2", "growl": "1.10.3", "he": "1.1.1", + "minimatch": "3.0.4", "mkdirp": "0.5.1", "supports-color": "4.4.0" }, @@ -6161,13 +6162,10 @@ "dev": true }, "ssri": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", - "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.0.tgz", + "integrity": "sha512-zYOGfVHPhxyzwi8MdtdNyxv3IynWCIM4jYReR48lqu0VngxgH1c+C6CmipRdJ55eVByTJV/gboFEEI7TEQI8DA==", + "dev": true }, "stack-trace": { "version": "0.0.10", diff --git a/package.json b/package.json index 485e6f17b1..75b47c9234 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@alrra/travis-scripts": "^3.0.1", "apache-server-configs": "^3.0.0", "archiver": "^2.1.1", - "babel-core": "^6.26.0", + "babel-core": "^6.26.3", "babel-preset-env": "^1.6.1", "babel-register": "^6.26.0", "del": "^3.0.0", @@ -20,11 +20,11 @@ "gulp-rename": "^1.2.2", "gulp-replace": "^0.6.1", "jquery": "3.3.1", - "mocha": "^5.0.5", + "mocha": "^5.1.1", "modernizr": "3.6.0", "normalize.css": "8.0.0", "run-sequence": "^2.2.1", - "ssri": "^5.3.0", + "ssri": "^6.0.0", "strip-json-comments": "^2.0.1", "travis-after-all": "^1.4.5" }, @@ -52,7 +52,7 @@ "build": "gulp build", "test": "gulp archive && mocha --require babel-core/register --reporter spec --timeout 5000" }, - "version": "6.0.1", + "version": "6.1.0", "description": "A professional front-end template for building fast, robust, and adaptable web apps or sites.", "files": [ "CHANGELOG.md", diff --git a/src/index.html b/src/index.html index 7d0f1ba0a1..8b2dd70d70 100644 --- a/src/index.html +++ b/src/index.html @@ -1,37 +1,40 @@ - - - - - - - - - + + + + + + - - - - - + + + - -

Hello world! This is HTML5 Boilerplate.

- - - - - + + + + + + + + +

Hello world! This is HTML5 Boilerplate.

+ + + + + + + + + + - - - -