netlify-cli 15.8.1-rc.0 → 15.8.1-rc.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "15.8.1-rc.0",
+  "version": "15.8.1-rc.1",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -44,13 +44,13 @@
   "dependencies": {
     "@bugsnag/js": "7.20.2",
     "@fastify/static": "6.10.2",
-    "@netlify/build": "29.15.4",
+    "@netlify/build": "29.15.6",
     "@netlify/build-info": "7.4.1",
     "@netlify/config": "20.5.2",
-    "@netlify/edge-bundler": "8.16.2",
+    "@netlify/edge-bundler": "8.16.3",
     "@netlify/local-functions-proxy": "1.1.1",
     "@netlify/serverless-functions-api": "1.5.1",
-    "@netlify/zip-it-and-ship-it": "9.12.2",
+    "@netlify/zip-it-and-ship-it": "9.13.0",
     "@octokit/rest": "19.0.13",
     "@skn0tt/lambda-local": "2.0.3",
     "ansi-escapes": "6.2.0",

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

@@ -5,7 +5,12 @@ import { exit, log } from '../command-helpers.mjs'
 
 import { createDeployKey, getBuildSettings, saveNetlifyToml, setupSite } from './utils.mjs'
 
-const addDeployKey = async ({ deployKey }) => {
+/**
+ * Prompts for granting the netlify ssh public key access to your repo
+ * @param {object} deployKey
+ * @param {string} deployKey.public_key
+ */
+const addDeployKey = async (deployKey) => {
   log('\nGive this Netlify SSH public key access to your repository:\n')
   log(`\n${deployKey.public_key}\n\n`)
 
@@ -23,6 +28,11 @@ const addDeployKey = async ({ deployKey }) => {
   }
 }
 
+/**
+ * @param {object} config
+ * @param {Awaited<ReturnType<import('../../utils/get-repo-data.mjs').default>>} config.repoData
+ * @returns {Promise<string>}
+ */
 const getRepoPath = async ({ repoData }) => {
   const { repoPath } = await inquirer.prompt([
     {
@@ -30,6 +40,9 @@ const getRepoPath = async ({ repoData }) => {
       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',
     },
   ])
@@ -37,7 +50,11 @@ const getRepoPath = async ({ repoData }) => {
   return repoPath
 }
 
-const addDeployHook = async ({ deployHook }) => {
+/**
+ * @param {string} deployHook
+ * @returns
+ */
+const addDeployHook = async (deployHook) => {
   log('\nConfigure the following webhook for your repository:\n')
   log(`\n${deployHook}\n\n`)
   const { deployHookAdded } = await inquirer.prompt([
@@ -55,7 +72,7 @@ const addDeployHook = async ({ deployHook }) => {
 /**
  * @param {object} config
  * @param {import('../../commands/base-command.mjs').default} config.command
- * @param {*} config.repoData
+ * @param {Awaited<ReturnType<import('../../utils/get-repo-data.mjs').default>>} config.repoData
  * @param {string} config.siteId
  */
 export default async function configManual({ command, repoData, siteId }) {
@@ -77,7 +94,7 @@ export default async function configManual({ command, repoData, siteId }) {
   await saveNetlifyToml({ repositoryRoot, config, configPath, baseDir, buildCmd, buildDir, functionsDir })
 
   const deployKey = await createDeployKey({ api })
-  await addDeployKey({ deployKey })
+  await addDeployKey(deployKey)
 
   const repoPath = await getRepoPath({ repoData })
   const repo = {
@@ -99,7 +116,7 @@ export default async function configManual({ command, repoData, siteId }) {
     configPlugins: config.plugins,
     pluginsToInstall,
   })
-  const deployHookAdded = await addDeployHook({ deployHook: updatedSite.deploy_hook })
+  const deployHookAdded = await addDeployHook(updatedSite.deploy_hook)
   if (!deployHookAdded) {
     exit()
   }

package/src/utils/init/frameworks.mjs

@@ -1,25 +1,18 @@
-// @ts-checkom '@netlify/build-info'
+// @ts-check
 
 /**
  * @param {{ project: import("@netlify/build-info").Project }} param0
  * @returns
  */
 export const getFrameworkInfo = async ({ project }) => {
-  const frameworks = await project.detectFrameworks()
+  const settings = await project.getBuildSettings()
   // several frameworks can be detected - first one has highest priority
-  if (frameworks && frameworks.length !== 0) {
-    const [
-      {
-        build: { command, directory },
-        name,
-        plugins,
-      },
-    ] = frameworks
+  if (settings?.length) {
     return {
-      frameworkName: name,
-      frameworkBuildCommand: command,
-      frameworkBuildDir: directory,
-      frameworkPlugins: plugins,
+      frameworkName: settings[0].framework?.name,
+      frameworkBuildCommand: settings[0].buildCommand,
+      frameworkBuildDir: settings[0].dist,
+      frameworkPlugins: settings[0].plugins_recommended,
     }
   }
   return {}