From 0aa91a35c7120d64098d1f167ee773ec46d84e0c Mon Sep 17 00:00:00 2001 From: JC Franco Date: Tue, 13 May 2025 01:01:02 -0700 Subject: [PATCH] chore(deps): use updated lumina controllers package --- package-lock.json | 11 ----------- packages/calcite-components/package.json | 1 - .../src/components/autocomplete/autocomplete.tsx | 2 +- .../src/components/button/button.tsx | 2 +- .../src/components/input-number/input-number.tsx | 2 +- .../src/components/input-text/input-text.tsx | 2 +- .../calcite-components/src/components/input/input.tsx | 2 +- .../calcite-components/src/components/menu/menu.tsx | 2 +- .../src/components/text-area/text-area.tsx | 2 +- .../calcite-components/src/controllers/time/time.ts | 2 +- .../src/controllers/useFocusTrap.ts | 2 +- .../src/controllers/usePreventDocumentScroll.ts | 2 +- packages/calcite-components/src/controllers/useT9n.ts | 2 +- support/createThirdPartyLicenses.ts | 2 +- 14 files changed, 12 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index c48e082cb29..1efcb8b9a8f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -334,16 +334,6 @@ "node": ">= 10.x" } }, - "node_modules/@arcgis/components-controllers": { - "version": "4.33.0-next.117", - "resolved": "https://registry.npmjs.org/@arcgis/components-controllers/-/components-controllers-4.33.0-next.117.tgz", - "integrity": "sha512-NNV1foISrM+A8GtFc74qXAnomokIkoX20OFWbdOH3Klb6T2v7oue0leKRbUbHyUCJMhsAWXa0vylohp1leaALg==", - "license": "SEE LICENSE IN LICENSE.md", - "dependencies": { - "@arcgis/lumina": "4.33.0-next.117", - "tslib": "^2.7.0" - } - }, "node_modules/@arcgis/components-utils": { "version": "4.33.0-next.117", "resolved": "https://registry.npmjs.org/@arcgis/components-utils/-/components-utils-4.33.0-next.117.tgz", @@ -36056,7 +36046,6 @@ "version": "3.2.0-next.59", "license": "SEE LICENSE.md", "dependencies": { - "@arcgis/components-controllers": "^4.33.0-next.110", "@arcgis/components-utils": "^4.33.0-next.110", "@arcgis/lumina": "^4.33.0-next.110", "@esri/calcite-ui-icons": "4.2.0-next.4", diff --git a/packages/calcite-components/package.json b/packages/calcite-components/package.json index 9ebc352e8f1..8accc92b66a 100644 --- a/packages/calcite-components/package.json +++ b/packages/calcite-components/package.json @@ -75,7 +75,6 @@ "util:update-3rd-party-licenses": "tsx ../../support/createThirdPartyLicenses.ts" }, "dependencies": { - "@arcgis/components-controllers": "^4.33.0-next.110", "@arcgis/components-utils": "^4.33.0-next.110", "@arcgis/lumina": "^4.33.0-next.110", "@esri/calcite-ui-icons": "4.2.0-next.4", diff --git a/packages/calcite-components/src/components/autocomplete/autocomplete.tsx b/packages/calcite-components/src/components/autocomplete/autocomplete.tsx index 329bc99bdb5..b0889488c4e 100644 --- a/packages/calcite-components/src/components/autocomplete/autocomplete.tsx +++ b/packages/calcite-components/src/components/autocomplete/autocomplete.tsx @@ -11,7 +11,7 @@ import { stringOrBoolean, LuminaJsx, } from "@arcgis/lumina"; -import { useWatchAttributes } from "@arcgis/components-controllers"; +import { useWatchAttributes } from "@arcgis/lumina/controllers"; import { debounce, escapeRegExp } from "lodash-es"; import { FlipPlacement, diff --git a/packages/calcite-components/src/components/button/button.tsx b/packages/calcite-components/src/components/button/button.tsx index 7524acc776a..96a98a50cac 100644 --- a/packages/calcite-components/src/components/button/button.tsx +++ b/packages/calcite-components/src/components/button/button.tsx @@ -12,7 +12,7 @@ import { LuminaJsx, stringOrBoolean, } from "@arcgis/lumina"; -import { useWatchAttributes } from "@arcgis/components-controllers"; +import { useWatchAttributes } from "@arcgis/lumina/controllers"; import { findAssociatedForm, FormOwner, resetForm, submitForm } from "../../utils/form"; import { InteractiveComponent, diff --git a/packages/calcite-components/src/components/input-number/input-number.tsx b/packages/calcite-components/src/components/input-number/input-number.tsx index 17e9c2d5714..762be01027d 100644 --- a/packages/calcite-components/src/components/input-number/input-number.tsx +++ b/packages/calcite-components/src/components/input-number/input-number.tsx @@ -12,7 +12,7 @@ import { LuminaJsx, stringOrBoolean, } from "@arcgis/lumina"; -import { useWatchAttributes } from "@arcgis/components-controllers"; +import { useWatchAttributes } from "@arcgis/lumina/controllers"; import { getElementDir, isPrimaryPointerButton, setRequestedIcon } from "../../utils/dom"; import { Alignment, Scale, Status } from "../interfaces"; import { diff --git a/packages/calcite-components/src/components/input-text/input-text.tsx b/packages/calcite-components/src/components/input-text/input-text.tsx index 59237921107..e54deb73ce2 100644 --- a/packages/calcite-components/src/components/input-text/input-text.tsx +++ b/packages/calcite-components/src/components/input-text/input-text.tsx @@ -12,7 +12,7 @@ import { LuminaJsx, stringOrBoolean, } from "@arcgis/lumina"; -import { useWatchAttributes } from "@arcgis/components-controllers"; +import { useWatchAttributes } from "@arcgis/lumina/controllers"; import { getElementDir, setRequestedIcon } from "../../utils/dom"; import { connectForm, diff --git a/packages/calcite-components/src/components/input/input.tsx b/packages/calcite-components/src/components/input/input.tsx index be53832f43d..2c13a84df0e 100644 --- a/packages/calcite-components/src/components/input/input.tsx +++ b/packages/calcite-components/src/components/input/input.tsx @@ -13,7 +13,7 @@ import { LuminaJsx, stringOrBoolean, } from "@arcgis/lumina"; -import { useWatchAttributes } from "@arcgis/components-controllers"; +import { useWatchAttributes } from "@arcgis/lumina/controllers"; import { focusFirstTabbable, getElementDir, diff --git a/packages/calcite-components/src/components/menu/menu.tsx b/packages/calcite-components/src/components/menu/menu.tsx index 9d4b0df0c55..b49cf2edc50 100644 --- a/packages/calcite-components/src/components/menu/menu.tsx +++ b/packages/calcite-components/src/components/menu/menu.tsx @@ -1,7 +1,7 @@ // @ts-strict-ignore import { PropertyValues } from "lit"; import { LitElement, property, h, method, JsxNode, LuminaJsx } from "@arcgis/lumina"; -import { useWatchAttributes } from "@arcgis/components-controllers"; +import { useWatchAttributes } from "@arcgis/lumina/controllers"; import { focusElement, focusElementInGroup, diff --git a/packages/calcite-components/src/components/text-area/text-area.tsx b/packages/calcite-components/src/components/text-area/text-area.tsx index 8f31d5f4fe4..4f8ad7c80dc 100644 --- a/packages/calcite-components/src/components/text-area/text-area.tsx +++ b/packages/calcite-components/src/components/text-area/text-area.tsx @@ -11,7 +11,7 @@ import { JsxNode, stringOrBoolean, } from "@arcgis/lumina"; -import { useWatchAttributes } from "@arcgis/components-controllers"; +import { useWatchAttributes } from "@arcgis/lumina/controllers"; import { connectForm, disconnectForm, diff --git a/packages/calcite-components/src/controllers/time/time.ts b/packages/calcite-components/src/controllers/time/time.ts index e331bbd8ff0..2ce61559b75 100644 --- a/packages/calcite-components/src/controllers/time/time.ts +++ b/packages/calcite-components/src/controllers/time/time.ts @@ -1,5 +1,5 @@ import { PropertyValues } from "lit"; -import { GenericController, T9nMeta } from "@arcgis/components-controllers"; +import { GenericController, T9nMeta } from "@arcgis/lumina/controllers"; import { GenericT9nStrings } from "@arcgis/components-utils"; import { createEvent, LitElement } from "@arcgis/lumina"; import { diff --git a/packages/calcite-components/src/controllers/useFocusTrap.ts b/packages/calcite-components/src/controllers/useFocusTrap.ts index 520ab1dce6a..be8615bb550 100644 --- a/packages/calcite-components/src/controllers/useFocusTrap.ts +++ b/packages/calcite-components/src/controllers/useFocusTrap.ts @@ -1,4 +1,4 @@ -import { makeGenericController } from "@arcgis/components-controllers"; +import { makeGenericController } from "@arcgis/lumina/controllers"; import { createFocusTrap, FocusTrap, Options as Options } from "focus-trap"; import { LitElement } from "@arcgis/lumina"; import { createFocusTrapOptions } from "../utils/focusTrapComponent"; diff --git a/packages/calcite-components/src/controllers/usePreventDocumentScroll.ts b/packages/calcite-components/src/controllers/usePreventDocumentScroll.ts index 7f40b19cf90..10df4f73213 100644 --- a/packages/calcite-components/src/controllers/usePreventDocumentScroll.ts +++ b/packages/calcite-components/src/controllers/usePreventDocumentScroll.ts @@ -7,7 +7,7 @@ * @module usePreventDocumentScroll */ -import { makeGenericController } from "@arcgis/components-controllers"; +import { makeGenericController } from "@arcgis/lumina/controllers"; import { LitElement } from "@arcgis/lumina"; let openedComponentCount: number = 0; diff --git a/packages/calcite-components/src/controllers/useT9n.ts b/packages/calcite-components/src/controllers/useT9n.ts index 12d50ca296c..2c0bd5cdb92 100644 --- a/packages/calcite-components/src/controllers/useT9n.ts +++ b/packages/calcite-components/src/controllers/useT9n.ts @@ -1,4 +1,4 @@ -import { makeT9nController } from "@arcgis/components-controllers"; +import { makeT9nController } from "@arcgis/lumina/controllers"; import { getAssetPath } from "../runtime"; export const useT9n = makeT9nController(getAssetPath); diff --git a/support/createThirdPartyLicenses.ts b/support/createThirdPartyLicenses.ts index 47dfc144f8f..34a5606c578 100644 --- a/support/createThirdPartyLicenses.ts +++ b/support/createThirdPartyLicenses.ts @@ -15,7 +15,7 @@ import { getProjectLicenses } from "generate-license-file"; await execAsync("npm install --no-workspaces"); const coveredByEsriLicense = [ - "@arcgis/components-controllers", + "@arcgis/lumina/controllers", "@arcgis/components-utils", "@arcgis/lumina", "@esri/calcite-components",