netlify-cli 14.0.0-rc → 14.1.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/execa.mjs

@@ -2,6 +2,10 @@ import { env } from 'process'
 // This is a thin layer on top of `execa` that allows consumers to provide an
 // alternative path to the module location, making it easier to mock its logic
 // in tests (see `tests/utils/mock-execa.js`).
+
+/**
+ * @type {import('execa')}
+ */
 // eslint-disable-next-line import/no-mutable-exports
 let execa
 

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/telemetry/index.mjs

@@ -1 +1,2 @@
 export { track, identify } from './telemetry.mjs'
+export { reportError } from './report-error.mjs'

package/src/utils/telemetry/report-error.mjs

@@ -0,0 +1,44 @@
+import { dirname, join } from 'path'
+import process, { version as nodejsVersion } from 'process'
+import { fileURLToPath } from 'url'
+
+import execa from '../execa.mjs'
+import getGlobalConfig from '../get-global-config.mjs'
+
+import { cliVersion } from './utils.mjs'
+
+const dirPath = dirname(fileURLToPath(import.meta.url))
+
+/**
+ *
+ * @param {import('@bugsnag/js').NotifiableError} error
+ * @param {object} config
+ * @param {import('@bugsnag/js').Event['severity']} config.severity
+ * @returns {Promise<void>}
+ */
+export const reportError = async function (error, config = {}) {
+  const globalConfig = await getGlobalConfig()
+
+  const options = JSON.stringify({
+    type: 'error',
+    data: {
+      message: error.message,
+      name: error.name,
+      stack: error.stack,
+      cause: error.cause,
+      severity: config.severity,
+      user: {
+        id: globalConfig.get('userId'),
+      },
+      osName: process.platform,
+      cliVersion,
+      nodejsVersion,
+    },
+  })
+
+  // spawn detached child process to handle send
+  execa(process.execPath, [join(dirPath, 'request.mjs'), options], {
+    detached: true,
+    stdio: 'ignore',
+  }).unref()
+}

package/src/utils/telemetry/request.mjs

@@ -14,13 +14,23 @@ const options = JSON.parse(process.argv[2])
 const CLIENT_ID = 'NETLIFY_CLI'
 const TRACK_URL = process.env.NETLIFY_TEST_TRACK_URL || 'https://cli.netlify.com/telemetry/track'
 const IDENTIFY_URL = process.env.NETLIFY_TEST_IDENTIFY_URL || 'https://cli.netlify.com/telemetry/identify'
-
-const API_URL = options.type && options.type === 'track' ? TRACK_URL : IDENTIFY_URL
+const REPORT_ERROR_URL = process.env.NETLIFY_TEST_ERROR_REPORT_URL || 'https://cli.netlify.com/report-error'
+
+const getApiUrl = () => {
+  switch (options.type) {
+    case 'track':
+      return TRACK_URL
+    case 'error':
+      return REPORT_ERROR_URL
+    default:
+      return IDENTIFY_URL
+  }
+}
 
 // Make telemetry call
 const makeRequest = async function () {
   try {
-    await fetch(API_URL, {
+    await fetch(getApiUrl(), {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',

package/src/utils/telemetry/telemetry.mjs

@@ -7,16 +7,10 @@ import { isCI } from 'ci-info'
 
 import execa from '../execa.mjs'
 import getGlobalConfig from '../get-global-config.mjs'
-import getPackageJson from '../get-package-json.mjs'
 
+import { isTelemetryDisabled, cliVersion } from './utils.mjs'
 import isValidEventName from './validation.mjs'
 
-const { version: cliVersion } = await getPackageJson()
-
-const isTelemetryDisabled = function (config) {
-  return config.get('telemetryDisabled')
-}
-
 const dirPath = dirname(fileURLToPath(import.meta.url))
 
 const send = function (type, payload) {

package/src/utils/telemetry/utils.mjs

@@ -0,0 +1,7 @@
+import getPackageJson from '../get-package-json.mjs'
+
+export const { version: cliVersion } = await getPackageJson()
+
+export const isTelemetryDisabled = function (config) {
+  return config.get('telemetryDisabled')
+}