@netlify/config 22.0.0-rc → 22.0.0

package/README.md

@@ -47,7 +47,6 @@ const exampleFunction = async function () {
   //   },
   //   ...
   // ],
-  // "addons": [],
   // "env": {
   //   "NODE_VERSION": { "sources": ["configFile"], "value": "16" },
   //   ...
@@ -117,7 +116,7 @@ Path to the `netlify.toml`. It is either an absolute path or a path relative to
 If not specified, it is searched in the following directories (by highest priority order):
 
 - `base` directory
-- [`repositoryRoot`](#repositoryRoot)
+- [`repositoryRoot`](#repositoryroot)
 - current directory
 - any parent directory
 
@@ -205,7 +204,7 @@ _Default value_: environment variable `NETLIFY_SITE_ID`
 
 Netlify Site ID.
 
-This is used to retrieve [`siteInfo`](#siteinfo), [`accounts`](#accounts) and [`addons`](#addons).
+This is used to retrieve [`siteInfo`](#siteinfo) and [`accounts`](#accounts).
 
 #### env
 
@@ -227,8 +226,8 @@ What is calling `@netlify/config`. Can be:
 
 This is used for the following cases:
 
-- if `mode` is `buildbot`, [`siteInfo`](#siteinfo), [`accounts`](#accounts) and [`addons`](#addons) are not retrieved
-  because they are also passed using another internal option.
+- if `mode` is `buildbot`, [`siteInfo`](#siteinfo) and [`accounts`](#accounts) are not retrieved because they are also
+  passed using another internal option.
 
 #### defaultConfig
 
@@ -287,13 +286,13 @@ _Type_: `string`
 Absolute path to the build directory.
 
 The build directory is the current directory in which most build operations, including the build command, execute. It is
-usually either the [`repositoryRoot`](#repositoryRoot) or (if specified) the `base` directory.
+usually either the [`repositoryRoot`](#repositoryroot) or (if specified) the `base` directory.
 
 #### repositoryRoot
 
 _Type_: `string`
 
-The computed value of [`repositoryRoot`](#repositoryRoot).
+The computed value of [`repositoryRoot`](#repositoryroot).
 
 #### context
 
@@ -326,15 +325,6 @@ environment variables.
 
 This might be empty depending on the options passed.
 
-#### addons
-
-_Type_: `object[]`
-
-Netlify addons retrieved using the `listServiceInstancesForSite` Netlify API endpoint. This is used to retrieve
-addon-specific environment variables.
-
-This might be empty depending on the options passed.
-
 #### token
 
 _Type_: `string`
@@ -346,8 +336,8 @@ variables.
 
 _Type_: `NetlifyClient?`
 
-Netlify [JavaScript client instance](https://github.com/netlify/js-client) used to retrieve [`siteInfo`](#siteinfo),
-[`accounts`](#accounts) and [`addons`](#addons).
+Netlify [JavaScript client instance](https://github.com/netlify/js-client) used to retrieve [`siteInfo`](#siteinfo) and
+[`accounts`](#accounts).
 
 #### logs
 
@@ -365,14 +355,13 @@ Site's environment variables. Each environment variable value is an object with
 - `sources` `string[]` among:
   - `general`: general environment variables set for all sites
   - `account`: environment variables set in the Netlify UI for a specific account
-  - `addons`: addon-specific environment variables
   - `ui`: environment variables set in the Netlify UI for a specific site
   - `configFile`: environment variables set in `netlify.toml`
 
 # Usage (CLI)
 
 ```bash
-$ netlify-config
+netlify-config
 ```
 
 Like [`resolveConfig()`](resolveconfig), but in the CLI. The return value is printed on `stdout`.

package/lib/api/site_info.d.ts

@@ -26,7 +26,6 @@ type GetSiteInfoOpts = {
 export declare const getSiteInfo: ({ api, siteId, accountId, mode, context, offline, testOpts, siteFeatureFlagPrefix, token, featureFlags, extensionApiBaseUrl, }: GetSiteInfoOpts) => Promise<{
     siteInfo: any;
     accounts: MinimalAccount[];
-    addons: any[] | undefined;
     integrations: IntegrationResponse[];
 }>;
 export type MinimalAccount = {

package/lib/api/site_info.js

@@ -32,19 +32,18 @@ export const getSiteInfo = async function ({ api, siteId, accountId, mode, conte
                 mode,
             })
             : [];
-        return { siteInfo, accounts: [], addons: [], integrations };
+        return { siteInfo, accounts: [], integrations };
     }
-    const [siteInfo, accounts, addons, integrations] = await Promise.all([
+    const [siteInfo, accounts, integrations] = await Promise.all([
         getSite(api, siteId, siteFeatureFlagPrefix),
         getAccounts(api),
-        getAddons(api, siteId),
         getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags, extensionApiBaseUrl, mode }),
     ]);
     if (siteInfo.use_envelope) {
         const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, siteId, context });
         siteInfo.build_settings.env = envelope;
     }
-    return { siteInfo, accounts, addons, integrations };
+    return { siteInfo, accounts, integrations };
 };
 const getSite = async function (api, siteId, siteFeatureFlagPrefix) {
     if (siteId === undefined) {
@@ -69,18 +68,6 @@ const getAccounts = async function (api) {
         return throwUserError(`Failed retrieving user account: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
     }
 };
-const getAddons = async function (api, siteId) {
-    if (siteId === undefined) {
-        return [];
-    }
-    try {
-        const addons = await api.listServiceInstancesForSite({ siteId });
-        return Array.isArray(addons) ? addons : [];
-    }
-    catch (error) {
-        throwUserError(`Failed retrieving addons for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
-    }
-};
 const getIntegrations = async function ({ siteId, accountId, testOpts, offline, token, featureFlags, extensionApiBaseUrl, mode, }) {
     if (!siteId || offline) {
         return [];

package/lib/env/main.d.ts

@@ -1,10 +1,9 @@
-export declare const getEnv: ({ api, mode, config, siteInfo, accounts, addons, buildDir, branch, deployId, buildId, context, cachedEnv, }: {
+export declare const getEnv: ({ api, mode, config, siteInfo, accounts, buildDir, branch, deployId, buildId, context, cachedEnv, }: {
     api: any;
     mode: any;
     config: any;
     siteInfo: any;
     accounts: any;
-    addons: any;
     buildDir: any;
     branch: any;
     deployId: any;

package/lib/env/main.js

@@ -3,30 +3,28 @@ import { removeFalsy } from '../utils/remove_falsy.js';
 import { getEnvelope } from './envelope.js';
 import { getGitEnv } from './git.js';
 // Retrieve this site's environment variable. Also take into account team-wide
-// environment variables and addons.
+// environment variables.
 // The buildbot already has the right environment variables. This is mostly
 // 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, cachedEnv, }) {
+export const getEnv = async function ({ api, mode, config, siteInfo, accounts, 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({
+    const [accountEnv, 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 },
         { key: 'ui', values: uiEnv },
-        { key: 'addons', values: addonsEnv },
         { key: 'account', values: accountEnv },
         { key: 'general', values: generalEnv },
         { key: 'internal', values: internalEnv },
@@ -113,12 +111,11 @@ 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, context }) {
+const getUserEnv = async function ({ api, config, siteInfo, accounts, 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);
+    return [accountEnv, uiEnv, configFileEnv].map(cleanUserEnv);
 };
 // Account-wide environment variables
 const getAccountEnv = async function ({ api, siteInfo, accounts, context, }) {
@@ -128,13 +125,6 @@ const getAccountEnv = async function ({ api, siteInfo, accounts, context, }) {
     const { site_env: siteEnv = {} } = accounts.find(({ slug }) => slug === siteInfo.account_slug) || {};
     return siteEnv;
 };
-// Environment variables from addons
-const getAddonsEnv = function (addons) {
-    return Object.assign({}, ...addons.map(getAddonEnv));
-};
-const getAddonEnv = function ({ env }) {
-    return env;
-};
 // Site-specific environment variables set in the UI
 const getUiEnv = function ({ siteInfo: { build_settings: { env = {} } = {} } }) {
     return env;

package/lib/integrations.d.ts

@@ -1,6 +1,5 @@
 import { IntegrationResponse } from './types/api.js';
 import { Integration } from './types/integrations.js';
-import { TestOptions } from './types/options.js';
 export declare const NETLIFY_API_STAGING_BASE_URL = "api-staging.netlify.com";
 export declare const NETLIFY_API_BASE_URL = "api.netlify.com";
 export declare const EXTENSION_API_BASE_URL = "https://api.netlifysdk.com";
@@ -15,9 +14,6 @@ type MergeIntegrationsOpts = {
     }[];
     apiIntegrations: IntegrationResponse[];
     context: string;
-    testOpts?: TestOptions;
-    offline: boolean;
-    extensionApiBaseUrl: string;
 };
-export declare const mergeIntegrations: ({ configIntegrations, apiIntegrations, context, testOpts, offline, extensionApiBaseUrl, }: MergeIntegrationsOpts) => Promise<Integration[]>;
+export declare const mergeIntegrations: ({ configIntegrations, apiIntegrations, context, }: MergeIntegrationsOpts) => Promise<Integration[]>;
 export {};

package/lib/integrations.js

@@ -1,10 +1,8 @@
-import { getAvailableIntegrations } from './api/integrations.js';
 export const NETLIFY_API_STAGING_BASE_URL = 'api-staging.netlify.com';
 export const NETLIFY_API_BASE_URL = 'api.netlify.com';
 export const EXTENSION_API_BASE_URL = 'https://api.netlifysdk.com';
 export const EXTENSION_API_STAGING_BASE_URL = 'https://api-staging.netlifysdk.com';
-export const mergeIntegrations = async function ({ configIntegrations = [], apiIntegrations, context, testOpts = {}, offline, extensionApiBaseUrl, }) {
-    const availableIntegrations = await getAvailableIntegrations({ testOpts, offline, extensionApiBaseUrl });
+export const mergeIntegrations = async function ({ configIntegrations = [], apiIntegrations, context, }) {
     // Include all API integrations, unless they have a `dev` property and we are in the `dev` context
     const resolvedApiIntegrations = apiIntegrations.filter((integration) => !configIntegrations.some((configIntegration) => configIntegration.name === integration.slug &&
         typeof configIntegration.dev !== 'undefined' &&
@@ -15,19 +13,20 @@ export const mergeIntegrations = async function ({ configIntegrations = [], apiI
         .filter((configIntegration) => apiIntegrations.every((apiIntegration) => apiIntegration.slug !== configIntegration.name) ||
         ('dev' in configIntegration && context === 'dev'))
         .map((configIntegration) => {
+        const apiIntegration = apiIntegrations.find((apiIntegration) => apiIntegration.slug === configIntegration.name);
         if (configIntegration.dev && context === 'dev') {
-            const integrationInstance = apiIntegrations.find((apiIntegration) => apiIntegration.slug === configIntegration.name);
             return {
                 slug: configIntegration.name,
                 dev: configIntegration.dev,
-                has_build: integrationInstance?.has_build ?? configIntegration.dev?.force_run_in_build ?? false,
+                // TODO(kh): has_build should become irrelevant soon as we are only returning extensions that have a build event handler.
+                has_build: apiIntegration?.has_build ?? configIntegration.dev?.force_run_in_build ?? false,
+                ...apiIntegration,
             };
         }
-        const integration = availableIntegrations.find((availableIntegration) => availableIntegration.slug === configIntegration.name);
-        if (!integration) {
+        if (!apiIntegration) {
             return undefined;
         }
-        return { slug: integration.slug, version: integration.hostSiteUrl, has_build: !!integration.hasBuild };
+        return apiIntegration;
     })
         .filter((i) => typeof i !== 'undefined');
     return [...resolvedApiIntegrations, ...resolvedConfigIntegrations];

package/lib/main.d.ts

@@ -1,7 +1,6 @@
 import { type MinimalAccount } from './api/site_info.js';
 export type Config = {
     accounts: MinimalAccount[] | undefined;
-    addons: any;
     api: any;
     branch: any;
     buildDir: any;

package/lib/main.js

@@ -39,12 +39,12 @@ export const resolveConfig = async function (opts) {
         ? EXTENSION_API_STAGING_BASE_URL
         : EXTENSION_API_BASE_URL;
     const { config: configOpt, defaultConfig, inlineConfig, configMutations, cwd, context, repositoryRoot, base, branch, siteId, accountId, deployId, buildId, baseRelDir, mode, debug, logs, featureFlags, } = await normalizeOpts(optsA);
-    let { siteInfo, accounts, addons, integrations } = parsedCachedConfig || {};
+    let { siteInfo, accounts, integrations } = parsedCachedConfig || {};
     // If we have cached site info, we don't need to fetch it again
-    const useCachedSiteInfo = Boolean(featureFlags?.use_cached_site_info && siteInfo && accounts && addons && integrations);
+    const useCachedSiteInfo = Boolean(featureFlags?.use_cached_site_info && siteInfo && accounts && integrations);
     // I'm adding some debug logging to see if the logic is working as expected
     if (featureFlags?.use_cached_site_info_logging) {
-        console.log('Checking site information', { useCachedSiteInfo, siteInfo, accounts, addons, integrations });
+        console.log('Checking site information', { useCachedSiteInfo, siteInfo, accounts, integrations });
     }
     if (!useCachedSiteInfo) {
         const updatedSiteInfo = await getSiteInfo({
@@ -62,7 +62,6 @@ export const resolveConfig = async function (opts) {
         });
         siteInfo = updatedSiteInfo.siteInfo;
         accounts = updatedSiteInfo.accounts;
-        addons = updatedSiteInfo.addons;
         integrations = updatedSiteInfo.integrations;
     }
     const { defaultConfig: defaultConfigA, baseRelDir: baseRelDirA } = parseDefaultConfig({
@@ -93,7 +92,6 @@ export const resolveConfig = async function (opts) {
         config,
         siteInfo,
         accounts,
-        addons,
         buildDir,
         branch,
         deployId,
@@ -107,15 +105,11 @@ export const resolveConfig = async function (opts) {
         apiIntegrations: integrations,
         configIntegrations: configA.integrations,
         context: context,
-        testOpts,
-        offline,
-        extensionApiBaseUrl,
     });
     const result = {
         siteInfo,
         integrations: mergedIntegrations,
         accounts,
-        addons,
         env,
         configPath,
         redirectsPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "22.0.0-rc",
+  "version": "22.0.0",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -59,6 +59,8 @@
   "license": "MIT",
   "dependencies": {
     "@iarna/toml": "^2.2.5",
+    "@netlify/headers-parser": "^8.0.0",
+    "@netlify/redirect-parser": "^14.5.1",
     "chalk": "^5.0.0",
     "cron-parser": "^4.1.0",
     "deepmerge": "^4.2.2",
@@ -73,8 +75,6 @@
     "js-yaml": "^4.0.0",
     "map-obj": "^5.0.0",
     "netlify": "^13.3.4",
-    "@netlify/headers-parser": "^8.0.0",
-    "@netlify/redirect-parser": "^14.5.1",
     "node-fetch": "^3.3.1",
     "omit.js": "^2.0.2",
     "p-locate": "^6.0.0",
@@ -94,5 +94,6 @@
   },
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
-  }
+  },
+  "gitHead": "6c53e667bd041a68dda336c678877dbb3b84a512"
 }

package/lib/api/integrations.d.ts

@@ -1,13 +0,0 @@
-import { TestOptions } from '../types/options.js';
-type AvailableIntegration = {
-    slug: string;
-    hostSiteUrl: string;
-    hasBuild?: boolean;
-};
-type GetAvailableIntegrationsOpts = {
-    testOpts: TestOptions;
-    offline: boolean;
-    extensionApiBaseUrl: string;
-};
-export declare const getAvailableIntegrations: ({ testOpts, offline, extensionApiBaseUrl, }: GetAvailableIntegrationsOpts) => Promise<AvailableIntegration[]>;
-export {};

package/lib/api/integrations.js

@@ -1,19 +0,0 @@
-import fetch from 'node-fetch';
-export const getAvailableIntegrations = async function ({ testOpts, offline, extensionApiBaseUrl, }) {
-    if (offline) {
-        return [];
-    }
-    const { host } = testOpts;
-    const baseUrl = new URL(host ? `http://${host}/` : extensionApiBaseUrl);
-    try {
-        const response = await fetch(`${baseUrl}integrations`);
-        if (response.ok) {
-            const integrations = (await response.json());
-            return Array.isArray(integrations) ? integrations : [];
-        }
-        return [];
-    }
-    catch {
-        return [];
-    }
-};