139106

.dockerignore

@@ -1,3 +1,4 @@
-.git
-tmp
-node_modules
+/.git
+/build
+/node_modules
+/tmp

.github/workflows/main.yml

@@ -1,29 +1,35 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  schedule:
+    - cron: "8 5 * * *"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.7"
+          ruby-version: "3.4"
           bundler-cache: true
 
-      - uses: actions/setup-node@v2
+      - uses: pnpm/action-setup@v4
+
+      - uses: actions/setup-node@v4
         with:
-          node-version: "14"
-          cache: yarn
-          cache-dependency-path: "**/yarn.lock"
+          node-version: "22"
+          cache: pnpm
 
-      # Yarn dependencies
-      - name: Yarn Install
-        run: yarn install
+      # NPM dependencies
+      - name: pnpm Install
+        run: pnpm install
 
       # Build
       - name: Set production DEPLOY_ENV
@@ -38,11 +44,14 @@ jobs:
         run: bundle exec middleman build --clean --verbose --environment=${{ env.DEPLOY_ENV }}
 
       # Lint
+      - name: JS Lint
+        run: pnpm run lint
+
       - name: Lint
         run: bundle exec rake lint
 
       # Artifact
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: success() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging')
         with:
           name: build
@@ -54,17 +63,17 @@ jobs:
         if: success() && github.ref == 'refs/heads/main'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: yarn run gh-pages --dist ./build/ --branch build-history --user "$GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>" --repo "https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
+        run: pnpm exec gh-pages --dist ./build/ --branch build-history --user "$GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>" --repo "https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
 
   deploy:
-    if: success() && github.repository_owner == 'NREL' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging')
+    if: success() && github.repository_owner == 'NatLabRockies' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging')
     needs: build
     runs-on: ubuntu-latest
     container:
       image: rclone/rclone:1.57.0
     steps:
       # Deploy to S3 bucket.
-      - uses: actions/download-artifact@v1
+      - uses: actions/download-artifact@v4
         with:
           name: build
           path: ./build
@@ -89,7 +98,7 @@ jobs:
             --s3-no-check-bucket \
             --s3-no-head \
             --header-upload "Cache-Control: public, max-age=31536000, immutable" \
-            --include "/assets/**" \
+            --include "/vite/assets/**" \
             ./build/ \
             "$S3_DEST"
           # Sync the remaining files, disallowing caching on those.
@@ -113,6 +122,6 @@ jobs:
             --no-update-modtime \
             --s3-no-check-bucket \
             --s3-no-head \
-            --exclude "/assets/**" \
+            --exclude "/vite/assets/**" \
             ./build/ \
             "$S3_DEST"

.gitignore

@@ -33,3 +33,9 @@
 
 /tmp
 /docker-compose.override.yml
+
+# Vite Ruby
+/public/vite*
+# Vite uses dotenv and suggests to ignore local-only env files. See
+# https://vitejs.dev/guide/env-and-mode.html#env-files
+*.local

.spectral.yaml

@@ -0,0 +1 @@
+extends: ["spectral:oas"]

Dockerfile

@@ -1,38 +1,56 @@
-FROM ruby:2.7-bullseye
+FROM public.ecr.aws/docker/library/ruby:3.4-slim-trixie
 
 ENV \
-  BUNDLE_JOBS=4 \
-  BUNDLE_RETRY=3 \
+  BUNDLE_JOBS=20 \
+  BUNDLE_RETRY=5 \
   DOCKER=true \
-  NODE_OPTIONS=--use-openssl-ca \
-  NODE_MODULES_DIR=/usr/local/node_modules
+  NODE_MODULES_DIR=/usr/local/node_modules \
+  NODE_OPTIONS="--use-openssl-ca --openssl-shared-config" \
+  PNPM_HOME=/usr/local/pnpm
 
