🔖 Release v2.4.1

2022-11-14 15:00:48 +11:00 · 2022-11-14 15:00:48 +11:00 · 6c14222b57
parent b168c4d39e 968d54a18e
commit 6c14222b57
13 changed files with 104 additions and 45 deletions
--- a/.github/workflows/build-theme.yml
+++ b/.github/workflows/build-theme.yml
@ -0,0 +1,54 @@
+name: Build Theme
+
+on: [pull_request_target]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: "${{ github.head_ref }}"
+      - name: Install dependencies and Build Theme
+        uses: actions/setup-node@v3
+      - run: npm install
+      - run: npm run assets
+      - name: Commit and push Chart.js changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: "${{ github.head_ref }}"
+          push_options: "--dry-run"
+          file_pattern: "assets/lib/chart/*"
+          commit_message: "📦 Update packaged ChartJS"
+      - name: Commit Fuse changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: "${{ github.head_ref }}"
+          push_options: "--dry-run"
+          file_pattern: "assets/lib/fuse/*"
+          commit_message: "📦 Update packaged FuseJS"
+      - name: Commit KaTeX changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: "${{ github.head_ref }}"
+          push_options: "--dry-run"
+          file_pattern: "assets/lib/katex/*"
+          commit_message: "📦 Update packaged KaTeX"
+      - name: Commit Mermaid changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: "${{ github.head_ref }}"
+          push_options: "--dry-run"
+          file_pattern: "assets/lib/mermaid/*"
+          commit_message: "📦 Update packaged Mermaid"
+      - run: npm run build
+      - name: Commit CSS changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: "${{ github.head_ref }}"
+          push_options: "--dry-run"
+          file_pattern: "assets/css/compiled/main.css"
+          commit_message: "💄 Rebuild CSS"
+      - run: git push
--- a/.github/workflows/label-closed.yml
+++ b/.github/workflows/label-closed.yml
@ -1,25 +0,0 @@
-name: Labeller on close
-
-on:
-  issues:
-    types:
-      - closed
-  pull_request:
-    types:
-      - closed
-
-jobs:
-  run:
-    name: "Label"
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-      issues: write
-
-    steps:
-      - name: Update Labels
-        uses: RebeccaStevens/issue-closed-labeler-action@latest
-        with:
-          token: "${{ secrets.GITHUB_TOKEN }}"
-          rules: '[{"condition": "wip", "remove": "wip"}]'
--- a/.github/workflows/unlabel.yml
+++ b/.github/workflows/unlabel.yml
@ -0,0 +1,16 @@
+name: Unlabeller
+
+on:
+  issues:
+    types: [closed]
+  pull_request:
+    types: [closed]
+
+jobs:
+  unlabel:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Remove labels
+        uses: andymckay/labeler@master
+        with:
+          remove-labels: "wip"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,6 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

 ## [Unreleased]

