Skip to content

Commit 9b56420

Browse files
jcfrancobenelan
authored andcommitted
build(deps): bump @arcgis/lumina, typescript, vite, vitest (#12137)
1 parent 4de84c7 commit 9b56420

File tree

28 files changed

+3226
-2909
lines changed

28 files changed

+3226
-2909
lines changed

package-lock.json

Lines changed: 3169 additions & 2844 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"@types/shell-quote": "1.7.5",
7171
"@typescript-eslint/rule-tester": "8.30.1",
7272
"@typescript-eslint/utils": "8.30.1",
73-
"@vitest/coverage-v8": "2.1.9",
73+
"@vitest/coverage-v8": "3.1.3",
7474
"@vitest/eslint-plugin": "1.1.43",
7575
"@whitespace/storybook-addon-html": "6.1.1",
7676
"autoprefixer": "10.4.21",
@@ -118,10 +118,10 @@
118118
"tsx": "4.19.3",
119119
"turbo": "2.5.0",
120120
"type-fest": "4.40.0",
121-
"typescript": "5.6.3",
121+
"typescript": "5.8.2",
122122
"typescript-eslint": "8.30.1",
123123
"typescript-strict-plugin": "2.4.4",
124-
"vite": "5.4.18",
124+
"vite": "6.3.5",
125125
"vite-plugin-dts": "4.5.3"
126126
},
127127
"license": "SEE LICENSE.md",

