From f637381198f014adb5d0fed2d47105924b1d6a0c Mon Sep 17 00:00:00 2001 From: "Aditya @ArchLinux" <132184385+adityadeshlahre@users.noreply.github.com> Date: Wed, 4 Oct 2023 01:39:16 +0530 Subject: [PATCH 1/4] style(ui/ux): added margin to dialogprimitive.content & dialogprimitive.close (m-4) --- packages/ui/primitives/dialog.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ui/primitives/dialog.tsx b/packages/ui/primitives/dialog.tsx index 8a0d8b21e..90e856466 100644 --- a/packages/ui/primitives/dialog.tsx +++ b/packages/ui/primitives/dialog.tsx @@ -56,13 +56,13 @@ const DialogContent = React.forwardRef< {children} - + Close From 68458b50d2ab76173319286f8fb810613d24f221 Mon Sep 17 00:00:00 2001 From: "Aditya @ArchLinux" <132184385+adityadeshlahre@users.noreply.github.com> Date: Wed, 4 Oct 2023 20:04:07 +0530 Subject: [PATCH 2/4] fix(script): added script envprisma in root package.json dotenv loads all environment variable before running prisma:migrate-dev script --- package.json | 7 ++++--- packages/prisma/helper.ts | 1 + packages/prisma/package.json | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index bb574f3ca..8f1b31211 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "commitlint": "commitlint --edit", "clean": "turbo run clean && rimraf node_modules", "d": "npm run dx && npm run dev", - "dx": "npm i && npm run dx:up && npm run prisma:migrate-dev -w @documenso/prisma", + "envprisma": "npm run prisma:migrate-dev -w @documenso/prisma", + "dx": "npm i && npm run dx:up && dotenv -e .env npm run envprisma", "dx:up": "docker compose -f docker/compose-services.yml up -d", "dx:down": "docker compose -f docker/compose-services.yml down" }, @@ -21,8 +22,8 @@ "devDependencies": { "@commitlint/cli": "^17.7.1", "@commitlint/config-conventional": "^17.7.0", - "dotenv": "^16.0.3", - "dotenv-cli": "^7.2.1", + "dotenv": "^16.3.1", + "dotenv-cli": "^7.3.0", "eslint": "^8.40.0", "eslint-config-custom": "*", "husky": "^8.0.0", diff --git a/packages/prisma/helper.ts b/packages/prisma/helper.ts index 865e16239..38f61cb79 100644 --- a/packages/prisma/helper.ts +++ b/packages/prisma/helper.ts @@ -1,4 +1,5 @@ /// +require('dotenv').config(); export const getDatabaseUrl = () => { if (process.env.NEXT_PRIVATE_DATABASE_URL) { diff --git a/packages/prisma/package.json b/packages/prisma/package.json index 1b12a18a4..efd494ed6 100644 --- a/packages/prisma/package.json +++ b/packages/prisma/package.json @@ -18,6 +18,8 @@ }, "dependencies": { "@prisma/client": "5.3.1", + "dotenv": "^16.3.1", + "dotenv-cli": "^7.3.0", "prisma": "5.3.1" }, "devDependencies": { From 0dadec3b8d79dc6e9a057680dc6bfa7d554117a4 Mon Sep 17 00:00:00 2001 From: "Aditya @ArchLinux" <132184385+adityadeshlahre@users.noreply.github.com> Date: Thu, 5 Oct 2023 15:26:53 +0530 Subject: [PATCH 3/4] fix(script): minor change on scipt --- packages/prisma/helper.ts | 1 - packages/ui/primitives/dialog.tsx | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/prisma/helper.ts b/packages/prisma/helper.ts index 38f61cb79..865e16239 100644 --- a/packages/prisma/helper.ts +++ b/packages/prisma/helper.ts @@ -1,5 +1,4 @@ /// -require('dotenv').config(); export const getDatabaseUrl = () => { if (process.env.NEXT_PRIVATE_DATABASE_URL) { diff --git a/packages/ui/primitives/dialog.tsx b/packages/ui/primitives/dialog.tsx index 90e856466..8a0d8b21e 100644 --- a/packages/ui/primitives/dialog.tsx +++ b/packages/ui/primitives/dialog.tsx @@ -56,13 +56,13 @@ const DialogContent = React.forwardRef< {children} - + Close From 2470aeee1f9e4bdf9565d7649b85cb5c0d3a38b1 Mon Sep 17 00:00:00 2001 From: Mythie Date: Sun, 8 Oct 2023 21:51:15 +1100 Subject: [PATCH 4/4] 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",