Use package.json & pnpm

- Use package.json to get hugo
- Update site building instructions
- Update GitHub workflow to use the tooling

Signed-off-by: Aesara Binder <[email protected]>

Author: AesaraB

.github/workflows/hugo.yml

@@ -30,32 +30,34 @@ jobs:
   # Build job
   build:
     runs-on: ubuntu-latest
-    env:
-      HUGO_VERSION: 0.133.0
     steps:
-      - name: Install Hugo CLI
-        run: |
-          wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
-          && sudo dpkg -i ${{ runner.temp }}/hugo.deb
-      - name: Install Dart Sass
-        run: sudo snap install dart-sass
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
           lfs: true
           fetch-depth: 0
+      - name: Setup dependencies
+        uses: pnpm/action-setup@v4
+        with:
+          version: 'latest'
+          run_install: false
+      - name: Copy package.json
+        run: cp package.hugo.json package.json
+      - name: Install project dependencies
+        run: pnpm install
+      - name: Collect submodule dependencies
+        run: pnpm run npm-pack
+      - name: Install submodule dependencies
+        run: pnpm update
       - name: Setup Pages
         id: pages
         uses: actions/configure-pages@v4
       - name: Build with Hugo
-        env:
-          # For maximum backward compatibility with Hugo modules
-          HUGO_ENVIRONMENT: production
-          HUGO_ENV: production
         run: |
-          hugo \
+          pnpm exec hugo \
             --minify \
+            --environment "production" \
             --baseURL "${{ steps.pages.outputs.base_url }}/"
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3

.gitignore

@@ -5,7 +5,10 @@
 /.hugo_build.lock
 hugo_stats.json
 # Sass
-.sass-cache/
+/.sass-cache/
 *.css.map
 *.sass.map
 *.scss.map
+# pnpm
+/node_modules/
+/package.json

package.hugo.json

@@ -0,0 +1,31 @@
+{
+  "author": {
+    "email": "[email protected]",
+    "name": "Aesara Binder",
+    "url": "https://www.aesara.org"
+  },
+  "description": "MyPaint's official website",
+  "devDependencies": {
+    "hugo-extended": "latest",
+    "sass-embedded": "latest"
+  },
+  "files": [
+    "public/"
+  ],
+  "homepage": "https://www.mypaint.org",
+  "license": "SEE LICENSE IN README.md",
+  "name": "mypaint-website",
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://gitlab.com/mypaint/website"
+  },
+  "scripts": {
+	"npm-pack": "hugo mod npm pack",
+    "build-dev": "hugo --environment development",
+    "build-prod": "hugo --environment production",
+    "postpack": "rm -rfv public",
+    "prepack": "hugo --environment production",
+    "start": "hugo server"
+  }
+}

pages/docs/contributing/documentation.md

@@ -103,10 +103,16 @@ They may be created:
 case 2 or 3.**{{< /colour >}}
 
 ## Build the Site Locally
-1. Install [hugo-extended][hugo-release], [dart sass][sass-release], and [git-lfs][git-lfs]
+
+To perform initial setup for the site:
+1. Ensure ``git``, ``git-lfs``, and ``pnpm`` are installed
 2. Clone the website [repository][website]
 3. Run ``git submodule update --init``
-4. Run ``hugo`` or ``hugo server``
+4. Copy ``package.hugo.json`` to ``package.json`` if the latter does not already exist
+5. Install project dependencies: ``pnpm install``
+6. Collect submodule dependencies: ``pnpm run npm-pack``
+7. Install subproject dependencies: ``pnpm install``
+8. Start the server: ``pnpm start``
 
 ### Update Submodules
 When the [website-theme][website-theme] or other submodules are updated, use