netlify-cli 17.3.1 → 17.4.0

package/src/utils/init/config-manual.mjs

@@ -1,125 +1,108 @@
-// @ts-check
-import inquirer from 'inquirer'
-
-import { exit, log } from '../command-helpers.mjs'
-
-import { createDeployKey, getBuildSettings, saveNetlifyToml, setupSite } from './utils.mjs'
-
+import inquirer from 'inquirer';
+import { exit, log } from '../command-helpers.mjs';
+import { createDeployKey, getBuildSettings, saveNetlifyToml, setupSite } from './utils.mjs';
 /**
  * Prompts for granting the netlify ssh public key access to your repo
  * @param {object} deployKey
  * @param {string} deployKey.public_key
  */
+// @ts-expect-error TS(7006) FIXME: Parameter 'deployKey' implicitly has an 'any' type... Remove this comment to see the full error message
 const addDeployKey = async (deployKey) => {
-  log('\nGive this Netlify SSH public key access to your repository:\n')
-  log(`\n${deployKey.public_key}\n\n`)
-
-  const { sshKeyAdded } = await inquirer.prompt([
-    {
-      type: 'confirm',
-      name: 'sshKeyAdded',
-      message: 'Continue?',
-      default: true,
-    },
-  ])
-
-  if (!sshKeyAdded) {
-    exit()
-  }
-}
-
+    log('\nGive this Netlify SSH public key access to your repository:\n');
+    log(`\n${deployKey.public_key}\n\n`);
+    const { sshKeyAdded } = await inquirer.prompt([
+        {
+            type: 'confirm',
+            name: 'sshKeyAdded',
+            message: 'Continue?',
+            default: true,
+        },
+    ]);
+    if (!sshKeyAdded) {
+        exit();
+    }
+};
 /**
  * @param {object} config
  * @param {Awaited<ReturnType<import('../../utils/get-repo-data.mjs').default>>} config.repoData
  * @returns {Promise<string>}
  */
+// @ts-expect-error TS(7031) FIXME: Binding element 'repoData' implicitly has an 'any'... Remove this comment to see the full error message
 const getRepoPath = async ({ repoData }) => {
-  const { repoPath } = await inquirer.prompt([
-    {
-      type: 'input',
-      name: 'repoPath',
-      message: 'The SSH URL of the remote git repo:',
-      default: repoData.url,
-      /**
-       * @param {string} url
-       */
-      validate: (url) => SSH_URL_REGEXP.test(url) || 'The URL provided does not use the SSH protocol',
-    },
-  ])
-
-  return repoPath
-}
-
+    const { repoPath } = await inquirer.prompt([
+        {
+            type: 'input',
+            name: 'repoPath',
+            message: 'The SSH URL of the remote git repo:',
+            default: repoData.url,
+            /**
+             * @param {string} url
+             */
+            validate: (url) => SSH_URL_REGEXP.test(url) || 'The URL provided does not use the SSH protocol',
+        },
+    ]);
+    return repoPath;
+};
 /**
  * @param {string} deployHook
  * @returns
  */
+// @ts-expect-error TS(7006) FIXME: Parameter 'deployHook' implicitly has an 'any' typ... Remove this comment to see the full error message
 const addDeployHook = async (deployHook) => {
-  log('\nConfigure the following webhook for your repository:\n')
-  log(`\n${deployHook}\n\n`)
-  const { deployHookAdded } = await inquirer.prompt([
-    {
-      type: 'confirm',
-      name: 'deployHookAdded',
-      message: 'Continue?',
-      default: true,
-    },
-  ])
-
-  return deployHookAdded
-}
-
+    log('\nConfigure the following webhook for your repository:\n');
+    log(`\n${deployHook}\n\n`);
+    const { deployHookAdded } = await inquirer.prompt([
+        {
+            type: 'confirm',
+            name: 'deployHookAdded',
+            message: 'Continue?',
+            default: true,
+        },
+    ]);
+    return deployHookAdded;
+};
 /**
  * @param {object} config
  * @param {import('../../commands/base-command.mjs').default} config.command
  * @param {Awaited<ReturnType<import('../../utils/get-repo-data.mjs').default>>} config.repoData
  * @param {string} config.siteId
  */
