esri-gl 1.0.6 → 2.0.0

package/dist/{useFeatureService-E9PiUOLP.js → useFeatureService-BRY6PHUs.js}

@@ -1,10 +1,16 @@
 import { useState, useRef, useCallback, useEffect } from 'react';
-import { D as DynamicMapService, d as TiledMapService, c as ImageService, e as VectorTileService, F as FeatureService } from './IdentifyImage-DmyKcbAv.js';
+import { D as DynamicMapService, d as TiledMapService, c as ImageService, e as VectorTileService, F as FeatureService } from './index-DsY1_0df.js';
 
 /**
  * Base hook for managing Esri services lifecycle
  */
-function useEsriService(createService, map) {
+function useEsriService(createService, map,
+/**
+ * Values that, when changed, rebuild the service (and its source). Pass the
+ * service-defining options (e.g. `url`, `token`) so option changes are
+ * reflected; the base hook otherwise only rebuilds when `map` changes.
+ */
+deps = []) {
   const [service, setService] = useState(null);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState(null);
@@ -81,7 +87,8 @@ function useEsriService(createService, map) {
       clearTimeout(timeoutId);
       if (retryTimeoutId) clearTimeout(retryTimeoutId);
     };
-  }, [map, reload]);
+    // deps trigger a rebuild when service-defining options change.
+  }, [map, reload, ...deps]);
   // Cleanup on unmount only
   useEffect(() => {
     return () => {
@@ -116,9 +123,12 @@ function useDynamicMapService({
   sourceOptions
 }) {
   const optionsRef = useRef(options);
-  const createService = useCallback(mapInstance => new DynamicMapService(sourceId, mapInstance, options, sourceOptions), [sourceId, sourceOptions] // Remove options from dependencies to prevent service recreation
-  );
-  const result = useEsriService(createService, map);
+  const createService = useCallback(mapInstance => new DynamicMapService(sourceId, mapInstance, options, sourceOptions),
+  // url/token/apiKey changes need a fresh closure + rebuild (below); layers /
+  // layerDefs are applied in place by the effect, so they stay out of here.
+  [sourceId, sourceOptions, options.url, options.token, options.apiKey]);
+  // Rebuild the service when the url / auth changes.
+  const result = useEsriService(createService, map, [sourceId, options.url, options.token, options.apiKey]);
   // Update service options when they change
   useEffect(() => {
     if (result.service && options !== optionsRef.current && map) {
@@ -162,11 +172,16 @@ function useTiledMapService({
   options,
   sourceOptions
 }) {
-  return useEsriService(mapInstance => new TiledMapService(sourceId, mapInstance, options, sourceOptions), map);
+  return useEsriService(mapInstance => new TiledMapService(sourceId, mapInstance, options, sourceOptions), map, [sourceId, options.url, options.token, options.apiKey]);
 }
 
 /**
- * Hook for managing ImageService lifecycle
+ * Hook for managing ImageService lifecycle.
+ *
+ * `useEsriService` only rebuilds when the `map` changes, so this hook reacts to
+ * service-defining option changes itself: a different `url`/`format` rebuilds
+ * the service (and its source), while `renderingRule`/`mosaicRule` changes are
+ * applied in place. (Pass a memoized `options` object.)
  */
 function useImageService({
   sourceId,
@@ -174,7 +189,30 @@ function useImageService({
   options,
   sourceOptions
 }) {
-  return useEsriService(mapInstance => new ImageService(sourceId, mapInstance, options, sourceOptions), map);
+  const result = useEsriService(mapInstance => new ImageService(sourceId, mapInstance, options, sourceOptions), map);
+  const {
+    service,
+    reload
+  } = result;
+  const optionsRef = useRef(options);
+  useEffect(() => {
+    const prev = optionsRef.current;
+    if (prev === options) return;
+    optionsRef.current = options;
+    if (options.url !== prev.url || options.format !== prev.format) {
+      // A different service / format needs a fresh source.
+      reload();
+      return;
+    }
+    if (!service) return;
+    if (options.renderingRule !== prev.renderingRule) {
+      service.setRenderingRule(options.renderingRule || {});
+    }
+    if (options.mosaicRule !== prev.mosaicRule) {
+      service.setMosaicRule(options.mosaicRule || {});
+    }
+  }, [options, service, reload]);
+  return result;
 }
 
 /**
@@ -186,7 +224,7 @@ function useVectorTileService({
   options,
   sourceOptions
 }) {
-  return useEsriService(mapInstance => new VectorTileService(sourceId, mapInstance, options, sourceOptions), map);
+  return useEsriService(mapInstance => new VectorTileService(sourceId, mapInstance, options, sourceOptions), map, [sourceId, options.url, options.token, options.apiKey]);
 }
 
 /**
@@ -198,8 +236,8 @@ function useFeatureService({
   options,
   sourceOptions
 }) {
-  return useEsriService(mapInstance => new FeatureService(sourceId, mapInstance, options, sourceOptions), map);
+  return useEsriService(mapInstance => new FeatureService(sourceId, mapInstance, options, sourceOptions), map, [sourceId, options.url, options.where, options.outFields, options.token, options.apiKey]);
 }
 
 export { useEsriService as a, useFeatureService as b, useImageService as c, useTiledMapService as d, useVectorTileService as e, useDynamicMapService as u };
-//# sourceMappingURL=useFeatureService-E9PiUOLP.js.map
+//# sourceMappingURL=useFeatureService-BRY6PHUs.js.map

package/dist/useFeatureService-BRY6PHUs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useFeatureService-BRY6PHUs.js","sources":["../src/react/hooks/useEsriService.ts","../src/react/hooks/useDynamicMapService.ts","../src/react/hooks/useTiledMapService.ts","../src/react/hooks/useImageService.ts","../src/react/hooks/useVectorTileService.ts","../src/react/hooks/useFeatureService.ts"],"sourcesContent":["import { useState, useEffect, useRef, useCallback } from 'react';\nimport type { UseEsriServiceResult } from '../types';\nimport type { Map } from '@/types';\n\n// Interface for services that can be removed\ninterface RemovableService {\n  remove(): void;\n}\n\n/**\n * Base hook for managing Esri services lifecycle\n */\nexport function useEsriService<T extends RemovableService>(\n  createService: (map: Map) => T,\n  map: Map | null,\n  /**\n   * Values that, when changed, rebuild the service (and its source). Pass the\n   * service-defining options (e.g. `url`, `token`) so option changes are\n   * reflected; the base hook otherwise only rebuilds when `map` changes.\n   */\n  deps: ReadonlyArray<unknown> = []\n): UseEsriServiceResult<T> {\n  const [service, setService] = useState<T | null>(null);\n  const [loading, setLoading] = useState(false);\n  const [error, setError] = useState<Error | null>(null);\n\n  // Track if a service creation is in progress to prevent race conditions\n  const isCreatingService = useRef(false);\n  // Store the current service in a ref to avoid stale closure issues in cleanup\n  const serviceRef = useRef<T | null>(null);\n  // Track the createService function to detect changes\n  const createServiceRef = useRef(createService);\n  createServiceRef.current = createService;\n\n  // Memoized reload function\n  const reload = useCallback(() => {\n    if (!map || isCreatingService.current) return;\n\n    isCreatingService.current = true;\n    setLoading(true);\n    setError(null);\n\n    try {\n      // Clean up existing service using ref to avoid stale closure\n      if (serviceRef.current) {\n        try {\n          serviceRef.current.remove();\n        } catch (err) {\n          // Log error but don't fail the reload\n          if (process.env?.NODE_ENV !== 'test') {\n            console.warn('Error removing existing service:', err);\n          }\n        }\n      }\n\n      // Create new service using the ref to get the latest createService\n      const newService = createServiceRef.current(map);\n      serviceRef.current = newService;\n      setService(newService);\n    } catch (err) {\n      setError(err instanceof Error ? err : new Error('Failed to create service'));\n      serviceRef.current = null;\n    } finally {\n      setLoading(false);\n      isCreatingService.current = false;\n    }\n  }, [map]);\n\n  // Initialize service when map becomes available\n  useEffect(() => {\n    if (!map) {\n      // Clean up service when map is removed\n      if (serviceRef.current) {\n        try {\n          serviceRef.current.remove();\n        } catch (err) {\n          if (process.env?.NODE_ENV !== 'test') {\n            console.warn('Error removing service during cleanup:', err);\n          }\n        }\n        serviceRef.current = null;\n      }\n      setService(null);\n      return;\n    }\n\n    // Add a small delay to ensure map is fully initialized\n    let retryTimeoutId: ReturnType<typeof setTimeout> | undefined;\n    const timeoutId = setTimeout(() => {\n      // Check if map is still valid\n      if (map && typeof map.addSource === 'function') {\n        reload();\n      } else {\n        // If map is not ready, try again after a short delay\n        retryTimeoutId = setTimeout(() => {\n          if (map && typeof map.addSource === 'function') {\n            reload();\n          }\n        }, 100);\n      }\n    }, 10);\n\n    return () => {\n      clearTimeout(timeoutId);\n      if (retryTimeoutId) clearTimeout(retryTimeoutId);\n    };\n    // deps trigger a rebuild when service-defining options change.\n  }, [map, reload, ...deps]);\n\n  // Cleanup on unmount only\n  useEffect(() => {\n    return () => {\n      // This cleanup function runs on unmount\n      if (serviceRef.current) {\n        try {\n          serviceRef.current.remove();\n        } catch (err) {\n          if (process.env?.NODE_ENV !== 'test') {\n            console.warn('Error removing service during cleanup:', err);\n          }\n        }\n        serviceRef.current = null;\n      }\n    };\n  }, []); // Empty dependency array - only run cleanup on unmount\n\n  return {\n    service,\n    loading,\n    error,\n    reload,\n  };\n}\n","import { useCallback, useEffect, useRef } from 'react';\nimport { useEsriService } from './useEsriService';\nimport { DynamicMapService } from '@/Services/DynamicMapService';\nimport type { UseDynamicMapServiceOptions, UseEsriServiceResult } from '../types';\nimport type { Map } from '@/types';\n\n/**\n * Hook for managing DynamicMapService lifecycle\n */\nexport function useDynamicMapService({\n  sourceId,\n  map,\n  options,\n  sourceOptions,\n}: UseDynamicMapServiceOptions): UseEsriServiceResult<DynamicMapService> {\n  const optionsRef = useRef(options);\n\n  const createService = useCallback(\n    (mapInstance: Map) => new DynamicMapService(sourceId, mapInstance, options, sourceOptions),\n    // url/token/apiKey changes need a fresh closure + rebuild (below); layers /\n    // layerDefs are applied in place by the effect, so they stay out of here.\n    [sourceId, sourceOptions, options.url, options.token, options.apiKey]\n  );\n\n  // Rebuild the service when the url / auth changes.\n  const result = useEsriService(createService, map, [\n    sourceId,\n    options.url,\n    options.token,\n    options.apiKey,\n  ]);\n\n  // Update service options when they change\n  useEffect(() => {\n    if (result.service && options !== optionsRef.current && map) {\n      // Add a small delay to ensure the service is fully initialized\n      const timeoutId = setTimeout(() => {\n        if (!result.service || !map) return;\n\n        // Check for specific option changes that we can handle without recreation\n        if (options.layers !== optionsRef.current.layers) {\n          const layers = options.layers || [];\n          if (Array.isArray(layers) || typeof layers === 'number') {\n            try {\n              result.service.setLayers(layers);\n            } catch (error) {\n              console.warn('useDynamicMapService: Error setting layers:', error);\n            }\n          }\n        }\n\n        if (options.layerDefs !== optionsRef.current.layerDefs) {\n          const layerDefs = options.layerDefs || {};\n          try {\n            result.service.setLayerDefs(layerDefs);\n          } catch (error) {\n            console.warn('useDynamicMapService: Error setting layer definitions:', error);\n          }\n        }\n\n        // Update the ref to track current options\n        optionsRef.current = options;\n      }, 50);\n\n      return () => clearTimeout(timeoutId);\n    }\n  }, [result.service, options, map]);\n\n  return result;\n}\n","import { useEsriService } from './useEsriService';\nimport { TiledMapService } from '@/Services/TiledMapService';\nimport type { UseTiledMapServiceOptions, UseEsriServiceResult } from '../types';\n\n/**\n * Hook for managing TiledMapService lifecycle\n */\nexport function useTiledMapService({\n  sourceId,\n  map,\n  options,\n  sourceOptions,\n}: UseTiledMapServiceOptions): UseEsriServiceResult<TiledMapService> {\n  return useEsriService(\n    mapInstance => new TiledMapService(sourceId, mapInstance, options, sourceOptions),\n    map,\n    [sourceId, options.url, options.token, options.apiKey]\n  );\n}\n","import { useEffect, useRef } from 'react';\nimport { useEsriService } from './useEsriService';\nimport { ImageService } from '@/Services/ImageService';\nimport type { UseImageServiceOptions, UseEsriServiceResult } from '../types';\n\n/**\n * Hook for managing ImageService lifecycle.\n *\n * `useEsriService` only rebuilds when the `map` changes, so this hook reacts to\n * service-defining option changes itself: a different `url`/`format` rebuilds\n * the service (and its source), while `renderingRule`/`mosaicRule` changes are\n * applied in place. (Pass a memoized `options` object.)\n */\nexport function useImageService({\n  sourceId,\n  map,\n  options,\n  sourceOptions,\n}: UseImageServiceOptions): UseEsriServiceResult<ImageService> {\n  const result = useEsriService(\n    mapInstance => new ImageService(sourceId, mapInstance, options, sourceOptions),\n    map\n  );\n\n  const { service, reload } = result;\n  const optionsRef = useRef(options);\n\n  useEffect(() => {\n    const prev = optionsRef.current;\n    if (prev === options) return;\n    optionsRef.current = options;\n\n    if (options.url !== prev.url || options.format !== prev.format) {\n      // A different service / format needs a fresh source.\n      reload();\n      return;\n    }\n\n    if (!service) return;\n    if (options.renderingRule !== prev.renderingRule) {\n      service.setRenderingRule((options.renderingRule || {}) as Record<string, unknown>);\n    }\n    if (options.mosaicRule !== prev.mosaicRule) {\n      service.setMosaicRule((options.mosaicRule || {}) as Record<string, unknown>);\n    }\n  }, [options, service, reload]);\n\n  return result;\n}\n","import { useEsriService } from './useEsriService';\nimport { VectorTileService } from '@/Services/VectorTileService';\nimport type { UseVectorTileServiceOptions, UseEsriServiceResult } from '../types';\n\n/**\n * Hook for managing VectorTileService lifecycle\n */\nexport function useVectorTileService({\n  sourceId,\n  map,\n  options,\n  sourceOptions,\n}: UseVectorTileServiceOptions): UseEsriServiceResult<VectorTileService> {\n  return useEsriService(\n    mapInstance => new VectorTileService(sourceId, mapInstance, options, sourceOptions),\n    map,\n    [sourceId, options.url, options.token, options.apiKey]\n  );\n}\n","import { useEsriService } from './useEsriService';\nimport { FeatureService } from '@/Services/FeatureService';\nimport type { UseFeatureServiceOptions, UseEsriServiceResult } from '../types';\n\n/**\n * Hook for managing FeatureService lifecycle\n */\nexport function useFeatureService({\n  sourceId,\n  map,\n  options,\n  sourceOptions,\n}: UseFeatureServiceOptions): UseEsriServiceResult<FeatureService> {\n  return useEsriService(\n    mapInstance => new FeatureService(sourceId, mapInstance, options, sourceOptions),\n    map,\n    [sourceId, options.url, options.where, options.outFields, options.token, options.apiKey]\n  );\n}\n"],"names":["useEsriService","createService","map","deps","service","setService","useState","loading","setLoading","error","setError","isCreatingService","useRef","serviceRef","createServiceRef","current","reload","useCallback","remove","err","process","env","NODE_ENV","console","warn","newService","Error","useEffect","retryTimeoutId","timeoutId","setTimeout","addSource","clearTimeout","useDynamicMapService","sourceId","options","sourceOptions","optionsRef","mapInstance","DynamicMapService","url","token","apiKey","result","layers","Array","isArray","setLayers","layerDefs","setLayerDefs","useTiledMapService","TiledMapService","useImageService","ImageService","prev","format","renderingRule","setRenderingRule","mosaicRule","setMosaicRule","useVectorTileService","VectorTileService","useFeatureService","FeatureService","where","outFields"],"mappings":"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"}

package/dist/{useFeatureService-QUqwJcet.d.ts → useFeatureService-CG70gjQy.d.ts}

@@ -1,4 +1,4 @@
-import { E as EsriServiceOptions, a as EditResult, A as ApplyEditsResult, F as FeatureServiceOptions, b as FindOptions, I as IdentifyImageOptions, c as ImageServiceOptions, V as VectorBasemapStyleOptions, d as VectorTileServiceOptions, D as DynamicMapService, T as TiledMapService, e as ImageService, f as VectorTileService, g as FeatureService } from './index-DczUYC4z.js';
+import { E as EsriServiceOptions, a as EditResult, A as ApplyEditsResult, F as FeatureServiceOptions, b as FindOptions, I as IdentifyImageOptions, c as ImageServiceOptions, P as PortalItemServiceOptions, d as PortalResolvedService, e as PortalServiceKind, V as VectorBasemapStyleOptions, f as VectorTileServiceOptions, D as DynamicMapService, T as TiledMapService, g as ImageService, h as VectorTileService, i as FeatureService } from './index-Doq93o-G.js';
 import { ReactNode } from 'react';
 import { Map } from 'maplibre-gl';
 
@@ -14,6 +14,26 @@ interface UseEsriServiceResult<T> {
     error: Error | null;
     reload: () => void;
 }
+interface UsePortalItemOptions {
+    sourceId: string;
+    map: Map | null;
+    /** ArcGIS portal item id to resolve. */
+    itemId: string;
+    options?: PortalItemServiceOptions;
+}
+interface UsePortalItemResult {
+    /** The resolved esri-gl service (source already added to the map), or null. */
+    service: PortalResolvedService | null;
+    /** Which service kind the item resolved to. */
+    kind: PortalServiceKind | null;
+    /** The service URL the item resolved to. */
+    url: string | null;
+    /** The portal item title. */
+    title: string | null;
+    loading: boolean;
+    error: Error | null;
+    reload: () => void;
+}
 interface UseDynamicMapServiceOptions extends UseEsriServiceOptions<EsriServiceOptions> {
 }
 interface UseTiledMapServiceOptions extends UseEsriServiceOptions<EsriServiceOptions> {
@@ -73,43 +93,6 @@ interface EsriLayerProps {
     layout?: Record<string, unknown>;
     beforeId?: string;
 }
-interface EsriLayerBaseProps {
-    id: string;
-    sourceId?: string;
-    beforeId?: string;
-    visible?: boolean;
-}
-interface EsriDynamicLayerProps extends EsriLayerBaseProps {
-    url: string;
-    layers?: number[] | number | false;
-    layerDefs?: Record<string, string> | false;
-    format?: string;
-    dpi?: number;
-    transparent?: boolean;
-}
-interface EsriTiledLayerProps extends EsriLayerBaseProps {
-    url: string;
-}
-interface EsriImageLayerProps extends EsriLayerBaseProps {
-    url: string;
-    renderingRule?: Record<string, unknown> | false;
-    mosaicRule?: Record<string, unknown> | false;
-    format?: string;
-}
-interface EsriVectorTileLayerProps extends EsriLayerBaseProps {
-    url: string;
-}
-interface EsriVectorBasemapLayerProps extends EsriLayerBaseProps {
-    basemapEnum: string;
-    token: string;
-}
-interface EsriFeatureLayerProps extends EsriLayerBaseProps {
-    url: string;
-    where?: string;
-    outFields?: string | string[];
-    paint?: Record<string, unknown>;
-    layout?: Record<string, unknown>;
-}
 
 /**
  * Hook for managing DynamicMapService lifecycle
@@ -122,7 +105,12 @@ declare function useDynamicMapService({ sourceId, map, options, sourceOptions, }
 declare function useTiledMapService({ sourceId, map, options, sourceOptions, }: UseTiledMapServiceOptions): UseEsriServiceResult<TiledMapService>;
 
 /**
- * Hook for managing ImageService lifecycle
+ * Hook for managing ImageService lifecycle.
+ *
+ * `useEsriService` only rebuilds when the `map` changes, so this hook reacts to
+ * service-defining option changes itself: a different `url`/`format` rebuilds
+ * the service (and its source), while `renderingRule`/`mosaicRule` changes are
+ * applied in place. (Pass a memoized `options` object.)
  */
 declare function useImageService({ sourceId, map, options, sourceOptions, }: UseImageServiceOptions): UseEsriServiceResult<ImageService>;
 
@@ -136,5 +124,5 @@ declare function useVectorTileService({ sourceId, map, options, sourceOptions, }
  */
 declare function useFeatureService({ sourceId, map, options, sourceOptions, }: UseFeatureServiceOptions): UseEsriServiceResult<FeatureService>;
 
-export { useDynamicMapService as u, useFeatureService as v, useImageService as w, useTiledMapService as x, useVectorTileService as y };
-export type { EsriServiceProviderProps as E, UseEsriServiceResult as U, UseVectorBasemapStyleOptions as a, UseIdentifyFeaturesOptions as b, UseIdentifyImageOptions as c, UseQueryOptions as d, UseFindOptions as e, EsriLayerProps as f, EsriDynamicLayerProps as g, EsriFeatureLayerProps as h, EsriImageLayerProps as i, EsriLayerBaseProps as j, EsriTiledLayerProps as k, EsriVectorBasemapLayerProps as l, EsriVectorTileLayerProps as m, UseDynamicMapServiceOptions as n, UseEsriServiceOptions as o, UseFeatureEditingResult as p, UseFeatureServiceOptions as q, UseImageServiceOptions as r, UseTiledMapServiceOptions as s, UseVectorTileServiceOptions as t };
+export { useFeatureService as p, useImageService as q, useTiledMapService as r, useVectorTileService as s, useDynamicMapService as u };
+export type { EsriServiceProviderProps as E, UseEsriServiceResult as U, UseVectorBasemapStyleOptions as a, UseIdentifyFeaturesOptions as b, UseIdentifyImageOptions as c, UseQueryOptions as d, UseFindOptions as e, UseFeatureEditingResult as f, UsePortalItemOptions as g, UsePortalItemResult as h, EsriLayerProps as i, UseDynamicMapServiceOptions as j, UseEsriServiceOptions as k, UseFeatureServiceOptions as l, UseImageServiceOptions as m, UseTiledMapServiceOptions as n, UseVectorTileServiceOptions as o };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esri-gl",
-  "version": "1.0.6",
+  "version": "2.0.0",
   "type": "module",
   "description": "A module for making it easier to use Esri services in mapbox-gl or maplibre-gl.",
   "main": "dist/index.js",
@@ -38,8 +38,8 @@
     "dev:docs": "cd docs && npm start",
     "serve:docs": "cd docs && npm run serve",
     "clean": "rimraf dist",
-    "type-check": "tsc --noEmit",
-    "type-check:watch": "tsc --noEmit --watch",
+    "type-check": "tsc -p tsconfig.app.json --noEmit && tsc -p tsconfig.test.json --noEmit && tsc -p tsconfig.node.json --noEmit",
+    "type-check:watch": "tsc -p tsconfig.app.json --noEmit --watch",
     "lint": "eslint 'src/**/*.{ts,tsx,js,jsx}'",
     "lint:fix": "eslint 'src/**/*.{ts,tsx,js,jsx}' --fix",
     "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,css,md}\"",
@@ -48,6 +48,7 @@
     "test:watch": "jest --watch",
     "test:coverage": "jest --coverage",
     "test:ci": "jest --ci --coverage --watchAll=false",
+    "test:portal": "node scripts/portal-live-test.mjs",
     "validate": "npm run type-check && npm run lint && npm run format:check && npm run test:ci",
     "publish:redirects": "./scripts/publish-redirects.sh",
     "publish:mapbox-redirect": "cd packages/esri-mapbox-gl && npm publish --access=public",
@@ -86,10 +87,8 @@
     "@rollup/plugin-babel": "^6.1.0",
     "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-node-resolve": "^16.0.3",
-    "@rollup/plugin-terser": "^1.0.0",
     "@rollup/plugin-typescript": "^12.3.0",
     "@testing-library/dom": "^10.4.1",
-    "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
     "@types/jest": "^30.0.0",
     "@types/react": "^19.2.9",
@@ -157,6 +156,10 @@
     }
   },
   "dependencies": {
+    "@esri/arcgis-rest-basemap-sessions": "^4.10.2",
+    "@esri/arcgis-rest-feature-service": "^4.10.2",
+    "@esri/arcgis-rest-portal": "^4.10.2",
+    "@esri/arcgis-rest-request": "^4.10.2",
     "@mapbox/tilebelt": "^2.0.3",
     "arcgis-pbf-parser": "^0.0.4"
   }