Merge branch 'sh-fix-inline-javascript-haml-lint' into 'master'

Fix inline JavaScript HAML linter not working

See merge request gitlab-org/gitlab!71798

app/views/authentication/_authenticate.html.haml

 #js-authenticate-token-2fa
 %a.gl-button.btn.btn-block.btn-confirm#js-login-2fa-device{ href: '#' }= _("Sign in via 2FA code")
 
+-# haml-lint:disable InlineJavaScript
 %script#js-authenticate-token-2fa-in-progress{ type: "text/template" }
   %p= _("Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now.")
 
+-# haml-lint:disable InlineJavaScript
 %script#js-authenticate-token-2fa-error{ type: "text/template" }
   %div
     %p <%= error_message %> (<%= error_name %>)
     %a.btn.btn-default.gl-button.btn-block#js-token-2fa-try-again= _("Try again?")
 
+-# haml-lint:disable InlineJavaScript
 %script#js-authenticate-token-2fa-authenticated{ type: "text/template" }
   %div
     %p= _("We heard back from your device. You have been authenticated.")

app/views/authentication/_register.html.haml

 #js-register-token-2fa
 
+-# haml-lint:disable InlineJavaScript
 %script#js-register-2fa-message{ type: "text/template" }
   %p <%= message %>
 
+-# haml-lint:disable InlineJavaScript
 %script#js-register-token-2fa-setup{ type: "text/template" }
   - if current_user.two_factor_otp_enabled?
     .row.gl-mb-3
@@ -17,12 +19,14 @@
       .col-md-8
         %p= _("You need to register a two-factor authentication app before you can set up a device.")
 
+-# haml-lint:disable InlineJavaScript
 %script#js-register-token-2fa-error{ type: "text/template" }
   %div
     %p
       %span <%= error_message %> (<%= error_name %>)
     %a.btn.btn-default.gl-button#js-token-2fa-try-again= _("Try again?")
 
+-# haml-lint:disable InlineJavaScript
 %script#js-register-token-2fa-registered{ type: "text/template" }
   .row.gl-mb-3
     .col-md-12

app/views/layouts/nav/_breadcrumbs.html.haml

@@ -21,6 +21,7 @@
           %li
             %h2.breadcrumbs-sub-title{ data: { qa_selector: 'breadcrumb_sub_title_content' } }
               = link_to @breadcrumb_title, breadcrumb_title_link
+    -# haml-lint:disable InlineJavaScript
     %script{ type: 'application/ld+json' }
       :plain
         #{schema_breadcrumb_json}

app/views/projects/branches/new.html.haml

@@ -31,4 +31,5 @@
   .form-actions
     = button_tag 'Create branch', class: 'gl-button btn btn-confirm'
     = link_to _('Cancel'), project_branches_path(@project), class: 'gl-button btn btn-default btn-cancel'
+-# haml-lint:disable InlineJavaScript
 %script#availableRefs{ type: "application/json" }= @project.repository.ref_names.to_json.html_safe

app/views/projects/merge_requests/show.html.haml

@@ -49,6 +49,7 @@
       = render "projects/merge_requests/tabs/pane", id: "notes", class: "notes voting_notes" do
         .row
           %section.col-md-12
+            -# haml-lint:disable InlineJavaScript
             %script.js-notes-data{ type: "application/json" }= initial_notes_data(true).to_json.html_safe
             .issuable-discussion.js-vue-notes-event
               - if @merge_request.description.present?

app/views/projects/product_analytics/test.html.haml

@@ -12,5 +12,6 @@
   %code
     = @event.as_json_wo_empty
 
+-# haml-lint:disable InlineJavaScript
 :javascript
   #{render 'tracker'}

app/views/projects/tags/new.html.haml

@@ -54,4 +54,5 @@
   .form-actions.gl-display-flex
     = button_tag s_('TagsPage|Create tag'), class: 'gl-button btn btn-confirm gl-mr-3', data: { qa_selector: "create_tag_button" }
     = link_to s_('TagsPage|Cancel'), project_tags_path(@project), class: 'gl-button btn btn-default btn-cancel'
+-# haml-lint:disable InlineJavaScript
 %script#availableRefs{ type: "application/json" }= @project.repository.ref_names.to_json.html_safe

app/views/shared/issuable/_sidebar.html.haml

@@ -55,11 +55,13 @@
         .js-sidebar-status-entry-point{ data: sidebar_status_data(issuable_sidebar, @project) }
 
       - if issuable_sidebar.has_key?(:confidential)
+        -# haml-lint:disable InlineJavaScript
         %script#js-confidential-issue-data{ type: "application/json" }= { is_confidential: issuable_sidebar[:confidential], is_editable: can_edit_issuable }.to_json.html_safe
         #js-confidential-entry-point
 
         = render_if_exists 'shared/issuable/sidebar_cve_id_request', issuable_sidebar: issuable_sidebar
 
+      -# haml-lint:disable InlineJavaScript
       %script#js-lock-issue-data{ type: "application/json" }= { is_locked: !!issuable_sidebar[:discussion_locked], is_editable: can_edit_issuable }.to_json.html_safe
       #js-lock-entry-point
 

app/views/shared/notes/_notes_with_form.html.haml

@@ -25,4 +25,5 @@
       = sprite_icon('lock', css_class: 'icon')
       %span
         = html_escape(_("This %{issuable} is locked. Only %{strong_open}project members%{strong_close} can comment.")) % { issuable: issuable.class.to_s.titleize.downcase, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
+-# haml-lint:disable InlineJavaScript
 %script.js-notes-data{ type: "application/json" }= initial_notes_data(autocomplete).to_json.html_safe

ee/app/views/groups/contribution_analytics/show.html.haml

@@ -68,6 +68,7 @@
       #js_issues_chart_vue
 
   #js-group-member-contributions{ data: { member_contributions_path: group_contribution_analytics_path(@group, { start_date: @start_date, format: :json }) } }
+  -# haml-lint:disable InlineJavaScript
   %script#js-analytics-data{ type: "application/json" }
     = @data_collector.group_member_contributions_table_data.to_json.html_safe
 - elsif show_promotions?

ee/app/views/groups/epics/show.html.haml

@@ -84,6 +84,7 @@
         notes_filters: UserPreference.notes_filters.to_json } }
   .row
     %section.col-md-12
+      -# haml-lint:disable InlineJavaScript
       %script.js-notes-data{ type: "application/json" }= initial_notes_data(true).to_json.html_safe
       .issuable-discussion
         = render 'discussion'

ee/app/views/projects/blob/_header_file_locks.html.haml

@@ -3,6 +3,7 @@
 
 - return unless project.feature_available?(:file_locks)
 
+-# haml-lint:disable InlineJavaScript
 %script#js-file-lock{ type: "application/json" }
   - data = { path: path, toggle_path: toggle_project_path_locks_path(project) }
   = data.to_json.html_safe

haml_lint/inline_javascript.rb

 # frozen_string_literal: true
 
 unless Rails.env.production?
-  require_dependency 'haml_lint/haml_visitor'
-  require_dependency 'haml_lint/linter'
-  require_dependency 'haml_lint/linter_registry'
+  require 'haml_lint/haml_visitor'
+  require 'haml_lint/linter'
+  require 'haml_lint/linter_registry'
 
   module HamlLint
     class Linter::InlineJavaScript < Linter