From 1848a9651392b17537969c6094016d598a2ab1c4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 17:33:09 +0000 Subject: [PATCH 01/10] build(deps): update dependency @stencil/core to v4.15.0 --- package-lock.json | 8 ++++---- packages/calcite-components/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 342ff9e3185..925f49df59d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6965,9 +6965,9 @@ } }, "node_modules/@stencil/core": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.13.0.tgz", - "integrity": "sha512-gg+gtBWekQ08mDja8GVAUHNu+rrFhQaKZDvfhnS3l/5JbYiJddTimuDPPhuc0sR0JZL1iRdJTJSa+JbvmnQ1cQ==", + "version": "4.15.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.15.0.tgz", + "integrity": "sha512-C5syM3chCyxX0Os5M+ZWrBujjqwUfrTb87YiLr8RC+kMTmIpnRvvtj8/s3QYDGdDENGRxGkBpeboVh82IGqk0w==", "bin": { "stencil": "bin/stencil" }, @@ -36513,7 +36513,7 @@ "license": "SEE LICENSE.md", "dependencies": { "@floating-ui/dom": "1.6.3", - "@stencil/core": "4.13.0", + "@stencil/core": "4.15.0", "@types/color": "3.0.6", "color": "4.2.3", "composed-offset-position": "0.0.4", diff --git a/packages/calcite-components/package.json b/packages/calcite-components/package.json index 4cced1d476e..17ed412fb1e 100644 --- a/packages/calcite-components/package.json +++ b/packages/calcite-components/package.json @@ -63,7 +63,7 @@ }, "dependencies": { "@floating-ui/dom": "1.6.3", - "@stencil/core": "4.13.0", + "@stencil/core": "4.15.0", "@types/color": "3.0.6", "color": "4.2.3", "composed-offset-position": "0.0.4", From d6a7eabaf92ccd46fec200a7c90e53dc062f6158 Mon Sep 17 00:00:00 2001 From: Ben Elan Date: Mon, 15 Apr 2024 10:45:55 -0700 Subject: [PATCH 02/10] build(deps): bump stencil to latest version --- package-lock.json | 16 +++++++++++++++- packages/calcite-components/package.json | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 925f49df59d..7ac6a8a7f93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6968,6 +6968,8 @@ "version": "4.15.0", "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.15.0.tgz", "integrity": "sha512-C5syM3chCyxX0Os5M+ZWrBujjqwUfrTb87YiLr8RC+kMTmIpnRvvtj8/s3QYDGdDENGRxGkBpeboVh82IGqk0w==", + "dev": true, + "peer": true, "bin": { "stencil": "bin/stencil" }, @@ -36513,7 +36515,7 @@ "license": "SEE LICENSE.md", "dependencies": { "@floating-ui/dom": "1.6.3", - "@stencil/core": "4.15.0", + "@stencil/core": "4.16.0", "@types/color": "3.0.6", "color": "4.2.3", "composed-offset-position": "0.0.4", @@ -37815,6 +37817,18 @@ } } }, + "packages/calcite-components/node_modules/@stencil/core": { + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.16.0.tgz", + "integrity": "sha512-gXaC5IrquV/Hw5JIZTCWkM5lJEbBQtnvHLhDebjar6A6+YBqxah04dardS+YUNVuRbnE6Hcja7KKiAXT3oVsvw==", + "bin": { + "stencil": "bin/stencil" + }, + "engines": { + "node": ">=16.0.0", + "npm": ">=7.10.0" + } + }, "packages/calcite-components/node_modules/@typescript-eslint/eslint-plugin": { "version": "6.21.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz", diff --git a/packages/calcite-components/package.json b/packages/calcite-components/package.json index 17ed412fb1e..ca1e93be5c5 100644 --- a/packages/calcite-components/package.json +++ b/packages/calcite-components/package.json @@ -63,7 +63,7 @@ }, "dependencies": { "@floating-ui/dom": "1.6.3", - "@stencil/core": "4.15.0", + "@stencil/core": "4.16.0", "@types/color": "3.0.6", "color": "4.2.3", "composed-offset-position": "0.0.4", From 862a843d4ebd5876f7c5806be5879386ac1ac4a2 Mon Sep 17 00:00:00 2001 From: Ben Elan Date: Mon, 15 Apr 2024 10:59:05 -0700 Subject: [PATCH 03/10] build(deps): re-generate package-lock --- package-lock.json | 158 ++++++++++++++++++++++++---------------------- 1 file changed, 81 insertions(+), 77 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a6fa907308..d084e4a0249 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2902,9 +2902,9 @@ "dev": true }, "node_modules/@cspell/dict-en_us": { - "version": "4.3.17", - "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.17.tgz", - "integrity": "sha512-CS0Tb2f2YwQZ4VZ6+WLAO5uOzb0iO/iYSRl34kX4enq6quXxLYzwdfGAwv85wSYHPdga8tGiZFP+p8GPsi2JEg==", + "version": "4.3.18", + "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.18.tgz", + "integrity": "sha512-D8jGT7Zi3+e8zIpT0NqGKvvzehcvUETFlOA0NxcRStkw7H7mgouHxKFU+u7t3tvCoGNwh2gwjCqZQlK8ZXwQHw==", "dev": true }, "node_modules/@cspell/dict-en-common-misspellings": { @@ -3115,9 +3115,9 @@ "dev": true }, "node_modules/@cspell/dict-typescript": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.1.2.tgz", - "integrity": "sha512-lcNOYWjLUvDZdLa0UMNd/LwfVdxhE9rKA+agZBGjL3lTA3uNvH7IUqSJM/IXhJoBpLLMVEOk8v1N9xi+vDuCdA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.1.3.tgz", + "integrity": "sha512-TdD789OWwOImH/IMyz/QRA6LJz7ScI/qbn1YOkcAW3AROvgbc0oKAxzp08+Xu8tj4GROrJ9UqZdh0t9xQCPkPg==", "dev": true }, "node_modules/@cspell/dict-vue": { @@ -5521,22 +5521,6 @@ "tar-stream": "^2.1.4" } }, - "node_modules/@ngtools/webpack": { - "version": "17.3.3", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.3.tgz", - "integrity": "sha512-053KMbg1Tb+Mmg4Htsv8yTpI7ABghguoxhwosQXKB0CjO6M0oexuvdaxbRDQ1vd5xYNOW9LcOfxOMPIwyU4BBA==", - "dev": true, - "engines": { - "node": "^18.13.0 || >=20.9.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - }, - "peerDependencies": { - "@angular/compiler-cli": "^17.0.0", - "typescript": ">=5.2 <5.5", - "webpack": "^5.54.0" - } - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -5607,15 +5591,15 @@ } }, "node_modules/@npmcli/git": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.5.tgz", - "integrity": "sha512-x8hXItC8OFOwdgERzRIxg0ic1lQqW6kSZFFQtZTCNYOeGb9UqzVcod02TYljI9UBl4RtfcyQ0A7ygmcGFvEqWw==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.6.tgz", + "integrity": "sha512-4x/182sKXmQkf0EtXxT26GEsaOATpD7WVtza5hrYivWZeo6QefC6xq9KAXrnjtFKBZ4rZwR7aX/zClYYXgtwLw==", "dev": true, "dependencies": { "@npmcli/promise-spawn": "^7.0.0", "lru-cache": "^10.0.1", "npm-pick-manifest": "^9.0.0", - "proc-log": "^3.0.0", + "proc-log": "^4.0.0", "promise-inflight": "^1.0.1", "promise-retry": "^2.0.1", "semver": "^7.3.5", @@ -5643,6 +5627,15 @@ "node": "14 || >=16.14" } }, + "node_modules/@npmcli/git/node_modules/proc-log": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.1.0.tgz", + "integrity": "sha512-dmQ2iPw2nJMi9/4dpaG1wd0m1GE+K5kW7RGbjy5hoEEGnhPIzsm+klBO5RGGdcoYbWsNtU2KSNAdEldts+icLg==", + "dev": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/@npmcli/git/node_modules/which": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", @@ -6605,9 +6598,9 @@ ] }, "node_modules/@rollup/wasm-node": { - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/@rollup/wasm-node/-/wasm-node-4.14.1.tgz", - "integrity": "sha512-w5GZ2p1F7tOop6WJxa5x0Ot1s6eVPKOlEo5hmWT3KGxv0naGqiGJa/fz7S/it06nzgS3fmkDbtDfpAYwqOMKRQ==", + "version": "4.14.3", + "resolved": "https://registry.npmjs.org/@rollup/wasm-node/-/wasm-node-4.14.3.tgz", + "integrity": "sha512-UyFUQV/iAu/Wt6rY6uQMYBQlfTMsynzYVIz6i7s9ySwjoG9WDNgtkK1TrazCSrUFbmuPZi2gbJm6VWdJCVw2yA==", "dev": true, "dependencies": { "@types/estree": "1.0.5" @@ -6965,11 +6958,9 @@ } }, "node_modules/@stencil/core": { - "version": "4.15.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.15.0.tgz", - "integrity": "sha512-C5syM3chCyxX0Os5M+ZWrBujjqwUfrTb87YiLr8RC+kMTmIpnRvvtj8/s3QYDGdDENGRxGkBpeboVh82IGqk0w==", - "dev": true, - "peer": true, + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.16.0.tgz", + "integrity": "sha512-gXaC5IrquV/Hw5JIZTCWkM5lJEbBQtnvHLhDebjar6A6+YBqxah04dardS+YUNVuRbnE6Hcja7KKiAXT3oVsvw==", "bin": { "stencil": "bin/stencil" }, @@ -7779,9 +7770,9 @@ } }, "node_modules/@storybook/csf": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.3.tgz", - "integrity": "sha512-IPZvXXo4b3G+gpmgBSBqVM81jbp2ePOKsvhgJdhyZJtkYQCII7rg9KKLQhvBQM5sLaF1eU6r0iuwmyynC9d9SA==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.4.tgz", + "integrity": "sha512-B9UI/lsQMjF+oEfZCI6YXNoeuBcGZoOP5x8yKbe2tIEmsMjSztFKkpPzi5nLCnBk/MBtl6QJeI3ksJnbsWPkOw==", "dependencies": { "type-fest": "^2.19.0" } @@ -8637,9 +8628,9 @@ } }, "node_modules/@types/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-87W6MJCKZYDhLAx/J1ikW8niMvmGRyY+rpUxWpL1cO7F8Uu5CHuQoFv+R0/L5pgNdW4jTyda42kv60uwVIPjLw==" + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-hulKeREDdLFesGQjl96+4aoJSHY5b2GRjagzzcqCfIrWhe5vkCqIvrLbqzBaI1q94Vg8DNJZZqTR5ocdWmWclg==" }, "node_modules/@types/connect": { "version": "3.4.38", @@ -8915,9 +8906,9 @@ } }, "node_modules/@types/mdx": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.12.tgz", - "integrity": "sha512-H9VZ9YqE+H28FQVchC83RCs5xQ2J7mAAv6qdDEaWmXEVl3OpdH+xfrSUzQ1lp7U7oSTRZ0RvW08ASPJsYBi7Cw==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.13.tgz", + "integrity": "sha512-+OWZQfAYyio6YkJb3HLxDrvnx6SWWDbC0zVPfBRzUk0/nqoDyf6dNxQi3eArPe8rJ473nobTMQ/8Zk+LxJ+Yuw==", "dev": true }, "node_modules/@types/mime": { @@ -9455,9 +9446,9 @@ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" }, "node_modules/@vitest/spy": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.4.0.tgz", - "integrity": "sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.5.0.tgz", + "integrity": "sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==", "dependencies": { "tinyspy": "^2.2.0" }, @@ -9466,9 +9457,9 @@ } }, "node_modules/@vitest/utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.4.0.tgz", - "integrity": "sha512-mx3Yd1/6e2Vt/PUC98DcqTirtfxUyAZ32uK82r8rZzbtBeBo+nqgnjx/LvqQdWsrvNtm14VmurNgcf4nqY5gJg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.5.0.tgz", + "integrity": "sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==", "dependencies": { "diff-sequences": "^29.6.3", "estree-walker": "^3.0.3", @@ -11371,9 +11362,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001608", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001608.tgz", - "integrity": "sha512-cjUJTQkk9fQlJR2s4HMuPMvTiRggl0rAVMtthQuyOlDWuqHXqN8azLq+pi8B2TjwKJ32diHjUqRIKeFX4z1FoA==", + "version": "1.0.30001610", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz", + "integrity": "sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA==", "devOptional": true, "funding": [ { @@ -14468,9 +14459,9 @@ "dev": true }, "node_modules/ejs": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", - "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", "dev": true, "dependencies": { "jake": "^10.8.5" @@ -14483,9 +14474,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.731", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.731.tgz", - "integrity": "sha512-+TqVfZjpRz2V/5SPpmJxq9qK620SC5SqCnxQIOi7i/U08ZDcTpKbT7Xjj9FU5CbXTMUb4fywbIr8C7cGv4hcjw==", + "version": "1.4.736", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.736.tgz", + "integrity": "sha512-Rer6wc3ynLelKNM4lOCg7/zPQj8tPOCB2hzD32PX9wd3hgRRi9MxEbmkFCokzcEhRVMiOVLjnL9ig9cefJ+6+Q==", "devOptional": true }, "node_modules/emittery": { @@ -27055,9 +27046,9 @@ } }, "node_modules/pacote/node_modules/npm-registry-fetch": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.2.0.tgz", - "integrity": "sha512-zVH+G0q1O2hqgQBUvQ2LWp6ujr6VJAeDnmWxqiMlCguvLexEzBnuQIwC70r04vcvCMAcYEIpA/rO9YyVi+fmJQ==", + "version": "16.2.1", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.2.1.tgz", + "integrity": "sha512-8l+7jxhim55S85fjiDGJ1rZXBWGtRLi1OSb4Z3BPLObPuIaeKRlPRiYMSHU4/81ck3t71Z+UwDDl47gcpmfQQA==", "dev": true, "dependencies": { "@npmcli/redact": "^1.1.0", @@ -27067,12 +27058,21 @@ "minipass-json-stream": "^1.0.1", "minizlib": "^2.1.2", "npm-package-arg": "^11.0.0", - "proc-log": "^3.0.0" + "proc-log": "^4.0.0" }, "engines": { "node": "^16.14.0 || >=18.0.0" } }, + "node_modules/pacote/node_modules/npm-registry-fetch/node_modules/proc-log": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.1.0.tgz", + "integrity": "sha512-dmQ2iPw2nJMi9/4dpaG1wd0m1GE+K5kW7RGbjy5hoEEGnhPIzsm+klBO5RGGdcoYbWsNtU2KSNAdEldts+icLg==", + "dev": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/pacote/node_modules/read-package-json": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.0.tgz", @@ -28452,9 +28452,9 @@ ] }, "node_modules/qs": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.0.tgz", - "integrity": "sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==", + "version": "6.12.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz", + "integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==", "dependencies": { "side-channel": "^1.0.6" }, @@ -36688,6 +36688,22 @@ } } }, + "packages/calcite-components-angular/node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": { + "version": "17.3.3", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.3.tgz", + "integrity": "sha512-053KMbg1Tb+Mmg4Htsv8yTpI7ABghguoxhwosQXKB0CjO6M0oexuvdaxbRDQ1vd5xYNOW9LcOfxOMPIwyU4BBA==", + "dev": true, + "engines": { + "node": "^18.13.0 || >=20.9.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + }, + "peerDependencies": { + "@angular/compiler-cli": "^17.0.0", + "typescript": ">=5.2 <5.5", + "webpack": "^5.54.0" + } + }, "packages/calcite-components-angular/node_modules/@babel/core": { "version": "7.24.0", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.0.tgz", @@ -37817,18 +37833,6 @@ } } }, - "packages/calcite-components/node_modules/@stencil/core": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.16.0.tgz", - "integrity": "sha512-gXaC5IrquV/Hw5JIZTCWkM5lJEbBQtnvHLhDebjar6A6+YBqxah04dardS+YUNVuRbnE6Hcja7KKiAXT3oVsvw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=16.0.0", - "npm": ">=7.10.0" - } - }, "packages/calcite-components/node_modules/@typescript-eslint/eslint-plugin": { "version": "6.21.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz", From bdf5405e8c813317930b2cfef684ea57333a45a9 Mon Sep 17 00:00:00 2001 From: JC Franco Date: Mon, 15 Apr 2024 22:09:24 -0700 Subject: [PATCH 04/10] fix tests --- .../src/components/action-bar/action-bar.e2e.ts | 6 ++---- .../src/components/action-pad/action-pad.e2e.ts | 2 +- .../src/components/color-picker/color-picker.e2e.ts | 2 +- .../src/components/combobox/combobox.e2e.ts | 7 +++---- .../src/components/radio-button/radio-button.e2e.ts | 12 ++++-------- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/packages/calcite-components/src/components/action-bar/action-bar.e2e.ts b/packages/calcite-components/src/components/action-bar/action-bar.e2e.ts index 4f752d74660..b11afdf4a08 100755 --- a/packages/calcite-components/src/components/action-bar/action-bar.e2e.ts +++ b/packages/calcite-components/src/components/action-bar/action-bar.e2e.ts @@ -116,12 +116,10 @@ describe("calcite-action-bar", () => { it("allows disabling expandable behavior", async () => { const page = await newE2EPage(); - await page.setContent(""); - await page.waitForChanges(); - const expandAction = await page.find("calcite-action-bar >>> calcite-action"); + const expandAction = await page.find("calcite-action-bar >>> calcite-action-group calcite-action"); expect(expandAction).toBeNull(); }); @@ -211,7 +209,7 @@ describe("calcite-action-bar", () => { `, ); - const expandAction = await page.find("calcite-action-bar >>> calcite-action"); + const expandAction = await page.find("calcite-action-bar >>> calcite-action-group calcite-action"); const action = await page.find("calcite-action"); const actionBar = await page.find("calcite-action-bar"); const group = await page.find("calcite-action-group"); diff --git a/packages/calcite-components/src/components/action-pad/action-pad.e2e.ts b/packages/calcite-components/src/components/action-pad/action-pad.e2e.ts index 4223e3a26f1..ce870bee16b 100755 --- a/packages/calcite-components/src/components/action-pad/action-pad.e2e.ts +++ b/packages/calcite-components/src/components/action-pad/action-pad.e2e.ts @@ -140,7 +140,7 @@ describe("calcite-action-pad", () => { await page.setContent(""); const element = await page.find("calcite-action-pad"); - const actionElement = await page.find("calcite-action-pad >>> calcite-action"); + const actionElement = await page.find("calcite-action-pad >>> calcite-action-group calcite-action"); const eventSpy = await element.spyOnEvent("calciteActionPadToggle"); diff --git a/packages/calcite-components/src/components/color-picker/color-picker.e2e.ts b/packages/calcite-components/src/components/color-picker/color-picker.e2e.ts index 3c10e50b056..8b1e2f496bf 100644 --- a/packages/calcite-components/src/components/color-picker/color-picker.e2e.ts +++ b/packages/calcite-components/src/components/color-picker/color-picker.e2e.ts @@ -137,7 +137,7 @@ describe("calcite-color-picker", () => { const page = await newE2EPage(); await page.setContent(html``); - const buttons = await page.findAll("calcite-color-picker >>> calcite-button"); + const buttons = await page.findAll(`calcite-color-picker >>> .${CSS.container} calcite-button`); expect(buttons).toHaveLength(2); diff --git a/packages/calcite-components/src/components/combobox/combobox.e2e.ts b/packages/calcite-components/src/components/combobox/combobox.e2e.ts index d07057efd1f..5eb605175cd 100644 --- a/packages/calcite-components/src/components/combobox/combobox.e2e.ts +++ b/packages/calcite-components/src/components/combobox/combobox.e2e.ts @@ -1187,7 +1187,7 @@ describe("calcite-combobox", () => { it("should delete last item on Delete in fit selection-display mode when there are no overflowed chips", async () => { const page = await newE2EPage(); await page.setContent(html` - + @@ -1201,7 +1201,7 @@ describe("calcite-combobox", () => { const item1 = await page.find("calcite-combobox-item#one"); const item2 = await page.find("calcite-combobox-item#two"); - const item3 = await page.find("calcite-combobox-item:last-child"); + const item3 = await page.find("calcite-combobox-item#three"); await item1.click(); await item2.click(); await item3.click(); @@ -1956,8 +1956,7 @@ describe("calcite-combobox", () => { await combobox.press("Tab"); await closeEvent; - const wrapper = await page.find("calcite-combobox >>> .wrapper"); - const close = await wrapper.find("calcite-chip >>> .close"); + const close = await page.find("calcite-combobox >>> calcite-chip >>> .close"); await close.press(" "); await page.waitForChanges(); diff --git a/packages/calcite-components/src/components/radio-button/radio-button.e2e.ts b/packages/calcite-components/src/components/radio-button/radio-button.e2e.ts index a9980d1566a..b114d9fc87c 100644 --- a/packages/calcite-components/src/components/radio-button/radio-button.e2e.ts +++ b/packages/calcite-components/src/components/radio-button/radio-button.e2e.ts @@ -545,37 +545,33 @@ describe("calcite-radio-button", () => { it("works correctly inside a shadowRoot", async () => { const page = await newE2EPage(); await page.setContent(` -
+ `); await page.waitForChanges(); - const radios = await page.findAll("div >>> calcite-radio-button"); - const inputs = await page.findAll("div >>> calcite-radio-button >>> input"); + const radios = await page.findAll("fake-component >>> calcite-radio-button"); await radios[0].click(); expect(await radios[0].getProperty("checked")).toBe(true); expect(radios[0].getAttribute("checked")).toBe(""); - expect(await inputs[0].getProperty("checked")).toBe(true); await radios[1].click(); expect(await radios[0].getProperty("checked")).toBe(false); expect(radios[0].getAttribute("checked")).toBe(null); - expect(await inputs[0].getProperty("checked")).toBe(false); expect(await radios[1].getProperty("checked")).toBe(true); expect(radios[1].getAttribute("checked")).toBe(""); - expect(await inputs[1].getProperty("checked")).toBe(true); }); describe("is form-associated", () => { From 1b1a2c52e8ff4a01214f9174a6391b2a18c240b4 Mon Sep 17 00:00:00 2001 From: JC Franco Date: Tue, 16 Apr 2024 09:10:38 -0700 Subject: [PATCH 05/10] stabilize combobox tests --- .../src/components/combobox/combobox.e2e.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/calcite-components/src/components/combobox/combobox.e2e.ts b/packages/calcite-components/src/components/combobox/combobox.e2e.ts index 5eb605175cd..64de1eb887b 100644 --- a/packages/calcite-components/src/components/combobox/combobox.e2e.ts +++ b/packages/calcite-components/src/components/combobox/combobox.e2e.ts @@ -1147,10 +1147,11 @@ describe("calcite-combobox", () => { const item1 = await page.find("calcite-combobox-item#one"); const item2 = await page.find("calcite-combobox-item#two"); - const item3 = await page.find("calcite-combobox-item:last-child"); + const item3 = await page.find("calcite-combobox-item#three"); await item1.click(); await item2.click(); await item3.click(); + await page.waitForChanges(); await element.click(); await element.press("Backspace"); @@ -1174,10 +1175,11 @@ describe("calcite-combobox", () => { const item1 = await page.find("calcite-combobox-item#one"); const item2 = await page.find("calcite-combobox-item#two"); - const item3 = await page.find("calcite-combobox-item:last-child"); + const item3 = await page.find("calcite-combobox-item#three"); await item1.click(); await item2.click(); await item3.click(); + await page.waitForChanges(); await element.click(); await element.press("Backspace"); @@ -1205,6 +1207,7 @@ describe("calcite-combobox", () => { await item1.click(); await item2.click(); await item3.click(); + await page.waitForChanges(); await element.click(); await element.press("Backspace"); From efc9e8e2314c6451277e3c5a21d571075c7ffa60 Mon Sep 17 00:00:00 2001 From: JC Franco Date: Tue, 16 Apr 2024 11:16:54 -0700 Subject: [PATCH 06/10] set up CI troubleshooting --- packages/calcite-components/stencil.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/calcite-components/stencil.config.ts b/packages/calcite-components/stencil.config.ts index 06559ec8e61..0a1bde1ef26 100644 --- a/packages/calcite-components/stencil.config.ts +++ b/packages/calcite-components/stencil.config.ts @@ -146,6 +146,7 @@ export const create: () => Config = () => ({ "^lodash-es$": "lodash", }, setupFilesAfterEnv: ["/src/tests/setupTests.ts"], + testRegex: "(/__tests__/.*|(\\.|/)combobox.e2e)\\.[jt]sx?$", transform: { "calcite-design-tokens/dist/es6/.*\\.js$": "../../node_modules/@stencil/core/testing/jest-preprocessor.js", From 943f11b1ef134a02d56cb87bfcf3b6834885f1d2 Mon Sep 17 00:00:00 2001 From: JC Franco Date: Tue, 16 Apr 2024 11:18:28 -0700 Subject: [PATCH 07/10] add extra wait calls --- .../src/components/combobox/combobox.e2e.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/calcite-components/src/components/combobox/combobox.e2e.ts b/packages/calcite-components/src/components/combobox/combobox.e2e.ts index 64de1eb887b..ad89f26fb68 100644 --- a/packages/calcite-components/src/components/combobox/combobox.e2e.ts +++ b/packages/calcite-components/src/components/combobox/combobox.e2e.ts @@ -1197,20 +1197,29 @@ describe("calcite-combobox", () => { `); + await page.waitForChanges(); const element = await page.find("#myCombobox"); await element.click(); + await page.waitForChanges(); const item1 = await page.find("calcite-combobox-item#one"); const item2 = await page.find("calcite-combobox-item#two"); const item3 = await page.find("calcite-combobox-item#three"); await item1.click(); + await page.waitForChanges(); await item2.click(); + await page.waitForChanges(); await item3.click(); await page.waitForChanges(); + expect((await element.getProperty("selectedItems")).length).toBe(3); + await element.click(); + await page.waitForChanges(); await element.press("Backspace"); + await page.waitForChanges(); + expect((await element.getProperty("selectedItems")).length).toBe(2); }); }); From bb91c090a1e7e29a984d7b21d7961bff1ab4c8b2 Mon Sep 17 00:00:00 2001 From: JC Franco Date: Tue, 16 Apr 2024 11:30:56 -0700 Subject: [PATCH 08/10] tweak test --- .../src/components/combobox/combobox.e2e.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/calcite-components/src/components/combobox/combobox.e2e.ts b/packages/calcite-components/src/components/combobox/combobox.e2e.ts index ad89f26fb68..208c2eb0cca 100644 --- a/packages/calcite-components/src/components/combobox/combobox.e2e.ts +++ b/packages/calcite-components/src/components/combobox/combobox.e2e.ts @@ -1199,8 +1199,9 @@ describe("calcite-combobox", () => { `); await page.waitForChanges(); - const element = await page.find("#myCombobox"); - await element.click(); + const combobox = await page.find("calcite-combobox"); + const input = await page.find("calcite-combobox >>> .input"); + await input.click(); await page.waitForChanges(); const item1 = await page.find("calcite-combobox-item#one"); @@ -1213,14 +1214,14 @@ describe("calcite-combobox", () => { await item3.click(); await page.waitForChanges(); - expect((await element.getProperty("selectedItems")).length).toBe(3); + expect((await combobox.getProperty("selectedItems")).length).toBe(3); - await element.click(); + await input.click(); await page.waitForChanges(); - await element.press("Backspace"); + await input.press("Backspace"); await page.waitForChanges(); - expect((await element.getProperty("selectedItems")).length).toBe(2); + expect((await combobox.getProperty("selectedItems")).length).toBe(2); }); }); From fd7978a637f1ea0b508b95687b7eee0e913cdb55 Mon Sep 17 00:00:00 2001 From: JC Franco Date: Tue, 16 Apr 2024 11:43:10 -0700 Subject: [PATCH 09/10] tidy up --- .../src/components/combobox/combobox.e2e.ts | 54 ++++++++----------- .../src/components/combobox/combobox.tsx | 2 +- .../src/components/combobox/resources.ts | 1 + 3 files changed, 23 insertions(+), 34 deletions(-) diff --git a/packages/calcite-components/src/components/combobox/combobox.e2e.ts b/packages/calcite-components/src/components/combobox/combobox.e2e.ts index 208c2eb0cca..39988190e12 100644 --- a/packages/calcite-components/src/components/combobox/combobox.e2e.ts +++ b/packages/calcite-components/src/components/combobox/combobox.e2e.ts @@ -16,6 +16,7 @@ import { html } from "../../../support/formatting"; import { CSS as ComboboxItemCSS } from "../combobox-item/resources"; import { CSS as XButtonCSS } from "../functional/XButton"; import { getElementXY, skipAnimations } from "../../tests/utils"; +import { CSS } from "./resources"; const selectionModes = ["single", "single-persist", "ancestors", "multiple"]; @@ -1133,7 +1134,7 @@ describe("calcite-combobox", () => { it("should not delete any items on Delete in single selection-display mode", async () => { const page = await newE2EPage(); await page.setContent(html` - + @@ -1141,27 +1142,26 @@ describe("calcite-combobox", () => { `); - - const element = await page.find("#myCombobox"); - await element.click(); - + const combobox = await page.find("calcite-combobox"); + const input = await page.find(`calcite-combobox >>> .${CSS.input}`); const item1 = await page.find("calcite-combobox-item#one"); const item2 = await page.find("calcite-combobox-item#two"); const item3 = await page.find("calcite-combobox-item#three"); + + await input.click(); await item1.click(); await item2.click(); await item3.click(); - await page.waitForChanges(); + await input.click(); + await combobox.press("Backspace"); - await element.click(); - await element.press("Backspace"); - expect((await element.getProperty("selectedItems")).length).toBe(3); + expect((await combobox.getProperty("selectedItems")).length).toBe(3); }); it("should not delete any items on Delete in fit selection-display mode when there are overflowed chips", async () => { const page = await newE2EPage(); await page.setContent(html` - + @@ -1169,27 +1169,26 @@ describe("calcite-combobox", () => { `); - - const element = await page.find("#myCombobox"); - await element.click(); - + const combobox = await page.find("calcite-combobox"); + const input = await page.find(`calcite-combobox >>> .${CSS.input}`); const item1 = await page.find("calcite-combobox-item#one"); const item2 = await page.find("calcite-combobox-item#two"); const item3 = await page.find("calcite-combobox-item#three"); + + await input.click(); await item1.click(); await item2.click(); await item3.click(); - await page.waitForChanges(); + await input.click(); + await input.press("Backspace"); - await element.click(); - await element.press("Backspace"); - expect((await element.getProperty("selectedItems")).length).toBe(3); + expect((await combobox.getProperty("selectedItems")).length).toBe(3); }); it("should delete last item on Delete in fit selection-display mode when there are no overflowed chips", async () => { const page = await newE2EPage(); await page.setContent(html` - + @@ -1197,29 +1196,18 @@ describe("calcite-combobox", () => { `); - await page.waitForChanges(); - const combobox = await page.find("calcite-combobox"); - const input = await page.find("calcite-combobox >>> .input"); - await input.click(); - await page.waitForChanges(); - + const input = await page.find(`calcite-combobox >>> .${CSS.input}`); const item1 = await page.find("calcite-combobox-item#one"); const item2 = await page.find("calcite-combobox-item#two"); const item3 = await page.find("calcite-combobox-item#three"); + + await input.click(); await item1.click(); - await page.waitForChanges(); await item2.click(); - await page.waitForChanges(); await item3.click(); - await page.waitForChanges(); - - expect((await combobox.getProperty("selectedItems")).length).toBe(3); - await input.click(); - await page.waitForChanges(); await input.press("Backspace"); - await page.waitForChanges(); expect((await combobox.getProperty("selectedItems")).length).toBe(2); }); diff --git a/packages/calcite-components/src/components/combobox/combobox.tsx b/packages/calcite-components/src/components/combobox/combobox.tsx index 81553732272..07bb607ef1a 100644 --- a/packages/calcite-components/src/components/combobox/combobox.tsx +++ b/packages/calcite-components/src/components/combobox/combobox.tsx @@ -1567,7 +1567,7 @@ export class Combobox aria-label={getLabelText(this)} aria-owns={`${listboxUidPrefix}${guid}`} class={{ - input: true, + [CSS.input]: true, "input--single": true, "input--transparent": this.activeChipIndex > -1, "input--hidden": showLabel, diff --git a/packages/calcite-components/src/components/combobox/resources.ts b/packages/calcite-components/src/components/combobox/resources.ts index 210c3af1590..f5e0b3175e0 100644 --- a/packages/calcite-components/src/components/combobox/resources.ts +++ b/packages/calcite-components/src/components/combobox/resources.ts @@ -3,6 +3,7 @@ export const ComboboxItemGroup = "CALCITE-COMBOBOX-ITEM-GROUP"; export const ComboboxChildSelector = `${ComboboxItem}, ${ComboboxItemGroup}`; export const CSS = { + input: "input", chipInvisible: "chip--invisible", selectionDisplayFit: "selection-display-fit", selectionDisplaySingle: "selection-display-single", From 7cf3fa25f2386fa26eef6c7843577ffb41c43760 Mon Sep 17 00:00:00 2001 From: JC Franco Date: Tue, 16 Apr 2024 11:53:23 -0700 Subject: [PATCH 10/10] remove CI troubleshooting option --- packages/calcite-components/stencil.config.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/calcite-components/stencil.config.ts b/packages/calcite-components/stencil.config.ts index 0a1bde1ef26..06559ec8e61 100644 --- a/packages/calcite-components/stencil.config.ts +++ b/packages/calcite-components/stencil.config.ts @@ -146,7 +146,6 @@ export const create: () => Config = () => ({ "^lodash-es$": "lodash", }, setupFilesAfterEnv: ["/src/tests/setupTests.ts"], - testRegex: "(/__tests__/.*|(\\.|/)combobox.e2e)\\.[jt]sx?$", transform: { "calcite-design-tokens/dist/es6/.*\\.js$": "../../node_modules/@stencil/core/testing/jest-preprocessor.js",