refactor: use geolocation from @netlify/dev-utils package (#7414)

* Imported Geolocation from @netlify/dev-utils package

* Small convention and format fixes

* Fixed Geolocation imports/exports

Author: keanu-a

package-lock.json

@@ -63,6 +63,7 @@
     "@netlify/build": "34.2.3",
     "@netlify/build-info": "10.0.7",
     "@netlify/config": "23.1.0",
+    "@netlify/dev-utils": "^3.2.2",
     "@netlify/edge-bundler": "14.2.1",
     "@netlify/edge-functions": "2.15.6",
     "@netlify/headers-parser": "9.0.1",

package.json

@@ -1,4 +1,5 @@
 import fetch from 'node-fetch'
+import { type Geolocation, mockLocation } from '@netlify/dev-utils'
 
 const API_URL = 'https://netlifind.netlify.app'
 const STATE_GEO_PROPERTY = 'geolocation'
@@ -8,35 +9,13 @@ const CACHE_TTL = 8.64e7
 // 10 seconds
 const REQUEST_TIMEOUT = 1e4
 
-export type Geolocation = {
-  city: string
-  country: {
-    code: string
-    name: string
-  }
-  subdivision: {
-    code: string
-    name: string
-  }
-  longitude: number
-  latitude: number
-  timezone: string
-}
+export { Geolocation }
 
 interface State {
   get(key: string): unknown
   set(key: string, value: unknown): void
 }
 
-export const mockLocation: Geolocation = {
-  city: 'San Francisco',
-  country: { code: 'US', name: 'United States' },
-  subdivision: { code: 'CA', name: 'California' },
-  longitude: 0,
-  latitude: 0,
-  timezone: 'UTC',
-}
-
 /**
  * Returns geolocation data from a remote API, the local cache, or a mock location, depending on the
  * specified mode.
@@ -63,7 +42,7 @@ export const getGeoLocation = async ({
   // `cache`, let's try to use it.
   // Or, if the country we're trying to mock is the same one as we have in the
   // cache, let's use the cache instead of the mock.
-  if (cacheObject !== undefined && (mode === 'cache' || cacheObject.data.country.code === geoCountry)) {
+  if (cacheObject !== undefined && (mode === 'cache' || cacheObject.data.country?.code === geoCountry)) {
     const age = Date.now() - cacheObject.timestamp
 
     // Let's use the cached data if it's not older than the TTL. Also, if the

src/lib/geo-location.ts

@@ -1,7 +1,8 @@
 import nock from 'nock'
 import { describe, expect, test } from 'vitest'
 
-import { type Geolocation, getGeoLocation, mockLocation } from '../../../src/lib/geo-location.js'
+import { mockLocation } from '@netlify/dev-utils'
+import { getGeoLocation, type Geolocation } from '../../../src/lib/geo-location.js'
 
 describe('getGeoLocation', () => {
   test('returns geolocation data from the API if `mode: "cache"`', async () => {