timothymiller · coniferconcepts · Jun 3, 2024 · Jun 3, 2024 · Jun 7, 2024 · Jun 8, 2024
diff --git a/.env.example b/.env.example
@@ -16,6 +16,7 @@ PUBLIC_EAS_PROJECT_ID="85fc6ccd-0ce1-4e4d-804c-b15df989f97e"
 # Cloudflare Wrangler
 JWT_VERIFICATION_KEY=
 DATABASE_ID=aa5e3923-0f1b-469a-8bb8-d10fb866efe0
+ACCOUNT_ID=
 
 # Optional for OAuth
 GOOGLE_CLIENT_ID=

diff --git a/apps/expo/app/legend-offline-first.tsx b/apps/expo/app/legend-offline-first.tsx
@@ -0,0 +1,15 @@
+import { LegendOfflineFirstScreen } from 'app/features/legend-offline-first/screen'
+import { Stack } from 'expo-router'
+
+export default function Screen() {
+  return (
+    <>
+      <Stack.Screen
+        options={{
+          title: 'Legend Offline First',
+        }}
+      />
+      <LegendOfflineFirstScreen />
+    </>
+  )
+}
diff --git a/apps/expo/package.json b/apps/expo/package.json
@@ -16,41 +16,40 @@
     "clean": "git clean -xdf .expo node_modules ios android"
   },
   "dependencies": {
-    "@babel/runtime": "^7.23.2",
-    "@shopify/flash-list": "^1.6.3",
-    "@t4/ui": "workspace:*",
-    "app": "workspace:*",
+    "@babel/runtime": "^7.24.7",
+    "@shopify/flash-list": "^1.6.4",
+    "@t4/ui": "2.0.0",
+    "app": "2.0.0",
     "babel-plugin-module-resolver": "^5.0.0",
-    "burnt": "^0.12.1",
-    "expo": "^49.0.16",
+    "burnt": "^0.12.2",
+    "expo": "^51.0.9",
     "expo-apple-authentication": "~6.1.2",
-    "expo-constants": "~14.4.2",
+    "expo-constants": "^16.0.2",
     "expo-crypto": "~12.6.0",
-    "expo-dev-client": "~2.4.11",
-    "expo-font": "~11.6.0",
-    "expo-image": "~1.5.1",
-    "expo-linear-gradient": "~12.5.0",
-    "expo-linking": "5.0.2",
-    "expo-router": "^2.0.11",
-    "expo-splash-screen": "^0.22.0",
-    "expo-status-bar": "~1.7.1",
+    "expo-dev-client": "~4.0.15",
+    "expo-font": "~12.0.6",
+    "expo-linear-gradient": "^13.0.2",
+    "expo-linking": "^6.3.1",
+    "expo-router": "3.5.15",
+    "expo-splash-screen": "0.27.4",
+    "expo-status-bar": "~1.12.1",
     "expo-system-ui": "^2.6.0",
-    "expo-updates": "^0.18.17",
+    "expo-updates": "~0.25.15",
     "expo-web-browser": "~12.5.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-native": "^0.72.6",
-    "react-native-gesture-handler": "~2.13.4",
-    "react-native-mmkv": "^2.10.2",
-    "react-native-safe-area-context": "4.7.4",
-    "react-native-screens": "^3.27.0",
-    "react-native-svg": "^13.14.0"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-native": "0.74.2",
+    "react-native-gesture-handler": "~2.16.2",
+    "react-native-mmkv": "^2.12.2",
+    "react-native-safe-area-context": "4.10.4",
+    "react-native-screens": "~3.31.1",
+    "react-native-web": "~0.19.12"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.2",
-    "@expo/metro-config": "^0.10.7",
-    "@tamagui/babel-plugin": "1.75.9",
-    "metro-minify-terser": "^0.80.0",
-    "typescript": "^5.2.2"
+    "@babel/core": "^7.24.6",
+    "@expo/metro-config": "~0.18.4",
+    "@tamagui/babel-plugin": "^1.101.0",
+    "metro-minify-terser": "^0.80.9",
+    "typescript": "^5.5.2"
   }
 }
diff --git a/apps/next/next.config.js b/apps/next/next.config.js
@@ -40,16 +40,17 @@ const plugins = [
     outputCSS: process.env.NODE_ENV === 'production' ? './public/tamagui.css' : null,
     logTimings: true,
     disableExtraction,
-    useReactNativeWebLite: true,
+    // useReactNativeWebLite: true,
     shouldExtract: (path) => {
       if (path.includes(join('packages', 'app'))) {
         return true
       }
     },
+    excludeReactNativeWebExports: ['Switch', 'ProgressBar', 'Picker', 'CheckBox', 'Touchable'],
   }),
 ]
 
