netlify-cli 14.0.0-rc → 14.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "14.0.0-rc",
+  "version": "14.0.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -117,15 +117,15 @@
     "netlify-redirect-parser": "^14.1.2",
     "netlify-redirector": "^0.4.0",
     "node-fetch": "^2.6.0",
-    "node-version-alias": "^2.0.0",
+    "node-version-alias": "^3.0.0",
     "ora": "^6.0.0",
     "p-filter": "^3.0.0",
     "p-map": "^5.0.0",
-    "p-wait-for": "^3.0.0",
+    "p-wait-for": "^5.0.0",
     "parallel-transform": "^1.2.0",
     "parse-github-url": "^1.0.2",
     "parse-gitignore": "^2.0.0",
-    "path-key": "^3.1.1",
+    "path-key": "^4.0.0",
     "prettyjson": "^1.2.1",
     "pump": "^3.0.0",
     "raw-body": "^2.4.1",
@@ -136,7 +136,7 @@
     "strip-ansi-control-characters": "^2.0.0",
     "tabtab": "^3.0.2",
     "tempy": "^3.0.0",
-    "terminal-link": "^2.1.1",
+    "terminal-link": "^3.0.0",
     "through2-filter": "^3.0.0",
     "through2-map": "^3.0.0",
     "to-readable-stream": "^2.1.0",
@@ -147,6 +147,6 @@
     "uuid": "^9.0.0",
     "wait-port": "^1.0.1",
     "winston": "^3.2.1",
-    "write-file-atomic": "^4.0.0"
+    "write-file-atomic": "^5.0.0"
   }
 }

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

@@ -1,6 +1,6 @@
 import execa from 'execa'
 
