netlify-cli 9.6.12 → 9.8.1

package/npm-shrinkwrap.json

@@ -1,17 +1,17 @@
 {
   "name": "netlify-cli",
-  "version": "9.6.12",
+  "version": "9.8.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "9.6.12",
+      "version": "9.8.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@netlify/build": "^26.3.5",
-        "@netlify/config": "^17.0.12",
+        "@netlify/build": "^26.3.6",
+        "@netlify/config": "^17.0.13",
         "@netlify/framework-info": "^9.0.2",
         "@netlify/local-functions-proxy": "^1.1.1",
         "@netlify/plugin-edge-handlers": "^3.0.6",
@@ -99,7 +99,7 @@
         "path-key": "^3.1.1",
         "prettyjson": "^1.2.1",
         "pump": "^3.0.0",
-        "raw-body": "^2.5.0",
+        "raw-body": "^2.4.1",
         "read-pkg-up": "^7.0.1",
         "semver": "^7.3.5",
         "source-map-support": "^0.5.19",
@@ -2358,9 +2358,9 @@
       }
     },
     "node_modules/@netlify/build": {
-      "version": "26.3.5",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.3.5.tgz",
-      "integrity": "sha512-scMxcFn5fRPpwUwiTK5y6cK3TySaGX6aThbfLf/4X2X6Bad+oVOzyT+2ObwGAqBJdyZNelLTcsv60ndGak6iiA==",
+      "version": "26.3.6",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.3.6.tgz",
+      "integrity": "sha512-1jfduo2SfD/CpoAShEa1dIfy0LOPkTuXEiqkMW7mE7/YLnvUhkxKrBrxwVsPjH36uUgzUpTa/WFp7pwCpffWaw==",
       "dependencies": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
@@ -2368,7 +2368,7 @@
         "@netlify/functions-utils": "^4.0.0",
         "@netlify/git-utils": "^4.0.0",
         "@netlify/plugin-edge-handlers": "^3.0.6",
-        "@netlify/plugins-list": "^6.12.0",
+        "@netlify/plugins-list": "^6.13.1",
         "@netlify/run-utils": "^4.0.0",
         "@netlify/zip-it-and-ship-it": "5.8.0",
         "@sindresorhus/slugify": "^2.0.0",
@@ -3110,9 +3110,9 @@
       }
     },
     "node_modules/@netlify/config": {
-      "version": "17.0.12",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.12.tgz",
-      "integrity": "sha512-6z+AamvN2eqSYbMK87yuYkU1HRLiyOpP2GPZXthvuGD0lRb+uyFrHaCHoEinEBjnUGZDan/w/lkQHX8JjI2qiQ==",
+      "version": "17.0.13",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.13.tgz",
+      "integrity": "sha512-Qx2r+t0wA0/f7CxWdMgoqIWYSZgiFeSZOw41a2AJiWIEAPHmpes4YtmThSu3oSG3qUjAfKcon8gqL/4K5IG0/Q==",
       "dependencies": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",
@@ -26132,9 +26132,9 @@
       }
     },
     "@netlify/build": {
-      "version": "26.3.5",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.3.5.tgz",
-      "integrity": "sha512-scMxcFn5fRPpwUwiTK5y6cK3TySaGX6aThbfLf/4X2X6Bad+oVOzyT+2ObwGAqBJdyZNelLTcsv60ndGak6iiA==",
+      "version": "26.3.6",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-26.3.6.tgz",
+      "integrity": "sha512-1jfduo2SfD/CpoAShEa1dIfy0LOPkTuXEiqkMW7mE7/YLnvUhkxKrBrxwVsPjH36uUgzUpTa/WFp7pwCpffWaw==",
       "requires": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
@@ -26142,7 +26142,7 @@
         "@netlify/functions-utils": "^4.0.0",
         "@netlify/git-utils": "^4.0.0",
         "@netlify/plugin-edge-handlers": "^3.0.6",
-        "@netlify/plugins-list": "^6.12.0",
+        "@netlify/plugins-list": "^6.13.1",
         "@netlify/run-utils": "^4.0.0",
         "@netlify/zip-it-and-ship-it": "5.8.0",
         "@sindresorhus/slugify": "^2.0.0",
@@ -26597,9 +26597,9 @@
       }
     },
     "@netlify/config": {
-      "version": "17.0.12",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.12.tgz",
-      "integrity": "sha512-6z+AamvN2eqSYbMK87yuYkU1HRLiyOpP2GPZXthvuGD0lRb+uyFrHaCHoEinEBjnUGZDan/w/lkQHX8JjI2qiQ==",
+      "version": "17.0.13",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.13.tgz",
+      "integrity": "sha512-Qx2r+t0wA0/f7CxWdMgoqIWYSZgiFeSZOw41a2AJiWIEAPHmpes4YtmThSu3oSG3qUjAfKcon8gqL/4K5IG0/Q==",
       "requires": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "9.6.12",
+  "version": "9.8.1",
   "author": "Netlify Inc.",
   "contributors": [
     "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",
@@ -200,8 +200,8 @@
     "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,yml,json,html}\" \"*.{mjs,cjs,js,yml,json,html}\" \".*.{mjs,cjs,js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!site/package-lock.json\" \"!.github/**/*.md\""
   },
   "dependencies": {
-    "@netlify/build": "^26.3.5",
-    "@netlify/config": "^17.0.12",
+    "@netlify/build": "^26.3.6",
+    "@netlify/config": "^17.0.13",
     "@netlify/framework-info": "^9.0.2",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/plugin-edge-handlers": "^3.0.6",

package/src/commands/deploy/deploy.js

@@ -529,7 +529,12 @@ const deploy = async (options, command) => {
     deployFolder,
     functionsFolder,
   })
-  const functionsConfig = normalizeFunctionsConfig({ functionsConfig: config.functions, projectRoot: site.root })
+  const siteEnv = get(siteData, 'build_settings.env')
+  const functionsConfig = normalizeFunctionsConfig({
+    functionsConfig: config.functions,
+    projectRoot: site.root,
+    siteEnv,
+  })
 
   const redirectsPath = `${deployFolder}/_redirects`
   const { restoreConfig, updateConfig } = await netlifyConfigPromise

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/lib/functions/config.js

@@ -1,7 +1,7 @@
 // The function configuration keys returned by @netlify/config are not an exact
 // match to the properties that @netlify/zip-it-and-ship-it expects. We do that
 // translation here.
-const normalizeFunctionsConfig = ({ functionsConfig = {}, projectRoot }) =>
+const normalizeFunctionsConfig = ({ functionsConfig = {}, projectRoot, siteEnv = {} }) =>
   Object.entries(functionsConfig).reduce(
     (result, [pattern, config]) => ({
       ...result,
@@ -11,6 +11,7 @@ const normalizeFunctionsConfig = ({ functionsConfig = {}, projectRoot }) =>
         includedFilesBasePath: projectRoot,
         ignoredNodeModules: config.ignored_node_modules,
         nodeBundler: config.node_bundler === 'esbuild' ? 'esbuild_zisi' : config.node_bundler,
+        nodeVersion: siteEnv.AWS_LAMBDA_JS_RUNTIME,
         processDynamicNodeImports: true,
         schedule: config.schedule,
         zipGo: true,

package/src/utils/deploy/deploy-site.js

@@ -37,6 +37,7 @@ const deploySite = async (
     maxRetry = DEFAULT_MAX_RETRY,
     // API calls this the 'title'
     message: title,
+    siteEnv,
     skipFunctionsCache,
     statusCb = () => {
       /* default to noop */
@@ -65,6 +66,7 @@ const deploySite = async (
         rootDir,
         manifestPath,
         skipFunctionsCache,
+        siteEnv,
       }),
     ])
   const filesCount = Object.keys(files).length

package/src/utils/deploy/hash-fns.js

@@ -61,7 +61,12 @@ const getFunctionZips = async ({
     })
   }
 
-  return await zipIt.zipFunctions(directories, tmpDir, { basePath: rootDir, config: functionsConfig })
+  const featureFlags = {
+    zisi_detect_esm: true,
+    zisi_pure_esm: true,
+  }
+
+  return await zipIt.zipFunctions(directories, tmpDir, { basePath: rootDir, config: functionsConfig, featureFlags })
 }
 
 const hashFns = async (

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 }