From 8166a7cc9fa30d68acbf5717c999a9cd9d80df41 Mon Sep 17 00:00:00 2001 From: Van Anderson Date: Fri, 11 Jun 2021 14:20:15 -0500 Subject: [PATCH 1/6] upgrade primer/primitives --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a5c68695ea1..225127da57c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@primer/components", - "version": "28.1.1", + "version": "28.2.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2916,9 +2916,9 @@ "integrity": "sha512-j5XppNRCvgaMZLPsVvvmp6GSh7P5pq6PUbsfLNBWi2Kz3KYDeoGDWbPr5MjoxFOGUn6Hjnt6qjHPRxahd11vLQ==" }, "@primer/primitives": { - "version": "0.0.0-202121782215", - "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-0.0.0-202121782215.tgz", - "integrity": "sha512-W3tdfiQ/6wSVkbwmv0RmIiZmzqcgQJKCwTjEUp1qMreQqe+smrtYq6u9pbWGlMgxX8aX79duNwwfiQ44eGO4NA==" + "version": "4.3.11", + "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-4.3.11.tgz", + "integrity": "sha512-3HSRYt5bkhSl/kv0JB3SYVpQSGiAN/7dPc/dMna4GD7tplvugVsFHlI3zdzmWBx/TQl64FsUNJ1TtSWN67GV4A==" }, "@reach/router": { "version": "1.3.4", diff --git a/package.json b/package.json index c9cde13cd49..a0bdcc7883a 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "license": "MIT", "dependencies": { "@primer/octicons-react": "^13.0.0", - "@primer/primitives": "0.0.0-202121782215", + "@primer/primitives": "4.3.11", "@styled-system/css": "5.1.5", "@styled-system/props": "5.1.4", "@styled-system/theme-get": "5.1.2", From ae146ab032e56f3b381e5ec2dd1ce36cbe080640 Mon Sep 17 00:00:00 2001 From: Dustin Savery Date: Fri, 11 Jun 2021 13:02:13 -0700 Subject: [PATCH 2/6] updating snapshots --- .../__snapshots__/Pagination.tsx.snap | 2 +- .../__snapshots__/ActionMenu.tsx.snap | 2 +- .../__snapshots__/AnchoredOverlay.tsx.snap | 2 +- .../__snapshots__/BranchName.tsx.snap | 2 +- src/__tests__/__snapshots__/Button.tsx.snap | 18 +++++++++--------- src/__tests__/__snapshots__/Dropdown.tsx.snap | 2 +- .../__snapshots__/DropdownMenu.tsx.snap | 2 +- .../__snapshots__/SelectMenu.tsx.snap | 8 ++++---- .../__snapshots__/SelectPanel.tsx.snap | 2 +- src/__tests__/__snapshots__/SideNav.tsx.snap | 2 +- .../__snapshots__/StateLabel.tsx.snap | 14 +++++++------- src/__tests__/__snapshots__/Timeline.tsx.snap | 4 ++-- .../__snapshots__/UnderlineNav.tsx.snap | 2 +- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/__tests__/Pagination/__snapshots__/Pagination.tsx.snap b/src/__tests__/Pagination/__snapshots__/Pagination.tsx.snap index 0a4471e5100..a8933148916 100644 --- a/src/__tests__/Pagination/__snapshots__/Pagination.tsx.snap +++ b/src/__tests__/Pagination/__snapshots__/Pagination.tsx.snap @@ -45,7 +45,7 @@ exports[`Pagination renders consistently 1`] = ` } .c2:active { - border-color: #eaecef; + border-color: hsla(214,13%,93%,1); } .c2[rel='prev'], diff --git a/src/__tests__/__snapshots__/ActionMenu.tsx.snap b/src/__tests__/__snapshots__/ActionMenu.tsx.snap index a773b4a4bea..7db066bfa39 100644 --- a/src/__tests__/__snapshots__/ActionMenu.tsx.snap +++ b/src/__tests__/__snapshots__/ActionMenu.tsx.snap @@ -57,7 +57,7 @@ exports[`ActionMenu renders consistently 1`] = ` } .c0:active { - background-color: #edeff2; + background-color: hsla(220,14%,94%,1); box-shadow: inset 0 0.15em 0.3em rgba(27,31,35,0.15); } diff --git a/src/__tests__/__snapshots__/AnchoredOverlay.tsx.snap b/src/__tests__/__snapshots__/AnchoredOverlay.tsx.snap index 82fcedaf414..037610aad09 100644 --- a/src/__tests__/__snapshots__/AnchoredOverlay.tsx.snap +++ b/src/__tests__/__snapshots__/AnchoredOverlay.tsx.snap @@ -57,7 +57,7 @@ exports[`AnchoredOverlay renders consistently 1`] = ` } .c0:active { - background-color: #edeff2; + background-color: hsla(220,14%,94%,1); box-shadow: inset 0 0.15em 0.3em rgba(27,31,35,0.15); } diff --git a/src/__tests__/__snapshots__/BranchName.tsx.snap b/src/__tests__/__snapshots__/BranchName.tsx.snap index 08c964defa1..9bfc2270966 100644 --- a/src/__tests__/__snapshots__/BranchName.tsx.snap +++ b/src/__tests__/__snapshots__/BranchName.tsx.snap @@ -7,7 +7,7 @@ exports[`BranchName renders consistently 1`] = ` font-size: 12px; font-family: SFMono-Regular,Consolas,"Liberation Mono",Menlo,Courier,monospace; color: #586069; - background-color: #eaf5ff; + background-color: hsla(210,100%,96%,1); border-radius: 6px; } diff --git a/src/__tests__/__snapshots__/Button.tsx.snap b/src/__tests__/__snapshots__/Button.tsx.snap index 5b3b4846e6f..91103dac140 100644 --- a/src/__tests__/__snapshots__/Button.tsx.snap +++ b/src/__tests__/__snapshots__/Button.tsx.snap @@ -57,7 +57,7 @@ exports[`Button renders consistently 1`] = ` } .c0:active { - background-color: #edeff2; + background-color: hsla(220,14%,94%,1); box-shadow: inset 0 0.15em 0.3em rgba(27,31,35,0.15); } @@ -129,7 +129,7 @@ exports[`Button respects the "disabled" prop 1`] = ` } .c0:active { - background-color: #edeff2; + background-color: hsla(220,14%,94%,1); box-shadow: inset 0 0.15em 0.3em rgba(27,31,35,0.15); } @@ -205,7 +205,7 @@ exports[`ButtonDanger renders consistently 1`] = ` .c0:active { color: #ffffff; - background-color: #d42d3d; + background-color: hsla(354,66%,51%,1); box-shadow: inset 0 1px 0 rgba(134,24,29,0.2); border-color: rgba(27,31,35,0.15); } @@ -280,7 +280,7 @@ exports[`ButtonDanger renders correct disabled styles 1`] = ` .c0:active { color: #ffffff; - background-color: #d42d3d; + background-color: hsla(354,66%,51%,1); box-shadow: inset 0 1px 0 rgba(134,24,29,0.2); border-color: rgba(27,31,35,0.15); } @@ -409,7 +409,7 @@ exports[`ButtonInvisible renders consistently 1`] = ` .c0:active { color: #ffffff; - background-color: #035fc7; + background-color: hsla(212,97%,40%,1); box-shadow: inset 0 1px 0 rgba(5,38,76,0.2); border-color: rgba(27,31,35,0.15); } @@ -546,7 +546,7 @@ exports[`ButtonOutline renders consistently 1`] = ` .c0:active { color: #ffffff; - background-color: #035fc7; + background-color: hsla(212,97%,40%,1); box-shadow: inset 0 1px 0 rgba(5,38,76,0.2); border-color: rgba(27,31,35,0.15); } @@ -622,7 +622,7 @@ exports[`ButtonOutline renders correct disabled styles 1`] = ` .c0:active { color: #ffffff; - background-color: #035fc7; + background-color: hsla(212,97%,40%,1); box-shadow: inset 0 1px 0 rgba(5,38,76,0.2); border-color: rgba(27,31,35,0.15); } @@ -696,7 +696,7 @@ exports[`ButtonPrimary renders consistently 1`] = ` } .c0:active { - background-color: #2a8f47; + background-color: hsla(137,55%,36%,1); box-shadow: inset 0 1px 0 rgba(20,70,32,0.2); } @@ -768,7 +768,7 @@ exports[`ButtonPrimary renders correct disabled styles 1`] = ` } .c0:active { - background-color: #2a8f47; + background-color: hsla(137,55%,36%,1); box-shadow: inset 0 1px 0 rgba(20,70,32,0.2); } diff --git a/src/__tests__/__snapshots__/Dropdown.tsx.snap b/src/__tests__/__snapshots__/Dropdown.tsx.snap index eda2535a8c4..d19df904e8d 100644 --- a/src/__tests__/__snapshots__/Dropdown.tsx.snap +++ b/src/__tests__/__snapshots__/Dropdown.tsx.snap @@ -79,7 +79,7 @@ exports[`Dropdown.Button renders consistently 1`] = ` } .c0:active { - background-color: #edeff2; + background-color: hsla(220,14%,94%,1); box-shadow: inset 0 0.15em 0.3em rgba(27,31,35,0.15); } diff --git a/src/__tests__/__snapshots__/DropdownMenu.tsx.snap b/src/__tests__/__snapshots__/DropdownMenu.tsx.snap index 0be984dfc86..0e1fd83dd83 100644 --- a/src/__tests__/__snapshots__/DropdownMenu.tsx.snap +++ b/src/__tests__/__snapshots__/DropdownMenu.tsx.snap @@ -57,7 +57,7 @@ exports[`DropdownMenu renders consistently 1`] = ` } .c0:active { - background-color: #edeff2; + background-color: hsla(220,14%,94%,1); box-shadow: inset 0 0.15em 0.3em rgba(27,31,35,0.15); } diff --git a/src/__tests__/__snapshots__/SelectMenu.tsx.snap b/src/__tests__/__snapshots__/SelectMenu.tsx.snap index 5984466a807..0fa494a034f 100644 --- a/src/__tests__/__snapshots__/SelectMenu.tsx.snap +++ b/src/__tests__/__snapshots__/SelectMenu.tsx.snap @@ -57,7 +57,7 @@ exports[`SelectMenu right-aligned modal has right: 0px 1`] = ` } .c1:active { - background-color: #edeff2; + background-color: hsla(220,14%,94%,1); box-shadow: inset 0 0.15em 0.3em rgba(27,31,35,0.15); } @@ -74,7 +74,7 @@ exports[`SelectMenu right-aligned modal has right: 0px 1`] = ` font-weight: 600; color: #6a737d; background-color: #f6f8fa; - border-bottom: 1px solid #eaecef; + border-bottom: 1px solid hsla(214,13%,93%,1); } .c7 { @@ -83,7 +83,7 @@ exports[`SelectMenu right-aligned modal has right: 0px 1`] = ` font-size: 12px; color: #6a737d; text-align: center; - border-top: 1px solid #eaecef; + border-top: 1px solid hsla(214,13%,93%,1); } .c5 { @@ -101,7 +101,7 @@ exports[`SelectMenu right-aligned modal has right: 0px 1`] = ` cursor: pointer; background-color: #ffffff; border: 0; - border-bottom: 1px solid #eaecef; + border-bottom: 1px solid hsla(214,13%,93%,1); color: #586069; -webkit-text-decoration: none; text-decoration: none; diff --git a/src/__tests__/__snapshots__/SelectPanel.tsx.snap b/src/__tests__/__snapshots__/SelectPanel.tsx.snap index b84999af80f..ca231625b02 100644 --- a/src/__tests__/__snapshots__/SelectPanel.tsx.snap +++ b/src/__tests__/__snapshots__/SelectPanel.tsx.snap @@ -63,7 +63,7 @@ exports[`SelectPanel renders consistently 1`] = ` } .c1:active { - background-color: #edeff2; + background-color: hsla(220,14%,94%,1); box-shadow: inset 0 0.15em 0.3em rgba(27,31,35,0.15); } diff --git a/src/__tests__/__snapshots__/SideNav.tsx.snap b/src/__tests__/__snapshots__/SideNav.tsx.snap index cb0cf5fe090..820f454a192 100644 --- a/src/__tests__/__snapshots__/SideNav.tsx.snap +++ b/src/__tests__/__snapshots__/SideNav.tsx.snap @@ -42,7 +42,7 @@ exports[`SideNav SideNav.Link renders consistently 1`] = ` color: #24292e; padding: 16px; border: 0; - border-top: 1px solid #eaecef; + border-top: 1px solid hsla(214,13%,93%,1); } .c1.variant-normal > .c0:first-child { diff --git a/src/__tests__/__snapshots__/StateLabel.tsx.snap b/src/__tests__/__snapshots__/StateLabel.tsx.snap index dc8ca55c957..38af876205b 100644 --- a/src/__tests__/__snapshots__/StateLabel.tsx.snap +++ b/src/__tests__/__snapshots__/StateLabel.tsx.snap @@ -23,7 +23,7 @@ exports[`StateLabel renders children 1`] = ` border-style: solid; background-color: #28a745; color: #ffffff; - border-color: rgba(0,0,0,0); + border-color: prState.open.border; padding-left: 12px; padding-right: 12px; padding-top: 8px; @@ -82,7 +82,7 @@ exports[`StateLabel renders consistently 1`] = ` border-style: solid; background-color: #28a745; color: #ffffff; - border-color: rgba(0,0,0,0); + border-color: prState.open.border; padding-left: 12px; padding-right: 12px; padding-top: 8px; @@ -141,7 +141,7 @@ exports[`StateLabel respects the status prop 1`] = ` border-style: solid; background-color: #28a745; color: #ffffff; - border-color: rgba(0,0,0,0); + border-color: prState.open.border; padding-left: 12px; padding-right: 12px; padding-top: 8px; @@ -199,7 +199,7 @@ exports[`StateLabel respects the status prop 2`] = ` border-style: solid; background-color: #d73a49; color: #ffffff; - border-color: rgba(0,0,0,0); + border-color: prState.closed.border; padding-left: 12px; padding-right: 12px; padding-top: 8px; @@ -257,7 +257,7 @@ exports[`StateLabel respects the status prop 3`] = ` border-style: solid; background-color: #6f42c1; color: #ffffff; - border-color: rgba(0,0,0,0); + border-color: prState.merged.border; padding-left: 12px; padding-right: 12px; padding-top: 8px; @@ -315,7 +315,7 @@ exports[`StateLabel respects the variant prop 1`] = ` border-style: solid; background-color: #28a745; color: #ffffff; - border-color: rgba(0,0,0,0); + border-color: prState.open.border; padding-left: 8px; padding-right: 8px; padding-top: 4px; @@ -373,7 +373,7 @@ exports[`StateLabel respects the variant prop 2`] = ` border-style: solid; background-color: #28a745; color: #ffffff; - border-color: rgba(0,0,0,0); + border-color: prState.open.border; padding-left: 12px; padding-right: 12px; padding-top: 8px; diff --git a/src/__tests__/__snapshots__/Timeline.tsx.snap b/src/__tests__/__snapshots__/Timeline.tsx.snap index 0913296c65a..528e91a3765 100644 --- a/src/__tests__/__snapshots__/Timeline.tsx.snap +++ b/src/__tests__/__snapshots__/Timeline.tsx.snap @@ -128,7 +128,7 @@ exports[`Timeline.Item renders consistently 1`] = ` display: block; width: 2px; content: ''; - background-color: #eaecef; + background-color: hsla(214,13%,93%,1); }
Date: Mon, 14 Jun 2021 10:35:32 -0700 Subject: [PATCH 3/6] Bump primitives --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 225127da57c..77bece13405 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2916,9 +2916,9 @@ "integrity": "sha512-j5XppNRCvgaMZLPsVvvmp6GSh7P5pq6PUbsfLNBWi2Kz3KYDeoGDWbPr5MjoxFOGUn6Hjnt6qjHPRxahd11vLQ==" }, "@primer/primitives": { - "version": "4.3.11", - "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-4.3.11.tgz", - "integrity": "sha512-3HSRYt5bkhSl/kv0JB3SYVpQSGiAN/7dPc/dMna4GD7tplvugVsFHlI3zdzmWBx/TQl64FsUNJ1TtSWN67GV4A==" + "version": "0.0.0-2021514171229", + "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-0.0.0-2021514171229.tgz", + "integrity": "sha512-puz1EuQ1Sl9it4ajMf5ixv8JJpWFJkML4aWXSQ6NGrmtO6J7HsL5nwKI2Extx+KWQ4PA3arUj75q2XGajDhIkw==" }, "@reach/router": { "version": "1.3.4", diff --git a/package.json b/package.json index a0bdcc7883a..ad01e671842 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "license": "MIT", "dependencies": { "@primer/octicons-react": "^13.0.0", - "@primer/primitives": "4.3.11", + "@primer/primitives": "0.0.0-2021514171229", "@styled-system/css": "5.1.5", "@styled-system/props": "5.1.4", "@styled-system/theme-get": "5.1.2", From 5556a968cd372b815a5638f0a69680474265803d Mon Sep 17 00:00:00 2001 From: Cole Bemis Date: Mon, 14 Jun 2021 11:13:11 -0700 Subject: [PATCH 4/6] Update snapshots --- src/__tests__/__snapshots__/StateLabel.tsx.snap | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/__tests__/__snapshots__/StateLabel.tsx.snap b/src/__tests__/__snapshots__/StateLabel.tsx.snap index 38af876205b..dc8ca55c957 100644 --- a/src/__tests__/__snapshots__/StateLabel.tsx.snap +++ b/src/__tests__/__snapshots__/StateLabel.tsx.snap @@ -23,7 +23,7 @@ exports[`StateLabel renders children 1`] = ` border-style: solid; background-color: #28a745; color: #ffffff; - border-color: prState.open.border; + border-color: rgba(0,0,0,0); padding-left: 12px; padding-right: 12px; padding-top: 8px; @@ -82,7 +82,7 @@ exports[`StateLabel renders consistently 1`] = ` border-style: solid; background-color: #28a745; color: #ffffff; - border-color: prState.open.border; + border-color: rgba(0,0,0,0); padding-left: 12px; padding-right: 12px; padding-top: 8px; @@ -141,7 +141,7 @@ exports[`StateLabel respects the status prop 1`] = ` border-style: solid; background-color: #28a745; color: #ffffff; - border-color: prState.open.border; + border-color: rgba(0,0,0,0); padding-left: 12px; padding-right: 12px; padding-top: 8px; @@ -199,7 +199,7 @@ exports[`StateLabel respects the status prop 2`] = ` border-style: solid; background-color: #d73a49; color: #ffffff; - border-color: prState.closed.border; + border-color: rgba(0,0,0,0); padding-left: 12px; padding-right: 12px; padding-top: 8px; @@ -257,7 +257,7 @@ exports[`StateLabel respects the status prop 3`] = ` border-style: solid; background-color: #6f42c1; color: #ffffff; - border-color: prState.merged.border; + border-color: rgba(0,0,0,0); padding-left: 12px; padding-right: 12px; padding-top: 8px; @@ -315,7 +315,7 @@ exports[`StateLabel respects the variant prop 1`] = ` border-style: solid; background-color: #28a745; color: #ffffff; - border-color: prState.open.border; + border-color: rgba(0,0,0,0); padding-left: 8px; padding-right: 8px; padding-top: 4px; @@ -373,7 +373,7 @@ exports[`StateLabel respects the variant prop 2`] = ` border-style: solid; background-color: #28a745; color: #ffffff; - border-color: prState.open.border; + border-color: rgba(0,0,0,0); padding-left: 12px; padding-right: 12px; padding-top: 8px; From 1a378ab96833f2b9dcb442ed50322780fcd2d6f2 Mon Sep 17 00:00:00 2001 From: Cole Bemis Date: Mon, 14 Jun 2021 11:21:39 -0700 Subject: [PATCH 5/6] Bump primitives --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad01e671842..3937a8c7419 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "license": "MIT", "dependencies": { "@primer/octicons-react": "^13.0.0", - "@primer/primitives": "0.0.0-2021514171229", + "@primer/primitives": "4.4.0", "@styled-system/css": "5.1.5", "@styled-system/props": "5.1.4", "@styled-system/theme-get": "5.1.2", From b451448d9e73d035d2c3ae4f1b30af1574427764 Mon Sep 17 00:00:00 2001 From: Cole Bemis Date: Mon, 14 Jun 2021 11:29:16 -0700 Subject: [PATCH 6/6] Create short-panthers-fail.md --- .changeset/short-panthers-fail.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/short-panthers-fail.md diff --git a/.changeset/short-panthers-fail.md b/.changeset/short-panthers-fail.md new file mode 100644 index 00000000000..bb76bcd35c0 --- /dev/null +++ b/.changeset/short-panthers-fail.md @@ -0,0 +1,5 @@ +--- +"@primer/components": patch +--- + +Bump @primer/primitives to 4.4.0