netlify-cli 12.4.0 → 12.5.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "12.4.0",
+  "version": "12.5.0",
   "author": "Netlify Inc.",
   "type": "module",
   "contributors": [
@@ -150,9 +150,9 @@
     "cesare soldini <cesare.soldini@gmail.com>",
     "chris (fool) mccraw (http://twitter.com/fool)",
     "dustincrogers",
+    "eddie",
     "ehmicky (https://twitter.com/ehmicky)",
     "internal tools netlibot",
-    "just toby",
     "kvn-shn",
     "netlibot (https://www.netlify.com)",
     "nikoladev",
@@ -211,7 +211,7 @@
     "test:init:eleventy-deps": "npm ci --prefix tests/integration/eleventy-site --no-audit",
     "test:init:hugo-deps": "npm ci --prefix tests/integration/hugo-site --no-audit",
     "test:dev:ava": "ava --verbose",
-    "test:dev:vitest": "vitest run",
+    "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/",
@@ -230,12 +230,12 @@
     "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,yml,json,html}\" \"*.{mjs,cjs,js,yml,json,html}\" \".*.{mjs,cjs,js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!**/*/package-lock.json\" \"!.github/**/*.md\""
   },
   "dependencies": {
-    "@netlify/build": "^29.1.1",
-    "@netlify/config": "^20.0.2",
-    "@netlify/edge-bundler": "^6.1.0",
-    "@netlify/framework-info": "^9.5.2",
+    "@netlify/build": "^29.2.2",
+    "@netlify/config": "^20.2.0",
+    "@netlify/edge-bundler": "^8.0.0",
+    "@netlify/framework-info": "^9.5.3",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/zip-it-and-ship-it": "^8.1.0",
+    "@netlify/zip-it-and-ship-it": "^8.2.0",
     "@octokit/rest": "^19.0.0",
     "ansi-escapes": "^5.0.0",
     "ansi-styles": "^5.0.0",
@@ -257,7 +257,6 @@
     "cron-parser": "^4.2.1",
     "debug": "^4.1.1",
     "decache": "^4.6.0",
-    "del": "^6.0.0",
     "dot-prop": "^6.0.0",
     "dotenv": "^16.0.0",
     "env-paths": "^2.2.0",
@@ -296,10 +295,10 @@
     "log-update": "^5.0.0",
     "minimist": "^1.2.5",
     "multiparty": "^4.2.1",
-    "netlify": "^13.0.2",
-    "netlify-headers-parser": "^7.0.3",
+    "netlify": "^13.1.0",
+    "netlify-headers-parser": "^7.1.0",
     "netlify-onegraph-internal": "0.10.1",
-    "netlify-redirect-parser": "^14.0.2",
+    "netlify-redirect-parser": "^14.1.0",
     "netlify-redirector": "^0.3.1",
     "node-fetch": "^2.6.0",
     "node-version-alias": "^1.0.1",
@@ -337,7 +336,7 @@
   "devDependencies": {
     "@babel/preset-react": "^7.12.13",
     "@netlify/eslint-config-node": "^7.0.0",
-    "@vitest/coverage-c8": "^0.25.3",
+    "@vitest/coverage-c8": "^0.26.0",
     "ava": "^4.0.0",
     "c8": "^7.11.0",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",
@@ -359,8 +358,8 @@
     "tree-kill": "^1.2.2",
     "typescript": "^4.4.4",
     "verdaccio": "^5.10.2",
-    "vite": "^3.2.4",
-    "vitest": "^0.25.3"
+    "vite": "^4.0.0",
+    "vitest": "^0.26.0"
   },
   "ava": {
     "files": [

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

@@ -76,6 +76,14 @@ const envList = async (options, command) => {
     return false
   }
 
+  if (options.plain) {
+    const plaintext = Object.entries(environment)
+      .map(([key, variable]) => `${key}=${variable.value}`)
+      .join('\n')
+    log(plaintext)
+    return false
+  }
+
   const forSite = `for site ${chalk.green(siteInfo.name)}`
   const contextType = AVAILABLE_CONTEXTS.includes(context) ? 'context' : 'branch'
   const withContext = isUsingEnvelope ? `in the ${chalk.magenta(options.context)} ${contextType}` : ''
@@ -126,6 +134,7 @@ export const createEnvListCommand = (program) =>
       normalizeContext,
       'dev',
     )
+    .addOption(new Option('--plain', 'Output environment variables as plaintext').conflicts('json'))
     .addOption(
       new Option('-s, --scope <scope>', 'Specify a scope')
         .choices(['builds', 'functions', 'post-processing', 'runtime', 'any'])
@@ -136,6 +145,7 @@ export const createEnvListCommand = (program) =>
       'netlify env:list --context production',
       'netlify env:list --context branch:staging',
       'netlify env:list --scope functions',
+      'netlify env:list --plain',
     ])
     .description('Lists resolved environment variables for site (includes netlify.toml)')
     .action(async (options, command) => {

package/src/lib/edge-functions/internal.mjs

@@ -2,33 +2,11 @@
 import { readFile, stat } from 'fs/promises'
 import { dirname, join, resolve } from 'path'
 import { cwd } from 'process'
-import { pathToFileURL } from 'url'
 
-import { warn } from '../../utils/command-helpers.mjs'
 import { getPathInProject } from '../settings.cjs'
 
 import { INTERNAL_EDGE_FUNCTIONS_FOLDER } from './consts.mjs'
 
-/**
- * Reads an import map from a path and returns the parsed data, if it exists
- * and is valid. Otherwise, it returns null.
- *
- * @param {string} importMapPath
- * @returns {Promise<object | null>}
- */
-const getImportMap = async (importMapPath) => {
-  try {
-    const data = await readFile(importMapPath)
-    const importMap = JSON.parse(data)
-
-    return importMap
-  } catch {
-    warn(`Could not read the import map file for Edge Functions at ${importMapPath}`)
-
-    return null
-  }
-}
-
 export const getInternalFunctions = async () => {
   const path = join(cwd(), getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]))
 
@@ -59,18 +37,7 @@ export const getInternalFunctions = async () => {
     }
 
     if (manifest.import_map) {
-      const importMapPath = resolve(dirname(manifestPath), manifest.import_map)
-      const importMap = await getImportMap(importMapPath)
-
-      if (importMap !== null) {
-        return {
-          ...data,
-          importMap: {
-            baseURL: pathToFileURL(importMapPath),
-            ...importMap,
-          },
-        }
-      }
+      data.importMap = resolve(dirname(manifestPath), manifest.import_map)
     }
 
     return data

package/src/lib/edge-functions/proxy.mjs

@@ -160,12 +160,14 @@ const prepareServer = async ({
   port,
   projectDir,
 }) => {
+  // Merging internal with user-defined import maps.
+  const importMapPaths = [...importMaps, config.functions['*'].deno_import_map]
+
   try {
     const bundler = await import('@netlify/edge-bundler')
     const distImportMapPath = getPathInProject([DIST_IMPORT_MAP_PATH])
     const runIsolate = await bundler.serve({
       ...getDownloadUpdateFunctions(),
-      basePath: projectDir,
       certificatePath,
       debug: env.NETLIFY_DENO_DEBUG === 'true',
       distImportMapPath,
@@ -175,7 +177,7 @@ const prepareServer = async ({
         )}. The file does not seem to have a function as the default export.`,
       formatImportError: (name) =>
         `${NETLIFYDEVERR} ${chalk.red('Failed')} to run Edge Function ${chalk.yellow(name)}:`,
-      importMaps,
+      importMapPaths,
       inspectSettings,
       port,
     })

package/src/lib/fs.cjs

@@ -1,26 +1,8 @@
 // @ts-check
 const {
   constants,
-  promises: { access, readFile, rm, stat },
+  promises: { access, stat },
 } = require('fs')
-const { version } = require('process')
-
-const del = require('del')
-const { gte, parse } = require('semver')
-
-const NODE_VERSION = parse(version)
-
-/**
- * reads a file async and catches potential errors
- * @param {string} filePath
- */
-const readFileAsyncCatchError = async (filePath) => {
-  try {
-    return { content: await readFile(filePath, 'utf-8') }
-  } catch (error) {
-    return { error }
-  }
-}
 
 const fileExistsAsync = async (filePath) => {
   try {
@@ -31,18 +13,6 @@ const fileExistsAsync = async (filePath) => {
   }
 }
 
-/**
- * Removes a directory recursively and async
- * @param {string} path
- * @returns {Promise<void>}
- */
-const rmdirRecursiveAsync = async (path) => {
-  if (gte(NODE_VERSION, '14.14.0')) {
-    return await rm(path, { force: true, recursive: true })
-  }
-  await del(path, { force: true })
-}
-
 /**
  * calls stat async with a function and catches potential errors
  * @param {string} filePath
@@ -78,6 +48,4 @@ module.exports = {
   fileExistsAsync,
   isDirectoryAsync,
   isFileAsync,
-  readFileAsyncCatchError,
-  rmdirRecursiveAsync,
 }

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

@@ -1,8 +1,9 @@
+import { rm } from 'fs/promises'
+
 import cleanDeep from 'clean-deep'
 import tempy from 'tempy'
 
 import { deployFileNormalizer, getDistPathIfExists, isEdgeFunctionFile } from '../../lib/edge-functions/deploy.mjs'
-import { rmdirRecursiveAsync } from '../../lib/fs.cjs'
 import { warn } from '../command-helpers.mjs'
 
 import {
@@ -170,7 +171,7 @@ For more information, visit https://ntl.fyi/cli-native-modules.`)
     phase: 'stop',
   })
 
-  await rmdirRecursiveAsync(tmpDir)
+  await rm(tmpDir, { force: true, recursive: true })
 
   const deployManifest = {
     deployId,

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

@@ -1,4 +1,5 @@
 // @ts-check
+import { readFile } from 'fs/promises'
 import { EOL } from 'os'
 import path from 'path'
 import process from 'process'
@@ -8,8 +9,6 @@ import fuzzy from 'fuzzy'
 import getPort from 'get-port'
 import isPlainObject from 'is-plain-obj'
 
-import { readFileAsyncCatchError } from '../lib/fs.cjs'
-
 import { NETLIFYDEVWARN, chalk, log } from './command-helpers.mjs'
 import { acquirePort } from './dev.mjs'
 import { getInternalFunctionsDir } from './functions/index.mjs'
@@ -34,9 +33,9 @@ const readHttpsSettings = async (options) => {
     throw new TypeError(`Certificate file configuration should be a string`)
   }
 
-  const [{ content: key, error: keyError }, { content: cert, error: certError }] = await Promise.all([
-    readFileAsyncCatchError(keyFile),
-    readFileAsyncCatchError(certFile),
+  const [{ reason: keyError, value: key }, { reason: certError, value: cert }] = await Promise.allSettled([
+    readFile(keyFile, 'utf-8'),
+    readFile(certFile, 'utf-8'),
   ])
 
   if (keyError) {

package/src/utils/lm/install.mjs

@@ -1,5 +1,5 @@
 // @ts-check
-import { appendFile, copyFile, readFile, writeFile } from 'fs/promises'
+import { appendFile, copyFile, readFile, rm, writeFile } from 'fs/promises'
 import os from 'os'
 import path, { dirname } from 'path'
 import process from 'process'
@@ -11,7 +11,7 @@ import Listr from 'listr'
 import pathKey from 'path-key'
 
 import { fetchLatestVersion, shouldFetchLatestVersion } from '../../lib/exec-fetcher.mjs'
-import { fileExistsAsync, rmdirRecursiveAsync } from '../../lib/fs.cjs'
+import { fileExistsAsync } from '../../lib/fs.cjs'
 import { normalizeBackslash } from '../../lib/path.mjs'
 import { getLegacyPathInHome, getPathInHome } from '../../lib/settings.cjs'
 import { chalk } from '../command-helpers.mjs'
@@ -92,7 +92,7 @@ const installedWithPackageManager = async function () {
 
 const installHelper = async function () {
   // remove any old versions that might still exist in `~/.netlify/helper/bin`
-  await rmdirRecursiveAsync(getLegacyBinPath())
+  await rm(getLegacyBinPath(), { force: true, recursive: true })
   const binPath = getBinPath()
   const shouldFetch = await shouldFetchLatestVersion({
     binPath,
@@ -277,7 +277,7 @@ const cleanupShell = async function () {
 
 export const uninstall = async function () {
   await Promise.all([
-    rmdirRecursiveAsync(getHelperPath()),
+    rm(getHelperPath(), { force: true, recursive: true }),
     removeConfig(GIT_CONFIG, getGitConfigContent(getGitConfigPath())),
     cleanupShell(),
   ])