+// @ts-expect-error TS(7031) FIXME: Binding element 'command' implicitly has an 'any' ... Remove this comment to see the full error message
 export default async function configManual({ command, repoData, siteId }) {
-  const { netlify } = command
-  const {
-    api,
-    cachedConfig: { configPath },
-    config,
-    repositoryRoot,
-    site: { root: siteRoot },
-  } = netlify
-
-  const { baseDir, buildCmd, buildDir, functionsDir, pluginsToInstall } = await getBuildSettings({
-    repositoryRoot,
-    siteRoot,
-    config,
-    command,
-  })
-  await saveNetlifyToml({ repositoryRoot, config, configPath, baseDir, buildCmd, buildDir, functionsDir })
-
-  const deployKey = await createDeployKey({ api })
-  await addDeployKey(deployKey)
-
-  const repoPath = await getRepoPath({ repoData })
-  const repo = {
-    provider: 'manual',
-    repo_path: repoPath,
-    repo_branch: repoData.branch,
-    allowed_branches: [repoData.branch],
-    deploy_key_id: deployKey.id,
-    base: baseDir,
-    dir: buildDir,
-    functions_dir: functionsDir,
-    ...(buildCmd && { cmd: buildCmd }),
-  }
-
-  const updatedSite = await setupSite({
-    api,
-    siteId,
-    repo,
-    configPlugins: config.plugins,
-    pluginsToInstall,
-  })
-  const deployHookAdded = await addDeployHook(updatedSite.deploy_hook)
-  if (!deployHookAdded) {
-    exit()
-  }
+    const { netlify } = command;
+    const { api, cachedConfig: { configPath }, config, repositoryRoot, site: { root: siteRoot }, } = netlify;
+    const { baseDir, buildCmd, buildDir, functionsDir, pluginsToInstall } = await getBuildSettings({
+        // @ts-expect-error TS(2345) FIXME: Argument of type '{ repositoryRoot: any; siteRoot:... Remove this comment to see the full error message
+        repositoryRoot,
+        siteRoot,
+        config,
+        command,
+    });
+    await saveNetlifyToml({ repositoryRoot, config, configPath, baseDir, buildCmd, buildDir, functionsDir });
+    const deployKey = await createDeployKey({ api });
+    await addDeployKey(deployKey);
+    const repoPath = await getRepoPath({ repoData });
+    const repo = {
+        provider: 'manual',
+        repo_path: repoPath,
+        repo_branch: repoData.branch,
+        allowed_branches: [repoData.branch],
+        deploy_key_id: deployKey.id,
+        base: baseDir,
+        dir: buildDir,
+        functions_dir: functionsDir,
+        ...(buildCmd && { cmd: buildCmd }),
+    };
+    const updatedSite = await setupSite({
+        api,
+        siteId,
+        repo,
+        configPlugins: config.plugins,
+        pluginsToInstall,
+    });
+    const deployHookAdded = await addDeployHook(updatedSite.deploy_hook);
+    if (!deployHookAdded) {
+        exit();
+    }
 }
-
-const SSH_URL_REGEXP = /(ssh:\/\/|[a-zA-Z]*@|[a-zA-Z.].*:(?!\/\/))/
+const SSH_URL_REGEXP = /(ssh:\/\/|[a-zA-Z]*@|[a-zA-Z.].*:(?!\/\/))/;

package/src/utils/init/config.mjs

@@ -1,22 +1,19 @@
-// @ts-check
-import { chalk, log } from '../command-helpers.mjs'
-
-import { configGithub } from './config-github.mjs'
-import configManual from './config-manual.mjs'
-
+import { chalk, log } from '../command-helpers.mjs';
+import { configGithub } from './config-github.mjs';
+import configManual from './config-manual.mjs';
+// @ts-expect-error TS(7006) FIXME: Parameter 'repoData' implicitly has an 'any' type.
 const logSuccess = (repoData) => {
-  log()
-  log(chalk.greenBright.bold.underline(`Success! Netlify CI/CD Configured!`))
-  log()
-  log(`This site is now configured to automatically deploy from ${repoData.provider} branches & pull requests`)
-  log()
-  log(`Next steps:
+    log();
+    log(chalk.greenBright.bold.underline(`Success! Netlify CI/CD Configured!`));
+    log();
+    log(`This site is now configured to automatically deploy from ${repoData.provider} branches & pull requests`);
+    log();
+    log(`Next steps:
 
   ${chalk.cyanBright.bold('git push')}       Push to your git repository to trigger new site builds
   ${chalk.cyanBright.bold('netlify open')}   Open the Netlify admin URL of your site
-  `)
-}
-
+  `);
+};
 /**
  * @param {object} config
  * @param {import('../../commands/base-command.mjs').default} config.command
@@ -24,15 +21,17 @@ const logSuccess = (repoData) => {
  * @param {*} config.repoData
  * @param {string} config.siteId
  */
+// @ts-expect-error TS(7031) FIXME: Binding element 'command' implicitly has an 'any' ... Remove this comment to see the full error message
 export const configureRepo = async ({ command, manual, repoData, siteId }) => {
-  if (manual) {
-    await configManual({ command, siteId, repoData })
-  } else if (repoData.provider === 'github') {
-    await configGithub({ command, siteId, repoName: repoData.name, repoOwner: repoData.owner })
-  } else {
-    log(`No configurator found for the provided git remote. Configuring manually...`)
-    await configManual({ command, siteId, repoData })
-  }
-
-  logSuccess(repoData)
-}
+    if (manual) {
+        await configManual({ command, siteId, repoData });
+    }
+    else if (repoData.provider === 'github') {
+        await configGithub({ command, siteId, repoName: repoData.name, repoOwner: repoData.owner });
+    }
+    else {
+        log(`No configurator found for the provided git remote. Configuring manually...`);
+        await configManual({ command, siteId, repoData });
+    }
+    logSuccess(repoData);
+};

