Address code review feedback: use LocalState class, remove CLI references, hook up to edge functions

Co-authored-by: serhalp <1377702+serhalp@users.noreply.github.com>

Author: Copilot

packages/dev-utils/src/lib/geo-location.ts

@@ -1,5 +1,7 @@
 import type { Context } from '@netlify/types'
 
+import { LocalState } from './local-state.js'
+
 export type Geolocation = Context['geo']
 
 export const mockLocation: Geolocation = {
@@ -19,11 +21,6 @@ const CACHE_TTL = 8.64e7
 // 10 seconds
 const REQUEST_TIMEOUT = 1e4
 
-interface State {
-  get(key: string): unknown
-  set(key: string, value: unknown): void
-}
-
 /**
  * Returns geolocation data from a remote API, the local cache, or a mock location, depending on the
  * specified mode.
@@ -37,7 +34,7 @@ export const getGeoLocation = async ({
   mode: 'cache' | 'update' | 'mock'
   geoCountry?: string | undefined
   offline?: boolean | undefined
-  state: State
+  state: LocalState
 }): Promise<Geolocation> => {
   // Early return for pure mock mode (no geoCountry, no offline)
   if (mode === 'mock' && !geoCountry && !offline) {
@@ -63,14 +60,15 @@ export const getGeoLocation = async ({
     }
   }
 
-  // If `--country` was used, we also set `--mode=mock`.
+  // If a country code was provided, we use mock mode to generate
+  // location data for that country.
   if (geoCountry) {
     mode = 'mock'
   }
 
-  // If the `--geo` option is set to `mock`, we use the default mock location.
-  // If the `--offline` option was used, we can't talk to the API, so let's
-  // also use the mock location.  Otherwise, use the country code passed in by
+  // If the mode is set to `mock`, we use the default mock location.
+  // If the `offline` option was used, we can't talk to the API, so let's
+  // also use the mock location. Otherwise, use the country code passed in by
   // the user.
   if (mode === 'mock' || offline || geoCountry) {
     if (geoCountry) {

packages/dev/src/main.ts

@@ -4,7 +4,7 @@ import path from 'node:path'
 import process from 'node:process'
 
 import { resolveConfig } from '@netlify/config'
-import { ensureNetlifyIgnore, getAPIToken, mockLocation, LocalState, type Logger, HTTPServer } from '@netlify/dev-utils'
+import { ensureNetlifyIgnore, getAPIToken, getGeoLocation, mockLocation, LocalState, type Logger, HTTPServer } from '@netlify/dev-utils'
 import { EdgeFunctionsHandler } from '@netlify/edge-functions/dev'
 import { FunctionsHandler } from '@netlify/functions/dev'
 import { HeadersHandler, type HeadersCollector } from '@netlify/headers'
@@ -475,11 +475,16 @@ export class NetlifyDev {
         ),
       }
 
+      const geolocation = await getGeoLocation({
+        mode: 'cache',
+        state,
+      })
+
       const edgeFunctionsHandler = new EdgeFunctionsHandler({
         configDeclarations: this.#config?.config.edge_functions ?? [],
         directories: [this.#config?.config.build.edge_functions].filter(Boolean) as string[],
         env: edgeFunctionsEnv,
-        geolocation: mockLocation,
+        geolocation,
         logger: this.#logger,
         siteID,
         siteName: config?.siteInfo.name,