netlify-cli 12.7.2 → 12.8.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "12.7.2",
+  "version": "12.8.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -76,12 +76,12 @@
   },
   "dependencies": {
     "@fastify/static": "^6.6.0",
-    "@netlify/build": "^29.4.0",
-    "@netlify/config": "^20.3.0",
-    "@netlify/edge-bundler": "^8.1.2",
-    "@netlify/framework-info": "^9.5.3",
+    "@netlify/build": "^29.5.1",
+    "@netlify/config": "^20.3.1",
+    "@netlify/edge-bundler": "^8.4.0",
+    "@netlify/framework-info": "^9.7.1",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/zip-it-and-ship-it": "^8.2.0",
+    "@netlify/zip-it-and-ship-it": "^8.4.1",
     "@octokit/rest": "^19.0.0",
     "ansi-escapes": "^5.0.0",
     "ansi-styles": "^5.0.0",
@@ -143,10 +143,10 @@
     "log-update": "^5.0.0",
     "minimist": "^1.2.5",
     "multiparty": "^4.2.1",
-    "netlify": "^13.1.0",
-    "netlify-headers-parser": "^7.1.0",
+    "netlify": "^13.1.1",
+    "netlify-headers-parser": "^7.1.1",
     "netlify-onegraph-internal": "0.10.1",
-    "netlify-redirect-parser": "^14.1.0",
+    "netlify-redirect-parser": "^14.1.1",
     "netlify-redirector": "^0.3.1",
     "node-fetch": "^2.6.0",
     "node-version-alias": "^1.0.1",
@@ -183,7 +183,7 @@
   "devDependencies": {
     "@babel/preset-react": "^7.12.13",
     "@netlify/eslint-config-node": "^7.0.0",
-    "@vitest/coverage-c8": "^0.26.0",
+    "@vitest/coverage-c8": "^0.27.0",
     "ava": "^4.0.0",
     "c8": "^7.11.0",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",
@@ -206,7 +206,7 @@
     "typescript": "^4.4.4",
     "verdaccio": "^5.10.2",
     "vite": "^4.0.0",
-    "vitest": "^0.26.0"
+    "vitest": "^0.27.0"
   },
   "ava": {
     "files": [

package/src/commands/addons/addons.mjs

@@ -30,7 +30,6 @@ export const createAddonsCommand = (program) => {
     .command('addons')
     .alias('addon')
     .description('(Beta) Manage Netlify Add-ons')
-    .noHelpOptions()
     .addExamples([
       'netlify addons:create addon-xyz',
       'netlify addons:list',

package/src/commands/base-command.mjs

@@ -99,13 +99,29 @@ export default class BaseCommand extends Command {
         .addOption(new Option('--cwd <cwd>').hideHelp(true))
         .addOption(new Option('-o, --offline').hideHelp(true))
         .addOption(new Option('--auth <token>', 'Netlify auth token').hideHelp(true))
+        .addOption(
+          new Option(
+            '--httpProxy [address]',
+            'Old, prefer --http-proxy. Proxy server address to route requests through.',
+          )
+            .default(process.env.HTTP_PROXY || process.env.HTTPS_PROXY)
+            .hideHelp(true),
+        )
+        .addOption(
+          new Option(
+            '--httpProxyCertificateFilename [file]',
+            'Old, prefer --http-proxy-certificate-filename. Certificate file to use when connecting using a proxy server.',
+          )
+            .default(process.env.NETLIFY_PROXY_CERTIFICATE_FILENAME)
+            .hideHelp(true),
+        )
         .option(
-          '--httpProxyCertificateFilename [file]',
+          '--http-proxy-certificate-filename [file]',
           'Certificate file to use when connecting using a proxy server',
           process.env.NETLIFY_PROXY_CERTIFICATE_FILENAME,
         )
         .option(
-          '--httpProxy [address]',
+          '--http-proxy [address]',
           'Proxy server address to route requests through.',
           process.env.HTTP_PROXY || process.env.HTTPS_PROXY,
         )

package/src/commands/deploy/deploy.mjs

@@ -5,6 +5,7 @@ import { cwd, env } from 'process'
 
 import { runCoreSteps } from '@netlify/build'
 import { restoreConfig, updateConfig } from '@netlify/config'
+import { Option } from 'commander'
 import { get } from 'dot-prop'
 import inquirer from 'inquirer'
 import isObject from 'lodash/isObject.js'
@@ -726,7 +727,15 @@ Support for package.json's main field, and intrinsic index.js entrypoints are co
     .option('-d, --dir <path>', 'Specify a folder to deploy')
     .option('-f, --functions <folder>', 'Specify a functions folder to deploy')
     .option('-p, --prod', 'Deploy to production', false)
-    .option('--prodIfUnlocked', 'Deploy to production if unlocked, create a draft otherwise', false)
+    .addOption(
+      new Option(
+        '--prodIfUnlocked',
+        'Old, prefer --prod-if-unlocked. Deploy to production if unlocked, create a draft otherwise',
+      )
+        .default(false)
+        .hideHelp(true),
+    )
+    .option('--prod-if-unlocked', 'Deploy to production if unlocked, create a draft otherwise', false)
     .option(
       '--alias <name>',
       'Specifies the alias for deployment, the string at the beginning of the deploy subdomain. Useful for creating predictable deployment URLs. Avoid setting an alias string to the same value as a deployed branch. `alias` doesn’t create a branch deploy and can’t be used in conjunction with the branch subdomain feature. Maximum 37 characters.',
@@ -754,7 +763,7 @@ Support for package.json's main field, and intrinsic index.js entrypoints are co
       'netlify deploy --site my-first-site',
       'netlify deploy --prod',
       'netlify deploy --prod --open',
-      'netlify deploy --prodIfUnlocked',
+      'netlify deploy --prod-if-unlocked',
       'netlify deploy --message "A message with an $ENV_VAR"',
       'netlify deploy --auth $NETLIFY_AUTH_TOKEN',
       'netlify deploy --trigger',

package/src/commands/dev/dev.mjs

@@ -163,6 +163,7 @@ const dev = async (options, command) => {
     addonsUrls,
     config,
     configPath: configPathOverride,
+    debug: options.debug,
     env,
     geolocationMode: options.geo,
     geoCountry: options.country,
@@ -219,13 +220,23 @@ export const createDevCommand = (program) => {
       normalizeContext,
     )
     .option('-p ,--port <port>', 'port of netlify dev', (value) => Number.parseInt(value))
-    .option('--targetPort <port>', 'port of target app server', (value) => Number.parseInt(value))
+    .addOption(
+      new Option('--targetPort <port>', 'Old, prefer --target-port. Port of target app server')
+        .argParser((value) => Number.parseInt(value))
+        .hideHelp(true),
+    )
+    .option('--target-port <port>', 'port of target app server', (value) => Number.parseInt(value))
     .option('--framework <name>', 'framework to use. Defaults to #auto which automatically detects a framework')
     .option('-d ,--dir <path>', 'dir with static files')
     .option('-f ,--functions <folder>', 'specify a functions folder to serve')
     .option('-o ,--offline', 'disables any features that require network access')
     .option('-l, --live', 'start a public live session', false)
-    .option('--functionsPort <port>', 'port of functions server', (value) => Number.parseInt(value))
+    .addOption(
+      new Option('--functionsPort <port>', 'Old, prefer --functions-port. Port of functions server')
+        .argParser((value) => Number.parseInt(value))
+        .hideHelp(true),
+    )
+    .option('--functions-port <port>', 'port of functions server', (value) => Number.parseInt(value))
     .addOption(
       new Option(
         '--geo <mode>',
@@ -246,10 +257,25 @@ export const createDevCommand = (program) => {
         .hideHelp(),
     )
     .addOption(new Option('--graph', 'enable Netlify Graph support').hideHelp())
-    .addOption(new Option('--sessionId [sessionId]', '(Graph) connect to cloud session with ID [sessionId]'))
+    .addOption(
+      new Option(
+        '--sessionId [sessionId]',
+        'Old, prefer --session-id. (Graph) connect to cloud session with ID [sessionId]',
+      ).hideHelp(true),
+    )
+    .option('--session-id [sessionId]', '(Graph) connect to cloud session with ID [sessionId]')
     .addOption(
       new Option(
         '-e, --edgeInspect [address]',
+        'Old, prefer --edge-inspect. Enable the V8 Inspector Protocol for Edge Functions, with an optional address in the host:port format',
+      )
+        .conflicts('edgeInspectBrk')
+        .argParser(validateShortFlagArgs)
+        .hideHelp(true),
+    )
+    .addOption(
+      new Option(
+        '-e, --edge-inspect [address]',
         'enable the V8 Inspector Protocol for Edge Functions, with an optional address in the host:port format',
       )
         .conflicts('edgeInspectBrk')
@@ -258,6 +284,15 @@ export const createDevCommand = (program) => {
     .addOption(
       new Option(
         '-E, --edgeInspectBrk [address]',
+        'Old, prefer --edge-inspect-brk. Enable the V8 Inspector Protocol for Edge Functions and pause execution on the first line of code, with an optional address in the host:port format',
+      )
+        .conflicts('edgeInspect')
+        .hideHelp(true)
+        .argParser(validateShortFlagArgs),
+    )
+    .addOption(
+      new Option(
+        '-E, --edge-inspect-brk [address]',
         'enable the V8 Inspector Protocol for Edge Functions and pause execution on the first line of code, with an optional address in the host:port format',
       )
         .conflicts('edgeInspect')
@@ -266,13 +301,13 @@ export const createDevCommand = (program) => {
     .addExamples([
       'netlify dev',
       'netlify dev -d public',
-      'netlify dev -c "hugo server -w" --targetPort 1313',
+      'netlify dev -c "hugo server -w" --target-port 1313',
       'netlify dev --context production',
       'netlify dev --graph',
-      'netlify dev --edgeInspect',
-      'netlify dev --edgeInspect=127.0.0.1:9229',
-      'netlify dev --edgeInspectBrk',
-      'netlify dev --edgeInspectBrk=127.0.0.1:9229',
+      'netlify dev --edge-inspect',
+      'netlify dev --edge-inspect=127.0.0.1:9229',
+      'netlify dev --edge-inspect-brk',
+      'netlify dev --edge-inspect-brk=127.0.0.1:9229',
       'BROWSER=none netlify dev # disable browser auto opening',
     ])
     .action(dev)

package/src/commands/env/env-import.mjs

@@ -2,6 +2,7 @@
 import { readFile } from 'fs/promises'
 
 import AsciiTable from 'ascii-table'
+import { Option } from 'commander'
 import dotenv from 'dotenv'
 
 import { exit, log, logJson } from '../../utils/command-helpers.mjs'
@@ -126,8 +127,16 @@ export const createEnvImportCommand = (program) =>
   program
     .command('env:import')
     .argument('<fileName>', '.env file to import')
+    .addOption(
+      new Option(
+        '-r --replaceExisting',
+        'Old, prefer --replace-existing. Replace all existing variables instead of merging them with the current ones',
+      )
+        .default(false)
+        .hideHelp(true),
+    )
     .option(
-      '-r, --replaceExisting',
+      '-r, --replace-existing',
       'Replace all existing variables instead of merging them with the current ones',
       false,
     )

package/src/commands/init/init.mjs

@@ -1,4 +1,5 @@
 // @ts-check
+import { Option } from 'commander'
 import dotProp from 'dot-prop'
 import inquirer from 'inquirer'
 import isEmpty from 'lodash/isEmpty.js'
@@ -229,5 +230,11 @@ export const createInitCommand = (program) =>
     )
     .option('-m, --manual', 'Manually configure a git remote for CI')
     .option('--force', 'Reinitialize CI hooks if the linked site is already configured to use CI')
-    .option('--gitRemoteName <name>', 'Name of Git remote to use. e.g. "origin"')
+    .addOption(
+      new Option(
+        '--gitRemoteName <name>',
+        'Old, prefer --git-remote-name. Name of Git remote to use. e.g. "origin"',
+      ).hideHelp(true),
+    )
+    .option('--git-remote-name <name>', 'Name of Git remote to use. e.g. "origin"')
     .action(init)

package/src/commands/link/link.mjs

@@ -1,4 +1,5 @@
 // @ts-check
+import { Option } from 'commander'
 import inquirer from 'inquirer'
 
 import { listSites } from '../../lib/api.mjs'
@@ -345,6 +346,12 @@ export const createLinkCommand = (program) =>
     .description('Link a local repo or project folder to an existing site on Netlify')
     .option('--id <id>', 'ID of site to link to')
     .option('--name <name>', 'Name of site to link to')
-    .option('--gitRemoteName <name>', 'Name of Git remote to use. e.g. "origin"')
+    .addOption(
+      new Option(
+        '--gitRemoteName <name>',
+        'Old, prefer --git-remote-name. Name of Git remote to use. e.g. "origin"',
+      ).hideHelp(true),
+    )
+    .option('--git-remote-name <name>', 'Name of Git remote to use. e.g. "origin"')
     .addExamples(['netlify link', 'netlify link --id 123-123-123-123', 'netlify link --name my-site-name'])
     .action(link)

package/src/commands/serve/index.mjs

@@ -0,0 +1 @@
+export { createServeCommand } from './serve.mjs'

package/src/commands/serve/serve.mjs

@@ -165,7 +165,12 @@ export const createServeCommand = (program) =>
     .option('-d ,--dir <path>', 'dir with static files')
     .option('-f ,--functions <folder>', 'specify a functions folder to serve')
     .option('-o ,--offline', 'disables any features that require network access')
-    .option('--functionsPort <port>', 'port of functions server', (value) => Number.parseInt(value))
+    .addOption(
+      new Option('--functionsPort <port>', 'Old, prefer --functions-port. Port of functions server')
+        .argParser((value) => Number.parseInt(value))
+        .hideHelp(true),
+    )
+    .option('--functions-port <port>', 'port of functions server', (value) => Number.parseInt(value))
     .addOption(
       new Option(
         '--geo <mode>',

package/src/functions-templates/go/hello-world/go.mod

@@ -2,4 +2,4 @@ module github.com/someone/{{name}}
 
 go 1.19
 
-require github.com/aws/aws-lambda-go v1.35.0
+require github.com/aws/aws-lambda-go v1.37.0

package/src/functions-templates/javascript/auth-fetch/package-lock.json

@@ -9,13 +9,13 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "node-fetch": "^2.6.7"
+        "node-fetch": "^2.3.0"
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "2.6.8",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz",
+      "integrity": "sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -53,9 +53,9 @@
   },
   "dependencies": {
     "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "2.6.8",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz",
+      "integrity": "sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==",
       "requires": {
         "whatwg-url": "^5.0.0"
       }

package/src/functions-templates/javascript/google-analytics/package-lock.json

@@ -17,9 +17,9 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "2.6.8",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz",
+      "integrity": "sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -65,9 +65,9 @@
   },
   "dependencies": {
     "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "2.6.8",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz",
+      "integrity": "sha512-RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==",
       "requires": {
         "whatwg-url": "^5.0.0"
       }

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

@@ -19,9 +19,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "node_modules/axios": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.0.tgz",
-      "integrity": "sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz",
+      "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -198,9 +198,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "axios": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.0.tgz",
-      "integrity": "sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz",
+      "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",