@netlify/config 21.0.6 → 22.0.0-rc

package/lib/api/site_info.d.ts

@@ -1,4 +1,5 @@
 import { NetlifyAPI } from 'netlify';
+import { IntegrationResponse } from '../types/api.js';
 import { ModeOption, TestOptions } from '../types/options.js';
 type GetSiteInfoOpts = {
     siteId: string;
@@ -24,8 +25,20 @@ type GetSiteInfoOpts = {
  */
 export declare const getSiteInfo: ({ api, siteId, accountId, mode, context, offline, testOpts, siteFeatureFlagPrefix, token, featureFlags, extensionApiBaseUrl, }: GetSiteInfoOpts) => Promise<{
     siteInfo: any;
-    accounts: any;
-    addons: any;
-    integrations: any;
+    accounts: MinimalAccount[];
+    addons: any[] | undefined;
+    integrations: IntegrationResponse[];
 }>;
+export type MinimalAccount = {
+    id: string;
+    name: string;
+    slug: string;
+    default: boolean;
+    team_logo_url: string | null;
+    on_pro_trial: boolean;
+    organization_id: string | null;
+    type_name: string;
+    type_slug: string;
+    members_count: number;
+};
 export {};

package/lib/api/site_info.js

@@ -34,13 +34,12 @@ export const getSiteInfo = async function ({ api, siteId, accountId, mode, conte
             : [];
         return { siteInfo, accounts: [], addons: [], integrations };
     }
-    const promises = [
+    const [siteInfo, accounts, addons, integrations] = await Promise.all([
         getSite(api, siteId, siteFeatureFlagPrefix),
         getAccounts(api),
         getAddons(api, siteId),
         getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags, extensionApiBaseUrl, mode }),
-    ];
-    const [siteInfo, accounts, addons, integrations] = await Promise.all(promises);
+    ]);
     if (siteInfo.use_envelope) {
         const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, siteId, context });
         siteInfo.build_settings.env = envelope;
@@ -61,11 +60,13 @@ const getSite = async function (api, siteId, siteFeatureFlagPrefix) {
 };
 const getAccounts = async function (api) {
     try {
-        const accounts = await api.listAccountsForUser();
+        const accounts = (await api.listAccountsForUser(
+        // @ts-expect-error(ndhoule): This is an unpublished, internal querystring parameter
+        { minimal: 'true' }));
         return Array.isArray(accounts) ? accounts : [];
     }
     catch (error) {
-        throwUserError(`Failed retrieving user account: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
+        return throwUserError(`Failed retrieving user account: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
     }
 };
 const getAddons = async function (api, siteId) {

package/lib/main.d.ts

@@ -1,6 +1,25 @@
+import { type MinimalAccount } from './api/site_info.js';
+export type Config = {
+    accounts: MinimalAccount[] | undefined;
+    addons: any;
+    api: any;
+    branch: any;
+    buildDir: any;
+    config: any;
+    configPath: any;
+    context: any;
+    env: any;
+    headersPath: any;
+    integrations: any;
+    logs: any;
+    redirectsPath: any;
+    repositoryRoot: any;
+    siteInfo: any;
+    token: any;
+};
 /**
  * Load the configuration file.
  * Takes an optional configuration file path as input and return the resolved
  * `config` together with related properties such as the `configPath`.
  */
-export declare const resolveConfig: (opts: any) => Promise<any>;
+export declare const resolveConfig: (opts: any) => Promise<Config>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "21.0.6",
+  "version": "22.0.0-rc",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -59,8 +59,6 @@
   "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",
@@ -75,6 +73,8 @@
     "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,6 +94,5 @@
   },
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
-  },
-  "gitHead": "761c1e087c92c4cf579050e686a5869da5b3ce00"
+  }
 }