netlify-cli 17.26.3 → 17.28.0

package/dist/commands/base-command.d.ts

@@ -1,6 +1,7 @@
 import { Project } from '@netlify/build-info';
 import { resolveConfig } from '@netlify/config';
 import { Command, Help } from 'commander';
+import { FeatureFlags } from '../utils/feature-flags.js';
 import { type NetlifyOptions } from './types.js';
 type Analytics = {
     startTime: bigint;
@@ -26,6 +27,8 @@ export default class BaseCommand extends Command {
     jsWorkspaceRoot?: string;
     /** The current workspace package we should execute the commands in  */
     workspacePackage?: string;
+    featureFlags: FeatureFlags;
+    siteId?: string;
     /**
      * IMPORTANT this function will be called for each command!
      * Don't do anything expensive in there.
@@ -53,7 +56,6 @@ export default class BaseCommand extends Command {
     getConfig(config: {
         cwd: string;
         token?: string | null;
-        state?: any;
         offline?: boolean;
         /** An optional path to the netlify configuration file e.g. netlify.toml */
         configFilePath?: string;

package/dist/commands/base-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":"AAOA,OAAO,EAAiB,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,WAAW,CAAA;AAgCjD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,KAAK,SAAS,GAAG;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClC,CAAA;AAkGD,0EAA0E;AAC1E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;;IAC9C,4DAA4D;IAE5D,OAAO,EAAE,cAAc,CAAA;IACvB,SAAS,EAAE,SAAS,CAAyC;IAE7D,OAAO,EAAE,OAAO,CAAA;IAEhB;;;;OAIG;IAGH,UAAU,SAAgB;IAE1B;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,uEAAuE;IACvE,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB;;;OAGG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW;IAqDxC,mIAAmI;IACnI,aAAa;IAKb,mFAAmF;IACnF,QAAQ,EAAE,MAAM,EAAE,CAAK;IACvB,oCAAoC;IACpC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE;IAK9B,iEAAiE;IACjE,UAAU,IAAI,IAAI;IAgIlB,kEAAkE;IAC5D,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO;IAwBtB,YAAY,CAAC,aAAa,CAAC,EAAE,MAAM;IAQnC,uBAAuB;IA4D7B,8CAA8C;IAC9C,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAOpD;;OAEG;YACW,IAAI;IA6KlB,iDAAiD;IAC3C,SAAS,CAAC,MAAM,EAAE;QACtB,GAAG,EAAE,MAAM,CAAA;QACX,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;QAErB,KAAK,CAAC,EAAE,GAAG,CAAA;QACX,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,2EAA2E;QAC3E,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC;IA+CpC;;OAEG;IACH,gBAAgB,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;IAI5C;;;;OAIG;IACH,iBAAiB,IAAI,YAAY,GAAG,KAAK;IAIzC;;OAEG;IACH,cAAc,CAAC,CAAC,GAAG,IAAI,GAAG,OAAO,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC;CAGjE"}
+{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":"AAOA,OAAO,EAAiB,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,WAAW,CAAA;AA0BjD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAOxD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,KAAK,SAAS,GAAG;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClC,CAAA;AAuGD,0EAA0E;AAC1E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;;IAC9C,4DAA4D;IAE5D,OAAO,EAAE,cAAc,CAAA;IACvB,SAAS,EAAE,SAAS,CAAyC;IAE7D,OAAO,EAAE,OAAO,CAAA;IAEhB;;;;OAIG;IAGH,UAAU,SAAgB;IAE1B;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,uEAAuE;IACvE,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB,YAAY,EAAE,YAAY,CAAK;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf;;;OAGG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW;IAqDxC,mIAAmI;IACnI,aAAa;IAKb,mFAAmF;IACnF,QAAQ,EAAE,MAAM,EAAE,CAAK;IACvB,oCAAoC;IACpC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE;IAK9B,iEAAiE;IACjE,UAAU,IAAI,IAAI;IAgIlB,kEAAkE;IAC5D,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO;IAwBtB,YAAY,CAAC,aAAa,CAAC,EAAE,MAAM;IAQnC,uBAAuB;IA4D7B,8CAA8C;IAC9C,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAOpD;;OAEG;YACW,IAAI;IAyLlB,iDAAiD;IAC3C,SAAS,CAAC,MAAM,EAAE;QACtB,GAAG,EAAE,MAAM,CAAA;QACX,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;QACrB,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,2EAA2E;QAC3E,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC;IAgDpC;;OAEG;IACH,gBAAgB,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;IAI5C;;;;OAIG;IACH,iBAAiB,IAAI,YAAY,GAAG,KAAK;IAIzC;;OAEG;IACH,cAAc,CAAC,CAAC,GAAG,IAAI,GAAG,OAAO,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC;CAGjE"}

package/dist/commands/base-command.js

@@ -53,6 +53,10 @@ const HELP_SEPARATOR_WIDTH = 5;
  * workspace aware.
  */
 const COMMANDS_WITHOUT_WORKSPACE_OPTIONS = new Set(['api', 'recipes', 'completion', 'status', 'switch', 'login', 'lm']);
+/**
+ * A list of commands where we need to fetch featureflags for config resolution
+ */
+const COMMANDS_WITH_FEATURE_FLAGS = new Set(['build', 'dev', 'deploy']);
 /** Formats a help list correctly with the correct indent */
 const formatHelpList = (textArray) => textArray.join('\n').replace(/^/gm, ' '.repeat(HELP_INDENT_WIDTH));
 /** Get the duration between a start time and the current time */
@@ -121,6 +125,7 @@ class BaseCommand extends Command {
         // here we actually want to disable the lint rule as its value is set
         // eslint-disable-next-line workspace/no-process-cwd
         this.workingDir = process.cwd();
+        this.featureFlags = {};
         _BaseCommand_noBaseOptions.set(this, false
         /** don't show help options on command overview (mostly used on top commands like `addons` where options only apply on children) */
         );
@@ -431,6 +436,24 @@ class BaseCommand extends Command {
             apiUrlOpts.pathPrefix =
                 process.env.NETLIFY_API_URL === `${apiUrl.protocol}//${apiUrl.host}` ? '/api/v1' : apiUrl.pathname;
         }
+        const agent = await getAgent({
+            httpProxy: flags.httpProxy,
+            certificateFile: flags.httpProxyCertificateFilename,
+        });
+        const apiOpts = { ...apiUrlOpts, agent };
+        // TODO: remove typecast once we have proper types for the API
+        const api = new NetlifyAPI(token || '', apiOpts);
+        actionCommand.siteId = flags.siteId || (typeof flags.site === 'string' && flags.site) || state.get('siteId');
+        const needsFeatureFlagsToResolveConfig = COMMANDS_WITH_FEATURE_FLAGS.has(actionCommand.name());
+        if (api.accessToken && !flags.offline && needsFeatureFlagsToResolveConfig && actionCommand.siteId) {
+            try {
+                const site = await api.getSite({ siteId: actionCommand.siteId, feature_flags: 'cli' });
+                actionCommand.featureFlags = site.feature_flags;
+            }
+            catch {
+                // if the site is not found, that could mean that the user passed a site name, not an ID
+            }
+        }
         // ==================================================
         // Start retrieving the configuration through the
         // configuration file and the API
@@ -441,20 +464,12 @@ class BaseCommand extends Command {
             packagePath: this.workspacePackage,
             // The config flag needs to be resolved from the actual process working directory
             configFilePath: packageConfig,
-            state,
             token,
             ...apiUrlOpts,
         });
         const { buildDir, config, configPath, env, repositoryRoot, siteInfo } = cachedConfig;
         env.NETLIFY_CLI_VERSION = { sources: ['internal'], value: version };
         const normalizedConfig = normalizeConfig(config);
-        const agent = await getAgent({
-            httpProxy: flags.httpProxy,
-            certificateFile: flags.httpProxyCertificateFilename,
-        });
-        const apiOpts = { ...apiUrlOpts, agent };
-        // TODO: remove typecast once we have proper types for the API
-        const api = new NetlifyAPI(token || '', apiOpts);
         // If a user passes a site name as an option instead of a site ID to options.site, the siteInfo object
         // will only have the property siteInfo.id. Checking for one of the other properties ensures that we can do
         // a re-call of the api.getSite() that is done in @netlify/config so we have the proper site object in all
@@ -531,7 +546,7 @@ class BaseCommand extends Command {
                 cwd: config.cwd,
                 context: flags.context || process.env.CONTEXT || this.getDefaultContext(),
                 debug: flags.debug,
-                siteId: flags.siteId || (typeof flags.site === 'string' && flags.site) || config.state.get('siteId'),
+                siteId: this.siteId,
                 token: config.token,
                 mode: 'cli',
                 host: config.host,
@@ -539,6 +554,7 @@ class BaseCommand extends Command {
                 scheme: config.scheme,
                 offline: config.offline ?? flags.offline,
                 siteFeatureFlagPrefix: 'cli',
+                featureFlags: this.featureFlags,
             });
         }
         catch (error_) {

package/dist/commands/dev/dev.js

@@ -164,7 +164,6 @@ export const dev = async (options, command) => {
         const { config: newConfig } = await command.getConfig({
             cwd: command.workingDir,
             offline: true,
-            state,
         });
         const normalizedNewConfig = normalizeConfig(newConfig);
         return normalizedNewConfig;
@@ -172,6 +171,7 @@ export const dev = async (options, command) => {
     const inspectSettings = generateInspectSettings(options.edgeInspect, options.edgeInspectBrk);
     await startProxyServer({
         addonsUrls,
+        api,
         blobsContext,
         command,
         config: mutatedConfig,

package/dist/commands/serve/serve.js

@@ -109,7 +109,7 @@ export const serve = async (options, command) => {
     }
     // TODO: We should consolidate this with the existing config watcher.
     const getUpdatedConfig = async () => {
-        const { config: newConfig } = await command.getConfig({ cwd: command.workingDir, offline: true, state });
+        const { config: newConfig } = await command.getConfig({ cwd: command.workingDir, offline: true });
         const normalizedNewConfig = normalizeConfig(newConfig);
         return normalizedNewConfig;
     };