From 7590f22dd919ca27fdaf828a8fe117f71f01a16b Mon Sep 17 00:00:00 2001 From: Allan James Vestal Date: Fri, 14 Jul 2017 11:11:39 -0500 Subject: [PATCH 1/3] Add eyeglass config to package.json. --- package.json | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 0b35a56b..dc0ebd08 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,8 @@ "google", "android", "browser", - "framework" + "framework", + "eyeglass-module" ], "homepage": "https://github.com/FezVrasta/bootstrap-material-design", "dependencies": { @@ -31,8 +32,10 @@ "jquery": ">=1.9.1" }, "devDependencies": { + "eyeglass": "^1.2.1", "grunt": "^0.4.5", "grunt-autoprefixer": "~3.0.3", + "grunt-bootlint": "latest", "grunt-contrib-clean": "~0.6.0", "grunt-contrib-compress": "~0.14.0", "grunt-contrib-concat": "~0.5.1", @@ -40,25 +43,29 @@ "grunt-contrib-copy": "~0.8.0", "grunt-contrib-csslint": "~0.5.0", "grunt-contrib-cssmin": "~0.14.0", - "grunt-contrib-jshint": "~0.11.2", "grunt-contrib-htmlmin": "~0.6.0", + "grunt-contrib-jasmine": "^0.8.0", + "grunt-contrib-jshint": "~0.11.2", "grunt-contrib-less": "~1.1.0", + "grunt-contrib-sass": "^0.8.1", "grunt-contrib-uglify": "~0.9.2", "grunt-contrib-watch": "~0.6.1", + "grunt-dependency-installer": "^0.2.0", "grunt-exec": "~0.4.6", "grunt-html": "~5.0.1", "grunt-jekyll": "~0.4.2", "grunt-jscs": "~2.3.0", - "grunt-bootlint": "latest", - "grunt-contrib-jasmine": "^0.8.0", - "grunt-dependency-installer": "^0.2.0", "grunt-less-to-sass": "latest", "grunt-newer": "^0.7.0", - "grunt-contrib-sass": "^0.8.1", "jshint-stylish": "^1.0.0", "load-grunt-tasks": "~3.3.0", "spacejam": "^1.1.1" }, + "eyeglass": { + "exports": false, + "needs": "^1.2.1", + "sassDir": "sass" + }, "_bootstraps_dependencies_we_dont_use_yet": { "grunt-contrib-jade": "~0.15.0", "grunt-csscomb": "~3.1.0", @@ -69,5 +76,3 @@ "time-grunt": "^1.2.1" } } - - From a4d78baacd8adc4dc613892bf0cc8305f32a159d Mon Sep 17 00:00:00 2001 From: Allan James Vestal Date: Fri, 14 Jul 2017 11:42:10 -0500 Subject: [PATCH 2/3] Made eyeglass version-requirement a wildcard. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dc0ebd08..73f47d7f 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ }, "eyeglass": { "exports": false, - "needs": "^1.2.1", + "needs": "*", "sassDir": "sass" }, "_bootstraps_dependencies_we_dont_use_yet": { From 9c9613d99a95c71697159a9e25f5de704156d709 Mon Sep 17 00:00:00 2001 From: Allan James Vestal Date: Fri, 14 Jul 2017 12:15:58 -0500 Subject: [PATCH 3/3] Remove eyeglass as a peer dependency (not needed to make stylesheets eyeglass-importable by another module). --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 73f47d7f..f41f34e7 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "jquery": ">=1.9.1" }, "devDependencies": { - "eyeglass": "^1.2.1", "grunt": "^0.4.5", "grunt-autoprefixer": "~3.0.3", "grunt-bootlint": "latest",