feat: upgrade prisma to 2.19.0 #130

code-jenn-or · 2021-03-23T23:50:06Z

This PR upgrades Prisma to take advantage of the latest migrations and features available.

Changes

Resets the Migrations to the new SQL format
Updates the the schema to match the new nexus-prisma-plugin format
Updates the db context accessors to utilize the updates findUnique instead of findOne

Screenshots

(prefer animated gif)

Checklist

Requires dependency update?
Generating a new app works

Fixes #xxx

mthomps4 · 2021-03-25T18:58:30Z

packages/create-bison-app/template/package.json.ejs

-    "db:migrate": "yarn -s prisma migrate up --experimental && yarn build:prisma",
-    "db:rollback": "yarn prisma migrate down --experimental && yarn build:prisma",
+    "db:migrate": "yarn -s prisma migrate deploy && yarn build:prisma",
+    "db:rollback": "yarn prisma migrate reset && yarn build:prisma",


Is reset correct here?
I think of reset as a Full Reset, not a single rollback?

e.g.
db:reset
db:rollback

That is great feedback! I think we should rename it. It does actually do a full reset and replays migrations. I need to dig back through but there wasn't a rollback per say, I think you literally need to reverse the SQL migration or do via a migration.

@cmejet

Weird... that seems like an oversight on their part.

--

Actually just realized the new SQL migrations aren't in an up/down flow.
Maybe they add that in the next run... 🙏🏼

--

I would def rename this to reset if that is the case.
We can figure out what a true rollback looks like later. 👍🏼

A good article I found as well about this specifically. I also like that they made a change that when you call reset it will run the seed file if it detects it there.

https://www.prisma.io/docs/concepts/components/prisma-migrate/prisma-migrate-limitations-issues#lack-of-rollbacks--down-migrations

After thinking about this more and chatting with Cory on Nest/CS work -- I get the reasoning... Still feels odd, but I get it.

mthomps4 · 2021-03-25T19:00:22Z

...s/create-bison-app/template/prisma/migrations/20210322221918_initial-migration/migration.sql