package/src/utils/init/node-version.mjs

@@ -1,32 +1,25 @@
-// @ts-check
-import { readFile } from 'fs/promises'
-
-import { locatePath } from 'locate-path'
-import nodeVersionAlias from 'node-version-alias'
-
-import { warn } from '../command-helpers.mjs'
-
-const DEFAULT_NODE_VERSION = '12.18.0'
-const NVM_FLAG_PREFIX = '--'
-
+import { readFile } from 'fs/promises';
+import { locatePath } from 'locate-path';
+import nodeVersionAlias from 'node-version-alias';
+import { warn } from '../command-helpers.mjs';
+const DEFAULT_NODE_VERSION = '12.18.0';
+const NVM_FLAG_PREFIX = '--';
 // to support NODE_VERSION=--lts, etc.
-const normalizeConfiguredVersion = (version) =>
-  version.startsWith(NVM_FLAG_PREFIX) ? version.slice(NVM_FLAG_PREFIX.length) : version
-
+// @ts-expect-error TS(7006) FIXME: Parameter 'version' implicitly has an 'any' type.
+const normalizeConfiguredVersion = (version) => version.startsWith(NVM_FLAG_PREFIX) ? version.slice(NVM_FLAG_PREFIX.length) : version;
+// @ts-expect-error TS(7031) FIXME: Binding element 'baseDirectory' implicitly has an ... Remove this comment to see the full error message
 export const detectNodeVersion = async ({ baseDirectory, env }) => {
-  try {
-    const nodeVersionFile = await locatePath(['.nvmrc', '.node-version'], { cwd: baseDirectory })
-    const configuredVersion =
-      nodeVersionFile === undefined ? env.NODE_VERSION?.value : await readFile(nodeVersionFile, 'utf8')
-
-    const version =
-      configuredVersion === undefined || configuredVersion === null
-        ? DEFAULT_NODE_VERSION
-        : await nodeVersionAlias(normalizeConfiguredVersion(configuredVersion))
-
-    return version
-  } catch (error) {
-    warn(`Failed detecting Node.js version: ${error.message}`)
-    return DEFAULT_NODE_VERSION
-  }
-}
+    try {
+        const nodeVersionFile = await locatePath(['.nvmrc', '.node-version'], { cwd: baseDirectory });
+        const configuredVersion = nodeVersionFile === undefined ? env.NODE_VERSION?.value : await readFile(nodeVersionFile, 'utf8');
+        const version = configuredVersion === undefined || configuredVersion === null
+            ? DEFAULT_NODE_VERSION
+            : await nodeVersionAlias(normalizeConfiguredVersion(configuredVersion));
+        return version;
+    }
+    catch (error) {
+        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+        warn(`Failed detecting Node.js version: ${error.message}`);
+        return DEFAULT_NODE_VERSION;
+    }
+};

package/src/utils/init/plugins.mjs

@@ -1,8 +1,12 @@
-const isPluginInstalled = (configPlugins, plugin) =>
-  configPlugins.some(({ package: configPlugin }) => configPlugin === plugin)
-
-export const getRecommendPlugins = (frameworkPlugins, config) =>
-  frameworkPlugins.filter((plugin) => !isPluginInstalled(config.plugins, plugin))
-
-export const getUIPlugins = (configPlugins) =>
-  configPlugins.filter(({ origin }) => origin === 'ui').map(({ package: pkg }) => ({ package: pkg }))
+// @ts-expect-error TS(7006) FIXME: Parameter 'configPlugins' implicitly has an 'any' ... Remove this comment to see the full error message
+const isPluginInstalled = (configPlugins, plugin) => 
+// @ts-expect-error TS(7031) FIXME: Binding element 'configPlugin' implicitly has an '... Remove this comment to see the full error message
+configPlugins.some(({ package: configPlugin }) => configPlugin === plugin);
+// @ts-expect-error TS(7006) FIXME: Parameter 'frameworkPlugins' implicitly has an 'an... Remove this comment to see the full error message
+export const getRecommendPlugins = (frameworkPlugins, config) => 
+// @ts-expect-error TS(7006) FIXME: Parameter 'plugin' implicitly has an 'any' type.
+frameworkPlugins.filter((plugin) => !isPluginInstalled(config.plugins, plugin));
+// @ts-expect-error TS(7006) FIXME: Parameter 'configPlugins' implicitly has an 'any' ... Remove this comment to see the full error message
+export const getUIPlugins = (configPlugins) => 
+// @ts-expect-error TS(7031) FIXME: Binding element 'origin' implicitly has an 'any' t... Remove this comment to see the full error message
+configPlugins.filter(({ origin }) => origin === 'ui').map(({ package: pkg }) => ({ package: pkg }));