-# Determine Debian version
-RUN apt-get update && apt-get -y install lsb-release
+# Build dependencies
+RUN apt-get update && \
+  apt-get -y --no-install-recommends install build-essential curl && \
+  rm -rf /var/lib/apt/lists/* /var/lib/dpkg/*-old /var/cache/* /var/log/*
 
-# NodeJS and Yarn
+# Install NLR root certs for machines running on NLR's network.
+ARG NREL_ROOT_CERT_URL_ROOT=""
 RUN set -x && \
-  VERSION=node_14.x && \
-  DISTRO="$(lsb_release -s -c)" && \
-  curl -sSk https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
-  echo "deb http://deb.nodesource.com/$VERSION $DISTRO main" > /etc/apt/sources.list.d/nodesource.list && \
-  echo "deb-src http://deb.nodesource.com/$VERSION $DISTRO main" >> /etc/apt/sources.list.d/nodesource.list && \
-  curl -sSk https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-  echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list && \
+  if [ -n "$NREL_ROOT_CERT_URL_ROOT" ]; then \
+    curl -fsSLk -o /usr/local/share/ca-certificates/nrel_root.crt "${NREL_ROOT_CERT_URL_ROOT}/nrel_root.pem" && \
+    curl -fsSLk -o /usr/local/share/ca-certificates/nrel_xca1.crt "${NREL_ROOT_CERT_URL_ROOT}/nrel_xca1.pem" && \
+    update-ca-certificates; \
+  fi
+
+# NodeJS and pnpm
+ARG NODEJS_MAJOR_VERSION=24
+RUN set -x && \
+  version="node_${NODEJS_MAJOR_VERSION}.x" && \
+  distro=$(. /etc/os-release && echo "$VERSION_CODENAME") && \
+  curl -fsSL -o /usr/share/keyrings/nodesource.asc https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key && \
+  echo "deb [signed-by=/usr/share/keyrings/nodesource.asc] https://deb.nodesource.com/$version nodistro main" > /etc/apt/sources.list.d/nodesource.list && \
   apt-get update && \
-  apt-get -y install nodejs yarn
-ENV NODE_OPTIONS --use-openssl-ca
+  apt-get -y --no-install-recommends install nodejs && \
+  corepack enable && \
+  mkdir -p ~/.config/pnpm && \
+  printf "update-notifier=false\ncafile=/etc/ssl/certs/ca-certificates.crt\nstore-dir=${PNPM_HOME}/store\n" > ~/.config/pnpm/rc && \
+  mkdir -p "${NODE_MODULES_DIR}/.pnpm" && \
+  rm -rf /var/lib/apt/lists/* /var/lib/dpkg/*-old /var/cache/* /var/log/* /root/.npm
 
-RUN mkdir -p /app
 WORKDIR /app
 
+# Install gems (all gems first for better Docker caching for CI/CD).
 COPY Gemfile Gemfile.lock /app/
-RUN bundle install --jobs=20 --retry=5
-
-COPY package.json yarn.lock /app/
-RUN mkdir -p "$NODE_MODULES_DIR" && \
+RUN bundle install
+ARG BUNDLE_INSTALL_ARGS="--frozen --without=development test"
+RUN set -x && bundle install $BUNDLE_INSTALL_ARGS && bundle clean --force --verbose
+
+# Install NPM dependencies.
+COPY package.json pnpm-lock.yaml /app/
+ARG PNPM_INSTALL_ARGS="--frozen-lockfile"
+RUN --mount=type=cache,target=/usr/local/pnpm/store set -x && \
   ln -s "$NODE_MODULES_DIR" /app/node_modules && \
-  yarn
+  pnpm install $PNPM_INSTALL_ARGS
 
 COPY . /app
 

Gemfile

@@ -1,26 +1,30 @@
 source "https://rubygems.org"
 
+ruby "~> 3.4.0"
+
 # Middleman Gems
-gem "middleman", "~> 4.4.2"
-gem "middleman-livereload", "~> 3.4.6"
+gem "middleman", "~> 4.6.2"
 
 # GitHub-flavored markdown.
 gem "kramdown-parser-gfm", "~> 1.1.0"
 
 # Environment specific config with environment variables
-gem "dotenv", "~> 2.7.2"
+gem "dotenv", "~> 3.2.0"
 
 # Syntax highlighting
-gem "middleman-syntax", "~> 3.2.0"
+gem "middleman-syntax", "~> 3.6.1"
 
 # Redirects
 gem "middleman-alias", "~> 0.0.17"
 
 # JSON validation
-gem "multi_json", "~> 1.15.0"
+gem "multi_json", "~> 1.19.1"
 
 # Test tasks
-gem "rake", "~> 13.0"
+gem "rake", "~> 13.3"
 
 # For making API calls to generate docs.
 gem "rest-client", "~> 2.1.0"
+
+# Use Vite for assets.
+gem "vite_padrino", "~> 3.0.0"