netlify-cli 10.17.3 → 10.17.6

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "10.17.3",
+  "version": "10.17.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "10.17.3",
+      "version": "10.17.6",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -81,7 +81,7 @@
         "multiparty": "^4.2.1",
         "netlify": "^12.0.0",
         "netlify-headers-parser": "^6.0.2",
-        "netlify-onegraph-internal": "0.8.5",
+        "netlify-onegraph-internal": "0.8.7",
         "netlify-redirect-parser": "^13.0.5",
         "netlify-redirector": "^0.2.1",
         "node-fetch": "^2.6.0",
@@ -15996,9 +15996,9 @@
       }
     },
     "node_modules/netlify-onegraph-internal": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.8.5.tgz",
-      "integrity": "sha512-UvxXqHbnzAJkshWkh7ihd4EYphFUYlQXnzeimx+Z8D9brkRGaccpIxiaMEbrLknLqWAD+g5LS/2UO11nGD6MSw==",
+      "version": "0.8.7",
+      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.8.7.tgz",
+      "integrity": "sha512-FDHQes/GP7UjlzAwJ+qwKfhESBo9NQDN9Ed6U+9a5CW5o2j8Lr23P9Ac1MKp7jDP5h0uAq73r9P86J9Kl1yzLQ==",
       "dependencies": {
         "graphql": "16.5.0",
         "node-fetch": "^2.6.0",
@@ -34229,9 +34229,9 @@
       }
     },
     "netlify-onegraph-internal": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.8.5.tgz",
