diff --git a/.changeset/twelve-ideas-raise.md b/.changeset/twelve-ideas-raise.md new file mode 100644 index 000000000..6b5c8f158 --- /dev/null +++ b/.changeset/twelve-ideas-raise.md @@ -0,0 +1,9 @@ +--- +'@halfdomelabs/fastify-generators': patch +--- + +Upgrade Prisma to 6.5.0 + +See +https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6 +for migration instructions diff --git a/packages/fastify-generators/package.json b/packages/fastify-generators/package.json index 1e0bee81c..b4c91f08a 100644 --- a/packages/fastify-generators/package.json +++ b/packages/fastify-generators/package.json @@ -37,7 +37,7 @@ "@halfdomelabs/core-generators": "workspace:*", "@halfdomelabs/sync": "workspace:*", "@halfdomelabs/utils": "workspace:*", - "@prisma/internals": "5.7.1", + "@prisma/internals": "6.5.0", "change-case": "5.4.4", "es-toolkit": "1.31.0", "indent-string": "5.0.0", diff --git a/packages/fastify-generators/src/constants/fastify-packages.ts b/packages/fastify-generators/src/constants/fastify-packages.ts index 88380aebf..c2d1ba664 100644 --- a/packages/fastify-generators/src/constants/fastify-packages.ts +++ b/packages/fastify-generators/src/constants/fastify-packages.ts @@ -37,9 +37,8 @@ export const FASTIFY_PACKAGES = { '@bull-board/fastify': '6.5.3', // Prisma - '@prisma/client': '5.19.1', - '@prisma/instrumentation': '5.19.1', - prisma: '5.19.1', + '@prisma/client': '6.5.0', + prisma: '6.5.0', // Utils ms: '2.1.3', diff --git a/packages/fastify-generators/src/generators/prisma/prisma/index.ts b/packages/fastify-generators/src/generators/prisma/prisma/index.ts index 4b3a0909b..6508f51e4 100644 --- a/packages/fastify-generators/src/generators/prisma/prisma/index.ts +++ b/packages/fastify-generators/src/generators/prisma/prisma/index.ts @@ -101,8 +101,6 @@ export const prismaGenerator = createGenerator({ }) { node.addDevPackages({ prisma: FASTIFY_PACKAGES.prisma, - '@prisma/instrumentation': - FASTIFY_PACKAGES['@prisma/instrumentation'], }); node.addPackages({ @@ -126,9 +124,6 @@ export const prismaGenerator = createGenerator({ createPrismaSchemaGeneratorBlock({ name: 'client', provider: 'prisma-client-js', - additionalOptions: { - previewFeatures: '["tracing"]', - }, }), ); @@ -178,8 +173,8 @@ export const prismaGenerator = createGenerator({ const { formatSchema: format } = internalRequire( '@prisma/internals', ) as { formatSchema: typeof formatSchema }; - const formattedSchemaText = await format({ - schema: schemaText, + const [[, formattedSchemaText]] = await format({ + schemas: [['prisma/schema.prisma', schemaText]], }); builder.writeFile({ id: 'prisma-schema', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 533c726ba..916d2c48d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -283,8 +283,8 @@ importers: specifier: workspace:* version: link:../utils '@prisma/internals': - specifier: 5.7.1 - version: 5.7.1 + specifier: 6.5.0 + version: 6.5.0(typescript@5.5.4) change-case: specifier: 5.4.4 version: 5.4.4 @@ -2046,29 +2046,40 @@ packages: engines: {node: '>=18'} hasBin: true - '@prisma/debug@5.7.1': - resolution: {integrity: sha512-yrVSO/YZOxdeIxcBtZ5BaNqUfPrZkNsAKQIQg36cJKMxj/VYK3Vk5jMKkI+gQLl0KReo1YvX8GWKfV788SELjw==} + '@prisma/config@6.5.0': + resolution: {integrity: sha512-sOH/2Go9Zer67DNFLZk6pYOHj+rumSb0VILgltkoxOjYnlLqUpHPAN826vnx8HigqnOCxj9LRhT6U7uLiIIWgw==} - '@prisma/engines-version@5.7.1-1.0ca5ccbcfa6bdc81c003cf549abe4269f59c41e5': - resolution: {integrity: sha512-dIR5IQK/ZxEoWRBDOHF87r1Jy+m2ih3Joi4vzJRP+FOj5yxCwS2pS5SBR3TWoVnEK1zxtLI/3N7BjHyGF84fgw==} + '@prisma/debug@6.5.0': + resolution: {integrity: sha512-fc/nusYBlJMzDmDepdUtH9aBsJrda2JNErP9AzuHbgUEQY0/9zQYZdNlXmKoIWENtio+qarPNe/+DQtrX5kMcQ==} - '@prisma/engines@5.7.1': - resolution: {integrity: sha512-R+Pqbra8tpLP2cvyiUpx+SIKglav3nTCpA+rn6826CThviQ8yvbNG0s8jNpo51vS9FuZO3pOkARqG062vKX7uA==} + '@prisma/engines-version@6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60': + resolution: {integrity: sha512-iK3EmiVGFDCmXjSpdsKGNqy9hOdLnvYBrJB61far/oP03hlIxrb04OWmDjNTwtmZ3UZdA5MCvI+f+3k2jPTflQ==} - '@prisma/fetch-engine@5.7.1': - resolution: {integrity: sha512-9ELauIEBkIaEUpMIYPRlh5QELfoC6pyHolHVQgbNxglaINikZ9w9X7r1TIePAcm05pCNp2XPY1ObQIJW5nYfBQ==} + '@prisma/engines@6.5.0': + resolution: {integrity: sha512-FVPQYHgOllJklN9DUyujXvh3hFJCY0NX86sDmBErLvoZjy2OXGiZ5FNf3J/C4/RZZmCypZBYpBKEhx7b7rEsdw==} - '@prisma/generator-helper@5.7.1': - resolution: {integrity: sha512-BiaCt3YtMnjAoqJ51rVSkvlPk0p7ErjmgFOjRUmAE/m75E9tJmFtgT6NWzXiX6KWs2OvnVuAqNY7imK6ZwlExA==} + '@prisma/fetch-engine@6.5.0': + resolution: {integrity: sha512-3LhYA+FXP6pqY8FLHCjewyE8pGXXJ7BxZw2rhPq+CZAhvflVzq4K8Qly3OrmOkn6wGlz79nyLQdknyCG2HBTuA==} - '@prisma/get-platform@5.7.1': - resolution: {integrity: sha512-eDlswr3a1m5z9D/55Iyt/nZqS5UpD+DZ9MooBB3hvrcPhDQrcf9m4Tl7buy4mvAtrubQ626ECtb8c6L/f7rGSQ==} + '@prisma/generator-helper@6.5.0': + resolution: {integrity: sha512-71ELYxnSE4soeV0BlWJEMgO4KkCowuzHsPY3o7quFOtlcmds5ZX190VZK/k9HMJWdPQ893HooBv3BkKvieR7vA==} - '@prisma/internals@5.7.1': - resolution: {integrity: sha512-kOKzfPYcOh25h48H/WLNnQzrcV54U4/0ORsagF7ude28RziB4mvlwGtjcEaQVhzGV1eFV5Ir8jtDtNUPAKuikA==} + '@prisma/get-platform@6.5.0': + resolution: {integrity: sha512-xYcvyJwNMg2eDptBYFqFLUCfgi+wZLcj6HDMsj0Qw0irvauG4IKmkbywnqwok0B+k+W+p+jThM2DKTSmoPCkzw==} - '@prisma/prisma-schema-wasm@5.7.1-1.0ca5ccbcfa6bdc81c003cf549abe4269f59c41e5': - resolution: {integrity: sha512-woHCFsEQ8DyYT9mTlO++iWSw9WP7cVtH2d3P4VQ521qQlPCUpozEbFszyCLkRJPXcGi4ci9J6v4mw/v5RsdDzA==} + '@prisma/internals@6.5.0': + resolution: {integrity: sha512-4hI114ho/BVvxSIZ7lQB3TPxGrSnt5+aYhKMzQU5+l659Qcjjiz56hZ/rXph3xIlgJUWVQyzwAS9/ZAMgXUySw==} + peerDependencies: + typescript: '>=5.1.0' + peerDependenciesMeta: + typescript: + optional: true + + '@prisma/prisma-schema-wasm@6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60': + resolution: {integrity: sha512-8zmXO5Luw5sCOgTw9nyN4/x7MgmIUUt/9zQZPPStiMUhZsXH72oqFwYJlibdS77gDuH2+DXgSRv6aPleDdTMsQ==} + + '@prisma/schema-files-loader@6.5.0': + resolution: {integrity: sha512-BE+YPIcqXx+9MkPsA/mACz3rGhKUfh5rsoGe1Male/0c9my9CaHKzJFxNAV4f70d6GTMMITQgFpwfrudGFOwpw==} '@protobufjs/aspromise@1.1.2': resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==} @@ -4269,8 +4280,8 @@ packages: fs-constants@1.0.0: resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} - fs-extra@11.2.0: - resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==} + fs-extra@11.3.0: + resolution: {integrity: sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==} engines: {node: '>=14.14'} fs-extra@7.0.1: @@ -7481,43 +7492,61 @@ snapshots: dependencies: playwright: 1.51.0 - '@prisma/debug@5.7.1': {} + '@prisma/config@6.5.0': + dependencies: + esbuild: 0.25.1 + esbuild-register: 3.6.0(esbuild@0.25.1) + transitivePeerDependencies: + - supports-color + + '@prisma/debug@6.5.0': {} - '@prisma/engines-version@5.7.1-1.0ca5ccbcfa6bdc81c003cf549abe4269f59c41e5': {} + '@prisma/engines-version@6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60': {} - '@prisma/engines@5.7.1': + '@prisma/engines@6.5.0': dependencies: - '@prisma/debug': 5.7.1 - '@prisma/engines-version': 5.7.1-1.0ca5ccbcfa6bdc81c003cf549abe4269f59c41e5 - '@prisma/fetch-engine': 5.7.1 - '@prisma/get-platform': 5.7.1 + '@prisma/debug': 6.5.0 + '@prisma/engines-version': 6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60 + '@prisma/fetch-engine': 6.5.0 + '@prisma/get-platform': 6.5.0 - '@prisma/fetch-engine@5.7.1': + '@prisma/fetch-engine@6.5.0': dependencies: - '@prisma/debug': 5.7.1 - '@prisma/engines-version': 5.7.1-1.0ca5ccbcfa6bdc81c003cf549abe4269f59c41e5 - '@prisma/get-platform': 5.7.1 + '@prisma/debug': 6.5.0 + '@prisma/engines-version': 6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60 + '@prisma/get-platform': 6.5.0 - '@prisma/generator-helper@5.7.1': + '@prisma/generator-helper@6.5.0': dependencies: - '@prisma/debug': 5.7.1 + '@prisma/debug': 6.5.0 - '@prisma/get-platform@5.7.1': + '@prisma/get-platform@6.5.0': dependencies: - '@prisma/debug': 5.7.1 + '@prisma/debug': 6.5.0 - '@prisma/internals@5.7.1': + '@prisma/internals@6.5.0(typescript@5.5.4)': dependencies: - '@prisma/debug': 5.7.1 - '@prisma/engines': 5.7.1 - '@prisma/fetch-engine': 5.7.1 - '@prisma/generator-helper': 5.7.1 - '@prisma/get-platform': 5.7.1 - '@prisma/prisma-schema-wasm': 5.7.1-1.0ca5ccbcfa6bdc81c003cf549abe4269f59c41e5 + '@prisma/config': 6.5.0 + '@prisma/debug': 6.5.0 + '@prisma/engines': 6.5.0 + '@prisma/fetch-engine': 6.5.0 + '@prisma/generator-helper': 6.5.0 + '@prisma/get-platform': 6.5.0 + '@prisma/prisma-schema-wasm': 6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60 + '@prisma/schema-files-loader': 6.5.0 arg: 5.0.2 prompts: 2.4.2 + optionalDependencies: + typescript: 5.5.4 + transitivePeerDependencies: + - supports-color - '@prisma/prisma-schema-wasm@5.7.1-1.0ca5ccbcfa6bdc81c003cf549abe4269f59c41e5': {} + '@prisma/prisma-schema-wasm@6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60': {} + + '@prisma/schema-files-loader@6.5.0': + dependencies: + '@prisma/prisma-schema-wasm': 6.5.0-73.173f8d54f8d52e692c7e27e72a88314ec7aeff60 + fs-extra: 11.3.0 '@protobufjs/aspromise@1.1.2': {} @@ -9237,7 +9266,7 @@ snapshots: debounce: 2.0.0 debug: 4.4.0 duplexer: 0.1.2 - fs-extra: 11.2.0 + fs-extra: 11.3.0 glob: 10.4.5 glob2base: 0.0.12 ignore: 5.3.2 @@ -10016,7 +10045,7 @@ snapshots: fs-constants@1.0.0: {} - fs-extra@11.2.0: + fs-extra@11.3.0: dependencies: graceful-fs: 4.2.11 jsonfile: 6.1.0