primer_view_components 0.0.80 → 0.0.83

data/app/components/primer/alpha/tool-tip-element.js

@@ -180,6 +180,7 @@ class ToolTipElement extends HTMLElement {
         var _a;
         if (!this.shadowRoot) {
             const shadow = this.attachShadow({ mode: 'open' });
+            // eslint-disable-next-line github/no-inner-html
             shadow.innerHTML = `
         <style>
           ${this.styles()}

data/app/components/primer/alpha/tool-tip-element.ts

@@ -179,6 +179,7 @@ class ToolTipElement extends HTMLElement {
   connectedCallback() {
     if (!this.shadowRoot) {
       const shadow = this.attachShadow({mode: 'open'})
+      // eslint-disable-next-line github/no-inner-html
       shadow.innerHTML = `
         <style>
           ${this.styles()}

data/app/components/primer/blankslate_component.html.erb

@@ -5,7 +5,7 @@
   <% elsif @icon.present? %>
     <%= primer_octicon @icon, size: @icon_size, classes: "blankslate-icon" %>
   <% elsif @image_src.present? && @image_alt.present? %>
-    <%= image_tag "#{@image_src}", class: "mb-3", size: "56x56", alt: "#{@image_alt}" %>
+    <%= image_tag @image_src.to_s, class: "mb-3", size: "56x56", alt: @image_alt.to_s %>
   <% end %>
 
   <% if @title.present? %>
@@ -24,7 +24,7 @@
 
   <% if @link_text.present? && @link_url.present? %>
     <p>
-      <%= link_to "#{@link_url}" do %><%= @link_text %><% end %>
+      <%= link_to @link_url.to_s do %><%= @link_text %><% end %>
     </p>
   <% end %>
 <% end %>

data/app/components/primer/component.rb

@@ -6,7 +6,7 @@ module Primer
   # @private
   class Component < ViewComponent::Base
     include ViewComponent::SlotableV2 unless ViewComponent::Base < ViewComponent::SlotableV2
-    include ViewComponent::PolymorphicSlots
+    include ViewComponent::PolymorphicSlots unless ViewComponent::Base < ViewComponent::PolymorphicSlots
     include ClassNameHelper
     include FetchOrFallbackHelper
     include TestSelectorHelper

data/app/components/primer/layout_component.html.erb

@@ -1,3 +1,4 @@
+<%# erblint:counter DeprecatedComponentsCounter 1 %>
 <%= render(Primer::FlexComponent.new(**@system_arguments)) do %>
   <% if @side == :left %>
     <%= sidebar %>

data/app/components/primer/octicon_component.rb

@@ -8,10 +8,12 @@ module Primer
   class OcticonComponent < Primer::Component
     status :beta
 
+    SIZE_XSMALL = :xsmall
     SIZE_DEFAULT = :small
     SIZE_MEDIUM = :medium
 
     SIZE_MAPPINGS = {
+      SIZE_XSMALL => 12,
       SIZE_DEFAULT => 16,
       SIZE_MEDIUM => 24
     }.freeze

data/lib/primer/view_components/linters/deprecated_components_counter.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require_relative "helpers/deprecated_components_helpers"
+require "erblint-github/linters/custom_helpers"
+
+module ERBLint
+  module Linters
+    # Lints against deprecated components
+    class DeprecatedComponentsCounter < Linter
+      include CustomHelpers
+      include ERBLint::LinterRegistry
+      include Helpers::DeprecatedComponentsHelpers
+
+      def run(processed_source)
+        processed_source.ast.descendants(:erb).each do |erb_node|
+          _, _, code_node = *erb_node
+          code = code_node.children.first.strip
+
+          next unless code.include?("Primer::")
+
+          deprecated_components.each do |component|
+            next unless code.include?(component)
+
+            add_offense(
+              erb_node.loc,
+              message(component)
+            )
+          end
+        end
+
+        counter_correct?(processed_source)
+      end
+
+      def autocorrect(processed_source, offense)
+        return unless offense.context
+
+        lambda do |corrector|
+          if processed_source.file_content.include?("erblint:counter #{self.class.name.gsub('ERBLint::Linters::', '')}")
+            # update the counter if exists
+            corrector.replace(offense.source_range, offense.context)
+          else
+            # add comment with counter if none
+            corrector.insert_before(processed_source.source_buffer.source_range, "#{offense.context}\n")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/primer/view_components/linters/helpers/deprecated_components_helpers.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module ERBLint
+  module Linters
+    module Helpers
+      # Helpers to share between DeprecatedComponents ERB lint and Rubocop cop
+      module DeprecatedComponentsHelpers
+        # If there is no alternative to suggest, set the value to nil
+        COMPONENT_TO_USE_INSTEAD = {
+          "Primer::BlankslateComponent" => "Primer::Beta::Blankslate",
+          "Primer::DropdownMenuComponent" => nil,
+          "Primer::Tooltip" => "Primer::Alpha::Tooltip",
+          "Primer::FlexComponent" => nil,
+          "Primer::FlexItemComponent" => nil
+        }.freeze
+
+        def message(component)
+          message = "#{component} has been deprecated and should not be used."
+          message += " Try #{COMPONENT_TO_USE_INSTEAD[component]} instead." if COMPONENT_TO_USE_INSTEAD.fetch(component).present?
+          message
+        end
+
+        def statuses_json
+          JSON.parse(
+            File.read(
+              File.join(File.dirname(__FILE__), "../../../../../static/statuses.json")
+            )
+          ).freeze
+        end
+
+        def deprecated_components
+          @deprecated_components ||= statuses_json.select { |_, value| value == "deprecated" }.keys.tap do |deprecated_components|
+            deprecated_components.each do |deprecated|
+              unless COMPONENT_TO_USE_INSTEAD.key?(deprecated)
+                raise "Please provide a component that should be used in place of #{deprecated} in COMPONENT_TO_USE_INSTEAD. "\
+                      "If there is no alternative, set the value to nil."
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/primer/view_components/version.rb

@@ -5,7 +5,7 @@ module Primer
     module VERSION
       MAJOR = 0
       MINOR = 0
-      PATCH = 80
+      PATCH = 83
 
       STRING = [MAJOR, MINOR, PATCH].join(".")
     end

data/lib/rubocop/cop/primer/deprecated_components.rb

@@ -3,6 +3,7 @@
 require "rubocop"
 require "json"
 require "parser/current"
+require_relative "./../../../primer/view_components/linters/helpers/deprecated_components_helpers"
 
 module RuboCop
   module Cop
@@ -21,14 +22,7 @@ module RuboCop
       # good
       # Primer::Alpha::Tooltip.new(:foo)
       class DeprecatedComponents < BaseCop
-        # If there is no alternative to suggest, set the value to nil.
-        COMPONENT_TO_USE_INSTEAD = {
-          "Primer::BlankslateComponent" => "Primer::Beta::Blankslate",
-          "Primer::DropdownMenuComponent" => nil,
-          "Primer::Tooltip" => "Primer::Alpha::Tooltip",
-          "Primer::FlexComponent" => nil,
-          "Primer::FlexItemComponent" => nil
-        }.freeze
+        include ERBLint::Linters::Helpers::DeprecatedComponentsHelpers
 
         def on_send(node)
           return unless node.source.include?("Primer::")
@@ -49,31 +43,6 @@ module RuboCop
                              .delete("\n")
                              .gsub("  ", " ")
         end
-
-        def message(component)
-          message = "#{component} has been deprecated and should not be used."
-          message += " Try #{COMPONENT_TO_USE_INSTEAD[component]} instead." if COMPONENT_TO_USE_INSTEAD.fetch(component).present?
-          message
-        end
-
-        def statuses_json
-          JSON.parse(
-            File.read(
-              File.join(File.dirname(__FILE__), "../../../../static/statuses.json")
-            )
-          ).freeze
-        end
-
-        def deprecated_components
-          @deprecated_components ||= statuses_json.select { |_, value| value == "deprecated" }.keys.tap do |deprecated_components|
-            deprecated_components.each do |deprecated|
-              unless COMPONENT_TO_USE_INSTEAD.key?(deprecated)
-                raise "Please provide a component that should be used in place of #{deprecated} in COMPONENT_TO_USE_INSTEAD. "\
-                      "If there is no alternative, set the value to nil."
-              end
-            end
-          end
-        end
       end
     end
   end

data/static/arguments.yml

@@ -885,7 +885,7 @@
   - name: size
     type: Symbol
     default: "`:small`"
-    description: One of `:small` (`16`) and `:medium` (`24`).
+    description: One of `:xsmall` (`12`), `:small` (`16`), or `:medium` (`24`).
   - name: use_symbol
     type: Boolean
     default: "`false`"

data/static/constants.json

@@ -644,14 +644,17 @@
   "Primer::OcticonComponent": {
     "SIZE_DEFAULT": "small",
     "SIZE_MAPPINGS": {
+      "xsmall": 12,
       "small": 16,
       "medium": 24
     },
     "SIZE_MEDIUM": "medium",
     "SIZE_OPTIONS": [
+      "xsmall",
       "small",
       "medium"
-    ]
+    ],
+    "SIZE_XSMALL": "xsmall"
   },
   "Primer::OcticonSymbolsComponent": {
   },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: primer_view_components
 version: !ruby/object:Gem::Version
-  version: 0.0.80
+  version: 0.0.83
 platform: ruby
 authors:
 - GitHub Open Source
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -170,6 +170,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: erblint-github
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +198,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: matrix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -366,7 +394,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.25
-description:
+description: 
 email:
 - opensource+primer_view_components@github.com
 executables: []
@@ -536,8 +564,10 @@ files:
 - lib/primer/view_components/linters/button_component_migration_counter.rb
 - lib/primer/view_components/linters/clipboard_copy_component_migration_counter.rb
 - lib/primer/view_components/linters/close_button_component_migration_counter.rb
+- lib/primer/view_components/linters/deprecated_components_counter.rb
 - lib/primer/view_components/linters/disallow_action_list.rb
 - lib/primer/view_components/linters/flash_migration_counter.rb
+- lib/primer/view_components/linters/helpers/deprecated_components_helpers.rb
 - lib/primer/view_components/linters/helpers/rubocop_helpers.rb
 - lib/primer/view_components/linters/label_component_migration_counter.rb
 - lib/primer/view_components/linters/subhead_component_migration_counter.rb
@@ -580,7 +610,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -588,15 +618,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: ViewComponents for the Primer Design System
 test_files: []