netlify-cli 10.17.7 → 10.17.8

package/npm-shrinkwrap.json

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "10.17.7",
+  "version": "10.17.8",
   "author": "Netlify Inc.",
   "contributors": [
     "@whitep4nth3r (https://twitter.com/whitep4nth3r)",

package/src/commands/env/env-clone.js

@@ -74,11 +74,7 @@ const envClone = async (options, command) => {
     return false
   }
 
-  log(
-    `Successfully cloned environment variables from ${chalk.greenBright(siteFrom.name)} to ${chalk.greenBright(
-      siteTo.name,
-    )}`,
-  )
+  log(`Successfully cloned environment variables from ${chalk.green(siteFrom.name)} to ${chalk.green(siteTo.name)}`)
 
   return true
 }
@@ -98,7 +94,7 @@ const mongoToMongo = async ({ api, siteFrom, siteTo }) => {
   ] = [siteFrom, siteTo]
 
   if (isEmpty(envFrom)) {
-    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to clone`)
+    log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
 
@@ -130,7 +126,7 @@ const mongoToEnvelope = async ({ api, siteFrom, siteTo }) => {
   const keysFrom = Object.keys(envFrom)
 
   if (isEmpty(envFrom)) {
-    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to clone`)
+    log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
 
@@ -163,7 +159,7 @@ const envelopeToMongo = async ({ api, siteFrom, siteTo }) => {
   const envFrom = translateFromEnvelopeToMongo(envelopeVariables)
 
   if (isEmpty(envFrom)) {
-    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to clone`)
+    log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
 
@@ -201,7 +197,7 @@ const envelopeToEnvelope = async ({ api, siteFrom, siteTo }) => {
   const keysFrom = envelopeFrom.map(({ key }) => key)
 
   if (isEmpty(keysFrom)) {
-    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to clone`)
+    log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
 

package/src/commands/env/env-get.js

@@ -26,7 +26,7 @@ const envGet = async (name, options, command) => {
     env = await getEnvelopeEnv({ api, context, env, key: name, scope, siteInfo })
   } else if (context !== 'dev' || scope !== 'any') {
     error(
-      `To specify a context or scope, please run ${chalk.yellowBright(
+      `To specify a context or scope, please run ${chalk.yellow(
         'netlify open:admin',
       )} to open the Netlify UI and opt in to the new environment variables experience from Site settings`,
     )
@@ -42,9 +42,9 @@ const envGet = async (name, options, command) => {
   }
 
   if (!value) {
-    const withContext = `in the ${chalk.magentaBright(context)} context`
-    const withScope = scope === 'any' ? '' : ` in the ${chalk.magentaBright(context)} scope`
-    log(`No value set ${withContext}${withScope} for environment variable ${chalk.yellowBright(name)}`)
+    const withContext = `in the ${chalk.magenta(context)} context`
+    const withScope = scope === 'any' ? '' : ` and the ${chalk.magenta(scope)} scope`
+    log(`No value set ${withContext}${withScope} for environment variable ${chalk.yellow(name)}`)
     return false
   }
 

package/src/commands/env/env-list.js

@@ -55,7 +55,7 @@ const envList = async (options, command) => {
     environment = await getEnvelopeEnv({ api, context, env, scope, siteInfo })
   } else if (context !== 'dev' || scope !== 'any') {
     error(
-      `To specify a context or scope, please run ${chalk.yellowBright(
+      `To specify a context or scope, please run ${chalk.yellow(
         'netlify open:admin',
       )} to open the Netlify UI and opt in to the new environment variables experience from Site settings`,
     )
@@ -76,9 +76,9 @@ const envList = async (options, command) => {
     return false
   }
 
-  const forSite = `for site ${chalk.greenBright(siteInfo.name)}`
-  const withContext = isUsingEnvelope ? `in the ${chalk.magentaBright(options.context)} context` : ''
-  const withScope = isUsingEnvelope && scope !== 'any' ? `and ${chalk.yellowBright(options.scope)} scope` : ''
+  const forSite = `for site ${chalk.green(siteInfo.name)}`
+  const withContext = isUsingEnvelope ? `in the ${chalk.magenta(options.context)} context` : ''
+  const withScope = isUsingEnvelope && scope !== 'any' ? `and ${chalk.yellow(options.scope)} scope` : ''
   if (isEmpty(environment)) {
     log(`No environment variables set ${forSite} ${withContext} ${withScope}`)
     return false

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

@@ -828,12 +828,32 @@ const detectLocalCLISessionMetadata = async ({ siteRoot }) => {
  * @param {string} input.jwt The GraphJWT string
  * @param {string} input.sessionId The id of the cli session to fetch the current metadata for
  * @param {string} input.siteRoot Path to the root of the project
+ * @param {object} input.config The parsed netlify.toml config file
  * @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 ({ docId, jwt, schemaId, sessionId, siteRoot }) => {
+const publishCliSessionMetadataPublishEvent = async ({ config, docId, jwt, schemaId, sessionId, siteRoot }) => {
   const detectedMetadata = await detectLocalCLISessionMetadata({ siteRoot })
 
+  /** @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,
+      })),
+    }
+  }
+
   /** @type {CliEventHelper.OneGraphNetlifyCliSessionMetadataPublishEvent} */
   const event = {
     __typename: 'OneGraphNetlifyCliSessionMetadataPublishEvent',
@@ -848,7 +868,7 @@ const publishCliSessionMetadataPublishEvent = async ({ docId, jwt, schemaId, ses
       siteRootFriendly: detectedMetadata.siteRoot,
       persistedDocId: docId,
       schemaId,
-      codegenModule: detectedMetadata.codegen,
+      codegenModule: codegen,
       arch: detectedMetadata.arch,
       nodeVersion: detectedMetadata.nodeVersion,
       platform: detectedMetadata.platform,