From 3bf1804b977089501879e4ca3fa4613428889162 Mon Sep 17 00:00:00 2001 From: Cameron Dutro Date: Thu, 11 Jan 2024 14:55:11 -0800 Subject: [PATCH 1/5] Add React component redirects (#388) --- redirects.json | 292 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 292 insertions(+) diff --git a/redirects.json b/redirects.json index 1d375c86..f71cdd88 100644 --- a/redirects.json +++ b/redirects.json @@ -340,6 +340,298 @@ "match": "^view-components/status", "destination": "/guides/status" }, + + { + "name": "React docs for ActionList", + "match": "^react/ActionList", + "destination": "/components/action-list/react" + }, + { + "name": "React docs for ActionMenu", + "match": "^react/ActionMenu", + "destination": "/components/action-menu/react" + }, + { + "name": "React docs for AnchoredOverlay", + "match": "^react/AnchoredOverlay", + "destination": "/components/anchored-overlay/react" + }, + { + "name": "React docs for Autocomplete", + "match": "^react/Autocomplete", + "destination": "/components/autocomplete/react" + }, + { + "name": "React docs for Avatar", + "match": "^react/Avatar", + "destination": "/components/avatar/react" + }, + { + "name": "React docs for AvatarPair", + "match": "^react/AvatarPair", + "destination": "/components/avatar-pair/react" + }, + { + "name": "React docs for AvatarStack", + "match": "^react/AvatarStack", + "destination": "/components/avatar-stack/react" + }, + { + "name": "React docs for Box", + "match": "^react/Box", + "destination": "/components/box/react" + }, + { + "name": "React docs for BranchName", + "match": "^react/BranchName", + "destination": "/components/branch-name/react" + }, + { + "name": "React docs for Breadcrumbs", + "match": "^react/Breadcrumbs", + "destination": "/components/breadcrumbs/react" + }, + { + "name": "React docs for Button", + "match": "^react/Button", + "destination": "/components/button/react" + }, + { + "name": "React docs for ButtonGroup", + "match": "^react/ButtonGroup", + "destination": "/components/button-group/react" + }, + { + "name": "React docs for Checkbox", + "match": "^react/Checkbox", + "destination": "/components/checkbox/react" + }, + { + "name": "React docs for CheckboxGroup", + "match": "^react/CheckboxGroup", + "destination": "/components/checkbox-group/react" + }, + { + "name": "React docs for CircleBadge", + "match": "^react/CircleBadge", + "destination": "/components/circle-badge/react" + }, + { + "name": "React docs for CircleOcticon", + "match": "^react/CircleOcticon", + "destination": "/components/circle-octicon/react" + }, + { + "name": "React docs for CounterLabel", + "match": "^react/CounterLabel", + "destination": "/components/counter-label/react" + }, + { + "name": "React docs for Details", + "match": "^react/Details", + "destination": "/components/details/react" + }, + { + "name": "React docs for Dialog", + "match": "^react/Dialog", + "destination": "/components/dialog/react" + }, + { + "name": "React docs for Flash", + "match": "^react/Flash", + "destination": "/components/flash/react" + }, + { + "name": "React docs for FormControl", + "match": "^react/FormControl", + "destination": "/components/form-control/react" + }, + { + "name": "React docs for Header", + "match": "^react/Header", + "destination": "/components/header/react" + }, + { + "name": "React docs for Heading", + "match": "^react/Heading", + "destination": "/components/heading/react" + }, + { + "name": "React docs for IconButton", + "match": "^react/IconButton", + "destination": "/components/icon-button/react" + }, + { + "name": "React docs for Label", + "match": "^react/Label", + "destination": "/components/label/react" + }, + { + "name": "React docs for LabelGroup", + "match": "^react/LabelGroup", + "destination": "/components/label-group/react" + }, + { + "name": "React docs for Link", + "match": "^react/Link", + "destination": "/components/link/react" + }, + { + "name": "React docs for NavList", + "match": "^react/NavList", + "destination": "/components/nav-list/react" + }, + { + "name": "React docs for Overlay", + "match": "^react/Overlay", + "destination": "/components/overlay/react" + }, + { + "name": "React docs for Pagehead", + "match": "^react/Pagehead", + "destination": "/components/pagehead/react" + }, + { + "name": "React docs for PageLayout", + "match": "^react/PageLayout", + "destination": "/components/page-layout/react" + }, + { + "name": "React docs for Pagination", + "match": "^react/Pagination", + "destination": "/components/pagination/react" + }, + { + "name": "React docs for PointerBox", + "match": "^react/PointerBox", + "destination": "/components/pointer-box/react" + }, + { + "name": "React docs for Popover", + "match": "^react/Popover", + "destination": "/components/popover/react" + }, + { + "name": "React docs for ProgressBar", + "match": "^react/ProgressBar", + "destination": "/components/progress-bar/react" + }, + { + "name": "React docs for RelativeTime", + "match": "^react/RelativeTime", + "destination": "/components/relative-time/react" + }, + { + "name": "React docs for Radio", + "match": "^react/Radio", + "destination": "/components/radio/react" + }, + { + "name": "React docs for RadioGroup", + "match": "^react/RadioGroup", + "destination": "/components/radio-group/react" + }, + { + "name": "React docs for SegmentedControl", + "match": "^react/SegmentedControl", + "destination": "/components/segmented-control/react" + }, + { + "name": "React docs for Select", + "match": "^react/Select", + "destination": "/components/select/react" + }, + { + "name": "React docs for SelectPanel", + "match": "^react/SelectPanel", + "destination": "/components/selectpanel/react" + }, + { + "name": "React docs for Spinner", + "match": "^react/Spinner", + "destination": "/components/spinner/react" + }, + { + "name": "React docs for SplitPageLayout", + "match": "^react/SplitPageLayout", + "destination": "/components/split-page-layout/react" + }, + { + "name": "React docs for StateLabel", + "match": "^react/StateLabel", + "destination": "/components/state-label/react" + }, + { + "name": "React docs for Octicon", + "match": "^react/Octicon", + "destination": "/components/icon/react" + }, + { + "name": "React docs for SubNav", + "match": "^react/SubNav", + "destination": "/components/subnav/react" + }, + { + "name": "React docs for ToggleSwitch", + "match": "^react/ToggleSwitch", + "destination": "/components/toggle-switch/react" + }, + { + "name": "React docs for TabNav", + "match": "^react/TabNav", + "destination": "/components/tab-nav/react" + }, + { + "name": "React docs for Textarea", + "match": "^react/Textarea", + "destination": "/components/textarea/react" + }, + { + "name": "React docs for Text", + "match": "^react/Text", + "destination": "/components/text/react" + }, + { + "name": "React docs for TextInput", + "match": "^react/TextInput", + "destination": "/components/text-input/react" + }, + { + "name": "React docs for TextInputWithTokens", + "match": "^react/TextInputWithTokens", + "destination": "/components/text-input-with-tokens/react" + }, + { + "name": "React docs for Timeline", + "match": "^react/Timeline", + "destination": "/components/timeline/react" + }, + { + "name": "React docs for Token", + "match": "^react/Token", + "destination": "/components/token/react" + }, + { + "name": "React docs for Tooltip", + "match": "^react/Tooltip", + "destination": "/components/tooltip/react" + }, + { + "name": "React docs for TreeView", + "match": "^react/TreeView", + "destination": "/components/tree-view/react" + }, + { + "name": "React docs for Truncate", + "match": "^react/Truncate", + "destination": "/components/truncate/react" + }, + { + "name": "React docs for UnderlineNav", + "match": "^react/UnderlineNav", + "destination": "/components/underline-nav/react" + }, + { "name": "Component statuses", "match": "^status", From 02c29d963ffb255d09f5f856224afb922e5b824f Mon Sep 17 00:00:00 2001 From: Katie Langerman <18661030+langermank@users.noreply.github.com> Date: Thu, 4 Apr 2024 11:44:40 -0700 Subject: [PATCH 2/5] remove redirect (#392) --- redirects.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/redirects.json b/redirects.json index f71cdd88..9d8c30c2 100644 --- a/redirects.json +++ b/redirects.json @@ -55,11 +55,6 @@ "match": "primitives/spacing", "destination": "/primitives/storybook/?path=/story/size-base--base" }, - { - "name": "Redirect /primitives/typography", - "match": "primitives/typography", - "destination": "/primitives/storybook/?path=/story/typography-base--base" - }, { "name": "Redirect /primitives", "match": "^primitives/?$", From c74fbf44223082bae943ef61efffb17992c4b9b0 Mon Sep 17 00:00:00 2001 From: Lukas Oppermann Date: Fri, 12 Apr 2024 11:01:29 +0200 Subject: [PATCH 3/5] Update deploy_preview.yml (#393) --- .github/workflows/deploy_preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_preview.yml b/.github/workflows/deploy_preview.yml index 8e46c181..e811efe6 100644 --- a/.github/workflows/deploy_preview.yml +++ b/.github/workflows/deploy_preview.yml @@ -11,7 +11,7 @@ permissions: jobs: deploy: name: Build and deploy - uses: primer/.github/.github/workflows/deploy_preview.yml@main + uses: primer/.github/.github/workflows/deploy_preview.yml@v1.0.0 secrets: gh_token: ${{ secrets.GITHUB_TOKEN }} with: From 001fb1c6540e2841775d496f75779f9ba6676146 Mon Sep 17 00:00:00 2001 From: Daniel Adams Date: Wed, 17 Apr 2024 09:44:33 +0200 Subject: [PATCH 4/5] Add custom head (#394) --- src/components/CustomHead.js | 11 +++++++++++ src/components/Layout.js | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 src/components/CustomHead.js diff --git a/src/components/CustomHead.js b/src/components/CustomHead.js new file mode 100644 index 00000000..e3985c60 --- /dev/null +++ b/src/components/CustomHead.js @@ -0,0 +1,11 @@ +import React from 'react' +import Helmet from 'react-helmet' + +export default function CustomHead() { + return ( + + + + + ) +} \ No newline at end of file diff --git a/src/components/Layout.js b/src/components/Layout.js index c97d9524..a7c3836e 100644 --- a/src/components/Layout.js +++ b/src/components/Layout.js @@ -1,5 +1,6 @@ import {Box, ThemeProvider} from '@primer/react' import {Head, Header} from '@primer/gatsby-theme-doctocat' +import CustomHead from './CustomHead' import '@primer/css/layout/index.scss' import React from 'react' @@ -7,6 +8,7 @@ export default function Layout({pageContext, children, colorMode}) { return ( +
{children} From 1848c174902ff815dfb81061a2027d7fe4b682af Mon Sep 17 00:00:00 2001 From: Cameron Dutro Date: Fri, 10 May 2024 11:30:43 -0700 Subject: [PATCH 5/5] Use new Lookbook URL --- redirects.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/redirects.json b/redirects.json index 9d8c30c2..2f1fad82 100644 --- a/redirects.json +++ b/redirects.json @@ -852,22 +852,22 @@ { "name": "ViewComponents Preview assets proxy", "match": "^assets/(.*)", - "destination": "https://view-components-storybook.eastus.cloudapp.azure.com/assets/{R:1}" + "destination": "https://primer-lookbook.github.com/assets/{R:1}" }, { "name": "ViewComponents Lookbook assets proxy", "match": "^lookbook-assets/(.*)", - "destination": "https://view-components-storybook.eastus.cloudapp.azure.com/lookbook-assets/{R:1}" + "destination": "https://primer-lookbook.github.com/lookbook-assets/{R:1}" }, { "name": "ViewComponents Lookbook proxy", "match": "^view-components/lookbook/(.*)", - "destination": "https://view-components-storybook.eastus.cloudapp.azure.com/view-components/lookbook/{R:1}" + "destination": "https://primer-lookbook.github.com/view-components/lookbook/{R:1}" }, { "name": "ViewComponents Rails App proxy", "match": "^view-components/rails-app/(.*)", - "destination": "https://view-components-storybook.eastus.cloudapp.azure.com/view-components/rails-app/{R:1}" + "destination": "https://primer-lookbook.github.com/view-components/rails-app/{R:1}" }, { "name": "Presentations proxy",