netlify-cli 13.2.2 → 14.0.0

package/src/utils/dev.mjs

@@ -137,30 +137,40 @@ const getEnvSourceName = (source) => {
   return printFn(name)
 }
 
-// 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`.
-export const injectEnvVariables = async ({ devConfig, env, site }) => {
-  const environment = new Map(Object.entries(env))
+/**
+ * @param {{devConfig: any, env: Record<string, { sources: string[], value: string}>, site: any}} param0
+ * @returns {Promise<Record<string, { sources: string[], value: string}>>}
+ */
+export const getDotEnvVariables = async ({ devConfig, env, site }) => {
   const dotEnvFiles = await loadDotEnvFiles({ envFiles: devConfig.envFiles, projectDir: site.root })
-
   dotEnvFiles.forEach(({ env: fileEnv, file }) => {
+    const newSourceName = `${file} file`
+
     Object.keys(fileEnv).forEach((key) => {
-      const newSourceName = `${file} file`
-      const sources = environment.has(key) ? [newSourceName, ...environment.get(key).sources] : [newSourceName]
+      const sources = key in env ? [newSourceName, ...env[key].sources] : [newSourceName]
 
       if (sources.includes('internal')) {
         return
       }
 
-      environment.set(key, {
+      env[key] = {
         sources,
         value: fileEnv[key],
-      })
+      }
     })
   })
 
+  return env
+}
+
+/**
+ * Takes a set of environment variables in the format provided by @netlify/config and injects them into `process.env`
+ * @param {Record<string, { sources: string[], value: string}>} env
+ * @return {void}
+ */
+export const injectEnvVariables = (env) => {
   // eslint-disable-next-line fp/no-loops
-  for (const [key, variable] of environment) {
+  for (const [key, variable] of Object.entries(env)) {
     const existsInProcess = process.env[key] !== undefined
     const [usedSource, ...overriddenSources] = existsInProcess ? ['process', ...variable.sources] : variable.sources
     const usedSourceName = getEnvSourceName(usedSource)

package/src/utils/init/node-version.mjs

@@ -1,7 +1,6 @@
 // @ts-check
 import { readFile } from 'fs/promises'
 
-import { get } from 'dot-prop'
 import { locatePath } from 'locate-path'
 import nodeVersionAlias from 'node-version-alias'
 
@@ -18,10 +17,10 @@ export const detectNodeVersion = async ({ baseDirectory, env }) => {
   try {
     const nodeVersionFile = await locatePath(['.nvmrc', '.node-version'], { cwd: baseDirectory })
     const configuredVersion =
-      nodeVersionFile === undefined ? get(env, 'NODE_VERSION.value') : await readFile(nodeVersionFile, 'utf8')
+      nodeVersionFile === undefined ? env.NODE_VERSION?.value : await readFile(nodeVersionFile, 'utf8')
 
     const version =
-      configuredVersion === undefined
+      configuredVersion === undefined || configuredVersion === null
         ? DEFAULT_NODE_VERSION
         : await nodeVersionAlias(normalizeConfiguredVersion(configuredVersion))
 

package/src/utils/live-tunnel.mjs

@@ -111,7 +111,7 @@ export const startLiveTunnel = async ({ localPort, netlifyApiToken, siteId }) =>
     return data.state === 'online'
   }
 
-  await connectTunnel({ session, netlifyApiToken, localPort })
+  connectTunnel({ session, netlifyApiToken, localPort })
 
   // Waiting for the live session to have a state of `online`.
   await pWaitFor(isLiveTunnelReady, {

package/src/utils/proxy.mjs

@@ -575,6 +575,11 @@ const onRequest = async (
   proxy.web(req, res, options)
 }
 
+export const getProxyUrl = function (settings) {
+  const scheme = settings.https ? 'https' : 'http'
+  return `${scheme}://localhost:${settings.port}`
+}
+
 export const startProxy = async function ({
   addonsUrls,
   config,
@@ -665,8 +670,7 @@ export const startProxy = async function ({
 
   await Promise.all(eventQueue)
 
-  const scheme = settings.https ? 'https' : 'http'
-  return `${scheme}://localhost:${settings.port}`
+  return getProxyUrl(settings)
 }
 
 const BYTES_LIMIT = 30

package/src/utils/run-build.mjs

@@ -56,7 +56,7 @@ const getBuildOptions = ({
   saveConfig,
 })
 
-const runNetlifyBuild = async ({ cachedConfig, options, settings, site, timeline = 'build' }) => {
+const runNetlifyBuild = async ({ cachedConfig, env, options, settings, site, timeline = 'build' }) => {
   const { default: buildSite, startDev } = await netlifyBuildPromise
   const sharedOptions = getBuildOptions({
     cachedConfig,
@@ -112,6 +112,7 @@ const runNetlifyBuild = async ({ cachedConfig, options, settings, site, timeline
     // Set `quiet` to suppress non-essential output from Netlify Build unless
     // the `debug` flag is set.
     quiet: !options.debug,
+    env,
   }
 
   // Run Netlify Build using the `startDev` entry point.