diff --git a/.changeset/fix-env-loading-precedence.md b/.changeset/fix-env-loading-precedence.md new file mode 100644 index 00000000000..752034b1d69 Binary files /dev/null and b/.changeset/fix-env-loading-precedence.md differ 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) { 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();