netlify-cli 11.2.0 → 11.3.0

package/npm-shrinkwrap.json

@@ -1,16 +1,16 @@
 {
   "name": "netlify-cli",
-  "version": "11.2.0",
+  "version": "11.3.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "11.2.0",
+      "version": "11.3.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@netlify/build": "^27.15.4",
+        "@netlify/build": "^27.15.5",
         "@netlify/config": "^18.2.1",
         "@netlify/edge-bundler": "^1.13.0",
         "@netlify/framework-info": "^9.2.0",
@@ -81,7 +81,7 @@
         "multiparty": "^4.2.1",
         "netlify": "^12.0.1",
         "netlify-headers-parser": "^6.0.2",
-        "netlify-onegraph-internal": "0.8.7",
+        "netlify-onegraph-internal": "0.10.0",
         "netlify-redirect-parser": "^13.0.5",
         "netlify-redirector": "^0.2.1",
         "node-fetch": "^2.6.0",
@@ -1189,9 +1189,9 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "node_modules/@netlify/build": {
-      "version": "27.15.4",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.15.4.tgz",
-      "integrity": "sha512-4fNEB3V4DF1HQEQrRfFFRWWRNNlkZEdcyWXz1ekzAwQ6rJYmhUxHV5tJg98AhHTrovXBmlWK1gLF3qLaGGoMFA==",
+      "version": "27.15.5",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.15.5.tgz",
+      "integrity": "sha512-DfzpiNztkB+7e0eM3B8QrXGP1Fc0ky/9ow5Mwg3+R7VeFKknVFAF8PKddQucR1vS0CW1lL1/jjcrv1M5zudVmQ==",
       "dependencies": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
@@ -15963,9 +15963,9 @@
       }
     },
     "node_modules/netlify-onegraph-internal": {
-      "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==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.10.0.tgz",
+      "integrity": "sha512-Gf6cE1W+q35niIz54xpSLneShpRxlleYL3ZD3D1tjGazuv19q8XBVAAynaAQFzbOk/RPTnu3+Vi/5L7DGACOIg==",
       "dependencies": {
         "graphql": "16.5.0",
         "node-fetch": "^2.6.0",
@@ -23374,9 +23374,9 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "@netlify/build": {
-      "version": "27.15.4",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.15.4.tgz",
-      "integrity": "sha512-4fNEB3V4DF1HQEQrRfFFRWWRNNlkZEdcyWXz1ekzAwQ6rJYmhUxHV5tJg98AhHTrovXBmlWK1gLF3qLaGGoMFA==",
+      "version": "27.15.5",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.15.5.tgz",
+      "integrity": "sha512-DfzpiNztkB+7e0eM3B8QrXGP1Fc0ky/9ow5Mwg3+R7VeFKknVFAF8PKddQucR1vS0CW1lL1/jjcrv1M5zudVmQ==",
       "requires": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
@@ -34193,9 +34193,9 @@
       }
     },
     "netlify-onegraph-internal": {
-      "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==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.10.0.tgz",
+      "integrity": "sha512-Gf6cE1W+q35niIz54xpSLneShpRxlleYL3ZD3D1tjGazuv19q8XBVAAynaAQFzbOk/RPTnu3+Vi/5L7DGACOIg==",
       "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": "11.2.0",
+  "version": "11.3.0",
   "author": "Netlify Inc.",
   "contributors": [
     "@whitep4nth3r (https://twitter.com/whitep4nth3r)",
@@ -222,7 +222,7 @@
     "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,yml,json,html}\" \"*.{mjs,cjs,js,yml,json,html}\" \".*.{mjs,cjs,js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!**/*/package-lock.json\" \"!.github/**/*.md\""
   },
   "dependencies": {
-    "@netlify/build": "^27.15.4",
+    "@netlify/build": "^27.15.5",
     "@netlify/config": "^18.2.1",
     "@netlify/edge-bundler": "^1.13.0",
     "@netlify/framework-info": "^9.2.0",
@@ -293,7 +293,7 @@
     "multiparty": "^4.2.1",
     "netlify": "^12.0.1",
     "netlify-headers-parser": "^6.0.2",
-    "netlify-onegraph-internal": "0.8.7",
+    "netlify-onegraph-internal": "0.10.0",
     "netlify-redirect-parser": "^13.0.5",
     "netlify-redirector": "^0.2.1",
     "node-fetch": "^2.6.0",

package/src/commands/dev/dev.js

@@ -434,6 +434,7 @@ const dev = async (options, command) => {
   }
 
   let { env } = cachedConfig
+
   if (!options.offline && siteInfo.use_envelope) {
     env = await getEnvelopeEnv({ api, context: options.context, env, siteInfo })
   }

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

@@ -33,17 +33,18 @@ const graphHandler = async (args, options, command) => {
     error(`Error parsing schema: ${buildSchemaError}`)
   }
 
-  const userOperationName = args.operationName
+  const userOperationNames = args.operationNames
   const userCodegenId = options.codegen
 
   const handlerOptions = options.data ? JSON.parse(options.data) : {}
 
-  let operationName = userOperationName
-  if (!operationName) {
-    operationName = await autocompleteOperationNames({ netlifyGraphConfig })
+  let operationNames = userOperationNames
+  if (!operationNames || operationNames.length === 0) {
+    const operationName = await autocompleteOperationNames({ netlifyGraphConfig })
+    operationNames = [operationName]
   }
 
-  if (!operationName) {
+  if (!operationNames || operationNames.length === 0) {
     error(`No operation name provided`)
   }
 
@@ -66,14 +67,17 @@ const graphHandler = async (args, options, command) => {
   }
 
   if (schema) {
-    generateHandlerByOperationName({
-      generate: codeGenerator.generateHandler,
-      logger: log,
-      netlifyGraphConfig,
-      schema,
-      operationName,
-      handlerOptions,
-    })
+    /* eslint-disable fp/no-loops */
+    for (const operationName of operationNames) {
+      await generateHandlerByOperationName({
+        generate: codeGenerator.generateHandler,
+        logger: log,
+        netlifyGraphConfig,
+        schema,
+        operationName,
+        handlerOptions,
+      })
+    }
   } else {
     error(`Failed to parse Netlify GraphQL schema`)
   }
@@ -87,14 +91,14 @@ const graphHandler = async (args, options, command) => {
 const createGraphHandlerCommand = (program) =>
   program
     .command('graph:handler')
-    .argument('[name]', 'Operation name')
+    .argument('[name...]', 'Operation name(s)')
     .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.',
     )
-    .action(async (operationName, options, command) => {
-      await graphHandler({ operationName }, options, command)
+    .action(async (operationNames, options, command) => {
+      await graphHandler({ operationNames }, options, command)
     })
 
 module.exports = { createGraphHandlerCommand }

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

@@ -318,7 +318,7 @@ const refetchAndGenerateFromOneGraph = async (input) => {
     return
   }
 
-  generateFunctionsFile({
+  await generateFunctionsFile({
     config,
     logger,
     netlifyGraphConfig,
@@ -619,7 +619,7 @@ ${JSON.stringify(payload, null, 2)}`)
         return
       }
 
-      const files = generateHandlerByOperationId({
+      const files = await generateHandlerByOperationId({
         netlifyGraphConfig,
         schema,
         operationId: payload.operationId,

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

@@ -550,9 +550,9 @@ const readGraphQLSchemaFile = (netlifyGraphConfig) => {
  * @param {string} input.operationsDoc The document containing the operation with operationId and any fragment dependency to use when generating the handler
  * @param {object} input.handlerOptions The options to use when generating the handler
  * @param {(message: string) => void=} input.logger A function that if provided will be used to log messages
- * @returns {{exportedFiles: CodegenHelpers.ExportedFile[]; operation: GraphQL.OperationDefinitionNode;} | undefined} The generated files
+ * @returns {Promise<{exportedFiles: CodegenHelpers.ExportedFile[]; operation: GraphQL.OperationDefinitionNode;} | undefined>} The generated files
  */
-const generateHandlerSourceByOperationId = ({
+const generateHandlerSourceByOperationId = async ({
   generate,
   handlerOptions,
   netlifyGraphConfig,
@@ -571,7 +571,7 @@ const generateHandlerSourceByOperationId = ({
     operationsDoc,
   }
 
-  const result = NetlifyGraph.generateCustomHandlerSource(generateHandlerPayload)
+  const result = await NetlifyGraph.generateCustomHandlerSource(generateHandlerPayload)
 
   return result
 }
@@ -585,15 +585,15 @@ const generateHandlerSourceByOperationId = ({
  * @param {string} input.operationId The operationId to use when generating the handler
  * @param {object} input.handlerOptions The options to use when generating the handler
  * @param {(message: string) => void=} input.logger A function that if provided will be used to log messages
- * @returns {Array<{filePath: string, name:string, prettierSuccess: boolean}> | undefined} An array of the generated handler filepaths
+ * @returns {Promise<Array<{filePath: string, name:string, prettierSuccess: boolean}> | undefined>} An array of the generated handler filepaths
  */
-const generateHandlerByOperationId = ({ generate, handlerOptions, netlifyGraphConfig, operationId, schema }) => {
+const generateHandlerByOperationId = async ({ generate, handlerOptions, netlifyGraphConfig, operationId, schema }) => {
   let currentOperationsDoc = readGraphQLOperationsSourceFile(netlifyGraphConfig)
   if (currentOperationsDoc.trim().length === 0) {
     currentOperationsDoc = NetlifyGraph.defaultExampleOperationsDoc
   }
 
-  const result = generateHandlerSourceByOperationId({
+  const result = await generateHandlerSourceByOperationId({
     generate,
     handlerOptions,
     netlifyGraphConfig,
@@ -669,9 +669,9 @@ const generateHandlerByOperationId = ({ generate, handlerOptions, netlifyGraphCo
  * @param {string} input.operationName The name of the operation to use when generating the handler
  * @param {object} input.handlerOptions The options to use when generating the handler
  * @param {(message: string) => void} input.logger A function that if provided will be used to log messages
- * @returns
+ * @returns {Promise<void>}
  */
-const generateHandlerByOperationName = ({
+const generateHandlerByOperationName = async ({
   generate,
   handlerOptions,
   logger,
@@ -702,7 +702,7 @@ const generateHandlerByOperationName = ({
     return
   }
 
-  generateHandlerByOperationId({
+  await generateHandlerByOperationId({
     logger,
     generate,
     netlifyGraphConfig,