⬆️ Upgrade Prisma to 2.10

Errorname · Nov 1, 2020 · 3c9a92a · 3c9a92a
1 parent 6170ea0
commit 3c9a92a
Show file tree

Hide file tree

Showing 14 changed files with 6,730 additions and 12,440 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/blitz/package.json b/packages/blitz/package.json
@@ -26,7 +26,7 @@
     "blitz": "^0.16.4"
   },
   "devDependencies": {
-    "@prisma/cli": "^2.4.1",
+    "@prisma/cli": "^2.10.1",
     "@types/react": "^16.9.43",
     "@types/react-dom": "^16.9.8",
     "@types/webpack": "^4.41.21",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@prisma-multi-tenant/shared": "^2.3.1",
-    "@prisma/cli": "^2.4.1",
+    "@prisma/cli": "^2.10.1",
     "arg": "^4.1.3",
     "chalk": "^4.1.0",
     "cli-table3": "^0.6.0",

diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts
@@ -217,9 +217,8 @@ class Init implements Command {
 
     const { dmmf } = requireDistant('@prisma/client')
 
-    const firstModelMapping = dmmf.mappings[0]
+    const firstModelMapping = dmmf.mappings.modelOperations[0]
 
-    // We should use singular name (See prisma/prisma-client-js#509)
     const modelNamePlural = firstModelMapping.plural
     const modelNameSingular = firstModelMapping.model.toLowerCase()
 

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -23,7 +23,7 @@
     "@prisma-multi-tenant/shared": "^2.3.1"
   },
   "peerDependencies": {
-    "@prisma/cli": "^2.4.1"
+    "@prisma/cli": "^2.10.1"
   },
   "devDependencies": {
     "@types/node": "^14.0.23",

diff --git a/packages/nexus/package.json b/packages/nexus/package.json
@@ -27,7 +27,7 @@
     "nexus": "^0.25.0"
   },
   "devDependencies": {
-    "@prisma/cli": "^2.4.1",
+    "@prisma/cli": "^2.10.1",
     "@typescript-eslint/eslint-plugin": "^3.6.1",
     "@typescript-eslint/parser": "^3.6.1",
     "eslint": "^7.4.0",

diff --git a/packages/redwood/package.json b/packages/redwood/package.json
@@ -26,7 +26,7 @@
     "@redwoodjs/api": "^0.15.3"
   },
   "devDependencies": {
-    "@prisma/cli": "^2.4.1",
+    "@prisma/cli": "^2.10.1",
     "@typescript-eslint/eslint-plugin": "^3.6.1",
     "@typescript-eslint/parser": "^3.6.1",
     "@redwoodjs/api": "^0.15.3",

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -20,10 +20,11 @@
     "prettier": "prettier \"src/**/*.ts\" --check"
   },
   "dependencies": {
-    "@prisma/client": "^2.4.1"
+    "@prisma/client": "^2.10.1",
+    "find-up": "^5.0.0"
   },
   "peerDependencies": {
-    "@prisma/cli": "^2.4.1"
+    "@prisma/cli": "^2.10.1"
   },
   "devDependencies": {
     "@types/node": "^14.0.23",

diff --git a/tests/client/constructor.test.ts b/tests/client/constructor.test.ts
@@ -1,5 +1,3 @@
-import path from 'path'
-
 // @ts-ignore
 const { MultiTenant } = require('@prisma-multi-tenant/client')
 

diff --git a/tests/client/create.test.ts b/tests/client/create.test.ts
@@ -1,5 +1,3 @@
-import path from 'path'
-
 // @ts-ignore
 const { MultiTenant } = require('@prisma-multi-tenant/client')
 // @ts-ignore

diff --git a/tests/client/delete.test.ts b/tests/client/delete.test.ts
@@ -1,8 +1,9 @@
-import path from 'path'
-
 // @ts-ignore
 const { MultiTenant } = require('@prisma-multi-tenant/client')
 
+// If timeout error, increase the number
+jest.setTimeout(300000)
+
 describe('delete', () => {
   test('delete existing tenant', async () => {
     const multiTenant = new MultiTenant()

diff --git a/tests/client/exists.test.ts b/tests/client/exists.test.ts
@@ -1,5 +1,3 @@
-import path from 'path'
-
 // @ts-ignore
 const { MultiTenant } = require('@prisma-multi-tenant/client')
 

diff --git a/tests/client/get.test.ts b/tests/client/get.test.ts
@@ -1,5 +1,3 @@
-import path from 'path'
-
 // @ts-ignore
 const { MultiTenant } = require('@prisma-multi-tenant/client')
 

diff --git a/tests/playground/example/package.json b/tests/playground/example/package.json
@@ -3,8 +3,8 @@
   "version": "1.0.0",
   "license": "MIT",
   "dependencies": {
-    "@prisma/client": "^2.4.1",
-    "@prisma/cli": "^2.4.1"
+    "@prisma/client": "^2.10.1",
+    "@prisma/cli": "^2.10.1"
   },
   "scripts": {
     "dev": "node ./script.js"