Merge branch 'main' into update-docker-image

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 19.0.0
+
+### Major Changes
+
+- [#943](https://github.com/primer/octicons/pull/943) [`a38ae2d2`](https://github.com/primer/octicons/commit/a38ae2d2cf0b51259be0ab9bc19052c4ddc64a09) Thanks [@broccolinisoup](https://github.com/broccolinisoup)! - Remove support for `Octicon`
+  Update peer dependency React version to support >=16.3
+  Update icons to use React.forwardRef
+
+### Minor Changes
+
+- [#937](https://github.com/primer/octicons/pull/937) [`6c94e0e8`](https://github.com/primer/octicons/commit/6c94e0e851c5c5b30cb7ddf73899cde54bf8e205) Thanks [@gavinmn](https://github.com/gavinmn)! - Add 12px `×` icon
+
 ## 18.3.0
 
 ### Minor Changes

lib/octicons_gem/lib/octicons/version.rb

@@ -1,3 +1,3 @@
 module Octicons
-  VERSION = "18.3.0".freeze
+  VERSION = "19.0.0".freeze
 end

lib/octicons_helper/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "octicons", "18.3.0"
+gem "octicons", "19.0.0"
 gem "rails"
 
 group :development, :test do

lib/octicons_helper/lib/octicons_helper/version.rb

@@ -1,3 +1,3 @@
 module OcticonsHelper
-  VERSION = "18.3.0".freeze
+  VERSION = "19.0.0".freeze
 end

lib/octicons_helper/octicons_helper.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  s.add_dependency "octicons", "18.3.0"
+  s.add_dependency "octicons", "19.0.0"
   s.add_dependency "railties"
   s.add_dependency "actionview"
 end

lib/octicons_jekyll/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "octicons", "18.3.0"
+gem "octicons", "19.0.0"
 
 group :development, :test do
   gem "minitest"

lib/octicons_jekyll/jekyll-octicons.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "jekyll", ">= 3.6", "< 5.0"
-  s.add_dependency "octicons", "18.3.0"
+  s.add_dependency "octicons", "19.0.0"
 end

lib/octicons_jekyll/lib/jekyll-octicons/version.rb

@@ -3,6 +3,6 @@ module Liquid; class Tag; end; end
 
 module Jekyll
   class Octicons < Liquid::Tag
-    VERSION = "18.3.0".freeze
+    VERSION = "19.0.0".freeze
   end
 end

lib/octicons_node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/octicons",
-  "version": "18.3.0",
+  "version": "19.0.0",
   "description": "A scalable set of icons handcrafted with <3 by GitHub.",
   "homepage": "https://primer.style/octicons",
   "author": "GitHub Inc.",

lib/octicons_react/README.md

@@ -121,9 +121,7 @@ export default () => (
 )
 ```
 
-### `Octicon` (DEPRECATED)
 
-> ⚠️ The `Octicon` component is deprecated. Use icon components on their own instead:
 ```diff
 - <Octicon icon={AlertIcon} />
 + <AlertIcon />

lib/octicons_react/__tests__/__snapshots__/public-api.test.js.snap

@@ -312,6 +312,5 @@ exports[`@primer/octicons-react should not update exports without a semver chang
   "ZapIcon",
   "ZoomInIcon",
   "ZoomOutIcon",
-  "default",
 ]
 `;

lib/octicons_react/__tests__/tree-shaking.test.js

@@ -50,5 +50,5 @@ test('tree shaking single export', async () => {
   })
 
   const bundleSize = Buffer.byteLength(output[0].code.trim()) / 1000
-  expect(`${bundleSize}kB`).toMatchInlineSnapshot(`"3.168kB"`)
+  expect(`${bundleSize}kB`).toMatchInlineSnapshot(`"3.244kB"`)
 })

lib/octicons_react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/octicons-react",
-  "version": "18.3.0",
+  "version": "19.0.0",
   "description": "A scalable set of icons handcrafted with <3 by GitHub.",
   "homepage": "https://primer.style/octicons",
   "author": "GitHub, Inc.",
@@ -69,7 +69,7 @@
     "typescript": "^4.8.3"
   },
   "peerDependencies": {
-    "react": ">=15"
+    "react": ">=16.3"
   },
   "engines": {
     "node": ">=8"

lib/octicons_react/pages/index.js

@@ -45,7 +45,7 @@ export default function App() {
                 <td>
                   <pre>
                     {`
-import Octicon, {${Icon.name}} from '${pkg.name}'
+import {${Icon.name}} from '${pkg.name}'
 export default () => <${Icon.name} />
                   `.trim()}
                   </pre>

lib/octicons_react/src/__tests__/octicon.js

@@ -1,61 +1,7 @@
 import '@testing-library/jest-dom'
 import {render} from '@testing-library/react'
 import React from 'react'
-import Octicon, {AlertIcon} from '../index'
-
-describe('Octicon component', () => {
-  let mock
-
-  beforeEach(() => {
-    mock = jest.spyOn(console, 'warn').mockImplementation(() => jest.fn())
-  })
-
-  afterEach(() => {
-    expect(mock).toHaveBeenCalledWith(
-      expect.stringContaining(
-        `<Octicon> is deprecated. Use icon components on their own instead (e.g. <Octicon icon={AlertIcon} /> → <AlertIcon />)`
-      )
-    )
-    mock.mockRestore()
-  })
-
-  it('throws an error without a single child or icon prop', () => {
-    const spy = jest.spyOn(console, 'error').mockImplementation(() => jest.fn())
-    expect(() => render(<Octicon />)).toThrow()
-    expect(() => render(<Octicon icon={null} />)).toThrow()
-    expect(spy).toHaveBeenCalledWith(
-      expect.objectContaining({
-        message: expect.stringContaining('React.Children.only expected to receive a single React element child')
-      })
-    )
-
-    spy.mockRestore()
-  })
-
-  it('passes props to icon prop', () => {
-    const {container} = render(
-      <Octicon aria-label="icon" className="foo" size={20} verticalAlign="middle" icon={AlertIcon} />
-    )
-    expect(container.querySelector('svg')).toHaveAttribute('aria-label', 'icon')
-    expect(container.querySelector('svg')).toHaveAttribute('class', 'foo')
-    expect(container.querySelector('svg')).toHaveAttribute('width', '20')
-    expect(container.querySelector('svg')).toHaveAttribute('height', '20')
-    expect(container.querySelector('svg')).toHaveStyle({verticalAlign: 'middle'})
-  })
-
-  it('passes props to icon as child', () => {
-    const {container} = render(
-      <Octicon aria-label="icon" className="foo" size={20} verticalAlign="middle">
-        <AlertIcon />
-      </Octicon>
-    )
-    expect(container.querySelector('svg')).toHaveAttribute('aria-label', 'icon')
-    expect(container.querySelector('svg')).toHaveAttribute('class', 'foo')
-    expect(container.querySelector('svg')).toHaveAttribute('width', '20')
-    expect(container.querySelector('svg')).toHaveAttribute('height', '20')
-    expect(container.querySelector('svg')).toHaveStyle({verticalAlign: 'middle'})
-  })
-})
+import {AlertIcon} from '../index'
 
 describe('An icon component', () => {
   it('matches snapshot', () => {

lib/octicons_react/src/createIconComponent.js

@@ -10,43 +10,49 @@ export function createIconComponent(name, defaultClassName, getSVGData) {
   const svgDataByHeight = getSVGData()
   const heights = Object.keys(svgDataByHeight)
 
-  function Icon({
-    'aria-label': ariaLabel,
-    tabIndex,
-    className = defaultClassName,
-    fill = 'currentColor',
-    size = 16,
-    verticalAlign = 'text-bottom'
-  }) {
-    const height = sizeMap[size] || size
-    const naturalHeight = closestNaturalHeight(heights, height)
-    const naturalWidth = svgDataByHeight[naturalHeight].width
-    const width = height * (naturalWidth / naturalHeight)
-    const path = svgDataByHeight[naturalHeight].path
+  const Icon = React.forwardRef(
+    (
+      {
+        'aria-label': ariaLabel,
+        tabIndex,
+        className = defaultClassName,
+        fill = 'currentColor',
+        size = 16,
+        verticalAlign = 'text-bottom'
+      },
+      forwardedRef
+    ) => {
+      const height = sizeMap[size] || size
+      const naturalHeight = closestNaturalHeight(heights, height)
+      const naturalWidth = svgDataByHeight[naturalHeight].width
+      const width = height * (naturalWidth / naturalHeight)
+      const path = svgDataByHeight[naturalHeight].path
 
-    return (
-      <svg
-        aria-hidden={ariaLabel ? 'false' : 'true'}
-        tabIndex={tabIndex}
-        focusable={tabIndex >= 0 ? 'true' : 'false'}
-        aria-label={ariaLabel}
-        role="img"
-        className={className}
-        viewBox={`0 0 ${naturalWidth} ${naturalHeight}`}
-        width={width}
-        height={height}
-        fill={fill}
-        style={{
-          display: 'inline-block',
-          userSelect: 'none',
-          verticalAlign,
-          overflow: 'visible'
-        }}
-      >
-        {path}
-      </svg>
-    )
-  }
+      return (
+        <svg
+          ref={forwardedRef}
+          aria-hidden={ariaLabel ? 'false' : 'true'}
+          tabIndex={tabIndex}
+          focusable={tabIndex >= 0 ? 'true' : 'false'}
+          aria-label={ariaLabel}
+          role="img"
+          className={className}
+          viewBox={`0 0 ${naturalWidth} ${naturalHeight}`}
+          width={width}
+          height={height}
+          fill={fill}
+          style={{
+            display: 'inline-block',
+            userSelect: 'none',
+            verticalAlign,
+            overflow: 'visible'
+          }}
+        >
+          {path}
+        </svg>
+      )
+    }
+  )
 
   Icon.displayName = name
 

lib/octicons_react/src/index.d.ts

@@ -15,11 +15,4 @@ export interface OcticonProps {
   verticalAlign?: 'middle' | 'text-bottom' | 'text-top' | 'top' | 'unset'
 }
 
-/**
- * @deprecated Use icon components on their own instead (e.g. `<Octicon icon={AlertIcon} />` → `<AlertIcon />`)
- */
-declare const Octicon: React.FC<OcticonProps>
-
-export default Octicon
-
 export * from './__generated__/icons'

lib/octicons_react/src/index.js

@@ -1,12 +1 @@
-import React from 'react'
-
-export default function Octicon({icon: Icon, children, ...props}) {
-  // eslint-disable-next-line no-console
-  console.warn(
-    // eslint-disable-next-line github/unescaped-html-literal
-    '<Octicon> is deprecated. Use icon components on their own instead (e.g. <Octicon icon={AlertIcon} /> → <AlertIcon />)'
-  )
-  return typeof Icon === 'function' ? <Icon {...props} /> : React.cloneElement(React.Children.only(children), props)
-}
-
 export * from './__generated__/icons'

lib/octicons_react/ts-tests/index.tsx

@@ -1,20 +1,11 @@
 import * as React from 'react'
-import Octicon, {MarkGithubIcon, PlusIcon, RepoIcon} from '../src'
+import {MarkGithubIcon, PlusIcon, RepoIcon} from '../src'
 
 function TestOcticons() {
   return (
     <div>
-      <Octicon icon={RepoIcon} size="large" verticalAlign="middle" /> github/github
-      <Octicon icon={PlusIcon} aria-label="Add new item" /> New
-      <Octicon icon={MarkGithubIcon} size="large" aria-label="GitHub" />
-      <Octicon icon={RepoIcon} className="awesomeClassName" />
-      <Octicon>
-        <RepoIcon />
-      </Octicon>
-      <Octicon size="large">
-        <RepoIcon />
-      </Octicon>
-      <RepoIcon />
+      <MarkGithubIcon />
+      <PlusIcon />
       <RepoIcon size="medium" className="test" aria-label="repo" verticalAlign="middle" />
     </div>
   )

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/octicons",
-  "version": "18.3.0",
+  "version": "19.0.0",
   "publishConfig": {
     "registry": "no registry, don't publish from this package.json."
   },