@netlify/config 20.16.0 → 20.17.1

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

@@ -28,7 +28,10 @@ export const resolveConfig = async function (opts) {
     // `api` is not JSON-serializable, so we cannot cache it inside `cachedConfig`
     const api = getApiClient({ token, offline, host, scheme, pathPrefix, testOpts });
     const parsedCachedConfig = await getCachedConfig({ cachedConfig, cachedConfigPath, token, api });
-    if (parsedCachedConfig !== undefined) {
+    // If there is a cached config, use it. The exception is when a default config,
+    // which consumers like the CLI can set, is present. In those cases, let the
+    // flow continue so that the default config is parsed and used.
+    if (parsedCachedConfig !== undefined && opts.defaultConfig === undefined) {
         return parsedCachedConfig;
     }
     const { config: configOpt, defaultConfig, inlineConfig, configMutations, cwd, context, repositoryRoot, base, branch, siteId, accountId, deployId, buildId, baseRelDir, mode, debug, logs, featureFlags, } = await normalizeOpts(optsA);
@@ -77,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.16.0",
+  "version": "20.17.1",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -95,5 +95,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "32bba2a0dd51881c3f3c45ac384e72e298591b6d"
+  "gitHead": "50efbdfa49d7e84b5ca5357187a07536560b10ad"
 }