-module.exports = function () {
+module.exports = () => {
   /** @type {import('next').NextConfig} */
   let config = {
     // Uncomment if you want to use Cloudflare's Paid Image Resizing w/ Next/Image
@@ -77,6 +78,7 @@ module.exports = function () {
       'react-native-safe-area-context',
       'react-native-reanimated',
       'react-native-gesture-handler',
+      'expo-linear-gradient',
     ],
     experimental: {
       /*

diff --git a/apps/next/package.json b/apps/next/package.json
@@ -13,24 +13,24 @@
     "@ducanh2912/next-pwa": "^9.7.2",
     "@supabase/auth-helpers-nextjs": "^0.7.4",
     "@supabase/auth-helpers-react": "^0.4.2",
-    "@t4/ui": "workspace:*",
-    "@tamagui/next-theme": "1.75.9",
+    "@t4/ui": "2.0.0",
+    "@tamagui/next-theme": "^1.101.0",
     "@tsndr/cloudflare-worker-jwt": "2.2.7",
-    "app": "workspace:*",
-    "million": "2.6.4",
-    "next": "14.0.1",
+    "app": "2.0.0",
+    "million": "3.1.0",
+    "next": "^14.2.3",
     "next-seo": "^6.4.0",
-    "next-superjson-plugin": "^0.5.10",
+    "next-superjson-plugin": "^0.6.3",
     "pattycake": "^0.0.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-native": "^0.72.6",
-    "react-native-web-lite": "1.75.9",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-native": "0.74.2",
+    "react-native-web-lite": "^1.101.0",
     "webpack": "^5.88.2"
   },
   "devDependencies": {
-    "@tamagui/next-plugin": "1.75.9",
-    "@types/react": "^18.2.37",
+    "@tamagui/next-plugin": "^1.101.0",
+    "@types/react": "^18.3.3",
     "vercel": "32.5.3"
   }
 }
diff --git a/apps/next/pages/legend-offline-first.tsx b/apps/next/pages/legend-offline-first.tsx
@@ -0,0 +1,13 @@
+import { LegendOfflineFirstScreen } from 'app/features/legend-offline-first/screen'
+import Head from 'next/head'
+
+export default function Page() {
+  return (
+    <>
+      <Head>
+        <title>Legend State w/ Offline First</title>
+      </Head>
+      <LegendOfflineFirstScreen />
+    </>
+  )
+}
diff --git a/apps/next/tsconfig.json b/apps/next/tsconfig.json
@@ -15,6 +15,7 @@
     "forceConsistentCasingInFileNames": true,
     "noEmit": true,
     "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
     "module": "esnext",
     "moduleResolution": "node",
     "resolveJsonModule": true,
@@ -33,8 +34,7 @@
         "completionFilters": {
           "showColorTokens": true,
           "showTrueTokens": true,
-          "custom": {
-          }
+          "custom": {}
         }
       }
     ]

diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -35,16 +35,24 @@
     "clean": "git clean -xdf node_modules && rm -f bun.lockb && rm -rf ./apps/next/.next && rm -rf ./apps/next/.tamagui && rm -rf ./apps/next/node_modules && rm -rf ./packages/ui/dist"
   },
   "workspaces": ["apps/*", "packages/*"],
+  "resolutions": {
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-refresh": "^0.14.0",
+    "react-native-svg": "15.3.0",
+    "react-native-web": "~0.19.12"
+  },
   "dependencies": {
-    "@babel/runtime": "^7.23.2",
+    "@babel/runtime": "^7.24.7",
     "@biomejs/biome": "1.3.3",
-    "@manypkg/cli": "^0.21.0",
+    "@manypkg/cli": "^0.21.4",
     "@nderscore/tamagui-typescript-plugin": "^0.6.0",
-    "@supabase/supabase-js": "^2.38.4",
+    "@supabase/supabase-js": "^2.43.5",
     "check-dependency-version-consistency": "^4.1.0",
     "npm-run-all": "^4.1.5",
     "react-native-url-polyfill": "^2.0.0",
-    "typescript": "^5.2.2",
+    "typescript": "^5.5.2",
     "workerd": "1.20231030.0"
-  }
+  },
+  "trustedDependencies": ["@biomejs/biome", "@swc/core", "@t4/api", "es5-ext", "esbuild", "workerd"]
 }
diff --git a/packages/api/drizzle.config.ts b/packages/api/drizzle.config.ts
@@ -1,13 +1,23 @@
-import type { Config } from 'drizzle-kit'
+import { defineConfig } from 'drizzle-kit'
+import { config as loadEnv } from 'dotenv'
 
-export default {
+// Load environment variables from .dev.vars
+loadEnv({ path: '.dev.vars' })
+
+export default defineConfig({
+  dialect: 'sqlite',
+  driver: 'd1-http',
   schema: './src/db/schema.ts',
-  out: './migrations',
-  driver: 'd1',
   dbCredentials: {
-    wranglerConfigPath: 'wrangler.toml',
-    dbName: 'production',
+    accountId: process.env.ACCOUNT_ID || '',
+    databaseId: process.env.DATABASE_ID || '',
+    token: process.env.TOKEN || '',
+  },
+  out: './migrations',
+  migrations: {
+    table: 'migrations',
+    //schema: 'public',
   },
-  verbose: false,
+  verbose: true,
   strict: true,
-} satisfies Config
+})
diff --git a/packages/api/migrations/0000_chemical_spitfire.sql b/packages/api/migrations/0000_chemical_spitfire.sql
@@ -8,6 +8,8 @@ CREATE TABLE `Car` (
 	`mileage` integer NOT NULL,
 	`fuelType` text NOT NULL,
 	`transmission` text NOT NULL
+	`created_at` integer NOT NULL,
+	`updated_at` integer
 );
 --> statement-breakpoint
 CREATE TABLE `User` (

diff --git a/packages/api/migrations/0003_hot_ultragirl.sql b/packages/api/migrations/0003_hot_ultragirl.sql
@@ -8,6 +8,8 @@ CREATE TABLE `Car` (
 	`mileage` integer NOT NULL,
 	`fuelType` text NOT NULL,
 	`transmission` text NOT NULL
+	`created_at` integer NOT NULL,
+	`updated_at` integer
 );
 --> statement-breakpoint
 CREATE TABLE `User` (

diff --git a/packages/api/migrations/meta/0000_snapshot.json b/packages/api/migrations/meta/0000_snapshot.json
@@ -1,8 +1,6 @@
 {
-  "version": "5",
+  "version": "6",
   "dialect": "sqlite",
-  "id": "b4ee64d5-7b72-4828-8645-33c41f0af619",
-  "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "Car": {
       "name": "Car",
@@ -102,8 +100,9 @@
   },
   "enums": {},
   "_meta": {
-    "schemas": {},
     "tables": {},
     "columns": {}
-  }
+  },
+  "id": "b4ee64d5-7b72-4828-8645-33c41f0af619",
+  "prevId": "00000000-0000-0000-0000-000000000000"
 }
diff --git a/packages/api/migrations/meta/0001_snapshot.json b/packages/api/migrations/meta/0001_snapshot.json
@@ -1,8 +1,6 @@
 {
-  "version": "5",
+  "version": "6",
   "dialect": "sqlite",
-  "id": "19d05176-7733-4654-b24f-799d3fddc19c",
-  "prevId": "b4ee64d5-7b72-4828-8645-33c41f0af619",
   "tables": {
     "Car": {
       "name": "Car",
@@ -125,8 +123,9 @@
   },
   "enums": {},
   "_meta": {
-    "schemas": {},
     "tables": {},
     "columns": {}
-  }
+  },
+  "id": "19d05176-7733-4654-b24f-799d3fddc19c",
+  "prevId": "b4ee64d5-7b72-4828-8645-33c41f0af619"
 }
diff --git a/packages/api/migrations/meta/0002_snapshot.json b/packages/api/migrations/meta/0002_snapshot.json
@@ -1,13 +1,12 @@
 {
-  "version": "5",
+  "version": "6",
   "dialect": "sqlite",
-  "id": "4dc9ecc7-da6d-4edc-841b-2d44a349d363",
-  "prevId": "19d05176-7733-4654-b24f-799d3fddc19c",
   "tables": {},
   "enums": {},
   "_meta": {
-    "schemas": {},
     "tables": {},
     "columns": {}
-  }
+  },
+  "id": "4dc9ecc7-da6d-4edc-841b-2d44a349d363",
+  "prevId": "19d05176-7733-4654-b24f-799d3fddc19c"
 }
diff --git a/packages/api/migrations/meta/0003_snapshot.json b/packages/api/migrations/meta/0003_snapshot.json
@@ -1,8 +1,6 @@
 {
-  "version": "5",
+  "version": "6",
   "dialect": "sqlite",
-  "id": "48283c30-3c21-4114-9533-2235c17d08b9",
-  "prevId": "4dc9ecc7-da6d-4edc-841b-2d44a349d363",
   "tables": {
     "Car": {
       "name": "Car",
@@ -102,8 +100,9 @@
   },
   "enums": {},
   "_meta": {
-    "schemas": {},
     "tables": {},
     "columns": {}
-  }
+  },
+  "id": "48283c30-3c21-4114-9533-2235c17d08b9",
+  "prevId": "4dc9ecc7-da6d-4edc-841b-2d44a349d363"
 }