Skip to content

Extended-tokens: Update to latest JSON spec and fix camel casing #34439

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
Mitch-At-Work merged 7 commits into from
May 14, 2025
Merged

Extended-tokens: Update to latest JSON spec and fix camel casing #34439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e766c97
Update token definitions
Mitch-At-Work May 12, 2025
616f797
Break tokens
Mitch-At-Work May 13, 2025
610342b
Update link
Mitch-At-Work May 13, 2025
788b36c
Update latest
Mitch-At-Work May 13, 2025
bb9676b
Lint and update order
Mitch-At-Work May 13, 2025
b1c4dd1
Update API
Mitch-At-Work May 13, 2025
e4f5c42
Add tests for fluent overrides and new camel case rules
Mitch-At-Work May 14, 2025
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
6 changes: 3 additions & 3 deletions packages/react-components/react-link/library/src/components/Link/useLinkStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ const useStyles = makeStyles({
color: semanticTokens.ctrlLinkForegroundBrandRest,
cursor: 'pointer',
display: 'inline',
fontFamily: semanticTokens.textStyleDefaultRegularFontfamily,
fontSize: semanticTokens.textGlobalBody3Fontsize,
fontFamily: semanticTokens.textStyleDefaultRegularFontFamily,
fontSize: semanticTokens.textGlobalBody3FontSize,
fontWeight: semanticTokens.textStyleDefaultRegularWeight,
margin: '0',
padding: '0',
overflow: 'inherit',
textAlign: 'left',
textDecorationLine: 'none',
textDecorationThickness: semanticTokens.strokewidthDefault,
textDecorationThickness: semanticTokens.strokeWidthDefault,
textOverflow: 'inherit',
userSelect: 'text',

Expand Down
10 changes: 9 additions & 1 deletion packages/semantic-tokens/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,13 @@
"patterns": ["react", "react-dom"]
}
]
}
},
"overrides": [
{
"files": ["./src/fluentOverrides.ts"],
"rules": {
"sort-keys": ["error"]
}
}
]
}
1,640 changes: 847 additions & 793 deletions packages/semantic-tokens/etc/semantic-tokens.api.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/semantic-tokens/scripts/legacyTokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import path from 'node:path';

// eslint-disable-next-line no-restricted-imports
import * as tokensPackage from '@fluentui/tokens';
import { fluentOverrides } from './fluentOverrides';
import { fluentOverrides } from '../src/fluentOverrides';
import { format } from 'prettier';

const generateLegacyTokens = () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/semantic-tokens/scripts/tokenGen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Takes in a Figma token export file and generates token raw strings and CSS Var files
*/
import tokensJSONRaw from './tokens.json';
import { fluentOverrides as fluentFallbacksRaw } from './fluentOverrides';
import type { FluentOverrideValue, FluentOverrides } from './fluentOverrides';
import { fluentOverrides as fluentFallbacksRaw } from '../src/fluentOverrides';
import type { FluentOverrideValue, FluentOverrides } from '../src/fluentOverrides';
import fs from 'node:fs';
import { Project } from 'ts-morph';
import { format } from 'prettier';
Expand Down
Loading