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.

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

Jump to bottom

Setup new primer-primitive bundle #2078

Merged
merged 5 commits into from
May 19, 2022
Merged

Setup new primer-primitive bundle #2078

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
9e318b7
bump
langermank May 18, 2022
9ced2c0
add index
langermank May 18, 2022
fe4e6b5
add storybook support
langermank May 18, 2022
32468bc
gatsby import
langermank May 18, 2022
a31aa92
Create itchy-wasps-refuse.md
langermank May 18, 2022
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
5 changes: 5 additions & 0 deletions .changeset/itchy-wasps-refuse.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/css": patch
---

Setup new `primer-primitive` bundle
6 changes: 5 additions & 1 deletion docs/.storybook/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,9 @@ module.exports = {
'@whitespace/storybook-addon-html',
'storybook-addon-designs',
'storybook-color-picker'
]
],
framework: '@storybook/react',
core: {
builder: 'webpack5'
}
}
11 changes: 11 additions & 0 deletions docs/.storybook/preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@ import '../../src/docs.scss'
import '../../src/index.scss'
import '../../src/base/index.scss'
import '../src/stories/helpers/storybook-styles.scss'
// temporary import until primitives moves to core bundle
// importing the index from /css didn't play nice with Storybook
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/base/size/size.css'
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/base/typography/typography.css'
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/border.css'
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/breakpoints.css'
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/size-coarse.css'
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/size-fine.css'
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/size.css'
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/viewport.css'
import '../../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/typography/typography.css'
Comment on lines +5 to +15
Copy link
Contributor

Choose a reason for hiding this comment

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

At some point might nice to offer an .../tokens-v2-private/css/tokens/index.css to not have to update each file individually.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

100% agree 😂 I certainly will add that!

import renderToHTML from '../src/stories/helpers/code-snippet-html-helper'

const customViewports = {
Expand Down
11 changes: 11 additions & 0 deletions docs/gatsby-browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// temporary import until primitives moves to core bundle
// importing the index from /css didn't play nice with Gatsby
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/base/size/size.css'
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/base/typography/typography.css'
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/border.css'
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/breakpoints.css'
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/size-coarse.css'
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/size-fine.css'
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/size.css'
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/size/viewport.css'
import '../node_modules/@primer/primitives/tokens-v2-private/css/tokens/functional/typography/typography.css'
16 changes: 9 additions & 7 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@primer/gatsby-theme-doctocat": "3.1.1",
"@primer/octicons": "17.0.0",
"@primer/octicons-react": "17.0.0",
"@primer/primitives": "7.3.0",
"@primer/primitives": "7.8.3",
"@svgr/webpack": "5.5.0",
"autoprefixer": "10.4.2",
"babel-preset-gatsby": "^2.11.1",
Expand Down Expand Up @@ -47,16 +47,18 @@
},
"devDependencies": {
"@babel/core": "^7.16.7",
"@storybook/addon-a11y": "6.4.19",
"@storybook/addon-actions": "^6.4.12",
"@storybook/addon-essentials": "^6.4.12",
"@storybook/addon-links": "^6.4.12",
"@storybook/addon-a11y": "6.5.0",
"@storybook/addon-actions": "^6.5.0",
"@storybook/addon-essentials": "^6.5.0",
"@storybook/addon-links": "^6.5.0",
"@storybook/addon-postcss": "2.0.0",
"@storybook/builder-webpack5": "^6.5.0",
"@storybook/manager-webpack5": "^6.5.0",
"@storybook/preset-scss": "^1.0.3",
"@storybook/react": "6.4.19",
"@storybook/react": "6.5.0",
"@whitespace/storybook-addon-html": "^5.0.0",
"babel-loader": "^8.2.3",
"storybook-addon-designs": "6.2.1",
"storybook-color-picker": "2.3.0"
"storybook-color-picker": "2.3.1"
}
}
2,700 changes: 1,536 additions & 1,164 deletions docs/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"storybook": "cd docs && yarn && yarn storybook"
},
"dependencies": {
"@primer/primitives": "^7.7.0"
"@primer/primitives": "^7.8.3"
},
"devDependencies": {
"@changesets/changelog-github": "0.4.4",
Expand Down
9 changes: 9 additions & 0 deletions src/primitives/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@import '@primer/primitives/tokens-v2-private/css/tokens/base/size/size.css';
@import '@primer/primitives/tokens-v2-private/css/tokens/base/typography/typography.css';
@import '@primer/primitives/tokens-v2-private/css/tokens/functional/size/border.css';
@import '@primer/primitives/tokens-v2-private/css/tokens/functional/size/breakpoints.css';
@import '@primer/primitives/tokens-v2-private/css/tokens/functional/size/size-coarse.css';
@import '@primer/primitives/tokens-v2-private/css/tokens/functional/size/size-fine.css';
@import '@primer/primitives/tokens-v2-private/css/tokens/functional/size/size.css';
@import '@primer/primitives/tokens-v2-private/css/tokens/functional/size/viewport.css';
@import '@primer/primitives/tokens-v2-private/css/tokens/functional/typography/typography.css';
2 changes: 1 addition & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,7 +1162,7 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"

"@primer/primitives@^7.7.0":
"@primer/primitives@^7.8.3":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@primer/primitives/-/primitives-7.8.3.tgz#de7e03492cf977e99f2417490d76421db9715e9f"
integrity sha512-04ZwfJhpZ0QFwDrJfCuLX6iOh0BflWDTvuoRA80lQH9xk0RtIg16INbruwwtnbSgnKKXXRSykRRJ5BbxnqufRA==
Expand Down