From a90b36918f026dd291bef09f66fe8c212fe7984a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 20 May 2016 09:04:31 -0700 Subject: Add "The Bootstrap Authors" to copyright notices (#19936) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ❤️❤️❤️ https://github.com/twbs/bootstrap/graphs/contributors --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 32c823821..7b655df8b 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "web" ], "homepage": "http://getbootstrap.com", - "author": "Twitter, Inc.", + "author": "The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)", + "contributors": ["Twitter, Inc."], "scripts": { "change-version": "node grunt/change-version.js", "shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", -- cgit v1.2.3 From f77d8c91a9c9f53b30535016c72e821f047cd924 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 30 May 2016 22:14:18 -0700 Subject: Killed the grunt-eslint middleman; Long live ESLint. Refs #19908 [skip sauce] [skip validator] --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 7b655df8b..f4c96bb7b 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,8 @@ "scripts": { "change-version": "node grunt/change-version.js", "shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", - "test": "grunt test" + "eslint": "eslint --config js/.eslintrc js/src", + "test": "npm run eslint && grunt test" }, "style": "dist/css/bootstrap.css", "sass": "scss/bootstrap.scss", @@ -37,6 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^4.1.3", + "eslint": "^1.5.1", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", @@ -50,7 +52,6 @@ "grunt-contrib-sass": "^1.0.0", "grunt-contrib-uglify": "^1.0.0", "grunt-contrib-watch": "^1.0.0", - "grunt-eslint": "^17.1.0", "grunt-exec": "^0.4.6", "grunt-html": "^7.0.0", "grunt-jekyll": "^0.4.2", -- cgit v1.2.3 From 324cbb2280cba8681395ed9f2b76c0ccdbf77c8d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 30 May 2016 23:38:10 -0700 Subject: Upgrade ESlint to v1.7.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enable new rules: * no-empty-pattern * no-magic-numbers (exempting 0 and ±1) Refs #19908 [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index f4c96bb7b..c7d0d9538 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^4.1.3", - "eslint": "^1.5.1", + "eslint": "^1.7.3", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3 From 00a3e1d9adfe0d7fc5a2e9ef2e529a1095de55d2 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 30 May 2016 23:59:23 -0700 Subject: Upgrade ESLint to v1.9.0 Refs #19908 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index c7d0d9538..d358bb866 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^4.1.3", - "eslint": "^1.7.3", + "eslint": "^1.9.0", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3 From 9324da7aeb35055c0b8ce9eccc0b56ac2b9c5574 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 31 May 2016 00:11:19 -0700 Subject: Upgrade ESLint to v1.10.3 Refs #19908 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index d358bb866..db64c2afe 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "scripts": { "change-version": "node grunt/change-version.js", "shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", - "eslint": "eslint --config js/.eslintrc js/src", + "eslint": "eslint --config js/.eslintrc.json js/src", "test": "npm run eslint && grunt test" }, "style": "dist/css/bootstrap.css", @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^4.1.3", - "eslint": "^1.9.0", + "eslint": "^1.10.3", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3 From ac25ee7a90673518c9776fd90ea865ecc8b350d0 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 31 May 2016 00:53:01 -0700 Subject: Upgrade ESLint to v2.0.0 [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index db64c2afe..4676977c8 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^4.1.3", - "eslint": "^1.10.3", + "eslint": "^2.0.0", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3 From 93f028b8f109dba44ac79edea89027a2f2b609ad Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 31 May 2016 01:02:30 -0700 Subject: Upgrade babel-eslint to ^6.0.4 [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 4676977c8..b87705106 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ }, "devDependencies": { "autoprefixer": "^6.0.3", - "babel-eslint": "^4.1.3", + "babel-eslint": "^6.0.4", "eslint": "^2.0.0", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", -- cgit v1.2.3 From 166daf498a51a42fa2c1c8dd02aaf7678d9987c2 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 31 May 2016 01:27:01 -0700 Subject: Upgrade ESLint to v2.2.0 (#20000) [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index b87705106..5afbef629 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^6.0.4", - "eslint": "^2.0.0", + "eslint": "^2.2.0", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3 From ef948ece79f7bfc62c465b4f7930f85b868eb8fe Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 7 Feb 2016 00:34:29 -0800 Subject: Integrate postcss-flexbugs-fixes into build; fixes #18569 --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 5afbef629..f8e414148 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "is-travis": "^1.0.0", "load-grunt-tasks": "^3.4.0", "mq4-hover-shim": "^0.3.0", + "postcss-flexbugs-fixes": "^2.0.0", "shelljs": "^0.6.0", "time-grunt": "^1.2.1" }, -- cgit v1.2.3 From 92ec110f089e268d88b81727ddf08d14db3c1df7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 14:01:12 -0700 Subject: Upgrade ESLint to v2.3.0 (#20041) Refs #19908 [skip sauce] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index f8e414148..28df1b346 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^6.0.4", - "eslint": "^2.2.0", + "eslint": "^2.3.0", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3 From c5eb5a45e92888da4ecd926c4397ab56c41f163d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 14:13:36 -0700 Subject: Upgrade ESLint to v2.4.0 (#20042) Refs #19908. [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 28df1b346..8604d9f58 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^6.0.4", - "eslint": "^2.3.0", + "eslint": "^2.4.0", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3 From 2b16f5c5100c8a42bccad028903eadac2875e20c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 14:28:34 -0700 Subject: Update ESLint to v2.5.3 (#20043) Refs #19908. [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 8604d9f58..d5f02993f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^6.0.4", - "eslint": "^2.4.0", + "eslint": "^2.5.3", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3 From 6c2ba51ba44dfbdecd46cbba7569ec2fabdf4562 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 14:39:56 -0700 Subject: Upgrade ESLint to v2.7.0 (#20044) Refs #19908 [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index d5f02993f..117bfc64b 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^6.0.4", - "eslint": "^2.5.3", + "eslint": "^2.7.0", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3 From 1f5d8aa4b30475798f4fa4a4d0b607bd0771cb94 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 14:52:07 -0700 Subject: Update ESLint to v2.8.0 (#20045) Refs #19908 [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 117bfc64b..493c270bc 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^6.0.4", - "eslint": "^2.7.0", + "eslint": "^2.8.0", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3 From d1b8ec85e25a33c824c4eb211cb5638e98fd616f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 15:07:16 -0700 Subject: Upgrade ESLint to v2.9.0 (#20047) Refs #19908 [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 493c270bc..caf86f069 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^6.0.4", - "eslint": "^2.8.0", + "eslint": "^2.9.0", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3 From abc4ecf670c190f070320fd04b94357a7963a2f1 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 16:52:06 -0700 Subject: Update ESLint to v2.10.2 (#20063) Refs #19908 [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index caf86f069..10245ec63 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^6.0.4", - "eslint": "^2.9.0", + "eslint": "^2.10.2", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3 From 04165ba6e31cd03e9145f666532d38b147abf703 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 17:08:59 -0700 Subject: Update ESLint to v2.11.1 (latest stable) (#20068) Fixes #19908 [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 10245ec63..e4c9a2ec4 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^6.0.4", - "eslint": "^2.10.2", + "eslint": "^2.11.1", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", -- cgit v1.2.3 From 0c4abb69e3c37cb454e6c3003763171528576ad1 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 17:46:36 -0700 Subject: Kill the grunt-jscs middleman; use JSCS directly instead (#20069) Refs #19990 [skip sauce] [skip validator] --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index e4c9a2ec4..8510855ae 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,8 @@ "change-version": "node grunt/change-version.js", "shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", "eslint": "eslint --config js/.eslintrc.json js/src", - "test": "npm run eslint && grunt test" + "jscs": "jscs --config=js/.jscsrc js/src js/tests/unit docs/assets/js/src docs/assets/js/ie*.js grunt Gruntfile.js", + "test": "npm run eslint && npm run jscs && grunt test" }, "style": "dist/css/bootstrap.css", "sass": "scss/bootstrap.scss", @@ -55,13 +56,13 @@ "grunt-exec": "^0.4.6", "grunt-html": "^7.0.0", "grunt-jekyll": "^0.4.2", - "grunt-jscs": "^2.8.0", "grunt-postcss": "^0.8.0", "grunt-sass": "^1.0.0", "grunt-saucelabs": "^8.6.1", "grunt-scss-lint": "^0.3.8", "grunt-stamp": "^0.1.0", "is-travis": "^1.0.0", + "jscs": "^2.11.0", "load-grunt-tasks": "^3.4.0", "mq4-hover-shim": "^0.3.0", "postcss-flexbugs-fixes": "^2.0.0", -- cgit v1.2.3 From eb350d1a7c91a42b4d943b13edf9304309920cb7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 17:55:21 -0700 Subject: Upgrade to latest version of JSCS (v3.0.4) (#20070) Fixes #20002 [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 8510855ae..5369ac115 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "grunt-scss-lint": "^0.3.8", "grunt-stamp": "^0.1.0", "is-travis": "^1.0.0", - "jscs": "^2.11.0", + "jscs": "^3.0.4", "load-grunt-tasks": "^3.4.0", "mq4-hover-shim": "^0.3.0", "postcss-flexbugs-fixes": "^2.0.0", -- cgit v1.2.3 From 10c9be114b9cb116601f2e67a9489b243d8768ef Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 21:45:59 -0700 Subject: Bump shelljs to ^0.7.0 (#20073) [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 5369ac115..1c871f907 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "load-grunt-tasks": "^3.4.0", "mq4-hover-shim": "^0.3.0", "postcss-flexbugs-fixes": "^2.0.0", - "shelljs": "^0.6.0", + "shelljs": "^0.7.0", "time-grunt": "^1.2.1" }, "engines": { -- cgit v1.2.3 From 143eca3ba97881f818a45a63b4bde7bfc3ed27f3 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 19 Jun 2016 22:09:29 -0700 Subject: package.json: engines: Require Node.js >= 4 (#20141) Refs #17652 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 1c871f907..87d5615dc 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "time-grunt": "^1.2.1" }, "engines": { - "node": ">=0.10.1" + "node": ">=4" }, "files": [ "dist", -- cgit v1.2.3 From a358fc9dc1b71c4177735c4ca27c9da350d655af Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 20 Jun 2016 16:18:21 -0700 Subject: Replace grunt-postcss with postcss-cli (#20140) Refs #19990 Continues the degruntification process. Also removes mq4-hover-shim for now, since it doesn't yet implement the standard PostCSS plugin interface. --- package.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 87d5615dc..eebbb2eee 100644 --- a/package.json +++ b/package.json @@ -13,12 +13,16 @@ ], "homepage": "http://getbootstrap.com", "author": "The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)", - "contributors": ["Twitter, Inc."], + "contributors": [ + "Twitter, Inc." + ], "scripts": { "change-version": "node grunt/change-version.js", "shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", "eslint": "eslint --config js/.eslintrc.json js/src", "jscs": "jscs --config=js/.jscsrc js/src js/tests/unit docs/assets/js/src docs/assets/js/ie*.js grunt Gruntfile.js", + "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", "test": "npm run eslint && npm run jscs && grunt test" }, "style": "dist/css/bootstrap.css", @@ -56,7 +60,6 @@ "grunt-exec": "^0.4.6", "grunt-html": "^7.0.0", "grunt-jekyll": "^0.4.2", - "grunt-postcss": "^0.8.0", "grunt-sass": "^1.0.0", "grunt-saucelabs": "^8.6.1", "grunt-scss-lint": "^0.3.8", @@ -64,7 +67,7 @@ "is-travis": "^1.0.0", "jscs": "^3.0.4", "load-grunt-tasks": "^3.4.0", - "mq4-hover-shim": "^0.3.0", + "postcss-cli": "^2.5.2", "postcss-flexbugs-fixes": "^2.0.0", "shelljs": "^0.7.0", "time-grunt": "^1.2.1" -- cgit v1.2.3 From dec2695d7e707d4e35d163c3b2e4223db8a25fe0 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 28 Jun 2016 18:59:26 +0300 Subject: Use shx so that the npm scripts work everywhere the same. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index eebbb2eee..f28e0369a 100644 --- a/package.json +++ b/package.json @@ -18,11 +18,11 @@ ], "scripts": { "change-version": "node grunt/change-version.js", - "shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", "eslint": "eslint --config js/.eslintrc.json js/src", "jscs": "jscs --config=js/.jscsrc js/src js/tests/unit docs/assets/js/src docs/assets/js/ie*.js grunt Gruntfile.js", "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", + "shrinkwrap": "npm shrinkwrap --dev && shx mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", "test": "npm run eslint && npm run jscs && grunt test" }, "style": "dist/css/bootstrap.css", @@ -70,6 +70,7 @@ "postcss-cli": "^2.5.2", "postcss-flexbugs-fixes": "^2.0.0", "shelljs": "^0.7.0", + "shx": "^0.1.2", "time-grunt": "^1.2.1" }, "engines": { -- cgit v1.2.3 From ed3ba4742506a7164caddbcdcfc58aba25277b4d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 28 Jun 2016 22:19:46 -0700 Subject: Support jQuery v3 in Bootstrap v4 (#20191) * bower.json, package.json: Extend jQuery version ranges to include v3 * NuGet: Bump jQuery to v3.0.0.1 * Docs+Examples: Update jQuery to v3.0.0 * Use jQuery v3.0.0 for JS unit tests * Update jqueryVersionCheck to allow jQuery v3.x.x --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index f28e0369a..24e8abd8c 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ }, "license": "MIT", "dependencies": { - "jquery": "1.9.1 - 2", + "jquery": "1.9.1 - 3", "tether": "^1.1.1" }, "devDependencies": { @@ -101,7 +101,7 @@ } }, "dependencies": { - "jquery": "*" + "jquery": "1.9.1 - 3" } } } -- cgit v1.2.3 From 7f6fd5be765d92029e7d51f5400bb08d85a0b897 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 29 Jun 2016 08:54:25 +0300 Subject: Update devDependencies. Only grunt-saucelabs is left in order to update grunt to v1.x. --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 24e8abd8c..6e004e1f0 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "eslint": "^2.11.1", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", - "grunt-build-control": "^0.6.0", + "grunt-build-control": "^0.7.0", "grunt-contrib-clean": "^1.0.0", "grunt-contrib-compress": "^1.1.0", "grunt-contrib-concat": "^1.0.0", @@ -57,13 +57,13 @@ "grunt-contrib-sass": "^1.0.0", "grunt-contrib-uglify": "^1.0.0", "grunt-contrib-watch": "^1.0.0", - "grunt-exec": "^0.4.6", - "grunt-html": "^7.0.0", + "grunt-exec": "^1.0.0", + "grunt-html": "^8.0.1", "grunt-jekyll": "^0.4.2", "grunt-sass": "^1.0.0", "grunt-saucelabs": "^8.6.1", "grunt-scss-lint": "^0.3.8", - "grunt-stamp": "^0.1.0", + "grunt-stamp": "^0.2.0", "is-travis": "^1.0.0", "jscs": "^3.0.4", "load-grunt-tasks": "^3.4.0", -- cgit v1.2.3 From 5d33891c32322047dd341bc90a40606563ccebe7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 28 Jun 2016 23:25:14 -0700 Subject: Avoid globbing in jscs npm script for Windows compatibility Fixes #20197 [skip sauce] [skip validator] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 24e8abd8c..910c634aa 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "scripts": { "change-version": "node grunt/change-version.js", "eslint": "eslint --config js/.eslintrc.json js/src", - "jscs": "jscs --config=js/.jscsrc js/src js/tests/unit docs/assets/js/src docs/assets/js/ie*.js grunt Gruntfile.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", "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", "shrinkwrap": "npm shrinkwrap --dev && shx mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", -- cgit v1.2.3 From e727ca9654966dbf525e72501c2a3984d92e7bd8 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 2 Jul 2016 20:49:51 +0300 Subject: Update devDepedencies. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 215ca8576..e8523f591 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,8 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^6.0.4", - "eslint": "^2.11.1", - "grunt": "^0.4.5", + "eslint": "^3.0.0", + "grunt": "^1.0.1", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.7.0", "grunt-contrib-clean": "^1.0.0", @@ -63,7 +63,7 @@ "grunt-sass": "^1.0.0", "grunt-saucelabs": "^8.6.1", "grunt-scss-lint": "^0.3.8", - "grunt-stamp": "^0.2.0", + "grunt-stamp": "^0.3.0", "is-travis": "^1.0.0", "jscs": "^3.0.4", "load-grunt-tasks": "^3.4.0", -- cgit v1.2.3 From 1e01721717fb125d4b75b3ba417d1c20bb13ad0a Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 11 Jul 2016 02:44:58 +0300 Subject: Bump devDependencies. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index e8523f591..4fe64fd59 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "grunt-html": "^8.0.1", "grunt-jekyll": "^0.4.2", "grunt-sass": "^1.0.0", - "grunt-saucelabs": "^8.6.1", + "grunt-saucelabs": "^9.0.0", "grunt-scss-lint": "^0.3.8", "grunt-stamp": "^0.3.0", "is-travis": "^1.0.0", -- cgit v1.2.3 From 0cf5204a48157b41420e60d8a71ac0ddbb968ab5 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 14 Jul 2016 16:22:56 -0700 Subject: Add HTMLHint to the build; fixes #20297 (#20301) [skip sauce] --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 4fe64fd59..2d6b598d2 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "change-version": "node grunt/change-version.js", "eslint": "eslint --config js/.eslintrc.json js/src", "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", "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", "shrinkwrap": "npm shrinkwrap --dev && shx mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", @@ -64,6 +65,7 @@ "grunt-saucelabs": "^9.0.0", "grunt-scss-lint": "^0.3.8", "grunt-stamp": "^0.3.0", + "htmlhint": "^0.9.13", "is-travis": "^1.0.0", "jscs": "^3.0.4", "load-grunt-tasks": "^3.4.0", -- cgit v1.2.3 From 1a4e48e3295ff8581903a6748d8bdb796a550356 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 16 Jul 2016 14:12:49 -0700 Subject: Rename shrinkwrap-related npm script (#20311) To avoid infinite recursion in newer npm versions, which added a lifecycle script for `npm shrinkwrap`. Refs https://github.com/npm/npm/issues/13253 Refs https://github.com/npm/npm/pull/12814 [ci skip] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 2d6b598d2..38d6b87bf 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "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", - "shrinkwrap": "npm shrinkwrap --dev && shx mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", + "update-shrinkwrap": "npm shrinkwrap --dev && shx mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", "test": "npm run eslint && npm run jscs && grunt test" }, "style": "dist/css/bootstrap.css", -- cgit v1.2.3 From 24e992a6ffbb3b54424eb1042d49005124b265d9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Jul 2016 09:31:24 -0700 Subject: bump versions --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 38d6b87bf..dbfbcbe7e 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.2", + "version": "4.0.0-alpha.3", "keywords": [ "css", "sass", -- cgit v1.2.3 From 1885bfe533722716b846835c825c1ef225b9b0a0 Mon Sep 17 00:00:00 2001 From: Onoshko Dan Date: Thu, 28 Jul 2016 23:55:10 +0700 Subject: Fix package.json For example, `resolve` npm module can't resolve path to bootstrap. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index dbfbcbe7e..0daac801f 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ }, "style": "dist/css/bootstrap.css", "sass": "scss/bootstrap.scss", - "main": "./dist/js/npm", + "main": "dist/js/bootstrap", "repository": { "type": "git", "url": "https://github.com/twbs/bootstrap.git" -- cgit v1.2.3 From 1efcbc81f29c084164e636f1655008cb376af765 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Jul 2016 10:44:19 -0700 Subject: Fixes #20385 Recursive glob action --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index dbfbcbe7e..3fc7ce1da 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "files": [ "dist", "grunt", - "js/*.js", + "js/**/*.js", "scss/**/*.scss", "Gruntfile.js", "LICENSE" -- cgit v1.2.3 From b821c57278125ad7f90e80b13a09daf08b22f54e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2016 17:50:34 -0700 Subject: Follow up to #20394: remove ignore for file that no longer exists --- package.json | 3 --- 1 file changed, 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 1dbd90bbd..c68729460 100644 --- a/package.json +++ b/package.json @@ -88,9 +88,6 @@ ], "jspm": { "main": "js/bootstrap", - "ignore": [ - "dist/js/npm" - ], "directories": { "lib": "dist" }, -- cgit v1.2.3 From 5495a4b3d383c745065a177d3adb8e5db94acd7f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Sep 2016 12:41:44 -0700 Subject: versions --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index c68729460..c056861ee 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.3", + "version": "4.0.0-alpha.4", "keywords": [ "css", "sass", -- cgit v1.2.3 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