From 3c171e57bc445737d19623ed0669f288ad76210c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 31 Dec 2025 12:32:25 +0000 Subject: [PATCH 1/2] chore(deps): update dependency @types/dotenv-defaults to v5 --- packages/api-server/package.json | 2 +- packages/cli-helpers/package.json | 2 +- yarn.lock | 21 +++++++-------------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/packages/api-server/package.json b/packages/api-server/package.json index 9a15ebe7c1..211f2df470 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -134,7 +134,7 @@ "devDependencies": { "@cedarjs/framework-tools": "workspace:*", "@types/aws-lambda": "8.10.159", - "@types/dotenv-defaults": "^2.0.4", + "@types/dotenv-defaults": "^5.0.0", "@types/qs": "6.14.0", "@types/split2": "4.2.3", "@types/yargs": "17.0.35", diff --git a/packages/cli-helpers/package.json b/packages/cli-helpers/package.json index c4b783bb1f..81e5de487e 100644 --- a/packages/cli-helpers/package.json +++ b/packages/cli-helpers/package.json @@ -74,7 +74,7 @@ }, "devDependencies": { "@cedarjs/framework-tools": "workspace:*", - "@types/dotenv-defaults": "^2.0.4", + "@types/dotenv-defaults": "^5.0.0", "@types/lodash": "4.17.21", "@types/pascalcase": "1.0.3", "@types/semver": "^7", diff --git a/yarn.lock b/yarn.lock index ca8383d7e5..5d639eda01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2695,7 +2695,7 @@ __metadata: "@fastify/multipart": "npm:9.3.0" "@fastify/url-data": "npm:6.0.3" "@types/aws-lambda": "npm:8.10.159" - "@types/dotenv-defaults": "npm:^2.0.4" + "@types/dotenv-defaults": "npm:^5.0.0" "@types/qs": "npm:6.14.0" "@types/split2": "npm:4.2.3" "@types/yargs": "npm:17.0.35" @@ -3360,7 +3360,7 @@ __metadata: "@cedarjs/project-config": "workspace:*" "@cedarjs/telemetry": "workspace:*" "@opentelemetry/api": "npm:1.8.0" - "@types/dotenv-defaults": "npm:^2.0.4" + "@types/dotenv-defaults": "npm:^5.0.0" "@types/lodash": "npm:4.17.21" "@types/pascalcase": "npm:1.0.3" "@types/semver": "npm:^7" @@ -11660,13 +11660,13 @@ __metadata: languageName: node linkType: hard -"@types/dotenv-defaults@npm:^2.0.4": - version: 2.0.4 - resolution: "@types/dotenv-defaults@npm:2.0.4" +"@types/dotenv-defaults@npm:^5.0.0": + version: 5.0.0 + resolution: "@types/dotenv-defaults@npm:5.0.0" dependencies: "@types/node": "npm:*" - dotenv: "npm:^8.2.0" - checksum: 10c0/7d7ebdd696318d5f9a510d1d0b5fa262e240a377056d6ce7ed8984fb222d472732bf27f8d16726879531706030f1aa0879e65e711dbda17ad4d0be138d9d118b + dotenv: "npm:^14.0.0" + checksum: 10c0/2cb21ce3c219f118a53fe25127b774581905604093753122e317bd90a1ec447451d12432700393aaaf54a19f0a8c670cadf73014e9c000a94d477e0d8415330b languageName: node linkType: hard @@ -16579,13 +16579,6 @@ __metadata: languageName: node linkType: hard -"dotenv@npm:^8.2.0": - version: 8.6.0 - resolution: "dotenv@npm:8.6.0" - checksum: 10c0/6750431dea8efbd54b9f2d9681b04e1ccc7989486461dcf058bb708d9e3d63b04115fcdf8840e38ad1e24a4a2e1e7c1560626c5e3ac7bc09371b127c49e2d45f - languageName: node - linkType: hard - "dotenv@npm:~16.4.5": version: 16.4.7 resolution: "dotenv@npm:16.4.7" From 2edbec94923e421210b246eb2d919d50fb9281ef Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Wed, 31 Dec 2025 15:00:29 +0100 Subject: [PATCH 2/2] remove outdated ts comments --- packages/cli-helpers/src/lib/loadEnvFiles.ts | 2 -- packages/cli-packages/dataMigrate/src/bin.ts | 2 -- packages/vite/src/runFeServer.ts | 2 -- 3 files changed, 6 deletions(-) diff --git a/packages/cli-helpers/src/lib/loadEnvFiles.ts b/packages/cli-helpers/src/lib/loadEnvFiles.ts index be894540bd..d26e8d3193 100644 --- a/packages/cli-helpers/src/lib/loadEnvFiles.ts +++ b/packages/cli-helpers/src/lib/loadEnvFiles.ts @@ -36,8 +36,6 @@ export function loadDefaultEnvFiles(cwd: string) { dotenvDefaultsConfig({ path: path.join(cwd, '.env'), defaults: path.join(cwd, '.env.defaults'), - // @ts-expect-error - Old typings. @types/dotenv-defaults depends on dotenv - // v8. dotenv-defaults uses dotenv v14 multiline: true, }) } diff --git a/packages/cli-packages/dataMigrate/src/bin.ts b/packages/cli-packages/dataMigrate/src/bin.ts index bc81d91d2a..a28519875d 100644 --- a/packages/cli-packages/dataMigrate/src/bin.ts +++ b/packages/cli-packages/dataMigrate/src/bin.ts @@ -13,8 +13,6 @@ if (!process.env.REDWOOD_ENV_FILES_LOADED) { config({ path: path.join(getPaths().base, '.env'), defaults: path.join(getPaths().base, '.env.defaults'), - // @ts-expect-error - Old typings. @types/dotenv-defaults depends on dotenv - // v8. dotenv-defaults uses dotenv v14 multiline: true, }) diff --git a/packages/vite/src/runFeServer.ts b/packages/vite/src/runFeServer.ts index 184a0d0d80..6b3f24cccd 100644 --- a/packages/vite/src/runFeServer.ts +++ b/packages/vite/src/runFeServer.ts @@ -42,8 +42,6 @@ import { convertExpressHeaders, getFullUrl } from './utils.js' loadDotEnv({ path: path.join(getPaths().base, '.env'), defaults: path.join(getPaths().base, '.env.defaults'), - // @ts-expect-error - Old typings. @types/dotenv-defaults depends on dotenv - // v8. dotenv-defaults uses dotenv v14 multiline: true, }) // ------------------------------------------------