chore: update some deps, fix tsconfig, import env path (t3-oss#1775)

mittalsam98 · Feb 22, 2024 · e8dad95 · e8dad95
1 parent 8f29eb9
commit e8dad95
Show file tree

Hide file tree

Showing 21 changed files with 859 additions and 630 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -62,34 +62,38 @@
  "sort-package-json": "^2.4.1"
  },
  "devDependencies": {
- "@auth/drizzle-adapter": "^0.3.6",
- "@next-auth/prisma-adapter": "^1.0.7",
+ "@auth/drizzle-adapter": "^0.7.0",
+ "@auth/prisma-adapter": "^1.4.0",
  "@planetscale/database": "^1.16.0",
- "@prisma/adapter-planetscale": "^5.6.0",
- "@prisma/client": "^5.6.0",
- "@t3-oss/env-nextjs": "^0.7.1",
+ "@prisma/adapter-planetscale": "^5.10.2",
+ "@prisma/client": "^5.10.2",
+ "@t3-oss/env-nextjs": "^0.9.2",
  "@tanstack/react-query": "^4.36.1",
- "@trpc/client": "^10.43.6",
- "@trpc/next": "^10.43.6",
- "@trpc/react-query": "^10.43.6",
- "@trpc/server": "^10.43.6",
- "@types/fs-extra": "^11.0.1",
- "@types/gradient-string": "^1.1.2",
- "@types/node": "^18.17.0",
+ "@trpc/client": "^10.45.1",
+ "@trpc/next": "^10.45.1",
+ "@trpc/react-query": "^10.45.1",
+ "@trpc/server": "^10.45.1",
+ "@types/better-sqlite3": "^7.6.9",
+ "@types/fs-extra": "^11.0.4",
+ "@types/gradient-string": "^1.1.5",
+ "@types/node": "^20.11.20",
+ "better-sqlite3": "^9.4.3",
  "drizzle-kit": "^0.20.14",
  "drizzle-orm": "^0.29.4",
- "next": "^14.0.3",
- "next-auth": "^4.24.5",
- "prettier": "^3.1.0",
- "prettier-plugin-tailwindcss": "^0.5.7",
- "prisma": "^5.6.0",
+ "mysql2": "^3.9.1",
+ "next": "^14.1.0",
+ "next-auth": "^4.24.6",
+ "postgres": "^3.4.3",
+ "prettier": "^3.2.5",
+ "prettier-plugin-tailwindcss": "^0.5.11",
+ "prisma": "^5.10.2",
  "react": "18.2.0",
  "react-dom": "18.2.0",
  "superjson": "^2.2.1",
- "tailwindcss": "^3.3.5",
+ "tailwindcss": "^3.4.1",
  "tsup": "^6.7.0",
  "type-fest": "^3.7.0",
- "typescript": "^5.0.4",
+ "typescript": "^5.3.3",
  "zod": "^3.22.4"
  }
 }
