From 2e69dfa8c1679238579ef6f5ec85deb755e4fb6d Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Tue, 4 Oct 2016 02:55:59 +1000 Subject: Fix broken/redirected links, moving to HTTPS where possible. (#20557) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index c056861ee..76e9d4d3d 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "framework", "web" ], - "homepage": "http://getbootstrap.com", + "homepage": "https://getbootstrap.com", "author": "The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)", "contributors": [ "Twitter, Inc." -- cgit v1.2.3 From d57d5a606b7a7b26b04e9315cca35287758b66c0 Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Fri, 7 Oct 2016 00:21:05 +1100 Subject: Update dependencies, including Babel to v6 and zeroUnits fix. --- package.json | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 76e9d4d3d..ed6fef32a 100644 --- a/package.json +++ b/package.json @@ -39,41 +39,43 @@ "license": "MIT", "dependencies": { "jquery": "1.9.1 - 3", - "tether": "^1.1.1" + "tether": "^1.3.7" }, "devDependencies": { - "autoprefixer": "^6.0.3", - "babel-eslint": "^6.0.4", - "eslint": "^3.0.0", + "autoprefixer": "^6.5.0", + "babel-eslint": "^7.0.0", + "babel-plugin-transform-es2015-modules-strip": "^0.1.0", + "babel-preset-es2015": "^6.16.0", + "eslint": "^3.7.1", "grunt": "^1.0.1", - "grunt-babel": "^5.0.3", - "grunt-build-control": "^0.7.0", + "grunt-babel": "^6.0.0", + "grunt-build-control": "^0.7.1", "grunt-contrib-clean": "^1.0.0", - "grunt-contrib-compress": "^1.1.0", - "grunt-contrib-concat": "^1.0.0", - "grunt-contrib-connect": "^1.0.0", + "grunt-contrib-compress": "^1.3.0", + "grunt-contrib-concat": "^1.0.1", + "grunt-contrib-connect": "^1.0.2", "grunt-contrib-copy": "^1.0.0", - "grunt-contrib-cssmin": "^1.0.0", - "grunt-contrib-qunit": "^1.0.1", + "grunt-contrib-cssmin": "^1.0.2", + "grunt-contrib-qunit": "^1.2.0", "grunt-contrib-sass": "^1.0.0", - "grunt-contrib-uglify": "^1.0.0", + "grunt-contrib-uglify": "^2.0.0", "grunt-contrib-watch": "^1.0.0", - "grunt-exec": "^1.0.0", - "grunt-html": "^8.0.1", - "grunt-jekyll": "^0.4.2", - "grunt-sass": "^1.0.0", + "grunt-exec": "^1.0.1", + "grunt-html": "^8.0.2", + "grunt-jekyll": "^0.4.4", + "grunt-sass": "^1.2.1", "grunt-saucelabs": "^9.0.0", - "grunt-scss-lint": "^0.3.8", + "grunt-scss-lint": "^0.5.0", "grunt-stamp": "^0.3.0", "htmlhint": "^0.9.13", "is-travis": "^1.0.0", - "jscs": "^3.0.4", - "load-grunt-tasks": "^3.4.0", - "postcss-cli": "^2.5.2", + "jscs": "^3.0.7", + "load-grunt-tasks": "^3.5.2", + "postcss-cli": "^2.6.0", "postcss-flexbugs-fixes": "^2.0.0", - "shelljs": "^0.7.0", - "shx": "^0.1.2", - "time-grunt": "^1.2.1" + "shelljs": "^0.7.4", + "shx": "^0.1.4", + "time-grunt": "^1.4.0" }, "engines": { "node": ">=4" @@ -100,7 +102,7 @@ } }, "dependencies": { - "jquery": "1.9.1 - 3" + "jquery": "3" } } } -- cgit v1.2.3 From 8ff7edaab4f55b6612df3fe670aa9b9ac0984eae Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Oct 2016 08:27:41 -0700 Subject: version bump to alpha 5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index ed6fef32a..045ea15e2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "version": "4.0.0-alpha.4", + "version": "4.0.0-alpha.5", "keywords": [ "css", "sass", -- cgit v1.2.3 From 26c16743fce73db5f85c9f16fe59242f876c5360 Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Tue, 25 Oct 2016 23:18:52 +1100 Subject: Refactor ESLint configuration. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 045ea15e2..f37edbb95 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ ], "scripts": { "change-version": "node grunt/change-version.js", - "eslint": "eslint --config js/.eslintrc.json js/src", + "eslint": "eslint --ignore-path .eslintignore js", "jscs": "jscs --config=js/.jscsrc js/src js/tests/unit docs/assets/js/src grunt Gruntfile.js docs/assets/js/ie-emulation-modes-warning.js docs/assets/js/ie10-viewport-bug-workaround.js", "htmlhint": "htmlhint --config docs/.htmlhintrc _gh_pages/", "postcss": "postcss --config grunt/postcss.js --replace dist/css/*.css", -- cgit v1.2.3 From ba86c314a46d70385ddc7ecdbf17874487065af5 Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Wed, 21 Dec 2016 17:38:32 +1100 Subject: Move scss-lint to npm scripts. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index f37edbb95..9ca76f663 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,8 @@ "htmlhint": "htmlhint --config docs/.htmlhintrc _gh_pages/", "postcss": "postcss --config grunt/postcss.js --replace dist/css/*.css", "postcss-docs": "postcss --config grunt/postcss.js --no-map --replace docs/assets/css/docs.min.css && postcss --config grunt/postcss.js --no-map --replace docs/examples/**/*.css", + "scss-lint": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude scss/_normalize.scss scss/*.scss", + "scss-lint-docs": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss", "update-shrinkwrap": "npm shrinkwrap --dev && shx mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", "test": "npm run eslint && npm run jscs && grunt test" }, @@ -65,7 +67,6 @@ "grunt-jekyll": "^0.4.4", "grunt-sass": "^1.2.1", "grunt-saucelabs": "^9.0.0", - "grunt-scss-lint": "^0.5.0", "grunt-stamp": "^0.3.0", "htmlhint": "^0.9.13", "is-travis": "^1.0.0", -- cgit v1.2.3 From 69935953413ca0bd96f2d70fe3b6f905ae2141b0 Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Fri, 23 Dec 2016 15:02:54 +1100 Subject: Move clean-css to npm scripts. --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 9ca76f663..f01c27eba 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,8 @@ ], "scripts": { "change-version": "node grunt/change-version.js", + "clean-css": "cleancss --skip-advanced --source-map --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --skip-advanced --source-map --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --skip-advanced --source-map --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css", + "clean-css-docs": "cleancss --skip-advanced --source-map --output docs/assets/css/docs.min.css docs/assets/css/docs.min.css", "eslint": "eslint --ignore-path .eslintignore js", "jscs": "jscs --config=js/.jscsrc js/src js/tests/unit docs/assets/js/src grunt Gruntfile.js docs/assets/js/ie-emulation-modes-warning.js docs/assets/js/ie10-viewport-bug-workaround.js", "htmlhint": "htmlhint --config docs/.htmlhintrc _gh_pages/", @@ -48,6 +50,7 @@ "babel-eslint": "^7.0.0", "babel-plugin-transform-es2015-modules-strip": "^0.1.0", "babel-preset-es2015": "^6.16.0", + "clean-css": "^3.4.23", "eslint": "^3.7.1", "grunt": "^1.0.1", "grunt-babel": "^6.0.0", @@ -57,7 +60,6 @@ "grunt-contrib-concat": "^1.0.1", "grunt-contrib-connect": "^1.0.2", "grunt-contrib-copy": "^1.0.0", - "grunt-contrib-cssmin": "^1.0.2", "grunt-contrib-qunit": "^1.2.0", "grunt-contrib-sass": "^1.0.0", "grunt-contrib-uglify": "^2.0.0", -- cgit v1.2.3 From effb2fb4b4bf12e6ecc3934761e0305147f6e2e2 Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Fri, 23 Dec 2016 23:43:46 +1100 Subject: Move uglifyjs to npm script. --- package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index f01c27eba..19267d698 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,8 @@ "postcss-docs": "postcss --config grunt/postcss.js --no-map --replace docs/assets/css/docs.min.css && postcss --config grunt/postcss.js --no-map --replace docs/examples/**/*.css", "scss-lint": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude scss/_normalize.scss scss/*.scss", "scss-lint-docs": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss", + "uglify": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output dist/js/bootstrap.min.js dist/js/bootstrap.js", + "uglify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/*.js docs/assets/js/src/application.js", "update-shrinkwrap": "npm shrinkwrap --dev && shx mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", "test": "npm run eslint && npm run jscs && grunt test" }, @@ -62,7 +64,6 @@ "grunt-contrib-copy": "^1.0.0", "grunt-contrib-qunit": "^1.2.0", "grunt-contrib-sass": "^1.0.0", - "grunt-contrib-uglify": "^2.0.0", "grunt-contrib-watch": "^1.0.0", "grunt-exec": "^1.0.1", "grunt-html": "^8.0.2", @@ -78,7 +79,8 @@ "postcss-flexbugs-fixes": "^2.0.0", "shelljs": "^0.7.4", "shx": "^0.1.4", - "time-grunt": "^1.4.0" + "time-grunt": "^1.4.0", + "uglify-js": "^2.7.5" }, "engines": { "node": ">=4" -- cgit v1.2.3 From a34cdc063809ea903314cc5d7ee368a4e938b687 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2016 10:00:55 -0800 Subject: bump jquery and grunt-sass plus shx? :shrug: --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 19267d698..4767a2538 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ }, "license": "MIT", "dependencies": { - "jquery": "1.9.1 - 3", + "jquery": ">=1.9.1", "tether": "^1.3.7" }, "devDependencies": { @@ -68,7 +68,7 @@ "grunt-exec": "^1.0.1", "grunt-html": "^8.0.2", "grunt-jekyll": "^0.4.4", - "grunt-sass": "^1.2.1", + "grunt-sass": "2.0.0", "grunt-saucelabs": "^9.0.0", "grunt-stamp": "^0.3.0", "htmlhint": "^0.9.13", @@ -78,7 +78,7 @@ "postcss-cli": "^2.6.0", "postcss-flexbugs-fixes": "^2.0.0", "shelljs": "^0.7.4", - "shx": "^0.1.4", + "shx": "^0.2.1", "time-grunt": "^1.4.0", "uglify-js": "^2.7.5" }, -- cgit v1.2.3