Skip to content

Commit

Permalink
Add homepage, fix cli error (#305)
Browse files Browse the repository at this point in the history
* Add homepage, fix cli error

* Fix test

* Fix lint
  • Loading branch information
drwpow authored Sep 16, 2024
1 parent f7c6ef8 commit 9ce829c
Show file tree
Hide file tree
Showing 54 changed files with 6,459 additions and 8,291 deletions.
6 changes: 6 additions & 0 deletions .changeset/thick-lions-wash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@terrazzo/parser": patch
"@terrazzo/cli": patch
---

Don’t log AST node on error
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"[astro]": {
"editor.defaultFormatter": "biomejs.biome"
"editor.defaultFormatter": "astro-build.astro-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "biomejs.biome"
Expand Down
4 changes: 2 additions & 2 deletions biome.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"$schema": "https://biomejs.dev/schemas/1.6.4/schema.json",
"$schema": "https://biomejs.dev/schemas/1.9.1/schema.json",
"organizeImports": {
"enabled": false
},
"files": {
"ignore": ["**/dist/**", "**/package.json"]
"ignore": ["**/dist/**", "**/package.json", "*.css"]
},
"formatter": {
"indentStyle": "space",
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
"version": "pnpm run build && changeset version && pnpm i --no-frozen-lockfile"
},
"devDependencies": {
"@biomejs/biome": "^1.8.3",
"@biomejs/biome": "^1.9.1",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.7",
"@changesets/cli": "^2.27.8",
"@types/node": "^22.5.0",
"del-cli": "^5.1.0",
"execa": "^9.3.1",
"prettier": "^3.3.3",
"strip-ansi": "^7.1.0",
"stylelint": "^16.8.2",
"stylelint": "^16.9.0",
"stylelint-config-standard": "^36.0.1",
"stylelint-order": "^6.0.4",
"typescript": "^5.5.4",
"vitest": "^2.0.5"
"typescript": "^5.6.2",
"vitest": "^2.1.1"
}
}
2 changes: 1 addition & 1 deletion packages/cli/biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/1.6.4/schema.json",
"$schema": "https://biomejs.dev/schemas/1.9.1/schema.json",
"extends": ["../../biome.json"],
"files": {
"include": ["./bin/", "./src/", "./test/"],
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
"chokidar": "^3.6.0",
"dotenv": "^16.4.5",
"merge-anything": "^5.1.7",
"picocolors": "^1.0.1",
"picocolors": "^1.1.0",
"yaml-to-momoa": "^0.0.1",
"yargs-parser": "^21.1.1"
},
"devDependencies": {
"typescript": "^5.5.4"
"typescript": "^5.6.2"
}
}
10 changes: 9 additions & 1 deletion packages/icons/biome.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
{
"extends": ["../../biome.json"]
"$schema": "https://biomejs.dev/schemas/1.9.1/schema.json",
"extends": ["../../biome.json"],
"linter": {
"rules": {
"a11y": {
"noInteractiveElementToNoninteractiveRole": "off"
}
}
}
}
4 changes: 2 additions & 2 deletions packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"@rollup/plugin-typescript": "^11.1.6",
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"react": "19.0.0-rc-1eaccd82-20240816",
"react-dom": "19.0.0-rc-1eaccd82-20240816",
"react": "19.0.0-rc-206df66e-20240912",
"react-dom": "19.0.0-rc-206df66e-20240912",
"rollup": "^4.18.0",
"rollup-plugin-cleandir": "^2.0.0",
"rollup-plugin-import-css": "^3.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/parser/biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/1.6.4/schema.json",
"$schema": "https://biomejs.dev/schemas/1.9.1/schema.json",
"extends": ["../../biome.json"],
"files": {
"ignore": ["./lib/code-frame.js"],
Expand Down
7 changes: 1 addition & 6 deletions packages/parser/logger.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ export default class Logger {
return;
}
if (entry.node) {
const e = new TokensJSONError(message);
e.node = entry.node; // set node on instance, but don’t print to console in constructor
throw e;
throw new TokensJSONError(message);
} else {
throw new Error(message);
}
Expand Down Expand Up @@ -130,9 +128,6 @@ export default class Logger {
}

export class TokensJSONError extends Error {
/** Erring JSON node */
node;

constructor(message) {
super(message);
this.name = 'TokensJSONError';
Expand Down
6 changes: 3 additions & 3 deletions packages/parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@
"test:ts": "tsc --noEmit"
},
"dependencies": {
"@humanwhocodes/momoa": "^3.2.0",
"@humanwhocodes/momoa": "^3.2.1",
"@terrazzo/token-tools": "workspace:^",
"@types/babel__code-frame": "^7.0.6",
"@types/culori": "^2.1.1",
"culori": "^4.0.1",
"is-what": "^4.1.16",
"merge-anything": "^5.1.7",
"picocolors": "^1.0.1",
"picocolors": "^1.1.0",
"wildcard-match": "^5.1.3",
"yaml": "^2.5.0"
"yaml": "^2.5.1"
},
"devDependencies": {
"esbuild": "^0.23.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/parser/test/parse.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ describe('Tokens', () => {
expect(stripAnsi(err.message)).toBe(want.error);

// ensure TokenValidationError contains necessary properties
expect(err.node?.type?.length).toBeGreaterThan(0);
expect(err.node?.loc?.start?.line).toBeGreaterThanOrEqual(1);
// expect(err.node?.type?.length).toBeGreaterThan(0);
// expect(err.node?.loc?.start?.line).toBeGreaterThanOrEqual(1);
}

if (result) {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-css/biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/1.6.4/schema.json",
"$schema": "https://biomejs.dev/schemas/1.9.1/schema.json",
"extends": ["../../biome.json"],
"files": {
"include": ["./src/", "./test/"],
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-js/biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/1.6.4/schema.json",
"$schema": "https://biomejs.dev/schemas/1.9.1/schema.json",
"extends": ["../../biome.json"],
"files": {
"include": ["./src/", "./test/"],
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-sass/biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/1.6.4/schema.json",
"$schema": "https://biomejs.dev/schemas/1.9.1/schema.json",
"extends": ["../../biome.json"],
"files": {
"include": ["./src/", "./test/"],
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-tailwind/biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/1.6.4/schema.json",
"$schema": "https://biomejs.dev/schemas/1.9.1/schema.json",
"extends": ["../../biome.json"],
"files": {
"include": ["./src/", "./test/"],
Expand Down
20 changes: 10 additions & 10 deletions packages/react-color-picker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,24 +50,24 @@
"clsx": "^2.1.1"
},
"devDependencies": {
"@rollup/plugin-swc": "^0.3.1",
"@rollup/plugin-swc": "^0.4.0",
"@rollup/plugin-typescript": "^11.1.6",
"@size-limit/preset-small-lib": "^11.1.4",
"@testing-library/jest-dom": "^6.4.8",
"@testing-library/react": "^16.0.0",
"@size-limit/preset-small-lib": "^11.1.5",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^16.0.1",
"@types/culori": "^2.1.1",
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"@vitejs/plugin-react-swc": "^3.7.0",
"chokidar-cli": "^3.0.0",
"culori": "^4.0.1",
"jsdom": "^24.1.1",
"react": "19.0.0-rc-1eaccd82-20240816",
"react-dom": "19.0.0-rc-1eaccd82-20240816",
"rollup": "^4.20.0",
"jsdom": "^24.1.3",
"react": "19.0.0-rc-206df66e-20240912",
"react-dom": "19.0.0-rc-206df66e-20240912",
"rollup": "^4.21.3",
"rollup-plugin-cleandir": "^2.0.0",
"rollup-plugin-import-css": "^3.5.0",
"size-limit": "^11.1.4",
"rollup-plugin-import-css": "^3.5.1",
"size-limit": "^11.1.5",
"types-react": "19.0.0-rc.1",
"types-react-dom": "19.0.0-rc.1",
"vitest-axe": "^0.1.0"
Expand Down
8 changes: 4 additions & 4 deletions packages/react-color-picker/src/components/ColorPicker.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.tz-color-picker {
background-color: var(--tz-color-control-bg);
background-color: var(--tz-color-bg-1);
color: var(--tz-text-primary);
display: flex;
flex-direction: column;
Expand All @@ -15,9 +15,9 @@
}

.tz-color-picker-code-input {
--tz-color-picker-input-bg: var(--tz-color-control-bg);
--tz-color-picker-input-border: var(--tz-color-control-border);
--tz-color-picker-input-text: var(--tz-color-control-text);
--tz-color-picker-input-bg: var(--tz-color-bg-1);
--tz-color-picker-input-border: var(--tz-color-border-3);
--tz-color-picker-input-text: var(--tz-color-text-1);

background-color: var(--tz-color-picker-input-bg);
border: 1px solid var(--tz-color-picker-input-border);
Expand Down
16 changes: 8 additions & 8 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"culori": "^4.0.1"
},
"devDependencies": {
"@storybook/addon-essentials": "^8.2.8",
"@storybook/react": "^8.2.8",
"@storybook/react-vite": "^8.2.8",
"@storybook/test": "^8.2.8",
"@storybook/addon-essentials": "^8.3.0",
"@storybook/react": "^8.3.0",
"@storybook/react-vite": "^8.3.0",
"@storybook/test": "^8.3.0",
"@terrazzo/fonts": "workspace:^",
"@terrazzo/icons": "workspace:^",
"@terrazzo/react-color-picker": "workspace:^",
Expand All @@ -31,12 +31,12 @@
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"@vitejs/plugin-react-swc": "^3.7.0",
"react": "19.0.0-rc-1eaccd82-20240816",
"react-dom": "19.0.0-rc-1eaccd82-20240816",
"storybook": "^8.2.8",
"react": "19.0.0-rc-206df66e-20240912",
"react-dom": "19.0.0-rc-206df66e-20240912",
"storybook": "^8.3.0",
"types-react": "19.0.0-rc.1",
"types-react-dom": "19.0.0-rc.1",
"vite": "^5.4.0"
"vite": "^5.4.5"
},
"overrides": {
"@types/react": "npm:types-react@rc",
Expand Down
10 changes: 9 additions & 1 deletion packages/tiles/biome.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
{
"extends": ["../../biome.json"]
"$schema": "https://biomejs.dev/schemas/1.9.1/schema.json",
"extends": ["../../biome.json"],
"linter": {
"rules": {
"a11y": {
"useFocusableInteractive": "off"
}
}
}
}
14 changes: 7 additions & 7 deletions packages/tiles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@
"@use-gesture/react": "^10.3.1",
"clsx": "^2.1.1",
"culori": "^4.0.1",
"shiki": "^1.12.1"
"shiki": "^1.17.6"
},
"devDependencies": {
"@rollup/plugin-swc": "^0.3.1",
"@rollup/plugin-typescript": "^11.1.6",
"@size-limit/preset-small-lib": "^11.1.4",
"@size-limit/preset-small-lib": "^11.1.5",
"@types/culori": "^2.1.1",
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"@vitejs/plugin-react-swc": "^3.7.0",
"chokidar-cli": "^3.0.0",
"react": "19.0.0-rc-1eaccd82-20240816",
"react-dom": "19.0.0-rc-1eaccd82-20240816",
"rollup": "^4.20.0",
"react": "19.0.0-rc-206df66e-20240912",
"react-dom": "19.0.0-rc-206df66e-20240912",
"rollup": "^4.21.3",
"rollup-plugin-cleandir": "^2.0.0",
"rollup-plugin-import-css": "^3.5.0",
"size-limit": "^11.1.4",
"rollup-plugin-import-css": "^3.5.1",
"size-limit": "^11.1.5",
"types-react": "19.0.0-rc.1",
"types-react-dom": "19.0.0-rc.1",
"vitest-axe": "^0.1.0"
Expand Down
47 changes: 33 additions & 14 deletions packages/tiles/src/Button/Button.css
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
.tz-button {
--tz-button-text: var(--tz-color-content-bg);
--tz-button-bg: var(--tz-color-content-text);
--tz-button-text: var(--tz-color-bg-1);
--tz-button-bg: var(--tz-color-text-1);
--tz-button-border: var(--tz-button-bg);
--tz-button-height: var(--tz-space-control-m);
--tz-button-height: 3rem;
--tz-button-gap: var(--tz-space-200);
--tz-button-padding: var(--tz-space-300);
--tz-button-padding: 1em;

align-items: center;
background-color: var(--tz-button-bg);
border-color: var(--tz-button-border);
border-radius: var(--tz-radius-400);
border-radius: 0;
border-style: solid;
border-width: 1px;
color: var(--tz-button-text);
cursor: pointer;
display: inline-flex;
font-family: var(--tz-typography-300-medium-font-family);
font-size: var(--tz-typography-300-medium-font-size);
font-weight: var(--tz-typography-300-medium-font-weight);
font-family: var(--tz-typography-200-medium-font-family);
font-size: var(--tz-typography-200-medium-font-size);
font-weight: var(--tz-typography-200-medium-font-weight);
gap: var(--tz-button-gap);
height: var(--tz-button-height);
justify-content: center;
letter-spacing: var(--tz-typography-300-medium-letter-spacing);
line-height: var(--tz-button-height);
letter-spacing: var(--tz-typography-200-medium-letter-spacing);
line-height: 1;
outline-color: transparent;
outline-offset: 2px;
outline-style: solid;
Expand All @@ -33,7 +34,7 @@
text-decoration: none;

&:focus-visible {
outline-color: var(--tz-color-control-border-focus);
outline-color: var(--tz-color-base-lime-800);
}

&[data-size="s"] {
Expand All @@ -43,10 +44,28 @@
letter-spacing: var(--tz-typography-200-medium-letter-spacing);
}

&[data-variant="lime"] {
--tz-button-bg: var(--tz-color-base-lime-800);
--tz-button-text: var(--tz-color-base-lime-200);
--tz-button-border: var(--tz-color-base-lime-300);
}

&[data-variant="blue"] {
--tz-button-bg: var(--tz-color-base-blue-800);
--tz-button-text: var(--tz-color-base-blue-200);
--tz-button-border: var(--tz-color-base-blue-300);
}

&[data-variant="orange"] {
--tz-button-bg: var(--tz-color-base-orange-800);
--tz-button-text: var(--tz-color-base-orange-200);
--tz-button-border: var(--tz-color-base-orange-300);
}

&[data-variant="secondary"] {
--tz-button-bg: var(--tz-color-control-bg);
--tz-button-border: var(--tz-color-control-border);
--tz-button-text: var(--tz-color-control-text);
--tz-button-bg: var(--tz-color-bg-1);
--tz-button-border: var(--tz-color-border-1);
--tz-button-text: var(--tz-color-text-1);
}

&:disabled {
Expand Down
Loading

0 comments on commit 9ce829c

Please sign in to comment.