@netlify/config 20.12.1 → 20.12.3

package/lib/api/site_info.js

@@ -11,7 +11,7 @@ import { ERROR_CALL_TO_ACTION } from '../log/messages.js';
  * Silently ignore API errors. For example the network connection might be down,
  * but local builds should still work regardless.
  */
-export const getSiteInfo = async function ({ api, siteId, mode, siteFeatureFlagPrefix, offline = false, testOpts = {}, }) {
+export const getSiteInfo = async function ({ api, siteId, mode, siteFeatureFlagPrefix, context, offline = false, testOpts = {}, }) {
     const { env: testEnv = false } = testOpts;
     if (api === undefined || mode === 'buildbot' || testEnv) {
         const siteInfo = siteId === undefined ? {} : { id: siteId };
@@ -26,7 +26,7 @@ export const getSiteInfo = async function ({ api, siteId, mode, siteFeatureFlagP
     ];
     const [siteInfo, accounts, addons, integrations] = await Promise.all(promises);
     if (siteInfo.use_envelope) {
-        const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, siteId });
+        const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, siteId, context });
         siteInfo.build_settings.env = envelope;
     }
     return { siteInfo, accounts, addons, integrations };

package/lib/env/envelope.js

@@ -1,9 +1,9 @@
-export const getEnvelope = async function ({ api, accountId, siteId }) {
+export const getEnvelope = async function ({ api, accountId, siteId, context, }) {
     if (accountId === undefined) {
         return {};
     }
     try {
-        const environmentVariables = await api.getEnvVars({ accountId, siteId });
+        const environmentVariables = await api.getEnvVars({ accountId, siteId, context_name: context });
         const sortedEnvVarsFromDevContext = environmentVariables
             .sort((left, right) => (left.key.toLowerCase() < right.key.toLowerCase() ? -1 : 1))
             .reduce((acc, cur) => {

package/lib/env/main.js

@@ -13,7 +13,14 @@ export const getEnv = async function ({ api, mode, config, siteInfo, accounts, a
         return {};
     }
     const generalEnv = await getGeneralEnv({ siteInfo, buildDir, branch, deployId, buildId, context });
-    const [accountEnv, addonsEnv, uiEnv, configFileEnv] = await getUserEnv({ api, config, siteInfo, accounts, addons });
+    const [accountEnv, addonsEnv, uiEnv, configFileEnv] = await getUserEnv({
+        api,
+        config,
+        siteInfo,
+        accounts,
+        addons,
+        context,
+    });
     // Sources of environment variables, in descending order of precedence.
     const sources = [
         { key: 'configFile', values: configFileEnv },
@@ -59,7 +66,7 @@ const convertToString = (value) => {
 // environment.
 const getGeneralEnv = async function ({ siteInfo, siteInfo: { id, name }, buildDir, branch, deployId, buildId, context, }) {
     const gitEnv = await getGitEnv(buildDir, branch);
-    const deployUrls = getDeployUrls({ siteInfo, branch, deployId });
+    const deployUrls = getDeployUrls({ siteInfo: siteInfo, branch, deployId });
     return removeFalsy({
         SITE_ID: id,
         SITE_NAME: name,
@@ -78,7 +85,7 @@ const getGeneralEnv = async function ({ siteInfo, siteInfo: { id, name }, buildD
         NEXT_TELEMETRY_DISABLED: '1',
     });
 };
-const getDeployUrls = function ({ siteInfo: { name = DEFAULT_SITE_NAME, ssl_url: sslUrl, build_settings: { repo_url: REPOSITORY_URL } = {} }, branch, deployId, }) {
+const getDeployUrls = function ({ siteInfo: { name = DEFAULT_SITE_NAME, ssl_url: sslUrl, build_settings: { repo_url: REPOSITORY_URL = undefined } = {}, }, branch, deployId, }) {
     return {
         URL: sslUrl,
         REPOSITORY_URL,
@@ -90,17 +97,17 @@ const NETLIFY_DEFAULT_DOMAIN = '.netlify.app';
 // `site.name` is `undefined` when there is no token or siteId
 const DEFAULT_SITE_NAME = 'site-name';
 // Environment variables specified by the user
-const getUserEnv = async function ({ api, config, siteInfo, accounts, addons }) {
-    const accountEnv = await getAccountEnv({ api, siteInfo, accounts });
+const getUserEnv = async function ({ api, config, siteInfo, accounts, addons, context }) {
+    const accountEnv = await getAccountEnv({ api, siteInfo, accounts, context });
     const addonsEnv = getAddonsEnv(addons);
     const uiEnv = getUiEnv({ siteInfo });
     const configFileEnv = getConfigFileEnv({ config });
     return [accountEnv, addonsEnv, uiEnv, configFileEnv].map(cleanUserEnv);
 };
 // Account-wide environment variables
-const getAccountEnv = async function ({ api, siteInfo, accounts }) {
+const getAccountEnv = async function ({ api, siteInfo, accounts, context, }) {
     if (siteInfo.use_envelope) {
-        const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug });
+        const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, context });
         return envelope;
     }
     const { site_env: siteEnv = {} } = accounts.find(({ slug }) => slug === siteInfo.account_slug) || {};

package/lib/main.js

@@ -34,6 +34,7 @@ export const resolveConfig = async function (opts) {
     const { config: configOpt, defaultConfig, inlineConfig, configMutations, cwd, context, repositoryRoot, base, branch, siteId, deployId, buildId, baseRelDir, mode, debug, logs, featureFlags, } = await normalizeOpts(optsA);
     const { siteInfo, accounts, addons, integrations } = await getSiteInfo({
         api,
+        context,
         siteId,
         mode,
         offline,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.12.1",
+  "version": "20.12.3",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -71,7 +71,7 @@
     "is-plain-obj": "^4.0.0",
     "js-yaml": "^4.0.0",
     "map-obj": "^5.0.0",
-    "netlify": "^13.1.14",
+    "netlify": "^13.1.15",
     "netlify-headers-parser": "^7.1.4",
     "netlify-redirect-parser": "^14.2.2",
     "node-fetch": "^3.3.1",
@@ -94,5 +94,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "b967616d77aa5a926c798f0296bfd01d2628543d"
+  "gitHead": "58fa495beea44671013bd5586c08dabc6d17bc20"
 }