-import { injectEnvVariables } from '../../utils/dev.mjs'
+import { getDotEnvVariables, injectEnvVariables } from '../../utils/dev.mjs'
 import { getEnvelopeEnv, normalizeContext } from '../../utils/env/index.mjs'
 
 /**
@@ -16,7 +16,8 @@ const devExec = async (cmd, options, command) => {
     env = await getEnvelopeEnv({ api, context: options.context, env, siteInfo })
   }
 
-  await injectEnvVariables({ devConfig: { ...config.dev }, env, site })
+  env = await getDotEnvVariables({ devConfig: { ...config.dev }, env, site })
+  injectEnvVariables(env)
 
   await execa(cmd, command.args.slice(1), {
     stdio: 'inherit',

package/src/commands/dev/dev.mjs

@@ -18,7 +18,7 @@ import {
   normalizeConfig,
 } from '../../utils/command-helpers.mjs'
 import detectServerSettings, { getConfigWithPlugins } from '../../utils/detect-server-settings.mjs'
-import { getSiteInformation, injectEnvVariables } from '../../utils/dev.mjs'
+import { getDotEnvVariables, getSiteInformation, injectEnvVariables } from '../../utils/dev.mjs'
 import { getEnvelopeEnv, normalizeContext } from '../../utils/env/index.mjs'
 import { ensureNetlifyIgnore } from '../../utils/gitignore.mjs'
 import { startNetlifyGraph, startPollingForAPIAuthentication } from '../../utils/graph.mjs'
@@ -96,7 +96,8 @@ const dev = async (options, command) => {
     log(`${NETLIFYDEVLOG} Injecting environment variable values for ${chalk.yellow('all scopes')}`)
   }
 
-  await injectEnvVariables({ devConfig, env, site })
+  env = await getDotEnvVariables({ devConfig, env, site })
+  injectEnvVariables(env)
   await promptEditorHelper({ chalk, config, log, NETLIFYDEVLOG, repositoryRoot, state })
 
   const { addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({

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

@@ -19,7 +19,7 @@ import ora from 'ora'
 import { fileExistsAsync } from '../../lib/fs.mjs'
 import { getAddons, getCurrentAddon, getSiteData } from '../../utils/addons/prepare.mjs'
 import { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, log } from '../../utils/command-helpers.mjs'
-import { injectEnvVariables } from '../../utils/dev.mjs'
+import { getDotEnvVariables, injectEnvVariables } from '../../utils/dev.mjs'
 import execa from '../../utils/execa.mjs'
 import { readRepoURL, validateRepoURL } from '../../utils/read-repo-url.mjs'
 
@@ -549,11 +549,12 @@ const handleOnComplete = async ({ command, onComplete }) => {
   const { config } = command.netlify
 
   if (onComplete) {
-    await injectEnvVariables({
+    const env = await getDotEnvVariables({
       devConfig: { ...config.dev },
       env: command.netlify.cachedConfig.env,
       site: command.netlify.site,
     })
+    injectEnvVariables(env)
     await onComplete.call(command)
   }
 }

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

@@ -2,7 +2,7 @@
 import { join } from 'path'
 
 import { startFunctionsServer } from '../../lib/functions/server.mjs'
-import { acquirePort, getSiteInformation, injectEnvVariables } from '../../utils/dev.mjs'
+import { acquirePort, getDotEnvVariables, getSiteInformation, injectEnvVariables } from '../../utils/dev.mjs'
 import { getFunctionsDir } from '../../utils/functions/index.mjs'
 
 const DEFAULT_PORT = 9999
@@ -16,11 +16,12 @@ const functionsServe = async (options, command) => {
   const { api, config, site, siteInfo } = command.netlify
 
   const functionsDir = getFunctionsDir({ options, config }, join('netlify', 'functions'))
-  const { env } = command.netlify.cachedConfig
+  let { env } = command.netlify.cachedConfig
 
   env.NETLIFY_DEV = { sources: ['internal'], value: 'true' }
 
-  await injectEnvVariables({ devConfig: { ...config.dev }, env, site })
+  env = await getDotEnvVariables({ devConfig: { ...config.dev }, env, site })
+  injectEnvVariables(env)
 
   const { capabilities, siteUrl, timeouts } = await getSiteInformation({
     offline: options.offline,

package/src/commands/serve/serve.mjs

@@ -16,7 +16,7 @@ import {
   normalizeConfig,
 } from '../../utils/command-helpers.mjs'
 import detectServerSettings, { getConfigWithPlugins } from '../../utils/detect-server-settings.mjs'
-import { getSiteInformation, injectEnvVariables } from '../../utils/dev.mjs'
+import { getDotEnvVariables, getSiteInformation, injectEnvVariables } from '../../utils/dev.mjs'
 import { getEnvelopeEnv, normalizeContext } from '../../utils/env/index.mjs'
 import { getInternalFunctionsDir } from '../../utils/functions/functions.mjs'
 import { ensureNetlifyIgnore } from '../../utils/gitignore.mjs'
@@ -52,7 +52,8 @@ const serve = async (options, command) => {
     log(`${NETLIFYDEVLOG} Injecting environment variable values for ${chalk.yellow('all scopes')}`)
   }
 
-  await injectEnvVariables({ devConfig, env, site })
+  env = await getDotEnvVariables({ devConfig, env, site })
+  injectEnvVariables(env)
   await promptEditorHelper({ chalk, config, log, NETLIFYDEVLOG, repositoryRoot, state })
 
   const { addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({

package/src/commands/watch/watch.mjs

@@ -42,8 +42,10 @@ const waitForBuildFinish = async function (api, siteId, spinner) {
 
   await pWaitFor(waitForBuildToFinish, {
     interval: BUILD_FINISH_INTERVAL,
-    timeout: BUILD_FINISH_TIMEOUT,
-    message: 'Timeout while waiting for deploy to finish',
+    timeout: {
+      milliseconds: BUILD_FINISH_TIMEOUT,
+      message: 'Timeout while waiting for deploy to finish',
+    },
   })
 
   // return only when build done or timeout happens

package/src/lib/edge-functions/proxy.mjs

@@ -79,11 +79,12 @@ export const initializeProxy = async ({
   const server = prepareServer({
     config,
     configPath,
-    directories: [internalFunctionsPath, userFunctionsPath].filter(Boolean),
+    directory: userFunctionsPath,
     env: configEnv,
     getUpdatedConfig,
     importMaps: [importMap].filter(Boolean),
     inspectSettings,
+    internalDirectory: internalFunctionsPath,
     internalFunctions,
     port: isolatePort,
     projectDir,
@@ -153,11 +154,12 @@ export const isEdgeFunctionsRequest = (req) => req[headersSymbol] !== undefined
 const prepareServer = async ({
   config,
   configPath,
-  directories,
+  directory,
   env: configEnv,
   getUpdatedConfig,
   importMaps,
   inspectSettings,
+  internalDirectory,
   internalFunctions,
   port,
   projectDir,
@@ -187,9 +189,10 @@ const prepareServer = async ({
       bundler,
       config,
       configPath,
-      directories,
+      directories: [directory].filter(Boolean),
       env: configEnv,
       getUpdatedConfig,
+      internalDirectories: [internalDirectory].filter(Boolean),
       internalFunctions,
       projectDir,
       runIsolate,