Skip to content

Commit

Permalink
Merge branch 'dev' into dris0000/popover-tooltip-display-contents
Browse files Browse the repository at this point in the history
  • Loading branch information
driskull authored Jan 27, 2025
2 parents 32818d3 + d18e682 commit 17201a0
Show file tree
Hide file tree
Showing 13 changed files with 583 additions and 649 deletions.
1,154 changes: 531 additions & 623 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
"util:sync-linked-package-versions": "tsx support/syncLinkedPackageVersions.ts"
},
"devDependencies": {
"@arcgis/lumina-compiler": "^4.32.0-next.81",
"@arcgis/lumina-compiler": "^4.32.0-next.111",
"@cspell/dict-gis": "1.0.1",
"@cspell/dict-pokemon": "1.0.1",
"@cspell/dict-scientific-terms-us": "3.0.6",
"@cspell/eslint-plugin": "8.17.1",
"@eslint/js": "9.17.0",
"@cspell/eslint-plugin": "8.17.2",
"@eslint/js": "9.18.0",
"@esri/calcite-base": "1.2.0",
"@octokit/webhooks-types": "7.6.1",
"@prettier/sync": "0.5.2",
Expand Down Expand Up @@ -70,27 +70,27 @@
"@types/react-dom": "18.3.1",
"@types/semver": "7.5.8",
"@types/shell-quote": "1.7.5",
"@typescript-eslint/rule-tester": "8.19.1",
"@typescript-eslint/utils": "8.19.1",
"@typescript-eslint/rule-tester": "8.21.0",
"@typescript-eslint/utils": "8.21.0",
"@vitest/coverage-v8": "2.1.8",
"@vitest/eslint-plugin": "1.1.24",
"@vitest/eslint-plugin": "1.1.25",
"@whitespace/storybook-addon-html": "6.1.1",
"autoprefixer": "10.4.20",
"axe-core": "4.10.2",
"change-case": "5.4.4",
"cheerio": "1.0.0",
"chokidar": "4.0.3",
"chromatic": "11.22.2",
"chromatic": "11.25.0",
"concurrently": "9.1.2",
"conventional-changelog-conventionalcommits": "7.0.2",
"cpy": "11.1.0",
"cpy-cli": "5.0.0",
"dedent": "1.5.3",
"eslint": "9.17.0",
"eslint": "9.18.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jsdoc": "50.6.1",
"eslint-plugin-react": "7.37.3",
"eslint-plugin-jsdoc": "50.6.2",
"eslint-plugin-react": "7.37.4",
"eslint-plugin-unicorn": "56.0.1",
"globals": "15.14.0",
"globby": "14.0.2",
Expand All @@ -100,7 +100,7 @@
"lerna": "8.1.9",
"lint-staged": "15.4.1",
"markdownlint-cli": "0.43.0",
"postcss": "8.4.49",
"postcss": "8.5.1",
"prettier": "3.4.2",
"puppeteer": "23.4.1",
"react": "18.3.1",
Expand All @@ -112,14 +112,14 @@
"storybook": "8.4.7",
"storybook-addon-rtl": "1.0.1",
"style-dictionary": "3.9.2",
"stylelint": "16.12.0",
"stylelint": "16.13.2",
"stylelint-config-recommended-scss": "14.1.0",
"stylelint-use-logical-spec": "5.0.1",
"tailwindcss": "3.4.17",
"tsx": "4.19.2",
"turbo": "2.3.3",
"typescript": "5.6.3",
"typescript-eslint": "8.19.1",
"typescript-eslint": "8.21.0",
"typescript-strict-plugin": "2.4.4",
"vite": "5.4.11",
"vitest": "2.1.8"
Expand Down
4 changes: 4 additions & 0 deletions packages/calcite-components-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.0.0-next.113](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-25)

**Note:** Version bump only for package @esri/calcite-components-react

## [3.0.0-next.112](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-24)

