Merge branch 'main' into ev-charging-units-nearest-endpoint

Author: littleforest

.github/workflows/main.yml

@@ -66,7 +66,7 @@ jobs:
         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:

Dockerfile

@@ -1,4 +1,4 @@
-FROM public.ecr.aws/docker/library/ruby:3.4-slim-bookworm
+FROM public.ecr.aws/docker/library/ruby:3.4-slim-trixie
 
 ENV \
   BUNDLE_JOBS=20 \
@@ -23,7 +23,7 @@ RUN set -x && \
   fi
 
 # NodeJS and pnpm
-ARG NODEJS_MAJOR_VERSION=22
+ARG NODEJS_MAJOR_VERSION=24
 RUN set -x && \
   version="node_${NODEJS_MAJOR_VERSION}.x" && \
   distro=$(. /etc/os-release && echo "$VERSION_CODENAME") && \

Gemfile

@@ -3,25 +3,25 @@ source "https://rubygems.org"
 ruby "~> 3.4.0"
 
 # Middleman Gems
-gem "middleman", "~> 4.6.0"
+gem "middleman", "~> 4.6.2"
 
 # GitHub-flavored markdown.
 gem "kramdown-parser-gfm", "~> 1.1.0"
 
 # Environment specific config with environment variables
-gem "dotenv", "~> 3.1.8"
+gem "dotenv", "~> 3.2.0"
 
 # Syntax highlighting
-gem "middleman-syntax", "~> 3.5.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"

Gemfile.lock

@@ -1,71 +1,73 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (8.1.2)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.2)
-    contracts (0.17.2)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
+    contracts (0.17.3)
     domain_name (0.6.20240107)
-    dotenv (3.1.8)
-    drb (2.2.1)
-    dry-cli (1.2.0)
+    dotenv (3.2.0)
+    drb (2.2.3)
+    dry-cli (1.4.1)
     erubi (1.13.1)
     execjs (2.10.0)
     fast_blank (1.0.1)
     fastimage (2.4.0)
-    ffi (1.17.2)
-    ffi (1.17.2-aarch64-linux-gnu)
-    ffi (1.17.2-x86_64-linux-gnu)
-    haml (6.3.0)
+    ffi (1.17.3)
+    ffi (1.17.3-aarch64-linux-gnu)
+    ffi (1.17.3-x86_64-linux-gnu)
+    haml (7.2.0)
       temple (>= 0.8.2)
       thor
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hashie (5.0.0)
+    hashie (5.1.0)
+      logger
     http-accept (1.7.0)
-    http-cookie (1.0.8)
+    http-cookie (1.1.0)
       domain_name (~> 0.5)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    kramdown (2.5.1)
-      rexml (>= 3.3.9)
+    json (2.18.1)
+    kramdown (2.5.2)
+      rexml (>= 3.4.4)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    listen (3.9.0)
+    listen (3.10.0)
+      logger
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
     memoist (0.16.2)
-    middleman (4.6.1)
-      middleman-cli (= 4.6.1)
-      middleman-core (= 4.6.1)
+    middleman (4.6.2)
+      middleman-cli (= 4.6.2)
+      middleman-core (= 4.6.2)
     middleman-alias (0.0.17)
       middleman-core (>= 3.3)
-    middleman-cli (4.6.1)
+    middleman-cli (4.6.2)
       thor (>= 0.17.0, < 2)
-    middleman-core (4.6.1)
+    middleman-core (4.6.2)
       activesupport (>= 6.1)
       addressable (~> 2.4)
       bundler (~> 2.0)
@@ -93,15 +95,16 @@ GEM
       toml
       uglifier (>= 3, < 5)
       webrick
-    middleman-syntax (3.5.0)
+    middleman-syntax (3.6.1)
       middleman-core (>= 3.2)
       rouge (~> 3.2)
-    mime-types (3.6.2)
+    mime-types (3.7.0)
       logger
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2025.0422)
-    minitest (5.25.5)
-    multi_json (1.15.0)
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2026.0203)
+    minitest (6.0.1)
+      prism (~> 1.5)
+    multi_json (1.19.1)
     mutex_m (0.3.0)
     netrc (0.11.0)
     padrino-helpers (0.15.3)
