govuk_publishing_components 23.11.0 → 23.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 884556b32a54e514794dba01e0bbac985e9fae36beeea08e458e017ba20bc397
-  data.tar.gz: 920499e180389d7f7fb34ad3a84b018a3e8d02a69393244c18027a55a0272031
+  metadata.gz: bfc403e4ae4e502dac4d0bbc51a5e3c0e454097ea602ef00a1cf0fd3e1ff98fb
+  data.tar.gz: 2b19a5969e18d37c3643fc800fb24a549487af3443074e7729d541184e16c315
 SHA512:
-  metadata.gz: e7f807097888f485b69167eadc138c279654952b4e67050312d8f12215d439a503471da4af64198201bc99c6c0b967d1203482350037d29eb1900c330c9af7f8
-  data.tar.gz: c360c8660c5e049177a15289856df34b84ccf25c3132361d8dcd5418a1947289afa76ff7ff0aff9ea103e8c8d8220ea57029fd790f7740169c9e6aa1aa9edf1b
+  metadata.gz: 3e9e7ee289c6a1cb4be8fdfba47fe6ca937654ee7fb379c8b1c2b88ff9a2cb890187a9ff7a2b5f850f17ef051f2b6d6e89fc3541acd8317aa7e991f52e6d10a0
+  data.tar.gz: e35c4c8554dbac78e610c31423d3b7e97f1bc8bfce31a32d3340ce99424d034694fbe868f0d70358d56b61604bfe5374d7be1d20b911b67539c6c9b93f1038a0

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -21,12 +21,15 @@ module GovukPublishingComponents
         collections-publisher
         content-data-admin
         content-publisher
+        datagovuk_find
         email-alert-frontend
         feedback
         finder-frontend
         frontend
         government-frontend
         govspeak-preview
+        govuk-account-manager-prototype
+        govuk-coronavirus-vulnerable-people-form
         info-frontend
         licence-finder
         manuals-frontend

data/app/models/govuk_publishing_components/audit_applications.rb

@@ -7,6 +7,7 @@ module GovukPublishingComponents
       application_found = application_exists(path)
       components_found = []
       @gem_style_references = []
+      @jquery_references = []
 
       if application_found
         templates = Dir["#{path}/app/views/**/*.erb"]
@@ -65,6 +66,7 @@ module GovukPublishingComponents
         application_found: application_found,
         components_found: components_found,
         gem_style_references: @gem_style_references.flatten.uniq.sort,
+        jquery_references: @jquery_references.flatten.uniq.sort,
       }
     end
 
@@ -76,8 +78,14 @@ module GovukPublishingComponents
       files.each do |file|
         src = File.read(file)
         components_found << find_match(find, src, type)
-        gem_references = find_gem_references(file, src)
-        @gem_style_references << gem_references if gem_references
+
+        if type == "javascripts"
+          jquery_references = find_code_references(file, src, /\$\(/)
+          @jquery_references << jquery_references if jquery_references
+        else
+          gem_style_references = find_code_references(file, src, /gem-c-[-_a-zA-Z]+/)
+          @gem_style_references << gem_style_references if gem_style_references
+        end
       rescue StandardError
         puts "File #{file} not found"
       end
@@ -99,11 +107,10 @@ module GovukPublishingComponents
       all_matches
     end
 
-    def find_gem_references(file, src)
-      find_gem_classes = /gem-c-[-_a-zA-Z]+/
+    def find_code_references(file, src, regex)
       clean_file_path = /(?<=#{Regexp.escape(@path)}\/)[\/a-zA-Z_-]+.[a-zA-Z.]+/
 
-      return file[clean_file_path] if find_gem_classes.match?(src)
+      return file[clean_file_path] if regex.match?(src)
     end
 
     def clean_file_name(name)

data/app/models/govuk_publishing_components/audit_comparer.rb

@@ -37,6 +37,7 @@ module GovukPublishingComponents
           warnings << warn_about_missing_components(result[:components_found])
           warnings << warn_about_missing_assets(result[:components_found])
           warnings << warn_about_style_overrides(result[:gem_style_references])
+          warnings << warn_about_jquery_references(result[:jquery_references])
           warnings = warnings.flatten
 
           data << {
@@ -67,6 +68,7 @@ module GovukPublishingComponents
             warnings: warnings,
             warning_count: warnings.length,
             gem_style_references: result[:gem_style_references],
+            jquery_references: result[:jquery_references],
           }
         else
           data << {
@@ -163,6 +165,16 @@ module GovukPublishingComponents
       warnings
     end
 
+    def warn_about_jquery_references(results)
+      warnings = []
+
+      results.each do |result|
+        warnings << create_warning("Possible jQuery", result)
+      end
+
+      warnings
+    end
+
     def find_missing(needle, haystack)
       (haystack - needle).flatten.sort
     end

data/app/views/govuk_publishing_components/audit/show.html.erb

@@ -109,6 +109,21 @@
                       <% end %>
                     </ul>
                   <% end %>
+
+                  <% if application[:jquery_references].any? %>
+                    <%= render "govuk_publishing_components/components/heading", {
+                      text: "jQuery references",
+                      font_size: "m",
+                      margin_bottom: 4,
+                      heading_level: 3,
+                    } %>
+                    <p class="govuk-body">This shows JavaScript files that might contain jQuery, which we are trying to remove our dependency on.</p>
+                    <ul class="govuk-list govuk-list--bullet">
+                      <% application[:jquery_references].each do |ref| %>
+                        <li><%= ref %></li>
+                      <% end %>
+                    </ul>
+                  <% end %>
                 <% else %>
                   <p class="govuk-body">This application was not found. This could be because you do not have this repository checked out locally.</p>
                 <% end %>

data/config/locales/cy.yml

@@ -12,4 +12,4 @@ cy:
       transition:
         title: "Brexit"
         link_path: "/transition.cy"
-        link_text: "Darganfyddwch sut mae’r rheolau newydd yn effeithio arnoch chi"
+        link_text: "Darganfyddwch sut mae’r rheolau Brexit newydd yn effeithio arnoch chi"

data/config/locales/en.yml

@@ -79,7 +79,7 @@ en:
       transition:
         title: "Brexit"
         link_path: "/transition"
-        link_text: "Check how the new rules affect you"
+        link_text: "Check how the new Brexit rules affect you"
     related_footer_navigation:
       collections: "Collections"
       policies: "Policies"

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "23.11.0".freeze
+  VERSION = "23.11.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 23.11.0
+  version: 23.11.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-31 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config