Merge pull request #2358 from uswds/jm-feature-node-20-update

USWDS-Site: Use node lts 20

.eslintrc

@@ -8,13 +8,16 @@
     "computed-property-spacing": [2, "always"],
     "object-curly-spacing": [2, "always"]
   },
-
   "env": {
     "node": true,
     "browser": true,
     "es6": true
   },
   "ignorePatterns": "node_modules/",
   "plugins": ["import"],
-  "extends": ["eslint:recommended", "prettier"]
+  "extends": [
+    "eslint:recommended",
+    "prettier",
+    "eslint-config-prettier"
+  ]
 }

.tool-versions

@@ -1,2 +1,2 @@
 ruby 3.1.2
-nodejs 20.9.0
+nodejs 20.9.0

Gemfile.lock

@@ -1,19 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    ffi (1.15.5)
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
+    google-protobuf (3.24.4-arm64-darwin)
+    google-protobuf (3.24.4-x86_64-linux)
     html-proofer (4.4.3)
       addressable (~> 2.3)
       mercenary (~> 0.3)
@@ -24,9 +26,9 @@ GEM
       yell (~> 2.0)
       zeitwerk (~> 2.5)
     http_parser.rb (0.8.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.1)
+    jekyll (4.3.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -46,58 +48,60 @@ GEM
       jekyll (>= 3.7, < 5.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sass-converter (2.2.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.6.2)
+    json (2.6.3)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    liquid-c (4.0.0)
+    liquid (4.0.4)
+    liquid-c (4.0.1)
       liquid (>= 3.0.0)
-    listen (3.7.1)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    nokogiri (1.14.3-arm64-darwin)
+    nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-linux)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.22.1)
+    parallel (1.23.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.0)
-    racc (1.6.2)
+    public_suffix (5.0.3)
+    racc (1.7.1)
     rainbow (3.1.1)
+    rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (4.0.0)
-    rspec-core (3.12.0)
+    rexml (3.2.6)
+    rouge (4.1.3)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
+    sass-embedded (1.69.3)
+      google-protobuf (~> 3.23)
+      rake (>= 13.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    unicode-display_width (2.3.0)
-    webrick (1.7.0)
+    unicode-display_width (2.5.0)
+    webrick (1.8.1)
     yell (2.2.2)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   arm64-darwin-21

config/gulp/build.js

@@ -15,7 +15,7 @@ const cleanAssets = gulp.parallel(
   cleanImages,
   cleanJavascript,
   cleanStyles,
-  removeAssetsDir
+  removeAssetsDir,
 );
 
 function spawnP(cmd, args, opts) {
@@ -57,8 +57,8 @@ function buildUSWDSComponents() {
         new Error(
           `${gulpfile} does not exist! You need a newer version of USWDS; ` +
             `specifically, one that includes the following PR: ` +
-            `https://github.com/uswds/uswds/pull/2050`
-        )
+            `https://github.com/uswds/uswds/pull/2050`,
+        ),
       );
     }
 
@@ -67,8 +67,8 @@ function buildUSWDSComponents() {
     /**
      * We need to: install USWDS deps and build components to HTML.
      */
-    return spawnP("npm", [ "install", "--legacy-peer-deps" ], sharedOpts).then(
-      () => spawnP("npm", [ "run", "build:html" ], sharedOpts)
+    return spawnP("npm", ["install", "--legacy-peer-deps"], sharedOpts).then(
+      () => spawnP("npm", ["run", "build:html"], sharedOpts),
     );
   }
 }

config/gulp/javascript.js

@@ -31,18 +31,18 @@ function build() {
     .pipe(
       rename({
         basename: "styleguide",
-      })
+      }),
     )
     .pipe(sourcemaps.write("."))
     .pipe(gulp.dest("assets/js"));
 }
 
 function watch(done) {
-  return gulp.watch(["./js/*.js"], gulp.series(lint, build))
+  return gulp.watch(["./js/*.js"], gulp.series(lint, build));
 }
 
 module.exports = {
   lint,
   build,
-  watch
-}
+  watch,
+};

config/gulp/sass.js

@@ -26,10 +26,7 @@ const entrypoints = {
  * @param {*} outputName - string of output file name
  * @returns - outputName.css
  */
-function compileProdCSS(
-  cssEntrypoints,
-  outputName = "styles.css"
-) {
+function compileProdCSS(cssEntrypoints, outputName = "styles.css") {
   return gulp
     .src(cssEntrypoints)
     .pipe(

css/_uswds-theme-custom-styles.scss

@@ -465,7 +465,6 @@ abbr[title="required"] {
       pointer-events: auto;
     }
 
-
     &#{$external-href} {
       display: inline-block;
     }