From 2470aeee1f9e4bdf9565d7649b85cb5c0d3a38b1 Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Sun, 8 Oct 2023 21:51:15 +1100
Subject: [PATCH] fix: update script, docs and devcontainer

---
 .devcontainer/on-create.sh |  7 +------
 README.md                  | 18 +++++++++++++++++-
 package.json               |  8 +++++---
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/.devcontainer/on-create.sh b/.devcontainer/on-create.sh
index a66491ef7..fbd5351f2 100755
--- a/.devcontainer/on-create.sh
+++ b/.devcontainer/on-create.sh
@@ -9,10 +9,5 @@ npm install
 # Copy the env file
 cp .env.example .env
 
-# Source the env file, export the variables
-set -a
-source .env
-set +a
-
 # Run the migrations
-npm run -w @documenso/prisma prisma:migrate-dev
+npm run prisma:migrate-dev
diff --git a/README.md b/README.md
index 2795d206d..f488b4a63 100644
--- a/README.md
+++ b/README.md
@@ -179,7 +179,7 @@ git clone https://github.com/documenso/documenso
    - NEXT_PRIVATE_SMTP_FROM_NAME
    - NEXT_PRIVATE_SMTP_FROM_ADDRESS
 
-5. Create the database schema by running `npm run prisma:migrate-dev -w @documenso/prisma`
+5. Create the database schema by running `npm run prisma:migrate-dev`
 
 6. Run `npm run dev` root directory to start
 
@@ -254,6 +254,22 @@ containers:
       - '::'
 ```
 
+### I can't see environment variables in my package scripts
+
+Wrap your package script with the `with:env` script like such:
+
+```
+npm run with:env -- npm run myscript
+```
+
+The same can be done when using `npx` for one of bin scripts:
+
+```
+npm run with:env -- npx myscript
+```
+
+This will load environment variables from your `.env` and `.env.local` files.
+
 ## Repo Activity
 
 ![Repository Activity](https://repobeats.axiom.co/api/embed/622a2e9aa709696f7226304b5b7178a5741b3868.svg)
diff --git a/package.json b/package.json
index 8f1b31211..e32c0322f 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,12 @@
     "commitlint": "commitlint --edit",
     "clean": "turbo run clean && rimraf node_modules",
     "d": "npm run dx && npm run dev",
-    "envprisma": "npm run prisma:migrate-dev -w @documenso/prisma",
-    "dx": "npm i && npm run dx:up && dotenv -e .env npm run envprisma",
+    "dx": "npm i && npm run dx:up && npm run prisma:migrate-dev",
     "dx:up": "docker compose -f docker/compose-services.yml up -d",
-    "dx:down": "docker compose -f docker/compose-services.yml down"
+    "dx:down": "docker compose -f docker/compose-services.yml down",
+    "prisma:migrate-dev": "npm run with:env -- npm run prisma:migrate-dev -w @documenso/prisma",
+    "prisma:migrate-deploy": "npm run with:env -- npm run prisma:migrate-deploy -w @documenso/prisma",
+    "with:env": "dotenv -e .env -e .env.local --"
   },
   "engines": {
     "npm": ">=8.6.0",