From f676d9828473d20d8d33a8676eab6ba11c3ed116 Mon Sep 17 00:00:00 2001 From: Justin Rummel Date: Tue, 27 Nov 2018 08:26:02 -0500 Subject: [PATCH] bundle update and 14.4.1 spec update --- Gemfile.lock | 6 ++--- _layouts/default.html | 4 +-- minimal-mistakes-jekyll.gemspec | 2 +- package.json | 44 +++++++++------------------------ 4 files changed, 18 insertions(+), 38 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c6477995..0f9dc226 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ GIT remote: git://github.com/mmistakes/minimal-mistakes.git - revision: 309b664cdbe08fbd5826ce4073378db9dbf1866d + revision: 763d1c1bb502ec8636af9c147b33f674fdd8b25f specs: - minimal-mistakes-jekyll (4.13.0) + minimal-mistakes-jekyll (4.14.1) jekyll (~> 3.7) jekyll-data (~> 1.0) jekyll-feed (~> 0.10) @@ -32,7 +32,7 @@ GEM ffi (>= 1.3.0) eventmachine (1.2.7) eventmachine (1.2.7-x64-mingw32) - faraday (0.15.3) + faraday (0.15.4) multipart-post (>= 1.2, < 3) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) diff --git a/_layouts/default.html b/_layouts/default.html index c3c65942..bd13cee2 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -5,10 +5,10 @@ {% comment %}{% endcomment %} diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec index e71d8455..abcf9e45 100644 --- a/minimal-mistakes-jekyll.gemspec +++ b/minimal-mistakes-jekyll.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "minimal-mistakes-jekyll" - spec.version = "4.13.0" + spec.version = "4.14.1" spec.authors = ["Michael Rose"] spec.summary = %q{A flexible two-column Jekyll theme.} diff --git a/package.json b/package.json index a6343848..2a78e421 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,12 @@ { "name": "minimal-mistakes", - "version": "4.1.1", - "description": "Minimal Mistakes Jekyll theme npm build scripts", + "version": "4.14.1", + "description": "Minimal Mistakes 2 column Jekyll theme.", "repository": { "type": "git", "url": "git://github.com/mmistakes/minimal-mistakes.git" }, - "keywords": [ - "jekyll", - "theme", - "minimal" - ], + "keywords": ["jekyll", "theme", "minimal"], "author": "Michael Rose", "license": "MIT", "bugs": { @@ -21,32 +17,16 @@ "node": ">= 0.10.0" }, "devDependencies": { - "grunt": "~1.0.1", - "grunt-autoprefixer": "~3.0.4", - "grunt-build-control": "~0.7.1", - "grunt-contrib-clean": "^1.0.0", - "grunt-contrib-connect": "~1.0.2", - "grunt-contrib-copy": "~1.0.0", - "grunt-contrib-cssmin": "~2.0.0", - "grunt-contrib-htmlmin": "~2.3.0", - "grunt-contrib-imagemin": "~1.0.1", - "grunt-contrib-uglify": "^2.2.0", - "grunt-contrib-watch": "~1.0.0", - "grunt-critical": "~0.2.2", - "grunt-jekyll": "^0.4.6", - "grunt-sass": "~2.0.0", - "grunt-shell": "^2.1.0", - "grunt-svgmin": "~4.0.0", - "grunt-uncss": "~0.6.1", - "jit-grunt": "^0.10.0", - "npm-run-all": "^4.0.2", - "onchange": "^3.2.1", - "time-grunt": "^1.4.0", + "npm-run-all": "^1.7.0", + "onchange": "^2.2.0", "uglify-js": "^2.6.1" }, "scripts": { - "uglify": "uglifyjs assets/js/vendor/jquery/jquery-1.12.4.min.js assets/js/plugins/jquery.fitvids.js assets/js/plugins/jquery.greedy-navigation.js assets/js/plugins/jquery.magnific-popup.js assets/js/plugins/jquery.smooth-scroll.min.js assets/js/plugins/stickyfill.min.js assets/js/_main.js -c -m -o assets/js/main.min.js", - "watch:js": "onchange \"assets/js/**/*.js\" -e \"assets/js/main.min.js\" -- npm run build:js", - "build:js": "npm run uglify" + "uglify": + "uglifyjs assets/js/vendor/jquery/jquery-3.3.1.min.js assets/js/plugins/jquery.fitvids.js assets/js/plugins/jquery.greedy-navigation.js assets/js/plugins/jquery.magnific-popup.js assets/js/plugins/jquery.smooth-scroll.min.js assets/js/_main.js -c -m -o assets/js/main.min.js", + "add-banner": "node banner.js", + "watch:js": + "onchange \"assets/js/**/*.js\" -e \"assets/js/main.min.js\" -- npm run build:js", + "build:js": "npm run uglify && npm run add-banner" } -} +} \ No newline at end of file