@conterra/ct-mapapps-typings 4.20.0-next.20250707091215 → 4.20.0-next.20250722040037

package/map-widget/MapWidgetFactory.d.ts

@@ -1,18 +1,21 @@
-import Map from 'esri/Map';
-import { MapWidgetModel } from './__internal__/DTPbI1Aa.js';
+import Map from '@arcgis/core/Map';
+import { MapWidgetModel } from './__internal__/CDrIcYrK.js';
 import { MapWidget } from './api/MapWidget.js';
 import { MapWidgetFactory as MapWidgetFactory$1 } from './api/MapWidgetFactory.js';
 import 'apprt-core/Mutable';
-import 'esri/geometry';
-import 'esri/layers/support/LOD';
-import 'esri/Camera';
-import 'esri/time/TimeExtent';
-import 'esri/Viewpoint';
-import 'esri/views/MapView';
-import 'esri/views/SceneView';
+import '@arcgis/core/geometry/Extent';
+import '@arcgis/core/geometry/Polygon';
+import '@arcgis/core/layers/support/LOD';
+import '@arcgis/core/Camera';
+import '@arcgis/core/geometry/Point';
+import '@arcgis/core/geometry/SpatialReference';
+import '@arcgis/core/time/TimeExtent';
+import '@arcgis/core/Viewpoint';
+import '@arcgis/core/views/MapView';
+import '@arcgis/core/views/SceneView';
 import './api/Navigation.js';
