Skip to content
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.

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

feat(blueprint): Added blueprint #3585

Merged
merged 2 commits into from
Jul 30, 2024
Merged

Conversation

greg-in-a-box
Copy link
Contributor

@greg-in-a-box greg-in-a-box commented Jul 17, 2024

Added Blueprint

@greg-in-a-box greg-in-a-box force-pushed the blueprint-web branch 3 times, most recently from 4465671 to e08963f Compare July 19, 2024 19:14
@greg-in-a-box greg-in-a-box marked this pull request as ready for review July 19, 2024 19:31
@greg-in-a-box greg-in-a-box requested review from a team as code owners July 19, 2024 19:31
@@ -73,6 +73,7 @@ function getConfig(isReactExternalized) {
examples: path.join(__dirname, '../examples/src'), // for examples only
'box-ui-elements-locale-data': path.resolve(`i18n/${language}`),
'box-locale-data': path.resolve(`node_modules/@box/cldr-data/locale-data/${language}`),
lodash : path.resolve('node_modules/lodash'),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

had to put this in because it was looking for lodash/merge within blueprint when it wasnt there

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not clear on why this is needed since lodash is already present in package.json. Do we have a type mismatch? Or a misconfigured dependency in Blueprint?

.bcu-footer-message {
padding: 0 10px;
text-align: center;
}

.bcu-footer-right .btn {
margin-left: 8px;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

doesnt look good if i left this in with the new buttons

jpan-box
jpan-box previously approved these changes Jul 22, 2024
tjiang-box
tjiang-box previously approved these changes Jul 22, 2024
package.json Outdated
@@ -316,6 +318,8 @@
"yargs": "^15.1.0"
},
"peerDependencies": {
"@box/blueprint-web": "^7.2.4",
Copy link
Contributor

Choose a reason for hiding this comment

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

is there any reason why we have different version in peerDependecies?

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

src/elements/common/messages.ts Outdated Show resolved Hide resolved
jpan-box
jpan-box previously approved these changes Jul 22, 2024
tjiang-box
tjiang-box previously approved these changes Jul 22, 2024
@@ -73,6 +73,7 @@ function getConfig(isReactExternalized) {
examples: path.join(__dirname, '../examples/src'), // for examples only
'box-ui-elements-locale-data': path.resolve(`i18n/${language}`),
'box-locale-data': path.resolve(`node_modules/@box/cldr-data/locale-data/${language}`),
lodash : path.resolve('node_modules/lodash'),
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not clear on why this is needed since lodash is already present in package.json. Do we have a type mismatch? Or a misconfigured dependency in Blueprint?

@@ -3021,6 +3291,22 @@
"@radix-ui/react-use-size" "1.0.1"
"@radix-ui/rect" "1.0.1"

"@radix-ui/react-popper@1.2.0":
Copy link
Contributor

Choose a reason for hiding this comment

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

It's not ideal to have two versions of the same library. It looks like we're already importing several @radix-ui libraries via Storybook. Should we look at upgrading to get the versions in sync?

@mergify mergify bot merged commit 0f2d876 into box:master Jul 30, 2024
6 checks passed
kajarosz pushed a commit to kajarosz/box-ui-elements that referenced this pull request Aug 21, 2024
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants