netlify-cli 16.9.2 → 16.9.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "16.9.2",
+  "version": "16.9.3",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -49,8 +49,6 @@
     "@netlify/config": "20.9.0",
     "@netlify/edge-bundler": "9.4.1",
     "@netlify/local-functions-proxy": "1.1.1",
-    "@netlify/sdk": "^1.1.5",
-    "@netlify/serverless-functions-api": "1.10.0",
     "@netlify/zip-it-and-ship-it": "9.25.4",
     "@octokit/rest": "19.0.13",
     "ansi-escapes": "6.2.0",
@@ -149,7 +147,7 @@
     "update-notifier": "6.0.2",
     "uuid": "9.0.0",
     "wait-port": "1.0.4",
-    "winston": "3.8.2",
-    "write-file-atomic": "5.0.1"
+    "write-file-atomic": "5.0.1",
+    "zod": "^3.22.4"
   }
 }

package/src/commands/build/build.mjs

@@ -74,7 +74,7 @@ const build = async (options, command) => {
 export const createBuildCommand = (program) =>
   program
     .command('build')
-    .description('(Beta) Build on your local machine')
+    .description('Build on your local machine')
     .option(
       '--context <context>',
       'Specify a build context or branch (contexts: "production", "deploy-preview", "branch-deploy", "dev")',

package/src/commands/completion/completion.mjs

@@ -50,7 +50,7 @@ export const createCompletionCommand = (program) => {
 
   return program
     .command('completion')
-    .description('(Beta) Generate shell completion script\nRun this command to see instructions for your shell.')
+    .description('Generate shell completion script\nRun this command to see instructions for your shell.')
     .addExamples(['netlify completion:install'])
     .action((options, command) => {
       command.help()

package/src/commands/integration/deploy.mjs

@@ -1,14 +1,11 @@
-/* eslint-disable import/extensions */
+import fs from 'fs'
 import { resolve } from 'path'
 import { exit, env } from 'process'
 
-// eslint-disable-next-line n/no-missing-import
-import { getConfiguration } from '@netlify/sdk/cli-utils'
-// eslint-disable-next-line n/no-unpublished-import
-import fs from 'fs-extra'
 import inquirer from 'inquirer'
 import yaml from 'js-yaml'
 import fetch from 'node-fetch'
+import { z } from 'zod'
 
 import { getBuildOptions } from '../../lib/build.mjs'
 import { getToken, chalk, log } from '../../utils/command-helpers.mjs'
@@ -176,7 +173,7 @@ export async function registerIntegration(workingDir, siteId, accountId, localIn
   })
 
   const filePath = resolve(workingDir, 'integration.yaml')
-  await fs.writeFile(filePath, updatedIntegrationConfig)
+  await fs.promises.writeFile(filePath, updatedIntegrationConfig)
 
   log(chalk.yellow('Your integration.yaml file has been updated. Please commit and push these changes.'))
 }
@@ -304,12 +301,66 @@ export async function updateIntegration(
     })
 
     const filePath = resolve(workingDir, 'integration.yaml')
-    await fs.writeFile(filePath, updatedIntegrationConfig)
+    await fs.promises.writeFile(filePath, updatedIntegrationConfig)
 
     log(chalk.yellow('Changes to the integration.yaml file are complete. Please commit and push these changes.'))
   }
 }
 
+const possibleFiles = ['integration.yaml', 'integration.yml', 'integration.netlify.yaml', 'integration.netlify.yml']
+const IntegrationConfigurationSchema = z.object({
+  name: z.string().optional(),
+  description: z.string().optional(),
+  slug: z.string().regex(/^[a-z\d-]+$/, 'slug must be lowercase with dashes'),
+  scopes: z
+    .object({
+      all: z.boolean().optional(),
+      site: z.array(z.enum(['read', 'write'])).optional(),
+      env: z.array(z.enum(['read', 'write', 'delete'])).optional(),
+      user: z.array(z.enum(['read', 'write'])).optional(),
+    })
+    .optional(),
+  integrationLevel: z.enum(['site', 'team', 'team-and-site']).optional(),
+})
+
+const getConfigurationFile = (workingDir) => {
+  const pwd = workingDir
+
+  const fileName = possibleFiles.find((configFileName) => fs.existsSync(resolve(pwd, configFileName)))
+
+  return fileName
+}
+
+export const getConfiguration = (workingDir) => {
+  const pwd = workingDir
+
+  const fileName = getConfigurationFile(workingDir)
+
+  if (!fileName) {
+    throw new Error('No configuration file found')
+  }
+
+  try {
+    const { config } = yaml.load(fs.readFileSync(resolve(pwd, fileName), 'utf-8'))
+
+    if (!config) {
+      throw new Error('No configuration found')
+    }
+
+    const parseResult = IntegrationConfigurationSchema.safeParse(config)
+
+    if (!parseResult.success) {
+      console.error(parseResult.error.message)
+      throw new Error('Invalid Configuration')
+    }
+
+    return config
+  } catch (error) {
+    console.error(error)
+    console.error(`No configuration found in ${fileName} in ${pwd}`)
+    exit(1)
+  }
+}
 /**
  * The deploy command for Netlify Integrations
  * @param {import('commander').OptionValues} options
@@ -330,7 +381,7 @@ const deploy = async (options, command) => {
   // Confirm that a site is linked and that the user is logged in
   checkOptions(buildOptions)
 
-  const { description, integrationLevel, name, scopes, slug } = await getConfiguration()
+  const { description, integrationLevel, name, scopes, slug } = await getConfiguration(command.workingDir)
   const localIntegrationConfig = { name, description, scopes, slug, integrationLevel }
 
   const { accountId } = await getSiteInformation({
@@ -394,4 +445,3 @@ export const createDeployCommand = (program) =>
     .option('-a, --auth <token>', 'Netlify auth token to deploy with', env.NETLIFY_AUTH_TOKEN)
     .option('-s, --site <name-or-id>', 'A site name or ID to deploy to', env.NETLIFY_SITE_ID)
     .action(deploy)
-/* eslint-enable import/extensions */

