feat: new t3 env setup & update deps

apps/web/next.config.js

@@ -1,4 +1,4 @@
-import '@orbitkit/db/env';
+import './src/env.mjs';
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {

apps/web/package.json

@@ -16,16 +16,18 @@
   "dependencies": {
     "@orbitkit/db": "workspace:^",
     "@orbitkit/ui": "workspace:^",
+    "@t3-oss/env-nextjs": "^0.8.0",
     "geist": "^1.2.1",
     "next": "14.1.0",
     "next-themes": "^0.2.1",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "zod": "^3.22.4"
   },
   "devDependencies": {
     "@orbitkit/tailwind": "workspace:^",
     "@orbitkit/tsconfig": "workspace:^",
-    "@types/node": "^20.11.5",
+    "@types/node": "^20.11.7",
     "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",
     "autoprefixer": "^10.4.17",

apps/web/src/app/page.tsx

@@ -1,5 +1,6 @@
 import { ThemeSwitcher } from '@/components/ThemeSwitcher';
 import { db } from '@orbitkit/db';
+import { Avatar, AvatarFallback, AvatarImage } from '@orbitkit/ui/avatar';
 
 export default async function Home() {
   const users = await db.query.userTable.findMany();
@@ -9,6 +10,10 @@ export default async function Home() {
       <h1>Hello World</h1>
       {JSON.stringify(users)}
       <ThemeSwitcher />
+      <Avatar>
+        <AvatarImage src="https://github.com/shadcn.png" alt="@shadcn" />
+        <AvatarFallback>CN</AvatarFallback>
+      </Avatar>
     </main>
   );
 }

apps/web/src/env.mjs

@@ -0,0 +1,11 @@
+import { env as dbEnv } from '@orbitkit/db/env';
+import { createEnv } from '@t3-oss/env-nextjs';
+import { vercel } from '@t3-oss/env-nextjs/presets';
+
+export const env = createEnv({
+  extends: [dbEnv, vercel],
+  server: {},
+  client: {},
+  runtimeEnv: {},
+  emptyStringAsUndefined: true,
+});

apps/web/tailwind.config.ts

@@ -3,7 +3,7 @@ import type { Config } from 'tailwindcss';
 import { orbitKitTailwindPreset } from '@orbitkit/tailwind';
 
 const config: Config = {
-  content: ['./src/**/*.{js,ts,jsx,tsx,mdx}'],
+  content: ['./src/**/*.{js,ts,jsx,tsx,mdx}', '../../packages/ui/dist/**/*.js'],
   darkMode: 'class',
   presets: [orbitKitTailwindPreset],
 };

apps/web/tsconfig.json

@@ -13,6 +13,7 @@
     "**/*.js",
     "**/*.cjs",
     ".eslintrc.cjs",
+    "**/*.mjs",
   ],
   "exclude": ["node_modules"],
 }

cspell.config.yaml

@@ -22,3 +22,4 @@ words:
   - tsup
   - turborepo
   - typecheck
+  - shadcn

package.json

@@ -18,17 +18,17 @@
     "typecheck": "tsc --noEmit --tsBuildInfoFile .tsbuildinfo"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.5.0",
-    "@commitlint/config-conventional": "^18.5.0",
+    "@commitlint/cli": "^18.6.0",
+    "@commitlint/config-conventional": "^18.6.0",
     "@commitlint/config-pnpm-scopes": "^18.4.4",
-    "@commitlint/prompt-cli": "^18.5.0",
+    "@commitlint/prompt-cli": "^18.6.0",
     "@ianvs/prettier-plugin-sort-imports": "^4.1.1",
     "@orbitkit/tsconfig": "workspace:^",
     "@types/eslint": "^8.56.2",
     "cspell": "^8.3.2",
     "eslint": "^8.56.0",
     "eslint-config-orbitkit": "workspace:^",
-    "husky": "^8.0.3",
+    "husky": "^9.0.6",
     "lint-staged": "^15.2.0",
     "markdownlint": "^0.33.0",
     "markdownlint-cli": "^0.38.0",

packages/config/tailwind/package.json

@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@orbitkit/tsconfig": "workspace:^",
-    "@types/node": "^20.11.5",
+    "@types/node": "^20.11.7",
     "eslint-config-orbitkit": "workspace:^",
     "tailwindcss-animate": "^1.0.7"
   },

