netlify-cli 13.0.1 → 13.1.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "13.0.1",
+  "version": "13.1.1",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -76,10 +76,10 @@
   },
   "dependencies": {
     "@fastify/static": "^6.6.0",
-    "@netlify/build": "^29.6.3",
-    "@netlify/config": "^20.3.3",
-    "@netlify/edge-bundler": "^8.9.0",
-    "@netlify/framework-info": "^9.8.4",
+    "@netlify/build": "^29.6.6",
+    "@netlify/config": "^20.3.4",
+    "@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.9.0",
     "@octokit/rest": "^19.0.0",
@@ -114,7 +114,7 @@
     "express-logging": "^1.1.1",
     "extract-zip": "^2.0.1",
     "fastify": "^4.10.2",
-    "find-up": "^5.0.0",
+    "find-up": "^6.0.0",
     "flush-write-stream": "^2.0.0",
     "folder-walker": "^3.2.0",
     "from2-array": "^0.0.4",
@@ -138,9 +138,9 @@
     "jwt-decode": "^3.0.0",
     "lambda-local": "^2.0.1",
     "listr": "^0.14.3",
-    "locate-path": "^6.0.0",
+    "locate-path": "^7.0.0",
     "lodash": "^4.17.20",
-    "log-symbols": "^4.0.0",
+    "log-symbols": "^5.0.0",
     "log-update": "^5.0.0",
     "minimist": "^1.2.5",
     "multiparty": "^4.2.1",
@@ -151,7 +151,7 @@
     "netlify-redirector": "^0.4.0",
     "node-fetch": "^2.6.0",
     "node-version-alias": "^2.0.0",
-    "ora": "^5.0.0",
+    "ora": "^6.0.0",
     "p-filter": "^3.0.0",
     "p-map": "^5.0.0",
     "p-wait-for": "^3.0.0",
@@ -207,7 +207,7 @@
     "tomlify-j0.4": "^3.0.0",
     "tree-kill": "^1.2.2",
     "typescript": "^4.4.4",
-    "verdaccio": "^5.10.2",
+    "verdaccio": "^5.22.1",
     "vite": "^4.0.0",
     "vitest": "^0.29.0"
   },

package/src/commands/deploy/deploy.mjs

@@ -31,6 +31,7 @@ import {
 } from '../../utils/command-helpers.mjs'
 import { DEFAULT_DEPLOY_TIMEOUT } from '../../utils/deploy/constants.mjs'
 import { deploySite } from '../../utils/deploy/deploy-site.mjs'
+import { getEnvelopeEnv } from '../../utils/env/index.mjs'
 import { getFunctionsManifestPath, getInternalFunctionsDir } from '../../utils/functions/index.mjs'
 import openBrowser from '../../utils/open-browser.mjs'
 import { link } from '../link/index.mjs'
@@ -567,6 +568,16 @@ const deploy = async (options, command) => {
     return triggerDeploy({ api, options, siteData, siteId })
   }
 