packages/calcite-components/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,8 @@
7575
"util:update-3rd-party-licenses": "tsx ../../support/createThirdPartyLicenses.ts"
7676
},
7777
"dependencies": {
78-
"@arcgis/components-controllers": "^4.33.0-next.110",
79-
"@arcgis/components-utils": "^4.33.0-next.110",
80-
"@arcgis/lumina": "^4.33.0-next.110",
78+
"@arcgis/components-utils": "^4.33.0-next.121",
79+
"@arcgis/lumina": "^4.33.0-next.121",
8180
"@esri/calcite-ui-icons": "4.2.0-next.4",
8281
"@floating-ui/dom": "^1.6.12",
8382
"@floating-ui/utils": "^0.2.8",
@@ -93,13 +92,13 @@
9392
"type-fest": "^4.30.1"
9493
},
9594
"devDependencies": {
96-
"@arcgis/lumina-compiler": "^4.33.0-next.110",
95+
"@arcgis/lumina-compiler": "^4.33.0-next.121",
9796
"@esri/calcite-design-tokens": "3.1.0-next.8",
9897
"@esri/calcite-tailwind-preset": "0.2.0-next.9",
9998
"@esri/eslint-plugin-calcite-components": "2.0.2-next.5",
100-
"@vitest/browser": "2.1.9",
99+
"@vitest/browser": "3.1.3",
101100
"playwright": "1.52.0",
102-
"vitest": "2.1.9"
101+
"vitest": "3.1.3"
103102
},
104103
"volta": {
105104
"extends": "../../package.json"

packages/calcite-components/src/components/autocomplete/autocomplete.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
stringOrBoolean,
1212
LuminaJsx,
1313
} from "@arcgis/lumina";
14-
import { useWatchAttributes } from "@arcgis/components-controllers";
14+
import { useWatchAttributes } from "@arcgis/lumina/controllers";
1515
import { debounce, escapeRegExp } from "lodash-es";
1616
import {
1717
FlipPlacement,

packages/calcite-components/src/components/button/button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
LuminaJsx,
1313
stringOrBoolean,
1414
} from "@arcgis/lumina";
15-
import { useWatchAttributes } from "@arcgis/components-controllers";
15+
import { useWatchAttributes } from "@arcgis/lumina/controllers";
1616
import { findAssociatedForm, FormOwner, resetForm, submitForm } from "../../utils/form";
1717
import {
1818
InteractiveComponent,

packages/calcite-components/src/components/input-number/input-number.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
LuminaJsx,
1313
stringOrBoolean,
1414
} from "@arcgis/lumina";
15-
import { useWatchAttributes } from "@arcgis/components-controllers";
15+
import { useWatchAttributes } from "@arcgis/lumina/controllers";
1616
import { getElementDir, isPrimaryPointerButton, setRequestedIcon } from "../../utils/dom";
1717
import { Alignment, Scale, Status } from "../interfaces";
1818
import {

packages/calcite-components/src/components/input-text/input-text.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
LuminaJsx,
1313
stringOrBoolean,
1414
} from "@arcgis/lumina";
15-
import { useWatchAttributes } from "@arcgis/components-controllers";
15+
import { useWatchAttributes } from "@arcgis/lumina/controllers";
1616
import { getElementDir, setRequestedIcon } from "../../utils/dom";
1717
import {
1818
connectForm,

packages/calcite-components/src/components/input-time-zone/utils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,12 @@ function getTimeZoneShortOffset(
263263
return parts.find(({ type }) => type === "timeZoneName").value;
264264
}
265265

266-
function isGroup(item: TimeZoneItem | TimeZoneItemGroup): item is TimeZoneItemGroup {
267-
return (item as TimeZoneItemGroup).items !== undefined;
266+
function hasGroups(items: TimeZoneItem[] | TimeZoneItemGroup[]): items is TimeZoneItemGroup[] {
267+
return (items[0] as TimeZoneItemGroup).items !== undefined;
268268
}
269269

270270
function flattenTimeZoneItems(timeZoneItems: TimeZoneItem[] | TimeZoneItemGroup[]): TimeZoneItem[] {
271-
return isGroup(timeZoneItems[0]) ? timeZoneItems.flatMap((item) => item.items) : timeZoneItems;
271+
return hasGroups(timeZoneItems) ? timeZoneItems.flatMap((item) => item.items) : timeZoneItems;
272272
}
273273

274274
export function findTimeZoneItemByProp(

packages/calcite-components/src/components/input/input.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
LuminaJsx,
1414
stringOrBoolean,
1515
} from "@arcgis/lumina";
16-
import { useWatchAttributes } from "@arcgis/components-controllers";
16+
import { useWatchAttributes } from "@arcgis/lumina/controllers";
1717
import {
1818
focusFirstTabbable,
1919
getElementDir,

packages/calcite-components/src/components/menu/menu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// @ts-strict-ignore
22
import { PropertyValues } from "lit";
33
import { LitElement, property, h, method, JsxNode, LuminaJsx } from "@arcgis/lumina";
4-
import { useWatchAttributes } from "@arcgis/components-controllers";
4+
import { useWatchAttributes } from "@arcgis/lumina/controllers";
55
import {
66
focusElement,
77
focusElementInGroup,

packages/calcite-components/src/components/navigation-logo/navigation-logo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// @ts-strict-ignore
2-
import { h, JsxNode, LitElement, method, property } from "@arcgis/lumina";
2+
import { h, Fragment, JsxNode, LitElement, method, property } from "@arcgis/lumina";
33
import { componentFocusable } from "../../utils/component";
44
import { Heading, HeadingLevel } from "../functional/Heading";
55
import { IconNameOrString } from "../icon/interfaces";

packages/calcite-components/src/components/table-row/table-row.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @ts-strict-ignore
22
import { PropertyValues } from "lit";
3-
import { LitElement, property, createEvent, h, JsxNode } from "@arcgis/lumina";
3+
import { Fragment, LitElement, property, createEvent, h, JsxNode } from "@arcgis/lumina";
44
import { createRef } from "lit-html/directives/ref.js";
55
import { render } from "lit-html";
66
import { Alignment, Scale, SelectionMode } from "../interfaces";

packages/calcite-components/src/components/table/table.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { PropertyValues } from "lit";
33
import { render } from "lit-html";
44
import { createRef } from "lit-html/directives/ref.js";
5-
import { createEvent, h, JsxNode, LitElement, property, state } from "@arcgis/lumina";
5+
import { createEvent, h, Fragment, JsxNode, LitElement, property, state } from "@arcgis/lumina";
66
import { Scale, SelectionMode } from "../interfaces";
77
import { NumberingSystem, numberStringFormatter } from "../../utils/locale";
88
import { getUserAgentString } from "../../utils/browser";

packages/calcite-components/src/components/text-area/text-area.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
JsxNode,
1212
stringOrBoolean,
1313
} from "@arcgis/lumina";
14-
import { useWatchAttributes } from "@arcgis/components-controllers";
14+
import { useWatchAttributes } from "@arcgis/lumina/controllers";
1515
import {
1616
connectForm,
1717
disconnectForm,

packages/calcite-components/src/controllers/time/time.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { PropertyValues } from "lit";
2-
import { GenericController, T9nMeta } from "@arcgis/components-controllers";
2+
import { GenericController, T9nMeta } from "@arcgis/lumina/controllers";
33
import { GenericT9nStrings } from "@arcgis/components-utils";
44
import { createEvent, LitElement } from "@arcgis/lumina";
55
import {

packages/calcite-components/src/controllers/useFocusTrap.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { makeGenericController } from "@arcgis/components-controllers";
1+
import { makeGenericController } from "@arcgis/lumina/controllers";
22
import { createFocusTrap, FocusTrap, Options as Options } from "focus-trap";
33
import { LitElement } from "@arcgis/lumina";
44
import { createFocusTrapOptions } from "../utils/focusTrapComponent";

packages/calcite-components/src/controllers/usePreventDocumentScroll.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @module usePreventDocumentScroll
88
*/
99

10-
import { makeGenericController } from "@arcgis/components-controllers";
10+
import { makeGenericController } from "@arcgis/lumina/controllers";
1111
import { LitElement } from "@arcgis/lumina";
1212

1313
let openedComponentCount: number = 0;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { makeT9nController } from "@arcgis/components-controllers";
1+
import { makeT9nController } from "@arcgis/lumina/controllers";
22
import { getAssetPath } from "../runtime";
33

44
export const useT9n = makeT9nController(getAssetPath);

packages/calcite-design-tokens/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,15 @@
3535
"lint:md": "prettier --write \"**/*.md\" >/dev/null && markdownlint-cli2 \"**/*.md\" --fix --config \"../../.markdownlint-cli2.jsonc\"",
3636
"lint:ts": "eslint --fix . && prettier --write \"**/*.{ts,tsx,cjs,mjs}\" >/dev/null",
3737
"lint": "concurrently npm:lint:*",
38-
"test": "vitest",
38+
"test": "vitest run",
39+
"test:watch": "vitest",
3940
"util:update-3rd-party-licenses": "tsx ../../support/createThirdPartyLicenses.ts",
4041
"util:update-test-snapshots": "vitest --update"
4142
},
4243
"volta": {
4344
"extends": "../../package.json"
4445
},
4546
"devDependencies": {
46-
"vitest": "2.1.9"
47+
"vitest": "3.1.3"
4748
}
4849
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
**/*.js
2+
!*.d.ts

packages/eslint-plugin-calcite-components/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"lint": "concurrently npm:lint:*",
1919
"lint:json": "prettier --write \"**/*.json\" >/dev/null",
2020
"lint:md": "prettier --write \"**/*.md\" >/dev/null && markdownlint-cli2 \"**/*.md\" --fix --config \"../../.markdownlint-cli2.jsonc\"",
21-
"test": "vitest",
21+
"test": "vitest run",
22+
"test:watch": "vitest",
2223
"clean": "rimraf node_modules dist .turbo",
2324
"util:update-3rd-party-licenses": "tsx ../../support/createThirdPartyLicenses.ts"
2425
},
@@ -31,6 +32,6 @@
3132
"extends": "../../package.json"
3233
},
3334
"devDependencies": {
34-
"vitest": "2.1.9"
35+
"vitest": "3.1.3"
3536
}
3637
}

packages/eslint-plugin-calcite-components/src/utils/rule-tester.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ export const ruleTester = () =>
1111
parserOptions: {
1212
projectService: {
1313
allowDefaultProject: ["*.ts*"],
14-
},
15-
tsconfigRootDir: "../../../",
14+
}
1615
},
1716
},
1817
});

