Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6,013 changes: 3,169 additions & 2,844 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@types/shell-quote": "1.7.5",
"@typescript-eslint/rule-tester": "8.30.1",
"@typescript-eslint/utils": "8.30.1",
"@vitest/coverage-v8": "2.1.9",
"@vitest/coverage-v8": "3.1.3",
"@vitest/eslint-plugin": "1.1.43",
"@whitespace/storybook-addon-html": "6.1.1",
"autoprefixer": "10.4.21",
Expand Down Expand Up @@ -118,10 +118,10 @@
"tsx": "4.19.3",
"turbo": "2.5.0",
"type-fest": "4.40.0",
"typescript": "5.6.3",
"typescript": "5.8.2",
"typescript-eslint": "8.30.1",
"typescript-strict-plugin": "2.4.4",
"vite": "5.4.18",
"vite": "6.3.5",
"vite-plugin-dts": "4.5.3"
},
"license": "SEE LICENSE.md",
Expand Down
11 changes: 5 additions & 6 deletions packages/calcite-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,8 @@
"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",
"@arcgis/components-utils": "^4.33.0-next.121",
"@arcgis/lumina": "^4.33.0-next.121",
"@esri/calcite-ui-icons": "4.2.0-next.4",
"@floating-ui/dom": "^1.6.12",
"@floating-ui/utils": "^0.2.8",
Expand All @@ -93,13 +92,13 @@
"type-fest": "^4.30.1"
},
"devDependencies": {
"@arcgis/lumina-compiler": "^4.33.0-next.110",
"@arcgis/lumina-compiler": "^4.33.0-next.121",
"@esri/calcite-design-tokens": "3.1.0-next.8",
"@esri/calcite-tailwind-preset": "0.2.0-next.9",
"@esri/eslint-plugin-calcite-components": "2.0.2-next.5",
"@vitest/browser": "2.1.9",
"@vitest/browser": "3.1.3",
"playwright": "1.52.0",
"vitest": "2.1.9"
"vitest": "3.1.3"
},
"volta": {
"extends": "../../package.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,12 +263,12 @@ function getTimeZoneShortOffset(
return parts.find(({ type }) => type === "timeZoneName").value;
}

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

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

export function findTimeZoneItemByProp(
Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components/src/components/input/input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components/src/components/menu/menu.tsx
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @ts-strict-ignore
import { h, JsxNode, LitElement, method, property } from "@arcgis/lumina";
import { h, Fragment, JsxNode, LitElement, method, property } from "@arcgis/lumina";
import { componentFocusable } from "../../utils/component";
import { Heading, HeadingLevel } from "../functional/Heading";
import { IconNameOrString } from "../icon/interfaces";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import { PropertyValues } from "lit";
import { LitElement, property, createEvent, h, JsxNode } from "@arcgis/lumina";
import { Fragment, LitElement, property, createEvent, h, JsxNode } from "@arcgis/lumina";
import { createRef } from "lit-html/directives/ref.js";
import { render } from "lit-html";
import { Alignment, Scale, SelectionMode } from "../interfaces";
Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components/src/components/table/table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { PropertyValues } from "lit";
import { render } from "lit-html";
import { createRef } from "lit-html/directives/ref.js";
import { createEvent, h, JsxNode, LitElement, property, state } from "@arcgis/lumina";
import { createEvent, h, Fragment, JsxNode, LitElement, property, state } from "@arcgis/lumina";
import { Scale, SelectionMode } from "../interfaces";
import { NumberingSystem, numberStringFormatter } from "../../utils/locale";
import { getUserAgentString } from "../../utils/browser";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components/src/controllers/time/time.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components/src/controllers/useT9n.ts
Original file line number Diff line number Diff line change
@@ -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);
5 changes: 3 additions & 2 deletions packages/calcite-design-tokens/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,15 @@
"lint:md": "prettier --write \"**/*.md\" >/dev/null && markdownlint-cli2 \"**/*.md\" --fix --config \"../../.markdownlint-cli2.jsonc\"",
"lint:ts": "eslint --fix . && prettier --write \"**/*.{ts,tsx,cjs,mjs}\" >/dev/null",
"lint": "concurrently npm:lint:*",
"test": "vitest",
"test": "vitest run",
"test:watch": "vitest",
"util:update-3rd-party-licenses": "tsx ../../support/createThirdPartyLicenses.ts",
"util:update-test-snapshots": "vitest --update"
},
"volta": {
"extends": "../../package.json"
},
"devDependencies": {
"vitest": "2.1.9"
"vitest": "3.1.3"
}
}
1 change: 1 addition & 0 deletions packages/eslint-plugin-calcite-components/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
**/*.js
!*.d.ts
5 changes: 3 additions & 2 deletions packages/eslint-plugin-calcite-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"lint": "concurrently npm:lint:*",
"lint:json": "prettier --write \"**/*.json\" >/dev/null",
"lint:md": "prettier --write \"**/*.md\" >/dev/null && markdownlint-cli2 \"**/*.md\" --fix --config \"../../.markdownlint-cli2.jsonc\"",
"test": "vitest",
"test": "vitest run",
"test:watch": "vitest",
"clean": "rimraf node_modules dist .turbo",
"util:update-3rd-party-licenses": "tsx ../../support/createThirdPartyLicenses.ts"
},
Expand All @@ -31,6 +32,6 @@
"extends": "../../package.json"
},
"devDependencies": {
"vitest": "2.1.9"
"vitest": "3.1.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ export const ruleTester = () =>
parserOptions: {
projectService: {
allowDefaultProject: ["*.ts*"],
},
tsconfigRootDir: "../../../",
}
},
},
});
Original file line number Diff line number Diff line change
@@ -1,31 +1,26 @@
import { describe } from "vitest";
import rule from "../../../../src/rules/ban-events";
import * as path from "path";
import * as fs from "fs";
import good from "./ban-events.good.tsx?raw";
import wrong from "./ban-events.wrong.tsx?raw";
import { ruleTester } from "../../../../src/utils/rule-tester";

