netlify-cli 8.6.6 → 8.6.10

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "8.6.6",
+  "version": "8.6.10",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "8.6.6",
+      "version": "8.6.10",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -46,14 +46,13 @@
         "execa": "^5.0.0",
         "express": "^4.17.1",
         "express-logging": "^1.1.1",
-        "filter-obj": "^2.0.1",
         "find-up": "^5.0.0",
         "flush-write-stream": "^2.0.0",
         "folder-walker": "^3.2.0",
         "from2-array": "^0.0.4",
         "fuzzy": "^0.1.3",
         "get-port": "^5.1.0",
-        "gh-release-fetch": "^2.0.0",
+        "gh-release-fetch": "^3.0.0",
         "git-repo-info": "^2.1.0",
         "gitconfiglocal": "^2.1.0",
         "hasbin": "^1.2.3",
@@ -74,10 +73,8 @@
         "lodash": "^4.17.20",
         "log-symbols": "^4.0.0",
         "log-update": "^5.0.0",
-        "make-dir": "^3.0.0",
         "memoize-one": "^6.0.0",
         "minimist": "^1.2.5",
-        "mock-require": "^3.0.3",
         "multiparty": "^4.2.1",
         "netlify": "^10.1.1",
         "netlify-headers-parser": "^6.0.0",
@@ -86,7 +83,6 @@
         "node-fetch": "^2.6.0",
         "node-version-alias": "^1.0.1",
         "omit.js": "^2.0.2",
-        "open": "^7.0.0",
         "ora": "^5.0.0",
         "p-event": "^4.2.0",
         "p-filter": "^2.1.0",
@@ -95,14 +91,11 @@
         "parallel-transform": "^1.2.0",
         "parse-github-url": "^1.0.2",
         "parse-gitignore": "^1.0.1",
-        "path-exists": "^4.0.0",
         "path-key": "^3.1.1",
-        "path-type": "^4.0.0",
         "prettyjson": "^1.2.1",
         "pump": "^3.0.0",
         "raw-body": "^2.4.1",
         "read-pkg-up": "^7.0.1",
-        "resolve": "^1.12.0",
         "semver": "^7.3.5",
         "source-map-support": "^0.5.19",
         "static-server": "^2.2.1",
@@ -126,7 +119,6 @@
         "ntl": "bin/run"
       },
       "devDependencies": {
-        "@babel/plugin-proposal-class-properties": "^7.13.0",
         "@babel/preset-react": "^7.12.13",
         "@commitlint/cli": "^16.0.0",
         "@commitlint/config-conventional": "^16.0.0",
@@ -135,16 +127,14 @@
         "eslint-plugin-sort-destructure-keys": "^1.3.5",
         "fast-glob": "^3.2.7",
         "form-data": "^4.0.0",
-        "from2-string": "^1.1.0",
         "got": "^11.8.1",
         "graphviz": "^0.0.9",
         "ini": "^2.0.0",
         "jsonwebtoken": "^8.5.1",
-        "mkdirp": "^1.0.4",
         "mock-fs": "^5.1.2",
+        "mock-require": "^3.0.3",
         "nyc": "^15.0.0",
         "p-timeout": "^4.0.0",
-        "pidtree": "^0.5.0",
         "seedrandom": "^3.0.5",
         "serialize-javascript": "^6.0.0",
         "sinon": "^12.0.0",
@@ -10552,15 +10542,6 @@
         "from2": "^2.0.3"
       }
     },
-    "node_modules/from2-string": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/from2-string/-/from2-string-1.1.0.tgz",
-      "integrity": "sha1-GCgrJ9CKJnyzAwzSuLSw8hKvdSo=",
-      "dev": true,
-      "dependencies": {
-        "from2": "^2.0.3"
-      }
-    },
     "node_modules/from2/node_modules/readable-stream": {
       "version": "2.3.7",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -10712,7 +10693,8 @@
     "node_modules/get-caller-file": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
     },
     "node_modules/get-intrinsic": {
       "version": "1.1.1",
@@ -10783,20 +10765,19 @@
       }
     },
     "node_modules/gh-release-fetch": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-2.0.4.tgz",