packages/eslint-plugin-calcite-components/tests/lib/rules/ban-events/ban-events.spec.ts

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
import { describe } from "vitest";
22
import rule from "../../../../src/rules/ban-events";
3-
import * as path from "path";
4-
import * as fs from "fs";
3+
import good from "./ban-events.good.tsx?raw";
4+
import wrong from "./ban-events.wrong.tsx?raw";
55
import { ruleTester } from "../../../../src/utils/rule-tester";
66

77
describe("ban-events", () => {
8-
const files = {
9-
good: path.resolve(__dirname, "ban-events.good.tsx"),
10-
wrong: path.resolve(__dirname, "ban-events.wrong.tsx"),
11-
};
12-
138
const options = ["some-unsupported-event", { event: "keypress", message: "use keyup or keydown instead" }];
149

1510
ruleTester().run("ban-events", rule, {
1611
valid: [
1712
{
18-
code: fs.readFileSync(files.good, "utf8"),
13+
code: good,
1914
options,
20-
filename: files.good,
15+
filename: "ban-events.good.tsx",
2116
},
2217
],
2318

2419
invalid: [
2520
{
26-
code: fs.readFileSync(files.wrong, "utf8"),
21+
code: wrong,
2722
options,
28-
filename: files.wrong,
23+
filename: "ban-events.wrong.tsx",
2924
errors: [
3025
{
3126
messageId: "default",

packages/eslint-plugin-calcite-components/tests/lib/rules/no-dynamic-createelement/no-dynamic-createelement.spec.ts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
import { describe } from "vitest";
22
import rule from "../../../../src/rules/no-dynamic-createelement";
3-
import * as path from "path";
4-
import * as fs from "fs";
3+
import good from "./no-dynamic-createelement.good.tsx?raw";
4+
import wrong from "./no-dynamic-createelement.wrong.tsx?raw";
55
import { ruleTester } from "../../../../src/utils/rule-tester";
66

77
describe("no-dynamic-createelement", () => {
8-
const files = {
9-
good: path.resolve(__dirname, "no-dynamic-createelement.good.tsx"),
10-
wrong: path.resolve(__dirname, "no-dynamic-createelement.wrong.tsx"),
11-
};
128
ruleTester().run("no-dynamic-createelement", rule, {
139
valid: [
1410
{
15-
code: fs.readFileSync(files.good, "utf8"),
16-
filename: files.good,
11+
code: good,
12+
filename: "no-dynamic-createelement.good.tsx",
1713
},
1814
],
1915

2016
invalid: [
2117
{
22-
code: fs.readFileSync(files.wrong, "utf8"),
23-
filename: files.wrong,
18+
code: wrong,
19+
filename: "no-dynamic-createelement.wrong.tsx",
2420
errors: [
2521
{
2622
messageId: "default",

packages/eslint-plugin-calcite-components/tests/lib/rules/strict-boolean-attributes/strict-boolean-attributes.spec.ts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
import { describe } from "vitest";
22
import rule from "../../../../src/rules/strict-boolean-attributes";
3-
import * as path from "path";
4-
import * as fs from "fs";
3+
import good from "./strict-boolean-attributes.good.tsx?raw";
4+
import wrong from "./strict-boolean-attributes.wrong.tsx?raw";
55
import { ruleTester } from "../../../../src/utils/rule-tester";
66

77
describe("strict-boolean-attributes", () => {
8-
const files = {
9-
good: path.resolve(__dirname, "strict-boolean-attributes.good.tsx"),
10-
wrong: path.resolve(__dirname, "strict-boolean-attributes.wrong.tsx"),
11-
};
128
ruleTester().run("strict-boolean-attributes", rule, {
139
valid: [
1410
{
15-
code: fs.readFileSync(files.good, "utf8"),
16-
filename: files.good,
11+
code: good,
12+
filename: "strict-boolean-attributes.good.tsx",
1713
},
1814
],
1915

2016
invalid: [
2117
{
22-
code: fs.readFileSync(files.wrong, "utf8"),
23-
filename: files.wrong,
18+
code: wrong,
19+
filename: "strict-boolean-attributes.wrong.tsx",
2420
errors: [
2521
{
2622
messageId: "default",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/// <reference types="vite/client" />

packages/eslint-plugin-calcite-components/vite.config.mts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { defineConfig } from "vite";
1+
import { defineConfig } from "vitest/config";
22
import { version } from "./package.json";
33

44
export default defineConfig({
@@ -18,4 +18,7 @@ See https://github.com/Esri/calcite-design-system/blob/${version}/LICENSE.md for
1818
}
1919
},
2020
},
21+
test: {
22+
testTimeout: 0
23+
}
2124
});

support/createThirdPartyLicenses.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { getProjectLicenses } from "generate-license-file";
1515
await execAsync("npm install --no-workspaces");
1616

1717
const coveredByEsriLicense = [
18-
"@arcgis/components-controllers",
18+
"@arcgis/lumina/controllers",
1919
"@arcgis/components-utils",
2020
"@arcgis/lumina",
2121
"@esri/calcite-components",

0 commit comments

Comments
 (0)