netlify-cli 10.7.0 → 10.7.1

package/npm-shrinkwrap.json

@@ -1,18 +1,18 @@
 {
   "name": "netlify-cli",
-  "version": "10.7.0",
+  "version": "10.7.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "10.7.0",
+      "version": "10.7.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@netlify/build": "^27.3.2",
         "@netlify/config": "^18.1.1",
-        "@netlify/edge-bundler": "^1.4.2",
+        "@netlify/edge-bundler": "^1.4.3",
         "@netlify/framework-info": "^9.1.0",
         "@netlify/local-functions-proxy": "^1.1.1",
         "@netlify/plugins-list": "^6.30.0",
@@ -2301,9 +2301,9 @@
       }
     },
     "node_modules/@netlify/edge-bundler": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.4.2.tgz",
-      "integrity": "sha512-grllAfoFzZu6m63pkcm8GqoG8wng6AIKNjY/Ay6UTMn+E2lBgB6pw2fF7xT8mGYWSB2TLdRlQ4RyPE/DUoyoIQ==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.4.3.tgz",
+      "integrity": "sha512-6brBHMq8cM6110H8Dtp7csPMhHeF8dtH6eqz+M+PVzsPEua4PY2KlSf+7CFxnviiXivm/k7bC/Hq4+VQvp8o3A==",
       "dependencies": {
         "common-path-prefix": "^3.0.0",
         "del": "^6.0.0",
@@ -24382,9 +24382,9 @@
       }
     },
     "@netlify/edge-bundler": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.4.2.tgz",