-import 'esri/layers/support/Sublayer';
-import 'esri/layers/Layer';
+import '@arcgis/core/layers/support/Sublayer';
+import '@arcgis/core/layers/Layer';
 
 /**
  * Use the `map-widget.MapWidgetFactory` service and not this class.

package/map-widget/MapWidgetModel.d.ts

@@ -1,16 +1,19 @@
-import { MapWidgetModelMembers, MapWidgetModel as MapWidgetModel$1 } from './__internal__/DTPbI1Aa.js';
+import { MapWidgetModelMembers, MapWidgetModel as MapWidgetModel$1 } from './__internal__/CDrIcYrK.js';
 import 'apprt-core/Mutable';
-import 'esri/geometry';
-import 'esri/layers/support/LOD';
-import 'esri/Camera';
-import 'esri/Map';
-import 'esri/time/TimeExtent';
-import 'esri/Viewpoint';
-import 'esri/views/MapView';
-import 'esri/views/SceneView';
+import '@arcgis/core/geometry/Extent';
+import '@arcgis/core/geometry/Polygon';
+import '@arcgis/core/layers/support/LOD';
+import '@arcgis/core/Camera';
+import '@arcgis/core/Map';
+import '@arcgis/core/geometry/Point';
+import '@arcgis/core/geometry/SpatialReference';
+import '@arcgis/core/time/TimeExtent';
+import '@arcgis/core/Viewpoint';
+import '@arcgis/core/views/MapView';
+import '@arcgis/core/views/SceneView';
 import './api/Navigation.js';
-import 'esri/layers/support/Sublayer';
-import 'esri/layers/Layer';
+import '@arcgis/core/layers/support/Sublayer';
+import '@arcgis/core/layers/Layer';
 
 declare const MapWidgetModel: {
     new (args: Partial<MapWidgetModelMembers>): MapWidgetModel;

package/map-widget/Navigation.d.ts

@@ -1,10 +1,17 @@
 import * as apprt_core_Mutable from 'apprt-core/Mutable';
-import { Navigation as Navigation$1 } from './api/Navigation.js';
+import { Navigation as Navigation$1, NavigationActionMap as NavigationActionMap$1 } from './api/Navigation.js';
 
 declare const Navigation: apprt_core_Mutable.MutableConstructor<{
+    actionMap: NonNullable<apprt_core_Mutable.Mutable<{
+        mouseWheel: NonNullable<"zoom" | "none">;
+    }>>;
     mouseWheelZoomEnabled: boolean;
     browserTouchPanEnabled: boolean;
 }>;
 type Navigation = Navigation$1;
+declare const NavigationActionMap: apprt_core_Mutable.MutableConstructor<{
+    mouseWheel: NonNullable<"zoom" | "none">;
+}>;
+type NavigationActionMap = NavigationActionMap$1;
 
-export { Navigation, Navigation as default };
+export { Navigation, NavigationActionMap, Navigation as default };

package/map-widget/ViewReadyWatcher.d.ts

@@ -1,16 +1,19 @@
-import { MapWidgetModel } from './__internal__/DTPbI1Aa.js';
+import { MapWidgetModel } from './__internal__/CDrIcYrK.js';
 import 'apprt-core/Mutable';
-import 'esri/geometry';
-import 'esri/layers/support/LOD';
-import 'esri/Camera';
-import 'esri/Map';
-import 'esri/time/TimeExtent';
-import 'esri/Viewpoint';
-import 'esri/views/MapView';
-import 'esri/views/SceneView';
+import '@arcgis/core/geometry/Extent';
+import '@arcgis/core/geometry/Polygon';
+import '@arcgis/core/layers/support/LOD';
+import '@arcgis/core/Camera';
+import '@arcgis/core/Map';
+import '@arcgis/core/geometry/Point';
+import '@arcgis/core/geometry/SpatialReference';
+import '@arcgis/core/time/TimeExtent';
+import '@arcgis/core/Viewpoint';
+import '@arcgis/core/views/MapView';
+import '@arcgis/core/views/SceneView';
 import './api/Navigation.js';
-import 'esri/layers/support/Sublayer';
-import 'esri/layers/Layer';
+import '@arcgis/core/layers/support/Sublayer';
+import '@arcgis/core/layers/Layer';
 
 type ViewReadyCallback = (event: {
     mapWidgetModel: MapWidgetModel;

package/map-widget/__internal__/{DTPbI1Aa.d.ts → CDrIcYrK.d.ts}

@@ -1,15 +1,18 @@
 import { Mutable } from 'apprt-core/Mutable';
-import { Extent, Point, SpatialReference, Polygon } from 'esri/geometry';
-import LOD from 'esri/layers/support/LOD';
-import Camera from 'esri/Camera';
-import Map from 'esri/Map';
-import TimeExtent from 'esri/time/TimeExtent';
-import Viewpoint from 'esri/Viewpoint';
-import MapView from 'esri/views/MapView';
-import SceneView from 'esri/views/SceneView';
+import Extent from '@arcgis/core/geometry/Extent';
+import Polygon from '@arcgis/core/geometry/Polygon';
+import LOD from '@arcgis/core/layers/support/LOD';
+import Camera from '@arcgis/core/Camera';
+import Map from '@arcgis/core/Map';
+import Point from '@arcgis/core/geometry/Point';
+import SpatialReference from '@arcgis/core/geometry/SpatialReference';
+import TimeExtent from '@arcgis/core/time/TimeExtent';
+import Viewpoint from '@arcgis/core/Viewpoint';
+import MapView from '@arcgis/core/views/MapView';
+import SceneView from '@arcgis/core/views/SceneView';
 import { Navigation, NavigationMembers } from '../api/Navigation.js';
-import Sublayer from 'esri/layers/support/Sublayer';
-import Layer from 'esri/layers/Layer';
+import Sublayer from '@arcgis/core/layers/support/Sublayer';
+import Layer from '@arcgis/core/layers/Layer';
 
 type ViewPadding = __esri.ViewPadding;
 /** The view mode indicates whether a 2D or a 3D view is active. */

package/map-widget/api/Constraints.d.ts

@@ -1,13 +1,16 @@
 import 'apprt-core/Mutable';
-import 'esri/geometry';
-import 'esri/layers/support/LOD';
-export { Constraints, ConstraintsMembers } from '../__internal__/DTPbI1Aa.js';
-import 'esri/Camera';
-import 'esri/Map';
-import 'esri/time/TimeExtent';
-import 'esri/Viewpoint';
-import 'esri/views/MapView';
-import 'esri/views/SceneView';
+import '@arcgis/core/geometry/Extent';
+import '@arcgis/core/geometry/Polygon';
+import '@arcgis/core/layers/support/LOD';
+export { Constraints, ConstraintsMembers } from '../__internal__/CDrIcYrK.js';
+import '@arcgis/core/Camera';
+import '@arcgis/core/Map';
+import '@arcgis/core/geometry/Point';
+import '@arcgis/core/geometry/SpatialReference';
+import '@arcgis/core/time/TimeExtent';
+import '@arcgis/core/Viewpoint';
+import '@arcgis/core/views/MapView';
+import '@arcgis/core/views/SceneView';
 import './Navigation.js';
