@netlify/config 20.17.0 → 20.18.0

package/lib/api/site_info.js

@@ -92,8 +92,9 @@ const getIntegrations = async function ({ siteId, accountId, testOpts, offline,
     }
     const { host } = testOpts;
     const baseUrl = new URL(host ? `http://${host}` : `https://api.netlifysdk.com`);
+    // use future state feature flag
     const url = useV2Endpoint
-        ? `${baseUrl}team/${accountId}/integrations/installations/meta?exclude_site_id=${siteId}`
+        ? `${baseUrl}team/${accountId}/integrations/installations/meta/${siteId}`
         : `${baseUrl}site/${siteId}/integrations/safe`;
     try {
         const response = await fetch(url);

package/lib/env/main.d.ts

@@ -1,4 +1,4 @@
-export declare const getEnv: ({ api, mode, config, siteInfo, accounts, addons, buildDir, branch, deployId, buildId, context, }: {
+export declare const getEnv: ({ api, mode, config, siteInfo, accounts, addons, buildDir, branch, deployId, buildId, context, cachedEnv, }: {
     api: any;
     mode: any;
     config: any;
@@ -10,4 +10,5 @@ export declare const getEnv: ({ api, mode, config, siteInfo, accounts, addons, b
     deployId: any;
     buildId: any;
     context: any;
+    cachedEnv: any;
 }) => Promise<any>;

package/lib/env/main.js

@@ -8,10 +8,11 @@ import { getGitEnv } from './git.js';
 // meant so that local builds can mimic production builds
 // TODO: add `netlify.toml` `build.environment`, after normalization
 // TODO: add `CONTEXT` and others
-export const getEnv = async function ({ api, mode, config, siteInfo, accounts, addons, buildDir, branch, deployId, buildId, context, }) {
+export const getEnv = async function ({ api, mode, config, siteInfo, accounts, addons, buildDir, branch, deployId, buildId, context, cachedEnv, }) {
     if (mode === 'buildbot') {
         return {};
     }
+    const internalEnv = getInternalEnv(cachedEnv);
     const generalEnv = await getGeneralEnv({ siteInfo, buildDir, branch, deployId, buildId, context });
     const [accountEnv, addonsEnv, uiEnv, configFileEnv] = await getUserEnv({
         api,
@@ -28,6 +29,7 @@ export const getEnv = async function ({ api, mode, config, siteInfo, accounts, a
         { key: 'addons', values: addonsEnv },
         { key: 'account', values: accountEnv },
         { key: 'general', values: generalEnv },
+        { key: 'internal', values: internalEnv },
     ];
     // A hash mapping names of environment variables to objects containing the following properties:
     // - sources: List of sources where the environment variable was found. The first element is the source that
@@ -85,6 +87,19 @@ const getGeneralEnv = async function ({ siteInfo, siteInfo: { id, name }, buildD
         NEXT_TELEMETRY_DISABLED: '1',
     });
 };
+/**
+ * Retrieve internal environment variables (needed for the CLI).
+ * Based on the cached environment, it returns the internal environment variables.
+ * Internal environment variables are those that are set by the CLI and are not retrieved by Envelope or the API.
+ */
+const getInternalEnv = function (cachedEnv) {
+    return Object.entries(cachedEnv).reduce((prev, [key, { sources, value }]) => {
+        if (sources.includes('internal')) {
+            prev[key] = value;
+        }
+        return prev;
+    }, {});
+};
 const getDeployUrls = function ({ siteInfo: { name = DEFAULT_SITE_NAME, ssl_url: sslUrl, build_settings: { repo_url: REPOSITORY_URL = undefined } = {}, }, branch, deployId, }) {
     return {
         URL: sslUrl,

package/lib/main.js

@@ -80,6 +80,7 @@ export const resolveConfig = async function (opts) {
         deployId,
         buildId,
         context,
+        cachedEnv: parsedCachedConfig?.env || {},
     });
     // @todo Remove in the next major version.
     const configA = addLegacyFunctionsDirectory(config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.17.0",
+  "version": "20.18.0",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -95,5 +95,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "0f0dfefdc7df94b4083dbb827751d015cb2c8c88"
+  "gitHead": "507a010535ba4028153a755b397501109fa872c9"
 }