+-- CreateEnum
+CREATE TYPE "Role" AS ENUM ('ADMIN', 'USER');
+
+-- CreateTable
+CREATE TABLE "Profile" (
+    "id" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "firstName" TEXT NOT NULL,
+    "lastName" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "User" (
+    "id" TEXT NOT NULL,
+    "email" TEXT NOT NULL,
+    "password" TEXT NOT NULL,
+    "roles" "Role"[],
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Profile.userId_unique" ON "Profile"("userId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User.email_unique" ON "User"("email");
+
+-- AddForeignKey
+ALTER TABLE "Profile" ADD FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;


* feat:upgrade chakra from RC to stable release * lock cross-fetch version * lock version of chakra

code-jenn-or · 2021-03-31T01:05:12Z

packages/create-bison-app/template/graphql/context.ts

@@ -16,7 +16,7 @@ export async function createContext(context: ApolloApiContext): Promise<Context>
  let user: User | null = null;

  if (authHeader) {
-    user = await prisma.user.findOne({ where: { id: authHeader.userId } });
+    user = await prisma.user.findUnique({ where: { id: authHeader.userId } });


This is a syntax change with the newest Prisma

💯 had to do this recently in the CITJS repo as well

code-jenn-or · 2021-03-31T01:05:36Z

packages/create-bison-app/template/_templates/graphql/new/graphql.ejs

@@ -3,7 +3,7 @@ to: graphql/modules/<%= name %>.ts
 ---
 <% camelized = h.inflection.camelize(name) -%>
 <% plural = h.inflection.pluralize(camelized) -%>
-import { objectType, extendType } from '@nexus/schema';
+import { objectType, extendType } from 'nexus';


Library @nexus/schema was deprecated and moved to nexus

code-jenn-or · 2021-03-31T01:06:17Z

packages/create-bison-app/template/graphql/modules/user.ts.ejs

@@ -178,6 +178,6 @@ export const SignupInput = inputObjectType({
  definition: (t) => {
    t.string('email', { required: true });
    t.string('password', { required: true });
-    t.field('profile', { type: 'ProfileCreateOneWithoutUserInput' });
+    t.field('profile', { type: 'ProfileCreateNestedOneWithoutUserInput' });


Another syntax change with latest Prisma, discovered through build error and tracking down type generations

code-jenn-or · 2021-03-31T01:07:40Z

packages/create-bison-app/template/graphql/schema.ts

@@ -13,6 +13,7 @@ export const schema = makeSchema({
  types,
  plugins: [
    fieldAuthorizePlugin(),
+    declarativeWrappingPlugin(),


This was required to add to the configuration in order to satisfy some of the current schema definitions we had.
https://nexusjs.org/docs/plugins/declarativeWrapping

code-jenn-or · 2021-03-31T01:08:19Z

packages/create-bison-app/template/graphql/schema.ts

        alias: 'db',
      },
      {
-        source: path.join(currentDirectory, 'graphql', 'context.ts'),
+        module: path.join(currentDirectory, 'graphql', 'context.ts'),


This is the updated config Syntax, not documented well for the migration

code-jenn-or · 2021-03-31T01:09:18Z

packages/create-bison-app/template/package.json.ejs

@@ -6,14 +6,15 @@
  "cacheDirectories": [".next/cache"],
 <% } -%>
  "scripts": {
-    "build": "ts-node ./scripts/buildProd",
+    "build": "node ./scripts/buildProd",


Updated to a js file due to build errors that started occurring. The script did not appear to need to be typescript as it was already using exports.module syntax and an empty export.

I fixed this in the CITJS repo by overriding the module definition in the CLI params:

"ts-node": "ts-node --compiler-options '{\"module\":\"CommonJS\"}'",

Prisma has some notes on this:

https://www.prisma.io/docs/guides/application-lifecycle/seed-database#set-up-seeding-in-typescript

code-jenn-or · 2021-03-31T01:10:39Z

packages/create-bison-app/template/package.json.ejs

-    "db:rollback": "yarn prisma migrate down --experimental && yarn build:prisma",
+    "db:migrate": "yarn -s prisma migrate dev && yarn build:prisma",
+    "db:deploy": "yarn -s primsa deploy && yarn build:prisma",
+    "db:reset": "yarn prisma migrate reset && yarn build:prisma",


Prisma no longer offers a direct rollback feature or migrate down so we renamed the script to match the functionality which resets the database and then runs the seed file if found. This is intended to be used on dev only, not on production database.

code-jenn-or · 2021-03-31T01:11:03Z

packages/create-bison-app/template/package.json.ejs

-    "db:migrate": "yarn -s prisma migrate up --experimental && yarn build:prisma",
-    "db:rollback": "yarn prisma migrate down --experimental && yarn build:prisma",
+    "db:migrate": "yarn -s prisma migrate dev && yarn build:prisma",
+    "db:deploy": "yarn -s primsa deploy && yarn build:prisma",


Prisma no longer uses the migrate up command and instead favors deploy

code-jenn-or · 2021-03-31T01:11:24Z

packages/create-bison-app/template/package.json.ejs

@@ -22,7 +23,7 @@
    "g:component": "hygen component new --name",
    "g:graphql": "hygen graphql new --name",
    "g:page": "hygen page new --name",
-    "g:migration": "yarn -s prisma migrate save --experimental",
+    "g:migration": "yarn -s prisma migrate dev",


Updated syntax for prisma 2.19.0

code-jenn-or · 2021-03-31T01:11:52Z

packages/create-bison-app/template/package.json.ejs

    "start-server-and-test": "^1.11.2",
    "supertest": "^4.0.2",
    "ts-jest": "^26.1.3",
    "ts-node-dev": "^1.0.0",
-    "typescript": "^3.9.7"
+    "typescript": "^4.1.3"


Updated to match peer dependencies.

code-jenn-or · 2021-03-31T01:12:56Z

packages/create-bison-app/template/tsconfig.json

@@ -8,7 +8,7 @@
    "forceConsistentCasingInFileNames": true,
    "noEmit": true,
    "esModuleInterop": true,
-    "module": "esnext",
+    "module": "commonjs",


All other tsconfig files are using commonjs and this started creating a build error when running buildProd, it was not happy with the empty export.

See my comment above, you can still set this to esnext and override at the command level

mcavaliere

Small comments - only blocking change I see is trying the commonjs override so we can keep using ts-node for the build script.

mcavaliere · 2021-03-31T12:58:44Z

packages/create-bison-app/template/graphql/context.ts

@@ -16,7 +16,7 @@ export async function createContext(context: ApolloApiContext): Promise<Context>
  let user: User | null = null;

  if (authHeader) {
-    user = await prisma.user.findOne({ where: { id: authHeader.userId } });
+    user = await prisma.user.findUnique({ where: { id: authHeader.userId } });


💯 had to do this recently in the CITJS repo as well

mcavaliere · 2021-03-31T13:02:31Z

packages/create-bison-app/template/package.json.ejs

@@ -6,14 +6,15 @@
  "cacheDirectories": [".next/cache"],
 <% } -%>
  "scripts": {
-    "build": "ts-node ./scripts/buildProd",
+    "build": "node ./scripts/buildProd",


I fixed this in the CITJS repo by overriding the module definition in the CLI params:

"ts-node": "ts-node --compiler-options '{\"module\":\"CommonJS\"}'",

Prisma has some notes on this:

https://www.prisma.io/docs/guides/application-lifecycle/seed-database#set-up-seeding-in-typescript

mcavaliere · 2021-03-31T13:06:06Z

packages/create-bison-app/template/package.json.ejs

    "@graphql-codegen/typescript-operations": "^1.17.6",
-    "@graphql-codegen/typescript-react-apollo": "1.17.6",
-    "@graphql-codegen/typescript-resolvers": "1.17.4",
-    "@prisma/cli": "2.8.1",


mcavaliere · 2021-03-31T13:07:00Z

packages/create-bison-app/template/tsconfig.json

@@ -8,7 +8,7 @@
    "forceConsistentCasingInFileNames": true,
    "noEmit": true,
    "esModuleInterop": true,
-    "module": "esnext",
+    "module": "commonjs",


See my comment above, you can still set this to esnext and override at the command level

MariahGrey

LGTM 👍

mcavaliere

LGTM

upgrade prisma to 2.19.0

29df413

code-jenn-or requested a review from cball March 23, 2021 23:50

Jenn Robison and others added 3 commits March 23, 2021 16:53

feat: update prisma doc

9ddb6f2

build(deps): bump node-notifier from 8.0.0 to 8.0.1 (#118)

ac5fb02

chore(release): publish v1.9.16-canary.0 [skip ci]

7f967ba

mthomps4 approved these changes Mar 25, 2021

View reviewed changes

Jenn Robison and others added 6 commits March 26, 2021 08:50

rename rollback with prisma changes

3eb1234

update tsconfig to commonjs

ae2380f

move script to js from ts file

6d9d2fa

feat: upgrade chakra from RC to stable release (#131)

d4f917c

* feat:upgrade chakra from RC to stable release * lock cross-fetch version * lock version of chakra

chore(release): publish v1.10.0-canary.0 [skip ci]

6c12f50

Merge branch 'canary' into codejenn/upgrade-nexus-prisma

ad27615

code-jenn-or commented Mar 31, 2021

View reviewed changes

mcavaliere suggested changes Mar 31, 2021

View reviewed changes

revert js back to typescript

d864ce9

code-jenn-or requested a review from mcavaliere April 1, 2021 14:14

MariahGrey approved these changes Apr 1, 2021

View reviewed changes

mcavaliere approved these changes Apr 2, 2021

View reviewed changes

code-jenn-or merged commit ebc68d9 into canary Apr 2, 2021

code-jenn-or deleted the codejenn/upgrade-nexus-prisma branch April 2, 2021 14:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: upgrade prisma to 2.19.0 #130

feat: upgrade prisma to 2.19.0 #130

code-jenn-or commented Mar 23, 2021

mthomps4 Mar 25, 2021

code-jenn-or Mar 25, 2021

mthomps4 Mar 26, 2021 •

edited

Loading

code-jenn-or Mar 26, 2021

mthomps4 Mar 31, 2021

mthomps4 Mar 25, 2021

code-jenn-or Mar 31, 2021

mcavaliere Mar 31, 2021

code-jenn-or Mar 31, 2021

code-jenn-or Mar 31, 2021

code-jenn-or Mar 31, 2021

code-jenn-or Mar 31, 2021

code-jenn-or Mar 31, 2021

mcavaliere Mar 31, 2021

code-jenn-or Mar 31, 2021

code-jenn-or Mar 31, 2021

code-jenn-or Mar 31, 2021

code-jenn-or Mar 31, 2021

code-jenn-or Mar 31, 2021

mcavaliere Mar 31, 2021

mcavaliere left a comment

mcavaliere Mar 31, 2021

mcavaliere Mar 31, 2021

mcavaliere Mar 31, 2021

mcavaliere Mar 31, 2021

MariahGrey left a comment

mcavaliere left a comment

feat: upgrade prisma to 2.19.0 #130

feat: upgrade prisma to 2.19.0 #130

Conversation

code-jenn-or commented Mar 23, 2021

Changes

Screenshots

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mthomps4 Mar 26, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mcavaliere left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MariahGrey left a comment

Choose a reason for hiding this comment

mcavaliere left a comment

Choose a reason for hiding this comment

mthomps4 Mar 26, 2021 •

edited

Loading