From 737c7f6191b6dfe018923caef6c8bb421cd1408c Mon Sep 17 00:00:00 2001 From: Gustavo Caetano Date: Fri, 10 May 2024 17:08:56 -0300 Subject: [PATCH] fix: Update drizzle config to be up to date with the latest version (#1881) Co-authored-by: juliusmarminge --- .changeset/dirty-tools-rule.md | 5 +++ cli/package.json | 2 +- cli/src/installers/dependencyVersionMap.ts | 2 +- .../extras/config/drizzle-config-mysql.ts | 4 +-- .../extras/config/drizzle-config-postgres.ts | 4 +-- .../extras/config/drizzle-config-sqlite.ts | 2 +- pnpm-lock.yaml | 36 +++---------------- www/src/utils/fetchGithub.ts | 2 +- 8 files changed, 18 insertions(+), 39 deletions(-) create mode 100644 .changeset/dirty-tools-rule.md diff --git a/.changeset/dirty-tools-rule.md b/.changeset/dirty-tools-rule.md new file mode 100644 index 0000000000..0dad264183 --- /dev/null +++ b/.changeset/dirty-tools-rule.md @@ -0,0 +1,5 @@ +--- +"create-t3-app": patch +--- + +chore: update `drizzle-kit` to `0.21.0` diff --git a/cli/package.json b/cli/package.json index 9b89f03d04..378ac58589 100644 --- a/cli/package.json +++ b/cli/package.json @@ -77,7 +77,7 @@ "@types/fs-extra": "^11.0.4", "@types/gradient-string": "^1.1.5", "@types/node": "^20.11.20", - "drizzle-kit": "^0.20.14", + "drizzle-kit": "^0.21.0", "drizzle-orm": "^0.29.4", "mysql2": "^3.9.1", "next": "^14.2.1", diff --git a/cli/src/installers/dependencyVersionMap.ts b/cli/src/installers/dependencyVersionMap.ts index 1fbb1e6037..c94e87de03 100644 --- a/cli/src/installers/dependencyVersionMap.ts +++ b/cli/src/installers/dependencyVersionMap.ts @@ -15,7 +15,7 @@ export const dependencyVersionMap = { // Drizzle "drizzle-orm": "^0.29.4", - "drizzle-kit": "^0.20.14", + "drizzle-kit": "^0.21.0", "eslint-plugin-drizzle": "^0.2.3", mysql2: "^3.9.1", "@planetscale/database": "^1.16.0", diff --git a/cli/template/extras/config/drizzle-config-mysql.ts b/cli/template/extras/config/drizzle-config-mysql.ts index 85f2024fcb..1f71d75432 100644 --- a/cli/template/extras/config/drizzle-config-mysql.ts +++ b/cli/template/extras/config/drizzle-config-mysql.ts @@ -4,9 +4,9 @@ import { env } from "~/env"; export default { schema: "./src/server/db/schema.ts", - driver: "mysql2", + dialect: "mysql", dbCredentials: { - uri: env.DATABASE_URL, + url: env.DATABASE_URL, }, tablesFilter: ["project1_*"], } satisfies Config; diff --git a/cli/template/extras/config/drizzle-config-postgres.ts b/cli/template/extras/config/drizzle-config-postgres.ts index 2c61c40949..d2a21ed74e 100644 --- a/cli/template/extras/config/drizzle-config-postgres.ts +++ b/cli/template/extras/config/drizzle-config-postgres.ts @@ -4,9 +4,9 @@ import { env } from "~/env"; export default { schema: "./src/server/db/schema.ts", - driver: "pg", + dialect: "postgresql", dbCredentials: { - connectionString: env.DATABASE_URL, + url: env.DATABASE_URL, }, tablesFilter: ["project1_*"], } satisfies Config; diff --git a/cli/template/extras/config/drizzle-config-sqlite.ts b/cli/template/extras/config/drizzle-config-sqlite.ts index a9354348cd..34f8fa2405 100644 --- a/cli/template/extras/config/drizzle-config-sqlite.ts +++ b/cli/template/extras/config/drizzle-config-sqlite.ts @@ -4,7 +4,7 @@ import { env } from "~/env"; export default { schema: "./src/server/db/schema.ts", - driver: "libsql", + dialect: "sqlite", dbCredentials: { url: env.DATABASE_URL, }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 981da15636..244e24f59f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -142,8 +142,8 @@ importers: specifier: ^20.11.20 version: 20.11.20 drizzle-kit: - specifier: ^0.20.14 - version: 0.20.14 + specifier: ^0.21.0 + version: 0.21.1 drizzle-orm: specifier: ^0.29.4 version: 0.29.4(@libsql/client@0.6.0)(@planetscale/database@1.16.0)(@types/better-sqlite3@7.6.9)(@types/react@18.2.57)(better-sqlite3@9.4.3)(mysql2@3.9.1)(postgres@3.4.3)(react@18.2.0) @@ -828,9 +828,6 @@ packages: react-dom: optional: true - '@drizzle-team/studio@0.0.39': - resolution: {integrity: sha512-c5Hkm7MmQC2n5qAsKShjQrHoqlfGslB8+qWzsGGZ+2dHMRTNG60UuzalF0h0rvBax5uzPXuGkYLGaQ+TUX3yMw==} - '@emmetio/abbreviation@2.3.3': resolution: {integrity: sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==} @@ -2691,10 +2688,6 @@ packages: resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} - camelcase@7.0.1: - resolution: {integrity: sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==} - engines: {node: '>=14.16'} - camelize@1.0.1: resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==} @@ -3069,8 +3062,8 @@ packages: resolution: {integrity: sha512-vyJTp8+mC+G+5dfgsY+r3ckxlz+QMX40VjPQsZc5gxVAxLmi64TBoVkP54A/pRAXMXsbu2GMMBrZPxNv23waMg==} engines: {node: '>=0.4.0'} - drizzle-kit@0.20.14: - resolution: {integrity: sha512-0fHv3YIEaUcSVPSGyaaBfOi9bmpajjhbJNdPsRMIUvYdLVxBu9eGjH8mRc3Qk7HVmEidFc/lhG1YyJhoXrn5yA==} + drizzle-kit@0.21.1: + resolution: {integrity: sha512-Sp7OnCdROiE2ebMuHsAfrnRoHVGYCvErQxUh7/0l6R1caHssZu9oZu/hW9rLU19xnTK4/y3iSe3sL0Cc530wCg==} hasBin: true drizzle-orm@0.29.4: @@ -4640,10 +4633,6 @@ packages: resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==} engines: {node: '>=10'} - minimatch@7.4.6: - resolution: {integrity: sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==} - engines: {node: '>=10'} - minimatch@9.0.3: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} engines: {node: '>=16 || 14 >=14.17'} @@ -7115,10 +7104,6 @@ snapshots: transitivePeerDependencies: - '@algolia/client-search' - '@drizzle-team/studio@0.0.39': - dependencies: - superjson: 2.2.1 - '@emmetio/abbreviation@2.3.3': dependencies: '@emmetio/scanner': 1.0.4 @@ -9048,8 +9033,6 @@ snapshots: camelcase@6.3.0: {} - camelcase@7.0.1: {} - camelize@1.0.1: {} caniuse-lite@1.0.30001515: {} @@ -9379,12 +9362,9 @@ snapshots: dependencies: wordwrap: 1.0.0 - drizzle-kit@0.20.14: + drizzle-kit@0.21.1: dependencies: - '@drizzle-team/studio': 0.0.39 '@esbuild-kit/esm-loader': 2.5.5 - camelcase: 7.0.1 - chalk: 5.2.0 commander: 9.5.0 env-paths: 3.0.0 esbuild: 0.19.10 @@ -9392,8 +9372,6 @@ snapshots: glob: 8.1.0 hanji: 0.0.5 json-diff: 0.9.0 - minimatch: 7.4.6 - semver: 7.5.4 zod: 3.23.3 transitivePeerDependencies: - supports-color @@ -11532,10 +11510,6 @@ snapshots: dependencies: brace-expansion: 2.0.1 - minimatch@7.4.6: - dependencies: - brace-expansion: 2.0.1 - minimatch@9.0.3: dependencies: brace-expansion: 2.0.1 diff --git a/www/src/utils/fetchGithub.ts b/www/src/utils/fetchGithub.ts index 5166451b60..6684272565 100644 --- a/www/src/utils/fetchGithub.ts +++ b/www/src/utils/fetchGithub.ts @@ -48,7 +48,7 @@ export const fetchGithub = async ( console.warn(msg); const response = await fetch(url); - const data = await response.json(); + const data = (await response.json()) as Promise; const parsed = schema.safeParse(data); if (!parsed.success) {