package/src/commands/recipes/recipes-list.mjs

@@ -27,6 +27,6 @@ const recipesListCommand = async () => {
 export const createRecipesListCommand = (program) =>
   program
     .command('recipes:list')
-    .description(`(Beta) List the recipes available to create and modify files in a project`)
+    .description(`List the recipes available to create and modify files in a project`)
     .addExamples(['netlify recipes:list'])
     .action(recipesListCommand)

package/src/commands/recipes/recipes.mjs

@@ -81,7 +81,7 @@ export const createRecipesCommand = (program) => {
   program
     .command('recipes')
     .argument('[name]', 'name of the recipe')
-    .description(`(Beta) Create and modify files in a project using pre-defined recipes`)
+    .description(`Create and modify files in a project using pre-defined recipes`)
     .option('-n, --name <name>', 'recipe name to use')
     .addExamples(['netlify recipes my-recipe', 'netlify recipes --name my-recipe'])
     .action(recipesCommand)

package/src/commands/serve/serve.mjs

@@ -167,7 +167,7 @@ export const createServeCommand = (program) =>
   program
     .command('serve')
     .description(
-      '(Beta) Build the site for production and serve locally. This does not watch the code for changes, so if you need to rebuild your site then you must exit and run `serve` again.',
+      'Build the site for production and serve locally. This does not watch the code for changes, so if you need to rebuild your site then you must exit and run `serve` again.',
     )
     .option(
       '--context <context>',

package/src/utils/deploy/deploy-site.mjs

@@ -28,7 +28,7 @@ export const deploySite = async (
     concurrentHash = DEFAULT_CONCURRENT_HASH,
     concurrentUpload = DEFAULT_CONCURRENT_UPLOAD,
     configPath = null,
-    deployId: deployIdOpt = null,
+    deployId,
     deployTimeout = DEFAULT_DEPLOY_TIMEOUT,
     draft = false,
     filter,
@@ -37,8 +37,6 @@ export const deploySite = async (
     hashAlgorithm,
     manifestPath,
     maxRetry = DEFAULT_MAX_RETRY,
-    // API calls this the 'title'
-    message: title,
     siteEnv,
     siteRoot,
     skipFunctionsCache,
@@ -120,9 +118,9 @@ For more information, visit https://ntl.fyi/cli-native-modules.`)
     phase: 'start',
   })
 
-  let deploy
-  let deployParams = cleanDeep({
+  const deployParams = cleanDeep({
     siteId,
+    deploy_id: deployId,
     body: {
       files,
       functions,
@@ -133,19 +131,11 @@ For more information, visit https://ntl.fyi/cli-native-modules.`)
       draft,
     },
   })
-  if (deployIdOpt === null) {
-    if (title) {
-      deployParams = { ...deployParams, title }
-    }
-    deploy = await api.createSiteDeploy(deployParams)
-  } else {
-    deployParams = { ...deployParams, deploy_id: deployIdOpt }
-    deploy = await api.updateSiteDeploy(deployParams)
-  }
+  let deploy = await api.updateSiteDeploy(deployParams)
 
   if (deployParams.body.async) deploy = await waitForDiff(api, deploy.id, siteId, deployTimeout)
 
-  const { id: deployId, required: requiredFiles, required_functions: requiredFns } = deploy
+  const { required: requiredFiles, required_functions: requiredFns } = deploy
 
   statusCb({
     type: 'create-deploy',