Merge branch 'main' into mp/fix-id-badge-24

mperrotti · web-flow · commit eabcc4b9056a · 2025-02-05T10:55:14.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -94,7 +94,7 @@ jobs:
           npx @arethetypeswrong/cli --pack .
 
           # Run publint
-          npx publint . --strict
+          npx publint@0.2.12 . --strict
 
   octicons_gem:
     name: 'gem:octicons'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 19.15.0
+
+### Minor Changes
+
+- [#1063](https://github.com/primer/octicons/pull/1063) [`6481783a`](https://github.com/primer/octicons/commit/6481783a5a7258cc4d7981a0510de56be05a2dc3) Thanks [@dylanatsmith](https://github.com/dylanatsmith)! - Add square-circle icon
+
+## 19.14.0
+
+### Minor Changes
+
+- [#1037](https://github.com/primer/octicons/pull/1037) [`7402e69c`](https://github.com/primer/octicons/commit/7402e69c4d928b12340cb2430bb942ae7d96c6ba) Thanks [@jonrohan](https://github.com/jonrohan)! - Update octicons-react to use presentational attributes over inline styles for base styles
+
+* [#1047](https://github.com/primer/octicons/pull/1047) [`48198033`](https://github.com/primer/octicons/commit/481980330efce92501df9a388b27314a3f86f182) Thanks [@joshblack](https://github.com/joshblack)! - Add support for SVG props to base icons
+
 ## 19.13.0
 
 ### Minor Changes
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 GitHub Inc.
+Copyright (c) 2025 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/icons/square-circle-16.svg b/icons/square-circle-16.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm0-1.5a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13Z"/><path d="M5 5.75A.75.75 0 0 1 5.75 5h4.5a.75.75 0 0 1 .75.75v4.5a.75.75 0 0 1-.75.75h-4.5a.75.75 0 0 1-.75-.75Z"/></svg>
diff --git a/icons/square-circle-24.svg b/icons/square-circle-24.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 23C5.925 23 1 18.075 1 12S5.925 1 12 1s11 4.925 11 11-4.925 11-11 11Zm0-1.5a9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5 9.5 9.5 0 0 0 2.5 12a9.5 9.5 0 0 0 9.5 9.5Z"/><path d="M7 8.75C7 7.784 7.784 7 8.75 7h6.5c.966 0 1.75.784 1.75 1.75v6.5A1.75 1.75 0 0 1 15.25 17h-6.5A1.75 1.75 0 0 1 7 15.25v-6.5Z"/></svg>
diff --git a/keywords.json b/keywords.json
@@ -195,6 +195,7 @@
   "sign-out": ["door", "arrow", "direction", "leave", "log out"],
   "skip": ["skip", "slash"],
   "smiley": ["emoji", "smile", "mood", "emotion"],
+  "square-circle": ["stop", "interupt", "block", "pause"],
   "squirrel": ["ship", "shipit", "launch"],
   "star": ["save", "remember", "like"],
   "stop": ["block", "spam", "report"],
diff --git a/lib/octicons_gem/LICENSE b/lib/octicons_gem/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 GitHub Inc.
+Copyright (c) 2025 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/octicons_helper/LICENSE b/lib/octicons_helper/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 GitHub Inc.
+Copyright (c) 2025 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/octicons_jekyll/LICENSE b/lib/octicons_jekyll/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 GitHub Inc.
+Copyright (c) 2025 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/octicons_node/LICENSE b/lib/octicons_node/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 GitHub Inc.
+Copyright (c) 2025 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/octicons_node/package.json b/lib/octicons_node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/octicons",
-  "version": "19.13.0",
+  "version": "19.15.0",
   "description": "A scalable set of icons handcrafted with <3 by GitHub.",
   "homepage": "https://primer.style/octicons",
   "author": "GitHub Inc.",
diff --git a/lib/octicons_react/LICENSE b/lib/octicons_react/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 GitHub Inc.
+Copyright (c) 2025 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/octicons_react/__tests__/__snapshots__/public-api.test.js.snap b/lib/octicons_react/__tests__/__snapshots__/public-api.test.js.snap
@@ -282,6 +282,7 @@ exports[`@primer/octicons-react should not update exports without a semver chang
   "SparkleFillIcon",
   "SparklesFillIcon",
   "SponsorTiersIcon",
+  "SquareCircleIcon",
   "SquareFillIcon",
   "SquareIcon",
   "SquirrelIcon",
diff --git a/lib/octicons_react/__tests__/tree-shaking.test.js b/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.563kB"`)
+  expect(`${bundleSize}kB`).toMatchInlineSnapshot(`"6.292kB"`)
 })
diff --git a/lib/octicons_react/package.json b/lib/octicons_react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/octicons-react",
-  "version": "19.13.0",
+  "version": "19.15.0",
   "description": "A scalable set of icons handcrafted with <3 by GitHub.",
   "homepage": "https://primer.style/octicons",
   "author": "GitHub, Inc.",
diff --git a/lib/octicons_react/src/__tests__/__snapshots__/octicon.js.snap b/lib/octicons_react/src/__tests__/__snapshots__/octicon.js.snap
@@ -4,10 +4,12 @@ exports[`An icon component matches snapshot 1`] = `
 <svg
   aria-hidden="true"
   class="octicon octicon-alert"
+  display="inline-block"
   fill="currentColor"
   focusable="false"
   height="16"
-  style="display: inline-block; user-select: none; vertical-align: text-bottom; overflow: visible;"
+  overflow="visible"
+  style="vertical-align: text-bottom;"
   viewBox="0 0 16 16"
   width="16"
 >
diff --git a/lib/octicons_react/src/__tests__/octicon.js b/lib/octicons_react/src/__tests__/octicon.js
@@ -54,7 +54,7 @@ describe('An icon component', () => {
 
   it('respects the className prop', () => {
     const {container} = render(<AlertIcon className="foo" />)
-    expect(container.querySelector('svg')).toHaveAttribute('class', 'foo')
+    expect(container.querySelector('svg')).toHaveAttribute('class', 'octicon octicon-alert foo')
   })
 
   it('respects the fill prop', () => {
@@ -67,6 +67,11 @@ describe('An icon component', () => {
     expect(container.querySelector('svg')).toHaveStyle({verticalAlign: 'middle'})
   })
 
+  it('supports additional props on the outermost element', () => {
+    const {container} = render(<AlertIcon data-testid="icon" />)
+    expect(container.firstChild).toHaveAttribute('data-testid', 'icon')
+  })
+
   describe('size props', () => {
     it('respects size="small"', () => {
       const {container} = render(<AlertIcon size="small" />)
diff --git a/lib/octicons_react/src/createIconComponent.js b/lib/octicons_react/src/createIconComponent.js
@@ -16,12 +16,14 @@ export function createIconComponent(name, defaultClassName, getSVGData) {
         'aria-label': ariaLabel,
         'aria-labelledby': arialabelledby,
         tabIndex,
-        className = defaultClassName,
+        className = '',
         fill = 'currentColor',
         size = 16,
         verticalAlign = 'text-bottom',
         id,
-        title
+        title,
+        style,
+        ...rest
       },
       forwardedRef
     ) => {
@@ -36,23 +38,24 @@ export function createIconComponent(name, defaultClassName, getSVGData) {
       return (
         <svg
           ref={forwardedRef}
+          {...rest}
           aria-hidden={labelled ? undefined : 'true'}
           tabIndex={tabIndex}
           focusable={tabIndex >= 0 ? 'true' : 'false'}
           aria-label={ariaLabel}
           aria-labelledby={arialabelledby}
-          className={className}
+          className={`${defaultClassName} ${className}`.trim()}
           role={role}
           viewBox={`0 0 ${naturalWidth} ${naturalHeight}`}
           width={width}
           height={height}
           fill={fill}
           id={id}
+          display="inline-block"
+          overflow="visible"
           style={{
-            display: 'inline-block',
-            userSelect: 'none',
             verticalAlign,
-            overflow: 'visible'
+            ...style
           }}
         >
           {title ? <title>{title}</title> : null}
diff --git a/lib/octicons_react/src/index.d.ts b/lib/octicons_react/src/index.d.ts
@@ -6,7 +6,7 @@ import {Icon} from './__generated__/icons.js'
 
 type Size = 'small' | 'medium' | 'large'
 
-export interface OcticonProps {
+export interface OcticonProps extends React.ComponentPropsWithoutRef<'svg'> {
   'aria-label'?: string
   'aria-labelledby'?: string
   tabIndex?: number
@@ -17,6 +17,7 @@ export interface OcticonProps {
   fill?: string
   icon?: Icon | React.ReactNode
   size?: number | Size
+  /** @deprecated use v-align utilities instead */
   verticalAlign?: 'middle' | 'text-bottom' | 'text-top' | 'top' | 'unset'
 }
 
diff --git a/lib/octicons_styled/LICENSE b/lib/octicons_styled/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 GitHub Inc.
+Copyright (c) 2025 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/octicons",
-  "version": "19.13.0",
+  "version": "19.15.0",
   "publishConfig": {
     "registry": "no registry, don't publish from this package.json."
   },
@@ -50,5 +50,6 @@
       "github/no-then": 0,
       "eslint-comments/no-use": 0
     }
-  }
+  },
+  "packageManager": "yarn@1.22.1"
 }
