mirror of
https://github.com/serverless/serverless.git
synced 2026-02-01 16:07:28 +00:00
chore(deps): upgrade dotenv to v17.2.3 and remove unused loadDotEnvFile utility (#13259)
This commit is contained in:
parent
e1b03b6c8d
commit
8e9a6ba437
8
package-lock.json
generated
8
package-lock.json
generated
@ -8450,9 +8450,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/dotenv": {
|
||||
"version": "16.6.1",
|
||||
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
|
||||
"integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
|
||||
"version": "17.2.3",
|
||||
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz",
|
||||
"integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==",
|
||||
"license": "BSD-2-Clause",
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
@ -16760,7 +16760,7 @@
|
||||
"@smithy/util-retry": "^4.2.6",
|
||||
"adm-zip": "^0.5.16",
|
||||
"child-process-ext": "^3.0.2",
|
||||
"dotenv": "^16.6.1",
|
||||
"dotenv": "^17.2.3",
|
||||
"fs-extra": "^11.3.3",
|
||||
"graceful-fs": "^4.2.11",
|
||||
"https-proxy-agent": "^7.0.6",
|
||||
|
||||
@ -73,7 +73,7 @@
|
||||
"@smithy/util-retry": "^4.2.6",
|
||||
"adm-zip": "^0.5.16",
|
||||
"child-process-ext": "^3.0.2",
|
||||
"dotenv": "^16.6.1",
|
||||
"dotenv": "^17.2.3",
|
||||
"fs-extra": "^11.3.3",
|
||||
"graceful-fs": "^4.2.11",
|
||||
"https-proxy-agent": "^7.0.6",
|
||||
|
||||
@ -26,7 +26,7 @@ export const loadEnvFiles = ({ stage, configFileDirPath }) => {
|
||||
// Load .env file
|
||||
const defaultEnvPath = path.resolve(configFileDirPath, '.env')
|
||||
if (existsSync(defaultEnvPath)) {
|
||||
dotenv.config({ path: defaultEnvPath })
|
||||
dotenv.config({ path: defaultEnvPath, quiet: true })
|
||||
}
|
||||
}
|
||||
|
||||
@ -41,6 +41,6 @@ export const loadStageEnvFiles = ({ stage, configFileDirPath }) => {
|
||||
// Load .env.[stageName] file
|
||||
const stageEnvPath = path.resolve(configFileDirPath, `.env.${stage}`)
|
||||
if (existsSync(stageEnvPath)) {
|
||||
dotenv.config({ path: stageEnvPath })
|
||||
dotenv.config({ path: stageEnvPath, quiet: true })
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,7 +14,6 @@ import yaml from 'js-yaml'
|
||||
import { createRequire } from 'node:module'
|
||||
import _ from 'lodash'
|
||||
import AdmZip from 'adm-zip'
|
||||
import dotenv from 'dotenv'
|
||||
|
||||
const require = createRequire(import.meta.url)
|
||||
|
||||
@ -197,51 +196,6 @@ const parseDeclarativeConfig = (filePath, contents) => {
|
||||
return contents.trim()
|
||||
}
|
||||
|
||||
/**
|
||||
* Read a dotenv file and return the parsed content.
|
||||
* NOTE: This does not automatically set environment variables.
|
||||
* If params are provided, search in a custom path.
|
||||
* Otherwise, search in the current working directory.
|
||||
* Can accept .env.dev, .env.prod, .env, etc.
|
||||
* A staged .env file takes priority over a default .env file.
|
||||
* @returns Object with environment variables
|
||||
*/
|
||||
const loadDotEnvFile = async ({ customPath = null, stageName = null }) => {
|
||||
// Set path to current working directory if not provided
|
||||
const envPath = customPath || process.cwd()
|
||||
|
||||
// If the path specifies a directory, search for a .env and staged .env file in it
|
||||
if (await dirExists(envPath)) {
|
||||
const defaultEnvPath = path.resolve(envPath, '.env')
|
||||
const stageFilePath = stageName
|
||||
? path.resolve(envPath, `.env.${stageName}`)
|
||||
: null
|
||||
|
||||
let envDefault = {}
|
||||
if (await fileExists(defaultEnvPath)) {
|
||||
const data = dotenv.config({
|
||||
path: defaultEnvPath,
|
||||
}).parsed
|
||||
envDefault = data || {}
|
||||
}
|
||||
|
||||
let envStage = {}
|
||||
if (stageFilePath && (await fileExists(stageFilePath))) {
|
||||
const data = dotenv.config({
|
||||
path: stageFilePath,
|
||||
}).parsed
|
||||
envStage = data || {}
|
||||
}
|
||||
// Merge default and staged environment variables, with staged taking priority
|
||||
return { ...envDefault, ...envStage }
|
||||
}
|
||||
|
||||
// If the path specifies a file, use it
|
||||
if (await fileExists(envPath)) {
|
||||
return dotenv.config({ path: envPath }).parsed
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* CloudFormation intrinsic functions need to be parsed as YAML.
|
||||
*/
|
||||
@ -971,7 +925,6 @@ export {
|
||||
copyDirContents,
|
||||
removeFileOrDirectory,
|
||||
parseDeclarativeConfig,
|
||||
loadDotEnvFile,
|
||||
renameTemplateInAllFiles,
|
||||
renameDirectory,
|
||||
getConfigFilePath,
|
||||
|
||||
@ -16,7 +16,6 @@ import {
|
||||
copyDirContents,
|
||||
removeFileOrDirectory,
|
||||
parseDeclarativeConfig,
|
||||
loadDotEnvFile,
|
||||
renameTemplateInAllFiles,
|
||||
renameDirectory,
|
||||
getConfigFilePath,
|
||||
@ -52,7 +51,6 @@ export {
|
||||
removeFileOrDirectory,
|
||||
scrambleSensitiveValue,
|
||||
parseDeclarativeConfig,
|
||||
loadDotEnvFile,
|
||||
renameTemplateInAllFiles,
|
||||
renameDirectory,
|
||||
getConfigFilePath,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user