netlify-cli 8.15.2 → 8.16.0-rc-eh

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "8.15.2",
+  "version": "8.16.0-rc-eh",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "8.15.2",
+      "version": "8.16.0-rc-eh",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "8.15.2",
+  "version": "8.16.0-rc-eh",
   "author": "Netlify Inc.",
   "contributors": [
     "Mathias Biilmann <matt@netlify.com> (https://twitter.com/biilmann)",

package/src/commands/deploy/deploy.js

@@ -20,7 +20,6 @@ const {
   NETLIFYDEVERR,
   NETLIFYDEVLOG,
   chalk,
-  deployEdgeHandlers,
   deploySite,
   error,
   exit,
@@ -313,12 +312,6 @@ const runDeploy = async ({
     results = await api.createSiteDeploy({ siteId, title, body: { draft, branch: alias } })
     deployId = results.id
 
-    await deployEdgeHandlers({
-      site,
-      deployId,
-      api,
-      silent,
-    })
     const internalFunctionsFolder = await getInternalFunctionsDir({ base: site.root })
 
     // The order of the directories matter: zip-it-and-ship-it will prioritize

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

@@ -156,7 +156,7 @@ const functionsInvoke = async (nameArgument, options, command) => {
     console.warn(`${NETLIFYDEVWARN} "port" flag was not specified. Attempting to connect to localhost:8888 by default`)
   const port = options.port || DEFAULT_PORT
 
-  const functions = await getFunctions(functionsDir, config)
+  const functions = await getFunctions(functionsDir)
   const functionToTrigger = await getNameFromArgs(functions, options, nameArgument)
   const functionObj = functions.find((func) => func.name === functionToTrigger)
 

package/src/lib/edge-handlers/index.js

@@ -0,0 +1,23 @@
+// @ts-check
+const path = require('path')
+
+const { getPathInProject } = require('../settings')
+
+const EDGE_HANDLERS_FOLDER = 'edge-handlers-dist'
+const PUBLIC_URL_PATH = '.netlify/internal/edge-handlers'
+
+const internalPath = getPathInProject([EDGE_HANDLERS_FOLDER])
+
+const deployFileNormalizer = (file) => {
+  const isEdgeHandler = file.root === internalPath
+  const normalizedPath = isEdgeHandler ? path.join(PUBLIC_URL_PATH, file.normalizedPath) : file.normalizedPath
+
+  return {
+    ...file,
+    normalizedPath,
+  }
+}
+
+const isEdgeHandlerFile = (filePath) => filePath.startsWith(`${PUBLIC_URL_PATH}${path.sep}`)
+
+module.exports = { deployFileNormalizer, internalPath, isEdgeHandlerFile }

package/src/utils/deploy/deploy-site.js

@@ -1,6 +1,7 @@
 const cleanDeep = require('clean-deep')
 const tempy = require('tempy')
 
+const edgeHandlers = require('../../lib/edge-handlers')
 const { rmdirRecursiveAsync } = require('../../lib/fs')
 const { warn } = require('../command-helpers')
 
@@ -52,9 +53,18 @@ const deploySite = async (
     phase: 'start',
   })
 
+  const edgeHandlersPath = edgeHandlers.internalPath
   const [{ files, filesShaMap }, { fnShaMap, functionSchedules, functions, functionsWithNativeModules }] =
     await Promise.all([
-      hashFiles(dir, configPath, { concurrentHash, hashAlgorithm, assetType, statusCb, filter }),
+      hashFiles({
+        assetType,
+        concurrentHash,
+        directories: [configPath, dir, edgeHandlersPath],
+        filter,
+        hashAlgorithm,
+        normalizer: edgeHandlers.deployFileNormalizer,
+        statusCb,
+      }),
       hashFns(fnDir, {
         functionsConfig,
         tmpDir,
@@ -67,13 +77,18 @@ const deploySite = async (
         skipFunctionsCache,
       }),
     ])
-  const filesCount = Object.keys(files).length
+  const edgeHandlersCount = Object.keys(files).filter(edgeHandlers.isEdgeHandlerFile).length
+  const filesCount = Object.keys(files).length - edgeHandlersCount
   const functionsCount = Object.keys(functions).length
-  const hasFunctionDirectories = fnDir.length !== 0
+  const stats = buildStatsString([
+    filesCount > 0 && `${filesCount} files`,
+    functionsCount > 0 && `${functionsCount} functions`,
+    edgeHandlersCount > 0 && `${edgeHandlersCount} Edge Handlers`,
+  ])
 
   statusCb({
     type: 'hashing',
-    msg: `Finished hashing ${filesCount} files${hasFunctionDirectories ? ` and ${functionsCount} functions` : ''}`,
+    msg: `Finished hashing ${stats}`,
     phase: 'stop',
   })
 
@@ -163,4 +178,11 @@ For more information, visit https://ntl.fyi/cli-native-modules.`)
   return deployManifest
 }
 
+const buildStatsString = (possibleParts) => {
+  const parts = possibleParts.filter(Boolean)
+  const message = parts.slice(0, -1).join(', ')
+
+  return parts.length > 1 ? `${message} and ${parts[parts.length - 1]}` : message
+}
+
 module.exports = { deploySite }

package/src/utils/deploy/hash-files.js

@@ -5,16 +5,21 @@ const pump = promisify(require('pump'))
 
 const { fileFilterCtor, fileNormalizerCtor, hasherCtor, manifestCollectorCtor } = require('./hasher-segments')
 
-const hashFiles = async (
-  dir,
-  configPath,
-  { assetType = 'file', concurrentHash, filter, hashAlgorithm = 'sha1', statusCb },
-) => {
+const hashFiles = async ({
+  assetType = 'file',
+  concurrentHash,
+  directories,
+  filter,
+  hashAlgorithm = 'sha1',
+  normalizer,
+  statusCb,
+}) => {
   if (!filter) throw new Error('Missing filter function option')
-  const fileStream = walker([configPath, dir], { filter })
+
+  const fileStream = walker(directories, { filter })
   const fileFilter = fileFilterCtor()
   const hasher = hasherCtor({ concurrentHash, hashAlgorithm })
-  const fileNormalizer = fileNormalizerCtor({ assetType })
+  const fileNormalizer = fileNormalizerCtor({ assetType, normalizer })
 
   // Written to by manifestCollector
   // normalizedPath: hash (wanted by deploy API)

package/src/utils/deploy/hasher-segments.js

@@ -24,8 +24,16 @@ const hasherCtor = ({ concurrentHash, hashAlgorithm }) => {
 }
 
 // Inject normalized file names into normalizedPath and assetType
-const fileNormalizerCtor = ({ assetType }) =>
-  map((fileObj) => ({ ...fileObj, assetType, normalizedPath: normalizePath(fileObj.relname) }))
+const fileNormalizerCtor = ({ assetType, normalizer: normalizeFunction }) =>
+  map((fileObj) => {
+    const normalizedFile = { ...fileObj, assetType, normalizedPath: normalizePath(fileObj.relname) }
+
+    if (normalizeFunction !== undefined) {
+      return normalizeFunction(normalizedFile)
+    }
+
+    return normalizedFile
+  })
 
 // A writable stream segment ctor that normalizes file paths, and writes shaMap's
 const manifestCollectorCtor = (filesObj, shaMap, { assetType, statusCb }) => {

package/src/utils/functions/get-functions.js

@@ -13,14 +13,7 @@ const addFunctionProps = ({ mainFile, name, runtime, schedule }) => {
 
 const JS = 'js'
 
-/**
- * @param {Record<string, { schedule?: string }>} functionConfigRecord
- * @returns {Record<string, { schedule?: string }>}
- */
-const extractSchedule = (functionConfigRecord) =>
-  Object.fromEntries(Object.entries(functionConfigRecord).map(([name, { schedule }]) => [name, { schedule }]))
-
-const getFunctions = async (functionsSrcDir, config = {}) => {
+const getFunctions = async (functionsSrcDir) => {
   if (!(await fileExistsAsync(functionsSrcDir))) {
     return []
   }
@@ -29,7 +22,6 @@ const getFunctions = async (functionsSrcDir, config = {}) => {
   // eslint-disable-next-line node/global-require
   const { listFunctions } = require('@netlify/zip-it-and-ship-it')
   const functions = await listFunctions(functionsSrcDir, {
-    config: config.functions ? extractSchedule(config.functions) : undefined,
     parseISC: true,
   })
   const functionsWithProps = functions.filter(({ runtime }) => runtime === JS).map((func) => addFunctionProps(func))

package/src/utils/functions/index.js

@@ -1,5 +1,6 @@
+const edgeHandlers = require('../../lib/edge-handlers')
+
 const constants = require('./constants')
-const edgeHandlers = require('./edge-handlers')
 const functions = require('./functions')
 const getFunctions = require('./get-functions')
 

package/src/utils/init/utils.js

@@ -123,8 +123,8 @@ const getPromptInputs = async ({
         .map(({ name }) => `${name} plugin`)
         .map(formatTitle)
         .join(', ')}${EOL}➡️  OK to install??`,
-      choices: infos.map((info) => ({ name: `${info.name} plugin`, value: info.package })),
-      default: infos.map((info) => info.package),
+      choices: infos.map(({ name, package }) => ({ name: `${name} plugin`, value: package })),
+      default: infos.map(({ package }) => package),
     },
   ]
 }

package/src/utils/functions/edge-handlers.js

@@ -1,88 +0,0 @@
-// @ts-check
-const fs = require('fs').promises
-const path = require('path')
-
-const { cancelDeploy, uploadEdgeHandlers } = require('../../lib/api')
-const { readFileAsyncCatchError } = require('../../lib/fs')
-const { startSpinner, stopSpinner } = require('../../lib/spinner')
-const { error } = require('../command-helpers')
-
-const MANIFEST_FILENAME = 'manifest.json'
-const EDGE_HANDLERS_FOLDER = '.netlify/edge-handlers'
-
-const validateEdgeHandlerFolder = async ({ site }) => {
-  try {
-    const resolvedFolder = path.resolve(site.root, EDGE_HANDLERS_FOLDER)
-    const stat = await fs.stat(resolvedFolder)
-    if (!stat.isDirectory()) {
-      error(`Edge Handlers folder ${EDGE_HANDLERS_FOLDER} must be a path to a directory`)
-    }
-    return resolvedFolder
-  } catch {
-    // ignore errors at the moment
-    // TODO: report error if 'edge_handlers' config exists after
-    // https://github.com/netlify/build/pull/1829 is published
-  }
-}
-
-const readBundleAndManifest = async ({ edgeHandlersResolvedFolder }) => {
-  const manifestPath = path.resolve(edgeHandlersResolvedFolder, MANIFEST_FILENAME)
-  const { content: manifest, error: manifestError } = await readFileAsyncCatchError(manifestPath)
-  if (manifestError) {
-    error(`Could not read Edge Handlers manifest file ${manifestPath}: ${manifestError.message}`)
-  }
-
-  let manifestJson
-  try {
-    manifestJson = JSON.parse(manifest)
-  } catch (error_) {
-    error(`Edge Handlers manifest file is not a valid JSON file: ${error_.message}`)
-  }
-
-  if (!manifestJson.sha) {
-    error(`Edge Handlers manifest file is missing the 'sha' property`)
-  }
-
-  const bundlePath = path.resolve(edgeHandlersResolvedFolder, manifestJson.sha)
-  const { content: bundleBuffer, error: bundleError } = await readFileAsyncCatchError(bundlePath)
-
-  if (bundleError) {
-    error(`Could not read Edge Handlers bundle file ${bundlePath}: ${bundleError.message}`)
-  }
-
-  return { bundleBuffer, manifest: manifestJson }
-}
-
-const deployEdgeHandlers = async ({ api, deployId, silent, site }) => {
-  const edgeHandlersResolvedFolder = await validateEdgeHandlerFolder({ site })
-  if (edgeHandlersResolvedFolder) {
-    let spinner
-    try {
-      spinner = silent
-        ? null
-        : startSpinner({ text: `Deploying Edge Handlers from directory ${edgeHandlersResolvedFolder}` })
-
-      const { bundleBuffer, manifest } = await readBundleAndManifest({ edgeHandlersResolvedFolder })
-      // returns false if the bundle exists, true on success, throws on error
-      const success = await uploadEdgeHandlers({
-        api,
-        deployId,
-        bundleBuffer,
-        manifest,
-      })
-
-      const text = success
-        ? `Finished deploying Edge Handlers from directory: ${edgeHandlersResolvedFolder}`
-        : `Skipped deploying Edge Handlers since the bundle already exists`
-      stopSpinner({ spinner, text, error: false })
-    } catch (error_) {
-      const text = `Failed deploying Edge Handlers: ${error_.message}`
-      stopSpinner({ spinner, text, error: true })
-      await cancelDeploy({ api, deployId })
-      // no need to report the error again
-      error('')
-    }
-  }
-}
-
-module.exports = { deployEdgeHandlers }