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