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

Clean up #283

Merged
merged 4 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Note: for [Spectrum 2](https://s2.spectrum.adobe.com/) tokens, look at the [`beta` branch](https://github.com/adobe/spectrum-tokens/tree/beta) and `beta` tagged packages on [NPM](https://www.npmjs.com/package/@adobe/spectrum-tokens?activeTab=versions).

# Spectrum Tokens Monorepo

This repo uses:
Expand Down
5 changes: 2 additions & 3 deletions docs/site/moon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ tasks:
platform: node
deps:
- ~:copySchema
outputs:
- "/site/"
clean:
command:
- rimraf
Expand All @@ -49,9 +51,6 @@ tasks:
deps:
- ~:build
export:
command:
- next
- build
platform: node
deps:
- ~:clean
Expand Down
14 changes: 7 additions & 7 deletions docs/site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
"url": "git+https://github.com/adobe/spectrum-tokens.git"
},
"dependencies": {
"@spectrum-css/link": "^4.0.74",
"@spectrum-css/page": "^6.0.9",
"@spectrum-css/sidenav": "^4.0.18",
"@spectrum-css/table": "^5.0.10",
"@spectrum-css/tokens": "^13.0.5",
"@spectrum-css/typography": "^5.0.49",
"@spectrum-css/link": "^4.2.5",
"@spectrum-css/page": "^7.1.4",
"@spectrum-css/sidenav": "^4.2.4",
"@spectrum-css/table": "^5.2.5",
"@spectrum-css/tokens": "^13.2.0",
"@spectrum-css/typography": "^5.1.5",
"ajv": "^8.12.0",
"ajv-formats": "^2.1.1",
"next": "^14.0.3",
"next": "^14.1.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rimraf": "^5.0.5"
Expand Down
3 changes: 2 additions & 1 deletion docs/site/pages/tokens/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ function TokenValue({ token }) {
case "font-family":
case "font-weight":
case "font-style":
case "font-size":
case "text-transform":
case "opacity":
return <>{token.value}</>;
Expand Down Expand Up @@ -140,7 +141,7 @@ function TokenValue({ token }) {
case "color":
return <code>{RGBAToHexA(token.value)}</code>;
default:
return <pre>JSON.stringify(token)</pre>;
return <code>{JSON.stringify(token)}</code>;
}
}

Expand Down
25 changes: 25 additions & 0 deletions docs/site/public/schemas/token-types/font-size.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/font-size.json",
"title": "Dimension",
"description": "Pixel, rem, and em font sizes dimension.",
"type": "object",
"allOf": [
{
"$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/token.json"
}
],
"properties": {
"$schema": {
"const": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/font-size.json"
},
"value": {
"type": "string",
"pattern": "^(?:-?((?:\\d+\\.?\\d*)|(?:\\.?\\d+))(px|rem|em))$"
},
"component": {},
"deprecated": {},
"deprecated_comment": {},
"uuid": {}
}
}
6 changes: 6 additions & 0 deletions docs/site/public/schemas/token-types/scale-set.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
{
"$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json"
},
{
"$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/font-size.json"
},
{
"$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/alias.json"
}
Expand All @@ -31,6 +34,9 @@
{
"$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json"
},
{
"$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/font-size.json"
},
{
"$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/alias.json"
}
Expand Down
11 changes: 11 additions & 0 deletions docs/site/public/schemas/token-types/system-set.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,17 @@
}
},
"required": ["spectrum", "express"]
},
{
"properties": {
"spectrum": {
"$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/dimension.json"
},
"express": {
"$ref": "https://opensource.adobe.com/spectrum-tokens/schemas/token-types/scale-set.json"
}
},
"required": ["spectrum", "express"]
}
]
},
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"homepage": "https://github.com/adobe/spectrum-tokens#readme",
"devDependencies": {
"@changesets/cli": "^2.27.1",
"@commitlint/cli": "^18.6.0",
"@commitlint/config-conventional": "^18.6.0",
"@moonrepo/cli": "^1.20.1",
"ava": "^6.1.1",
"husky": "^9.0.10",
"lint-staged": "^15.2.1",
"prettier": "^3.2.4"
"@commitlint/cli": "^19.0.3",
"@commitlint/config-conventional": "^19.0.3",
"@moonrepo/cli": "^1.22.5",
"ava": "^6.1.2",
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5"
},
"engines": {
"node": "~20.11"
Expand Down
Loading
Loading