🔖 Release 2.0.0-beta.4

README.md

@@ -48,7 +48,7 @@ npm i -g prisma-multi-tenant@beta
 ```
 $> prisma-multi-tenant help
 
-  🧭  prisma-multi-tenant v2.0.0-beta.3
+  🧭  prisma-multi-tenant v2.0.0-beta.4
 
   USAGE
 

docs/examples/basic-js/multi-tenancy-example.js

@@ -1,10 +1,6 @@
 const { MultiTenant } = require('prisma-multi-tenant')
 
-require('dotenv').config({
-  path: 'prisma/.env'
-})
-
-// This is the name of your first tenant, try with another one
+// This is the name of your first tenant, try with another one: "prod"
 const name = 'dev'
 
 const multiTenant = new MultiTenant()

docs/examples/basic-js/package.json

@@ -10,11 +10,10 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@prisma/cli": "2.0.0-beta.3"
+    "@prisma/cli": "2.0.0-beta.4"
   },
   "dependencies": {
-    "@prisma/client": "2.0.0-beta.3",
-    "dotenv": "8.2.0",
-    "prisma-multi-tenant": "2.0.0-beta.3"
+    "@prisma/client": "2.0.0-beta.4",
+    "prisma-multi-tenant": "2.0.0-beta.4"
   }
 }

docs/examples/basic-ts/multi-tenancy-example.ts

@@ -1,11 +1,7 @@
 import { PrismaClient } from '@prisma/client'
 import { MultiTenant } from 'prisma-multi-tenant'
 
-require('dotenv').config({
-  path: 'prisma/.env'
-})
-
-// This is the name of your first tenant, try with another one
+// This is the name of your first tenant, try with another one: "prod"
 const name = 'dev'
 
 const multiTenant = new MultiTenant<PrismaClient>()

docs/examples/basic-ts/package.json

@@ -10,12 +10,11 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@prisma/cli": "2.0.0-beta.3"
+    "@prisma/cli": "2.0.0-beta.4"
   },
   "dependencies": {
-    "@prisma/client": "2.0.0-beta.3",
-    "dotenv": "8.2.0",
-    "prisma-multi-tenant": "2.0.0-beta.3",
+    "@prisma/client": "2.0.0-beta.4",
+    "prisma-multi-tenant": "2.0.0-beta.4",
     "ts-node": "8.6.2",
     "typescript": "3.8.2"
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-multi-tenant",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "description": "🧭 Use Prisma as a multi-tenant provider for your application",
   "author": {
     "name": "Thibaud Courtoison",
@@ -34,13 +34,13 @@
     "inquirer": "^7.0.4"
   },
   "peerDependencies": {
-    "@prisma/cli": "^2.0.0-beta.3"
+    "@prisma/cli": "^2.0.0-beta.4"
   },
   "devDependencies": {
     "@babel/core": "^7.8.3",
     "@babel/preset-env": "^7.8.3",
     "@babel/preset-typescript": "^7.8.3",
-    "@prisma/cli": "^2.0.0-beta.3",
+    "@prisma/cli": "^2.0.0-beta.4",
     "@types/inquirer": "^6.5.0",
     "@types/jest": "^25.1.0",
     "@types/node": "^13.7.0",

src/cli/helpers/checkCompatibility.ts

@@ -18,6 +18,8 @@ export default () => {
       )
     }
   } catch {
-    console.warn(chalk.yellow`Warning: Couldn't verify version compatibility with @prisma/cli`)
+    console.warn(
+      chalk.yellow`Warning: Couldn't verify version compatibility with @prisma/cli. Did you forget to install it locally?`
+    )
   }
 }

src/lib/index.ts

@@ -1,3 +1,4 @@
+import path from 'path'
 import { datasourceProviders } from '../shared/constants'
 import { runDistantPrisma, requireDistant } from '../shared/shell'
 import Management from '../shared/management'
@@ -31,6 +32,8 @@ class MultiTenant<PrismaClient extends { disconnect: () => Promise<void> }> {
   constructor(options?: MultiTenantOptions) {
     this.options = { ...defaultMultiTenantOptions, ...options }
 
+    this.loadEnv()
+
     this.ClientTenant = this.requireTenant()
 
     if (this.options.useManagement) {
@@ -40,6 +43,13 @@ class MultiTenant<PrismaClient extends { disconnect: () => Promise<void> }> {
     this.tenants = {}
   }
 
+  private loadEnv(): void {
+    // Try loading env variables
+    require('dotenv').config({
+      path: path.resolve(process.cwd(), 'prisma/.env')
+    })
+  }
+
   private requireTenant(): any {
     if (this.options.PrismaClient) {
       return this.options.PrismaClient

src/shared/constants.ts

@@ -1,2 +1,2 @@
 export const datasourceProviders = ['sqlite', 'mysql', 'postgresql']
-export const clientManagementPath = '@prisma/prisma-multi-tenant/management'
+export const clientManagementPath = '.prisma-multi-tenant/management'

tests/lib/constructor.test.ts

@@ -32,7 +32,7 @@ describe('constructor', () => {
 
   test('PrismaClient & PrismaClientManagement', () => {
     const PrismaClient = require(`@prisma/client`)
-    const PrismaClientManagement = require(`@prisma/prisma-multi-tenant/management`)
+    const PrismaClientManagement = require(`.prisma-multi-tenant/management`)
 
     const multiTenant = new MultiTenant({
       PrismaClient,

tests/playground/example/package.json

@@ -3,10 +3,10 @@
   "version": "1.0.0",
   "license": "MIT",
   "dependencies": {
-    "@prisma/client": "2.0.0-beta.3"
+    "@prisma/client": "2.0.0-beta.4"
   },
   "devDependencies": {
-    "@prisma/cli": "2.0.0-beta.3"
+    "@prisma/cli": "2.0.0-beta.4"
   },
   "scripts": {
     "dev": "node ./script.js"