From 2ef8fdc16d15dffd8f5144fb640ec2321ee49fc1 Mon Sep 17 00:00:00 2001 From: lifehackerhansol Date: Thu, 26 Aug 2021 23:14:51 -0700 Subject: [PATCH] Update MM to 4.24.0 and update some deps (#1905) * Update MM to 4.24.0 and update some deps * Update package.json to MM 4.24.0 * Update package.json to MM 4.24.0 * Add dependabot config to auto-update packages --- .github/dependabot.yml | 12 ++++++++++++ .gitignore | 1 + Gemfile | 6 ++++-- minimal-mistakes-jekyll.gemspec | 19 +++++++++---------- package.json | 13 +++++++------ 5 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..3e84edb22b --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: +- package-ecosystem: npm + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 +- package-ecosystem: bundler + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 diff --git a/.gitignore b/.gitignore index 9f31bc8f68..c47dba95f3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ .bundle .DS_Store .jekyll-metadata +.jekyll-cache .sass-cache _asset_bundler_cache _site diff --git a/Gemfile b/Gemfile index ef9533a3ba..bc08b6437b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,6 @@ source "https://rubygems.org" -gem 'jekyll-redirect-from' -gem 'kramdown-parser-gfm' +gem "jemoji", "~> 0.8" +gem "jekyll-redirect-from", "~>0.16" +gem "kramdown-parser-gfm", "~>1.1" +gem "webrick", "~>1.7" gemspec diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec index 11eba516fc..8905a25bac 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.6.0" + spec.version = "4.24.0" spec.authors = ["Michael Rose"] spec.summary = %q{A flexible two-column Jekyll theme.} @@ -15,14 +15,13 @@ Gem::Specification.new do |spec| f.match(%r{^(assets|_(data|includes|layouts|sass)/|(LICENSE|README|CHANGELOG)((\.(txt|md|markdown)|$)))}i) end - spec.add_runtime_dependency "jekyll", "~> 3.5", ">= 3.5.1" + spec.add_runtime_dependency "jekyll", ">= 3.7", "< 5.0" spec.add_runtime_dependency "jekyll-paginate", "~> 1.1" - spec.add_runtime_dependency "jekyll-sitemap", "~> 1.0" - spec.add_runtime_dependency "jekyll-gist", "~> 1.4" - spec.add_runtime_dependency "jekyll-feed", "~> 0.9.2" - spec.add_runtime_dependency "jekyll-data", "~> 1.0" - spec.add_runtime_dependency "jemoji", "~> 0.8" + spec.add_runtime_dependency "jekyll-sitemap", "~> 1.3" + spec.add_runtime_dependency "jekyll-gist", "~> 1.5" + spec.add_runtime_dependency "jekyll-feed", "~> 0.1" + spec.add_runtime_dependency "jekyll-include-cache", "~> 0.1" - spec.add_development_dependency "bundler", "~> 1.15" - spec.add_development_dependency "rake", "~> 10.0" -end + spec.add_development_dependency "bundler" + spec.add_development_dependency "rake", ">= 12.3.3" +end \ No newline at end of file diff --git a/package.json b/package.json index 3935b24615..c71c518e00 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,8 @@ { "name": "minimal-mistakes", - "version": "4.6.0", - "description": "Minimal Mistakes Jekyll theme npm build scripts", + "private": true, + "version": "4.24.0", + "description": "Minimal Mistakes 2 column Jekyll theme.", "repository": { "type": "git", "url": "git://github.com/mmistakes/minimal-mistakes.git" @@ -21,12 +22,12 @@ "node": ">= 0.10.0" }, "devDependencies": { - "npm-run-all": "^1.7.0", - "onchange": "^2.2.0", - "uglify-js": "^2.6.1" + "npm-run-all": "^4.1.5", + "onchange": "^7.1.0", + "uglify-js": "^3.13.6" }, "scripts": { - "uglify": "uglifyjs assets/js/vendor/jquery/jquery-3.2.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", + "uglify": "uglifyjs assets/js/vendor/jquery/jquery-3.5.1.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.ba-throttle-debounce.js assets/js/plugins/smooth-scroll.js assets/js/plugins/gumshoe.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"