-import 'esri/layers/support/Sublayer';
-import 'esri/layers/Layer';
+import '@arcgis/core/layers/support/Sublayer';
+import '@arcgis/core/layers/Layer';

package/map-widget/api/MapWidget.d.ts

@@ -1,16 +1,19 @@
-import { MapWidgetModel } from '../__internal__/DTPbI1Aa.js';
+import { MapWidgetModel } from '../__internal__/CDrIcYrK.js';
 import 'apprt-core/Mutable';
-import 'esri/geometry';
-import 'esri/layers/support/LOD';
-import 'esri/Camera';
-import 'esri/Map';
-import 'esri/time/TimeExtent';
-import 'esri/Viewpoint';
-import 'esri/views/MapView';
-import 'esri/views/SceneView';
+import '@arcgis/core/geometry/Extent';
+import '@arcgis/core/geometry/Polygon';
+import '@arcgis/core/layers/support/LOD';
+import '@arcgis/core/Camera';
+import '@arcgis/core/Map';
+import '@arcgis/core/geometry/Point';
+import '@arcgis/core/geometry/SpatialReference';
+import '@arcgis/core/time/TimeExtent';
+import '@arcgis/core/Viewpoint';
+import '@arcgis/core/views/MapView';
+import '@arcgis/core/views/SceneView';
 import './Navigation.js';
