From a2c66cd94ddd2198ee0ba3aa06d5e828d37d90cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abd=C3=B3n=20Rodr=C3=ADguez=20Davila?= Date: Sat, 21 Aug 2021 15:01:36 +0000 Subject: [PATCH 1/2] feat: update to Lit v2.0.2 --- .changeset/fair-mails-smell.md | 5 + package.json | 6 +- packages/core/package.json | 6 +- packages/select-rich/src/LionSelectInvoker.js | 3 +- yarn.lock | 271 ++++++++++++------ 5 files changed, 189 insertions(+), 102 deletions(-) create mode 100644 .changeset/fair-mails-smell.md diff --git a/.changeset/fair-mails-smell.md b/.changeset/fair-mails-smell.md new file mode 100644 index 000000000..076f42607 --- /dev/null +++ b/.changeset/fair-mails-smell.md @@ -0,0 +1,5 @@ +--- +'@lion/core': minor +--- + +Update Lit to v2 diff --git a/package.json b/package.json index 39c72a07c..5dd0463f8 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,8 @@ "@custom-elements-manifest/analyzer": "^0.1.8", "@open-wc/building-rollup": "^1.2.1", "@open-wc/eslint-config": "^4.2.0", - "@open-wc/testing": "^3.0.0-next.1", - "@open-wc/testing-helpers": "^2.0.0-next.0", + "@open-wc/testing": "^3.0.1", + "@open-wc/testing-helpers": "^2.0.1", "@rocket/blog": "^0.4.0", "@rocket/cli": "^0.10.0", "@rocket/launch": "^0.6.0", @@ -102,7 +102,7 @@ "bundlesize": [ { "path": "./bundlesize/dist/core/*.js", - "maxSize": "12 kB" + "maxSize": "13 kB" }, { "path": "./bundlesize/dist/all/*.js", diff --git a/packages/core/package.json b/packages/core/package.json index d2e166869..bdc4a66e7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -36,9 +36,9 @@ "./differentKeyEventNamesShimIE.js" ], "dependencies": { - "@open-wc/dedupe-mixin": "^1.2.18", - "@open-wc/scoped-elements": "^2.0.0-next.3", - "lit": "^2.0.0-rc.2" + "@open-wc/dedupe-mixin": "^1.3.0", + "@open-wc/scoped-elements": "^2.0.1", + "lit": "^2.0.2" }, "keywords": [ "lion", diff --git a/packages/select-rich/src/LionSelectInvoker.js b/packages/select-rich/src/LionSelectInvoker.js index bf6728cad..2b1ed0727 100644 --- a/packages/select-rich/src/LionSelectInvoker.js +++ b/packages/select-rich/src/LionSelectInvoker.js @@ -13,7 +13,8 @@ import { css, html, SlotMixin } from '@lion/core'; export class LionSelectInvoker extends SlotMixin(LionButton) { static get styles() { return [ - ...super.styles, + // TODO switch back to ...super.styles once fixed https://github.com/lit/lit.dev/pull/535 + ...LionButton.styles, css` :host { justify-content: space-between; diff --git a/yarn.lock b/yarn.lock index 08a35c991..d2465be3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1324,6 +1324,11 @@ "@popperjs/core" "^2.5.4" singleton-manager "1.4.1" +"@lit/reactive-element@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.0.0.tgz#7b6e6a85709cda0370c47e425ac2f3b553696a4b" + integrity sha512-Kpgenb8UNFsKCsFhggiVvUkCbcFQSd6N8hffYEEGjz27/4rw3cTSsmP9t3q1EHOAsdum60Wo64HvuZDFpEwexA== + "@lit/reactive-element@^1.0.0-rc.1", "@lit/reactive-element@^1.0.0-rc.2": version "1.0.0-rc.2" resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.0.0-rc.2.tgz#f24dba16ea571a08dca70f1783bd2ca5ec8de3ee" @@ -1527,15 +1532,6 @@ "@open-wc/dedupe-mixin" "^1.3.0" lit-html "^1.0.0" -"@open-wc/scoped-elements@^2.0.0-next.0": - version "2.0.0-next.3" - resolved "https://registry.yarnpkg.com/@open-wc/scoped-elements/-/scoped-elements-2.0.0-next.3.tgz#adbd9d6fddc67158fd11ffe78c5e11aefdaaf8af" - integrity sha512-9dT+0ea/RKO3s2m5H+U8gwG7m1jE89JhgWKI6FnkG4pE9xMx8KACoLZZcUfogVjb6/vKaIeoCj6Mqm+2HiqCeQ== - dependencies: - "@lit/reactive-element" "^1.0.0-rc.1" - "@open-wc/dedupe-mixin" "^1.3.0" - "@webcomponents/scoped-custom-element-registry" "0.0.1" - "@open-wc/scoped-elements@^2.0.0-next.3": version "2.0.0-next.4" resolved "https://registry.yarnpkg.com/@open-wc/scoped-elements/-/scoped-elements-2.0.0-next.4.tgz#d8294358e3e8ad2ba44200ab805549fde49245f6" @@ -1545,41 +1541,49 @@ "@open-wc/dedupe-mixin" "^1.3.0" "@webcomponents/scoped-custom-element-registry" "0.0.2" +"@open-wc/scoped-elements@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@open-wc/scoped-elements/-/scoped-elements-2.0.1.tgz#6b1c3535f809bd90710574db80093a81e3a1fc2d" + integrity sha512-JS6ozxUFwFX3+Er91v9yQzNIaFn7OnE0iESKTbFvkkKdNwvAPtp1fpckBKIvWk8Ae9ZcoI9DYZuT2DDbMPcadA== + dependencies: + "@lit/reactive-element" "^1.0.0" + "@open-wc/dedupe-mixin" "^1.3.0" + "@webcomponents/scoped-custom-element-registry" "^0.0.3" + "@open-wc/semantic-dom-diff@^0.13.16": version "0.13.21" resolved "https://registry.yarnpkg.com/@open-wc/semantic-dom-diff/-/semantic-dom-diff-0.13.21.tgz#718b9ec5f9a98935fc775e577ad094ae8d8b7dea" integrity sha512-BONpjHcGX2zFa9mfnwBCLEmlDsOHzT+j6Qt1yfK3MzFXFtAykfzFjAgaxPetu0YbBlCfXuMlfxI4vlRGCGMvFg== -"@open-wc/semantic-dom-diff@^0.19.3": - version "0.19.4" - resolved "https://registry.yarnpkg.com/@open-wc/semantic-dom-diff/-/semantic-dom-diff-0.19.4.tgz#d6c880224cce52d14a8f8a116ec76611426463aa" - integrity sha512-jiqM40e8WKOPIzf48lFlf+2eHhNiIeumprFQ05xCrktRQtvUlBpYNIQ0427z/aGr+56p8KIiWzx1K/0lbLWaqw== +"@open-wc/semantic-dom-diff@^0.19.5": + version "0.19.5" + resolved "https://registry.yarnpkg.com/@open-wc/semantic-dom-diff/-/semantic-dom-diff-0.19.5.tgz#8d3d7f69140b9ba477a4adf8099c79e0efe18955" + integrity sha512-Wi0Fuj3dzqlWClU0y+J4k/nqTcH0uwgOWxZXPyeyG3DdvuyyjgiT4L4I/s6iVShWQvvEsyXnj7yVvixAo3CZvg== dependencies: "@types/chai" "^4.2.11" + "@web/test-runner-commands" "^0.5.7" -"@open-wc/testing-helpers@^2.0.0-next.0": - version "2.0.0-next.0" - resolved "https://registry.yarnpkg.com/@open-wc/testing-helpers/-/testing-helpers-2.0.0-next.0.tgz#ece19e1c22ff91ae5f6ff2fae199719b7a7bfce7" - integrity sha512-94TL8IK05w1JyN8xt7t+vQBQYPdPy/JSJbWJ/ytvStou085SoDN6p1xCPh1PNhjm9LALc60nWM8qb2J2YRT8QA== +"@open-wc/testing-helpers@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@open-wc/testing-helpers/-/testing-helpers-2.0.1.tgz#b54ccb3d67d874baf57b66ad17d45d1eb56f30f9" + integrity sha512-kBg3TJeqVCvVhBLPGRnlgkkghl854Ohp8xt8vuyDwWJUSpM7eimaXbn/YbRVVT5PScodjvMO9HDl2U8LX63CIw== dependencies: - "@open-wc/scoped-elements" "^2.0.0-next.0" - lit "^2.0.0-rc.1" + "@open-wc/scoped-elements" "^2.0.1" + lit "^2.0.0" -"@open-wc/testing@^3.0.0-next.1": - version "3.0.0-next.1" - resolved "https://registry.yarnpkg.com/@open-wc/testing/-/testing-3.0.0-next.1.tgz#c5c08093439450ed2c871ad18a7ccef787ea15f4" - integrity sha512-dDgbqIgNTizSugrya6iSh9s3VS2xsZ3HURFpRVTlKGbEE7OYrRHcBBe73DiSWLRPeYyagVZsOshTUPfTBGamwQ== +"@open-wc/testing@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@open-wc/testing/-/testing-3.0.1.tgz#088fe295b0215f3267601db335eee4a23c0731c4" + integrity sha512-8ZVdmNT8e0hcB0tGrdfsvWydpDUr+1oeQ4XRm2T3Ck+nTJIddQO28tO0OvDLrJU/5WtT7LLZDqRpM32SPdcxjA== dependencies: "@esm-bundle/chai" "^4.3.4" "@open-wc/chai-dom-equals" "^0.12.36" - "@open-wc/semantic-dom-diff" "^0.19.3" - "@open-wc/testing-helpers" "^2.0.0-next.0" + "@open-wc/semantic-dom-diff" "^0.19.5" + "@open-wc/testing-helpers" "^2.0.1" "@types/chai" "^4.2.11" "@types/chai-dom" "^0.0.9" - "@types/mocha" "^5.2.7" "@types/sinon-chai" "^3.2.3" - chai-a11y-axe "^1.3.1" - mocha "^6.2.2" + chai-a11y-axe "^1.3.2" "@popperjs/core@^2.5.4": version "2.9.2" @@ -1830,6 +1834,11 @@ resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.9.tgz#01d7b86949f455402a94c788883fe4ba574cad41" integrity sha512-qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA== +"@types/babel__code-frame@^7.0.2": + version "7.0.3" + resolved "https://registry.yarnpkg.com/@types/babel__code-frame/-/babel__code-frame-7.0.3.tgz#eda94e1b7c9326700a4b69c485ebbc9498a0b63f" + integrity sha512-2TN6oiwtNjOezilFVl77zwdNPwQWaDBBCCWWxyo1ctiO3vAtd7H/aB/CBJdw9+kqq3+latD0SXoedIuHySSZWw== + "@types/babel__core@^7.1.3": version "7.1.14" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402" @@ -1930,6 +1939,14 @@ "@types/node" "*" "@types/qs" "*" +"@types/co-body@^6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@types/co-body/-/co-body-6.1.0.tgz#b52625390eb0d113c9b697ea92c3ffae7740cdb9" + integrity sha512-3e0q2jyDAnx/DSZi0z2H0yoZ2wt5yRDZ+P7ymcMObvq0ufWRT4tsajyO+Q1VwVWiv9PRR4W3YEjEzBjeZlhF+w== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/command-line-args@^5.0.0": version "5.0.0" resolved "https://registry.yarnpkg.com/@types/command-line-args/-/command-line-args-5.0.0.tgz#484e704d20dbb8754a8f091eee45cdd22bcff28c" @@ -2176,11 +2193,6 @@ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256" integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg== -"@types/mocha@^5.2.7": - version "5.2.7" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea" - integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ== - "@types/mocha@^8.2.0": version "8.2.2" resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.2.tgz#91daa226eb8c2ff261e6a8cbf8c7304641e095e0" @@ -2295,6 +2307,11 @@ resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-1.0.6.tgz#569b8a08121d3203398290d602d84d73c8dcf5da" integrity sha512-230RC8sFeHoT6sSUlRO6a8cAnclO06eeiq1QDfiv2FGCLWFvvERWgwIQD4FWqD9A69BN7Lzee4OXwoMVnnsWDw== +"@types/trusted-types@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756" + integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg== + "@types/uglify-js@*": version "3.13.0" resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.0.tgz#1cad8df1fb0b143c5aba08de5712ea9d1ff71124" @@ -2397,6 +2414,30 @@ picomatch "^2.2.2" ws "^7.4.2" +"@web/dev-server-core@^0.3.16": + version "0.3.16" + resolved "https://registry.yarnpkg.com/@web/dev-server-core/-/dev-server-core-0.3.16.tgz#7404383d05031f462a29f578dc35948d0af35344" + integrity sha512-nj6liCErIGtpuZYPf6QaxGQ9nlaHd8Cf/NBcRhogskvjOVFkF3FS9xpjRw3WidkmOQnk+D0ZGCeXjtTibgy5CA== + dependencies: + "@types/koa" "^2.11.6" + "@types/ws" "^7.4.0" + "@web/parse5-utils" "^1.2.0" + chokidar "^3.4.3" + clone "^2.1.2" + es-module-lexer "^0.9.0" + get-stream "^6.0.0" + is-stream "^2.0.0" + isbinaryfile "^4.0.6" + koa "^2.13.0" + koa-etag "^4.0.0" + koa-send "^5.0.1" + koa-static "^5.0.0" + lru-cache "^6.0.0" + mime-types "^2.1.27" + parse5 "^6.0.1" + picomatch "^2.2.2" + ws "^7.4.2" + "@web/dev-server-legacy@^0.1.7": version "0.1.7" resolved "https://registry.yarnpkg.com/@web/dev-server-legacy/-/dev-server-legacy-0.1.7.tgz#51e126c7c0b8b9f4f4940964e0713c8b8cf455cb" @@ -2540,6 +2581,14 @@ "@web/test-runner-core" "^0.10.14" mkdirp "^1.0.4" +"@web/test-runner-commands@^0.5.7": + version "0.5.13" + resolved "https://registry.yarnpkg.com/@web/test-runner-commands/-/test-runner-commands-0.5.13.tgz#57ea472c00ee2ada99eb9bb5a0371200922707c2" + integrity sha512-FXnpUU89ALbRlh9mgBd7CbSn5uzNtr8gvnQZPOvGLDAJ7twGvZdUJEAisPygYx2BLPSFl3/Mre8pH8zshJb8UQ== + dependencies: + "@web/test-runner-core" "^0.10.20" + mkdirp "^1.0.4" + "@web/test-runner-core@^0.10.14", "@web/test-runner-core@^0.10.17", "@web/test-runner-core@^0.10.8", "@web/test-runner-core@^0.10.9": version "0.10.17" resolved "https://registry.yarnpkg.com/@web/test-runner-core/-/test-runner-core-0.10.17.tgz#bae17071d1e5a5fd9fa01cf759644352c243c513" @@ -2572,6 +2621,38 @@ source-map "^0.7.3" uuid "^8.3.2" +"@web/test-runner-core@^0.10.20": + version "0.10.22" + resolved "https://registry.yarnpkg.com/@web/test-runner-core/-/test-runner-core-0.10.22.tgz#34bb67d12a79b01dc79c816f3d76f3419ef50eaf" + integrity sha512-0jzJIl/PTZa6PCG/noHAFZT2DTcp+OYGmYOnZ2wcHAO3KwtJKnBVSuxgdOzFdmfvoO7TYAXo5AH+MvTZXMWsZw== + dependencies: + "@babel/code-frame" "^7.12.11" + "@types/babel__code-frame" "^7.0.2" + "@types/co-body" "^6.1.0" + "@types/convert-source-map" "^1.5.1" + "@types/debounce" "^1.2.0" + "@types/istanbul-lib-coverage" "^2.0.3" + "@types/istanbul-reports" "^3.0.0" + "@web/browser-logs" "^0.2.1" + "@web/dev-server-core" "^0.3.16" + chokidar "^3.4.3" + cli-cursor "^3.1.0" + co-body "^6.1.0" + convert-source-map "^1.7.0" + debounce "^1.2.0" + dependency-graph "^0.11.0" + globby "^11.0.1" + ip "^1.1.5" + istanbul-lib-coverage "^3.0.0" + istanbul-lib-report "^3.0.0" + istanbul-reports "^3.0.2" + log-update "^4.0.0" + nanocolors "^0.2.1" + nanoid "^3.1.25" + open "^8.0.2" + picomatch "^2.2.2" + source-map "^0.7.3" + "@web/test-runner-coverage-v8@^0.4.5": version "0.4.6" resolved "https://registry.yarnpkg.com/@web/test-runner-coverage-v8/-/test-runner-coverage-v8-0.4.6.tgz#bf7ee2a9ab4ec06a3880f96bd156b142dc60f6ff" @@ -2629,16 +2710,16 @@ portfinder "^1.0.28" source-map "^0.7.3" -"@webcomponents/scoped-custom-element-registry@0.0.1": - version "0.0.1" - resolved "https://registry.yarnpkg.com/@webcomponents/scoped-custom-element-registry/-/scoped-custom-element-registry-0.0.1.tgz#196365260a019f87bddbded154ab09faf0e666fc" - integrity sha512-ef5/v4U2vCxrnSMpo41LSWTjBOXCQ4JOt4+Y6PaSd8ympYioPhOP6E1tKmIk2ppwLSjCKbTyYf7ocHvwDat7bA== - "@webcomponents/scoped-custom-element-registry@0.0.2": version "0.0.2" resolved "https://registry.yarnpkg.com/@webcomponents/scoped-custom-element-registry/-/scoped-custom-element-registry-0.0.2.tgz#c863d163cb39c60063808e5ae23e06a1766fbe5f" integrity sha512-lKCoZfKoE3FHvmmj2ytaLBB8Grxp4HaxfSzaGlIZN6xXnOILfpCO0PFJkAxanefLGJWMho4kRY5PhgxWFhmSOw== +"@webcomponents/scoped-custom-element-registry@^0.0.3": + version "0.0.3" + resolved "https://registry.yarnpkg.com/@webcomponents/scoped-custom-element-registry/-/scoped-custom-element-registry-0.0.3.tgz#774591a886b0b0e4914717273ba53fd8d5657522" + integrity sha512-lpSzgDCGbM99dytb3+J3Suo4+Bk1E13MPnWB42JK8GwxSAxFz+tC7TTv2hhDSIE2IirGNKNKCf3m08ecu6eAsQ== + "@webcomponents/shadycss@^1.10.2": version "1.10.2" resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.10.2.tgz#40e03cab6dc5e12f199949ba2b79e02f183d1e7b" @@ -3091,6 +3172,11 @@ axe-core@^4.0.2: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.2.0.tgz#6594db4ee62f78be79e32a7295d21b099b60668d" integrity sha512-1uIESzroqpaTzt9uX48HO+6gfnKu3RwvWdCcWSrX4csMInJfCo1yvKPNXCwXFRpJqRW25tiASb6No0YH57PXqg== +axe-core@^4.3.3: + version "4.3.3" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.3.tgz#b55cd8e8ddf659fe89b064680e1c6a4dceab0325" + integrity sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA== + axios@0.21.1: version "0.21.1" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" @@ -3633,12 +3719,12 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chai-a11y-axe@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/chai-a11y-axe/-/chai-a11y-axe-1.3.1.tgz#1889d2b639612ff4e9b9e40ff528442fd0191798" - integrity sha512-O+JJ+fELEvK/5SwFe9ltIk+qYz9p+zjnw/iUC1qNrlpgEPvTxScvyvQSU7eP73ixxHkCH1oNFAqkiM+MopbCEw== +chai-a11y-axe@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/chai-a11y-axe/-/chai-a11y-axe-1.3.2.tgz#77dc5f503901fed4f6097b5b0213ddb00cc891ea" + integrity sha512-/jYczmhGUoCfEcsrkJwjecy3PJ31T9FxFdu2BDlAwR/sX1nN3L2XmuPP3tw8iYk6LPqdF7K11wwFr3yUZMv5MA== dependencies: - axe-core "^4.0.2" + axe-core "^4.3.3" chai@^4.2.0: version "4.3.4" @@ -5311,6 +5397,11 @@ es-module-lexer@^0.4.0: resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.1.tgz#dda8c6a14d8f340a24e34331e0fab0cb50438e0e" integrity sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA== +es-module-lexer@^0.9.0: + version "0.9.3" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== + es-module-shims@^0.4.6, es-module-shims@^0.4.7: version "0.4.7" resolved "https://registry.yarnpkg.com/es-module-shims/-/es-module-shims-0.4.7.tgz#1419b65bbd38dfe91ab8ea5d7b4b454561e44641" @@ -7784,6 +7875,14 @@ lit-element@^2.4.0: dependencies: lit-html "^1.1.1" +lit-element@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-3.0.0.tgz#0e9e64ddbc3dd6a8da4d6fbfadbc070a54cf0597" + integrity sha512-oPqRhhBBhs+AlI62QLwtWQNU/bNK/h2L1jI3IDroqZubo6XVAkyNy2dW3CRfjij8mrNlY7wULOfyyKKOnfEePA== + dependencies: + "@lit/reactive-element" "^1.0.0" + lit-html "^2.0.0" + lit-element@^3.0.0-rc.2: version "3.0.0-rc.2" resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-3.0.0-rc.2.tgz#883d0b6fd7b846226d360699d1b713da5fc7e1b7" @@ -7804,6 +7903,13 @@ lit-html@^1.0.0, lit-html@^1.1.1, lit-html@^1.3.0: resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.4.1.tgz#0c6f3ee4ad4eb610a49831787f0478ad8e9ae5e0" integrity sha512-B9btcSgPYb1q4oSOb/PrOT6Z/H+r6xuNzfH4lFli/AWhYwdtrgQkQWBbIc6mdnf6E2IL3gDXdkkqNktpU0OZQA== +lit-html@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-2.0.0.tgz#ba6779269c382e66d7403a96ed99516ccc3d658b" + integrity sha512-tJsCapCmc0vtLj6harqd6HfCxnlt/RSkgowtz4SC9dFE3nSL38Tb33I5HMDiyJsRjQZRTgpVsahrnDrR9wg27w== + dependencies: + "@types/trusted-types" "^2.0.2" + lit-html@^2.0.0-rc.3: version "2.0.0-rc.3" resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-2.0.0-rc.3.tgz#1c216e548630e18d3093d97f4e29563abce659af" @@ -7811,7 +7917,16 @@ lit-html@^2.0.0-rc.3: dependencies: "@types/trusted-types" "^1.0.1" -lit@^2.0.0-rc.1, lit@^2.0.0-rc.2: +lit@^2.0.0, lit@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lit/-/lit-2.0.2.tgz#5e6f422924e0732258629fb379556b6d23f7179c" + integrity sha512-hKA/1YaSB+P+DvKWuR2q1Xzy/iayhNrJ3aveD0OQ9CKn6wUjsdnF/7LavDOJsKP/K5jzW/kXsuduPgRvTFrFJw== + dependencies: + "@lit/reactive-element" "^1.0.0" + lit-element "^3.0.0" + lit-html "^2.0.0" + +lit@^2.0.0-rc.2: version "2.0.0-rc.2" resolved "https://registry.yarnpkg.com/lit/-/lit-2.0.0-rc.2.tgz#724a2d621aa098001d73bf7106f3a72b7b5948ef" integrity sha512-BOCuoJR04WaTV8UqTKk09cNcQA10Aq2LCcBOiHuF7TzWH5RNDsbCBP5QM9sLBSotGTXbDug/gFO08jq6TbyEtw== @@ -7981,13 +8096,6 @@ lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@2.2.0, log-symbols@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" - integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg== - dependencies: - chalk "^2.0.1" - log-symbols@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4" @@ -8002,6 +8110,13 @@ log-symbols@^1.0.0: dependencies: chalk "^1.0.0" +log-symbols@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" + integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg== + dependencies: + chalk "^2.0.1" + log-symbols@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" @@ -8588,13 +8703,6 @@ mkdirp@*, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mkdirp@0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512" - integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw== - dependencies: - minimist "^1.2.5" - mkdirp@0.5.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" @@ -8602,35 +8710,6 @@ mkdirp@0.5.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5: dependencies: minimist "^1.2.5" -mocha@^6.2.2: - version "6.2.3" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.3.tgz#e648432181d8b99393410212664450a4c1e31912" - integrity sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg== - dependencies: - ansi-colors "3.2.3" - browser-stdout "1.3.1" - debug "3.2.6" - diff "3.5.0" - escape-string-regexp "1.0.5" - find-up "3.0.0" - glob "7.1.3" - growl "1.10.5" - he "1.2.0" - js-yaml "3.13.1" - log-symbols "2.2.0" - minimatch "3.0.4" - mkdirp "0.5.4" - ms "2.1.1" - node-environment-flags "1.0.5" - object.assign "4.1.0" - strip-json-comments "2.0.1" - supports-color "6.0.0" - which "1.3.1" - wide-align "1.1.3" - yargs "13.3.2" - yargs-parser "13.1.2" - yargs-unparser "1.6.0" - mocha@^7.1.1: version "7.2.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.2.0.tgz#01cc227b00d875ab1eed03a75106689cfed5a604" @@ -8736,6 +8815,16 @@ mz@^2.1.0: object-assign "^4.0.1" thenify-all "^1.0.0" +nanocolors@^0.2.1: + version "0.2.13" + resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.2.13.tgz#dfd1ed0bfab05e9fe540eb6874525f0a1684099b" + integrity sha512-0n3mSAQLPpGLV9ORXT5+C/D4mwew7Ebws69Hx4E2sgz2ZA5+32Q80B9tL8PbL7XHnRDiAxH/pnrUJ9a4fkTNTA== + +nanoid@^3.1.25: + version "3.1.30" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" + integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== + napi-build-utils@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" @@ -8804,14 +8893,6 @@ node-addon-api@^3.2.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== -node-environment-flags@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.5.tgz#fa930275f5bf5dae188d6192b24b4c8bbac3d76a" - integrity sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ== - dependencies: - object.getownpropertydescriptors "^2.0.3" - semver "^5.7.0" - node-environment-flags@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088" From c4562f7e64513094a28b85ce1b62a642ba9f38cd Mon Sep 17 00:00:00 2001 From: qa46hx Date: Wed, 10 Nov 2021 14:24:09 +0100 Subject: [PATCH 2/2] fix: use html & unsafeStatic from @open-wc/testing --- .changeset/few-books-provide.md | 17 ++++++++++++++ .changeset/twelve-zoos-turn.md | 2 +- .../button/test-suites/LionButton.suite.js | 16 +++++++++---- .../test-suites/LionButtonReset.suite.js | 6 ++--- .../test-suites/LionButtonSubmit.suite.js | 8 +++---- packages/combobox/test/lion-combobox.test.js | 9 ++++---- packages/core/test/DelegateMixin.test.js | 3 +-- packages/dialog/test/lion-dialog.test.js | 3 +-- .../test-suites/FormatMixin.suite.js | 6 ++--- .../choice-group/ChoiceGroupMixin.suite.js | 6 ++--- .../form-group/FormGroupMixin-input.suite.js | 7 +++--- .../form-group/FormGroupMixin.suite.js | 19 ++++++++++----- packages/form-core/test/FocusMixin.test.js | 3 +-- .../form-core/test/FormControlMixin.test.js | 7 +++--- packages/form-core/test/lion-field.test.js | 16 +++++++++---- .../test/utils/SyncUpdatableMixin.test.js | 3 +-- .../form-core/test/validate/Required.test.js | 3 +-- .../form-core/test/validate/Validator.test.js | 3 +-- .../test/form-validation-integrations.test.js | 9 ++++---- .../test/model-value-consistency.test.js | 3 +-- packages/form/test/lion-form.test.js | 19 +++++++++------ packages/input/test/lion-input.test.js | 5 ++-- .../listbox/test-suites/ListboxMixin.suite.js | 14 +++++++---- packages/localize/test/LocalizeMixin.test.js | 12 ++++++++-- .../test-suites/OverlayMixin.suite.js | 1 + .../overlays/test/OverlayController.test.js | 6 ++--- packages/overlays/test/OverlayMixin.test.js | 3 +-- ...ion-select-rich-dialog-integration.test.js | 5 ++-- .../select-rich/test/lion-select-rich.test.js | 23 ++++++++++++------- packages/tooltip/test/lion-tooltip.test.js | 5 ++-- 30 files changed, 140 insertions(+), 102 deletions(-) create mode 100644 .changeset/few-books-provide.md diff --git a/.changeset/few-books-provide.md b/.changeset/few-books-provide.md new file mode 100644 index 000000000..bce492ac0 --- /dev/null +++ b/.changeset/few-books-provide.md @@ -0,0 +1,17 @@ +--- +'@lion/button': patch +'@lion/combobox': patch +'@lion/core': patch +'@lion/dialog': patch +'@lion/form': patch +'@lion/form-core': patch +'@lion/form-integrations': patch +'@lion/input': patch +'@lion/listbox': patch +'@lion/localize': patch +'@lion/overlays': patch +'@lion/select-rich': patch +'@lion/tooltip': patch +--- + +use html & unsafeStatic from @open-wc/testing instead of directly from lit diff --git a/.changeset/twelve-zoos-turn.md b/.changeset/twelve-zoos-turn.md index c4c08fe64..e008e46a3 100644 --- a/.changeset/twelve-zoos-turn.md +++ b/.changeset/twelve-zoos-turn.md @@ -1,5 +1,5 @@ --- -"providence-analytics": patch +'providence-analytics': patch --- Correct default target in Windows if no -t diff --git a/packages/button/test-suites/LionButton.suite.js b/packages/button/test-suites/LionButton.suite.js index ce329fbad..15ff25edc 100644 --- a/packages/button/test-suites/LionButton.suite.js +++ b/packages/button/test-suites/LionButton.suite.js @@ -1,11 +1,17 @@ /* eslint-disable lit-a11y/click-events-have-key-events */ -import { browserDetection } from '@lion/core'; -import { aTimeout, expect, fixture, oneEvent, defineCE } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; - import { LionButton } from '@lion/button'; -import sinon from 'sinon'; +import { browserDetection } from '@lion/core'; import '@lion/core/differentKeyEventNamesShimIE'; +import { + aTimeout, + defineCE, + expect, + fixture, + html, + oneEvent, + unsafeStatic, +} from '@open-wc/testing'; +import sinon from 'sinon'; export function LionButtonSuite({ klass = LionButton } = {}) { const tagStringButton = defineCE(class extends klass {}); diff --git a/packages/button/test-suites/LionButtonReset.suite.js b/packages/button/test-suites/LionButtonReset.suite.js index e541eb753..a9a0a0ba0 100644 --- a/packages/button/test-suites/LionButtonReset.suite.js +++ b/packages/button/test-suites/LionButtonReset.suite.js @@ -1,10 +1,8 @@ /* eslint-disable lit-a11y/click-events-have-key-events */ -import { aTimeout, expect, fixture, defineCE } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; - import { LionButtonReset } from '@lion/button'; -import sinon from 'sinon'; import '@lion/core/differentKeyEventNamesShimIE'; +import { aTimeout, defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing'; +import sinon from 'sinon'; export function LionButtonResetSuite({ klass = LionButtonReset } = {}) { const tagStringButtonReset = defineCE(class extends klass {}); diff --git a/packages/button/test-suites/LionButtonSubmit.suite.js b/packages/button/test-suites/LionButtonSubmit.suite.js index b5bbd2538..f294c911b 100644 --- a/packages/button/test-suites/LionButtonSubmit.suite.js +++ b/packages/button/test-suites/LionButtonSubmit.suite.js @@ -1,11 +1,9 @@ /* eslint-disable lit-a11y/click-events-have-key-events */ -import { aTimeout, expect, fixture, defineCE } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; - -import { sendKeys } from '@web/test-runner-commands'; import { LionButtonSubmit } from '@lion/button'; -import sinon from 'sinon'; import '@lion/core/differentKeyEventNamesShimIE'; +import { aTimeout, defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing'; +import { sendKeys } from '@web/test-runner-commands'; +import sinon from 'sinon'; export function LionButtonSubmitSuite({ klass = LionButtonSubmit } = {}) { const tagStringButton = defineCE(class extends klass {}); diff --git a/packages/combobox/test/lion-combobox.test.js b/packages/combobox/test/lion-combobox.test.js index 31de70e98..4a67bb430 100644 --- a/packages/combobox/test/lion-combobox.test.js +++ b/packages/combobox/test/lion-combobox.test.js @@ -1,11 +1,10 @@ -import '@lion/listbox/define-option'; -import { expect, fixture, defineCE } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; -import sinon from 'sinon'; import '@lion/combobox/define'; import { browserDetection, LitElement } from '@lion/core'; -import { getListboxMembers } from '@lion/listbox/test-helpers'; import { Required } from '@lion/form-core'; +import '@lion/listbox/define-option'; +import { getListboxMembers } from '@lion/listbox/test-helpers'; +import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing'; +import sinon from 'sinon'; import { LionCombobox } from '../src/LionCombobox.js'; /** diff --git a/packages/core/test/DelegateMixin.test.js b/packages/core/test/DelegateMixin.test.js index 1acc9babf..46fa03192 100644 --- a/packages/core/test/DelegateMixin.test.js +++ b/packages/core/test/DelegateMixin.test.js @@ -1,5 +1,4 @@ -import { defineCE, expect, fixture } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; +import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing'; import sinon from 'sinon'; import { LitElement } from '../index.js'; import { DelegateMixin } from '../src/DelegateMixin.js'; diff --git a/packages/dialog/test/lion-dialog.test.js b/packages/dialog/test/lion-dialog.test.js index 41d71a2a5..0ef4892a4 100644 --- a/packages/dialog/test/lion-dialog.test.js +++ b/packages/dialog/test/lion-dialog.test.js @@ -1,5 +1,4 @@ -import { expect, fixture as _fixture } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; +import { expect, fixture as _fixture, html, unsafeStatic } from '@open-wc/testing'; import { runOverlayMixinSuite } from '../../overlays/test-suites/OverlayMixin.suite.js'; import '@lion/dialog/define'; diff --git a/packages/form-core/test-suites/FormatMixin.suite.js b/packages/form-core/test-suites/FormatMixin.suite.js index 16b1ac57f..7bfa1c144 100644 --- a/packages/form-core/test-suites/FormatMixin.suite.js +++ b/packages/form-core/test-suites/FormatMixin.suite.js @@ -1,11 +1,9 @@ import { LitElement } from '@lion/core'; import { parseDate } from '@lion/localize'; -import { aTimeout, defineCE, expect, fixture } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; - +import { aTimeout, defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing'; import sinon from 'sinon'; -import { FormatMixin } from '../src/FormatMixin.js'; import { Unparseable, Validator } from '../index.js'; +import { FormatMixin } from '../src/FormatMixin.js'; import { getFormControlMembers } from '../test-helpers/getFormControlMembers.js'; /** diff --git a/packages/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js b/packages/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js index 186263314..621665a03 100644 --- a/packages/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js +++ b/packages/form-core/test-suites/choice-group/ChoiceGroupMixin.suite.js @@ -1,10 +1,8 @@ import { LitElement } from '@lion/core'; -import { LionInput } from '@lion/input'; import '@lion/fieldset/define'; import { FormGroupMixin, Required } from '@lion/form-core'; -import { expect, fixture, fixtureSync } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; - +import { LionInput } from '@lion/input'; +import { expect, fixture, fixtureSync, html, unsafeStatic } from '@open-wc/testing'; import sinon from 'sinon'; import { ChoiceGroupMixin } from '../../src/choice-group/ChoiceGroupMixin.js'; import { ChoiceInputMixin } from '../../src/choice-group/ChoiceInputMixin.js'; diff --git a/packages/form-core/test-suites/form-group/FormGroupMixin-input.suite.js b/packages/form-core/test-suites/form-group/FormGroupMixin-input.suite.js index ead12dd89..0e50d3d8f 100644 --- a/packages/form-core/test-suites/form-group/FormGroupMixin-input.suite.js +++ b/packages/form-core/test-suites/form-group/FormGroupMixin-input.suite.js @@ -1,10 +1,9 @@ import { LitElement } from '@lion/core'; -import { localizeTearDown } from '@lion/localize/test-helpers'; -import { html, unsafeStatic } from 'lit/static-html.js'; -import { defineCE, expect, fixture } from '@open-wc/testing'; +import '@lion/form-core/define'; import { getFormControlMembers } from '@lion/form-core/test-helpers'; import { LionInput } from '@lion/input'; -import '@lion/form-core/define'; +import { localizeTearDown } from '@lion/localize/test-helpers'; +import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing'; import { FormGroupMixin } from '../../src/form-group/FormGroupMixin.js'; /** diff --git a/packages/form-core/test-suites/form-group/FormGroupMixin.suite.js b/packages/form-core/test-suites/form-group/FormGroupMixin.suite.js index 992dc36fc..171dc4bf3 100644 --- a/packages/form-core/test-suites/form-group/FormGroupMixin.suite.js +++ b/packages/form-core/test-suites/form-group/FormGroupMixin.suite.js @@ -1,10 +1,17 @@ -import { LitElement, ifDefined } from '@lion/core'; -import { html, unsafeStatic } from 'lit/static-html.js'; -import { localizeTearDown } from '@lion/localize/test-helpers'; -import { defineCE, expect, triggerFocusFor, fixture, aTimeout } from '@open-wc/testing'; -import sinon from 'sinon'; -import { IsNumber, Validator, LionField } from '@lion/form-core'; +import { ifDefined, LitElement } from '@lion/core'; +import { IsNumber, LionField, Validator } from '@lion/form-core'; import '@lion/form-core/define'; +import { localizeTearDown } from '@lion/localize/test-helpers'; +import { + aTimeout, + defineCE, + expect, + fixture, + html, + triggerFocusFor, + unsafeStatic, +} from '@open-wc/testing'; +import sinon from 'sinon'; import { FormGroupMixin } from '../../src/form-group/FormGroupMixin.js'; import { getFormControlMembers } from '../../test-helpers/getFormControlMembers.js'; diff --git a/packages/form-core/test/FocusMixin.test.js b/packages/form-core/test/FocusMixin.test.js index b32ef4619..0a1aaf113 100644 --- a/packages/form-core/test/FocusMixin.test.js +++ b/packages/form-core/test/FocusMixin.test.js @@ -1,6 +1,5 @@ import { LitElement } from '@lion/core'; -import { defineCE, expect, fixture, oneEvent } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; +import { defineCE, expect, fixture, html, oneEvent, unsafeStatic } from '@open-wc/testing'; import sinon from 'sinon'; import { FocusMixin } from '../src/FocusMixin.js'; diff --git a/packages/form-core/test/FormControlMixin.test.js b/packages/form-core/test/FormControlMixin.test.js index 0fcd835fa..bbc5e373b 100644 --- a/packages/form-core/test/FormControlMixin.test.js +++ b/packages/form-core/test/FormControlMixin.test.js @@ -1,12 +1,11 @@ -import { expect, defineCE, fixture } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; import { LitElement } from '@lion/core'; import { getFormControlMembers } from '@lion/form-core/test-helpers'; +import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing'; import sinon from 'sinon'; -import { FormControlMixin } from '../src/FormControlMixin.js'; -import { FormRegistrarMixin } from '../src/registration/FormRegistrarMixin.js'; import { FocusMixin } from '../src/FocusMixin.js'; import { FormGroupMixin } from '../src/form-group/FormGroupMixin.js'; +import { FormControlMixin } from '../src/FormControlMixin.js'; +import { FormRegistrarMixin } from '../src/registration/FormRegistrarMixin.js'; /** * @typedef {import('../types/FormControlMixinTypes').FormControlHost} FormControlHost diff --git a/packages/form-core/test/lion-field.test.js b/packages/form-core/test/lion-field.test.js index 0e666c5ea..7a5bcba72 100644 --- a/packages/form-core/test/lion-field.test.js +++ b/packages/form-core/test/lion-field.test.js @@ -1,12 +1,18 @@ import { unsafeHTML } from '@lion/core'; +import { Required, Validator } from '@lion/form-core'; +import '@lion/form-core/define-field'; +import { getFormControlMembers } from '@lion/form-core/test-helpers'; import { localize } from '@lion/localize'; import { localizeTearDown } from '@lion/localize/test-helpers'; -import { Required, Validator } from '@lion/form-core'; -import { expect, fixture, triggerBlurFor, triggerFocusFor } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; -import { getFormControlMembers } from '@lion/form-core/test-helpers'; +import { + expect, + fixture, + html, + triggerBlurFor, + triggerFocusFor, + unsafeStatic, +} from '@open-wc/testing'; import sinon from 'sinon'; -import '@lion/form-core/define-field'; /** * @typedef {import('../src/LionField.js').LionField} LionField diff --git a/packages/form-core/test/utils/SyncUpdatableMixin.test.js b/packages/form-core/test/utils/SyncUpdatableMixin.test.js index 777edc563..d04b58530 100644 --- a/packages/form-core/test/utils/SyncUpdatableMixin.test.js +++ b/packages/form-core/test/utils/SyncUpdatableMixin.test.js @@ -1,6 +1,5 @@ import { LitElement } from '@lion/core'; -import { defineCE, expect, fixture, fixtureSync } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; +import { defineCE, expect, fixture, fixtureSync, html, unsafeStatic } from '@open-wc/testing'; import sinon from 'sinon'; import { SyncUpdatableMixin } from '../../src/utils/SyncUpdatableMixin.js'; diff --git a/packages/form-core/test/validate/Required.test.js b/packages/form-core/test/validate/Required.test.js index 24cdf9902..097f6abd8 100644 --- a/packages/form-core/test/validate/Required.test.js +++ b/packages/form-core/test/validate/Required.test.js @@ -1,7 +1,6 @@ -import { expect, fixture, defineCE } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; import { LionField } from '@lion/form-core'; import { getFormControlMembers } from '@lion/form-core/test-helpers'; +import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing'; import { Required } from '../../src/validate/validators/Required.js'; /** diff --git a/packages/form-core/test/validate/Validator.test.js b/packages/form-core/test/validate/Validator.test.js index 5ef5f6e29..3886ab386 100644 --- a/packages/form-core/test/validate/Validator.test.js +++ b/packages/form-core/test/validate/Validator.test.js @@ -1,6 +1,5 @@ import { LitElement } from '@lion/core'; -import { defineCE, expect, fixture } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; +import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing'; import sinon from 'sinon'; import { ValidateMixin } from '../../src/validate/ValidateMixin.js'; import { Validator } from '../../src/validate/Validator.js'; diff --git a/packages/form-integrations/test/form-validation-integrations.test.js b/packages/form-integrations/test/form-validation-integrations.test.js index f2701afe6..614523032 100644 --- a/packages/form-integrations/test/form-validation-integrations.test.js +++ b/packages/form-integrations/test/form-validation-integrations.test.js @@ -1,11 +1,10 @@ -import { expect, fixture, defineCE } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; -import { Required, DefaultSuccess, Validator } from '@lion/form-core'; +import { DefaultSuccess, Required, Validator } from '@lion/form-core'; +import { getFormControlMembers } from '@lion/form-core/test-helpers'; +import { LionInput } from '@lion/input'; import { localize } from '@lion/localize'; import { loadDefaultFeedbackMessages } from '@lion/validate-messages'; -import { LionInput } from '@lion/input'; +import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing'; import sinon from 'sinon'; -import { getFormControlMembers } from '@lion/form-core/test-helpers'; describe('Form Validation Integrations', () => { const lightDom = ''; diff --git a/packages/form-integrations/test/model-value-consistency.test.js b/packages/form-integrations/test/model-value-consistency.test.js index 7b11e98f6..1ae2a5a7d 100644 --- a/packages/form-integrations/test/model-value-consistency.test.js +++ b/packages/form-integrations/test/model-value-consistency.test.js @@ -1,5 +1,4 @@ -import { expect, fixture } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; +import { expect, fixture, html, unsafeStatic } from '@open-wc/testing'; // eslint-disable-next-line import/no-extraneous-dependencies import sinon from 'sinon'; diff --git a/packages/form/test/lion-form.test.js b/packages/form/test/lion-form.test.js index e3d3ddd20..9fa3e39a9 100644 --- a/packages/form/test/lion-form.test.js +++ b/packages/form/test/lion-form.test.js @@ -1,15 +1,20 @@ -import { expect, fixture as _fixture, oneEvent, aTimeout, defineCE } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; -import { spy } from 'sinon'; -import { LionField } from '@lion/form-core'; import { LionFieldset } from '@lion/fieldset'; -import '@lion/form-core/define'; import '@lion/fieldset/define'; - +import { LionField } from '@lion/form-core'; +import '@lion/form-core/define'; import '@lion/form/define'; +import { + aTimeout, + defineCE, + expect, + fixture as _fixture, + html, + oneEvent, + unsafeStatic, +} from '@open-wc/testing'; +import { spy } from 'sinon'; /** - * @typedef {import('../src/LionForm').LionForm} LionForm * @typedef {import('@lion/core').TemplateResult} TemplateResult */ diff --git a/packages/input/test/lion-input.test.js b/packages/input/test/lion-input.test.js index e3740f411..8a58e77a1 100644 --- a/packages/input/test/lion-input.test.js +++ b/packages/input/test/lion-input.test.js @@ -1,8 +1,7 @@ import { Validator } from '@lion/form-core'; -import { expect, fixture, triggerFocusFor, aTimeout } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; -import { getInputMembers } from '../test-helpers/index.js'; import '@lion/input/define'; +import { aTimeout, expect, fixture, html, triggerFocusFor, unsafeStatic } from '@open-wc/testing'; +import { getInputMembers } from '../test-helpers/index.js'; /** * @typedef {import('../src/LionInput').LionInput} LionInput diff --git a/packages/listbox/test-suites/ListboxMixin.suite.js b/packages/listbox/test-suites/ListboxMixin.suite.js index 653c6b99e..7b484e3f5 100644 --- a/packages/listbox/test-suites/ListboxMixin.suite.js +++ b/packages/listbox/test-suites/ListboxMixin.suite.js @@ -1,11 +1,17 @@ +import { LitElement, repeat } from '@lion/core'; import '@lion/core/differentKeyEventNamesShimIE'; -import { repeat, LitElement } from '@lion/core'; import { Required } from '@lion/form-core'; import { LionOptions } from '@lion/listbox'; import '@lion/listbox/define'; -import { expect, aTimeout, nextFrame, fixture as _fixture, defineCE } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; - +import { + aTimeout, + defineCE, + expect, + fixture as _fixture, + html, + nextFrame, + unsafeStatic, +} from '@open-wc/testing'; import sinon from 'sinon'; import { getListboxMembers } from '../test-helpers/index.js'; diff --git a/packages/localize/test/LocalizeMixin.test.js b/packages/localize/test/LocalizeMixin.test.js index 122bc2dbb..7a1753ba0 100644 --- a/packages/localize/test/LocalizeMixin.test.js +++ b/packages/localize/test/LocalizeMixin.test.js @@ -1,6 +1,14 @@ import { isDirectiveResult, LitElement } from '@lion/core'; -import { aTimeout, defineCE, expect, fixture, fixtureSync, nextFrame } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; +import { + aTimeout, + defineCE, + expect, + fixture, + fixtureSync, + html, + nextFrame, + unsafeStatic, +} from '@open-wc/testing'; import sinon from 'sinon'; import { localize } from '../src/localize.js'; import { LocalizeMixin } from '../src/LocalizeMixin.js'; diff --git a/packages/overlays/test-suites/OverlayMixin.suite.js b/packages/overlays/test-suites/OverlayMixin.suite.js index a27e0f9b4..4ae6508c9 100644 --- a/packages/overlays/test-suites/OverlayMixin.suite.js +++ b/packages/overlays/test-suites/OverlayMixin.suite.js @@ -1,4 +1,5 @@ import { expect, fixture, html, nextFrame, aTimeout } from '@open-wc/testing'; + import sinon from 'sinon'; import { overlays } from '../src/overlays.js'; import { OverlayController } from '../src/OverlayController.js'; diff --git a/packages/overlays/test/OverlayController.test.js b/packages/overlays/test/OverlayController.test.js index a1edbf22e..51304c27a 100644 --- a/packages/overlays/test/OverlayController.test.js +++ b/packages/overlays/test/OverlayController.test.js @@ -1,10 +1,8 @@ /* eslint-disable no-new */ -import { aTimeout, defineCE, expect, fixture } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; +import '@lion/core/differentKeyEventNamesShimIE'; +import { aTimeout, defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing'; import { fixtureSync } from '@open-wc/testing-helpers'; import sinon from 'sinon'; - -import '@lion/core/differentKeyEventNamesShimIE'; import { OverlayController } from '../src/OverlayController.js'; import { overlays } from '../src/overlays.js'; import { keyCodes } from '../src/utils/key-codes.js'; diff --git a/packages/overlays/test/OverlayMixin.test.js b/packages/overlays/test/OverlayMixin.test.js index 34fb94c1f..842b90e72 100644 --- a/packages/overlays/test/OverlayMixin.test.js +++ b/packages/overlays/test/OverlayMixin.test.js @@ -1,5 +1,4 @@ -import { defineCE } from '@open-wc/testing'; -import { unsafeStatic } from 'lit/static-html.js'; +import { defineCE, unsafeStatic } from '@open-wc/testing'; import { LitElement, html } from '@lion/core'; import { runOverlayMixinSuite } from '../test-suites/OverlayMixin.suite.js'; import { OverlayMixin } from '../src/OverlayMixin.js'; diff --git a/packages/select-rich/test/lion-select-rich-dialog-integration.test.js b/packages/select-rich/test/lion-select-rich-dialog-integration.test.js index 3b3d1f178..4dbbb7130 100644 --- a/packages/select-rich/test/lion-select-rich-dialog-integration.test.js +++ b/packages/select-rich/test/lion-select-rich-dialog-integration.test.js @@ -1,9 +1,8 @@ -import { OverlayMixin } from '@lion/overlays'; import { LitElement } from '@lion/core'; -import { defineCE, fixture, expect } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; import '@lion/listbox/define'; +import { OverlayMixin } from '@lion/overlays'; import '@lion/select-rich/define'; +import { defineCE, expect, fixture, html, unsafeStatic } from '@open-wc/testing'; /** * @typedef {import('../src/LionSelectRich').LionSelectRich} LionSelectRich diff --git a/packages/select-rich/test/lion-select-rich.test.js b/packages/select-rich/test/lion-select-rich.test.js index cda11372f..f68f47999 100644 --- a/packages/select-rich/test/lion-select-rich.test.js +++ b/packages/select-rich/test/lion-select-rich.test.js @@ -1,15 +1,22 @@ import { LitElement } from '@lion/core'; -import { renderLitAsNode } from '@lion/helpers'; -import { OverlayController } from '@lion/overlays'; -import { LionOption } from '@lion/listbox'; -import { mimicClick } from '@lion/overlays/test-helpers'; -import { aTimeout, defineCE, expect, nextFrame, fixture as _fixture } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; -import { LionSelectInvoker, LionSelectRich } from '@lion/select-rich'; import '@lion/core/differentKeyEventNamesShimIE'; +import { renderLitAsNode } from '@lion/helpers'; +import { LionOption } from '@lion/listbox'; import '@lion/listbox/define'; -import '@lion/select-rich/define'; import { getListboxMembers } from '@lion/listbox/test-helpers'; +import { OverlayController } from '@lion/overlays'; +import { mimicClick } from '@lion/overlays/test-helpers'; +import { LionSelectInvoker, LionSelectRich } from '@lion/select-rich'; +import '@lion/select-rich/define'; +import { + aTimeout, + defineCE, + expect, + fixture as _fixture, + html, + nextFrame, + unsafeStatic, +} from '@open-wc/testing'; /** * @typedef {import('@lion/listbox/src/LionOptions').LionOptions} LionOptions diff --git a/packages/tooltip/test/lion-tooltip.test.js b/packages/tooltip/test/lion-tooltip.test.js index 1009af4fb..ee070c735 100644 --- a/packages/tooltip/test/lion-tooltip.test.js +++ b/packages/tooltip/test/lion-tooltip.test.js @@ -1,7 +1,6 @@ -import { aTimeout, expect, fixture } from '@open-wc/testing'; -import { html, unsafeStatic } from 'lit/static-html.js'; -import { runOverlayMixinSuite } from '../../overlays/test-suites/OverlayMixin.suite.js'; import '@lion/tooltip/define'; +import { aTimeout, expect, fixture, html, unsafeStatic } from '@open-wc/testing'; +import { runOverlayMixinSuite } from '../../overlays/test-suites/OverlayMixin.suite.js'; /** * @typedef {import('../src/LionTooltip.js').LionTooltip} LionTooltip