-      "integrity": "sha512-PALrCv6MuxEKsj5Oz9G81iU6pxvoxgpSnwbtIqAkQ6m6fioFicNznZUl/aOW92rK2k8cuaM48Rd59G7eV2QsTA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-3.0.0.tgz",
+      "integrity": "sha512-P7Anj35Y4kI3RBoQ+M8Z2U9ittORYyRNLb55+5yGGXmm3Mazgkq4MPqsHH9S7+pNWFpE2BtAWeF6twzz6JY3Bw==",
       "dependencies": {
         "@types/download": "^8.0.0",
         "@types/node-fetch": "^2.1.6",
         "@types/semver": "^7.0.0",
         "download": "^8.0.0",
-        "make-dir": "^3.1.0",
         "node-fetch": "^2.3.0",
         "semver": "^7.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
       }
     },
     "node_modules/git-raw-commits": {
@@ -14390,6 +14371,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/mock-require/-/mock-require-3.0.3.tgz",
       "integrity": "sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==",
+      "dev": true,
       "dependencies": {
         "get-caller-file": "^1.0.2",
         "normalize-path": "^2.1.1"
@@ -14402,6 +14384,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
       "dependencies": {
         "remove-trailing-separator": "^1.0.1"
       },
@@ -16800,18 +16783,6 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/pidtree": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.5.0.tgz",
-      "integrity": "sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==",
-      "dev": true,
-      "bin": {
-        "pidtree": "bin/pidtree.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/pify": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
@@ -28682,15 +28653,6 @@
         "from2": "^2.0.3"
       }
     },
-    "from2-string": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/from2-string/-/from2-string-1.1.0.tgz",
-      "integrity": "sha1-GCgrJ9CKJnyzAwzSuLSw8hKvdSo=",
-      "dev": true,
-      "requires": {
-        "from2": "^2.0.3"
-      }
-    },
     "fromentries": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
@@ -28781,7 +28743,8 @@
     "get-caller-file": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
     },
     "get-intrinsic": {
       "version": "1.1.1",
@@ -28825,15 +28788,14 @@
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
     },
     "gh-release-fetch": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-2.0.4.tgz",
-      "integrity": "sha512-PALrCv6MuxEKsj5Oz9G81iU6pxvoxgpSnwbtIqAkQ6m6fioFicNznZUl/aOW92rK2k8cuaM48Rd59G7eV2QsTA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-3.0.0.tgz",
+      "integrity": "sha512-P7Anj35Y4kI3RBoQ+M8Z2U9ittORYyRNLb55+5yGGXmm3Mazgkq4MPqsHH9S7+pNWFpE2BtAWeF6twzz6JY3Bw==",
       "requires": {
         "@types/download": "^8.0.0",
         "@types/node-fetch": "^2.1.6",
         "@types/semver": "^7.0.0",
         "download": "^8.0.0",
-        "make-dir": "^3.1.0",
         "node-fetch": "^2.3.0",
         "semver": "^7.0.0"
       }
@@ -31500,6 +31462,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/mock-require/-/mock-require-3.0.3.tgz",
       "integrity": "sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==",
+      "dev": true,
       "requires": {
         "get-caller-file": "^1.0.2",
         "normalize-path": "^2.1.1"
@@ -31509,6 +31472,7 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
           "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
           "requires": {
             "remove-trailing-separator": "^1.0.1"
           }
@@ -33351,12 +33315,6 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
       "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
     },
-    "pidtree": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.5.0.tgz",
-      "integrity": "sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==",
-      "dev": true
-    },
     "pify": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "8.6.6",