+## [2.4.1] - 2022-11-14
+
+### Changed
+
+- Upgrade to Tailwind v3.2.4 ([#368](https://github.com/jpanther/congo/pull/368))
+
+### Fixed
+
+- List page doesn't render nested list pages ([#365](https://github.com/jpanther/congo/issues/365))
+- Pagination is duplicated on term pages ([#366](https://github.com/jpanther/congo/issues/366))
+- Link to last pagination page sometimes displays twice
+- Recent articles would sometimes display less than five articles
+
 ## [2.4.0] - 2022-11-10

 ### Added
@ -540,7 +553,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Advanced customisation using simple Tailwind colour definitions and styles
 - Fully documented

-[unreleased]: https://github.com/jpanther/congo/compare/v2.4.0...HEAD
+[unreleased]: https://github.com/jpanther/congo/compare/v2.4.1...HEAD
+[2.4.1]: https://github.com/jpanther/congo/compare/v2.4.0...v2.4.1
 [2.4.0]: https://github.com/jpanther/congo/compare/v2.3.1...v2.4.0
 [2.3.1]: https://github.com/jpanther/congo/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/jpanther/congo/compare/v2.2.3...v2.3.0
--- a/assets/css/compiled/main.css
+++ b/assets/css/compiled/main.css
@ -1,6 +1,6 @@
-/*! Congo v2.4.0 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v2.4.1 | MIT License | https://github.com/jpanther/congo */

-/*! tailwindcss v3.2.2 | MIT License | https://tailwindcss.com */
+/*! tailwindcss v3.2.4 | MIT License | https://tailwindcss.com */

 /*
 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
--- a/assets/css/main.css
+++ b/assets/css/main.css
@ -1,4 +1,4 @@
-/*! Congo v2.4.0 | MIT License | https://github.com/jpanther/congo */
+/*! Congo v2.4.1 | MIT License | https://github.com/jpanther/congo */

@tailwind base;
@tailwind components;
--- a/exampleSite/content/users.md
+++ b/exampleSite/content/users.md
@ -47,5 +47,6 @@ Real websites that are built with Congo.
 | [major.io](https://major.io)                                           | Personal site and Blog       |
 | [bayas.dev](https://bayas.dev)                                         | Personal site and Blog       |
 | [顾宇的博客](https://www.guyu.me/)                                     | Personal Blog (in Chinese)   |
+| [cgutierr-zgz.github.io](https://cgutierr-zgz.github.io/)              | Personal site and Tech blog  |

 **Congo user?** To add your site to this list, [submit a pull request](https://github.com/jpanther/congo/blob/dev/exampleSite/content/users.md).
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@ -37,7 +37,7 @@
          {{ end }}
        {{ end }}
      {{ else }}
-        {{ range .Paginator.Pages }}
+        {{ range (.Paginate .Pages).Pages }}
          {{ partial "article-link.html" . }}
        {{ end }}
      {{ end }}
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@ -26,7 +26,7 @@
            {{ end }}
          {{ end }}
        {{ else }}
-          {{ range .Paginator.Pages }}
+          {{ range (.Paginate .Pages).Pages }}
            {{ partial "article-link.html" . }}
          {{ end }}
        {{ end }}
@ -40,5 +40,4 @@
      </section>
    {{ end }}
  </section>
-  {{ partial "pagination.html" . }}
 {{ end }}
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@ -59,7 +59,7 @@
      {{- end }}

      {{- with .Last }}
-        {{- if lt $currentPageNumber (sub .TotalPages $width) }}
+        {{- if and (lt $currentPageNumber (sub .TotalPages $width)) (lt $end .TotalPages) }}
          {{- if lt $currentPageNumber (sub .TotalPages (add $width 1)) }}
            <li>&ctdot;</li>
          {{- end }}
--- a/layouts/partials/recent-articles.html
+++ b/layouts/partials/recent-articles.html
@ -1,6 +1,6 @@
 {{ if .Site.Params.homepage.showRecent | default false }}
  <h2 class="mt-8 text-2xl font-extrabold">{{ i18n "shortcode.recent_articles" | emojify }}</h2>
-  {{ range first 5 (.Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections)).Pages }}
+  {{ range first 5 (.Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 5).Pages }}
    {{ partial "article-link.html" . }}
  {{ end }}
 {{ end }}
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "hugo-congo-theme",
-  "version": "2.3.1",
+  "version": "2.4.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "hugo-congo-theme",
-      "version": "2.3.1",
+      "version": "2.4.0",
      "hasInstallScript": true,
      "license": "MIT",
      "devDependencies": {
@ -19,7 +19,7 @@
        "prettier-plugin-go-template": "^0.0.13",
        "prettier-plugin-tailwindcss": "^0.1.13",
        "rimraf": "^3.0.2",
-        "tailwindcss": "^3.2.2",
+        "tailwindcss": "^3.2.4",
        "vendor-copy": "^3.0.1"
      },
      "funding": {
@ -1843,9 +1843,9 @@
      }
    },
    "node_modules/tailwindcss": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.2.tgz",
-      "integrity": "sha512-c2GtSdqg+harR4QeoTmex0Ngfg8IIHNeLQH5yr2B9uZbZR1Xt1rYbjWOWTcj3YLTZhrmZnPowoQDbSRFyZHQ5Q==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz",
+      "integrity": "sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==",
      "dev": true,
      "dependencies": {
        "arg": "^5.0.2",
@ -3364,9 +3364,9 @@
      "dev": true
    },
    "tailwindcss": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.2.tgz",
-      "integrity": "sha512-c2GtSdqg+harR4QeoTmex0Ngfg8IIHNeLQH5yr2B9uZbZR1Xt1rYbjWOWTcj3YLTZhrmZnPowoQDbSRFyZHQ5Q==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.4.tgz",
+      "integrity": "sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==",
      "dev": true,
      "requires": {
        "arg": "^5.0.2",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "hugo-congo-theme",
-  "version": "2.4.0",
+  "version": "2.4.1",
  "description": "Congo theme for Hugo",
  "scripts": {
    "preinstall": "rimraf assets/vendor",
@ -38,7 +38,7 @@
    "prettier-plugin-go-template": "^0.0.13",
    "prettier-plugin-tailwindcss": "^0.1.13",
    "rimraf": "^3.0.2",
-    "tailwindcss": "^3.2.2",
+    "tailwindcss": "^3.2.4",
    "vendor-copy": "^3.0.1"
  },
  "vendorCopy": [],