From 93067925d746a4e155b5bb9e257669e51c47e33c Mon Sep 17 00:00:00 2001 From: Mike Perrotti Date: Wed, 16 Mar 2022 12:27:18 -0400 Subject: [PATCH 1/5] removes deprecated Octicons export from docs scope --- docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js b/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js index f89af5a7a60..a9b98b59a42 100644 --- a/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js +++ b/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js @@ -12,13 +12,15 @@ const ReactRouterLink = ({to, ...props}) => { return } +delete octicons.default + export default function resolveScope(metastring) { return { ...doctocatComponents, ...primerComponents, - ...octicons, ...(metastring.includes('drafts') ? drafts : {}), ...(metastring.includes('deprecated') ? deprecated : {}), + ...octicons, ReactRouterLink, State, Placeholder From 74ef98ef8d167d2bba315c23c2933a339e4c8570 Mon Sep 17 00:00:00 2001 From: Mike Perrotti Date: Wed, 16 Mar 2022 12:30:46 -0400 Subject: [PATCH 2/5] undo the change of order in exports --- docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js b/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js index a9b98b59a42..05d97c26b9d 100644 --- a/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js +++ b/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js @@ -18,9 +18,9 @@ export default function resolveScope(metastring) { return { ...doctocatComponents, ...primerComponents, + ...octicons, ...(metastring.includes('drafts') ? drafts : {}), ...(metastring.includes('deprecated') ? deprecated : {}), - ...octicons, ReactRouterLink, State, Placeholder From 53796a9bebb6d77fec357ec1775c05b5d725c102 Mon Sep 17 00:00:00 2001 From: Mike Perrotti Date: Wed, 16 Mar 2022 12:51:10 -0400 Subject: [PATCH 3/5] adds comment about why we do not export octicons-react default export --- docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js b/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js index 05d97c26b9d..c0691a1503d 100644 --- a/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js +++ b/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js @@ -12,6 +12,7 @@ const ReactRouterLink = ({to, ...props}) => { return } +// don't attempt to export this below because octicons-react's default export is deprecated delete octicons.default export default function resolveScope(metastring) { From df8ee810566c0c99bb4299b5d80fb52d8abb03ac Mon Sep 17 00:00:00 2001 From: Cole Bemis Date: Wed, 16 Mar 2022 10:44:15 -0700 Subject: [PATCH 4/5] Update docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js --- docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js b/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js index c0691a1503d..86afbfac657 100644 --- a/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js +++ b/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js @@ -12,8 +12,8 @@ const ReactRouterLink = ({to, ...props}) => { return } -// don't attempt to export this below because octicons-react's default export is deprecated -delete octicons.default +// Exclude octicons-react's default export because it's deprecated +const {default: _, ...octiconComponents} = octicons export default function resolveScope(metastring) { return { From 91fc7191b35c7b80a51bced57bcf6e729fc7f4bd Mon Sep 17 00:00:00 2001 From: Cole Bemis Date: Wed, 16 Mar 2022 10:46:06 -0700 Subject: [PATCH 5/5] Update export --- docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js b/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js index 86afbfac657..991f401f1fd 100644 --- a/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js +++ b/docs/src/@primer/gatsby-theme-doctocat/live-code-scope.js @@ -19,7 +19,7 @@ export default function resolveScope(metastring) { return { ...doctocatComponents, ...primerComponents, - ...octicons, + ...octiconComponents, ...(metastring.includes('drafts') ? drafts : {}), ...(metastring.includes('deprecated') ? deprecated : {}), ReactRouterLink,