Merge branch 'main' into main

t3-oss · Aug 19, 2024 · e6b9d97 · e6b9d97
2 parents af198f4 + ce9670a
commit e6b9d97
Show file tree

Hide file tree

Showing 22 changed files with 316 additions and 493 deletions.
diff --git a/.changeset/four-dolphins-tie.md b/.changeset/four-dolphins-tie.md
@@ -0,0 +1,5 @@
+---
+"create-t3-app": minor
+---
+
+upgrade to typescript eslint v8
diff --git a/.changeset/quick-laws-breathe.md b/.changeset/quick-laws-breathe.md
@@ -0,0 +1,5 @@
+---
+"create-t3-app": minor
+---
+
+upgrade to drizzle-orm@0.33 and corresponding drizzle-kit version
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -12,12 +12,7 @@ const config = {
     ecmaVersion: "latest",
     sourceType: "module",
     tsconfigRootDir: __dirname,
-    project: [
-      "./tsconfig.json",
-      "./cli/tsconfig.eslint.json", // separate eslint config for the CLI since we want to lint and typecheck differently due to template files
-      "./upgrade/tsconfig.json",
-      "./www/tsconfig.json",
-    ],
+    projectService: true,
   },
   overrides: [
     // Template files don't have reliable type information

diff --git a/cli/package.json b/cli/package.json
@@ -64,8 +64,8 @@
   "devDependencies": {
     "@auth/drizzle-adapter": "^1.1.0",
     "@auth/prisma-adapter": "^1.6.0",
-    "@libsql/client": "^0.6.0",
-    "@planetscale/database": "^1.18.0",
+    "@libsql/client": "^0.9.0",
+    "@planetscale/database": "^1.19.0",
     "@prisma/adapter-planetscale": "^5.14.0",
     "@prisma/client": "^5.14.0",
     "@t3-oss/env-nextjs": "^0.10.1",
@@ -77,9 +77,9 @@
     "@types/fs-extra": "^11.0.4",
     "@types/gradient-string": "^1.1.6",
     "@types/node": "^20.14.10",
-    "drizzle-kit": "^0.21.4",
-    "drizzle-orm": "^0.30.10",
-    "mysql2": "^3.9.7",
+    "drizzle-kit": "^0.24.0",
+    "drizzle-orm": "^0.33.0",
+    "mysql2": "^3.11.0",
     "next": "^14.2.4",
     "next-auth": "^4.24.7",
     "postgres": "^3.4.4",

diff --git a/cli/src/helpers/git.ts b/cli/src/helpers/git.ts
@@ -12,7 +12,7 @@ const isGitInstalled = (dir: string): boolean => {
   try {
     execSync("git --version", { cwd: dir });
     return true;
-  } catch (_e) {
+  } catch {
     return false;
   }
 };
@@ -31,7 +31,7 @@ export const isInsideGitRepo = async (dir: string): Promise<boolean> => {
       stdout: "ignore",
     });
     return true;
-  } catch (_e) {
+  } catch {
     // Else, it will throw a git-error and we return false
     return false;
   }
@@ -125,7 +125,7 @@ export const initializeGit = async (projectDir: string) => {
         "git"
       )}\n`
     );
-  } catch (error) {
+  } catch {
     // Safeguard, should be unreachable
     spinner.fail(
       `${chalk.bold.red(

diff --git a/cli/src/helpers/logNextSteps.ts b/cli/src/helpers/logNextSteps.ts
@@ -23,7 +23,9 @@ export const logNextSteps = async ({
   const pkgManager = getUserPkgManager();
 
   logger.info("Next steps:");
-  projectName !== "." && logger.info(`  cd ${projectName}`);
+  if (projectName !== ".") {
+    logger.info(`  cd ${projectName}`);
+  }
   if (noInstall) {
     // To reflect yarn's default behavior of installing packages when no additional args provided
     if (pkgManager === "yarn") {

diff --git a/cli/src/index.ts b/cli/src/index.ts
@@ -31,7 +31,9 @@ const main = async () => {
   const npmVersion = await getNpmVersion();
   const pkgManager = getUserPkgManager();
   renderTitle();
-  npmVersion && renderVersionWarning(npmVersion);
+  if (npmVersion) {
+    renderVersionWarning(npmVersion);
+  }
 
   const {
     appName,

diff --git a/cli/src/installers/dependencyVersionMap.ts b/cli/src/installers/dependencyVersionMap.ts
@@ -14,13 +14,13 @@ export const dependencyVersionMap = {
   "@prisma/adapter-planetscale": "^5.14.0",
 
   // Drizzle
-  "drizzle-orm": "^0.30.10",
-  "drizzle-kit": "^0.21.4",
+  "drizzle-kit": "^0.24.0",
+  "drizzle-orm": "^0.33.0",
   "eslint-plugin-drizzle": "^0.2.3",
-  mysql2: "^3.9.7",
-  "@planetscale/database": "^1.18.0",
+  mysql2: "^3.11.0",
+  "@planetscale/database": "^1.19.0",
   postgres: "^3.4.4",
-  "@libsql/client": "^0.6.0",
+  "@libsql/client": "^0.9.0",
 
   // TailwindCSS
   tailwindcss: "^3.4.3",

diff --git a/cli/src/utils/renderVersionWarning.ts b/cli/src/utils/renderVersionWarning.ts
@@ -55,12 +55,14 @@ function checkForLatestVersion(): Promise<string> {
               resolve((JSON.parse(body) as DistTagsBody).latest);
             });
           } else {
+            // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
             reject();
           }
         }
       )
       .on("error", () => {
         // logger.error("Unable to check for latest version.");
+        // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
         reject();
       });
   });

diff --git a/cli/template/base/package.json b/cli/template/base/package.json
@@ -22,8 +22,8 @@
     "@types/node": "^20.14.10",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^7.1.1",
-    "@typescript-eslint/parser": "^7.1.1",
+    "@typescript-eslint/eslint-plugin": "^8.1.0",
+    "@typescript-eslint/parser": "^8.1.0",
     "eslint": "^8.57.0",
     "eslint-config-next": "^14.2.4",
     "typescript": "^5.5.3"

diff --git a/cli/tsconfig.eslint.json b/cli/tsconfig.eslint.json
diff --git a/package.json b/package.json
@@ -51,8 +51,8 @@
     "@total-typescript/ts-reset": "^0.3.7",
     "@types/eslint": "^8.56.10",
     "@types/node": "^20.14.10",
-    "@typescript-eslint/eslint-plugin": "^7.15.0",
-    "@typescript-eslint/parser": "^7.15.0",
+    "@typescript-eslint/eslint-plugin": "^8.1.0",
+    "@typescript-eslint/parser": "^8.1.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
@@ -63,5 +63,9 @@
     "prettier": "^3.3.2",
     "turbo": "1.13.3-canary.3",
     "typescript": "^5.5.3"
+  },
+  "resolutions": {
+    "@typescript-eslint/eslint-plugin": "8.1.0",
+    "@typescript-eslint/parser": "8.1.0"
   }
 }