netlify-cli 13.0.0 → 13.1.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "13.0.0",
+  "version": "13.1.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -59,7 +59,7 @@
     "test:dev:vitest": "vitest run tests/unit/ && vitest run tests/integration",
     "test:ci:ava:integration": "c8 -r json ava --concurrency 1 --no-worker-threads tests/integration/",
     "test:ci:vitest:unit": "vitest run --coverage tests/unit/",
-    "test:ci:vitest:integration": "vitest run --coverage --no-threads tests/integration/",
+    "test:ci:vitest:integration": "vitest run --coverage tests/integration/",
     "test:affected": "node ./tools/affected-test.mjs",
     "e2e": "node ./tools/e2e/run.mjs",
     "docs": "node ./site/scripts/docs.mjs",
@@ -76,12 +76,12 @@
   },
   "dependencies": {
     "@fastify/static": "^6.6.0",
-    "@netlify/build": "^29.5.8",
+    "@netlify/build": "^29.6.5",
     "@netlify/config": "^20.3.3",
-    "@netlify/edge-bundler": "^8.7.0",
-    "@netlify/framework-info": "^9.8.2",
+    "@netlify/edge-bundler": "^8.11.0",
+    "@netlify/framework-info": "^9.8.5",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/zip-it-and-ship-it": "^8.7.0",
+    "@netlify/zip-it-and-ship-it": "^8.9.0",
     "@octokit/rest": "^19.0.0",
     "ansi-escapes": "^5.0.0",
     "ansi-styles": "^5.0.0",
@@ -89,8 +89,8 @@
     "ascii-table": "0.0.9",
     "backoff": "^2.5.0",
     "better-opn": "^3.0.0",
-    "boxen": "^5.0.0",
-    "chalk": "^4.0.0",
+    "boxen": "^7.0.1",
+    "chalk": "^5.0.0",
     "chokidar": "^3.0.2",
     "ci-info": "^3.0.0",
     "clean-deep": "^3.0.2",
@@ -130,8 +130,8 @@
     "https-proxy-agent": "^5.0.0",
     "inquirer": "^6.5.1",
     "inquirer-autocomplete-prompt": "^1.0.1",
-    "is-docker": "^2.0.0",
-    "is-plain-obj": "^3.0.0",
+    "is-docker": "^3.0.0",
+    "is-plain-obj": "^4.0.0",
     "is-wsl": "^2.2.0",
     "isexe": "^2.0.0",
     "jsonwebtoken": "^9.0.0",
@@ -152,8 +152,8 @@
     "node-fetch": "^2.6.0",
     "node-version-alias": "^2.0.0",
     "ora": "^5.0.0",
-    "p-filter": "^2.1.0",
-    "p-map": "^4.0.0",
+    "p-filter": "^3.0.0",
+    "p-map": "^5.0.0",
     "p-wait-for": "^3.0.0",
     "parallel-transform": "^1.2.0",
     "parse-github-url": "^1.0.2",
@@ -185,7 +185,7 @@
   "devDependencies": {
     "@babel/preset-react": "^7.12.13",
     "@netlify/eslint-config-node": "^7.0.0",
-    "@vitest/coverage-c8": "^0.28.0",
+    "@vitest/coverage-c8": "^0.29.0",
     "ava": "^4.0.0",
     "c8": "^7.11.0",
     "cpy": "^9.0.1",
@@ -209,7 +209,7 @@
     "typescript": "^4.4.4",
     "verdaccio": "^5.10.2",
     "vite": "^4.0.0",
-    "vitest": "^0.28.0"
+    "vitest": "^0.29.0"
   },
   "ava": {
     "files": [

package/src/commands/deploy/deploy.mjs

@@ -567,7 +567,7 @@ const deploy = async (options, command) => {
     return triggerDeploy({ api, options, siteData, siteId })
   }
 
-  const { newConfig, configMutations = [] } = await handleBuild({
+  const { configMutations = [], newConfig } = await handleBuild({
     cachedConfig: command.netlify.cachedConfig,
     options,
   })

package/src/commands/functions/functions-create.mjs

@@ -361,7 +361,7 @@ const downloadFromURL = async function (command, options, argumentName, function
   const fnTemplateFile = path.join(fnFolder, '.netlify-function-template.mjs')
   if (await fileExistsAsync(fnTemplateFile)) {
     const {
-      default: { onComplete, addons = [] },
+      default: { addons = [], onComplete },
       // eslint-disable-next-line import/no-dynamic-require
     } = await import(pathToFileURL(fnTemplateFile).href)
 
@@ -463,7 +463,7 @@ const scaffoldFromTemplate = async function (command, options, argumentName, fun
   } else if (chosenTemplate === 'report') {
     log(`${NETLIFYDEVLOG} Open in browser: https://github.com/netlify/cli/issues/new`)
   } else {
-    const { onComplete, name: templateName, lang, addons = [] } = chosenTemplate
+    const { addons = [], lang, name: templateName, onComplete } = chosenTemplate
     const pathToTemplate = path.join(templatesDir, lang, templateName)
     if (!fs.existsSync(pathToTemplate)) {
       throw new Error(

package/src/commands/graph/graph.mjs

@@ -1,4 +1,6 @@
 // @ts-check
+import { warn } from '../../utils/command-helpers.mjs'
+
 import { createGraphConfigWriteCommand } from './graph-config-write.mjs'
 import { createGraphEditCommand } from './graph-edit.mjs'
 import { createGraphHandlerCommand } from './graph-handler.mjs'
@@ -32,7 +34,12 @@ export const createGraphCommand = (program) => {
 
   return program
     .command('graph')
-    .description('(Beta) Control the Netlify Graph functions for the current site')
+    .hook('preAction', () => {
+      warn(
+        'Netlify Graph is deprecated and will be removed from the CLI in a future release at the end of April, 2023. Please migrate off of Netlify Graph beforehand.',
+      )
+    })
+    .description('(Deprecated) Control the Netlify Graph functions for the current site')
     .addExamples(['netlify graph:pull', 'netlify graph:edit'])
     .action(graph)
 }

package/src/functions-templates/javascript/token-hider/package-lock.json

@@ -19,9 +19,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "node_modules/axios": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.3.tgz",
-      "integrity": "sha512-eYq77dYIFS77AQlhzEL937yUBSepBfPIe8FcgEDN35vMNZKMrs81pgnyrQpwfy4NF4b4XWX1Zgx7yX+25w8QJA==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz",
+      "integrity": "sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -198,9 +198,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "axios": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.3.tgz",
-      "integrity": "sha512-eYq77dYIFS77AQlhzEL937yUBSepBfPIe8FcgEDN35vMNZKMrs81pgnyrQpwfy4NF4b4XWX1Zgx7yX+25w8QJA==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz",
+      "integrity": "sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",

package/src/functions-templates/javascript/url-shortener/package-lock.json

@@ -51,9 +51,9 @@
       }
     },
     "node_modules/hashids": {
-      "version": "2.2.10",
-      "resolved": "https://registry.npmjs.org/hashids/-/hashids-2.2.10.tgz",
-      "integrity": "sha512-nXnYums7F8B5Y+GSThutLPlKMaamW1yjWNZVt0WModiJfdjaDZHnhYTWblS+h1OoBx3yjwiBwxldPP3nIbFSSA=="
+      "version": "2.2.11",
+      "resolved": "https://registry.npmjs.org/hashids/-/hashids-2.2.11.tgz",
+      "integrity": "sha512-e1rAPT5Wa9vf/Dq1eq8LFw5VH2dtKxRf6k9bCw0GLwKL/SRnUphIcqwJWUZ1ki18cdj03nCrpdlJOcyHILQk8Q=="
     },
     "node_modules/mime-db": {
       "version": "1.51.0",
@@ -105,9 +105,9 @@
       }
     },
     "hashids": {
-      "version": "2.2.10",
-      "resolved": "https://registry.npmjs.org/hashids/-/hashids-2.2.10.tgz",
-      "integrity": "sha512-nXnYums7F8B5Y+GSThutLPlKMaamW1yjWNZVt0WModiJfdjaDZHnhYTWblS+h1OoBx3yjwiBwxldPP3nIbFSSA=="
+      "version": "2.2.11",
+      "resolved": "https://registry.npmjs.org/hashids/-/hashids-2.2.11.tgz",
+      "integrity": "sha512-e1rAPT5Wa9vf/Dq1eq8LFw5VH2dtKxRf6k9bCw0GLwKL/SRnUphIcqwJWUZ1ki18cdj03nCrpdlJOcyHILQk8Q=="
     },
     "mime-db": {
       "version": "1.51.0",

package/src/functions-templates/rust/hello-world/Cargo.toml

@@ -7,7 +7,7 @@ version = "0.1.0"
 
 [dependencies]
 aws_lambda_events = "0.7.3"
-http = "0.2.8"
+http = "0.2.9"
 lambda_runtime = "0.7.3"
 log = "0.4.17"
 simple_logger = "1.16.0"

package/src/functions-templates/typescript/hello-world/package-lock.json

@@ -26,9 +26,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.18.36",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz",
-      "integrity": "sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ=="
+      "version": "14.18.37",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.37.tgz",
+      "integrity": "sha512-7GgtHCs/QZrBrDzgIJnQtuSvhFSwhyYSI2uafSwZoNt1iOGhEN5fwNrQMjtONyHm9+/LoA4453jH0CMYcr06Pg=="
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
@@ -58,9 +58,9 @@
       }
     },
     "@types/node": {
-      "version": "14.18.36",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz",
-      "integrity": "sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ=="
+      "version": "14.18.37",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.37.tgz",
+      "integrity": "sha512-7GgtHCs/QZrBrDzgIJnQtuSvhFSwhyYSI2uafSwZoNt1iOGhEN5fwNrQMjtONyHm9+/LoA4453jH0CMYcr06Pg=="
     },
     "is-promise": {
       "version": "4.0.0",

package/src/lib/api.mjs

@@ -12,7 +12,7 @@ const FIRST_PAGE = 1
 const MAX_PAGES = 10
 const MAX_PER_PAGE = 100
 export const listSites = async ({ api, options }) => {
-  const { page = FIRST_PAGE, maxPages = MAX_PAGES, ...rest } = options
+  const { maxPages = MAX_PAGES, page = FIRST_PAGE, ...rest } = options
   const sites = await api.listSites({ page, per_page: MAX_PER_PAGE, ...rest })
   // TODO: use pagination headers when js-client returns them
   if (sites.length === MAX_PER_PAGE && page + 1 <= maxPages) {

package/src/lib/build.mjs

@@ -42,7 +42,6 @@ export const getBuildOptions = ({
   featureFlags: {
     ...edgeFunctionsFeatureFlags,
     functionsBundlingManifest: true,
-    project_deploy_configuration_api_use_per_function_configuration_files: true,
   },
 })
 

package/src/lib/functions/registry.mjs

@@ -194,7 +194,6 @@ export class FunctionsRegistry {
     const functions = await this.listFunctions(directories, {
       featureFlags: {
         buildRustSource: env.NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE === 'true',
-        project_deploy_configuration_api_use_per_function_configuration_files: true,
       },
       configFileDirectories: [getPathInProject([INTERNAL_FUNCTIONS_FOLDER])],
       config: this.config.functions,

package/src/utils/addons/diffs/options.mjs

@@ -1,9 +1,9 @@
 // @ts-check
 import ansiStyles from 'ansi-styles'
+// eslint-disable-next-line no-restricted-imports
+import { Chalk } from 'chalk'
 
-import { chalk } from '../../command-helpers.mjs'
-
-const forceColor = new chalk.Instance({ level: 1 })
+const forceColor = new Chalk({ level: 1 })
 
 const colorTheme = {
   boolean: ansiStyles.yellow,

package/src/utils/command-helpers.mjs

@@ -5,7 +5,7 @@ import process from 'process'
 import { format, inspect } from 'util'
 
 // eslint-disable-next-line no-restricted-imports
-import chalkModule from 'chalk'
+import { Chalk } from 'chalk'
 import chokidar from 'chokidar'
 import decache from 'decache'
 import WSL from 'is-wsl'
@@ -27,10 +27,10 @@ const argv = process.argv.slice(2)
  */
 const safeChalk = function (noColors) {
   if (noColors) {
-    const colorlessChalk = new chalkModule.Instance({ level: 0 })
+    const colorlessChalk = new Chalk({ level: 0 })
     return colorlessChalk
   }
-  return new chalkModule.Instance()
+  return new Chalk()
 }
 
 export const chalk = safeChalk(argv.includes('--json'))

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

@@ -39,6 +39,7 @@ export const deploySite = async (
     maxRetry = DEFAULT_MAX_RETRY,
     // API calls this the 'title'
     message: title,
+    rootDir,
     siteEnv,
     skipFunctionsCache,
     statusCb = () => {
@@ -46,7 +47,6 @@ export const deploySite = async (
     },
     syncFileLimit = DEFAULT_SYNC_LIMIT,
     tmpDir = temporaryDirectory(),
-    rootDir,
   } = {},
 ) => {
   statusCb({

package/src/utils/deploy/hash-fns.mjs

@@ -69,7 +69,6 @@ const getFunctionZips = async ({
   const { zipFunctions } = await import('@netlify/zip-it-and-ship-it')
 
   return await zipFunctions(directories, tmpDir, {
-    featureFlags: { project_deploy_configuration_api_use_per_function_configuration_files: true },
     basePath: rootDir,
     configFileDirectories: [getPathInProject([INTERNAL_FUNCTIONS_FOLDER])],
     config: functionsConfig,

package/src/utils/detect-server-settings.mjs

@@ -160,13 +160,13 @@ const getSettingsFromFramework = (framework) => {
     build: { directory: dist },
     dev: {
       commands: [command],
-      port: frameworkPort,
       pollingStrategies = [],
+      port: frameworkPort,
     },
-    name: frameworkName,
-    staticAssetsDirectory: staticDir,
     env = {},
+    name: frameworkName,
     plugins,
+    staticAssetsDirectory: staticDir,
   } = framework
 
   return {
@@ -246,10 +246,10 @@ const handleCustomFramework = ({ devConfig }) => {
 const mergeSettings = async ({ devConfig, frameworkSettings = {} }) => {
   const {
     command: frameworkCommand,
-    frameworkPort: frameworkDetectedPort,
     dist,
-    framework,
     env,
+    framework,
+    frameworkPort: frameworkDetectedPort,
     pollingStrategies = [],
   } = frameworkSettings
 

package/src/utils/dev.mjs

@@ -132,7 +132,7 @@ export const getSiteInformation = async ({ api, offline, site, siteInfo }) => {
 }
 
 const getEnvSourceName = (source) => {
-  const { printFn = chalk.green, name = source } = ENV_VAR_SOURCES[source] || {}
+  const { name = source, printFn = chalk.green } = ENV_VAR_SOURCES[source] || {}
 
   return printFn(name)
 }

package/src/utils/dot-env.mjs

@@ -22,7 +22,7 @@ export const loadDotEnvFiles = async function ({ envFiles, projectDir }) {
 // in the user configuration, the order is highest to lowest
 const defaultEnvFiles = ['.env.development.local', '.env.local', '.env.development', '.env']
 
-export const tryLoadDotEnvFiles = async ({ projectDir, dotenvFiles = defaultEnvFiles }) => {
+export const tryLoadDotEnvFiles = async ({ dotenvFiles = defaultEnvFiles, projectDir }) => {
   const results = await Promise.all(
     dotenvFiles.map(async (file) => {
       const filepath = path.resolve(projectDir, file)

package/src/utils/init/utils.mjs

@@ -40,8 +40,8 @@ const getDefaultSettings = ({
   const recommendedPlugins = getRecommendPlugins(frameworkPlugins, config)
   const {
     command: defaultBuildCmd = frameworkBuildCommand,
-    publish: defaultBuildDir = frameworkBuildDir,
     functions: defaultFunctionsDir,
+    publish: defaultBuildDir = frameworkBuildDir,
   } = config.build
 
   return {
@@ -87,9 +87,9 @@ export const getBuildSettings = async ({ config, env, repositoryRoot, siteRoot }
   const baseDirectory = getBaseDirectory({ repositoryRoot, siteRoot })
   const nodeVersion = await detectNodeVersion({ baseDirectory, env })
   const {
-    frameworkName,
     frameworkBuildCommand,
     frameworkBuildDir,
+    frameworkName,
     frameworkPlugins = [],
   } = await getFrameworkInfo({
     baseDirectory,