Skip to content

Commit 0e65ffb

Browse files
lukasoppermannlukasoppermann
committed
test
1 parent 161f797 commit 0e65ffb

File tree

3 files changed

+43
-42
lines changed

3 files changed

+43
-42
lines changed

‎scripts/buildTokens.ts

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ const getStyleDictionaryConfig: StyleDictionaryConfigGenerator = (
4242
Object.entries({
4343
css: css(`css/${filename}.css`, options.prefix, options.buildPath, {
4444
themed: options.themed,
45-
theme: [options.theme, getFallbackTheme(options.theme)],
45+
theme: options.theme,
4646
}),
4747
docJson: docJson(`docs/${filename}.json`, options.prefix, options.buildPath, {
48-
theme: [options.theme, getFallbackTheme(options.theme)],
48+
theme: options.theme,
4949
}),
5050
styleLint: styleLint(`styleLint/${filename}.json`, options.prefix, options.buildPath, {
5151
theme: options.theme,
@@ -60,26 +60,26 @@ export const buildDesignTokens = async (buildOptions: ConfigGeneratorOptions): P
6060
/** -----------------------------------
6161
* Internal Colors
6262
* ----------------------------------- */
63-
// try {
64-
// for (const {filename, source, include, theme} of themes) {
65-
// // build functional scales
66-
// const extendedSD = await PrimerStyleDictionary.extend({
67-
// source: [...source, ...include], // build the special formats
68-
// include,
69-
// log,
70-
// platforms: {
71-
// css: css(`internalCss/${filename}.css`, buildOptions.prefix, buildOptions.buildPath, {
72-
// themed: true,
73-
// theme: [theme, getFallbackTheme(theme)],
74-
// }),
75-
// },
76-
// })
77-
// await extendedSD.buildAllPlatforms()
78-
// }
79-
// } catch (e) {
80-
// // eslint-disable-next-line no-console
81-
// console.error('🛑 Error trying to build internal css colors for code output:', e)
82-
// }
63+
try {
64+
for (const {filename, source, include, theme} of themes) {
65+
// build functional scales
66+
const extendedSD = await PrimerStyleDictionary.extend({
67+
source: [...source, ...include], // build the special formats
68+
include,
69+
log,
70+
platforms: {
71+
css: css(`internalCss/${filename}.css`, buildOptions.prefix, buildOptions.buildPath, {
72+
themed: true,
73+
theme: [theme, getFallbackTheme(theme)],
74+
}),
75+
},
76+
})
77+
await extendedSD.buildAllPlatforms()
78+
}
79+
} catch (e) {
80+
// eslint-disable-next-line no-console
81+
console.error('🛑 Error trying to build internal css colors for code output:', e)
82+
}
8383

8484
/** -----------------------------------
8585
* Colors, shadows & borders

‎src/preprocessors/themeOverrides.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export const themeOverrides: Preprocessor = {
99
const valueProp = config.options?.themeOverrides?.valueProp || '$value'
1010
const [currentTheme, fallbackTheme] = asArray(config.options?.themeOverrides?.theme)
1111
const tokens = transformTokens(dictionary, token => {
12+
console.log('Theme', currentTheme, fallbackTheme)
1213
// return early if no theme value is set
1314
if (
1415
!currentTheme ||

‎src/tokens/functional/color/bgColor.json5

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
'org.primer.overrides': {
1616
dark: '{base.color.neutral.1}',
17-
"dark-high-contrast": "{base.color.neutral.0}",
17+
'dark-high-contrast': '{base.color.neutral.0}',
1818
},
1919
},
2020
},
@@ -32,8 +32,8 @@
3232
},
3333
'org.primer.overrides': {
3434
dark: '{base.color.neutral.2}',
35-
"light-high-contrast": "{base.color.neutral.3}",
36-
"dark-high-contrast": "{base.color.neutral.2}",
35+
'light-high-contrast': '{base.color.neutral.3}',
36+
'dark-high-contrast': '{base.color.neutral.2}',
3737
},
3838
},
3939
},
@@ -51,7 +51,7 @@
5151
},
5252
'org.primer.overrides': {
5353
dark: '{base.color.neutral.0}',
54-
"light-high-contrast": "{base.color.neutral.2}",
54+
'light-high-contrast': '{base.color.neutral.2}',
5555
},
5656
},
5757
},
@@ -125,8 +125,8 @@
125125
},
126126
'org.primer.overrides': {
127127
dark: '{base.color.neutral.3}',
128-
"light-high-contrast": "{base.color.neutral.4}",
129-
"dark-high-contrast": "{base.color.neutral.4}",
128+
'light-high-contrast': '{base.color.neutral.4}',
129+
'dark-high-contrast': '{base.color.neutral.4}',
130130
},
131131
},
132132
},
@@ -163,8 +163,8 @@
163163
$value: '{base.color.neutral.8}',
164164
alpha: 0.2,
165165
},
166-
"light-high-contrast": "{base.color.neutral.4}",
167-
"dark-high-contrast": "{base.color.neutral.3}",
166+
'light-high-contrast': '{base.color.neutral.4}',
167+
'dark-high-contrast': '{base.color.neutral.3}',
168168
},
169169
},
170170
},
@@ -179,8 +179,8 @@
179179
},
180180
'org.primer.overrides': {
181181
dark: '{base.color.neutral.8}',
182-
"light-high-contrast": "{base.color.neutral.10}",
183-
"dark-high-contrast": "{base.color.neutral.7}",
182+
'light-high-contrast': '{base.color.neutral.10}',
183+
'dark-high-contrast': '{base.color.neutral.7}',
184184
},
185185
},
186186
},
@@ -220,7 +220,7 @@
220220
},
221221
'org.primer.overrides': {
222222
dark: '{base.color.blue.5}',
223-
"dark-high-contrast": "{base.color.blue.9}",
223+
'dark-high-contrast': '{base.color.blue.9}',
224224
},
225225
},
226226
},
@@ -249,11 +249,11 @@
249249
alpha: 0.15,
250250
},
251251
'light-protanopia-deuteranopia': '{base.color.blue.0}',
252+
252253
'dark-protanopia-deuteranopia': {
253254
$value: '{base.color.blue.4}',
254255
alpha: 0.2,
255256
},
256-
257257
},
258258
},
259259
},
@@ -275,8 +275,8 @@
275275
'dark-tritanopia': '{base.color.blue.5}',
276276
'light-protanopia-deuteranopia': '{base.color.blue.5}',
277277
'dark-protanopia-deuteranopia': '{base.color.blue.5}',
278-
"light-high-contrast": "{base.color.green.5}",
279-
"dark-high-contrast": "{base.color.green.9}",
278+
'light-high-contrast': '{base.color.green.5}',
279+
'dark-high-contrast': '{base.color.green.9}',
280280
},
281281
},
282282
},
@@ -363,7 +363,7 @@
363363
},
364364
},
365365
'org.primer.overrides': {
366-
"dark-high-contrast": "{base.color.yellow.9}",
366+
'dark-high-contrast': '{base.color.yellow.9}',
367367
},
368368
},
369369
},
@@ -409,7 +409,7 @@
409409
'org.primer.overrides': {
410410
'light-tritanopia': '{base.color.red.5}',
411411
'dark-tritanopia': '{base.color.red.5}',
412-
"dark-high-contrast": "{base.color.orange.9}",
412+
'dark-high-contrast': '{base.color.orange.9}',
413413
},
414414
},
415415
},
@@ -454,8 +454,8 @@
454454
},
455455
'org.primer.overrides': {
456456
'light-protanopia-deuteranopia': '{base.color.orange.5}',
457-
"dark-protanopia-deuteranopia": "{base.color.orange.5}",
458-
"dark-high-contrast": "{base.color.red.9}",
457+
'dark-protanopia-deuteranopia': '{base.color.orange.5}',
458+
'dark-high-contrast': '{base.color.red.9}',
459459
},
460460
},
461461
},
@@ -542,7 +542,7 @@
542542
},
543543
},
544544
'org.primer.overrides': {
545-
"dark-high-contrast": "{base.color.purple.9}",
545+
'dark-high-contrast': '{base.color.purple.9}',
546546
},
547547
},
548548
},
@@ -615,7 +615,7 @@
615615
},
616616
},
617617
'org.primer.overrides': {
618-
"dark-high-contrast": "{base.color.pink.9}",
618+
'dark-high-contrast': '{base.color.pink.9}',
619619
},
620620
},
621621
},

0 commit comments

Comments
 (0)