**Note:** Version bump only for package @esri/calcite-components-react
Expand Down
4 changes: 2 additions & 2 deletions packages/calcite-components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/calcite-components-react",
"version": "3.0.0-next.112",
"version": "3.0.0-next.113",
"description": "A set of React components that wrap calcite components",
"homepage": "https://developers.arcgis.com/calcite-design-system/",
"repository": {
Expand All @@ -26,7 +26,7 @@
"tsc": "tsc"
},
"dependencies": {
"@esri/calcite-components": "3.0.0-next.112",
"@esri/calcite-components": "3.0.0-next.113",
"@lit/react": "1.0.7"
},
"peerDependencies": {
Expand Down
6 changes: 6 additions & 0 deletions packages/calcite-components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [3.0.0-next.113](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-25)

### Bug Fixes

- **combobox:** improve prop update times ([#11383](https://github.com/Esri/calcite-design-system/issues/11383)) ([d72375f](https://github.com/Esri/calcite-design-system/commit/d72375fea872b3a1cd0bd5c8356a87d315864387)), closes [#10731](https://github.com/Esri/calcite-design-system/issues/10731) [#10310](https://github.com/Esri/calcite-design-system/issues/10310)

## [3.0.0-next.112](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-24)

### Features
Expand Down
12 changes: 6 additions & 6 deletions packages/calcite-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/calcite-components",
"version": "3.0.0-next.112",
"version": "3.0.0-next.113",
"description": "Web Components for Esri's Calcite Design System.",
"homepage": "https://developers.arcgis.com/calcite-design-system/",
"repository": {
Expand Down Expand Up @@ -69,10 +69,10 @@
"util:test-types": "! grep -rnw 'dist/types' -e '<reference types='"
},
"dependencies": {
"@arcgis/components-controllers": "^4.32.0-next.81",
"@arcgis/components-utils": "^4.32.0-next.81",
"@arcgis/lumina": "^4.32.0-next.81",
"@esri/calcite-ui-icons": "4.0.0-next.10",
"@arcgis/components-controllers": "^4.32.0-next.111",
"@arcgis/components-utils": "^4.32.0-next.111",
"@arcgis/lumina": "^4.32.0-next.111",
"@esri/calcite-ui-icons": "4.0.0-next.11",
"@floating-ui/dom": "^1.6.12",
"@floating-ui/utils": "^0.2.8",
"@types/color": "^4.2.0",
Expand All @@ -89,7 +89,7 @@
},
"devDependencies": {
"@esri/calcite-design-tokens": "3.0.0-next.7",
"@esri/eslint-plugin-calcite-components": "2.0.0-next.5"
"@esri/eslint-plugin-calcite-components": "2.0.0-next.6"
},
"volta": {
"extends": "../../package.json"
Expand Down
8 changes: 6 additions & 2 deletions packages/calcite-components/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// @ts-strict-ignore
import { execSync } from "child_process";
import tailwindcss, { Config as TailwindConfig } from "tailwindcss";
import autoprefixer from "autoprefixer";
Expand Down Expand Up @@ -58,7 +57,7 @@ export default defineConfig({
preprocessorOptions: {
scss: {
// Add "includes.scss" import to each scss file
additionalData(code, id) {
additionalData(code: string, id: string) {
const globalCss = "/src/assets/styles/includes";
if (!id.endsWith(".scss") || id.endsWith(`${globalCss}.sass`)) {
return undefined;
Expand Down Expand Up @@ -92,6 +91,11 @@ export default defineConfig({
},

test: {
// workaround for lumina puppeteer testing issue
browser: {
name: "chromium",
enabled: false,
},
setupFiles: ["src/tests/setupTests.ts"],
include: ["**/*.{e2e,spec}.?(c|m)[jt]s?(x)"],
},
Expand Down
4 changes: 4 additions & 0 deletions packages/calcite-ui-icons/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [4.0.0-next.11](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-25)

**Note:** Version bump only for package @esri/calcite-ui-icons

## [4.0.0-next.10](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-22)

**Note:** Version bump only for package @esri/calcite-ui-icons
Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-ui-icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/calcite-ui-icons",
"version": "4.0.0-next.10",
"version": "4.0.0-next.11",
"private": false,
"description": "A collection of UI SVG icons created by Esri for applications.",
"keywords": [
Expand Down
4 changes: 4 additions & 0 deletions packages/eslint-config-calcite/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 0.0.1-next.1 (2025-01-25)

**Note:** Version bump only for package @esri/eslint-config-calcite

## 0.0.1-next.0 (2025-01-14)

**Note:** Version bump only for package @esri/eslint-config-calcite
2 changes: 1 addition & 1 deletion packages/eslint-config-calcite/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/eslint-config-calcite",
"version": "0.0.1-next.0",
"version": "0.0.1-next.1",
"private": true,
"type": "module",
"description": "The shared ESLint config for Esri's Calcite Design System",
Expand Down
4 changes: 4 additions & 0 deletions packages/eslint-plugin-calcite-components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.0.0-next.6](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-25)

**Note:** Version bump only for package @esri/eslint-plugin-calcite-components

## [2.0.0-next.5](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2025-01-14)

**Note:** Version bump only for package @esri/eslint-plugin-calcite-components
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-calcite-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@esri/eslint-plugin-calcite-components",
"version": "2.0.0-next.5",
"version": "2.0.0-next.6",
"description": "ESLint rules for @esri/calcite-components",
"repository": {
"type": "git",
Expand Down

0 comments on commit 17201a0

Please sign in to comment.