netlify-cli 15.9.1-rc.0 → 15.10.0

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

@@ -2,6 +2,7 @@
 import fs from 'fs'
 import { createRequire } from 'module'
 import path from 'path'
+import process from 'process'
 
 import inquirer from 'inquirer'
 import fetch from 'node-fetch'
@@ -55,18 +56,14 @@ const formatQstring = function (querystring) {
   return ''
 }
 
-/**
- * process payloads from flag
- * @param {string} payloadString
- * @param {string} workingDir
- */
-const processPayloadFromFlag = function (payloadString, workingDir) {
+/** process payloads from flag */
+const processPayloadFromFlag = function (payloadString) {
   if (payloadString) {
     // case 1: jsonstring
     let payload = tryParseJSON(payloadString)
     if (payload) return payload
     // case 2: jsonpath
-    const payloadpath = path.join(workingDir, payloadString)
+    const payloadpath = path.join(process.cwd(), payloadString)
     const pathexists = fs.existsSync(payloadpath)
     if (pathexists) {
       try {
@@ -213,7 +210,7 @@ const functionsInvoke = async (nameArgument, options, command) => {
       // }
     }
   }
-  const payload = processPayloadFromFlag(options.payload, command.workingDir)
+  const payload = processPayloadFromFlag(options.payload)
   body = { ...body, ...payload }
 
   try {

package/src/commands/init/init.mjs

@@ -196,7 +196,7 @@ export const init = async (options, command) => {
   }
 
   // Look for local repo
-  const repoData = await getRepoData({ workingDir: command.workingDir, remoteName: options.gitRemoteName })
+  const repoData = await getRepoData({ remoteName: options.gitRemoteName })
   if (repoData.error) {
     await handleNoGitRemoteAndExit({ command, error: repoData.error, state })
   }

package/src/commands/link/link.mjs

@@ -11,11 +11,11 @@ import { track } from '../../utils/telemetry/index.mjs'
 
 /**
  *
- * @param {import('../base-command.mjs').default} command
+ * @param {import('../base-command.mjs').NetlifyOptions} netlify
  * @param {import('commander').OptionValues} options
  */
-const linkPrompt = async (command, options) => {
-  const { api, state } = command.netlify
+const linkPrompt = async (netlify, options) => {
+  const { api, state } = netlify
 
   const SITE_NAME_PROMPT = 'Search by full or partial site name'
   const SITE_LIST_PROMPT = 'Choose from a list of your recently updated sites'
@@ -24,7 +24,7 @@ const linkPrompt = async (command, options) => {
   let GIT_REMOTE_PROMPT = 'Use the current git remote origin URL'
   let site
   // Get git remote data if exists
-  const repoData = await getRepoData({ workingDir: command.workingDir, remoteName: options.gitRemoteName })
+  const repoData = await getRepoData({ remoteName: options.gitRemoteName })
 
   let linkChoices = [SITE_NAME_PROMPT, SITE_LIST_PROMPT, SITE_ID_PROMPT]
 
@@ -326,7 +326,7 @@ export const link = async (options, command) => {
       kind: 'byName',
     })
   } else {
-    siteData = await linkPrompt(command, options)
+    siteData = await linkPrompt(command.netlify, options)
   }
   return siteData
 }

package/src/commands/serve/serve.mjs

@@ -69,10 +69,10 @@ const serve = async (options, command) => {
   // Netlify Build are loaded.
   await getInternalFunctionsDir({ base: site.root, ensureExists: true })
 
-  /** @type {Partial<import('../../utils/types.js').ServerSettings>} */
+  /** @type {Partial<import('../../utils/types').ServerSettings>} */
   let settings = {}
   try {
-    settings = await detectServerSettings(devConfig, options, command)
+    settings = await detectServerSettings(devConfig, options, site.root)
 
     cachedConfig.config = getConfigWithPlugins(cachedConfig.config, settings)
   } catch (error_) {
@@ -87,13 +87,7 @@ const serve = async (options, command) => {
     `${NETLIFYDEVWARN} Changes will not be hot-reloaded, so if you need to rebuild your site you must exit and run 'netlify serve' again`,
   )
 
-  const { configPath: configPathOverride } = await runBuildTimeline({
-    cachedConfig,
-    options,
-    settings,
-    projectDir: command.workingDir,
-    site,
-  })
+  const { configPath: configPathOverride } = await runBuildTimeline({ cachedConfig, options, settings, site })
 
   await startFunctionsServer({
     api,
@@ -123,7 +117,8 @@ const serve = async (options, command) => {
 
   // TODO: We should consolidate this with the existing config watcher.
   const getUpdatedConfig = async () => {
-    const { config: newConfig } = await command.getConfig({ cwd: command.workingDir, offline: true, state })
+    const cwd = options.cwd || process.cwd()
+    const { config: newConfig } = await command.getConfig({ cwd, offline: true, state })
     const normalizedNewConfig = normalizeConfig(newConfig)
 
     return normalizedNewConfig
@@ -140,7 +135,6 @@ const serve = async (options, command) => {
     getUpdatedConfig,
     inspectSettings,
     offline: options.offline,
-    projectDir: command.workingDir,
     settings,
     site,
     siteInfo,

package/src/commands/sites/sites-create-template.mjs

@@ -197,7 +197,7 @@ const sitesCreateTemplate = async (repository, options, command) => {
 
   if (options.withCi) {
     log('Configuring CI')
-    const repoData = await getRepoData({ workingDir: command.workingDir })
+    const repoData = await getRepoData()
     await configureRepo({ command, siteId: site.id, repoData, manual: options.manual })
   }
 

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

@@ -102,7 +102,7 @@ export const sitesCreate = async (options, command) => {
 
   if (options.withCi) {
     log('Configuring CI')
-    const repoData = await getRepoData({ workingDir: command.workingDir })
+    const repoData = await getRepoData()
     await configureRepo({ command, siteId: site.id, repoData, manual: options.manual })
   }
 

package/src/functions-templates/typescript/hello-world/package-lock.json

@@ -26,9 +26,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.18.53",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.53.tgz",
-      "integrity": "sha512-soGmOpVBUq+gaBMwom1M+krC/NNbWlosh4AtGA03SyWNDiqSKtwp7OulO1M6+mg8YkHMvJ/y0AkCeO8d1hNb7A=="
+      "version": "14.18.54",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.54.tgz",
+      "integrity": "sha512-uq7O52wvo2Lggsx1x21tKZgqkJpvwCseBBPtX/nKQfpVlEsLOb11zZ1CRsWUKvJF0+lzuA9jwvA7Pr2Wt7i3xw=="
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
@@ -58,9 +58,9 @@
       }
     },
     "@types/node": {
-      "version": "14.18.53",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.53.tgz",
-      "integrity": "sha512-soGmOpVBUq+gaBMwom1M+krC/NNbWlosh4AtGA03SyWNDiqSKtwp7OulO1M6+mg8YkHMvJ/y0AkCeO8d1hNb7A=="
+      "version": "14.18.54",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.54.tgz",
+      "integrity": "sha512-uq7O52wvo2Lggsx1x21tKZgqkJpvwCseBBPtX/nKQfpVlEsLOb11zZ1CRsWUKvJF0+lzuA9jwvA7Pr2Wt7i3xw=="
     },
     "is-promise": {
       "version": "4.0.0",

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

@@ -1,5 +1,5 @@
 import { env } from 'process'
 
-const latestBootstrapURL = 'https://64ae60d920fd0f000865bcfc--edge.netlify.com/bootstrap/index-combined.ts'
+const latestBootstrapURL = 'https://64c264287e9cbb0008621df3--edge.netlify.com/bootstrap/index-combined.ts'
 
 export const getBootstrapURL = () => env.NETLIFY_EDGE_BOOTSTRAP || latestBootstrapURL

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

@@ -2,6 +2,7 @@
 import { Buffer } from 'buffer'
 
 export const headers = {
+  DeployID: 'x-nf-deploy-id',
   FeatureFlags: 'x-nf-feature-flags',
   ForwardedHost: 'x-forwarded-host',
   Functions: 'x-nf-edge-functions',

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

@@ -1,16 +1,14 @@
 // @ts-check
 import { readFile, stat } from 'fs/promises'
 import { dirname, join, resolve } from 'path'
+import { cwd } from 'process'
 
 import { getPathInProject } from '../settings.mjs'
 
 import { INTERNAL_EDGE_FUNCTIONS_FOLDER } from './consts.mjs'
 
-/**
- * @param {string} workingDir
- */
-export const getInternalFunctions = async (workingDir) => {
-  const path = join(workingDir, getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]))
+export const getInternalFunctions = async () => {
+  const path = join(cwd(), getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]))
 
   try {
     const stats = await stat(path)

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

@@ -1,7 +1,7 @@
 // @ts-check
 import { Buffer } from 'buffer'
 import { relative } from 'path'
-import { env } from 'process'
+import { cwd, env } from 'process'
 
 // eslint-disable-next-line import/no-namespace
 import * as bundler from '@netlify/edge-bundler'
@@ -62,26 +62,6 @@ export const createAccountInfoHeader = (accountInfo = {}) => {
   return Buffer.from(accountString).toString('base64')
 }
 
-/**
- *
- * @param {object} config
- * @param {*} config.accountId
- * @param {*} config.config
- * @param {*} config.configPath
- * @param {*} config.debug
- * @param {*} config.env
- * @param {*} config.geoCountry
- * @param {*} config.geolocationMode
- * @param {*} config.getUpdatedConfig
- * @param {*} config.inspectSettings
- * @param {*} config.mainPort
- * @param {boolean=} config.offline
- * @param {*} config.passthroughPort
- * @param {*} config.projectDir
- * @param {*} config.siteInfo
- * @param {*} config.state
- * @returns
- */
 export const initializeProxy = async ({
   accountId,
   config,
@@ -99,11 +79,7 @@ export const initializeProxy = async ({
   siteInfo,
   state,
 }) => {
-  const {
-    functions: internalFunctions,
-    importMap,
-    path: internalFunctionsPath,
-  } = await getInternalFunctions(projectDir)
+  const { functions: internalFunctions, importMap, path: internalFunctionsPath } = await getInternalFunctions()
   const userFunctionsPath = config.build.edge_functions
   const isolatePort = await getAvailablePort()
 
@@ -139,6 +115,7 @@ export const initializeProxy = async ({
 
     // Setting header with geolocation and site info.
     req.headers[headers.Geo] = Buffer.from(JSON.stringify(geoLocation)).toString('base64')
+    req.headers[headers.DeployID] = '0'
     req.headers[headers.Site] = createSiteInfoHeader(siteInfo)
     req.headers[headers.Account] = createAccountInfoHeader({ id: accountId })
 
@@ -156,7 +133,7 @@ export const initializeProxy = async ({
         )} matches declaration for edge function ${chalk.yellow(
           functionName,
         )}, but there's no matching function file in ${chalk.yellow(
-          relative(projectDir, userFunctionsPath),
+          relative(cwd(), userFunctionsPath),
         )}. Please visit ${chalk.blue('https://ntl.fyi/edge-create')} for more information.`,
       )
     })

package/src/lib/functions/runtimes/js/index.mjs

@@ -3,7 +3,7 @@ import { dirname } from 'path'
 import { pathToFileURL } from 'url'
 import { Worker } from 'worker_threads'
 
-import lambdaLocal from '@skn0tt/lambda-local'
+import lambdaLocal from 'lambda-local'
 import winston from 'winston'
 
 import detectNetlifyLambdaBuilder from './builders/netlify-lambda.mjs'

package/src/lib/functions/runtimes/js/worker.mjs

@@ -1,8 +1,8 @@
 import { createServer } from 'net'
 import { isMainThread, workerData, parentPort } from 'worker_threads'
 
-import lambdaLocal from '@skn0tt/lambda-local'
 import { isStream } from 'is-stream'
+import lambdaLocal from 'lambda-local'
 import sourceMapSupport from 'source-map-support'
 
 if (isMainThread) {

package/src/lib/spinner.mjs

@@ -17,7 +17,7 @@ export const startSpinner = ({ text }) =>
  * Stops the spinner with the following text
  * @param {object} config
  * @param {ora.Ora} config.spinner
- * @param {boolean} [config.error]
+ * @param {object} [config.error]
  * @param {string} [config.text]
  * @returns {void}
  */

package/src/utils/command-helpers.mjs

@@ -24,7 +24,7 @@ const argv = process.argv.slice(2)
  * Chalk instance for CLI that can be initialized with no colors mode
  * needed for json outputs where we don't want to have colors
  * @param  {boolean} noColors - disable chalk colors
- * @return {import('chalk').ChalkInstance} - default or custom chalk instance
+ * @return {object} - default or custom chalk instance
  */
 const safeChalk = function (noColors) {
   if (noColors) {
@@ -174,18 +174,12 @@ export const warn = (message = '') => {
 
 /**
  * throws an error or log it
- * @param {unknown} message
+ * @param {string|Error} message
  * @param {object} [options]
  * @param {boolean} [options.exit]
  */
 export const error = (message = '', options = {}) => {
-  const err =
-    message instanceof Error
-      ? message
-      : // eslint-disable-next-line unicorn/no-nested-ternary
-      typeof message === 'string'
-      ? new Error(message)
-      : /** @type {Error} */ ({ message, stack: undefined, name: 'Error' })
+  const err = message instanceof Error ? message : new Error(message)
 
   if (options.exit === false) {
     const bang = chalk.red(BANG)
@@ -204,13 +198,10 @@ export const exit = (code = 0) => {
   process.exit(code)
 }
 
-/**
- * When `build.publish` is not set by the user, the CLI behavior differs in
- * several ways. It detects it by checking if `build.publish` is `undefined`.
- * However, `@netlify/config` adds a default value to `build.publish`.
- * This removes 'publish' and 'publishOrigin' in this case.
- * @param {*} config
- */
+// When `build.publish` is not set by the user, the CLI behavior differs in
+// several ways. It detects it by checking if `build.publish` is `undefined`.
+// However, `@netlify/config` adds a default value to `build.publish`.
+// This removes 'publish' and 'publishOrigin' in this case.
 export const normalizeConfig = (config) => {
   // Unused var here is in order to omit 'publish' from build config
   // eslint-disable-next-line no-unused-vars