describe("ban-events", () => {
const files = {
good: path.resolve(__dirname, "ban-events.good.tsx"),
wrong: path.resolve(__dirname, "ban-events.wrong.tsx"),
};

const options = ["some-unsupported-event", { event: "keypress", message: "use keyup or keydown instead" }];

ruleTester().run("ban-events", rule, {
valid: [
{
code: fs.readFileSync(files.good, "utf8"),
code: good,
options,
filename: files.good,
filename: "ban-events.good.tsx",
},
],

invalid: [
{
code: fs.readFileSync(files.wrong, "utf8"),
code: wrong,
options,
filename: files.wrong,
filename: "ban-events.wrong.tsx",
errors: [
{
messageId: "default",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
import { describe } from "vitest";
import rule from "../../../../src/rules/no-dynamic-createelement";
import * as path from "path";
import * as fs from "fs";
import good from "./no-dynamic-createelement.good.tsx?raw";
import wrong from "./no-dynamic-createelement.wrong.tsx?raw";
import { ruleTester } from "../../../../src/utils/rule-tester";

describe("no-dynamic-createelement", () => {
const files = {
good: path.resolve(__dirname, "no-dynamic-createelement.good.tsx"),
wrong: path.resolve(__dirname, "no-dynamic-createelement.wrong.tsx"),
};
ruleTester().run("no-dynamic-createelement", rule, {
valid: [
{
code: fs.readFileSync(files.good, "utf8"),
filename: files.good,
code: good,
filename: "no-dynamic-createelement.good.tsx",
},
],

invalid: [
{
code: fs.readFileSync(files.wrong, "utf8"),
filename: files.wrong,
code: wrong,
filename: "no-dynamic-createelement.wrong.tsx",
errors: [
{
messageId: "default",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
import { describe } from "vitest";
import rule from "../../../../src/rules/strict-boolean-attributes";
import * as path from "path";
import * as fs from "fs";
import good from "./strict-boolean-attributes.good.tsx?raw";
import wrong from "./strict-boolean-attributes.wrong.tsx?raw";
import { ruleTester } from "../../../../src/utils/rule-tester";

describe("strict-boolean-attributes", () => {
const files = {
good: path.resolve(__dirname, "strict-boolean-attributes.good.tsx"),
wrong: path.resolve(__dirname, "strict-boolean-attributes.wrong.tsx"),
};
ruleTester().run("strict-boolean-attributes", rule, {
valid: [
{
code: fs.readFileSync(files.good, "utf8"),
filename: files.good,
code: good,
filename: "strict-boolean-attributes.good.tsx",
},
],

invalid: [
{
code: fs.readFileSync(files.wrong, "utf8"),
filename: files.wrong,
code: wrong,
filename: "strict-boolean-attributes.wrong.tsx",
errors: [
{
messageId: "default",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/// <reference types="vite/client" />
5 changes: 4 additions & 1 deletion packages/eslint-plugin-calcite-components/vite.config.mts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineConfig } from "vite";
import { defineConfig } from "vitest/config";
import { version } from "./package.json";

export default defineConfig({
Expand All @@ -18,4 +18,7 @@ See https://github.com/Esri/calcite-design-system/blob/${version}/LICENSE.md for
}
},
},
test: {
testTimeout: 0
}
});
2 changes: 1 addition & 1 deletion support/createThirdPartyLicenses.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading