Merge pull request #1230 from GSA/staging

Production Update 1210
GSA · Dec 10, 2024 · 2fadbc8 · 2fadbc8
2 parents 86edacf + 5f18ee6
commit 2fadbc8
Show file tree

Hide file tree

Showing 14 changed files with 5,160 additions and 1,832 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -95,6 +95,7 @@ GEM
     tzinfo-data (1.2023.3)
       tzinfo (>= 1.0.0)
     unicode-display_width (1.8.0)
+    wdm (0.1.1)
     webrick (1.8.2)
     yell (2.2.2)
 
@@ -114,6 +115,7 @@ DEPENDENCIES
   jekyll-seo-tag
   jekyll-sitemap
   tzinfo-data
+  wdm (~> 0.1.0)
   webrick
 
 BUNDLED WITH

diff --git a/_plugins/asset-helper.rb b/_plugins/asset-helper.rb
@@ -7,6 +7,13 @@ def self.process(site, payload)
         FileUtils.cp_r('node_modules/@uswds/uswds/dist/js/', 'assets/', verbose: true)
         FileUtils.cp_r('node_modules/@uswds/uswds/dist/img/', 'assets/', verbose: true)
         FileUtils.cp_r('node_modules/@uswds/uswds/dist/fonts/', 'assets/', verbose: true)
+        # The below Ruby code copies individual files from the node package to the assets folder /assets/css/.
+        # The FileUtils.copy method copies individual uswds files to the site's existing /assets/css/ folder.
+        # This prevents overwriting the /assets/css/ folder that contains other files needed by the site 
+        # to run and display properly. Do not change the function below to use the FileUtils.cp_r function(unless you know what you are doing). 
+        FileUtils.copy('node_modules/@uswds/uswds/dist/css/uswds.css', 'assets/css/', verbose: true)
+        FileUtils.copy('node_modules/@uswds/uswds/dist/css/uswds.min.css', 'assets/css/', verbose: true)
+        FileUtils.copy('node_modules/@uswds/uswds/dist/css/uswds.min.css.map', 'assets/css/', verbose: true)
         @processed = true
     end
 end