From 30295e07858d01dcaa45e97220ae5b8ddc43e4d7 Mon Sep 17 00:00:00 2001
From: Michelle Tilley <michelle@michelletilley.net>
Date: Tue, 15 Sep 2020 14:35:06 -0700
Subject: [PATCH 1/4] Upgrading @primer/gatsby-theme-doctocat to 0.25.1
---
package.json | 4 +-
yarn.lock | 160 +++++++++++++++++++++++++++++++++++----------------
2 files changed, 112 insertions(+), 52 deletions(-)
diff --git a/package.json b/package.json
index 4ab7d79..05aa2bf 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@loadable/component": "^5.10.2",
- "@primer/gatsby-theme-doctocat": "^0.20.0",
+ "@primer/gatsby-theme-doctocat": "^0.25.1",
"eslint": "5.8.0",
"eslint-plugin-github": "1.6.0",
"gatsby": "^2.13.25",
@@ -20,4 +20,4 @@
"react-dom": "16.9.x"
},
"private": true
-}
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 3e47e98..88a6881 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -279,7 +279,7 @@
"@babel/traverse" "^7.8.3"
"@babel/types" "^7.8.3"
-"@babel/helpers@^7.8.4", "@babel/helpers@^7.9.0":
+"@babel/helpers@7.9.2", "@babel/helpers@^7.8.4", "@babel/helpers@^7.9.0":
version "7.9.2"
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"
integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==
@@ -863,7 +863,7 @@
core-js-pure "^3.0.0"
regenerator-runtime "^0.13.4"
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.7.6", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+"@babel/runtime@7.9.2", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.7.6", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
version "7.9.2"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
@@ -1246,41 +1246,43 @@
style-value-types "^3.1.7"
tslib "^1.10.0"
-"@primer/components@^16.1.0":
- version "16.3.0"
- resolved "https://registry.yarnpkg.com/@primer/components/-/components-16.3.0.tgz#c623424cc57edcfc5007284970ffbc0fd72f7dbf"
- integrity sha512-oydKIzcDCtIDjbGEUCLuxW94sDfBFbKRne/I4DlnYYnv6DGxpL1hE3zLoKp3+f5ycpsFSAckXJBafIhimQljpQ==
+"@primer/components@^20.0.0":
+ version "20.0.0"
+ resolved "https://registry.yarnpkg.com/@primer/components/-/components-20.0.0.tgz#643bd7d719af28d6cdf446909255ee04e9f47014"
+ integrity sha512-OpnBJDB+7Rw8NK7p/UlJx3B6uGjRSVKtbEUAE+BjTYAD5wrjSnWKTgBqnorTzPcmstDAxC6GNtmsukyyk3lMHA==
dependencies:
- "@primer/octicons-react" "^9.2.0"
+ "@babel/helpers" "7.9.2"
+ "@babel/runtime" "7.9.2"
+ "@primer/octicons-react" "^10.0.0"
+ "@primer/primitives" "3.0.0"
"@reach/dialog" "0.3.0"
+ "@styled-system/css" "5.1.5"
"@styled-system/prop-types" "5.1.2"
"@styled-system/props" "5.1.4"
"@styled-system/theme-get" "5.1.2"
"@testing-library/react" "9.4.0"
+ "@types/styled-components" "^4.4.0"
"@types/styled-system" "5.1.2"
- babel-plugin-macros "2.6.1"
+ babel-plugin-macros "2.8.0"
babel-polyfill "6.26.0"
classnames "^2.2.5"
details-element-polyfill "2.4.0"
jest-axe "3.2.0"
- nanoid "2.1.4"
- primer-colors "1.0.1"
- primer-typography "1.0.1"
+ polished "3.5.2"
react "^16.10.2"
react-is "16.10.2"
styled-system "5.1.2"
-"@primer/gatsby-theme-doctocat@^0.20.0":
- version "0.20.0"
- resolved "https://registry.yarnpkg.com/@primer/gatsby-theme-doctocat/-/gatsby-theme-doctocat-0.20.0.tgz#95f7d965ecfa7199ad0e022b1029b9c6b2a793ff"
- integrity sha512-ltCnDFRT+X3EIT5jI8jsGKeVx7RZTJpqC9Ms1AbtTZ7V6aJ6ocHbY0kSYqWmGu8Juaqy0u3aocoG8u4P66q7QQ==
+"@primer/gatsby-theme-doctocat@^0.25.1":
+ version "0.25.1"
+ resolved "https://registry.yarnpkg.com/@primer/gatsby-theme-doctocat/-/gatsby-theme-doctocat-0.25.1.tgz#a676b2b80226fcd49f8a6e87f670ce313b67ed64"
+ integrity sha512-DzeJfjLK0MOvSyvMRv9uh/HuFnD7Ra1abMxKmXoVrTOs42jVi2NthfCScroBVSzCLMOfk6Bap2UV76KGG9jiRQ==
dependencies:
"@babel/preset-env" "^7.5.5"
"@babel/preset-react" "^7.0.0"
"@mdx-js/mdx" "^1.0.21"
"@mdx-js/react" "^1.0.21"
- "@primer/components" "^16.1.0"
- "@primer/octicons-react" "^9.1.1"
+ "@primer/components" "^20.0.0"
"@styled-system/theme-get" "^5.0.12"
"@testing-library/jest-dom" "^4.1.0"
"@testing-library/react" "^9.1.3"
@@ -1323,13 +1325,17 @@
sentence-case "^2.1.1"
styled-components "^4.3.2"
styled-system "^5.0.18"
+ worker-loader "^3.0.2"
-"@primer/octicons-react@^9.1.1", "@primer/octicons-react@^9.2.0":
- version "9.6.0"
- resolved "https://registry.yarnpkg.com/@primer/octicons-react/-/octicons-react-9.6.0.tgz#996f621cb063757a4985cd6b45e59ed00e3444bf"
- integrity sha512-FR0fiU1UY1ds5ZMCUY+iVkkm1Eh4yDHf2ui+cxB3VvYX23DAdUAohPGit+qaMFy2caDd7uWYGRZduKS7dW1FZQ==
- dependencies:
- prop-types "^15.6.1"
+"@primer/octicons-react@^10.0.0":
+ version "10.1.0"
+ resolved "https://registry.yarnpkg.com/@primer/octicons-react/-/octicons-react-10.1.0.tgz#6d2b980582f6d917043dd8fd873039e71d8b7242"
+ integrity sha512-WjIaetTaf4x66xxaG/gxwsWRL2JYG33n8CfeR/L134YcX2zl9TPps9crLzI2f3rxjOdKZgVFBoUh94Cim4Fflw==
+
+"@primer/primitives@3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@primer/primitives/-/primitives-3.0.0.tgz#ccfb324b478b2373733535ec49f8de29e238c55d"
+ integrity sha512-ISXB43vcA+kg5pmGtGo3lPlHmY5Mg9nLhliePJu3Y5aP7g28TO+9cC99gL240pZHYsO0aVyU26WZwUXn6UIqJQ==
"@reach/component-component@^0.3.0":
version "0.3.0"
@@ -1415,7 +1421,7 @@
dependencies:
object-assign "^4.1.1"
-"@styled-system/css@^5.1.5":
+"@styled-system/css@5.1.5", "@styled-system/css@^5.1.5":
version "5.1.5"
resolved "https://registry.yarnpkg.com/@styled-system/css/-/css-5.1.5.tgz#0460d5f3ff962fa649ea128ef58d9584f403bbbc"
integrity sha512-XkORZdS5kypzcBotAMPBoeckDs9aSZVkvrAlq5K3xP8IMAUek+x2O4NtwoSgkYkWWzVBu6DGdFZLR790QWGG+A==
@@ -1642,6 +1648,14 @@
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.5.tgz#527d20ef68571a4af02ed74350164e7a67544860"
integrity sha512-wLD/Aq2VggCJXSjxEwrMafIP51Z+13H78nXIX0ABEuIGhmB5sNGbR113MOKo+yfw+RDo1ZU3DM6yfnnRF/+ouw==
+"@types/hoist-non-react-statics@*":
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
+ integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
+ dependencies:
+ "@types/react" "*"
+ hoist-non-react-statics "^3.3.0"
+
"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -1667,6 +1681,11 @@
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
+"@types/json-schema@^7.0.5":
+ version "7.0.6"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
+ integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
+
"@types/lodash@^4.14.92":
version "4.14.149"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz#1342d63d948c6062838fbf961012f74d4e638440"
@@ -1729,6 +1748,13 @@
dependencies:
"@types/react" "*"
+"@types/react-native@*":
+ version "0.63.18"
+ resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.63.18.tgz#748d82c6453befe97285393ad9530472d8de56af"
+ integrity sha512-WwEWqmHiqFn61M1FZR/+frj+E8e2o8i5cPqu9mjbjtZS/gBfCKVESF2ai/KAlaQECkkWkx/nMJeCc5eHMmLQgw==
+ dependencies:
+ "@types/react" "*"
+
"@types/react@*":
version "16.9.33"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.33.tgz#a5274520f0d28cbbb73c8652ddd48646fd4bcae5"
@@ -1750,6 +1776,16 @@
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+"@types/styled-components@^4.4.0":
+ version "4.4.3"
+ resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-4.4.3.tgz#74dd00ad760845a98890a8539361d8afc32059de"
+ integrity sha512-U0udeNOZBfUkJycmGJwmzun0FBt11rZy08weVQmE2xfUNAbX8AGOEWxWna2d+qAUKxKgMlcG+TZT0+K2FfDcnQ==
+ dependencies:
+ "@types/hoist-non-react-statics" "*"
+ "@types/react" "*"
+ "@types/react-native" "*"
+ csstype "^2.2.0"
+
"@types/styled-system@5.1.2":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@types/styled-system/-/styled-system-5.1.2.tgz#d75c40bc4a3bb0d0022eb3dcae58854129e9dd32"
@@ -2107,6 +2143,11 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
+ajv-keywords@^3.5.2:
+ version "3.5.2"
+ resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+ integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.3, ajv@^6.5.5:
version "6.12.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
@@ -2117,6 +2158,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.3, ajv@^6.5.5:
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
+ajv@^6.12.4:
+ version "6.12.5"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
+ integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
+ dependencies:
+ fast-deep-equal "^3.1.1"
+ fast-json-stable-stringify "^2.0.0"
+ json-schema-traverse "^0.4.1"
+ uri-js "^4.2.2"
+
alphanum-sort@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@@ -2596,16 +2647,7 @@ babel-plugin-jest-hoist@^24.9.0:
dependencies:
"@types/babel__traverse" "^7.0.6"
-babel-plugin-macros@2.6.1:
- version "2.6.1"
- resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz#41f7ead616fc36f6a93180e89697f69f51671181"
- integrity sha512-6W2nwiXme6j1n2erPOnmRiWfObUhWH7Qw1LMi9XZy8cj+KtESu3T6asZvtk5bMQQjX8te35o7CFueiSdL/2NmQ==
- dependencies:
- "@babel/runtime" "^7.4.2"
- cosmiconfig "^5.2.0"
- resolve "^1.10.0"
-
-babel-plugin-macros@^2.2.2, babel-plugin-macros@^2.8.0:
+babel-plugin-macros@2.8.0, babel-plugin-macros@^2.2.2, babel-plugin-macros@^2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
@@ -3933,7 +3975,7 @@ cors@^2.8.5:
object-assign "^4"
vary "^1"
-cosmiconfig@^5.0.0, cosmiconfig@^5.2.0:
+cosmiconfig@^5.0.0:
version "5.2.1"
resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
@@ -8853,6 +8895,15 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4
emojis-list "^3.0.0"
json5 "^1.0.1"
+loader-utils@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
+ integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
+ dependencies:
+ big.js "^5.2.2"
+ emojis-list "^3.0.0"
+ json5 "^2.1.2"
+
locate-path@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -9625,11 +9676,6 @@ nan@^2.12.1:
resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
-nanoid@2.1.4:
- version "2.1.4"
- resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.4.tgz#c38b2c1f7f4c60cde2291f40854420328d0d621e"
- integrity sha512-PijW88Ry+swMFfArOrm7uRAdVmJilLbej7WwVY6L5QwLDckqxSOinGGMV596yp5C8+MH3VvCXCSZ6AodGtKrYQ==
-
nanomatch@^1.2.9:
version "1.2.13"
resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -10649,6 +10695,13 @@ pnp-webpack-plugin@^1.6.4:
dependencies:
ts-pnp "^1.1.6"
+polished@3.5.2:
+ version "3.5.2"
+ resolved "https://registry.yarnpkg.com/polished/-/polished-3.5.2.tgz#ca132b8cd68f7ffa95ae9d423f03e7a14fda1062"
+ integrity sha512-vWoRDg3gY5RQBtUfcj9MRN10VCIf4EkdUikGxyXItg2Hnwk+eIVtdBiLajN0ldFeT3Vq4r/QNbjrQdhqBKrTug==
+ dependencies:
+ "@babel/runtime" "^7.8.7"
+
popmotion@9.0.0-beta-8:
version "9.0.0-beta-8"
resolved "https://registry.yarnpkg.com/popmotion/-/popmotion-9.0.0-beta-8.tgz#f5a709f11737734e84f2a6b73f9bcf25ee30c388"
@@ -11112,16 +11165,6 @@ preval.macro@^3.0.0:
dependencies:
babel-plugin-preval "^3.0.0"
-primer-colors@1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/primer-colors/-/primer-colors-1.0.1.tgz#9bc2dbfefeba3ec987eb7d71c6a3d14c67ae9c35"
- integrity sha512-bxo3OPoIO1F/C07RpKbLjPzuSsTkOMzo9Yl9OJFHGD7/UxA+JvNdZK0GbJzWtz5Y8H6KabbHadxwVWRp1xl08A==
-
-primer-typography@1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/primer-typography/-/primer-typography-1.0.1.tgz#559c03e0d2470fa2d48a4166a63091f4b1162759"
- integrity sha512-9f1MNOMYOWemosmJIG8FToqZoL7YKQW3KHNsMS3DddTUzJefnVzeqmiiTBPc2ok0yE7fE2PgobG9iRY+itgdVg==
-
prism-react-renderer@^0.1.7:
version "0.1.7"
resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-0.1.7.tgz#dc273d0cb6e4a498ba0775094e9a8b01a3ad2eaa"
@@ -12397,6 +12440,15 @@ schema-utils@^2.6.5:
ajv "^6.12.0"
ajv-keywords "^3.4.1"
+schema-utils@^2.7.0:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
+ integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
+ dependencies:
+ "@types/json-schema" "^7.0.5"
+ ajv "^6.12.4"
+ ajv-keywords "^3.5.2"
+
scroll-behavior@^0.9.12:
version "0.9.12"
resolved "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.12.tgz#1c22d273ec4ce6cd4714a443fead50227da9424c"
@@ -14641,6 +14693,14 @@ worker-farm@^1.7.0:
dependencies:
errno "~0.1.7"
+worker-loader@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-3.0.2.tgz#f82386a96366d24dbf6c2420f5bed04d3fe5a229"
+ integrity sha512-a3Hk9/3OCKkiK00gRIenNd4pdwBQn2Hu2L39WPGqR5WlX90u++mAVK7K1i6zUQyio4zqpnaastJ7J0xCBaA3VA==
+ dependencies:
+ loader-utils "^2.0.0"
+ schema-utils "^2.7.0"
+
worker-rpc@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/worker-rpc/-/worker-rpc-0.1.1.tgz#cb565bd6d7071a8f16660686051e969ad32f54d5"
--
GitLab
From dd2ce09d037686718989e3c81b4e8383db11b507 Mon Sep 17 00:00:00 2001
From: Michelle Tilley <michelle@michelletilley.net>
Date: Thu, 17 Sep 2020 11:15:47 -0700
Subject: [PATCH 2/4] Add @primer/octicons-react dependency
---
package.json | 3 ++-
yarn.lock | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 05aa2bf..d876081 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
"dependencies": {
"@loadable/component": "^5.10.2",
"@primer/gatsby-theme-doctocat": "^0.25.1",
+ "@primer/octicons-react": "^11.0.0",
"eslint": "5.8.0",
"eslint-plugin-github": "1.6.0",
"gatsby": "^2.13.25",
@@ -20,4 +21,4 @@
"react-dom": "16.9.x"
},
"private": true
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index 88a6881..7506545 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1332,6 +1332,11 @@
resolved "https://registry.yarnpkg.com/@primer/octicons-react/-/octicons-react-10.1.0.tgz#6d2b980582f6d917043dd8fd873039e71d8b7242"
integrity sha512-WjIaetTaf4x66xxaG/gxwsWRL2JYG33n8CfeR/L134YcX2zl9TPps9crLzI2f3rxjOdKZgVFBoUh94Cim4Fflw==
+"@primer/octicons-react@^11.0.0":
+ version "11.0.0"
+ resolved "https://registry.yarnpkg.com/@primer/octicons-react/-/octicons-react-11.0.0.tgz#8171177a55d944c9e6b491c43f2957e86191cfa5"
+ integrity sha512-lHEoFVhTyyjxIDJJgVQBJGsEU4BywFbpHuBPDM8jpqYszGcYaV3zCLWNCUaQgLfzl3lRBUXc+pMrzT5qRXLftg==
+
"@primer/primitives@3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@primer/primitives/-/primitives-3.0.0.tgz#ccfb324b478b2373733535ec49f8de29e238c55d"
--
GitLab
From 79c5ace9468d88130bbe1852f8e8835c4f3b2b4c Mon Sep 17 00:00:00 2001
From: Michelle Tilley <michelle@michelletilley.net>
Date: Thu, 17 Sep 2020 11:21:32 -0700
Subject: [PATCH 3/4] Update Octicon imports
---
content/ui-patterns/messaging.mdx | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/content/ui-patterns/messaging.mdx b/content/ui-patterns/messaging.mdx
index 86aa88c..e9c326f 100644
--- a/content/ui-patterns/messaging.mdx
+++ b/content/ui-patterns/messaging.mdx
@@ -3,8 +3,7 @@ title: Messaging
---
import {Box, Flex, BorderBox, Text, CircleOcticon} from '@primer/components'
-import {Check} from '@primer/octicons-react'
-import {X} from '@primer/octicons-react'
+import {CheckIcon, XIcon} from '@primer/octicons-react'
Messaging components are used to provide important and relevant information to the user, including feedback, contextual information, product updates, and more.
@@ -45,10 +44,10 @@ Toasts should be brief and not bog down the experience with superfluous copy. If
<Flex flexDirection={['column', 'row', 'row']}>
<Box mr="2" mb="4">
<Flex flexDirection="row" alignItems="center" mb="2">
- <CircleOcticon icon={Check} size={16} bg="green.5" color="white" mr="2" p="1"/>
+ <CircleOcticon icon={CheckIcon} size={16} bg="green.5" color="white" mr="2" p="1"/>
<Text fontWeight="bold" color="gray.9" ml="1">
Do
- </Text>
+ </Text>
</Flex>
<Box>
<img src="https://user-images.githubusercontent.com/586552/63106528-06de5100-bf51-11e9-8a5e-98583ed74874.png" />
@@ -59,10 +58,10 @@ Toasts should be brief and not bog down the experience with superfluous copy. If
</Box>
<Box mr="2">
<Flex flexDirection="row" alignItems="center" mb="2">
- <CircleOcticon icon={X} size={16} bg="red.5" color="white" mr="2" p="1"/>
+ <CircleOcticon icon={XIcon} size={16} bg="red.5" color="white" mr="2" p="1"/>
<Text fontWeight="bold" color="gray.9" ml="1">
Don't
- </Text>
+ </Text>
</Flex>
<Box borderRadius="3">
<img src="https://user-images.githubusercontent.com/586552/63106527-06de5100-bf51-11e9-858c-72de6a5c728a.png" />
@@ -85,7 +84,7 @@ Toasts are generally informative and should not receive focus when they appear.
</Box>
Flash alerts are used to display updates or alerts pertaining to any part of the system; this includes information regarding the user's account, the organization, the repo, and more. These updates are typically not user-initiated but rather alerts that require the user's attention. Similarly to Toasts, Flash alerts can convey a warning, error, success, or a neutral message.
-Though Flash alerts don't need to be as concise as a typical Toast message, they should still be direct and not exceed two to three sentences. If additional context is needed, provide a link for the user to learn more.
+Though Flash alerts don't need to be as concise as a typical Toast message, they should still be direct and not exceed two to three sentences. If additional context is needed, provide a link for the user to learn more.
Don't use headings or multiple type sizes in Flash alerts, rely on our default paragraph size instead.
@@ -95,10 +94,10 @@ Flash alerts that affect every page (e.g. a global message) should use the [full
<Flex flexDirection="column">
<Box width="100%" mr="2" mb="4">
<Flex flexDirection="row" alignItems="center" mb="2">
- <CircleOcticon icon={Check} size={16} bg="green.5" color="white" mr="2" p="1"/>
+ <CircleOcticon icon={CheckIcon} size={16} bg="green.5" color="white" mr="2" p="1"/>
<Text fontWeight="bold" color="gray.9" ml="1">
Do
- </Text>
+ </Text>
</Flex>
<Box>
<img src="https://user-images.githubusercontent.com/586552/63046880-46e5fb00-bea1-11e9-836d-be1b1c7d963f.png" />
@@ -109,10 +108,10 @@ Flash alerts that affect every page (e.g. a global message) should use the [full
</Box>
<Box width="100%" mr="2">
<Flex flexDirection="row" alignItems="center" mb="2">
- <CircleOcticon icon={X} size={16} bg="red.5" color="white" mr="2" p="1"/>
+ <CircleOcticon icon={XIcon} size={16} bg="red.5" color="white" mr="2" p="1"/>
<Text fontWeight="bold" color="gray.9" ml="1">
Don't
- </Text>
+ </Text>
</Flex>
<Box borderRadius="3">
<img src="https://user-images.githubusercontent.com/586552/63046881-46e5fb00-bea1-11e9-87ee-80dbeb0bea1c.png" />
@@ -132,7 +131,7 @@ They typically do not timeout on their own, but can include a dismiss action for
<Flex flexDirection={['column', 'row', 'row']}>
<Box mr="3" mb="2">
<img width="262" src="https://user-images.githubusercontent.com/586552/63109550-8111d400-bf57-11e9-8714-46607da2f2ba.png" />
-
+
</Box>
<Box mb="2">
<img width="386" src="https://user-images.githubusercontent.com/586552/63109551-8111d400-bf57-11e9-893b-2cdeffffd147.png" />
@@ -142,7 +141,7 @@ They typically do not timeout on their own, but can include a dismiss action for
Popovers are used to call attention to a new feature, change to an existing feature, or to provide additional context. Popovers can be helpful for flows that require light onboarding or instruction.
**Use sparingly to avoid cognitive overload**
-Though they can be used for a variety of things, they should be used sparingly to avoid cognitive overload. It's important to consider the context in which the Popover appears. Are there other Popovers on the page? Does it appear on page load, or require the user to open the Popover?
+Though they can be used for a variety of things, they should be used sparingly to avoid cognitive overload. It's important to consider the context in which the Popover appears. Are there other Popovers on the page? Does it appear on page load, or require the user to open the Popover?
Unlike other messaging components, Popovers should never include critical information (such as errors) and should always include a dismiss action.
--
GitLab
From 2f3ed30073f652db88f41f4f48152f31b463c883 Mon Sep 17 00:00:00 2001
From: Michelle Tilley <michelle@michelletilley.net>
Date: Fri, 18 Sep 2020 11:05:02 -0700
Subject: [PATCH 4/4] doctocat@0.25.2
---
package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index d876081..ba268b9 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"@loadable/component": "^5.10.2",
- "@primer/gatsby-theme-doctocat": "^0.25.1",
+ "@primer/gatsby-theme-doctocat": "^0.25.2",
"@primer/octicons-react": "^11.0.0",
"eslint": "5.8.0",
"eslint-plugin-github": "1.6.0",
diff --git a/yarn.lock b/yarn.lock
index 7506545..403df14 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1273,10 +1273,10 @@
react-is "16.10.2"
styled-system "5.1.2"
-"@primer/gatsby-theme-doctocat@^0.25.1":
- version "0.25.1"
- resolved "https://registry.yarnpkg.com/@primer/gatsby-theme-doctocat/-/gatsby-theme-doctocat-0.25.1.tgz#a676b2b80226fcd49f8a6e87f670ce313b67ed64"
- integrity sha512-DzeJfjLK0MOvSyvMRv9uh/HuFnD7Ra1abMxKmXoVrTOs42jVi2NthfCScroBVSzCLMOfk6Bap2UV76KGG9jiRQ==
+"@primer/gatsby-theme-doctocat@^0.25.2":
+ version "0.25.2"
+ resolved "https://registry.yarnpkg.com/@primer/gatsby-theme-doctocat/-/gatsby-theme-doctocat-0.25.2.tgz#f0d871ac204902b153e2c9a1926390e54aa2419b"
+ integrity sha512-Hihiz2yTT4tEOUurLBRr8SlHNP9jPupBoMXbc/IC7HoxwyNONKpl8wOojgJvswAiHx1Gd4knTEzD6ZbC3KGtyw==
dependencies:
"@babel/preset-env" "^7.5.5"
"@babel/preset-react" "^7.0.0"
--
GitLab