From 1ba4577cc6786c15a86cabb5dff719febc7c9b15 Mon Sep 17 00:00:00 2001 From: Jeremy Danyow Date: Mon, 24 Aug 2015 07:44:30 -0400 Subject: Update jspm package configuration Related to https://github.com/jspm/registry/pull/534 --- package.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index eded9e2b4..570ebe7f8 100644 --- a/package.json +++ b/package.json @@ -82,16 +82,18 @@ ], "jspm": { "main": "js/bootstrap", + "ignore": ["dist/js/npm"], + "directories": { + "lib": "dist" + }, "shim": { "js/bootstrap": { - "deps": "jquery", + "deps": ["jquery"], "exports": "$" } }, - "files": [ - "css", - "fonts", - "js" - ] + "dependencies": { + "jquery": "*" + } } } -- cgit v1.2.3 From 6f9b0ba6ce435504d528729c3defe3c198801dbb Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 19 Sep 2015 09:41:04 +0300 Subject: Update devDependencies. --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index aa18f874a..4ee5ab911 100644 --- a/package.json +++ b/package.json @@ -28,19 +28,19 @@ }, "license": "MIT", "devDependencies": { - "babel-eslint": "^4.1.1", + "babel-eslint": "^4.1.3", "btoa": "~1.1.2", "glob": "~5.0.14", "grunt": "~0.4.5", "grunt-autoprefixer": "~3.0.3", - "grunt-babel": "^5.0.1", - "grunt-build-control": "~0.5.0", + "grunt-babel": "^5.0.3", + "grunt-build-control": "~0.6.0", "grunt-contrib-clean": "~0.6.0", "grunt-contrib-compress": "~0.13.0", "grunt-contrib-concat": "~0.5.1", "grunt-contrib-connect": "~0.11.2", "grunt-contrib-copy": "~0.8.1", - "grunt-contrib-cssmin": "~0.13.0", + "grunt-contrib-cssmin": "~0.14.0", "grunt-contrib-qunit": "~0.7.0", "grunt-contrib-sass": "^0.9.2", "grunt-contrib-uglify": "~0.9.2", @@ -58,7 +58,7 @@ "grunt-scss-lint": "^0.3.8", "grunt-sed": "~0.1.1", "grunt-stamp": "^0.1.0", - "load-grunt-tasks": "~3.2.0", + "load-grunt-tasks": "~3.3.0", "markdown-it": "^4.4.0", "mq4-hover-shim": "^0.2.0", "npm-shrinkwrap": "^200.1.0", -- cgit v1.2.3 From 74cc05c0325bde26201aeff2ff7835f73158401b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 25 Sep 2015 15:32:42 -0700 Subject: Only run htmllint on Travis So as to avoid any dependence on Java for normal users of the Gruntfile. [skip sauce] --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 4ee5ab911..fdd09f5a4 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "grunt-scss-lint": "^0.3.8", "grunt-sed": "~0.1.1", "grunt-stamp": "^0.1.0", + "is-travis": "^1.0.0", "load-grunt-tasks": "~3.3.0", "markdown-it": "^4.4.0", "mq4-hover-shim": "^0.2.0", -- cgit v1.2.3 From fe0ad8215982bb5dad794f4e954dfa36550d787e Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 14 Oct 2015 00:49:05 +0300 Subject: Update devDependencies. --- package.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 17cb245da..0e4d297c3 100644 --- a/package.json +++ b/package.json @@ -60,8 +60,8 @@ "grunt-stamp": "^0.1.0", "is-travis": "^1.0.0", "load-grunt-tasks": "~3.3.0", - "markdown-it": "^4.4.0", - "mq4-hover-shim": "^0.2.0", + "markdown-it": "^5.0.0", + "mq4-hover-shim": "^0.3.0", "npm-shrinkwrap": "^200.1.0", "time-grunt": "^1.2.1" }, @@ -79,13 +79,17 @@ ], "jspm": { "main": "js/bootstrap", - "ignore": ["dist/js/npm"], + "ignore": [ + "dist/js/npm" + ], "directories": { "lib": "dist" }, "shim": { "js/bootstrap": { - "deps": ["jquery"], + "deps": [ + "jquery" + ], "exports": "$" } }, -- cgit v1.2.3 From 8924b5044ec9522e2c8ac1295e7843d70404449a Mon Sep 17 00:00:00 2001 From: Henry Zhu Date: Mon, 19 Oct 2015 00:07:57 -0400 Subject: update grunt-jscs to 2.1.0 to use jscs 2.x --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 0e4d297c3..caf458219 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "grunt-exec": "~0.4.6", "grunt-html": "~5.0.0", "grunt-jekyll": "~0.4.2", - "grunt-jscs": "~1.8.0", + "grunt-jscs": "~2.1.0", "grunt-line-remover": "0.0.2", "grunt-postcss": "^0.6.0", "grunt-sass": "^1.0.0", -- cgit v1.2.3 From 154ed7318109858339aa42c904b2f42dd3f59824 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 24 Oct 2015 19:16:51 +0300 Subject: Update devDependencies. [validator skip] [sauce skip] --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index caf458219..cc4ddc2c5 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "grunt-babel": "^5.0.3", "grunt-build-control": "~0.6.0", "grunt-contrib-clean": "~0.6.0", - "grunt-contrib-compress": "~0.13.0", + "grunt-contrib-compress": "~0.14.0", "grunt-contrib-concat": "~0.5.1", "grunt-contrib-connect": "~0.11.2", "grunt-contrib-copy": "~0.8.1", @@ -52,7 +52,7 @@ "grunt-jekyll": "~0.4.2", "grunt-jscs": "~2.1.0", "grunt-line-remover": "0.0.2", - "grunt-postcss": "^0.6.0", + "grunt-postcss": "^0.7.0", "grunt-sass": "^1.0.0", "grunt-saucelabs": "~8.6.1", "grunt-scss-lint": "^0.3.8", -- cgit v1.2.3 From f564c683f776173c1dc828cc6095358c0fd4d74c Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 29 Oct 2015 08:15:05 +0200 Subject: Update devDependencies. [skip sauce] --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index cc4ddc2c5..2f399acc3 100644 --- a/package.json +++ b/package.json @@ -43,14 +43,14 @@ "grunt-contrib-cssmin": "~0.14.0", "grunt-contrib-qunit": "~0.7.0", "grunt-contrib-sass": "^0.9.2", - "grunt-contrib-uglify": "~0.9.2", + "grunt-contrib-uglify": "~0.10.0", "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~3.1.0", "grunt-eslint": "^17.1.0", "grunt-exec": "~0.4.6", "grunt-html": "~5.0.0", "grunt-jekyll": "~0.4.2", - "grunt-jscs": "~2.1.0", + "grunt-jscs": "~2.2.0", "grunt-line-remover": "0.0.2", "grunt-postcss": "^0.7.0", "grunt-sass": "^1.0.0", -- cgit v1.2.3 From a8c04056fcb3c515eb0698085ba1bc183c23d247 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 11 Nov 2015 08:59:43 +0200 Subject: Update devDependencies. [sauce skip] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 2f399acc3..6f7651f7b 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "grunt-exec": "~0.4.6", "grunt-html": "~5.0.0", "grunt-jekyll": "~0.4.2", - "grunt-jscs": "~2.2.0", + "grunt-jscs": "~2.3.0", "grunt-line-remover": "0.0.2", "grunt-postcss": "^0.7.0", "grunt-sass": "^1.0.0", -- cgit v1.2.3 From 5a26a1386828758dbe0f132c2d02a3d46b5e0705 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 12 Nov 2015 09:17:26 +0200 Subject: Downgrade grunt-contrib-uglify to fix the comments issue. Fixes #18224. [sauce skip] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 6f7651f7b..c73aa2513 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "grunt-contrib-cssmin": "~0.14.0", "grunt-contrib-qunit": "~0.7.0", "grunt-contrib-sass": "^0.9.2", - "grunt-contrib-uglify": "~0.10.0", + "grunt-contrib-uglify": "~0.9.2", "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~3.1.0", "grunt-eslint": "^17.1.0", -- cgit v1.2.3 From 50c43bc55a3576636cf83eae2a918fa6dd231b75 Mon Sep 17 00:00:00 2001 From: Bass Jobsen Date: Mon, 26 Oct 2015 23:15:00 +0100 Subject: Replace grunt-autoprefixer with grunt-postcss + autoprefixer Closes #18068 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index c73aa2513..9db16134a 100644 --- a/package.json +++ b/package.json @@ -28,11 +28,11 @@ }, "license": "MIT", "devDependencies": { + "autoprefixer": "^6.0.3", "babel-eslint": "^4.1.3", "btoa": "~1.1.2", "glob": "~5.0.14", "grunt": "~0.4.5", - "grunt-autoprefixer": "~3.0.3", "grunt-babel": "^5.0.3", "grunt-build-control": "~0.6.0", "grunt-contrib-clean": "~0.6.0", -- cgit v1.2.3 From 1b645ef686c61fef6be87c5ef15411cbeb869702 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 16 Nov 2015 09:32:59 +0200 Subject: Update devDependencies. Adapt uglify for the new version. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 9db16134a..5e3e9a8b9 100644 --- a/package.json +++ b/package.json @@ -31,11 +31,11 @@ "autoprefixer": "^6.0.3", "babel-eslint": "^4.1.3", "btoa": "~1.1.2", - "glob": "~5.0.14", + "glob": "~6.0.1", "grunt": "~0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "~0.6.0", - "grunt-contrib-clean": "~0.6.0", + "grunt-contrib-clean": "~0.7.0", "grunt-contrib-compress": "~0.14.0", "grunt-contrib-concat": "~0.5.1", "grunt-contrib-connect": "~0.11.2", @@ -43,7 +43,7 @@ "grunt-contrib-cssmin": "~0.14.0", "grunt-contrib-qunit": "~0.7.0", "grunt-contrib-sass": "^0.9.2", - "grunt-contrib-uglify": "~0.9.2", + "grunt-contrib-uglify": "~0.10.1", "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~3.1.0", "grunt-eslint": "^17.1.0", -- cgit v1.2.3 From bc2d162fd15ca2127a13bfba9267c0b3f932296f Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 23 Nov 2015 18:40:44 +0200 Subject: Bump grunt-contrib-uglify. [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 5e3e9a8b9..8ffcfd56b 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "grunt-contrib-cssmin": "~0.14.0", "grunt-contrib-qunit": "~0.7.0", "grunt-contrib-sass": "^0.9.2", - "grunt-contrib-uglify": "~0.10.1", + "grunt-contrib-uglify": "~0.11.0", "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~3.1.0", "grunt-eslint": "^17.1.0", -- cgit v1.2.3 From 28d85ab8092fde0350ed3842f252f61ef630c3eb Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 3 Dec 2015 08:51:44 +0200 Subject: Update grunt-jscs. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 8ffcfd56b..c7aafd743 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "grunt-exec": "~0.4.6", "grunt-html": "~5.0.0", "grunt-jekyll": "~0.4.2", - "grunt-jscs": "~2.3.0", + "grunt-jscs": "~2.4.0", "grunt-line-remover": "0.0.2", "grunt-postcss": "^0.7.0", "grunt-sass": "^1.0.0", -- cgit v1.2.3 From e95ab5c36ed1746277515bc3514ae8f23dbdac0d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 1 Dec 2015 20:25:09 -0800 Subject: s/grunt-sed/npm script/ ; fixes #18338 [skip sauce] [skip validator] --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index c7aafd743..617d84564 100644 --- a/package.json +++ b/package.json @@ -56,13 +56,13 @@ "grunt-sass": "^1.0.0", "grunt-saucelabs": "~8.6.1", "grunt-scss-lint": "^0.3.8", - "grunt-sed": "~0.1.1", "grunt-stamp": "^0.1.0", "is-travis": "^1.0.0", "load-grunt-tasks": "~3.3.0", "markdown-it": "^5.0.0", "mq4-hover-shim": "^0.3.0", "npm-shrinkwrap": "^200.1.0", + "shelljs": "^0.5.3", "time-grunt": "^1.2.1" }, "engines": { @@ -96,5 +96,8 @@ "dependencies": { "jquery": "*" } + }, + "scripts": { + "change-version": "node grunt/change-version.js" } } -- cgit v1.2.3 From 3cd8bd58e3a56161d8c4b131f3566ad84c885a40 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 5 Dec 2015 12:06:57 +0200 Subject: package.json: fix duplicate scripts property. [skip sauce] [skip validator] --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 617d84564..f78686564 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "homepage": "http://getbootstrap.com", "author": "Twitter, Inc.", "scripts": { + "change-version": "node grunt/change-version.js", "test": "grunt test" }, "style": "dist/css/bootstrap.css", @@ -96,8 +97,5 @@ "dependencies": { "jquery": "*" } - }, - "scripts": { - "change-version": "node grunt/change-version.js" } } -- cgit v1.2.3