-import 'esri/layers/support/Sublayer';
-import 'esri/layers/Layer';
+import '@arcgis/core/layers/support/Sublayer';
+import '@arcgis/core/layers/Layer';
 
 /**
  * The MapWidget shows a map. It is using the MapWidgetModel for state management.

package/map-widget/api/MapWidgetFactory.d.ts

@@ -1,17 +1,20 @@
-import Map from 'esri/Map';
+import Map from '@arcgis/core/Map';
 import { MapWidget } from './MapWidget.js';
-import { MapWidgetModelMembers, MapWidgetModel } from '../__internal__/DTPbI1Aa.js';
+import { MapWidgetModelMembers, MapWidgetModel } from '../__internal__/CDrIcYrK.js';
 import 'apprt-core/Mutable';
-import 'esri/geometry';
-import 'esri/layers/support/LOD';
-import 'esri/Camera';
-import 'esri/time/TimeExtent';
-import 'esri/Viewpoint';
-import 'esri/views/MapView';
-import 'esri/views/SceneView';
+import '@arcgis/core/geometry/Extent';
+import '@arcgis/core/geometry/Polygon';
+import '@arcgis/core/layers/support/LOD';
+import '@arcgis/core/Camera';
+import '@arcgis/core/geometry/Point';
+import '@arcgis/core/geometry/SpatialReference';
+import '@arcgis/core/time/TimeExtent';
+import '@arcgis/core/Viewpoint';
+import '@arcgis/core/views/MapView';
+import '@arcgis/core/views/SceneView';
 import './Navigation.js';
-import 'esri/layers/support/Sublayer';
-import 'esri/layers/Layer';
+import '@arcgis/core/layers/support/Sublayer';
+import '@arcgis/core/layers/Layer';
 
 /**
  * Use the `map-widget.MapWidgetFactory` service to inject an instance of this interface.
@@ -20,9 +23,9 @@ import 'esri/layers/Layer';
  */
 interface MapWidgetFactory {
     /**
-     * Creates a esri/Map instance.
+     * Creates a @arcgis/core/Map instance.
      *
-     * @param options options of the esri/Map constructor.
+     * @param options options of the @arcgis/core/Map constructor.
      * @returns the new map instance.
      * @see [Map](https://developers.arcgis.com/javascript/latest/api-reference/esri-Map.html)
      */
@@ -30,7 +33,7 @@ interface MapWidgetFactory {
     /**
      * Creates a MapWidgetModel instance.
      *
-     * Note: in options the `map` parameter is required and needs to be a `esri/Map` instance.
+     * Note: in options the `map` parameter is required and needs to be a `@arcgis/core/Map` instance.
      *
      * @param options options of the MapWidgetModel constructor.
      * @returns the MapWidgetModel instance.

package/map-widget/api/MapWidgetModel.d.ts

@@ -1,13 +1,16 @@
 import 'apprt-core/Mutable';
-import 'esri/Camera';
-import 'esri/Map';
-import 'esri/geometry';
-import 'esri/time/TimeExtent';
-import 'esri/Viewpoint';
-import 'esri/views/MapView';
-import 'esri/views/SceneView';
-export { LayerLookupResult, MapWidgetModel, MapWidgetModelMembers, SceneViewEnvironment, View, ViewMode, ViewPadding, ViewingMode } from '../__internal__/DTPbI1Aa.js';
+import '@arcgis/core/Camera';
+import '@arcgis/core/Map';
+import '@arcgis/core/geometry/Extent';
+import '@arcgis/core/geometry/Point';
+import '@arcgis/core/geometry/SpatialReference';
+import '@arcgis/core/time/TimeExtent';
+import '@arcgis/core/Viewpoint';
+import '@arcgis/core/views/MapView';
+import '@arcgis/core/views/SceneView';
+export { LayerLookupResult, MapWidgetModel, MapWidgetModelMembers, SceneViewEnvironment, View, ViewMode, ViewPadding, ViewingMode } from '../__internal__/CDrIcYrK.js';
 import './Navigation.js';
-import 'esri/layers/support/Sublayer';
-import 'esri/layers/Layer';
-import 'esri/layers/support/LOD';
+import '@arcgis/core/layers/support/Sublayer';
+import '@arcgis/core/layers/Layer';
+import '@arcgis/core/geometry/Polygon';
+import '@arcgis/core/layers/support/LOD';

package/map-widget/api/MapWidgetRegistration.d.ts

@@ -1,17 +1,20 @@
-import Map from 'esri/Map';
+import Map from '@arcgis/core/Map';
 import { MapWidget } from './MapWidget.js';
-import { MapWidgetModel } from '../__internal__/DTPbI1Aa.js';
+import { MapWidgetModel } from '../__internal__/CDrIcYrK.js';
 import 'apprt-core/Mutable';
-import 'esri/geometry';
-import 'esri/layers/support/LOD';
-import 'esri/Camera';
-import 'esri/time/TimeExtent';
-import 'esri/Viewpoint';
-import 'esri/views/MapView';
-import 'esri/views/SceneView';
+import '@arcgis/core/geometry/Extent';
+import '@arcgis/core/geometry/Polygon';
+import '@arcgis/core/layers/support/LOD';
+import '@arcgis/core/Camera';
+import '@arcgis/core/geometry/Point';
+import '@arcgis/core/geometry/SpatialReference';
+import '@arcgis/core/time/TimeExtent';
+import '@arcgis/core/Viewpoint';
+import '@arcgis/core/views/MapView';
+import '@arcgis/core/views/SceneView';
 import './Navigation.js';
-import 'esri/layers/support/Sublayer';
-import 'esri/layers/Layer';
+import '@arcgis/core/layers/support/Sublayer';
+import '@arcgis/core/layers/Layer';
 
 /**
  * Registers map-related components as OSGi services.
@@ -28,7 +31,7 @@ interface MapWidgetRegistration {
      * * map-widget.MapWidgetModel
      *     * the map widget model provided to interact with the main map
      * * map-widget.Map
-     *     * the esri/Map part of the MapWidgetModel, provided if only the layer tree should change
+     *     * the @arcgis/core/Map part of the MapWidgetModel, provided if only the layer tree should change
      * * map-widget.MapWidget
      *     * the map widget, do not use it directly
      *

package/map-widget/api/Navigation.d.ts

@@ -1,11 +1,24 @@
 import { Mutable } from 'apprt-core/Mutable';
 
+/** Documentation for the members of {@link NavigationActionMap}. */
+interface NavigationActionMapMembers {
+    /**
+     * Indicates whether the view zooms when the user scrolls the mouse wheel.
+     */
+    mouseWheel: "zoom" | "none";
+}
+type NavigationActionMap = Mutable<NavigationActionMapMembers>;
 /** Documentation for the members of {@link Navigation}. */
 interface NavigationMembers {
     /**
      * Indicates whether the view zooms when the user scrolls the mouse wheel.
+     * @deprecated Use actionMap.mouseWheel instead.
+     */
+    mouseWheelZoomEnabled?: boolean;
+    /**
+     * Defines the navigation controls behavior.
      */
-    mouseWheelZoomEnabled: boolean;
+    actionMap: NavigationActionMap;
     /**
      * Indicates whether the view pans when the user touches the screen.
      */
@@ -17,4 +30,4 @@ interface NavigationMembers {
  */
 type Navigation = Mutable<NavigationMembers>;
 
-export type { Navigation, NavigationMembers };
+export type { Navigation, NavigationActionMap, NavigationActionMapMembers, NavigationMembers };

package/map-widget/api/SrsChangeService.d.ts

@@ -1,17 +1,20 @@
-import { SpatialReference } from 'esri/geometry';
+import SpatialReference from '@arcgis/core/geometry/SpatialReference';
 import { MapWidget } from './MapWidget.js';
-import '../__internal__/DTPbI1Aa.js';
+import '../__internal__/CDrIcYrK.js';
 import 'apprt-core/Mutable';
-import 'esri/layers/support/LOD';
-import 'esri/Camera';
-import 'esri/Map';
-import 'esri/time/TimeExtent';
-import 'esri/Viewpoint';
-import 'esri/views/MapView';
-import 'esri/views/SceneView';
+import '@arcgis/core/geometry/Extent';
+import '@arcgis/core/geometry/Polygon';
+import '@arcgis/core/layers/support/LOD';
+import '@arcgis/core/Camera';
+import '@arcgis/core/Map';
+import '@arcgis/core/geometry/Point';
+import '@arcgis/core/time/TimeExtent';
+import '@arcgis/core/Viewpoint';
+import '@arcgis/core/views/MapView';
+import '@arcgis/core/views/SceneView';
 import './Navigation.js';
-import 'esri/layers/support/Sublayer';
-import 'esri/layers/Layer';
+import '@arcgis/core/layers/support/Sublayer';
+import '@arcgis/core/layers/Layer';
 
 /**
  * The SrsChangeService provides methods for successful switching of SRS on a MapWidget.

package/map-widget/api/index.d.ts

@@ -1,17 +1,20 @@
-export { Constraints, ConstraintsMembers, LayerLookupResult, MapWidgetModel, MapWidgetModelMembers, SceneViewEnvironment, View, ViewMode, ViewPadding, ViewingMode } from '../__internal__/DTPbI1Aa.js';
-export { Navigation, NavigationMembers } from './Navigation.js';
+export { Constraints, ConstraintsMembers, LayerLookupResult, MapWidgetModel, MapWidgetModelMembers, SceneViewEnvironment, View, ViewMode, ViewPadding, ViewingMode } from '../__internal__/CDrIcYrK.js';
+export { Navigation, NavigationActionMap, NavigationActionMapMembers, NavigationMembers } from './Navigation.js';
 export { MapWidget } from './MapWidget.js';
 export { MapWidgetFactory } from './MapWidgetFactory.js';
 export { MapWidgetRegistration } from './MapWidgetRegistration.js';
 export { SrsChangeService } from './SrsChangeService.js';
 import 'apprt-core/Mutable';
-import 'esri/geometry';
-import 'esri/layers/support/LOD';
-import 'esri/Camera';
-import 'esri/Map';
-import 'esri/time/TimeExtent';
-import 'esri/Viewpoint';
-import 'esri/views/MapView';
-import 'esri/views/SceneView';
-import 'esri/layers/support/Sublayer';
-import 'esri/layers/Layer';
+import '@arcgis/core/geometry/Extent';
+import '@arcgis/core/geometry/Polygon';
+import '@arcgis/core/layers/support/LOD';
+import '@arcgis/core/Camera';
+import '@arcgis/core/Map';
+import '@arcgis/core/geometry/Point';
+import '@arcgis/core/geometry/SpatialReference';
+import '@arcgis/core/time/TimeExtent';
+import '@arcgis/core/Viewpoint';
+import '@arcgis/core/views/MapView';
+import '@arcgis/core/views/SceneView';
+import '@arcgis/core/layers/support/Sublayer';
+import '@arcgis/core/layers/Layer';

package/mapdraw-api/api.d.ts

@@ -1,7 +1,7 @@
 import { Mutable } from 'apprt-core/Mutable';
-import Graphic from 'esri/Graphic';
-import { Symbol } from 'esri/symbols';
+import Graphic from '@arcgis/core/Graphic';
 import { View } from 'map-widget/api';
+import { SymbolUnion } from '@arcgis/core/unionTypes';
 
 /**
  * Draws a graphic on the map.
@@ -105,7 +105,7 @@ interface DrawingOptions {
  * Lookup table for symbols.
  */
 type SymbolLookup = {
-    [D in DrawingMode]?: __esri.SymbolProperties | Symbol;
+    [D in DrawingMode]?: __esri.SymbolProperties | SymbolUnion;
 };
 /**
  * The type of graphic being drawn.

package/maptips/api.d.ts

@@ -1,5 +1,5 @@
-import MapView from 'esri/views/MapView';
-import SceneView from 'esri/views/SceneView';
+import MapView from '@arcgis/core/views/MapView';
+import SceneView from '@arcgis/core/views/SceneView';
 
 /**
  * Constructs maptip viewer instances.

package/measurement-2d/api.d.ts

@@ -1,6 +1,7 @@
 import { Watchable } from 'apprt-core/Types';
-import { Polyline, Polygon } from 'esri/geometry';
-import { SystemOrAreaUnit, SystemOrLengthUnit } from 'esri/core/units';
+import Polyline from '@arcgis/core/geometry/Polyline';
+import Polygon from '@arcgis/core/geometry/Polygon';
+import { SystemOrAreaUnit, SystemOrLengthUnit } from '@arcgis/core/core/units';
 
 /**
  * Measurement mode.

package/measurement-3d/api.d.ts

@@ -1,5 +1,5 @@
 import { Watchable } from 'apprt-core/Types';
-import { SystemOrAreaUnit, SystemOrLengthUnit } from 'esri/core/units';
+import { SystemOrAreaUnit, SystemOrLengthUnit } from '@arcgis/core/core/units';
 
 /**
  * Measurement mode.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@conterra/ct-mapapps-typings",
-"version": "4.20.0-next.20250707091215",
+"version": "4.20.0-next.20250722040037",
     "description": "TypeDefinitions for ct-mapapps",
     "author": "conterra",
     "license": "Apache-2.0"

package/popups/Action.d.ts

@@ -1,11 +1,11 @@
 import { BaseActionConstructor } from './BaseAction.js';
-import 'esri/support/actions/ActionButton';
-import 'esri/support/actions/ActionToggle';
+import '@arcgis/core/support/actions/ActionButton';
+import '@arcgis/core/support/actions/ActionToggle';
 import './api.js';
-import 'esri/geometry';
-import 'esri/Graphic';
-import 'esri/layers/Layer';
-import 'esri/layers/support/Sublayer';
+import '@arcgis/core/geometry/Point';
+import '@arcgis/core/Graphic';
+import '@arcgis/core/layers/Layer';
+import '@arcgis/core/layers/support/Sublayer';
 import 'map-widget/api';
 import 'store-api/api';
 
@@ -14,7 +14,7 @@ declare const Action_base: BaseActionConstructor<"button">;
  * This is the default Action class.
  * It equals `popups/BaseAction("button")`.
  *
- * @see [esri/support/actions/ActionButton](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionButton.html)
+ * @see [@arcgis/core/support/actions/ActionButton](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionButton.html)
  */
 declare class Action extends Action_base {
 }

package/popups/BaseAction.d.ts

@@ -1,10 +1,10 @@
-import ActionButton from 'esri/support/actions/ActionButton';
-import ActionToggle from 'esri/support/actions/ActionToggle';
+import ActionButton from '@arcgis/core/support/actions/ActionButton';
+import ActionToggle from '@arcgis/core/support/actions/ActionToggle';
 import { Action } from './api.js';
-import 'esri/geometry';
-import 'esri/Graphic';
-import 'esri/layers/Layer';
-import 'esri/layers/support/Sublayer';
+import '@arcgis/core/geometry/Point';
+import '@arcgis/core/Graphic';
+import '@arcgis/core/layers/Layer';
+import '@arcgis/core/layers/support/Sublayer';
 import 'map-widget/api';
 import 'store-api/api';
 
@@ -26,8 +26,8 @@ type EsriActionProps<Type extends EsriActionType> = EsriActions[Type][1];
  */
 type EsriActionType = "button" | "toggle";
 /**
- * Either [esri/support/actions/ActionButton](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionButton.html)
- * or [esri/support/actions/ActionButton](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.html)
+ * Either [@arcgis/core/support/actions/ActionButton](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionButton.html)
+ * or [@arcgis/core/support/actions/ActionButton](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.html)
  */
 type EsriAction = ActionButton | ActionToggle;
 /**

package/popups/ContentUpdateProxy.d.ts

@@ -1,4 +1,4 @@
-import Graphic from 'esri/Graphic';
+import Graphic from '@arcgis/core/Graphic';
 
 /**
  * Proxy to handle content updates
@@ -24,8 +24,8 @@ interface WidgetProxy {
  * @example
  * ```ts
  * import VueDijit from "apprt-vue/VueDijit";
- * import Graphic from "esri/Graphic";
- * import Layer from "esri/layers/Layer";
+ * import Graphic from "@arcgis/core/Graphic";
+ * import Layer from "@arcgis/core/layers/Layer";
  * import { PopupDefinition, PopupTemplateDefinition } from "popups/api";
  * import ContentUpdateProxy, { WidgetProxy } from "popups/ContentUpdateProxy";
  * import { Store } from "store-api/api";

package/popups/api.d.ts

@@ -1,7 +1,7 @@
-import { Point } from 'esri/geometry';
-import Graphic from 'esri/Graphic';
-import Layer from 'esri/layers/Layer';
-import Sublayer from 'esri/layers/support/Sublayer';
+import Point from '@arcgis/core/geometry/Point';
+import Graphic from '@arcgis/core/Graphic';
+import Layer from '@arcgis/core/layers/Layer';
+import Sublayer from '@arcgis/core/layers/support/Sublayer';
 import { MapWidgetModel } from 'map-widget/api';
 import { Store } from 'store-api/api';
 
@@ -186,7 +186,7 @@ interface ActionMethods {
 /**
  * Actions which can be executed in Popups.
  *
- * @see [esri/support/actions/ActionBase](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionBase.html)
+ * @see [@arcgis/core/support/actions/ActionBase](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionBase.html)
  */
 type Action = __esri.ActionButtonProperties & __esri.ActionToggleProperties & Required<Pick<__esri.ActionBaseProperties, "id" | "title">> & ActionMethods;
 /**

package/portal-security/api.d.ts

@@ -1,5 +1,5 @@
 import { EventSource } from 'apprt-core/Events';
-import Credential from 'esri/identity/Credential';
+import Credential from '@arcgis/core/identity/Credential';
 
 /**
  * Events emitted from PortalLoginService.

package/result-api/__internal__/{DHLZxzhJ.d.ts → CBP8V1_F.d.ts}

@@ -1,5 +1,6 @@
 import { EventSource, Watchable, DeepReadonly } from 'apprt-core/Types';
-import { SpatialReference, Geometry } from 'esri/geometry';
+import { Geometry } from '@arcgis/core/geometry';
+import SpatialReference from '@arcgis/core/geometry/SpatialReference';
 import { AllowedIdTypes, Store, FieldData } from 'store-api/api';
 
 type FORMATTER_ID_IDENTIFIER = "object-id";

package/result-api/api/actions.d.ts

@@ -1,7 +1,8 @@
-import { DataTableCollection, DataTable, TableItem } from '../__internal__/DHLZxzhJ.js';
+import { DataTableCollection, DataTable, TableItem } from '../__internal__/CBP8V1_F.js';
 import { EventSource } from 'apprt-core/Events';
 import 'apprt-core/Types';
-import 'esri/geometry';
+import '@arcgis/core/geometry';
+import '@arcgis/core/geometry/SpatialReference';
 import 'store-api/api';
 
 /**