Merge branch 'dev'

This commit is contained in:
Atridad Lahiji 2023-12-23 02:01:19 -07:00
commit 6fb25dca28
No known key found for this signature in database
5 changed files with 400 additions and 379 deletions

View file

@ -72,6 +72,7 @@ export function ErrorBoundary() {
return <ErrorPage />; return <ErrorPage />;
} }
// Page Entry Point
export default function Room() { export default function Room() {
return ( return (
<> <>
@ -242,6 +243,7 @@ function RoomContent() {
setStoryNameText(roomFromDbParsed?.storyName || ""); setStoryNameText(roomFromDbParsed?.storyName || "");
setRoomScale(roomFromDbParsed?.scale || "ERROR"); setRoomScale(roomFromDbParsed?.scale || "ERROR");
} }
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [roomFromDb]); }, [roomFromDb]);
// UI // UI

View file

@ -1,46 +1,46 @@
{ {
"name": "sprintpadawan", "name": "sprintpadawan",
"version": "4.2.0", "version": "4.2.1",
"private": true, "private": true,
"sideEffects": false, "sideEffects": false,
"type": "module", "type": "module",
"scripts": { "scripts": {
"build": "vite build && vite build --ssr", "build": "vite build && vite build --ssr",
"dev": "vite dev --force", "dev": "vite dev",
"start": "remix-serve ./build/server/index.js", "start": "remix-serve ./build/server/index.js",
"typecheck": "tsc" "typecheck": "tsc"
}, },
"dependencies": { "dependencies": {
"@clerk/remix": "^3.1.11", "@clerk/remix": "^3.1.13",
"@libsql/client": "0.4.0-pre.5", "@libsql/client": "0.4.0-pre.5",
"@paralleldrive/cuid2": "^2.2.2", "@paralleldrive/cuid2": "^2.2.2",
"@remix-run/node": "^2.4.0", "@remix-run/node": "^2.4.1",
"@remix-run/react": "^2.4.0", "@remix-run/react": "^2.4.1",
"@remix-run/serve": "^2.4.0", "@remix-run/serve": "^2.4.1",
"csv42": "^5.0.0", "csv42": "^5.0.0",
"dotenv": "^16.3.1",
"drizzle-orm": "^0.29.1", "drizzle-orm": "^0.29.1",
"ioredis": "^5.3.2", "ioredis": "^5.3.2",
"isbot": "^3.7.1", "isbot": "3.7.1-deprecated",
"lucide-react": "^0.295.0", "lucide-react": "^0.300.0",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"remix-utils": "^7.3.0", "remix-utils": "^7.4.0",
"svix": "^1.15.0", "svix": "^1.15.0"
"dotenv": "^16.3.1"
}, },
"devDependencies": { "devDependencies": {
"@flydotio/dockerfile": "^0.4.11", "@flydotio/dockerfile": "^0.5.0",
"@remix-run/dev": "^2.4.0", "@remix-run/dev": "^2.4.1",
"@remix-run/eslint-config": "^2.4.0", "@remix-run/eslint-config": "^2.4.1",
"@types/react": "^18.2.45", "@types/react": "^18.2.45",
"@types/react-dom": "^18.2.17", "@types/react-dom": "^18.2.18",
"autoprefixer": "^10.4.16", "autoprefixer": "^10.4.16",
"better-sqlite3": "^9.2.2", "better-sqlite3": "^9.2.2",
"daisyui": "^4.4.20", "daisyui": "^4.4.23",
"drizzle-kit": "^0.20.6", "drizzle-kit": "^0.20.7",
"eslint": "^8.55.0", "eslint": "^8.56.0",
"postcss": "^8.4.32", "postcss": "^8.4.32",
"tailwindcss": "^3.3.6", "tailwindcss": "^3.4.0",
"typescript": "^5.3.3", "typescript": "^5.3.3",
"vite": "^5.0.10", "vite": "^5.0.10",
"vite-tsconfig-paths": "^4.2.2" "vite-tsconfig-paths": "^4.2.2"

731
pnpm-lock.yaml generated

File diff suppressed because it is too large Load diff

View file

@ -8,6 +8,7 @@
"moduleResolution": "Bundler", "moduleResolution": "Bundler",
"resolveJsonModule": true, "resolveJsonModule": true,
"target": "ESNext", "target": "ESNext",
"module": "ESNext",
"strict": true, "strict": true,
"allowJs": true, "allowJs": true,
"forceConsistentCasingInFileNames": true, "forceConsistentCasingInFileNames": true,

View file

@ -5,11 +5,14 @@ import tsconfigPaths from "vite-tsconfig-paths";
installGlobals(); installGlobals();
export default defineConfig({ export default defineConfig((env) => ({
plugins: [ plugins: [
remix({ remix({
ignoredRouteFiles: ["**/.*"], ignoredRouteFiles: ["**/.*"],
}), }),
tsconfigPaths(), tsconfigPaths(),
], ],
}); optimizeDeps: {
exclude: ["react-jsx"],
},
}));