diff --git a/cli/src/installers/dependencyVersionMap.ts b/cli/src/installers/dependencyVersionMap.ts
@@ -4,37 +4,36 @@
  */
 export const dependencyVersionMap = {
  // NextAuth.js
- "next-auth": "^4.24.5",
- "@next-auth/prisma-adapter": "^1.0.7",
- "@auth/drizzle-adapter": "^0.3.6",
+ "next-auth": "^4.24.6",
+ "@auth/prisma-adapter": "^1.4.0",
+ "@auth/drizzle-adapter": "^0.7.0",
 
  // Prisma
- prisma: "^5.6.0",
- "@prisma/client": "^5.6.0",
- "@prisma/adapter-planetscale": "^5.6.0",
+ prisma: "^5.10.2",
+ "@prisma/client": "^5.10.2",
+ "@prisma/adapter-planetscale": "^5.10.2",
 
  // Drizzle
  "drizzle-orm": "^0.29.4",
  "drizzle-kit": "^0.20.14",
- mysql2: "^3.6.1",
+ mysql2: "^3.9.1",
  "@planetscale/database": "^1.16.0",
  postgres: "^3.4.3",
  pg: "^8.11.3",
- "@types/better-sqlite3": "^7.6.6",
- "better-sqlite3": "^9.0.0",
+ "@types/better-sqlite3": "^7.6.9",
+ "better-sqlite3": "^9.4.3",
 
  // TailwindCSS
- tailwindcss: "^3.3.5",
- autoprefixer: "^10.4.14",
- postcss: "^8.4.31",
- prettier: "^3.1.0",
- "prettier-plugin-tailwindcss": "^0.5.7",
+ tailwindcss: "^3.4.1",
+ postcss: "^8.4.34",
+ prettier: "^3.2.5",
+ "prettier-plugin-tailwindcss": "^0.5.11",
 
  // tRPC
- "@trpc/client": "^10.43.6",
- "@trpc/server": "^10.43.6",
- "@trpc/react-query": "^10.43.6",
- "@trpc/next": "^10.43.6",
+ "@trpc/client": "^10.45.1",
+ "@trpc/server": "^10.45.1",
+ "@trpc/react-query": "^10.45.1",
+ "@trpc/next": "^10.45.1",
  "@tanstack/react-query": "^4.36.1",
  superjson: "^2.2.1",
  "server-only": "^0.0.1",

diff --git a/cli/src/installers/nextAuth.ts b/cli/src/installers/nextAuth.ts
@@ -15,7 +15,7 @@ export const nextAuthInstaller: Installer = ({
  const usingDrizzle = packages?.drizzle.inUse;
 
  const deps: AvailableDependencies[] = ["next-auth"];
- if (usingPrisma) deps.push("@next-auth/prisma-adapter");
+ if (usingPrisma) deps.push("@auth/prisma-adapter");
  if (usingDrizzle) deps.push("@auth/drizzle-adapter");
 
  addPackageDependency({

diff --git a/cli/src/installers/tailwind.ts b/cli/src/installers/tailwind.ts
@@ -11,7 +11,6 @@ export const tailwindInstaller: Installer = ({ projectDir }) => {
  dependencies: [
  "tailwindcss",
  "postcss",
- "autoprefixer",
  "prettier",
  "prettier-plugin-tailwindcss",
  ],

diff --git a/cli/template/base/package.json b/cli/template/base/package.json
@@ -10,21 +10,21 @@
  "lint": "next lint"
  },
  "dependencies": {
- "@t3-oss/env-nextjs": "^0.7.1",
- "next": "^14.0.4",
+ "@t3-oss/env-nextjs": "^0.9.2",
+ "next": "^14.1.0",
  "react": "18.2.0",
  "react-dom": "18.2.0",
  "zod": "^3.22.4"
  },
  "devDependencies": {
- "@types/eslint": "^8.44.7",
- "@types/node": "^18.17.0",
- "@types/react": "^18.2.37",
- "@types/react-dom": "^18.2.15",
- "@typescript-eslint/eslint-plugin": "^6.11.0",
- "@typescript-eslint/parser": "^6.11.0",
- "eslint": "^8.54.0",
- "eslint-config-next": "^14.0.4",
- "typescript": "^5.1.6"
+ "@types/eslint": "^8.56.2",
+ "@types/node": "^20.11.20",
+ "@types/react": "^18.2.57",
+ "@types/react-dom": "^18.2.19",
+ "@typescript-eslint/eslint-plugin": "^7.0.2",
+ "@typescript-eslint/parser": "^7.0.2",
+ "eslint": "^8.56.0",
+ "eslint-config-next": "^14.1.0",
+ "typescript": "^5.3.3"
  }
 }
diff --git a/cli/template/extras/config/drizzle-config-postgres.ts b/cli/template/extras/config/drizzle-config-postgres.ts
@@ -1,6 +1,6 @@
 import { type Config } from "drizzle-kit";
 
-import { env } from "~/env.js";
+import { env } from "~/env";
 
 export default {
  schema: "./src/server/db/schema.ts",

diff --git a/cli/template/extras/config/drizzle-config-sqlite.ts b/cli/template/extras/config/drizzle-config-sqlite.ts
@@ -1,6 +1,6 @@
 import { type Config } from "drizzle-kit";
 
-import { env } from "~/env.js";
+import { env } from "~/env";
 
 export default {
  schema: "./src/server/db/schema.ts",

diff --git a/cli/template/extras/config/postcss.config.cjs b/cli/template/extras/config/postcss.config.cjs
@@ -1,7 +1,6 @@
 const config = {
  plugins: {
  tailwindcss: {},
- autoprefixer: {},
  },
 };
 

diff --git a/cli/template/extras/src/server/auth-app/with-prisma.ts b/cli/template/extras/src/server/auth-app/with-prisma.ts
@@ -1,9 +1,10 @@
-import { PrismaAdapter } from "@next-auth/prisma-adapter";
+import { PrismaAdapter } from "@auth/prisma-adapter";
 import {
  getServerSession,
  type DefaultSession,
  type NextAuthOptions,
 } from "next-auth";
+import { type Adapter } from "next-auth/adapters";
 import DiscordProvider from "next-auth/providers/discord";
 
 import { env } from "~/env";
@@ -45,7 +46,7 @@ export const authOptions: NextAuthOptions = {
  },
  }),
  },
- adapter: PrismaAdapter(db),
+ adapter: PrismaAdapter(db) as Adapter,
  providers: [
  DiscordProvider({
  clientId: env.DISCORD_CLIENT_ID,

diff --git a/cli/template/extras/src/server/auth-pages/with-prisma.ts b/cli/template/extras/src/server/auth-pages/with-prisma.ts
@@ -1,10 +1,11 @@
-import { PrismaAdapter } from "@next-auth/prisma-adapter";
+import { PrismaAdapter } from "@auth/prisma-adapter";
 import { type GetServerSidePropsContext } from "next";
 import {
  getServerSession,
  type DefaultSession,
  type NextAuthOptions,
 } from "next-auth";
+import { type Adapter } from "next-auth/adapters";
 import DiscordProvider from "next-auth/providers/discord";
 
 import { env } from "~/env";
@@ -46,7 +47,7 @@ export const authOptions: NextAuthOptions = {
  },
  }),
  },
- adapter: PrismaAdapter(db),
+ adapter: PrismaAdapter(db) as Adapter,
  providers: [
  DiscordProvider({
  clientId: env.DISCORD_CLIENT_ID,

diff --git a/cli/template/extras/src/server/db/index-drizzle/with-mysql.ts b/cli/template/extras/src/server/db/index-drizzle/with-mysql.ts
@@ -1,7 +1,7 @@
 import { drizzle } from "drizzle-orm/mysql2";
 import mysql from "mysql2/promise";
 
-import { env } from "~/env.js";
+import { env } from "~/env";
 import * as schema from "./schema";
 
 export const db = drizzle(

diff --git a/cli/template/extras/src/server/db/index-drizzle/with-postgres.ts b/cli/template/extras/src/server/db/index-drizzle/with-postgres.ts
@@ -1,7 +1,7 @@
 import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
 
-import { env } from "~/env.js";
+import { env } from "~/env";
 import * as schema from "./schema";
 
 export const db = drizzle(postgres(env.DATABASE_URL), { schema });
diff --git a/cli/template/extras/src/server/db/index-drizzle/with-sqlite.ts b/cli/template/extras/src/server/db/index-drizzle/with-sqlite.ts
@@ -1,7 +1,7 @@
 import Database from "better-sqlite3";
 import { drizzle } from "drizzle-orm/better-sqlite3";
 
-import { env } from "~/env.js";
+import { env } from "~/env";
 import * as schema from "./schema";
 
 export const db = drizzle(

diff --git a/package.json b/package.json
@@ -49,20 +49,20 @@
  "@changesets/cli": "^2.26.1",
  "@manypkg/cli": "^0.20.0",
  "@total-typescript/ts-reset": "^0.3.7",
- "@types/eslint": "^8.37.0",
- "@types/node": "^18.17.0",
- "@typescript-eslint/eslint-plugin": "6.0.0",
- "@typescript-eslint/parser": "6.0.0",
- "eslint": "^8.40.0",
+ "@types/eslint": "^8.56.2",
+ "@types/node": "^20.11.20",
+ "@typescript-eslint/eslint-plugin": "7.0.2",
+ "@typescript-eslint/parser": "7.0.2",
+ "eslint": "^8.56.0",
  "eslint-config-prettier": "^9.0.0",
  "eslint-config-turbo": "^0.0.9",
  "eslint-plugin-import": "^2.27.5",
  "eslint-plugin-isaacscript": "^2.6.7",
  "eslint-plugin-prettier": "^5.0.1",
  "eslint-plugin-react": "^7.32.2",
  "eslint-plugin-react-hooks": "^4.6.0",
- "prettier": "^3.1.0",
+ "prettier": "^3.2.5",
  "turbo": "^1.9.6",
- "typescript": "^5.0.4"
+ "typescript": "^5.3.3"
  }
 }