-      "integrity": "sha512-UvxXqHbnzAJkshWkh7ihd4EYphFUYlQXnzeimx+Z8D9brkRGaccpIxiaMEbrLknLqWAD+g5LS/2UO11nGD6MSw==",
+      "version": "0.8.7",
+      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.8.7.tgz",
+      "integrity": "sha512-FDHQes/GP7UjlzAwJ+qwKfhESBo9NQDN9Ed6U+9a5CW5o2j8Lr23P9Ac1MKp7jDP5h0uAq73r9P86J9Kl1yzLQ==",
       "requires": {
         "graphql": "16.5.0",
         "node-fetch": "^2.6.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "10.17.3",
+  "version": "10.17.6",
   "author": "Netlify Inc.",
   "contributors": [
     "@whitep4nth3r (https://twitter.com/whitep4nth3r)",
@@ -81,6 +81,7 @@
     "Liran Tal <liran.tal@gmail.com> (https://twitter.com/liran_tal)",
     "Louis DeScioli (https://twitter.com/descioli)",
     "Lukas Holzer <lukas.holzer@netlify.com> (https://twitter.com/luka5c0m)",
+    "Lxxyx <Lxxyxzj@gmail.com> (https://twitter.com/Lxxyx_)",
     "Marc Littlemore (https://twitter.com/marclittlemore)",
     "Marcus Weiner",
     "Mark Bello <mark@markbello.dev> (https://markbello.dev)",
@@ -292,7 +293,7 @@
     "multiparty": "^4.2.1",
     "netlify": "^12.0.0",
     "netlify-headers-parser": "^6.0.2",
-    "netlify-onegraph-internal": "0.8.5",
+    "netlify-onegraph-internal": "0.8.7",
     "netlify-redirect-parser": "^13.0.5",
     "netlify-redirector": "^0.2.1",
     "node-fetch": "^2.6.0",

package/src/commands/graph/graph-edit.js

@@ -1,6 +1,5 @@
 // @ts-check
 const gitRepoInfo = require('git-repo-info')
-const { OneGraphClient } = require('netlify-onegraph-internal')
 
 const { OneGraphCliClient, ensureCLISession, upsertMergeCLISessionMetadata } = require('../../lib/one-graph/cli-client')
 const {
@@ -40,6 +39,7 @@ const graphEdit = async (options, command) => {
   }
 
   const netlifyToken = await command.authenticate()
+  const { jwt } = await OneGraphCliClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
 
   await ensureAppForSite(netlifyToken, siteId)
 
@@ -62,8 +62,7 @@ const graphEdit = async (options, command) => {
       tags: ['netlify-cli', `session:${oneGraphSessionId}`, `git-branch:${branch}`],
     },
     {
-      accessToken: netlifyToken,
-
+      accessToken: jwt,
       siteId,
     },
   )
@@ -76,7 +75,6 @@ const graphEdit = async (options, command) => {
 
   const newMetadata = { docId: persistedDoc.id }
 
-  const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
   await upsertMergeCLISessionMetadata({
     config,
     jwt,

package/src/commands/graph/graph-handler.js

@@ -36,6 +36,8 @@ const graphHandler = async (args, options, command) => {
   const userOperationName = args.operationName
   const userCodegenId = options.codegen
 
+  const handlerOptions = options.data ? JSON.parse(options.data) : {}
+
   let operationName = userOperationName
   if (!operationName) {
     operationName = await autocompleteOperationNames({ netlifyGraphConfig })
@@ -70,7 +72,7 @@ const graphHandler = async (args, options, command) => {
       netlifyGraphConfig,
       schema,
       operationName,
-      handlerOptions: {},
+      handlerOptions,
     })
   } else {
     error(`Failed to parse Netlify GraphQL schema`)
@@ -87,6 +89,7 @@ const createGraphHandlerCommand = (program) =>
     .command('graph:handler')
     .argument('[name]', 'Operation name')
     .option('-c, --codegen <id>', 'The id of the specific code generator to use')
+    .option("-d, --data '<json>'", 'Optional data to pass along to the code generator')
     .description(
       'Generate a handler for a Graph operation given its name. See `graph:operations` for a list of operations.',
     )

package/src/commands/sites/sites-create.js

@@ -1,6 +1,7 @@
 // @ts-check
 
 const slugify = require('@sindresorhus/slugify')
+const { InvalidArgumentError } = require('commander')
 const inquirer = require('inquirer')
 const pick = require('lodash/pick')
 const sample = require('lodash/sample')
@@ -84,7 +85,6 @@ const sitesCreate = async (options, command) => {
     accountSlug = accountSlugInput
   }
 
-  const { name: nameFlag } = options
   let user
   let site
 
@@ -110,7 +110,7 @@ const sitesCreate = async (options, command) => {
       }
     }
   }
-  await inputSiteName(nameFlag)
+  await inputSiteName(options.name)
 
   log()
   log(chalk.greenBright.bold.underline(`Site Created`))
@@ -175,6 +175,16 @@ const sitesCreate = async (options, command) => {
   return site
 }
 
+const MAX_SITE_NAME_LENGTH = 63
+const validateName = function (value) {
+  // netlify sites:create --name <A string of more than 63 words>
+  if (typeof value === 'string' && value.length > MAX_SITE_NAME_LENGTH) {
+    throw new InvalidArgumentError(`--name should be less than 64 characters, input length: ${value.length}`)
+  }
+
+  return value
+}
+
 /**
  * Creates the `netlify sites:create` command
  * @param {import('../base-command').BaseCommand} program
@@ -187,8 +197,8 @@ const createSitesCreateCommand = (program) =>
       `Create an empty site (advanced)
 Create a blank site that isn't associated with any git remote. Will link the site to the current working directory.`,
     )
-    .option('-n, --name [name]', 'name of site')
-    .option('-a, --account-slug [slug]', 'account slug to create the site under')
+    .option('-n, --name <name>', 'name of site', validateName)
+    .option('-a, --account-slug <slug>', 'account slug to create the site under')
     .option('-c, --with-ci', 'initialize CI hooks during site creation')
     .option('-m, --manual', 'force manual CI setup.  Used --with-ci flag')
     .option('--disable-linking', 'create the site without linking it to current directory')

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

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

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

@@ -9,15 +9,15 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@netlify/functions": "^1.0.0",
+        "@netlify/functions": "^1.1.0",
         "@types/node": "^14.0.0",
         "typescript": "^4.0.0"
       }
     },
     "node_modules/@netlify/functions": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.0.0.tgz",
-      "integrity": "sha512-7fnJv3vr8uyyyOYPChwoec6MjzsCw1CoRUO2DhQ1BD6bOyJRlD4DUaOOGlMILB2LCT8P24p5LexEGx8AJb7xdA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.1.0.tgz",
+      "integrity": "sha512-XUFC5nt4iLMrDK+6WjYrDOW9h6XGIQlEk3o++xglFbDKc6dsP+k6rjfz3vl0w8S9Oiosxj3uLaPW18szJc1UgA==",
       "dependencies": {
         "is-promise": "^4.0.0"
       },
@@ -50,9 +50,9 @@
   },
   "dependencies": {
     "@netlify/functions": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.0.0.tgz",
-      "integrity": "sha512-7fnJv3vr8uyyyOYPChwoec6MjzsCw1CoRUO2DhQ1BD6bOyJRlD4DUaOOGlMILB2LCT8P24p5LexEGx8AJb7xdA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.1.0.tgz",
+      "integrity": "sha512-XUFC5nt4iLMrDK+6WjYrDOW9h6XGIQlEk3o++xglFbDKc6dsP+k6rjfz3vl0w8S9Oiosxj3uLaPW18szJc1UgA==",
       "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": "^1.0.0",
+    "@netlify/functions": "^1.1.0",
     "@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": "^1.0.0",
+    "@netlify/functions": "^1.1.0",
     "@types/node": "^14.18.9",
     "typescript": "^4.5.5"
   }

package/src/lib/one-graph/cli-client.js

@@ -780,10 +780,9 @@ const getCLISessionMetadata = async ({ jwt, oneGraphSessionId, siteId }) => {
  * Look at the current project, filesystem, etc. and determine relevant metadata for a cli session
  * @param {object} input
  * @param {string} input.siteRoot The root file path for the site
- * @param {object} input.config The parsed netlify.toml config file
  * @returns {Promise<CliEventHelper.DetectedLocalCLISessionMetadata>} Any locally detected facts that are relevant to include in the cli session metadata
  */
-const detectLocalCLISessionMetadata = async ({ config, siteRoot }) => {
+const detectLocalCLISessionMetadata = async ({ siteRoot }) => {
   // @ts-ignore
   const { listFrameworks } = await frameworkInfoPromise
 
@@ -806,25 +805,6 @@ const detectLocalCLISessionMetadata = async ({ config, siteRoot }) => {
 
   const editor = process.env.EDITOR || null
 
-  /** @type {CodegenHelpers.CodegenModuleMeta | null} */
-  let codegen = null
-
-  const codegenModule = await getCodegenModule({ config })
-
-  if (codegenModule) {
-    codegen = {
-      id: codegenModule.id,
-      version: codegenModule.id,
-      generators: codegenModule.generators.map((generator) => ({
-        id: generator.id,
-        name: generator.name,
-        options: generator.generateHandlerOptions || null,
-        supportedDefinitionTypes: generator.supportedDefinitionTypes,
-        version: generator.version,
-      })),
-    }
-  }
-
   const detectedMetadata = {
     gitBranch: branch,
     hostname,
@@ -835,8 +815,8 @@ const detectLocalCLISessionMetadata = async ({ config, siteRoot }) => {
     platform,
     arch,
     nodeVersion: process.version,
-    codegen,
     framework,
+    codegen: null,
   }
 
   return detectedMetadata
@@ -847,13 +827,12 @@ const detectLocalCLISessionMetadata = async ({ config, siteRoot }) => {
  * @param {object} input
  * @param {string} input.jwt The GraphJWT string
  * @param {string} input.sessionId The id of the cli session to fetch the current metadata for
- * @param {object} input.config The parsed netlify.toml config file
  * @param {string} input.siteRoot Path to the root of the project
  * @param {string} input.docId The GraphQL operations document id to fetch
  * @param {string} input.schemaId The GraphQL schemaId to use when generating code
  */
-const publishCliSessionMetadataPublishEvent = async ({ config, docId, jwt, schemaId, sessionId, siteRoot }) => {
-  const detectedMetadata = await detectLocalCLISessionMetadata({ config, siteRoot })
+const publishCliSessionMetadataPublishEvent = async ({ docId, jwt, schemaId, sessionId, siteRoot }) => {
+  const detectedMetadata = await detectLocalCLISessionMetadata({ siteRoot })
 
   /** @type {CliEventHelper.OneGraphNetlifyCliSessionMetadataPublishEvent} */
   const event = {
@@ -901,13 +880,13 @@ const publishCliSessionMetadataPublishEvent = async ({ config, docId, jwt, schem
  * @param {object} input.newMetadata The metadata to merge into (with priority) the existing metadata
  * @returns {Promise<object>}
  */
-const upsertMergeCLISessionMetadata = async ({ config, jwt, newMetadata, oneGraphSessionId, siteId, siteRoot }) => {
+const upsertMergeCLISessionMetadata = async ({ jwt, newMetadata, oneGraphSessionId, siteId, siteRoot }) => {
   const { errors, metadata } = await getCLISessionMetadata({ jwt, oneGraphSessionId, siteId })
   if (errors) {
     warn(`Error fetching cli session metadata: ${JSON.stringify(errors, null, 2)}`)
   }
 
-  const detectedMetadata = await detectLocalCLISessionMetadata({ config, siteRoot })
+  const detectedMetadata = await detectLocalCLISessionMetadata({ siteRoot })
 
   // @ts-ignore
   const finalMetadata = { ...metadata, ...detectedMetadata, ...newMetadata }
@@ -992,7 +971,13 @@ const persistNewOperationsDocForSession = async ({
   })
 
   if (!result || result.errors) {
-    warn(`Unable to update session metadata with updated operations doc ${JSON.stringify(result.errors, null, 2)}`)
+    warn(
+      `Unable to update session metadata with updated operations docId="${persistedDoc.id}": ${JSON.stringify(
+        result && result.errors,
+        null,
+        2,
+      )}`,
+    )
   } else if (lockfile != null) {
     // Now that we've persisted the document, lock it in the lockfile
     const currentOperationsDoc = readGraphQLOperationsSourceFile(netlifyGraphConfig)
@@ -1336,7 +1321,6 @@ const ensureCLISession = async (input) => {
     // If we can't access the session in the state.json or it doesn't exist, create a new one
     const sessionName = generateSessionName()
     const detectedMetadata = await detectLocalCLISessionMetadata({
-      config,
       siteRoot: site.root,
     })
     const newSessionMetadata = parentCliSessionId ? { parentCliSessionId } : {}

package/src/lib/one-graph/cli-netlify-graph.js

@@ -459,7 +459,7 @@ const generateFunctionsFile = async ({ config, netlifyGraphConfig, operationsDoc
 
   const codegenModule = await getCodegenModule({ config })
   if (!codegenModule) {
-    error(
+    warn(
       `No Netlify Graph codegen module specified in netlify.toml under the [graph] header. Please specify 'codeGenerator' field and try again.`,
     )
     return
@@ -685,13 +685,19 @@ const generateHandlerByOperationName = ({
   }
 
   const parsedDoc = parse(currentOperationsDoc)
-  const { functions } = extractFunctionsFromOperationDoc(GraphQL, parsedDoc)
+  const { fragments, functions } = extractFunctionsFromOperationDoc(GraphQL, parsedDoc)
 
-  const operation = Object.values(functions).find(
-    (potentialOperation) => potentialOperation.operationName === operationName,
+  const functionDefinition = Object.values(functions).find(
+    (potentialDefinition) => potentialDefinition.operationName === operationName,
   )
 
-  if (!operation) {
+  const fragmentDefinition = Object.values(fragments).find(
+    (potentialDefinition) => potentialDefinition.fragmentName === operationName,
+  )
+
+  const definition = functionDefinition || fragmentDefinition
+
+  if (!definition) {
     warn(`No operation named ${operationName} was found in the operations doc`)
     return
   }
@@ -701,7 +707,7 @@ const generateHandlerByOperationName = ({
     generate,
     netlifyGraphConfig,
     schema,
-    operationId: operation.id,
+    operationId: definition.id,
     handlerOptions,
   })
 }

package/src/utils/proxy.js

@@ -201,10 +201,9 @@ const serveRedirect = async function ({ match, options, proxy, req, res }) {
     // construct destination URL from redirect rule match
     const dest = new URL(match.to, `${reqUrl.protocol}//${reqUrl.host}`)
 
-    // We pass through request params in one of the following cases:
-    // 1. The redirect rule doesn't have any query params
-    // 2. This is a function redirect https://github.com/netlify/cli/issues/1605
-    if ([...dest.searchParams].length === 0 || isFunction(options.functionsPort, stripOrigin(dest))) {
+    // We pass through request params if the redirect rule
+    // doesn't have any query params
+    if ([...dest.searchParams].length === 0) {
       dest.searchParams.forEach((_, key) => {
         dest.searchParams.delete(key)
       })