Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

build: replace dotenv with node env loader (#3500)

Bogdan Chadkin9998f1633fa5
diff --git a/apps/builder/middleware.js b/apps/builder/middleware.js
index bb49f03239..85bb549f2c 100644
--- a/apps/builder/middleware.js
+++ b/apps/builder/middleware.js
@@ -22,7 +22,7 @@
* ```shell
* pnpx vercel link
* pnpx vercel env pull --environment=preview ./.env.preview
- * DOTENV_CONFIG_PATH=.env.preview pnpm tsx watch -r dotenv/config ./middleware.js
+ * pnpm tsx watch --env-file=.env.preview ./middleware.js
* ```
*/
import { Ratelimit } from "@upstash/ratelimit";
diff --git a/apps/builder/package.json b/apps/builder/package.json
index 752f58acbf..a8b6fd897c 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -9,7 +9,6 @@
"build": "remix vite:build",
"build:webflow-presets": "css-to-ws ./app/shared/copy-paste/plugin-webflow/style-presets.css ./app/shared/copy-paste/plugin-webflow/__generated__/style-presets.ts",
"start": "remix-serve build/server/index.js",
- "start-local": "NODE_OPTIONS='-r dotenv/config' remix-serve build/server/index.js",
"dev": "remix vite:dev",
"typecheck": "tsc --noEmit --emitDeclarationOnly false",
"test": "NODE_OPTIONS=--experimental-vm-modules jest",
@@ -17,7 +16,7 @@
"ci:migrate": "migrations migrate",
"middleware:link": "pnpx vercel link",
"middleware:env": "pnpx vercel env pull --environment=preview ./.env.preview",
- "middleware:dev": "DOTENV_CONFIG_PATH=.env.preview tsx watch -r dotenv/config ./middleware.js"
+ "middleware:dev": "tsx watch --env-file=.env.preview ./middleware.js"
},
"dependencies": {
"@codemirror/autocomplete": "^6.16.2",
@@ -133,7 +132,6 @@
"@types/react-dom": "^18.2.25",
"@webstudio-is/jest-config": "workspace:*",
"@webstudio-is/tsconfig": "workspace:*",
- "dotenv": "^16.3.1",
"html-tags": "^3.3.1",
"react-router-dom": "^6.23.1",
"react-test-renderer": "18.3.0-canary-14898b6a9-20240318",
diff --git a/packages/prisma-client/migrations-cli/cli.ts b/packages/prisma-client/migrations-cli/cli.ts
index 8b2ce09d00..2ef0cc52b1 100755
--- a/packages/prisma-client/migrations-cli/cli.ts
+++ b/packages/prisma-client/migrations-cli/cli.ts
@@ -1,6 +1,6 @@
#!/usr/bin/env tsx
-import * as dotenv from "dotenv";
+import { loadEnvFile } from "node:process";
import * as commands from "./commands";
import * as logger from "./logger";
import * as args from "./args";
@@ -23,7 +23,16 @@ Arguments
const main = async () => {
if (args.values.dev) {
- dotenv.config();
+ try {
+ loadEnvFile(".env.development");
+ } catch {
+ // empty block
+ }
+ try {
+ loadEnvFile(".env");
+ } catch {
+ // empty block
+ }
}
const command = args.positionals[0];
diff --git a/packages/prisma-client/package.json b/packages/prisma-client/package.json
index 44646fe475..82fac90070 100644
--- a/packages/prisma-client/package.json
+++ b/packages/prisma-client/package.json
@@ -34,7 +34,6 @@
"license": "AGPL-3.0-or-later",
"private": true,
"dependencies": {
- "dotenv": "^16.3.1",
"execa": "^7.2.0",
"nanoid": "^5.0.1",
"umzug": "^3.2.1"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 70b446c66f..8acd23b730 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -435,9 +435,6 @@ importers:
'@webstudio-is/tsconfig':
specifier: workspace:*
version: link:../../packages/tsconfig
- dotenv:
- specifier: ^16.3.1
- version: 16.3.1
html-tags:
specifier: ^3.3.1
version: 3.3.1
@@ -1587,9 +1584,6 @@ importers:
packages/prisma-client:
dependencies:
- dotenv:
- specifier: ^16.3.1
- version: 16.3.1
execa:
specifier: ^7.2.0
version: 7.2.0