@@ -111,13 +114,14 @@ GEM
     padrino-support (0.15.3)
     parallel (1.27.0)
     parslet (2.0.0)
-    public_suffix (6.0.1)
-    rack (3.1.18)
+    prism (1.9.0)
+    public_suffix (7.0.2)
+    rack (3.2.5)
     rack-proxy (0.7.7)
       rack
-    rackup (2.2.1)
+    rackup (2.3.1)
       rack (>= 3)
-    rake (13.2.1)
+    rake (13.3.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
@@ -126,22 +130,22 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.4.2)
+    rexml (3.4.4)
     rouge (3.30.0)
     sassc (2.4.0)
       ffi (~> 1.9)
     securerandom (0.4.1)
     servolux (0.13.0)
-    temple (0.10.3)
-    thor (1.4.0)
-    tilt (2.6.0)
+    temple (0.10.4)
+    thor (1.5.0)
+    tilt (2.7.0)
     toml (0.3.0)
       parslet (>= 1.8.0, < 3.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
-    uri (1.0.3)
+    uri (1.1.1)
     vite_padrino (3.0.0)
       vite_ruby (~> 3.0)
     vite_ruby (3.9.2)
@@ -150,27 +154,27 @@ GEM
       mutex_m
       rack-proxy (~> 0.6, >= 0.6.1)
       zeitwerk (~> 2.2)
-    webrick (1.9.1)
-    zeitwerk (2.7.2)
+    webrick (1.9.2)
+    zeitwerk (2.7.4)
 
 PLATFORMS
   aarch64-linux
   ruby
   x86_64-linux
 
 DEPENDENCIES
-  dotenv (~> 3.1.8)
+  dotenv (~> 3.2.0)
   kramdown-parser-gfm (~> 1.1.0)
-  middleman (~> 4.6.0)
+  middleman (~> 4.6.2)
   middleman-alias (~> 0.0.17)
-  middleman-syntax (~> 3.5.0)
-  multi_json (~> 1.15.0)
-  rake (~> 13.0)
+  middleman-syntax (~> 3.6.1)
+  multi_json (~> 1.19.1)
+  rake (~> 13.3)
   rest-client (~> 2.1.0)
   vite_padrino (~> 3.0.0)
 
 RUBY VERSION
-   ruby 3.4.3p32
+   ruby 3.4.8p72
 
 BUNDLED WITH
-   2.6.7
+   2.6.9

README.md

@@ -1,15 +1,15 @@
-# developer.nrel.gov
+# developer.nlr.gov
 
-Have questions, feedback, or issues with the APIs available at [developer.nrel.gov](https://developer.nrel.gov/)? [Contact us](https://developer.nrel.gov/contact/) or let us know in the [issue tracker](https://github.com/NREL/developer.nrel.gov/issues).
+Have questions, feedback, or issues with the APIs available at [developer.nlr.gov](https://developer.nlr.gov/)? [Contact us](https://developer.nlr.gov/contact/) or let us know in the [issue tracker](https://github.com/NatLabRockies/developer.nlr.gov/issues).
 
-This repository stores the website content and documentation for [developer.nrel.gov](https://developer.nrel.gov). Contributions are welcome. To submit a change, fork this repo, commit your changes, and send us a [pull request](https://help.github.com/articles/using-pull-requests).
+This repository stores the website content and documentation for [developer.nlr.gov](https://developer.nlr.gov). Contributions are welcome. To submit a change, fork this repo, commit your changes, and send us a [pull request](https://help.github.com/articles/using-pull-requests).
 
 ## Development
 
-The content files to edit are in [`./source`](https://github.com/NREL/developer.nrel.gov/tree/master/source). To preview your changes you can use the [Middleman](https://middlemanapp.com) preview server. To run Middleman:
+The content files to edit are in [`./source`](https://github.com/NatLabRockies/developer.nlr.gov/tree/main/source). To preview your changes you can use the [Middleman](https://middlemanapp.com) preview server. To run Middleman:
 
 1. Install [Docker](https://www.docker.com/products/docker-desktop/) on your computer.
-2. Checkout the `developer.nrel.gov` repository on your computer (`git clone https://github.com/NREL/developer.nrel.gov.git`).
+2. Checkout the `developer.nlr.gov` repository on your computer (`git clone https://github.com/NatLabRockies/developer.nlr.gov.git`).
 3. For NLR employees on the NLR network: Add a `docker-compose.override.yml`, with the following contents, but substituting `REPLACE_ME` with the appropriate URL (reach out to a maintainer for this value):
 
     ```yaml
@@ -20,7 +20,7 @@ The content files to edit are in [`./source`](https://github.com/NREL/developer.
             NREL_ROOT_CERT_URL_ROOT: "REPLACE_ME"
     ```
 
-4. Inside the `developer.nrel.gov` directory, run `docker compose up`.
+4. Inside the `developer.nlr.gov` directory, run `docker compose up`.
 5. View your changes at: http://localhost:4480/
 
 ### Linting
@@ -30,6 +30,6 @@ If you're working on Swagger documentation, you can run `rake lint` locally to c
 ## Deploy
 
 - Changes committed to the `staging` branch will automatically be deployed to the staging site.
-- Changes committed to the `master` branch will automatically be deployed to the production site.
+- Changes committed to the `main` branch will automatically be deployed to the production site.
 
 Deploys may take a few minutes after pushing before they show up. You can check the status via the Actions tab above.

config.rb

@@ -179,7 +179,7 @@ def loader
   end
 
   def make_request(path, params = {country: "all", api_key: ENV["DOCS_API_KEY"]})
-    MultiJson.load(RestClient.get("https://developer.nrel.gov/api/alt-fuel-stations/v1/#{path}.json", params: params))
+    MultiJson.load(RestClient.get("https://developer.nlr.gov/api/alt-fuel-stations/v1/#{path}.json", params: params))
   end
 end
 

config/vite.json

@@ -2,7 +2,7 @@
   "all": {
     "publicDir": "tmp/vite",
     "sourceCodeDir": "frontend",
-    "additionalEntrypoints": ["~/{assets,fonts,icons,images,nrel-app-template/img}/**/*"],
+    "additionalEntrypoints": ["~/{assets,fonts,icons,images,nlr-app-template/img}/**/*"],
     "watchAdditionalPaths": []
   },
   "development": {

frontend/entrypoints/all.scss

@@ -1,9 +1,9 @@
 @import "@/stylesheets/_variables";
 @import "bootstrap/scss/bootstrap";
 
-@import "@/nrel-app-template/css/nrel.complete";
-@import "@/nrel-app-template/css/nrel.application";
-@import "@/stylesheets/_nrel_app_template_overrides";
+@import "@/nlr-app-template/css/nlr.complete";
+@import "@/nlr-app-template/css/nlr.application";
+@import "@/stylesheets/_nlr_app_template_overrides";
 
 @import "@/stylesheets/_base";
 @import "@/stylesheets/_docs";

frontend/entrypoints/contact.js

@@ -33,7 +33,7 @@ formEl.addEventListener("submit", (event) => {
   }, 0);
 
   const hostname = window.location.hostname;
-  const apiHost = (hostname === 'developer.nrel.gov') ? 'developer.nrel.gov' : 'devstage.nrel.gov';
+  const apiHost = (hostname === 'developer.nlr.gov') ? 'developer.nlr.gov' : 'devstage.nlr.gov';
 
   return fetch(`https://${apiHost}/api/contactor/v1.json?` + new URLSearchParams({
     api_key: options.apiKey,

frontend/entrypoints/swagger.js

@@ -1,12 +1,12 @@
-import SwaggerUI from 'swagger-ui'
+import { SwaggerUIBundle } from 'swagger-ui-dist'
 import ApiKeyFormPlugin from '@/lib/swagger_api_key_form';
 import domready from 'domready';
-import 'swagger-ui/dist/swagger-ui.css';
+import 'swagger-ui-dist/swagger-ui.css';
 
 domready(() => {
   const swaggerUiEl = document.getElementById('swagger-ui');
 
-  SwaggerUI({
+  SwaggerUIBundle({
     url: swaggerUiEl.dataset.swaggerUrl,
     dom_id: '#swagger-ui',
     plugins: [