-      "integrity": "sha512-grllAfoFzZu6m63pkcm8GqoG8wng6AIKNjY/Ay6UTMn+E2lBgB6pw2fF7xT8mGYWSB2TLdRlQ4RyPE/DUoyoIQ==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.4.3.tgz",
+      "integrity": "sha512-6brBHMq8cM6110H8Dtp7csPMhHeF8dtH6eqz+M+PVzsPEua4PY2KlSf+7CFxnviiXivm/k7bC/Hq4+VQvp8o3A==",
       "requires": {
         "common-path-prefix": "^3.0.0",
         "del": "^6.0.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "10.7.0",
+  "version": "10.7.1",
   "author": "Netlify Inc.",
   "contributors": [
     "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",
@@ -215,7 +215,7 @@
   "dependencies": {
     "@netlify/build": "^27.3.2",
     "@netlify/config": "^18.1.1",
-    "@netlify/edge-bundler": "^1.4.2",
+    "@netlify/edge-bundler": "^1.4.3",
     "@netlify/framework-info": "^9.1.0",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/plugins-list": "^6.30.0",

package/src/lib/edge-functions/deploy.js

@@ -1,6 +1,5 @@
 // @ts-check
 const { stat } = require('fs').promises
-const path = require('path')
 
 const { getPathInProject } = require('../settings')
 
@@ -10,7 +9,7 @@ const distPath = getPathInProject([EDGE_FUNCTIONS_FOLDER])
 
 const deployFileNormalizer = (file) => {
   const isEdgeFunction = file.root === distPath
-  const normalizedPath = isEdgeFunction ? path.join(PUBLIC_URL_PATH, file.normalizedPath) : file.normalizedPath
+  const normalizedPath = isEdgeFunction ? `${PUBLIC_URL_PATH}/${file.normalizedPath}` : file.normalizedPath
 
   return {
     ...file,
@@ -32,7 +31,7 @@ const getDistPathIfExists = async () => {
   }
 }
 
-const isEdgeFunctionFile = (filePath) => filePath.startsWith(`${PUBLIC_URL_PATH}${path.sep}`)
+const isEdgeFunctionFile = (filePath) => filePath.startsWith(`${PUBLIC_URL_PATH}/`)
 
 module.exports = {
   deployFileNormalizer,

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

@@ -5,7 +5,7 @@ const { cwd, env } = require('process')
 const getAvailablePort = require('get-port')
 const { v4: generateUUID } = require('uuid')
 
-const { NETLIFYDEVERR, NETLIFYDEVWARN, chalk, error, log } = require('../../utils/command-helpers')
+const { NETLIFYDEVERR, NETLIFYDEVWARN, chalk, error: printError, log } = require('../../utils/command-helpers')
 const { getGeoLocation } = require('../geo-location')
 const { getPathInProject } = require('../settings')
 const { startSpinner, stopSpinner } = require('../spinner')
@@ -77,24 +77,18 @@ const initializeProxy = async ({
     projectDir,
   })
   const hasEdgeFunctions = userFunctionsPath !== undefined || internalFunctions.length !== 0
-  let hasServerError = false
 
   return async (req) => {
-    if (req.headers[headers.Passthrough] !== undefined || !hasEdgeFunctions || hasServerError) {
+    if (req.headers[headers.Passthrough] !== undefined || !hasEdgeFunctions) {
       return
     }
 
-    let promiseResult
+    const [geoLocation, registry] = await Promise.all([
+      getGeoLocation({ mode: geolocationMode, offline, state }),
+      server,
+    ])
 
-    try {
-      promiseResult = await Promise.all([getGeoLocation({ mode: geolocationMode, offline, state }), server])
-    } catch (error_) {
-      error(error_.message, { exit: false })
-      hasServerError = true
-      return
-    }
-
-    const [geoLocation, { registry }] = promiseResult
+    if (!registry) return
 
     // Setting header with geolocation.
     req.headers[headers.Geo] = JSON.stringify(geoLocation)
@@ -152,34 +146,39 @@ const prepareServer = async ({
   port,
   projectDir,
 }) => {
-  const bundler = await import('@netlify/edge-bundler')
-  const distImportMapPath = getPathInProject([DIST_IMPORT_MAP_PATH])
-  const runIsolate = await bundler.serve({
-    ...getDownloadUpdateFunctions(),
-    certificatePath,
-    debug: env.NETLIFY_DENO_DEBUG === 'true',
-    distImportMapPath,
-    formatExportTypeError: (name) =>
-      `${NETLIFYDEVERR} ${chalk.red('Failed')} to load Edge Function ${chalk.yellow(
-        name,
-      )}. The file does not seem to have a function as the default export.`,
-    formatImportError: (name) => `${NETLIFYDEVERR} ${chalk.red('Failed')} to run Edge Function ${chalk.yellow(name)}:`,
-    importMaps,
-    inspectSettings,
-    port,
-  })
-  const registry = new EdgeFunctionsRegistry({
-    bundler,
-    config,
-    configPath,
-    directories,
-    getUpdatedConfig,
-    internalFunctions,
-    projectDir,
-    runIsolate,
-  })
+  try {
+    const bundler = await import('@netlify/edge-bundler')
+    const distImportMapPath = getPathInProject([DIST_IMPORT_MAP_PATH])
+    const runIsolate = await bundler.serve({
+      ...getDownloadUpdateFunctions(),
+      certificatePath,
+      debug: env.NETLIFY_DENO_DEBUG === 'true',
+      distImportMapPath,
+      formatExportTypeError: (name) =>
+        `${NETLIFYDEVERR} ${chalk.red('Failed')} to load Edge Function ${chalk.yellow(
+          name,
+        )}. The file does not seem to have a function as the default export.`,
+      formatImportError: (name) =>
+        `${NETLIFYDEVERR} ${chalk.red('Failed')} to run Edge Function ${chalk.yellow(name)}:`,
+      importMaps,
+      inspectSettings,
+      port,
+    })
+    const registry = new EdgeFunctionsRegistry({
+      bundler,
+      config,
+      configPath,
+      directories,
+      getUpdatedConfig,
+      internalFunctions,
+      projectDir,
+      runIsolate,
+    })
 
-  return { registry, runIsolate }
+    return registry
+  } catch (error) {
+    printError(error.message, { exit: false })
+  }
 }
 
 module.exports = { handleProxyRequest, initializeProxy, isEdgeFunctionsRequest }