packages/db/package.json

@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@neondatabase/serverless": "^0.7.2",
-    "@t3-oss/env-nextjs": "^0.7.3",
+    "@t3-oss/env-core": "^0.8.0",
     "drizzle-orm": "^0.29.3",
     "pg": "^8.11.3",
     "postgres": "^3.4.3",

packages/db/src/env.mjs

@@ -1,12 +1,14 @@
-import { createEnv } from '@t3-oss/env-nextjs';
+import { createEnv } from '@t3-oss/env-core';
+import { vercel } from '@t3-oss/env-core/presets';
 import { z } from 'zod';
 
 export const env = createEnv({
+  extends: [vercel],
   server: {
-    DATABASE_URL: z.string().url(),
+    DATABASE_URL: z.string().url().startsWith('postgres'),
   },
-  client: {},
   runtimeEnv: {
     DATABASE_URL: process.env['DATABASE_URL'],
   },
+  emptyStringAsUndefined: true,
 });

packages/ui/package.json

@@ -9,32 +9,32 @@
   "exports": {
     ".": {
       "import": {
-        "default": "./dist/index.js",
-        "types": "./dist/index.d.ts"
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
       },
       "require": {
-        "default": "./dist/index.cjs",
-        "types": "./dist/index.d.cts"
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
       }
     },
     "./avatar": {
       "import": {
-        "default": "./dist/avatar.js",
-        "types": "./dist/avatar.d.ts"
+        "types": "./dist/avatar.d.ts",
+        "default": "./dist/avatar.js"
       },
       "require": {
-        "default": "./dist/avatar.cjs",
-        "types": "./dist/avatar.d.cts"
+        "types": "./dist/avatar.d.cts",
+        "default": "./dist/avatar.cjs"
       }
     },
     "./cn": {
       "import": {
-        "default": "./dist/utils/cn.js",
-        "types": "./dist/utils/cn.d.ts"
+        "types": "./dist/utils/cn.d.ts",
+        "default": "./dist/utils/cn.js"
       },
       "require": {
-        "default": "./dist/utils/cn.cjs",
-        "types": "./dist/utils/cn.d.cts"
+        "types": "./dist/utils/cn.d.cts",
+        "default": "./dist/utils/cn.cjs"
       }
     }
   },
@@ -61,7 +61,7 @@
   "devDependencies": {
     "@orbitkit/tailwind": "workspace:^",
     "@orbitkit/tsconfig": "workspace:^",
-    "@types/node": "^20.11.5",
+    "@types/node": "^20.11.7",
     "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",
     "autoprefixer": "^10.4.17",

packages/ui/tsup.config.ts

@@ -25,13 +25,13 @@ type PackageJson = {
   types: string;
 };
 
-export default defineConfig({
+export default defineConfig((opts) => ({
   entry: entries.map((entry) => entry.source),
   format: ['esm', 'cjs'],
   splitting: true,
   sourcemap: true,
   minify: true,
-  clean: true,
+  clean: !opts.watch,
   dts: true,
   outDir: 'dist',
   async onSuccess() {
@@ -40,20 +40,20 @@ export default defineConfig({
     pkg.exports = entries.reduce((acc: Record<string, unknown>, entry) => {
       acc[entry.export] = {
         import: {
-          default: entry.source
-            .replace('src', 'dist')
-            .replace(/\.tsx?$/, '.js'),
           types: entry.source
             .replace('src', 'dist')
             .replace(/\.tsx?$/, '.d.ts'),
-        },
-        require: {
           default: entry.source
             .replace('src', 'dist')
-            .replace(/\.tsx?$/, '.cjs'),
+            .replace(/\.tsx?$/, '.js'),
+        },
+        require: {
           types: entry.source
             .replace('src', 'dist')
             .replace(/\.tsx?$/, '.d.cts'),
+          default: entry.source
+            .replace('src', 'dist')
+            .replace(/\.tsx?$/, '.cjs'),
         },
       };
       return acc;
@@ -77,4 +77,4 @@ export default defineConfig({
       fs.writeFileSync('./package.json', formatted);
     }
   },
-});
+}));