+  const isUsingEnvelope = siteData && siteData.use_envelope
+  // if a context is passed besides dev, we need to pull env vars from that specific context
+  if (isUsingEnvelope && options.context && options.context !== 'dev') {
+    command.netlify.cachedConfig.env = await getEnvelopeEnv({
+      api,
+      context: options.context,
+      env: command.netlify.cachedConfig.env,
+      siteInfo: siteData,
+    })
+  }
   const { configMutations = [], newConfig } = await handleBuild({
     cachedConfig: command.netlify.cachedConfig,
     options,
@@ -595,7 +606,18 @@ const deploy = async (options, command) => {
     deployFolder,
     functionsFolder,
   })
-  const siteEnv = get(siteData, 'build_settings.env')
+
+  const siteEnv = isUsingEnvelope
+    ? await getEnvelopeEnv({
+        api,
+        context: options.context,
+        env: command.netlify.cachedConfig.env,
+        raw: true,
+        scope: 'functions',
+        siteInfo: siteData,
+      })
+    : get(siteData, 'build_settings.env')
+
   const functionsConfig = normalizeFunctionsConfig({
     functionsConfig: config.functions,
     projectRoot: site.root,

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

@@ -9,7 +9,7 @@ import { fileURLToPath, pathToFileURL } from 'url'
 import { promisify } from 'util'
 
 import copyTemplateDirOriginal from 'copy-template-dir'
-import findUp from 'find-up'
+import { findUp } from 'find-up'
 import fuzzy from 'fuzzy'
 import inquirer from 'inquirer'
 import inquirerAutocompletePrompt from 'inquirer-autocomplete-prompt'

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/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/lib/functions/runtimes/rust/index.mjs

@@ -3,7 +3,7 @@ import { readFile } from 'fs/promises'
 import { dirname, extname, join, resolve } from 'path'
 import { platform } from 'process'
 
-import findUp from 'find-up'
+import { findUp } from 'find-up'
 import toml from 'toml'
 
 import execa from '../../../../utils/execa.mjs'

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/env/index.mjs

@@ -131,11 +131,12 @@ export const formatEnvelopeData = ({ context = 'dev', envelopeItems = [], scope
  * @param {string} context - The deploy context or branch of the environment variable
  * @param {object} env - The dictionary of environment variables
  * @param {string} key - If present, fetch a single key (case-sensitive)
+ * @param {boolean} raw - Return a dictionary of raw key/value pairs for only the account and site sources
  * @param {enum<any,builds,functions,runtime,post_processing>} scope - The scope of the environment variables
  * @param {object} siteInfo - The site object
  * @returns {object} An object of environment variables keys and their metadata
  */
-export const getEnvelopeEnv = async ({ api, context = 'dev', env, key = '', scope = 'any', siteInfo }) => {
+export const getEnvelopeEnv = async ({ api, context = 'dev', env, key = '', raw = false, scope = 'any', siteInfo }) => {
   const { account_slug: accountId, id: siteId } = siteInfo
 
   const [accountEnvelopeItems, siteEnvelopeItems] = await Promise.all([
@@ -145,6 +146,18 @@ export const getEnvelopeEnv = async ({ api, context = 'dev', env, key = '', scop
 
   const accountEnv = formatEnvelopeData({ context, envelopeItems: accountEnvelopeItems, scope, source: 'account' })
   const siteEnv = formatEnvelopeData({ context, envelopeItems: siteEnvelopeItems, scope, source: 'ui' })
+
+  if (raw) {
+    const entries = Object.entries({ ...accountEnv, ...siteEnv })
+    return entries.reduce(
+      (obj, [envVarKey, metadata]) => ({
+        ...obj,
+        [envVarKey]: metadata.value,
+      }),
+      {},
+    )
+  }
+
   const generalEnv = filterEnvBySource(env, 'general')
   const internalEnv = filterEnvBySource(env, 'internal')
   const addonsEnv = filterEnvBySource(env, 'addons')

package/src/utils/get-repo-data.mjs

@@ -3,7 +3,7 @@ import { dirname } from 'path'
 import process from 'process'
 import util from 'util'
 
-import findUp from 'find-up'
+import { findUp } from 'find-up'
 import gitRepoInfo from 'git-repo-info'
 import gitconfiglocal from 'gitconfiglocal'
 import parseGitRemote from 'parse-github-url'
@@ -23,16 +23,17 @@ const getRepoData = async function ({ remoteName } = {}) {
       util.promisify(gitconfiglocal)(cwd),
       findUp('.git', { cwd, type: 'directory' }),
     ])
+
+    if (!gitDirectory || !gitConfig || !gitConfig.remote || Object.keys(gitConfig.remote).length === 0) {
+      throw new Error('No Git remote found')
+    }
+
     const baseGitPath = dirname(gitDirectory)
 
     if (cwd !== baseGitPath) {
       log(`Git directory located in ${baseGitPath}`)
     }
 
-    if (!gitConfig || !gitConfig.remote || Object.keys(gitConfig.remote).length === 0) {
-      throw new Error('No Git remote found')
-    }
-
     if (!remoteName) {
       const remotes = Object.keys(gitConfig.remote)
       remoteName = remotes.find((remote) => remote === 'origin') || remotes[0]

package/src/utils/init/node-version.mjs

@@ -2,7 +2,7 @@
 import { readFile } from 'fs/promises'
 
 import { get } from 'dot-prop'
-import locatePath from 'locate-path'
+import { locatePath } from 'locate-path'
 import nodeVersionAlias from 'node-version-alias'
 
 import { warn } from '../command-helpers.mjs'

package/src/utils/proxy.mjs

@@ -17,7 +17,7 @@ import getAvailablePort from 'get-port'
 import httpProxy from 'http-proxy'
 import { createProxyMiddleware } from 'http-proxy-middleware'
 import jwtDecode from 'jwt-decode'
-import locatePath from 'locate-path'
+import { locatePath } from 'locate-path'
 import pFilter from 'p-filter'
 import toReadableStream from 'to-readable-stream'
 

package/src/utils/state-config.mjs

@@ -3,7 +3,7 @@ import path from 'path'
 import process from 'process'
 
 import dotProp from 'dot-prop'
-import findUp from 'find-up'
+import { findUpSync } from 'find-up'
 import writeFileAtomic from 'write-file-atomic'
 
 import { getPathInProject } from '../lib/settings.mjs'
@@ -13,7 +13,7 @@ const permissionError = "You don't have access to this file."
 
 // Finds location of `.netlify/state.json`
 const findStatePath = (cwd) => {
-  const statePath = findUp.sync([STATE_PATH], { cwd })
+  const statePath = findUpSync([STATE_PATH], { cwd })
 
   if (!statePath) {
     return path.join(cwd, STATE_PATH)