netlify-cli 6.14.16 → 6.14.21

package/src/lib/functions/form-submissions-handler.js

@@ -1,5 +1,6 @@
 const { Readable } = require('stream')
 
+const fromEntries = require('@ungap/from-entries')
 const { parse: parseContentType } = require('content-type')
 const multiparty = require('multiparty')
 const getRawBody = require('raw-body')
@@ -38,7 +39,7 @@ const createFormSubmissionHandler = function ({ functionsRegistry, siteUrl }) {
         encoding: ct.parameters.charset,
       })
 
-      fields = getObjectFromParams(new URLSearchParams(bodyData.toString()))
+      fields = fromEntries(new URLSearchParams(bodyData.toString()))
     } else if (ct.type === 'multipart/form-data') {
       try {
         ;[fields, files] = await new Promise((resolve, reject) => {
@@ -126,17 +127,6 @@ const createFormSubmissionHandler = function ({ functionsRegistry, siteUrl }) {
   }
 }
 
-/**
- * Converts URLSearchParams to an object
- * @deprecated can be replaced with `Object.fromEntries` once the support for older Node.js Versions than `12.0.0` is dropped.
- * @param {URLSearchParams} urlParams
- * @returns {Record<string, any>}
- */
-const getObjectFromParams = (urlParams) => {
-  const entries = [...urlParams]
-  return entries.reduce((prev, [key, value]) => ({ ...prev, [key]: value }), {})
-}
-
 const getFormHandler = function ({ functionsRegistry }) {
   const handlers = ['submission-created', `submission-created${BACKGROUND}`]
     .map((name) => functionsRegistry.get(name))

package/src/lib/functions/registry.js

@@ -12,9 +12,10 @@ const runtimes = require('./runtimes')
 const { watchDebounced } = require('./watcher')
 
 class FunctionsRegistry {
-  constructor({ capabilities, config, projectRoot, timeouts }) {
+  constructor({ capabilities, config, isConnected = false, projectRoot, timeouts }) {
     this.capabilities = capabilities
     this.config = config
+    this.isConnected = isConnected
     this.projectRoot = projectRoot
     this.timeouts = timeouts
 
@@ -128,7 +129,7 @@ class FunctionsRegistry {
       return
     }
 
-    if (func.isBackground && !this.capabilities.backgroundFunctions) {
+    if (func.isBackground && this.isConnected && !this.capabilities.backgroundFunctions) {
       warn(getLogMessage('functions.backgroundNotSupported'))
     }
 

package/src/lib/functions/server.js

@@ -178,6 +178,7 @@ const startFunctionsServer = async ({
     const functionsRegistry = new FunctionsRegistry({
       capabilities,
       config,
+      isConnected: Boolean(siteUrl),
       projectRoot: site.root,
       timeouts,
     })

package/src/utils/command.js

@@ -11,7 +11,7 @@ const { getAgent } = require('../lib/http-agent')
 
 const { argv, chalk, error, exit, getCwd, getToken, log, normalizeConfig, pollForToken } = require('./command-helpers')
 const getGlobalConfig = require('./get-global-config')
-const openBrowser = require('./open-browser')
+const { openBrowser } = require('./open-browser')
 const StateConfig = require('./state-config')
 const { identify, track } = require('./telemetry')
 const { TrackedCommand } = require('./telemetry/tracked-command')

package/src/utils/gh-auth.js

@@ -3,12 +3,13 @@ const http = require('http')
 const process = require('process')
 
 const { Octokit } = require('@octokit/rest')
+const fromEntries = require('@ungap/from-entries')
 const getPort = require('get-port')
 const inquirer = require('inquirer')
 
 const { log } = require('./command-helpers')
 const { createDeferred } = require('./deferred')
-const openBrowser = require('./open-browser')
+const { openBrowser } = require('./open-browser')
 
 const SERVER_PORT = 3000
 
@@ -31,6 +32,17 @@ const promptForAuthMethod = async () => {
   return authMethod === authChoiceNetlify
 }
 
+/**
+ * Authenticate with the netlify app
+ * @returns {Promise<Record<string,string>} Returns a Promise with an object of the following shape
+ * ```
+ * {
+ *   user: 'spongebob,
+ *   token: 'gho_some-token',
+ *   provider: 'github'
+ * }
+ * ```
+ */
 const authWithNetlify = async () => {
   const port = await getPort({ port: SERVER_PORT })
   const { promise: deferredPromise, reject: deferredReject, resolve: deferredResolve } = createDeferred()
@@ -38,7 +50,7 @@ const authWithNetlify = async () => {
   const server = http.createServer(function onRequest(req, res) {
     const parameters = new URLSearchParams(req.url.slice(req.url.indexOf('?') + 1))
     if (parameters.get('token')) {
-      deferredResolve(parameters)
+      deferredResolve(fromEntries(parameters))
       res.end(
         `${
           "<html><head><script>if(history.replaceState){history.replaceState({},'','/')}</script><style>html{font-family:sans-serif;background:#0e1e25}body{overflow:hidden;position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;height:100vh;width:100vw;}h3{margin:0}.card{position:relative;display:flex;flex-direction:column;width:75%;max-width:364px;padding:24px;background:white;color:rgb(14,30,37);border-radius:8px;box-shadow:0 2px 4px 0 rgba(14,30,37,.16);}</style></head>" +
@@ -96,7 +108,7 @@ const authWithToken = async () => {
   throw error
 }
 
-module.exports = async function getGitHubToken() {
+const getGitHubToken = async () => {
   log('')
 
   const withNetlify = await promptForAuthMethod()
@@ -106,3 +118,5 @@ module.exports = async function getGitHubToken() {
 
   return await authWithToken()
 }
+
+module.exports = { getGitHubToken, authWithNetlify }

package/src/utils/init/config-github.js

@@ -2,7 +2,7 @@ const { Octokit } = require('@octokit/rest')
 const chalk = require('chalk')
 
 const { error: failAndExit, log } = require('../command-helpers')
-const ghauth = require('../gh-auth')
+const { getGitHubToken: ghauth } = require('../gh-auth')
 
 const { createDeployKey, formatErrorMessage, getBuildSettings, saveNetlifyToml, setupSite } = require('./utils')
 

package/src/utils/open-browser.js

@@ -33,4 +33,4 @@ const openBrowser = async function ({ silentBrowserNoneError, url }) {
   }
 }
 
-module.exports = openBrowser
+module.exports = { openBrowser }