netlify-cli 9.6.0 → 9.6.1

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "9.6.0",
+  "version": "9.6.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "9.6.0",
+      "version": "9.6.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "9.6.0",
+  "version": "9.6.1",
   "author": "Netlify Inc.",
   "contributors": [
     "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",

package/src/commands/dev/dev.js

@@ -33,6 +33,7 @@ const {
   detectServerSettings,
   error,
   exit,
+  generateNetlifyGraphJWT,
   getSiteInformation,
   injectEnvVariables,
   log,
@@ -262,6 +263,44 @@ const printBanner = ({ url }) => {
   )
 }
 
+const startPollingForAPIAuthentication = async function (options) {
+  const { api, command, config, site, siteInfo } = options
+  const frequency = 5000
+
+  const helper = async (maybeSiteData) => {
+    const siteData = await (maybeSiteData || api.getSite({ siteId: site.id }))
+    const authlifyTokenId = siteData && siteData.authlify_token_id
+
+    const existingAuthlifyTokenId = config && config.netlifyGraphConfig && config.netlifyGraphConfig.authlifyTokenId
+    if (authlifyTokenId && authlifyTokenId !== existingAuthlifyTokenId) {
+      const netlifyToken = await command.authenticate()
+      // Only inject the authlify config if a token ID exists. This prevents
+      // calling command.authenticate() (which opens a browser window) if the
+      // user hasn't enabled API Authentication
+      const netlifyGraphConfig = {
+        netlifyToken,
+        authlifyTokenId: siteData.authlify_token_id,
+        siteId: site.id,
+      }
+      config.netlifyGraphConfig = netlifyGraphConfig
+
+      const netlifyGraphJWT = generateNetlifyGraphJWT(netlifyGraphConfig)
+
+      if (netlifyGraphJWT != null) {
+        // XXX(anmonteiro): this name is deprecated. Delete after 3/31/2022
+        process.env.ONEGRAPH_AUTHLIFY_TOKEN = netlifyGraphJWT
+        process.env.NETLIFY_GRAPH_TOKEN = netlifyGraphJWT
+      }
+    } else {
+      delete config.netlifyGraphConfig
+    }
+
+    setTimeout(helper, frequency)
+  }
+
+  await helper(siteInfo)
+}
+
 /**
  * The dev command
  * @param {import('commander').OptionValues} options
@@ -287,7 +326,6 @@ const dev = async (options, command) => {
     )
   }
 
-  const startNetlifyGraphWatcher = Boolean(options.graph)
   await injectEnvVariables({ env: command.netlify.cachedConfig.env, site })
 
   const { addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({
@@ -309,11 +347,15 @@ const dev = async (options, command) => {
 
   command.setAnalyticsPayload({ projectType: settings.framework || 'custom', live: options.live })
 
+  const startNetlifyGraphWatcher = Boolean(options.graph)
+  if (startNetlifyGraphWatcher) {
+    startPollingForAPIAuthentication({ api, command, config, site, siteInfo })
+  }
+
   await startFunctionsServer({
     api,
     command,
     config,
-    isGraphEnabled: startNetlifyGraphWatcher,
     settings,
     site,
     siteInfo,

package/src/functions-templates/javascript/scheduled-function/package.json

@@ -15,6 +15,6 @@
   "author": "Netlify",
   "license": "MIT",
   "dependencies": {
-    "@netlify/functions": "^0.11.0"
+    "@netlify/functions": "^0.11.1"
   }
 }

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

@@ -9,15 +9,15 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@netlify/functions": "^0.11.0",
-        "@types/node": "^14.18.11",
+        "@netlify/functions": "^0.11.1",
+        "@types/node": "^14.0.0",
         "typescript": "^4.0.0"
       }
     },
     "node_modules/@netlify/functions": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-0.11.0.tgz",
-      "integrity": "sha512-+WWX081UCkLZYkfh1Ru+PH5HTujNXugeskATGhZLTyS1U3Cqh2gYLArdG1a/vU8WWopu/wjpxEOdWq8/T5Nw5Q==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-0.11.1.tgz",
+      "integrity": "sha512-J2QUAYRblvTrl/cOYU2RNHdv/EYy4qnKQhds0aDNB560Y83wfpaMS3F7PKpHygGWrVuLRyevenIzsV9MaQrKlQ==",
       "dependencies": {
         "is-promise": "^4.0.0"
       },
@@ -50,9 +50,9 @@
   },
   "dependencies": {
     "@netlify/functions": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-0.11.0.tgz",
-      "integrity": "sha512-+WWX081UCkLZYkfh1Ru+PH5HTujNXugeskATGhZLTyS1U3Cqh2gYLArdG1a/vU8WWopu/wjpxEOdWq8/T5Nw5Q==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-0.11.1.tgz",
+      "integrity": "sha512-J2QUAYRblvTrl/cOYU2RNHdv/EYy4qnKQhds0aDNB560Y83wfpaMS3F7PKpHygGWrVuLRyevenIzsV9MaQrKlQ==",
       "requires": {
         "is-promise": "^4.0.0"
       }

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

@@ -14,7 +14,7 @@
   "author": "Netlify",
   "license": "MIT",
   "dependencies": {
-    "@netlify/functions": "^0.11.0",
+    "@netlify/functions": "^0.11.1",
     "@types/node": "^14.0.0",
     "typescript": "^4.0.0"
   }

package/src/functions-templates/typescript/scheduled-function/package.json

@@ -15,7 +15,7 @@
   "author": "Netlify",
   "license": "MIT",
   "dependencies": {
-    "@netlify/functions": "^0.11.0",
+    "@netlify/functions": "^0.11.1",
     "@types/node": "^14.18.9",
     "typescript": "^4.5.5"
   }

package/src/lib/functions/server.js

@@ -1,6 +1,4 @@
 // @ts-check
-const process = require('process')
-
 const jwtDecode = require('jwt-decode')
 
 const {
@@ -47,51 +45,9 @@ const buildClientContext = function (headers) {
   }
 }
 
-const startPollingForAPIAuthentication = async function (options) {
-  const { api, command, config, site, siteInfo } = options
-  const frequency = 5000
-
-  const helper = async (maybeSiteData) => {
-    const siteData = await (maybeSiteData || api.getSite({ siteId: site.id }))
-    const authlifyTokenId = siteData && siteData.authlify_token_id
-
-    const existingAuthlifyTokenId = config && config.netlifyGraphConfig && config.netlifyGraphConfig.authlifyTokenId
-    if (authlifyTokenId && authlifyTokenId !== existingAuthlifyTokenId) {
-      const netlifyToken = await command.authenticate()
-      // Only inject the authlify config if a token ID exists. This prevents
-      // calling command.authenticate() (which opens a browser window) if the
-      // user hasn't enabled API Authentication
-      const netlifyGraphConfig = {
-        netlifyToken,
-        authlifyTokenId: siteData.authlify_token_id,
-        siteId: site.id,
-      }
-      config.netlifyGraphConfig = netlifyGraphConfig
-
-      const netlifyGraphJWT = generateNetlifyGraphJWT(netlifyGraphConfig)
-
-      if (netlifyGraphJWT != null) {
-        // XXX(anmonteiro): this name is deprecated. Delete after 3/31/2022
-        process.env.ONEGRAPH_AUTHLIFY_TOKEN = netlifyGraphJWT
-        process.env.NETLIFY_GRAPH_TOKEN = netlifyGraphJWT
-      }
-    } else {
-      delete config.authlify
-    }
-
-    setTimeout(helper, frequency)
-  }
-
-  await helper(siteInfo)
-}
-
 const createHandler = function (options) {
   const { config, functionsRegistry } = options
 
-  if (options.isGraphEnabled) {
-    startPollingForAPIAuthentication(options)
-  }
-
   return async function handler(request, response) {
     // handle proxies without path re-writes (http-servr)
     const cleanPath = request.path.replace(/^\/.netlify\/(functions|builders)/, '')
@@ -152,7 +108,7 @@ const createHandler = function (options) {
       rawQuery,
     }
 
-    if (config && config.authlify && config.authlify.authlifyTokenId != null) {
+    if (config && config.netlifyGraphConfig && config.netlifyGraphConfig.authlifyTokenId != null) {
       // XXX(anmonteiro): this name is deprecated. Delete after 3/31/2022
       const jwt = generateNetlifyGraphJWT(config.netlifyGraphConfig)
       event.authlifyToken = jwt