netlify-cli 9.9.0 → 9.9.1

package/npm-shrinkwrap.json

@@ -1,20 +1,20 @@
 {
   "name": "netlify-cli",
-  "version": "9.9.0",
+  "version": "9.9.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "9.9.0",
+      "version": "9.9.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@netlify/build": "^26.3.10",
-        "@netlify/config": "^17.0.15",
+        "@netlify/config": "^17.0.16",
         "@netlify/framework-info": "^9.0.2",
         "@netlify/local-functions-proxy": "^1.1.1",
-        "@netlify/plugin-edge-handlers": "^3.0.6",
+        "@netlify/plugin-edge-handlers": "^3.0.7",
         "@netlify/plugins-list": "^6.14.0",
         "@netlify/routing-local-proxy": "^0.34.1",
         "@netlify/zip-it-and-ship-it": "^5.9.0",
@@ -83,7 +83,7 @@
         "netlify": "^11.0.0",
         "netlify-headers-parser": "^6.0.2",
         "netlify-onegraph-internal": "0.0.50",
-        "netlify-redirect-parser": "^13.0.4",
+        "netlify-redirect-parser": "^13.0.5",
         "netlify-redirector": "^0.2.1",
         "node-fetch": "^2.6.0",
         "node-version-alias": "^1.0.1",
@@ -3110,9 +3110,9 @@
       }
     },
     "node_modules/@netlify/config": {
-      "version": "17.0.15",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.15.tgz",
-      "integrity": "sha512-ShEMw5C5PrfC4M3rdcFTdN9Phj3bsPbE8fpy2LdHUEdjEGnNo26frxq3Nh+suLsVvLZ1zWY7yoCQcT+6McerIw==",
+      "version": "17.0.16",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.16.tgz",
+      "integrity": "sha512-MajIdbsdOVpI59zayMY/9S4XrO0gVWXvl7r5iEFoSnzuloJlN/Ws0GFOSL9FqJEH8Fh1lafOIMPCugRxWhdJ6g==",
       "dependencies": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",
@@ -3129,7 +3129,7 @@
         "map-obj": "^5.0.0",
         "netlify": "^11.0.0",
         "netlify-headers-parser": "^6.0.2",
-        "netlify-redirect-parser": "13.0.4",
+        "netlify-redirect-parser": "13.0.5",
         "omit.js": "^2.0.2",
         "p-locate": "^6.0.0",
         "path-exists": "^5.0.0",
@@ -3312,9 +3312,9 @@
       }
     },
     "node_modules/@netlify/config/node_modules/map-obj": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-5.0.0.tgz",
-      "integrity": "sha512-2L3MIgJynYrZ3TYMriLDLWocz15okFakV6J12HXvMXDHui2x/zgChzg1u9mFFGbbGWE+GsLpQByt4POb9Or+uA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-5.0.1.tgz",
+      "integrity": "sha512-p3Qoax94q4c4Pb4etNi2lQSQGlqOA4PoD3ARovo7NllRoObZHwNEYd40fz4qgX1zTFK4geU/R1kbowl5hU5OVg==",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -4272,9 +4272,9 @@
       "integrity": "sha512-lfNB/QYDgaP07pwm/nWEaWPvRAAGyhxvJqNzvxMijc7A4uwquMjlbYve8yYyd0LJXPwgBpGobwiQj5RA76xzUQ=="
     },
     "node_modules/@netlify/plugin-edge-handlers": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-3.0.6.tgz",
-      "integrity": "sha512-wf9556qv5lEzuZuj3X5XIbhLerOipcrTNybGFSuDRN4bIRrpWDfap+fGiZI2D+EyEXWvkQDNaEHc64AH9H8Siw==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-3.0.7.tgz",
+      "integrity": "sha512-ThceMAZ7M0k6WVcZwszVh9qozZKveQCnmQtWZW69Qf+g1pGHFkGIt9Vclt5op+Dd8bIdk0kcu1NnX9Ll7eZL1w==",
       "dependencies": {
         "@babel/core": "^7.11.4",
         "@babel/preset-env": "^7.11.5",
@@ -4300,9 +4300,9 @@
       }
     },
     "node_modules/@netlify/plugin-edge-handlers/node_modules/node-fetch": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.0.tgz",
-      "integrity": "sha512-8xeimMwMItMw8hRrOl3C9/xzU49HV/yE6ORew/l+dxWimO5A4Ra8ld2rerlJvc/O7et5Z1zrWsPX43v1QBjCxw==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.1.tgz",
+      "integrity": "sha512-Ef3SPFtRWFCDyhvcwCSvacLpkwmYZcD57mmZzAsMiks9TpHpIghe32U9H06tMICnr+X7YCpzH7WvUlUoml2urA==",
       "dependencies": {
         "data-uri-to-buffer": "^4.0.0",
         "fetch-blob": "^3.1.4",
@@ -17206,9 +17206,9 @@
       }
     },
     "node_modules/netlify-redirect-parser": {
-      "version": "13.0.4",
-      "resolved": "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-13.0.4.tgz",
-      "integrity": "sha512-Dg3JACJTcMwjof4FzeV9yDl6BgWkIIoBBfZxBjV2PNv9+QRYb1bOE7k4jx4HA9TTwzNQCJCdfJqmIqtR/w3Qrg==",
+      "version": "13.0.5",
+      "resolved": "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-13.0.5.tgz",
+      "integrity": "sha512-Q5YEQu9YLItP38VzmzJRZ+dP4HTnK0i4Reczq+AC4UDGGEcf9JkyUC8f9YgCoamtMPjX3Qb+o+7lF1vYztH/UQ==",
       "dependencies": {
         "filter-obj": "^3.0.0",
         "is-plain-obj": "^4.0.0",
@@ -26583,9 +26583,9 @@
       }
     },
     "@netlify/config": {
-      "version": "17.0.15",
-      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.15.tgz",
-      "integrity": "sha512-ShEMw5C5PrfC4M3rdcFTdN9Phj3bsPbE8fpy2LdHUEdjEGnNo26frxq3Nh+suLsVvLZ1zWY7yoCQcT+6McerIw==",
+      "version": "17.0.16",
+      "resolved": "https://registry.npmjs.org/@netlify/config/-/config-17.0.16.tgz",
+      "integrity": "sha512-MajIdbsdOVpI59zayMY/9S4XrO0gVWXvl7r5iEFoSnzuloJlN/Ws0GFOSL9FqJEH8Fh1lafOIMPCugRxWhdJ6g==",
       "requires": {
         "chalk": "^5.0.0",
         "cron-parser": "^4.1.0",
@@ -26602,7 +26602,7 @@
         "map-obj": "^5.0.0",
         "netlify": "^11.0.0",
         "netlify-headers-parser": "^6.0.2",
-        "netlify-redirect-parser": "13.0.4",
+        "netlify-redirect-parser": "13.0.5",
         "omit.js": "^2.0.2",
         "p-locate": "^6.0.0",
         "path-exists": "^5.0.0",
@@ -26704,9 +26704,9 @@
           }
         },
         "map-obj": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-5.0.0.tgz",
-          "integrity": "sha512-2L3MIgJynYrZ3TYMriLDLWocz15okFakV6J12HXvMXDHui2x/zgChzg1u9mFFGbbGWE+GsLpQByt4POb9Or+uA=="
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-5.0.1.tgz",
+          "integrity": "sha512-p3Qoax94q4c4Pb4etNi2lQSQGlqOA4PoD3ARovo7NllRoObZHwNEYd40fz4qgX1zTFK4geU/R1kbowl5hU5OVg=="
         },
         "npm-run-path": {
           "version": "5.1.0",
@@ -27278,9 +27278,9 @@
       "integrity": "sha512-lfNB/QYDgaP07pwm/nWEaWPvRAAGyhxvJqNzvxMijc7A4uwquMjlbYve8yYyd0LJXPwgBpGobwiQj5RA76xzUQ=="
     },
     "@netlify/plugin-edge-handlers": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-3.0.6.tgz",
-      "integrity": "sha512-wf9556qv5lEzuZuj3X5XIbhLerOipcrTNybGFSuDRN4bIRrpWDfap+fGiZI2D+EyEXWvkQDNaEHc64AH9H8Siw==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-3.0.7.tgz",
+      "integrity": "sha512-ThceMAZ7M0k6WVcZwszVh9qozZKveQCnmQtWZW69Qf+g1pGHFkGIt9Vclt5op+Dd8bIdk0kcu1NnX9Ll7eZL1w==",
       "requires": {
         "@babel/core": "^7.11.4",
         "@babel/preset-env": "^7.11.5",
@@ -27300,9 +27300,9 @@
       },
       "dependencies": {
         "node-fetch": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.0.tgz",
-          "integrity": "sha512-8xeimMwMItMw8hRrOl3C9/xzU49HV/yE6ORew/l+dxWimO5A4Ra8ld2rerlJvc/O7et5Z1zrWsPX43v1QBjCxw==",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.1.tgz",
+          "integrity": "sha512-Ef3SPFtRWFCDyhvcwCSvacLpkwmYZcD57mmZzAsMiks9TpHpIghe32U9H06tMICnr+X7YCpzH7WvUlUoml2urA==",
           "requires": {
             "data-uri-to-buffer": "^4.0.0",
             "fetch-blob": "^3.1.4",
@@ -37123,9 +37123,9 @@
       }
     },
     "netlify-redirect-parser": {
-      "version": "13.0.4",
-      "resolved": "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-13.0.4.tgz",
-      "integrity": "sha512-Dg3JACJTcMwjof4FzeV9yDl6BgWkIIoBBfZxBjV2PNv9+QRYb1bOE7k4jx4HA9TTwzNQCJCdfJqmIqtR/w3Qrg==",
+      "version": "13.0.5",
+      "resolved": "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-13.0.5.tgz",
+      "integrity": "sha512-Q5YEQu9YLItP38VzmzJRZ+dP4HTnK0i4Reczq+AC4UDGGEcf9JkyUC8f9YgCoamtMPjX3Qb+o+7lF1vYztH/UQ==",
       "requires": {
         "filter-obj": "^3.0.0",
         "is-plain-obj": "^4.0.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "9.9.0",
+  "version": "9.9.1",
   "author": "Netlify Inc.",
   "contributors": [
     "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",
@@ -201,10 +201,10 @@
   },
   "dependencies": {
     "@netlify/build": "^26.3.10",
-    "@netlify/config": "^17.0.15",
+    "@netlify/config": "^17.0.16",
     "@netlify/framework-info": "^9.0.2",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/plugin-edge-handlers": "^3.0.6",
+    "@netlify/plugin-edge-handlers": "^3.0.7",
     "@netlify/plugins-list": "^6.14.0",
     "@netlify/routing-local-proxy": "^0.34.1",
     "@netlify/zip-it-and-ship-it": "^5.9.0",
@@ -273,7 +273,7 @@
     "netlify": "^11.0.0",
     "netlify-headers-parser": "^6.0.2",
     "netlify-onegraph-internal": "0.0.50",
-    "netlify-redirect-parser": "^13.0.4",
+    "netlify-redirect-parser": "^13.0.5",
     "netlify-redirector": "^0.2.1",
     "node-fetch": "^2.6.0",
     "node-version-alias": "^1.0.1",

package/src/commands/base-command.js

@@ -1,5 +1,4 @@
 // @ts-check
-const events = require('events')
 const process = require('process')
 const { format } = require('util')
 
@@ -29,7 +28,6 @@ const {
   pollForToken,
   sortOptions,
   track,
-  watchDebounced,
 } = require('../utils')
 
 // Netlify CLI client id. Lives in bot@netlify.com
@@ -121,11 +119,6 @@ class BaseCommand extends Command {
           await this.init(actionCommand)
           debug(`${name}:preAction`)('end')
         })
-        .hook('postAction', async () => {
-          if (this.configWatcherHandle) {
-            await this.configWatcherHandle.close()
-          }
-        })
     )
   }
 
