netlify-cli 9.6.12 → 9.7.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "9.6.12",
+  "version": "9.7.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "9.6.12",
+      "version": "9.7.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "9.6.12",
+  "version": "9.7.0",
   "author": "Netlify Inc.",
   "contributors": [
     "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",

package/src/commands/dev/dev-exec.js

@@ -8,8 +8,8 @@ const { injectEnvVariables } = require('../../utils')
  * @param {import('../base-command').BaseCommand} command
  */
 const devExec = async (cmd, options, command) => {
-  const { cachedConfig, site } = command.netlify
-  await injectEnvVariables({ env: cachedConfig.env, site })
+  const { cachedConfig, config, site } = command.netlify
+  await injectEnvVariables({ devConfig: { ...config.dev }, env: cachedConfig.env, site })
 
   await execa(cmd, command.args.slice(1), {
     stdio: 'inherit',

package/src/commands/dev/dev.js

@@ -326,7 +326,7 @@ const dev = async (options, command) => {
     )
   }
 
-  await injectEnvVariables({ env: command.netlify.cachedConfig.env, site })
+  await injectEnvVariables({ devConfig, env: command.netlify.cachedConfig.env, site })
 
   const { addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({
     // inherited from base command --offline

package/src/commands/functions/functions-create.js

@@ -477,8 +477,14 @@ const createFunctionAddon = async function ({ addonName, addons, api, siteData,
  * @param {(command: import('../base-command').BaseCommand) => any} config.onComplete
  */
 const handleOnComplete = async ({ command, onComplete }) => {
+  const { config } = command.netlify
+
   if (onComplete) {
-    await injectEnvVariables({ env: command.netlify.cachedConfig.env, site: command.netlify.site })
+    await injectEnvVariables({
+      devConfig: { ...config.dev },
+      env: command.netlify.cachedConfig.env,
+      site: command.netlify.site,
+    })
     await onComplete.call(command)
   }
 }
@@ -491,6 +497,8 @@ const handleOnComplete = async ({ command, onComplete }) => {
  * @param {string} config.fnPath
  */
 const handleAddonDidInstall = async ({ addonCreated, addonDidInstall, command, fnPath }) => {
+  const { config } = command.netlify
+
   if (!addonCreated || !addonDidInstall) {
     return
   }
@@ -508,7 +516,11 @@ const handleAddonDidInstall = async ({ addonCreated, addonDidInstall, command, f
     return
   }
 
-  await injectEnvVariables({ env: command.netlify.cachedConfig.env, site: command.netlify.site })
+  await injectEnvVariables({
+    devConfig: { ...config.dev },
+    env: command.netlify.cachedConfig.env,
+    site: command.netlify.site,
+  })
   addonDidInstall(fnPath)
 }
 

package/src/commands/functions/functions-serve.js

@@ -17,7 +17,7 @@ const functionsServe = async (options, command) => {
 
   const functionsDir = getFunctionsDir({ options, config }, join('netlify', 'functions'))
 
-  await injectEnvVariables({ env: command.netlify.cachedConfig.env, site })
+  await injectEnvVariables({ devConfig: { ...config.dev }, env: command.netlify.cachedConfig.env, site })
 
   const { capabilities, siteUrl, timeouts } = await getSiteInformation({
     offline: options.offline,

package/src/utils/dev.js

@@ -139,9 +139,9 @@ const getEnvSourceName = (source) => {
 
 // Takes a set of environment variables in the format provided by @netlify/config, augments it with variables from both
 // dot-env files and the process itself, and injects into `process.env`.
-const injectEnvVariables = async ({ env, site }) => {
+const injectEnvVariables = async ({ devConfig, env, site }) => {
   const environment = new Map(Object.entries(env))
-  const dotEnvFiles = await loadDotEnvFiles({ projectDir: site.root })
+  const dotEnvFiles = await loadDotEnvFiles({ envFiles: devConfig.envFiles, projectDir: site.root })
 
   dotEnvFiles.forEach(({ env: fileEnv, file }) => {
     Object.keys(fileEnv).forEach((key) => {

package/src/utils/dot-env.js

@@ -8,8 +8,8 @@ const { isFileAsync } = require('../lib/fs')
 
 const { warn } = require('./command-helpers')
 
-const loadDotEnvFiles = async function ({ projectDir }) {
-  const response = await tryLoadDotEnvFiles({ projectDir })
+const loadDotEnvFiles = async function ({ envFiles, projectDir }) {
+  const response = await tryLoadDotEnvFiles({ projectDir, dotenvFiles: envFiles })
 
   const filesWithWarning = response.filter((el) => el.warning)
   filesWithWarning.forEach((el) => {
@@ -19,8 +19,10 @@ const loadDotEnvFiles = async function ({ projectDir }) {
   return response.filter((el) => el.file && el.env)
 }
 
-const tryLoadDotEnvFiles = async ({ projectDir }) => {
-  const dotenvFiles = ['.env', '.env.development']
+// in the user configuration, the order is highest to lowest
+const defaultEnvFiles = ['.env.development', '.env']
+
+const tryLoadDotEnvFiles = async ({ projectDir, dotenvFiles = defaultEnvFiles }) => {
   const results = await Promise.all(
     dotenvFiles.map(async (file) => {
       const filepath = path.resolve(projectDir, file)
@@ -40,7 +42,8 @@ const tryLoadDotEnvFiles = async ({ projectDir }) => {
     }),
   )
 
-  return results.filter(Boolean)
+  // we return in order of lowest to highest priority
+  return results.filter(Boolean).reverse()
 }
 
 module.exports = { loadDotEnvFiles, tryLoadDotEnvFiles }