Skip to content

chore(deps): update btn deps #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 17, 2021
Merged

chore(deps): update btn deps #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0868ce9
chore(deps): update react-button deps
kendallstrautman Mar 12, 2021
b1f8ba8
patch(button): accommodates dark / light background themes
kendallstrautman Mar 12, 2021
c293d90
patch(case-study-slider): upgrades to latest button api
kendallstrautman Mar 12, 2021
ad2e893
patch(call-to-action): fix dark / light theme styles
kendallstrautman Mar 12, 2021
a3af144
chore(logo-grid): updates react-button api usage
kendallstrautman Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/button/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ function Button({
`variant-${themeObj.variant}`,
themeClass,
{ 'brand-neutral': themeObj.brand === 'neutral' },
`background-${themeObj.background}`,
Copy link
Contributor Author

@kendallstrautman kendallstrautman Mar 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Button didn't seem to actually be affected by dark or light theme values, so I added back in that classname. LMK if that's not wanted, but note that other components depend on this property.

className
)}
data-ga-button={`${ga_prefix ? ga_prefix + ' | ' : ''}${gaSlug}`}
Expand Down
2 changes: 1 addition & 1 deletion packages/call-to-action/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function CallToAction(props) {
throw new Error('<CallToAction /> `links` must have both a title and a URL')
}
return (
<div className={`g-call-to-action variant-${variant} theme-${theme}}`}>
<div className={`g-call-to-action variant-${variant} theme-${theme}`}>
Copy link
Contributor Author

@kendallstrautman kendallstrautman Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix: as the classname wasn't dark} 🤭

<div className="g-grid-container">
{heading && (
<h2 data-testid="heading" className="g-type-display-2">
Expand Down
2 changes: 1 addition & 1 deletion packages/call-to-action/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"Zach Shilton"
],
"dependencies": {
"@hashicorp/react-button": "^2.2.4"
"@hashicorp/react-button": "^4.1.0"
Copy link
Contributor Author

@kendallstrautman kendallstrautman Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we going to have to update all of these again when we release the breaking change with colors??... I felt like this was something Lerna would take care of, but I guess not?

Copy link
Contributor Author

@kendallstrautman kendallstrautman Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sort of like, should this just be a peer dep??

Copy link
Contributor

@zchsh zchsh Mar 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Lerna should take care of this - I made the mistake of manually bumping versions in recent docs-page work, but as long as there's none of that happening, and as long as the version numbers actually match (as they do in this case thanks to all the work you did 😅 ), I think lerna should do its job.

I don't have a super deep understanding of peer deps vs direct ones, but based on my understanding so far button should be a direct dependency, since we need a specific version of button code to run callouts (rather than callouts just being "compatible" or "intended for use with" a specific version of button).

},
"peerDependencies": {
"@hashicorp/nextjs-scripts": ">=16.x"
Expand Down
20 changes: 0 additions & 20 deletions packages/callouts/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/callouts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"Zach Shilton"
],
"dependencies": {
"@hashicorp/react-button": "^2.2.4",
"@hashicorp/react-button": "^4.1.0",
"@hashicorp/react-inline-svg": "^1.0.2"
},
"license": "MPL-2.0",
Expand Down
11 changes: 9 additions & 2 deletions packages/case-study-slider/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,11 @@ class CaseStudySlider extends Component {
/>
</a>
</div>
<div className="feature-content g-type-body">
<div
Copy link
Contributor Author

@kendallstrautman kendallstrautman Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dark and light theme was broken on this component.

className={`feature-content g-type-body ${
dark ? 'dark' : 'light'
}`}
>
{single && (
<div className="single-logo">
<Logo dark={dark} image={caseStudy.company} />
Expand All @@ -207,7 +211,10 @@ class CaseStudySlider extends Component {
}}
/>
<Button
theme={dark ? 'light-outline' : 'dark-outline'}
theme={{
variant: 'secondary',
background: dark ? 'dark' : 'light',
}}
title={caseStudy.buttonLabel || 'Read Case Study'}
url={caseStudyLink}
/>
Expand Down
25 changes: 0 additions & 25 deletions packages/case-study-slider/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/case-study-slider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"Mike Wickett"
],
"dependencies": {
"@hashicorp/react-button": "^2.2.4",
"@hashicorp/react-button": "^4.1.0",
"@hashicorp/react-image": "^2.0.3"
},
"peerDependencies": {
Expand Down
3 changes: 3 additions & 0 deletions packages/case-study-slider/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@

& .slider-frame {
& .case-study {
& .dark {
Copy link
Contributor Author

@kendallstrautman kendallstrautman Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Text wasn't showing on dark.

color: white;
}
& .feature-image {
margin-bottom: 2rem;

Expand Down
19 changes: 0 additions & 19 deletions packages/consent-manager/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/consent-manager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"Jeff Escalante"
],
"dependencies": {
"@hashicorp/react-button": "^2.2.6",
"@hashicorp/react-button": "^4.1.0",
"@hashicorp/react-toggle": "^2.1.0",
"@segment/in-eu": "^0.2.1",
"js-cookie": "^2.2.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/content-cta/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"Nicole Forrester"
],
"dependencies": {
"@hashicorp/react-button": "^2.2.6"
"@hashicorp/react-button": "^4.1.0"
},
"license": "MPL-2.0",
"peerDependencies": {
Expand Down
19 changes: 0 additions & 19 deletions packages/featured-slider/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/featured-slider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"access": "public"
},
"dependencies": {
"@hashicorp/react-button": "^2.2.6",
"@hashicorp/react-button": "^4.1.0",
"@hashicorp/react-image": "^2.0.3"
}
}
19 changes: 0 additions & 19 deletions packages/hero/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/hero/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@hashicorp/js-utils": "next",
"@hashicorp/localstorage-polyfill": "^1.0.14",
"@hashicorp/react-alert": "^2.0.3",
"@hashicorp/react-button": "^2.2.6",
"@hashicorp/react-button": "^4.1.0",
"@hashicorp/react-image": "^2.0.3",
"@hashicorp/react-text-input": "^3.0.1",
"classnames": "^2.2.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/logo-grid/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class LogoGrid extends Component {
<Button
title={`${c.name} Website`}
url={c.link}
theme="dark-outline"
theme={{ variant: 'secondary' }}
Copy link
Contributor Author

@kendallstrautman kendallstrautman Mar 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updates to new API

external={true}
/>
)}
Expand Down
19 changes: 0 additions & 19 deletions packages/logo-grid/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/logo-grid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"Jeff Escalante"
],
"dependencies": {
"@hashicorp/react-button": "^2.2.6",
"@hashicorp/react-button": "^4.1.0",
"@hashicorp/react-image": "^2.0.3",
"@tippy.js/react": "^2.1.2"
},
Expand Down
25 changes: 0 additions & 25 deletions packages/product-downloader/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading