From 171f898180af769ec4dcb61c837166b264c2e110 Mon Sep 17 00:00:00 2001 From: amjjbonvin Date: Tue, 29 Sep 2026 22:52:55 +0200 Subject: [PATCH] Declare logger, refresh action pins, drop grunt tooling Backlog items 5, 6 and 7. logger (item 5) Jekyll 4.4 requires logger but does not declare it, so it resolved from the standard library and warned on every build. Ruby 3.5 removes it from the default gems, at which point a bundled build without it is expected to fail rather than warn. Declared as `gem "logger", "~> 1.6"`, resolving to 1.7.0; the warning is gone. GitHub Actions pins (item 6) checkout v4 -> v7 (source of the Node 20 annotation) cache v4 -> v6 configure-pages v4 -> v6 deploy-pages v4 -> v5 upload-pages-artifact v3 -> v5 Release notes for the Pages trio show no breaking changes; the majors are Node runtime upgrades and internal dependency bumps. upload-pages-artifact v5 uses upload-artifact v7 internally and deploy-pages v5 is its matching generation, so the three move together. lychee-action and setup-ruby were already current on their floating major tags. grunt tooling (item 7) Delete package.json, Gruntfile.js and .jshintrc, and drop the now-stale Gruntfile.js and package.json entries from the _config.yml exclude list. Nothing referenced them: no workflow, script or page, no package-lock.json and no node_modules. assets/js/scripts.min.js is committed, so no build output is lost. This permanently closes the phantom grunt Dependabot alerts. The pin in 6e817a9 only raised the declared range; with the manifest gone there is nothing left to scan, so the seven grunt-* dependencies still on open-ended ">1.3.0" ranges cannot raise alerts either. Verified: the built site is byte-identical to the previous baseline across all 1242 files, and the logger warning no longer appears. Only the @import Sass deprecation remains, which is deferred by design. Co-Authored-By: Claude Opus 5 --- .github/workflows/build.yml | 2 +- .github/workflows/jekyll-gh-pages.yml | 8 +-- .github/workflows/link-checker.yml | 4 +- .jshintrc | 20 ------- Gemfile | 4 ++ Gemfile.lock | 2 + Gruntfile.js | 84 --------------------------- _config.yml | 2 +- package.json | 25 -------- 9 files changed, 14 insertions(+), 137 deletions(-) delete mode 100644 .jshintrc delete mode 100644 Gruntfile.js delete mode 100644 package.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c011dee1..9b91351f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Setup Ruby uses: ruby/setup-ruby@v1 diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml index e8f041663..47d085685 100644 --- a/.github/workflows/jekyll-gh-pages.yml +++ b/.github/workflows/jekyll-gh-pages.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Setup Ruby uses: ruby/setup-ruby@v1 @@ -39,7 +39,7 @@ jobs: - name: Setup Pages id: pages - uses: actions/configure-pages@v4 + uses: actions/configure-pages@v6 # NOTE: the site is served from a custom apex domain (see CNAME), so # baseurl stays "" as set in _config.yml. Deliberately do not pass @@ -51,7 +51,7 @@ jobs: JEKYLL_ENV: production - name: Upload artifact - uses: actions/upload-pages-artifact@v3 + uses: actions/upload-pages-artifact@v5 # Deployment job deploy: @@ -63,4 +63,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v5 diff --git a/.github/workflows/link-checker.yml b/.github/workflows/link-checker.yml index 46c1d8710..22891f392 100644 --- a/.github/workflows/link-checker.yml +++ b/.github/workflows/link-checker.yml @@ -13,13 +13,13 @@ jobs: permissions: issues: write steps: - - uses: actions/cache@v4 + - uses: actions/cache@v6 with: path: .lycheecache key: cache-lychee-${{ github.sha }} restore-keys: cache-lychee- - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Link Checker id: lychee diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index c7fe06660..000000000 --- a/.jshintrc +++ /dev/null @@ -1,20 +0,0 @@ -{ - "bitwise": true, - "browser": true, - "curly": true, - "eqeqeq": true, - "eqnull": true, - "es5": false, - "esnext": true, - "immed": true, - "jquery": true, - "latedef": true, - "newcap": true, - "noarg": true, - "node": true, - "strict": false, - "trailing": false, - "undef": true, - "multistr": true, - "expr": true -} \ No newline at end of file diff --git a/Gemfile b/Gemfile index 7d4252228..e5324f023 100644 --- a/Gemfile +++ b/Gemfile @@ -16,3 +16,7 @@ gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby] gem "webrick", "~> 1.9" + +# Jekyll 4.4 requires logger but does not declare it. Ruby 3.5 removes it +# from the default gems, so name it explicitly here. +gem "logger", "~> 1.6" diff --git a/Gemfile.lock b/Gemfile.lock index 51c18ded7..474eb5bc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,6 +88,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.7.0) mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) @@ -160,6 +161,7 @@ DEPENDENCIES http_parser.rb (~> 0.6.0) jekyll (~> 4.2) jekyll-feed (~> 0.12) + logger (~> 1.6) tzinfo (>= 1, < 3) tzinfo-data wdm (~> 0.1.1) diff --git a/Gruntfile.js b/Gruntfile.js deleted file mode 100644 index 4b0dd9c55..000000000 --- a/Gruntfile.js +++ /dev/null @@ -1,84 +0,0 @@ -'use strict'; -module.exports = function(grunt) { - - grunt.initConfig({ - jshint: { - options: { - jshintrc: '.jshintrc' - }, - all: [ - 'Gruntfile.js', - 'assets/js/*.js', - '!assets/js/plugins/*.js', - '!assets/js/scripts.min.js' - ] - }, - uglify: { - dist: { - files: { - 'assets/js/scripts.min.js': [ - 'assets/js/plugins/*.js', - 'assets/js/_*.js' - ] - } - } - }, - imagemin: { - dist: { - options: { - optimizationLevel: 7, - progressive: true - }, - files: [{ - expand: true, - cwd: 'images/', - src: '{,*/}*.{png,jpg,jpeg}', - dest: 'images/' - }] - } - }, - svgmin: { - dist: { - files: [{ - expand: true, - cwd: 'images/', - src: '{,*/}*.svg', - dest: 'images/' - }] - } - }, - watch: { - js: { - files: [ - '<%= jshint.all %>' - ], - tasks: ['jshint','uglify'] - } - }, - clean: { - dist: [ - 'assets/js/scripts.min.js' - ] - } - }); - - // Load tasks - grunt.loadNpmTasks('grunt-contrib-clean'); - grunt.loadNpmTasks('grunt-contrib-jshint'); - grunt.loadNpmTasks('grunt-contrib-uglify'); - grunt.loadNpmTasks('grunt-contrib-watch'); - grunt.loadNpmTasks('grunt-contrib-imagemin'); - grunt.loadNpmTasks('grunt-svgmin'); - - // Register tasks - grunt.registerTask('default', [ - 'clean', - 'uglify', - 'imagemin', - 'svgmin' - ]); - grunt.registerTask('dev', [ - 'watch' - ]); - -}; \ No newline at end of file diff --git a/_config.yml b/_config.yml index 8f746e3bd..274edfd21 100644 --- a/_config.yml +++ b/_config.yml @@ -52,7 +52,7 @@ owner: x: amjjbonvin include: [".htaccess"] -exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "Gruntfile.js", "package.json", "node_modules", "Gemfile", "Gemfile.lock", "LICENSE", "README.md", "UPGRADE.md", "_utilities", "vendor", "ruby"] +exclude: ["lib", "config.rb", "Capfile", "config", "log", "Rakefile", "Rakefile.rb", "tmp", "less", "*.sublime-project", "*.sublime-workspace", "test", "spec", "node_modules", "Gemfile", "Gemfile.lock", "LICENSE", "README.md", "UPGRADE.md", "_utilities", "vendor", "ruby"] # Github Specific Settings that *cannot* be changed diff --git a/package.json b/package.json deleted file mode 100644 index abcea662c..000000000 --- a/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "minimal-mistakes-theme", - "author": "Michael Rose ", - "homepage": "http://mmistakes.github.io/minima-mistakes/", - "repository": { - "type": "git", - "url": "git://github.com/mmistakes/minimal-mistakes.git" - }, - "bugs": { - "url": "https://github.com/mmistakes/minimal-mistakes/issues" - }, - "engines": { - "node": ">= 0.10.0" - }, - "devDependencies": { - "grunt": "^1.6.1", - "grunt-contrib-clean": ">1.3.0", - "grunt-contrib-jshint": ">1.3.0", - "grunt-contrib-uglify": ">1.3.0", - "grunt-contrib-watch": ">1.3.0", - "grunt-recess": ">1.3.0", - "grunt-contrib-imagemin": ">1.3.0", - "grunt-svgmin": ">1.3.0" - } -}