From 378ddc8c0a2a3a03652a3013bcfa78f04202e982 Mon Sep 17 00:00:00 2001 From: deepshekhardas Date: Mon, 23 Feb 2026 14:57:27 +0530 Subject: [PATCH 1/3] fix: ensure .env.local overrides .env in CLI Corrected the order of env file loading to follow standard precedence conventions where local and environment-specific files override the base .env file. --- packages/cli-v3/src/utilities/dotEnv.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cli-v3/src/utilities/dotEnv.ts b/packages/cli-v3/src/utilities/dotEnv.ts index 83cb92822ab..7559ebf709c 100644 --- a/packages/cli-v3/src/utilities/dotEnv.ts +++ b/packages/cli-v3/src/utilities/dotEnv.ts @@ -3,11 +3,11 @@ import { resolve } from "node:path"; import { env } from "std-env"; const ENVVAR_FILES = [ - ".env", - ".env.development", - ".env.local", ".env.development.local", + ".env.local", + ".env.development", "dev.vars", + ".env", ]; export function resolveDotEnvVars(cwd?: string, envFile?: string) { From 8c6dc85a4783a7d1698baf359ae721f003bc40fa Mon Sep 17 00:00:00 2001 From: deepshekhardas Date: Mon, 23 Feb 2026 14:59:55 +0530 Subject: [PATCH 2/3] chore: add changeset for env loading fix --- .changeset/fix-env-loading-precedence.md | Bin 0 -> 358 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .changeset/fix-env-loading-precedence.md diff --git a/.changeset/fix-env-loading-precedence.md b/.changeset/fix-env-loading-precedence.md new file mode 100644 index 0000000000000000000000000000000000000000..752034b1d6992d98733c71105fc6ddd2529460f6 GIT binary patch literal 358 zcmZ9Gy9&ZE6o&s<@EwAC>)_@jI0-(2ORZ4@niSirPp^I_MJf_FxBR#FtB}2&qGnpD z(@jAqo@Xj`px-rDtqb>pc>!)Ir$!a%TIb9iRZQs!_L)(htyPbfhf`7`8YOB8Zbf(0 zh|llu;OaA~(KWNWKUPA=GFo24k9@}^vahw(hTh@j$du4C-v?XEb?~iFF!v!@U`w#S jo(>m71nM5P`84dF^gjE>JUOcIEK@`~ Date: Thu, 5 Mar 2026 07:35:25 +0530 Subject: [PATCH 3/3] fix: replace @bugsnag/cuid with nanoid for edge compatibility (#3147) --- packages/core/package.json | 2 +- packages/core/src/v3/isomorphic/friendlyId.ts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 369b3266c7c..bd1469c83a4 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -583,4 +583,4 @@ "main": "./dist/commonjs/index.js", "types": "./dist/commonjs/index.d.ts", "module": "./dist/esm/index.js" -} +} \ No newline at end of file diff --git a/packages/core/src/v3/isomorphic/friendlyId.ts b/packages/core/src/v3/isomorphic/friendlyId.ts index 90fa31bd573..660cc101206 100644 --- a/packages/core/src/v3/isomorphic/friendlyId.ts +++ b/packages/core/src/v3/isomorphic/friendlyId.ts @@ -1,5 +1,4 @@ import { customAlphabet } from "nanoid"; -import cuid from "@bugsnag/cuid"; const idGenerator = customAlphabet("123456789abcdefghijkmnopqrstuvwxyz", 21); @@ -8,7 +7,7 @@ export function generateFriendlyId(prefix: string, size?: number) { } export function generateInternalId() { - return cuid(); + return idGenerator(); } /** Convert an internal ID to a friendly ID */ @@ -58,7 +57,7 @@ export function fromFriendlyId(friendlyId: string, expectedEntityName?: string): } export class IdUtil { - constructor(private entityName: string) {} + constructor(private entityName: string) { } generate() { const internalId = generateInternalId();