netlify-cli 15.1.0 → 15.2.0

package/src/lib/functions/registry.mjs

@@ -15,7 +15,7 @@ import {
   watchDebounced,
 } from '../../utils/command-helpers.mjs'
 import { INTERNAL_FUNCTIONS_FOLDER, SERVE_FUNCTIONS_FOLDER } from '../../utils/functions/functions.mjs'
-import { getLogMessage } from '../log.mjs'
+import { BACKGROUND_FUNCTIONS_WARNING } from '../log.mjs'
 import { getPathInProject } from '../settings.mjs'
 
 import NetlifyFunction from './netlify-function.mjs'
@@ -140,7 +140,7 @@ export class FunctionsRegistry {
     }
 
     if (func.isBackground && this.isConnected && !this.capabilities.backgroundFunctions) {
-      warn(getLogMessage('functions.backgroundNotSupported'))
+      warn(BACKGROUND_FUNCTIONS_WARNING)
     }
 
     if (!func.hasValidName()) {

package/src/lib/functions/runtimes/js/builders/zisi.mjs

@@ -3,7 +3,7 @@ import { createRequire } from 'module'
 import path from 'path'
 
 import decache from 'decache'
-import readPkgUp from 'read-pkg-up'
+import { readPackageUp } from 'read-pkg-up'
 import sourceMapSupport from 'source-map-support'
 
 import { NETLIFYDEVERR } from '../../../../../utils/command-helpers.mjs'
@@ -112,7 +112,7 @@ const netlifyConfigToZisiConfig = ({ config, projectRoot }) =>
 export default async function handler({ config, directory, errorExit, func, projectRoot }) {
   const functionsConfig = netlifyConfigToZisiConfig({ config, projectRoot })
 
-  const packageJson = await readPkgUp(func.mainFile)
+  const packageJson = await readPackageUp(func.mainFile)
   const hasTypeModule = packageJson && packageJson.packageJson.type === 'module'
 
   // We must use esbuild for certain file extensions.

package/src/lib/functions/server.mjs

@@ -1,5 +1,4 @@
 // @ts-check
-import { get } from 'dot-prop'
 import jwtDecode from 'jwt-decode'
 
 import { NETLIFYDEVERR, NETLIFYDEVLOG, error as errorExit, log } from '../../utils/command-helpers.mjs'
@@ -94,7 +93,7 @@ export const createHandler = function (options) {
       {},
     )
     const rawQuery = new URLSearchParams(request.query).toString()
-    const protocol = get(options, 'config.dev.https') ? 'https' : 'http'
+    const protocol = options.config?.dev?.https ? 'https' : 'http'
     const url = new URL(requestPath, `${protocol}://${request.get('host') || 'localhost'}`)
     url.search = rawQuery
     const rawUrl = url.toString()

package/src/lib/functions/utils.mjs

@@ -1,12 +1,12 @@
 // @ts-check
 import { chalk, warn } from '../../utils/command-helpers.mjs'
-import { getLogMessage } from '../log.mjs'
+import { MISSING_AWS_SDK_WARNING } from '../log.mjs'
 
 export const detectAwsSdkError = ({ error }) => {
   const isAwsSdkError = error && error.errorMessage && error.errorMessage.includes("Cannot find module 'aws-sdk'")
 
   if (isAwsSdkError) {
-    warn(getLogMessage('functions.missingAwsSdk'))
+    warn(MISSING_AWS_SDK_WARNING)
   }
 }
 

package/src/lib/log.mjs

@@ -1,27 +1,18 @@
-import dotProp from 'dot-prop'
-
 import { chalk } from '../utils/command-helpers.mjs'
 
 const RED_BACKGROUND = chalk.red('-background')
 const [PRO, BUSINESS, ENTERPRISE] = ['Pro', 'Business', 'Enterprise'].map((plan) => chalk.magenta(plan))
-const BACKGROUND_FUNCTIONS_WARNING = `A serverless function ending in \`${RED_BACKGROUND}\` was detected.
+export const BACKGROUND_FUNCTIONS_WARNING = `A serverless function ending in \`${RED_BACKGROUND}\` was detected.
 Your team’s current plan doesn’t support Background Functions, which have names ending in \`${RED_BACKGROUND}\`.
 To be able to deploy this function successfully either:
   - change the function name to remove \`${RED_BACKGROUND}\` and execute it synchronously
   - upgrade your team plan to a level that supports Background Functions (${PRO}, ${BUSINESS}, or ${ENTERPRISE})
 `
-const MISSING_AWS_SDK_WARNING = `A function has thrown an error due to a missing dependency: ${chalk.yellow('aws-sdk')}.
+export const MISSING_AWS_SDK_WARNING = `A function has thrown an error due to a missing dependency: ${chalk.yellow(
+  'aws-sdk',
+)}.
 You should add this module to the project's dependencies, using your package manager of choice:
 
 ${chalk.yellow('npm install aws-sdk --save')} or ${chalk.yellow('yarn add aws-sdk')}
 
 For more information, see https://ntl.fyi/cli-aws-sdk.`
-
-const messages = {
-  functions: {
-    backgroundNotSupported: BACKGROUND_FUNCTIONS_WARNING,
-    missingAwsSdk: MISSING_AWS_SDK_WARNING,
-  },
-}
-
-export const getLogMessage = (key) => dotProp.get(messages, key, 'Missing Log Message Key')

package/src/utils/dev.mjs

@@ -1,7 +1,6 @@
 // @ts-check
 import process from 'process'
 
-import { get } from 'dot-prop'
 import getPort from 'get-port'
 import isEmpty from 'lodash/isEmpty.js'
 
@@ -112,7 +111,7 @@ export const getSiteInformation = async ({ api, offline, site, siteInfo }) => {
         backgroundFunctions: supportsBackgroundFunctions(account),
       },
       timeouts: {
-        syncFunctions: get(siteInfo, 'functions_config.timeout', SYNCHRONOUS_FUNCTION_TIMEOUT),
+        syncFunctions: siteInfo.functions_config?.timeout ?? SYNCHRONOUS_FUNCTION_TIMEOUT,
         backgroundFunctions: BACKGROUND_FUNCTION_TIMEOUT,
       },
     }

package/src/utils/get-site.mjs

@@ -0,0 +1,16 @@
+import { error } from './command-helpers.mjs'
+
+export const getSiteByName = async (api, siteName) => {
+  try {
+    const sites = await api.listSites({ name: siteName, filter: 'all' })
+    const siteFoundByName = sites.find((filteredSite) => filteredSite.name === siteName)
+
+    if (!siteFoundByName) {
+      throw Error
+    }
+
+    return siteFoundByName
+  } catch {
+    error('Site not found. Please rerun "netlify link"')
+  }
+}

package/src/utils/hooks/requires-site-info.mjs

@@ -0,0 +1,29 @@
+import { error, warn } from '../command-helpers.mjs'
+/**
+ * A preAction hook that errors out if siteInfo is an empty object
+ * @param {*} command
+ */
+const requiresSiteInfo = async (command) => {
+  const { api, site } = command.netlify
+  const siteId = site.id
+  if (!siteId) {
+    warn('Did you run `netlify link` yet?')
+    return error(`You don't appear to be in a folder that is linked to a site`)
+  }
+  try {
+    await api.getSite({ siteId })
+  } catch (error_) {
+    // unauthorized
+    if (error_.status === 401) {
+      warn(`Log in with a different account or re-link to a site you have permission for`)
+      return error(`Not authorized to view the currently linked site (${siteId})`)
+    }
+    // missing
+    if (error_.status === 404) {
+      return error(`The site this folder is linked to can't be found`)
+    }
+    return error(error_)
+  }
+}
+
+export default requiresSiteInfo

package/src/utils/proxy.mjs

@@ -11,7 +11,7 @@ import zlib from 'zlib'
 
 import contentType from 'content-type'
 import cookie from 'cookie'
-import { get } from 'dot-prop'
+import { getProperty } from 'dot-prop'
 import generateETag from 'etag'
 import getAvailablePort from 'get-port'
 import httpProxy from 'http-proxy'
@@ -210,7 +210,7 @@ const serveRedirect = async function ({ env, match, options, proxy, req, res, si
       if ((jwtValue.exp || 0) < Math.round(Date.now() / MILLISEC_TO_SEC)) {
         console.warn(NETLIFYDEVWARN, 'Expired JWT provided in request', req.url)
       } else {
-        const presentedRoles = get(jwtValue, options.jwtRolePath) || []
+        const presentedRoles = getProperty(jwtValue, options.jwtRolePath) || []
         if (!Array.isArray(presentedRoles)) {
           console.warn(NETLIFYDEVWARN, `Invalid roles value provided in JWT ${options.jwtRolePath}`, presentedRoles)
           res.writeHead(400)

package/src/utils/state-config.mjs

@@ -2,7 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import process from 'process'
 
-import dotProp from 'dot-prop'
+import { deleteProperty, getProperty, hasProperty, setProperty } from 'dot-prop'
 import { findUpSync } from 'find-up'
 import writeFileAtomic from 'write-file-atomic'
 
@@ -75,7 +75,7 @@ export default class StateConfig {
       // TODO figure out cleaner way of grabbing ENV vars
       return process.env.NETLIFY_SITE_ID
     }
-    return dotProp.get(this.all, key)
+    return getProperty(this.all, key)
   }
 
   set(...args) {
@@ -84,22 +84,22 @@ export default class StateConfig {
 
     if (args.length === 1) {
       Object.entries(key).forEach(([keyPart, value]) => {
-        dotProp.set(config, keyPart, value)
+        setProperty(config, keyPart, value)
       })
     } else {
-      dotProp.set(config, key, val)
+      setProperty(config, key, val)
     }
 
     this.all = config
   }
 
   has(key) {
-    return dotProp.has(this.all, key)
+    return hasProperty(this.all, key)
   }
 
   delete(key) {
     const config = this.all
-    dotProp.delete(config, key)
+    deleteProperty(config, key)
     this.all = config
   }