diff --git a/.vscode/settings.json b/.vscode/settings.json index 5e4287f83..b2d525cc2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,6 +3,9 @@ "source.fixAll.eslint": "explicit" }, "editor.defaultFormatter": "esbenp.prettier-vscode", + "[typescript,typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, "editor.formatOnSave": true, "eslint.rules.customizations": [{ "rule": "*", "severity": "warn" }], "eslint.runtime": "node", diff --git a/packages/ui/components.json b/packages/ui/components.json index c26248867..200045990 100644 --- a/packages/ui/components.json +++ b/packages/ui/components.json @@ -4,7 +4,7 @@ "rsc": true, "tsx": true, "tailwind": { - "config": "./tailwind.config.ts", + "config": "../../tooling/tailwind/web.ts", "css": "unused.css", "baseColor": "zinc", "cssVariables": true diff --git a/packages/ui/package.json b/packages/ui/package.json index 721f65d57..974f2e7cf 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -41,6 +41,7 @@ "devDependencies": { "@acme/eslint-config": "workspace:*", "@acme/prettier-config": "workspace:*", + "@acme/tailwind-config": "workspace:*", "@acme/tsconfig": "workspace:*", "@types/react": "catalog:react18", "eslint": "catalog:", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8d063fb19..82e6ea6bc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -487,6 +487,9 @@ importers: '@acme/prettier-config': specifier: workspace:* version: link:../../tooling/prettier + '@acme/tailwind-config': + specifier: workspace:* + version: link:../../tooling/tailwind '@acme/tsconfig': specifier: workspace:* version: link:../../tooling/typescript @@ -553,7 +556,7 @@ importers: version: 7.37.1(eslint@9.12.0(jiti@2.3.3)) eslint-plugin-react-hooks: specifier: rc - version: 5.1.0-rc-09111202-20241011(eslint@9.12.0(jiti@2.3.3)) + version: 5.1.0-rc-77b637d6-20241016(eslint@9.12.0(jiti@2.3.3)) eslint-plugin-turbo: specifier: ^2.1.3 version: 2.1.3(eslint@9.12.0(jiti@2.3.3)) @@ -2333,7 +2336,7 @@ packages: '@radix-ui/react-compose-refs@1.1.0': resolution: {integrity: sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==} peerDependencies: - '@types/react': 18.3.1 + '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc peerDependenciesMeta: '@types/react': @@ -2422,7 +2425,7 @@ packages: '@radix-ui/react-id@1.1.0': resolution: {integrity: sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==} peerDependencies: - '@types/react': 18.3.1 + '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc peerDependenciesMeta: '@types/react': @@ -2496,7 +2499,7 @@ packages: '@radix-ui/react-primitive@2.0.0': resolution: {integrity: sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==} peerDependencies: - '@types/react': 18.3.1 + '@types/react': '*' '@types/react-dom': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc @@ -2536,7 +2539,7 @@ packages: '@radix-ui/react-use-callback-ref@1.1.0': resolution: {integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==} peerDependencies: - '@types/react': 18.3.1 + '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc peerDependenciesMeta: '@types/react': @@ -2545,7 +2548,7 @@ packages: '@radix-ui/react-use-controllable-state@1.1.0': resolution: {integrity: sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==} peerDependencies: - '@types/react': 18.3.1 + '@types/react': '*' react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc peerDependenciesMeta: '@types/react': @@ -4459,8 +4462,8 @@ packages: peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9 - eslint-plugin-react-hooks@5.1.0-rc-09111202-20241011: - resolution: {integrity: sha512-HLdP3Qpr9KUckSEhxwWHqpXGJYKlZV+P9gqdOwPa45Ka3qhY1kuflvtwRMMA9dd7p8AL/lRLU3UUfNcDVh5DGw==} + eslint-plugin-react-hooks@5.1.0-rc-77b637d6-20241016: + resolution: {integrity: sha512-lGKra+7UDOdruymKEJu/60zfzp8TvtdcxIAkwkhw/5NfSllWsW/pIoO5SIOy8W8gddtTZp/Uw9UYpTFeOiebIw==} engines: {node: '>=10'} peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0 @@ -12673,7 +12676,7 @@ snapshots: safe-regex-test: 1.0.3 string.prototype.includes: 2.0.0 - eslint-plugin-react-hooks@5.1.0-rc-09111202-20241011(eslint@9.12.0(jiti@2.3.3)): + eslint-plugin-react-hooks@5.1.0-rc-77b637d6-20241016(eslint@9.12.0(jiti@2.3.3)): dependencies: eslint: 9.12.0(jiti@2.3.3)