Merge branch 'main' into add-devices

.changeset/gorgeous-windows-wash.md

@@ -0,0 +1,5 @@
+---
+"@primer/octicons": minor
+---
+
+Updates the `pin` icon with a flipped composition, and adds `pin-slash`

.changeset/lemon-bulldogs-give.md

@@ -0,0 +1,5 @@
+---
+"@primer/octicons": minor
+---
+
+Updating `move-to-top` and `move-to-bottom` to fix logic and alignment issues.

.github/actions/build_node/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10-slim
+FROM node:18-slim
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \

.github/workflows/ci.yml

@@ -9,15 +9,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
       - run: yarn
       - name: Building
         run: yarn build
       - run: cp -r icons lib/build/svg
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: octicons-build
           path: ./lib/build
@@ -27,11 +27,11 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
-      - uses: actions/download-artifact@v2
+          node-version: 18
+      - uses: actions/download-artifact@v3
         with:
           name: octicons-build
           path: ./lib/build
@@ -49,11 +49,11 @@ jobs:
       run:
         working-directory: ./lib/octicons_node
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
-      - uses: actions/download-artifact@v2
+          node-version: 18
+      - uses: actions/download-artifact@v3
         with:
           name: octicons-build
           path: ./lib/build
@@ -73,11 +73,11 @@ jobs:
       run:
         working-directory: ./lib/octicons_react
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
-      - uses: actions/download-artifact@v2
+          node-version: 18
+      - uses: actions/download-artifact@v3
         with:
           name: octicons-build
           path: ./lib/build
@@ -97,12 +97,12 @@ jobs:
       run:
         working-directory: ./lib/octicons_gem
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: octicons-build
           path: ./lib/octicons_gem/lib/build
@@ -126,12 +126,12 @@ jobs:
       run:
         working-directory: ./lib/octicons_helper
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: octicons-gem
           path: ./lib/octicons_helper/vendor/cache
@@ -149,12 +149,12 @@ jobs:
       run:
         working-directory: ./lib/octicons_jekyll
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: octicons-gem
           path: ./lib/octicons_jekyll/vendor/cache

.github/workflows/publish.yml

@@ -1,6 +1,7 @@
 on:
   release:
     types: [published]
+  workflow_dispatch:
 name: Octicons Publish
 jobs:
   setup:
@@ -9,7 +10,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: '10.x'
+          node-version: '18.x'
       - run: npm install
       - run: npm run build
       - run: cp -r icons lib/build/svg

.github/workflows/release.yml

@@ -12,16 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
           fetch-depth: 0
           persist-credentials: false
 
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18.x
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1

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

keywords.json

@@ -150,6 +150,7 @@
   "pencil": ["edit", "change", "update", "write"],
   "person": ["people", "man", "woman", "human"],
   "pin": ["save", "star", "bookmark"],
+  "pin-slash": ["unpin", "unsave", "unstar", "unbookmark"],
   "play": ["play", "start", "begin", "action"],
   "plug": ["hook", "webhook"],
   "plus": ["add", "new", "more"],

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

@@ -214,6 +214,7 @@ exports[`@primer/octicons-react should not update exports without a semver chang
   "PersonFillIcon",
   "PersonIcon",
   "PinIcon",
+  "PinSlashIcon",
   "PlayIcon",
   "PlugIcon",
   "PlusCircleIcon",
@@ -313,6 +314,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(`"2.848kB"`)
+  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>