From a6a4acb79273accd6ea3f21ee04eac7fe3c2f882 Mon Sep 17 00:00:00 2001 From: EnixCoda Date: Sun, 21 Jun 2020 10:55:30 +0800 Subject: [PATCH] build: use stable octicons --- package.json | 2 +- src/components/Icon.tsx | 2 +- src/components/SearchBar.tsx | 2 +- src/content.scss | 6 +++--- yarn.lock | 5 +++++ 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index c6004db..a63a162 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "dependencies": { "@primer/components": "^16.0.0", "@primer/css": "^14.2.0", - "@primer/octicons-v2-react": "^0.0.0-53e900d", + "@primer/octicons-react": "^10.0.0", "@sentry/browser": "^5.12.1", "@types/firefox-webext-browser": "^70.0.1", "@types/history": "^4.7.5", diff --git a/src/components/Icon.tsx b/src/components/Icon.tsx index e37facd..e0943df 100644 --- a/src/components/Icon.tsx +++ b/src/components/Icon.tsx @@ -15,7 +15,7 @@ import { OctofaceIcon as Octoface, ReplyIcon as Reply, XIcon as X, -} from '@primer/octicons-v2-react' +} from '@primer/octicons-react' import * as React from 'react' import { cx } from 'utils/cx' diff --git a/src/components/SearchBar.tsx b/src/components/SearchBar.tsx index 1d4015f..ab86600 100644 --- a/src/components/SearchBar.tsx +++ b/src/components/SearchBar.tsx @@ -1,5 +1,5 @@ import { TextInput } from '@primer/components' -import { SearchIcon } from '@primer/octicons-v2-react' +import { SearchIcon } from '@primer/octicons-react' import * as React from 'react' import { cx } from 'utils/cx' import { isValidRegexpSource } from 'utils/general' diff --git a/src/content.scss b/src/content.scss index 09c8df6..e48bae5 100644 --- a/src/content.scss +++ b/src/content.scss @@ -103,14 +103,14 @@ $minimal-z-index: max($github-header-z-index, $github-pull-request-float-header- width: 100%; height: 100%; display: block; - background-image: url('~@primer/octicons-v2-react/build/svg/clippy-16.svg?inline'); + background-image: url('~@primer/octicons-react/build/svg/clippy-16.svg?inline'); background-position: center; background-repeat: no-repeat; &.success { - background-image: url('~@primer/octicons-v2-react/build/svg/check-16.svg?inline'); + background-image: url('~@primer/octicons-react/build/svg/check-16.svg?inline'); } &.fail { - background-image: url('~@primer/octicons-v2-react/build/svg/x-16.svg?inline'); + background-image: url('~@primer/octicons-react/build/svg/x-16.svg?inline'); } } } diff --git a/yarn.lock b/yarn.lock index 9ec6e2f..8be6a5f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1006,6 +1006,11 @@ dependencies: "@primer/octicons" "^9.1.1" +"@primer/octicons-react@^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/@primer/octicons-react/-/octicons-react-10.0.0.tgz#82f0d64b4276778fb51468afac00aa0c420ad230" + integrity sha512-I+m7Srg/Ivo5VuXoKwKCJ6YJya+lr6EVzp/WGnDlwBSpy0m4WfYAmZigt3A0i4JMqgLRFDlK+8AgqT66E9bOOw== + "@primer/octicons-react@^9.2.0": version "9.2.0" resolved "https://registry.yarnpkg.com/@primer/octicons-react/-/octicons-react-9.2.0.tgz#76446c36346fef67cbf91c78bd329c8f860c35d5"