Merge commit '4875b2eb3edebc037a39bdd3ae65306f7860fb3d'

@acme/hooks/eslint.config.js

@@ -1,6 +1,11 @@
 import baseConfig from "@acme/eslint-config/base";
+import reactConfig from "@acme/eslint-config/react";
 
 /** @type {import('typescript-eslint').Config} */
 export default [
+  {
+    ignores: ["dist/**"],
+  },
   ...baseConfig,
+  ...reactConfig,
 ];

@acme/hooks/package.json

@@ -6,25 +6,23 @@
   "type": "module",
   "exports": {
     "./*": {
-      "types": "./dist/src/*/index.d.ts",
+      "//types": "./dist/src/*/index.d.ts",
       "default": "./src/*/index.ts"
     },
     "./next/*": {
-      "types": "./dist/src/next/*/index.d.ts",
+      "//types": "./dist/src/next/*/index.d.ts",
       "default": "./src/next/*/index.ts"
     }
   },
   "scripts": {
-    "build": "tsc",
-    "clean": "rm -rf .turbo dist node_modules",
-    "dev": "tsc",
+    "clean": "git clean -xdf .cache .turbo dist node_modules",
     "format": "prettier --check . --ignore-path ../../.gitignore",
     "lint": "eslint",
     "typecheck": "tsc --noEmit --emitDeclarationOnly false"
   },
   "prettier": "@acme/prettier-config",
   "dependencies": {
-    "@tanstack/react-router": "^1.45.2"
+    "@tanstack/react-router": "^1.48.1"
   },
   "devDependencies": {
     "@acme/eslint-config": "workspace:*",

@acme/hooks/src/useResponsive/index.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unnecessary-condition */
 import { useEffect, useState } from "react";
 import { theme } from "tailwindcss/defaultConfig";
 

@acme/hooks/src/utils/isBrowser.ts

@@ -1,4 +1,5 @@
 // May 16, 2022
-const isBrowser = !!window.document.createElement;
+const isBrowser =
+  typeof window !== "undefined" && !!window.document.createElement;
 
 export default isBrowser;

@acme/hooks/tsconfig.json

@@ -3,7 +3,6 @@
   "extends": "@acme/tsconfig/internal-package.json",
   "compilerOptions": {
     "lib": ["dom", "dom.iterable", "ES2022"],
-    "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json",
     "rootDir": ".",
     "emitDeclarationOnly": true
   },

@acme/tooling/eslint/base.js

@@ -12,34 +12,36 @@ import tseslint from "typescript-eslint";
 /**
  * All packages that leverage t3-env should use this rule
  */
-export const restrictEnvAccess = tseslint.config({
-  files: ["**/*.js", "**/*.ts", "**/*.tsx"],
-  rules: {
-    "no-restricted-properties": [
-      "error",
-      {
-        object: "process",
-        property: "env",
-        message:
-          "Use `import { env } from '~/env'` instead to ensure validated types.",
-      },
-    ],
-    "no-restricted-imports": [
-      "error",
-      {
-        name: "process",
-        importNames: ["env"],
-        message:
-          "Use `import { env } from '~/env'` instead to ensure validated types.",
-      },
-    ],
+export const restrictEnvAccess = tseslint.config(
+  { ignores: ["**/env.ts"] },
+  {
+    rules: {
+      "no-restricted-properties": [
+        "error",
+        {
+          object: "process",
+          property: "env",
+          message:
+            "Use `import { env } from '~/env'` instead to ensure validated types.",
+        },
+      ],
+      "no-restricted-imports": [
+        "error",
+        {
+          name: "process",
+          importNames: ["env"],
+          message:
+            "Use `import { env } from '~/env'` instead to ensure validated types.",
+        },
+      ],
+    },
   },
-});
+);
 
 export default tseslint.config(
   // Ignore files not tracked by VCS and any config files
-  includeIgnoreFile(path.join(import.meta.dirname, "../../.gitignore")),
-  { ignores: ["**/*.config.*"] },
+  includeIgnoreFile(path.join(import.meta.dirname, "../../../.gitignore")),
+  // { ignores: ["**/*.config.*", "**/*.d.ts"] },
   {
     files: ["**/*.js", "**/*.ts", "**/*.tsx"],
     plugins: {
@@ -104,6 +106,11 @@ export default tseslint.config(
   },
   {
     linterOptions: { reportUnusedDisableDirectives: true },
-    languageOptions: { parserOptions: { projectService: true } },
+    languageOptions: {
+      parserOptions: {
+        projectService: true,
+        // tsconfigRootDir: import.meta.dirname,
+      },
+    },
   },
 );

@acme/tooling/eslint/package.json

@@ -11,7 +11,7 @@
     "./tailwind": "./tailwind.js"
   },
   "scripts": {
-    "clean": "rm -rf .turbo node_modules",
+    "clean": "git clean -xdf .cache .turbo node_modules",
     "format": "prettier --check . --ignore-path ../../.gitignore",
     "lint": "eslint",
     "typecheck": "tsc --noEmit"
@@ -20,16 +20,15 @@
   "dependencies": {
     "@eslint/compat": "^1.1.1",
     "@next/eslint-plugin-next": "^14.2.5",
-    "eslint-config-turbo": "^2.0.11",
+    "eslint-config-turbo": "^2.0.14",
     "eslint-plugin-drizzle": "^0.2.3",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.9.0",
-    "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-react": "^7.35.0",
     "eslint-plugin-react-hooks": "rc",
     "eslint-plugin-tailwindcss": "^3.17.4",
-    "eslint-plugin-turbo": "^2.0.11",
-    "typescript-eslint": "^8.0.0"
+    "eslint-plugin-turbo": "^2.0.14",
+    "typescript-eslint": "^8.1.0"
   },
   "devDependencies": {
     "@acme/prettier-config": "workspace:*",

@acme/tooling/eslint/tailwind.js

@@ -1,24 +1,28 @@
+import * as path from "node:path";
 import { fileURLToPath } from "url";
+// @ts-expect-error
 import tailwindPlugin from "eslint-plugin-tailwindcss";
-import tailwind from "tailwindcss";
 
 const __filename = fileURLToPath(import.meta.url);
+const config = path.join(import.meta.dirname, "../tailwind/web.ts");
 
 /** @type {Awaited<import('typescript-eslint').Config>} */
 export default [
+  ...tailwindPlugin.configs["flat/recommended"],
   {
-    plugins: {
-      tailwindcss: tailwindPlugin,
-    },
+    // plugins: {
+    //   tailwindcss: tailwindPlugin,
+    // },
     // rules: {
     //   ...tailwindPlugin.rules,
     // },
     settings: {
       tailwindcss: {
         callees: ["clsm", "cva", "cx"],
-        config: fileURLToPath(
-          new URL("../tailwind/web.ts", "file://" + __filename),
-        ),
+        config,
+        // config: fileURLToPath(
+        //   new URL("../tailwind/web.ts", "file://" + __filename),
+        // ),
         cssFiles: [
           "**/*.{css,scss}",
           "!**/node_modules",

@acme/tooling/eslint/tsconfig.json

@@ -1,9 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig.json",
   "extends": "@acme/tsconfig/base.json",
-  "compilerOptions": {
-    "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
-  },
   "include": ["."],
   "exclude": ["node_modules"]
 }

@acme/tooling/prettier/package.json

@@ -8,7 +8,7 @@
     ".": "./index.js"
   },
   "scripts": {
-    "clean": "rm -rf .turbo node_modules",
+    "clean": "git clean -xdf .cache .turbo node_modules",
     "format": "prettier --check . --ignore-path ../../.gitignore",
     "typecheck": "tsc --noEmit"
   },
@@ -17,7 +17,7 @@
     "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
     "prettier": "catalog:",
     "prettier-plugin-packagejson": "^2.5.0",
-    "prettier-plugin-tailwindcss": "^0.6.5"
+    "prettier-plugin-tailwindcss": "^0.6.6"
   },
   "devDependencies": {
     "@acme/tsconfig": "workspace:*",

@acme/tooling/prettier/tsconfig.json

@@ -1,9 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig.json",
   "extends": "@acme/tsconfig/base.json",
-  "compilerOptions": {
-    "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
-  },
   "include": ["."],
   "exclude": ["node_modules"]
 }

@acme/tooling/tailwind/base.ts

@@ -125,11 +125,12 @@ export default {
             DEFAULT: baseColors.blue[100],
           },
         },
-        danger: {
+        error: {
           DEFAULT: baseColors.red[800],
           hover: baseColors.red[900],
           muted: {
             DEFAULT: baseColors.red[100],
+            hover: baseColors.red[200],
           },
         },
         success: {
@@ -158,16 +159,40 @@ export default {
           DEFAULT: "hsl(var(--popover))",
           foreground: "hsl(var(--popover-foreground))",
         },
+        placeholder: baseColors.gray[700],
         ring: "hsl(var(--ring))",
       },
       /* End Colors */
 
       fontSize: {
         md: fontSize.base,
       },
-      width: {
-        "screen-md": "1024px",
-      },
+      // width: {
+      //   "screen-sm": "640px",
+      //   "screen-md": "1024px",
+      // },
+      width: (pluginUtils) => ({
+        ...pluginUtils.breakpoints(pluginUtils.theme("screens")),
+        // ...theme('spacing'),
+        // none: 'none',
+        // xs: '20rem',
+        // sm: '24rem',
+        // md: '28rem',
+        // lg: '32rem',
+        // xl: '36rem',
+        // '2xl': '42rem',
+        // '3xl': '48rem',
+        // '4xl': '56rem',
+        // '5xl': '64rem',
+        // '6xl': '72rem',
+        // '7xl': '80rem',
+        // full: '100%',
+        // min: 'min-content',
+        // max: 'max-content',
+        // fit: 'fit-content',
+        // prose: '65ch',
+        // ...breakpoints(theme('screens')),
+      }),
       /**
        * Colors
        */

@acme/tooling/tailwind/package.json

@@ -11,15 +11,15 @@
     "./postcss.cjs": "./postcss.cjs"
   },
   "scripts": {
-    "clean": "rm -rf .turbo node_modules",
+    "clean": "git clean -xdf .cache .turbo node_modules",
     "format": "prettier --check . --ignore-path ../../.gitignore",
     "lint": "eslint",
     "typecheck": "tsc --noEmit"
   },
   "prettier": "@acme/prettier-config",
   "dependencies": {
-    "postcss": "8.4.40",
-    "tailwindcss": "^3.4.7",
+    "postcss": "8.4.41",
+    "tailwindcss": "catalog:",
     "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {

@acme/tooling/tailwind/tsconfig.json

@@ -1,9 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig.json",
   "extends": "@acme/tsconfig/base.json",
-  "compilerOptions": {
-    "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
-  },
   "include": ["."],
   "exclude": ["node_modules"]
 }

@acme/tooling/typescript/base.json

@@ -14,7 +14,7 @@
     /** Keep TSC performant in monorepos */
     "incremental": true,
     "disableSourceOfProjectReferenceRedirect": true,
-    "tsBuildInfoFile": "${configDir}/node_modules/.cache/tsbuildinfo.json",
+    "tsBuildInfoFile": "${configDir}/.cache/tsbuildinfo.json",
 
     /** Strictness */
     "strict": true,

@acme/tooling/typescript/internal-package.json

@@ -5,6 +5,7 @@
     /** Emit types for internal packages to speed up editor performance. */
     "declaration": true,
     "declarationMap": true,
+    "emitDeclarationOnly": true,
     "noEmit": false,
     "outDir": "${configDir}/dist"
   }