refactor: use LocalState from @netlify/dev-utils (#7454)

* Replaced usages of CLIState to LocalState

* Exported type LocalState in types

Author: keanu-a

src/commands/base-command.ts

@@ -7,7 +7,7 @@ import { NetlifyAPI } from '@netlify/api'
 import { DefaultLogger, Project } from '@netlify/build-info'
 import { NodeFS, NoopLogger } from '@netlify/build-info/node'
 import { resolveConfig } from '@netlify/config'
-import { getGlobalConfigStore } from '@netlify/dev-utils'
+import { getGlobalConfigStore, LocalState } from '@netlify/dev-utils'
 import { isCI } from 'ci-info'
 import { Command, Help, Option, type OptionValues } from 'commander'
 import debug from 'debug'
@@ -38,7 +38,6 @@ import type { FeatureFlags } from '../utils/feature-flags.js'
 import { getFrameworksAPIPaths } from '../utils/frameworks-api.js'
 import { getSiteByName } from '../utils/get-site.js'
 import openBrowser from '../utils/open-browser.js'
-import CLIState from '../utils/cli-state.js'
 import { identify, reportError, track } from '../utils/telemetry/index.js'
 import type { NetlifyOptions } from './types.js'
 import type { CachedConfig } from '../lib/build.js'
@@ -566,7 +565,7 @@ export default class BaseCommand extends Command {
     // ==================================================
     // Retrieve Site id and build state from the state.json
     // ==================================================
-    const state = new CLIState(this.workingDir)
+    const state = new LocalState(this.workingDir)
     const [token] = await getToken(flags.auth)
 
     const apiUrlOpts: {

src/commands/dev/dev.ts

@@ -27,7 +27,7 @@ import openBrowser from '../../utils/open-browser.js'
 import { generateInspectSettings, startProxyServer } from '../../utils/proxy-server.js'
 import { getProxyUrl } from '../../utils/proxy.js'
 import { runDevTimeline } from '../../utils/run-build.js'
-import type { CLIState, ServerSettings } from '../../utils/types.js'
+import type { LocalState, ServerSettings } from '../../utils/types.js'
 import type BaseCommand from '../base-command.js'
 import { getBaseOptionValues } from '../base-command.js'
 import type { NetlifySite } from '../types.js'
@@ -46,7 +46,7 @@ const handleLiveTunnel = async ({
   options: OptionValues
   settings: ServerSettings
   site: NetlifySite
-  state: CLIState
+  state: LocalState
 }) => {
   const { live } = options
 

src/commands/init/init.ts

@@ -10,11 +10,11 @@ import { track } from '../../utils/telemetry/index.js'
 import type BaseCommand from '../base-command.js'
 import { link } from '../link/link.js'
 import { sitesCreate } from '../sites/sites-create.js'
-import type { CLIState, SiteInfo } from '../../utils/types.js'
+import type { LocalState, SiteInfo } from '../../utils/types.js'
 import { getBuildSettings, saveNetlifyToml } from '../../utils/init/utils.js'
 import { type InitExitCode, LINKED_EXISTING_SITE_EXIT_CODE, LINKED_NEW_SITE_EXIT_CODE } from './constants.js'
 
-const persistState = ({ siteInfo, state }: { siteInfo: SiteInfo; state: CLIState }): void => {
+const persistState = ({ siteInfo, state }: { siteInfo: SiteInfo; state: LocalState }): void => {
   // Save to .netlify/state.json file
   state.set('siteId', siteInfo.id)
 }
@@ -47,7 +47,7 @@ const createNewSiteAndExit = async ({
   customizeExitMessage,
 }: {
   command: BaseCommand
-  state: CLIState
+  state: LocalState
   disableLinking: boolean
   customizeExitMessage: InitExitMessageCustomizer | undefined
 }): Promise<never> => {
@@ -131,7 +131,7 @@ const handleNoGitRemoteAndExit = async ({
 }: {
   command: BaseCommand
   error?: unknown
-  state: CLIState
+  state: LocalState
   disableLinking: boolean
   customizeExitMessage: InitExitMessageCustomizer | undefined
 }): Promise<never> => {

src/commands/types.d.ts

@@ -1,7 +1,7 @@
 import type { NetlifyAPI } from '@netlify/api'
 
 import type { FrameworksAPIPaths } from '../utils/frameworks-api.ts'
-import type CLIState from '../utils/cli-state.js'
+import type { LocalState } from '../utils/types.ts'
 import type { MinimalAccount, GlobalConfigStore, SiteInfo } from '../utils/types.ts'
 import type { NormalizedCachedConfigConfig } from '../utils/command-helpers.js'
 import type { CachedConfig } from '../lib/build.js'
@@ -40,7 +40,7 @@ export type NetlifyOptions = {
   config: NormalizedCachedConfigConfig
   cachedConfig: CachedConfig
   globalConfig: GlobalConfigStore
-  state: CLIState
+  state: LocalState
   frameworksAPIPaths: FrameworksAPIPaths
 }
 

src/lib/edge-functions/proxy.ts

@@ -19,7 +19,7 @@ import { BlobsContextWithEdgeAccess } from '../blobs/blobs.js'
 import { getGeoLocation } from '../geo-location.js'
 import { getPathInProject } from '../settings.js'
 import { type Spinner, startSpinner, stopSpinner } from '../spinner.js'
-import type { CLIState, ServerSettings } from '../../utils/types.js'
+import type { LocalState, ServerSettings } from '../../utils/types.js'
 
 import { getBootstrapURL } from './bootstrap.js'
 import { DIST_IMPORT_MAP_PATH, EDGE_FUNCTIONS_SERVE_FOLDER } from './consts.js'
@@ -112,7 +112,7 @@ export const initializeProxy = async ({
   repositoryRoot?: string
   settings: ServerSettings
   siteInfo: $TSFixMe
-  state: CLIState
+  state: LocalState
 }) => {
   const userFunctionsPath = config.build.edge_functions
   const isolatePort = await getAvailablePort()

src/lib/functions/server.ts

@@ -23,7 +23,7 @@ import { NFFunctionName, NFFunctionRoute } from '../../utils/headers.js'
 import type { BlobsContextWithEdgeAccess } from '../blobs/blobs.js'
 import { headers as efHeaders } from '../edge-functions/headers.js'
 import { getGeoLocation } from '../geo-location.js'
-import type { CLIState, ServerSettings, SiteInfo } from '../../utils/types.js'
+import type { LocalState, ServerSettings, SiteInfo } from '../../utils/types.js'
 
 import { handleBackgroundFunction, handleBackgroundFunctionResult } from './background.js'
 import { createFormSubmissionHandler } from './form-submissions-handler.js'
@@ -265,7 +265,7 @@ interface GetFunctionsServerOptions {
   accountId?: string | undefined
   geoCountry: string
   offline: boolean
-  state: CLIState
+  state: LocalState
   config: NormalizedCachedConfigConfig
   geolocationMode: 'cache' | 'update' | 'mock'
 }

src/utils/cli-state.ts

@@ -9,7 +9,7 @@ import { getPathInHome } from '../lib/settings.js'
 
 import { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, exit, log } from './command-helpers.js'
 import execa from './execa.js'
-import type CLIState from './cli-state.js'
+import type { LocalState } from './types.js'
 
 const PACKAGE_NAME = 'live-tunnel-client'
 const EXEC_NAME = PACKAGE_NAME
@@ -174,7 +174,7 @@ export const startLiveTunnel = async ({
   return session.session_url
 }
 
-export const getLiveTunnelSlug = (state: CLIState, override?: string) => {
+export const getLiveTunnelSlug = (state: LocalState, override?: string) => {
   if (override !== undefined) {
     return override
   }

src/utils/live-tunnel.ts

@@ -5,7 +5,7 @@ import type { FunctionsRegistry } from '../lib/functions/registry.js'
 
 import { exit, log, NETLIFYDEVERR, type NormalizedCachedConfigConfig } from './command-helpers.js'
 import { startProxy } from './proxy.js'
-import type CLIState from './cli-state.js'
+import type { LocalState } from './types.js'
 import type { ServerSettings } from './types.js'
 
 interface InspectSettings {
@@ -84,7 +84,7 @@ export const startProxyServer = async ({
   siteInfo: $TSFixMe
   projectDir: string
   repositoryRoot?: string
-  state: CLIState
+  state: LocalState
   functionsRegistry?: FunctionsRegistry
 }) => {
   const url = await startProxy({

src/utils/proxy-server.ts

@@ -5,7 +5,7 @@ import type { PollingStrategy } from '@netlify/build-info'
 import type { Match } from 'netlify-redirector'
 
 export type { GlobalConfigStore } from '@netlify/dev-utils'
-export { default as CLIState } from './cli-state.js'
+export type { LocalState } from '@netlify/dev-utils'
 
 export type FrameworkNames = '#static' | '#auto' | '#custom' | string