@@ -437,27 +430,10 @@ class BaseCommand extends Command {
     const globalConfig = await getGlobalConfig()
     const { NetlifyAPI } = await jsClient
 
-    const configWatcher = new events.EventEmitter()
-
-    // Only set up a watcher if we know the config path.
-    if (configPath) {
-      const configWatcherHandle = await watchDebounced(configPath, {
-        depth: 1,
-        onChange: async () => {
-          const { config: newConfig } = await actionCommand.getConfig({ cwd, state, token, ...apiUrlOpts })
-
-          const normalizedNewConfig = normalizeConfig(newConfig)
-          configWatcher.emit('change', normalizedNewConfig)
-        },
-      })
-
-      // chokidar handler
-      this.configWatcherHandle = configWatcherHandle
-    }
-
     actionCommand.netlify = {
       // api methods
       api: new NetlifyAPI(token || '', apiOpts),
+      apiOpts,
       repositoryRoot,
       // current site context
       site: {
@@ -480,8 +456,6 @@ class BaseCommand extends Command {
       globalConfig,
       // state of current site dir
       state,
-      // netlify.toml file watcher
-      configWatcher,
     }
     debug(`${this.name()}:init`)('end')
   }

package/src/commands/dev/dev.js

@@ -1,4 +1,5 @@
 // @ts-check
+const events = require('events')
 const path = require('path')
 const process = require('process')
 const { promisify } = require('util')
@@ -35,13 +36,17 @@ const {
   exit,
   generateNetlifyGraphJWT,
   getSiteInformation,
+  getToken,
   injectEnvVariables,
   log,
+  normalizeConfig,
   openBrowser,
+  processOnExit,
   startForwardProxy,
   startLiveTunnel,
   startProxy,
   warn,
+  watchDebounced,
 } = require('../../utils')
 
 const { createDevExecCommand } = require('./dev-exec')
@@ -147,9 +152,7 @@ const runCommand = (command, env = {}) => {
 
       return await cleanupBeforeExit({ exitCode: 1 })
     })
-  ;['SIGINT', 'SIGTERM', 'SIGQUIT', 'SIGHUP', 'exit'].forEach((signal) => {
-    process.on(signal, async () => await cleanupBeforeExit({}))
-  })
+  processOnExit(async () => await cleanupBeforeExit({}))
 
   return commandProcess
 }
@@ -417,9 +420,31 @@ const dev = async (options, command) => {
       return oneGraphSessionId
     }
 
-    //
+    const configWatcher = new events.EventEmitter()
+
+    // Only set up a watcher if we know the config path.
+    const { configPath } = command.netlify.site
+    if (configPath) {
+      // chokidar handle
+      command.configWatcherHandle = await watchDebounced(configPath, {
+        depth: 1,
+        onChange: async () => {
+          const cwd = options.cwd || process.cwd()
+          const [token] = await getToken(options.auth)
+          const { config: newConfig } = await command.getConfig({ cwd, state, token, ...command.netlify.apiUrlOpts })
+
+          const normalizedNewConfig = normalizeConfig(newConfig)
+          configWatcher.emit('change', normalizedNewConfig)
+        },
+      })
+
+      processOnExit(async () => {
+        await command.configWatcherHandle.close()
+      })
+    }
+
     // Set up a handler for config changes.
-    command.netlify.configWatcher.on('change', (newConfig) => {
+    configWatcher.on('change', (newConfig) => {
       command.netlify.config = newConfig
       stopWatchingCLISessions()
       createOrResumeSession()
@@ -486,8 +511,10 @@ const createDevCommand = (program) => {
       'netlify dev',
       'netlify dev -d public',
       'netlify dev -c "hugo server -w" --targetPort 1313',
+      'netlify dev --graph',
       'BROWSER=none netlify dev # disable browser auto opening',
     ])
     .action(dev)
 }
+
 module.exports = { createDevCommand }

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

@@ -63,7 +63,6 @@ const getFunctionZips = async ({
 
   const featureFlags = {
     zisi_detect_esm: true,
-    zisi_pure_esm: true,
   }
 
   return await zipIt.zipFunctions(directories, tmpDir, { basePath: rootDir, config: functionsConfig, featureFlags })

package/src/utils/dev.js

@@ -215,9 +215,17 @@ const generateNetlifyGraphJWT = ({ authlifyTokenId, netlifyToken, siteId }) => {
   )
 }
 
+const processOnExit = (fn) => {
+  const signals = ['SIGINT', 'SIGTERM', 'SIGQUIT', 'SIGHUP', 'exit']
+  signals.forEach((signal) => {
+    process.on(signal, fn)
+  })
+}
+
 module.exports = {
   getSiteInformation,
   injectEnvVariables,
   acquirePort,
   generateNetlifyGraphJWT,
+  processOnExit,
 }