Skip to content

Commit a03827b

Browse files
langermanklangermank
authored
Cleanup old Primitive imports (#2606)
* cleanup * Create three-apples-beg.md * add color imports to sb * sb upgrades
1 parent a723b65 commit a03827b

File tree

8 files changed

+74
-145
lines changed

8 files changed

+74
-145
lines changed

‎.changeset/three-apples-beg.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/css": patch
3+
---
4+
5+
Cleanup old Primitive imports

‎docs/.storybook/preview.css

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
1-
@import '@primer/primitives/tokens-next-private/css/base/size/size.css';
2-
@import '@primer/primitives/tokens-next-private/css/base/typography/typography.css';
3-
@import '@primer/primitives/tokens-next-private/css/functional/size/border.css';
4-
@import '@primer/primitives/tokens-next-private/css/functional/size/breakpoints.css';
5-
@import '@primer/primitives/tokens-next-private/css/functional/size/size-coarse.css';
6-
@import '@primer/primitives/tokens-next-private/css/functional/size/size-fine.css';
7-
@import '@primer/primitives/tokens-next-private/css/functional/size/size.css';
8-
@import '@primer/primitives/tokens-next-private/css/functional/size/viewport.css';
9-
@import '@primer/primitives/tokens-next-private/css/functional/typography/typography.css';
1+
@import '@primer/primitives/dist/css/base/size/size.css';
2+
@import '@primer/primitives/dist/css/base/typography/typography.css';
3+
@import '@primer/primitives/dist/css/functional/size/border.css';
4+
@import '@primer/primitives/dist/css/functional/size/breakpoints.css';
5+
@import '@primer/primitives/dist/css/functional/size/size-coarse.css';
6+
@import '@primer/primitives/dist/css/functional/size/size-fine.css';
7+
@import '@primer/primitives/dist/css/functional/size/size.css';
8+
@import '@primer/primitives/dist/css/functional/size/viewport.css';
9+
@import '@primer/primitives/dist/css/functional/typography/typography.css';
10+
11+
/* color */
12+
@import '@primer/primitives/dist/css/functional/themes/light.css';
13+
@import '@primer/primitives/dist/css/functional/themes/light-tritanopia.css';
14+
@import '@primer/primitives/dist/css/functional/themes/light-high-contrast.css';
15+
@import '@primer/primitives/dist/css/functional/themes/light-colorblind.css';
16+
@import '@primer/primitives/dist/css/functional/themes/dark.css';
17+
@import '@primer/primitives/dist/css/functional/themes/dark-colorblind.css';
18+
@import '@primer/primitives/dist/css/functional/themes/dark-dimmed.css';
19+
@import '@primer/primitives/dist/css/functional/themes/dark-high-contrast.css';
20+
@import '@primer/primitives/dist/css/functional/themes/dark-tritanopia.css';

‎docs/package-lock.json

Lines changed: 37 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
"babel-loader": "^8.2.5",
2525
"clsx": "^1.2.1",
2626
"eslint-plugin-storybook": "^0.6.12",
27+
"react": "^18.2.0",
28+
"react-dom": "^18.2.0",
2729
"storybook": "^7.0.26",
2830
"storybook-addon-pseudo-states": "^2.1.0"
2931
}

‎package-lock.json

Lines changed: 0 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"js-yaml": "^4.1.0",
6666
"postcss": "^8.4.35",
6767
"postcss-calc": "^9.0.1",
68-
"postcss-custom-properties-fallback": "^1.0.2",
6968
"postcss-import": "^16.0.1",
7069
"postcss-load-config": "^5.0.3",
7170
"postcss-scss": "^4.0.5",

‎postcss.config.cjs

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ const sass = require('@csstools/postcss-sass')
33
const scss = require('postcss-scss')
44
const scssImport = require('postcss-import')
55
const { join } = require('path')
6-
const path = require('path')
7-
const fs = require('fs')
86

97
module.exports = {
108
map: {
@@ -19,31 +17,6 @@ module.exports = {
1917
includePaths: [join(__dirname, 'node_modules')],
2018
outputStyle: process.env.CSS_MINIFY === '0' ? 'expanded' : 'compressed'
2119
}),
22-
autoprefixer,
23-
require('postcss-custom-properties-fallback')({
24-
importFrom: [
25-
() => {
26-
const primitiveFallbacks = [
27-
'color-fallbacks.json',
28-
'base/size/size.json',
29-
'base/typography/typography.json',
30-
'functional/size/border.json',
31-
'functional/size/breakpoints.json',
32-
'functional/size/size-coarse.json',
33-
'functional/size/size-fine.json',
34-
'functional/size/size.json',
35-
'functional/size/viewport.json',
36-
'functional/typography/typography.json',
37-
]
38-
let customProperties = {}
39-
for (const filePath of primitiveFallbacks) {
40-
const fileData = fs.readFileSync(path.join(__dirname, './node_modules/@primer/primitives/tokens-next-private/fallbacks/', filePath), 'utf8')
41-
customProperties = {...customProperties, ...JSON.parse(fileData)}
42-
}
43-
44-
return { customProperties: customProperties };
45-
}
46-
]
47-
}),
20+
autoprefixer
4821
]
4922
}

‎src/primitives/index.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
@import '@primer/primitives/tokens-next-private/css/base/size/size';
2-
@import '@primer/primitives/tokens-next-private/css/base/typography/typography';
3-
@import '@primer/primitives/tokens-next-private/css/functional/size/border';
4-
@import '@primer/primitives/tokens-next-private/css/functional/size/breakpoints';
5-
@import '@primer/primitives/tokens-next-private/css/functional/size/size-coarse';
6-
@import '@primer/primitives/tokens-next-private/css/functional/size/size-fine';
7-
@import '@primer/primitives/tokens-next-private/css/functional/size/size';
8-
@import '@primer/primitives/tokens-next-private/css/functional/size/viewport';
9-
@import '@primer/primitives/tokens-next-private/css/functional/typography/typography';
1+
@import '@primer/primitives/dist/css/base/size/size';
2+
@import '@primer/primitives/dist/css/base/typography/typography';
3+
@import '@primer/primitives/dist/css/functional/size/border';
4+
@import '@primer/primitives/dist/css/functional/size/breakpoints';
5+
@import '@primer/primitives/dist/css/functional/size/size-coarse';
6+
@import '@primer/primitives/dist/css/functional/size/size-fine';
7+
@import '@primer/primitives/dist/css/functional/size/size';
8+
@import '@primer/primitives/dist/css/functional/size/viewport';
9+
@import '@primer/primitives/dist/css/functional/typography/typography';
1010
@import './temp-typography-tokens.scss';

0 commit comments

Comments
 (0)