+  "version": "8.6.10",
   "author": "Netlify Inc.",
   "contributors": [
     "Mathias Biilmann <matt@netlify.com> (https://twitter.com/biilmann)",
@@ -114,14 +114,13 @@
     "execa": "^5.0.0",
     "express": "^4.17.1",
     "express-logging": "^1.1.1",
-    "filter-obj": "^2.0.1",
     "find-up": "^5.0.0",
     "flush-write-stream": "^2.0.0",
     "folder-walker": "^3.2.0",
     "from2-array": "^0.0.4",
     "fuzzy": "^0.1.3",
     "get-port": "^5.1.0",
-    "gh-release-fetch": "^2.0.0",
+    "gh-release-fetch": "^3.0.0",
     "git-repo-info": "^2.1.0",
     "gitconfiglocal": "^2.1.0",
     "hasbin": "^1.2.3",
@@ -142,10 +141,8 @@
     "lodash": "^4.17.20",
     "log-symbols": "^4.0.0",
     "log-update": "^5.0.0",
-    "make-dir": "^3.0.0",
     "memoize-one": "^6.0.0",
     "minimist": "^1.2.5",
-    "mock-require": "^3.0.3",
     "multiparty": "^4.2.1",
     "netlify": "^10.1.1",
     "netlify-headers-parser": "^6.0.0",
@@ -154,7 +151,6 @@
     "node-fetch": "^2.6.0",
     "node-version-alias": "^1.0.1",
     "omit.js": "^2.0.2",
-    "open": "^7.0.0",
     "ora": "^5.0.0",
     "p-event": "^4.2.0",
     "p-filter": "^2.1.0",
@@ -163,14 +159,11 @@
     "parallel-transform": "^1.2.0",
     "parse-github-url": "^1.0.2",
     "parse-gitignore": "^1.0.1",
-    "path-exists": "^4.0.0",
     "path-key": "^3.1.1",
-    "path-type": "^4.0.0",
     "prettyjson": "^1.2.1",
     "pump": "^3.0.0",
     "raw-body": "^2.4.1",
     "read-pkg-up": "^7.0.1",
-    "resolve": "^1.12.0",
     "semver": "^7.3.5",
     "source-map-support": "^0.5.19",
     "static-server": "^2.2.1",
@@ -190,7 +183,6 @@
     "write-file-atomic": "^3.0.0"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.13.0",
     "@babel/preset-react": "^7.12.13",
     "@commitlint/cli": "^16.0.0",
     "@commitlint/config-conventional": "^16.0.0",
@@ -199,16 +191,14 @@
     "eslint-plugin-sort-destructure-keys": "^1.3.5",
     "fast-glob": "^3.2.7",
     "form-data": "^4.0.0",
-    "from2-string": "^1.1.0",
     "got": "^11.8.1",
     "graphviz": "^0.0.9",
     "ini": "^2.0.0",
     "jsonwebtoken": "^8.5.1",
-    "mkdirp": "^1.0.4",
     "mock-fs": "^5.1.2",
+    "mock-require": "^3.0.3",
     "nyc": "^15.0.0",
     "p-timeout": "^4.0.0",
-    "pidtree": "^0.5.0",
     "seedrandom": "^3.0.5",
     "serialize-javascript": "^6.0.0",
     "sinon": "^12.0.0",

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

@@ -253,7 +253,7 @@ const ensureFunctionDirExists = async function (command) {
 }
 
 /**
- * Download files from a given github URL
+ * Download files from a given GitHub URL
  * @param {import('../base-command').BaseCommand} command
  * @param {import('commander').OptionValues} options
  * @param {string} argumentName

package/src/commands/init/init.js

@@ -162,7 +162,7 @@ const logExistingRepoSetupAndExit = ({ repoUrl, siteName }) => {
   log()
   log(chalk.underline.bold(`Success`))
   log(`This site "${siteName}" is configured to automatically deploy via ${repoUrl}`)
-  // TODO add support for changing github repo in site:config command
+  // TODO add support for changing GitHub repo in site:config command
   exit()
 }
 

package/src/functions-templates/javascript/serverless-ssr/app/index.js

@@ -57,7 +57,7 @@ module.exports = function expressApp(functionName) {
 
         <div>
           <a href='https://github.com/DavidWells/netlify-functions-express' target='_blank'>
-            See the source code on github
+            See the source code on GitHub
           </a>
         </div>
       </body>

package/src/lib/functions/runtimes/js/builders/zisi.js

@@ -1,9 +1,8 @@
-const { writeFile } = require('fs').promises
+const { mkdir, writeFile } = require('fs').promises
 const path = require('path')
 
 const { zipFunction } = require('@netlify/zip-it-and-ship-it')
 const decache = require('decache')
-const makeDir = require('make-dir')
 const readPkgUp = require('read-pkg-up')
 const sourceMapSupport = require('source-map-support')
 
@@ -72,7 +71,7 @@ const getTargetDirectory = async ({ errorExit }) => {
   const targetDirectory = path.resolve(getPathInProject(['functions-serve']))
 
   try {
-    await makeDir(targetDirectory)
+    await mkdir(targetDirectory, { recursive: true })
   } catch (error) {
     errorExit(`${NETLIFYDEVERR} Could not create directory: ${targetDirectory}`)
   }

package/src/utils/gh-auth.js

@@ -102,30 +102,26 @@ const getPersonalAccessToken = async () => {
  */
 const authWithToken = async () => {
   const { token } = await getPersonalAccessToken()
-  if (token) {
-    const octokit = new Octokit({
-      auth: `token ${token}`,
-    })
-    const { login: user } = await octokit.users.getAuthenticated()
-    return { token, user, provider: 'github' }
+  if (!token) {
+    throw new Error('GitHub authentication failed')
   }
-  const error = new Error('Github authentication failed')
-  throw error
+
+  const octokit = new Octokit({ auth: `token ${token}` })
+  const { login: user } = await octokit.users.getAuthenticated()
+
+  return { token, user, provider: 'github' }
 }
 
 /**
- * Get a github token
+ * Get a GitHub token
  * @returns {Promise<Token>} Returns a Promise with a token object
  */
 const getGitHubToken = async () => {
   log('')
 
   const withNetlify = await promptForAuthMethod()
-  if (withNetlify) {
-    return await authWithNetlify()
-  }
 
-  return await authWithToken()
+  return withNetlify ? await authWithNetlify() : await authWithToken()
 }
 
 module.exports = { getGitHubToken, authWithNetlify }

package/src/utils/init/config-github.js

@@ -22,7 +22,7 @@ const formatRepoAndOwner = ({ repoName, repoOwner }) => ({
 const PAGE_SIZE = 100
 
 /**
- * Get a valid github token
+ * Get a valid GitHub token
  * @returns {Promise<string>}
  */
 const getGitHubToken = async ({ globalConfig }) => {
@@ -50,7 +50,7 @@ const getGitHubToken = async ({ globalConfig }) => {
 }
 
 /**
- * Retrieves the Github octokit client
+ * Retrieves the GitHub octokit client
  * @param {string} token
  * @returns {Octokit}
  */

package/src/utils/read-repo-url.js

@@ -15,7 +15,7 @@ const readRepoURL = async function (_url) {
   // eslint-disable-next-line node/no-deprecated-api
   const URL = url.parse(_url)
   const repoHost = validateRepoURL(_url)
-  if (repoHost !== GITHUB) throw new Error('only github repos are supported for now')
+  if (repoHost !== GITHUB) throw new Error('only GitHub repos are supported for now')
   const [ownerAndRepo, contentsPath] = parseRepoURL(repoHost, URL)
   const folderContents = await getRepoURLContents(repoHost, ownerAndRepo, contentsPath)
   return folderContents

package/src/utils/state-config.js

@@ -4,7 +4,6 @@ const process = require('process')
 
 const dotProp = require('dot-prop')
 const findUp = require('find-up')
-const makeDir = require('make-dir')
 const writeFileAtomic = require('write-file-atomic')
 
 const { getPathInProject } = require('../lib/settings')
@@ -55,7 +54,7 @@ class StateConfig {
   set all(val) {
     try {
       // Make sure the folder exists as it could have been deleted in the meantime
-      makeDir.sync(path.dirname(this.path))
+      fs.mkdirSync(path.dirname(this.path), { recursive: true })
       writeFileAtomic.sync(this.path, JSON.stringify(val, null, '\t'))
     } catch (error) {
       // Improve the message of permission errors