From 0b516a6410e385c02309c015b7406b32f813c286 Mon Sep 17 00:00:00 2001 From: "christian.b.hoffmann" Date: Tue, 19 Dec 2023 15:13:37 +0100 Subject: [PATCH 01/10] added lit-analyzer to compile step and updated vs code extensions --- .vscode/extensions.json | 2 +- package.json | 4 +- packages/ui-library/package.json | 1 + packages/ui-library/tsconfig.json | 12 ++- yarn.lock | 161 +++++++++++++++++++++++++++++- 5 files changed, 175 insertions(+), 5 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 1c331e2a1..a3a69bef6 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,6 +3,6 @@ "editorconfig.editorconfig", "dbaeumer.vscode-eslint", "esbenp.prettier-vscode", - "bierner.lit-html" + "runem.lit-analyzer" ] } diff --git a/package.json b/package.json index 12be82c75..552225e53 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "doc:check": "deven-documentation-skeleton check", "doc:update": "deven-documentation-skeleton update", "compile:icons": "yarn workspace @boiler/icons compile:icons", - "compile": "yarn workspace @boiler/ui-library compile", + "compile": "yarn workspace @boiler/ui-library compile && yarn workspace @boiler/ui-library analyze", "tokens:generate": "yarn workspace @boiler/figma-design-tokens tokens:generate", "prepare": "husky install" }, @@ -77,6 +77,7 @@ "html-webpack-plugin": "^5.5.0", "husky": "^8.0.0", "lint-staged": "^13.1.0", + "lit-analyzer": "^2.0.2", "lit-html": "^2.6.1", "lodash.camelcase": "4.3.0", "mini-css-extract-plugin": "^2.7.2", @@ -92,6 +93,7 @@ "stylelint": "^14.16.1", "stylelint-config-standard": "^29.0.0", "svgo": "^3.0.2", + "ts-lit-plugin": "^2.0.1", "ts-node": "^10.9.1", "typescript": "^5.3.0", "webpack": "^5.75.0", diff --git a/packages/ui-library/package.json b/packages/ui-library/package.json index 630894c4c..da3d914aa 100644 --- a/packages/ui-library/package.json +++ b/packages/ui-library/package.json @@ -5,6 +5,7 @@ "scripts": { "start:storybook": "sb dev -p 1337", "compile": "tsc --project tsconfig.json", + "analyze": "npx lit-analyzer \"packages/ui-library/src/**/*.{js,ts}\"", "build:storybook": "sb build", "build": "NODE_ENV=production webpack --config webpack.prod.js", "build:types": "rimraf types && tsc --emitDeclarationOnly", diff --git a/packages/ui-library/tsconfig.json b/packages/ui-library/tsconfig.json index 70bc31691..768f41888 100644 --- a/packages/ui-library/tsconfig.json +++ b/packages/ui-library/tsconfig.json @@ -14,7 +14,17 @@ "experimentalDecorators": true, "skipLibCheck": true, "strict": true, - "useDefineForClassFields": false + "useDefineForClassFields": false, + "plugins": [ + { + "name": "ts-lit-plugin", + "strict": true, + "rules": { + "no-unknown-tag-name": "off", + "no-unknown-event": "warning" + } + } + ] }, "include": ["src"], "exclude": [""] diff --git a/yarn.lock b/yarn.lock index a39a78bda..0b74bc611 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1575,6 +1575,7 @@ __metadata: husky: "npm:^8.0.0" lint-staged: "npm:^13.1.0" lit: "npm:^2.7.4" + lit-analyzer: "npm:^2.0.2" lit-html: "npm:^2.6.1" lodash.camelcase: "npm:4.3.0" mini-css-extract-plugin: "npm:^2.7.2" @@ -1592,6 +1593,7 @@ __metadata: stylelint: "npm:^14.16.1" stylelint-config-standard: "npm:^29.0.0" svgo: "npm:^3.0.2" + ts-lit-plugin: "npm:^2.0.1" ts-node: "npm:^10.9.1" typescript: "npm:^5.3.0" webpack: "npm:^5.75.0" @@ -5437,6 +5439,13 @@ __metadata: languageName: node linkType: hard +"@vscode/web-custom-data@npm:^0.4.2": + version: 0.4.8 + resolution: "@vscode/web-custom-data@npm:0.4.8" + checksum: 26a06ecd1a1b48388828855a559948410a5d13163bcc3713207d72c03c533b779032419a08528f27a49c83490fa4bacb0d4652c2cb05ca0bd095db42f177498e + languageName: node + linkType: hard + "@web/browser-logs@npm:^0.2.6": version: 0.2.6 resolution: "@web/browser-logs@npm:0.2.6" @@ -8066,6 +8075,17 @@ __metadata: languageName: node linkType: hard +"didyoumean2@npm:4.1.0": + version: 4.1.0 + resolution: "didyoumean2@npm:4.1.0" + dependencies: + "@babel/runtime": "npm:^7.10.2" + leven: "npm:^3.1.0" + lodash.deburr: "npm:^4.1.0" + checksum: 82fdfd5f81b36a6b842d0bb7758bd24110b4c860a44eb098b0bd3f5d761b9db5f8eb9f1b5cbbac4a09c11eb0ce8b98f0c13167174d85ff56c91817f179a74c19 + languageName: node + linkType: hard + "diff@npm:^4.0.1": version: 4.0.2 resolution: "diff@npm:4.0.2" @@ -9387,7 +9407,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.1": +"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.2, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.1": version: 3.3.2 resolution: "fast-glob@npm:3.3.2" dependencies: @@ -11885,6 +11905,25 @@ __metadata: languageName: node linkType: hard +"lit-analyzer@npm:^2.0.1, lit-analyzer@npm:^2.0.2": + version: 2.0.2 + resolution: "lit-analyzer@npm:2.0.2" + dependencies: + "@vscode/web-custom-data": "npm:^0.4.2" + chalk: "npm:^2.4.2" + didyoumean2: "npm:4.1.0" + fast-glob: "npm:^3.2.11" + parse5: "npm:5.1.0" + ts-simple-type: "npm:~2.0.0-next.0" + vscode-css-languageservice: "npm:4.3.0" + vscode-html-languageservice: "npm:3.1.0" + web-component-analyzer: "npm:^2.0.0" + bin: + lit-analyzer: cli.js + checksum: b101aad9c16f558dba146494ee7da65ca2c6e0a8430e71f3ca9ea8c6dcb68514a8311f17bf3175dc1a7a67081337d1bbe98ee6598329b6eee1a3617582a21216 + languageName: node + linkType: hard + "lit-element@npm:^3.3.0": version: 3.3.3 resolution: "lit-element@npm:3.3.3" @@ -12025,6 +12064,13 @@ __metadata: languageName: node linkType: hard +"lodash.deburr@npm:^4.1.0": + version: 4.1.0 + resolution: "lodash.deburr@npm:4.1.0" + checksum: 30c068e9c3b21d65d260887a8849fa7b94692f868adcc4527136c296b4e71ced7149f58e0f37154d3c56d7950cc605ad3e10b2ee0baedf5638af0befc5013ebc + languageName: node + linkType: hard + "lodash.isfunction@npm:^3.0.9": version: 3.0.9 resolution: "lodash.isfunction@npm:3.0.9" @@ -13437,6 +13483,13 @@ __metadata: languageName: node linkType: hard +"parse5@npm:5.1.0": + version: 5.1.0 + resolution: "parse5@npm:5.1.0" + checksum: 2b2048e9a2d5932678293685f8bd25cc2841828a6d1020f4550b0e48d9e3de814b26c8b3aa58b6ff97434fa7e65b19ff265f5236acda92bbe1ecc264eda409f5 + languageName: node + linkType: hard + "parse5@npm:^4.0.0": version: 4.0.0 resolution: "parse5@npm:4.0.0" @@ -16077,6 +16130,16 @@ __metadata: languageName: node linkType: hard +"ts-lit-plugin@npm:^2.0.1": + version: 2.0.1 + resolution: "ts-lit-plugin@npm:2.0.1" + dependencies: + lit-analyzer: "npm:^2.0.1" + web-component-analyzer: "npm:^2.0.0" + checksum: 17146c0250991d6f69f71afd136ea7abca18b50202146c5d1535f10b87f5f9bc1bab22181f9ee881d570c99cac1c8ce8607b05c9a53e5b1dabf20c67e1b4a640 + languageName: node + linkType: hard + "ts-node@npm:^10.8.1, ts-node@npm:^10.9.1": version: 10.9.1 resolution: "ts-node@npm:10.9.1" @@ -16115,6 +16178,13 @@ __metadata: languageName: node linkType: hard +"ts-simple-type@npm:2.0.0-next.0, ts-simple-type@npm:~2.0.0-next.0": + version: 2.0.0-next.0 + resolution: "ts-simple-type@npm:2.0.0-next.0" + checksum: a8838487b063b2ecf5e96c3cd25b4dfd2fb758c415430e20c0683874e6ca32770ab18c63c8313452ae5be3cc4400efd189de43d8138be1af7e990cb6b8ce184e + languageName: node + linkType: hard + "tsconfig-paths@npm:^3.14.2": version: 3.14.2 resolution: "tsconfig-paths@npm:3.14.2" @@ -16298,6 +16368,16 @@ __metadata: languageName: node linkType: hard +"typescript@npm:~5.2.0": + version: 5.2.2 + resolution: "typescript@npm:5.2.2" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 91ae3e6193d0ddb8656d4c418a033f0f75dec5e077ebbc2bd6d76439b93f35683936ee1bdc0e9cf94ec76863aa49f27159b5788219b50e1cd0cd6d110aa34b07 + languageName: node + linkType: hard + "typescript@patch:typescript@npm%3A^4.6.4 || ^5.2.2#optional!builtin, typescript@patch:typescript@npm%3A^5.3.0#optional!builtin": version: 5.3.2 resolution: "typescript@patch:typescript@npm%3A5.3.2#optional!builtin::version=5.3.2&hash=e012d7" @@ -16308,6 +16388,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@npm%3A~5.2.0#optional!builtin": + version: 5.2.2 + resolution: "typescript@patch:typescript@npm%3A5.2.2#optional!builtin::version=5.2.2&hash=f3b441" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 062c1cee1990e6b9419ce8a55162b8dc917eb87f807e4de0327dbc1c2fa4e5f61bc0dd4e034d38ff541d1ed0479b53bcee8e4de3a4075c51a1724eb6216cb6f5 + languageName: node + linkType: hard + "typical@npm:^4.0.0": version: 4.0.0 resolution: "typical@npm:4.0.0" @@ -16681,6 +16771,58 @@ __metadata: languageName: node linkType: hard +"vscode-css-languageservice@npm:4.3.0": + version: 4.3.0 + resolution: "vscode-css-languageservice@npm:4.3.0" + dependencies: + vscode-languageserver-textdocument: "npm:^1.0.1" + vscode-languageserver-types: "npm:3.16.0-next.2" + vscode-nls: "npm:^4.1.2" + vscode-uri: "npm:^2.1.2" + checksum: 633a5c3857646f262982f5fe29243f20839621e81d78aa883822ef0fa0d9b2ec9d69e3201ee251541f8a04762f8033ad3d38c09d938ed4cecdae7df0e6a0076e + languageName: node + linkType: hard + +"vscode-html-languageservice@npm:3.1.0": + version: 3.1.0 + resolution: "vscode-html-languageservice@npm:3.1.0" + dependencies: + vscode-languageserver-textdocument: "npm:^1.0.1" + vscode-languageserver-types: "npm:3.16.0-next.2" + vscode-nls: "npm:^4.1.2" + vscode-uri: "npm:^2.1.2" + checksum: 80c4377dd74f390183ba9c0365d83e6182f436c0ff77af535158fecfb45b044fd7643eb99b6fe755a57c223b6fd8f4e36883133fbbb65e84f838b81df58b5aa6 + languageName: node + linkType: hard + +"vscode-languageserver-textdocument@npm:^1.0.1": + version: 1.0.11 + resolution: "vscode-languageserver-textdocument@npm:1.0.11" + checksum: 1996a38e24571e05aa21dd4f46e0a6849e22301c9a66996762e77d9c6df3622de0bd31cd5742a0c0c47fb9dfd00b310ad08c44d08241873ea571edacd5238da6 + languageName: node + linkType: hard + +"vscode-languageserver-types@npm:3.16.0-next.2": + version: 3.16.0-next.2 + resolution: "vscode-languageserver-types@npm:3.16.0-next.2" + checksum: 783b1b593655413eb657c4238fe93532b1eb299f6100b85ac74e2a36cf808e2719813240da85eb3d0a6adf30e922b3bcba5d174ea5d45cfb463ea6698576cf33 + languageName: node + linkType: hard + +"vscode-nls@npm:^4.1.2": + version: 4.1.2 + resolution: "vscode-nls@npm:4.1.2" + checksum: 8e88b2438e6058309c0ccae59166cf63b34f2182450a7d2bc7eeb90b414a7e9a99397f5f672284f5dbc5466578472e4fbb28b29a730e3b08342564e840fac5d6 + languageName: node + linkType: hard + +"vscode-uri@npm:^2.1.2": + version: 2.1.2 + resolution: "vscode-uri@npm:2.1.2" + checksum: 4ed01e79f8caee5518d7dce567280001a00c87ff75c29421ac3693c735834f17950e79f818981c591e58c6efe681e13928470037b6ae75c948bec9b398e4c8db + languageName: node + linkType: hard + "walker@npm:^1.0.8": version: 1.0.8 resolution: "walker@npm:1.0.8" @@ -16709,6 +16851,21 @@ __metadata: languageName: node linkType: hard +"web-component-analyzer@npm:^2.0.0": + version: 2.0.0 + resolution: "web-component-analyzer@npm:2.0.0" + dependencies: + fast-glob: "npm:^3.2.2" + ts-simple-type: "npm:2.0.0-next.0" + typescript: "npm:~5.2.0" + yargs: "npm:^17.7.2" + bin: + wca: cli.js + web-component-analyzer: cli.js + checksum: da25adf151afe1eb308f5e1dc6617ccefd3506f144e90ed2cb9a823cf6b3512dbda1b5d43ad36bf0eba9e930683f26537aecdfde623960c6a1aae593ffa210ef + languageName: node + linkType: hard + "webidl-conversions@npm:^3.0.0": version: 3.0.1 resolution: "webidl-conversions@npm:3.0.1" @@ -17213,7 +17370,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^17.0.0": +"yargs@npm:^17.0.0, yargs@npm:^17.7.2": version: 17.7.2 resolution: "yargs@npm:17.7.2" dependencies: From 64d71765638864d259b04f7467eb47372f93e2c9 Mon Sep 17 00:00:00 2001 From: "christian.b.hoffmann" Date: Tue, 19 Dec 2023 16:07:30 +0100 Subject: [PATCH 02/10] updated lit and added github worklflow --- .github/workflows/analyze.yml | 36 +++++++++++++++++++ package.json | 5 +-- .../src/components/forms/select/index.ts | 4 +-- yarn.lock | 6 ++-- 4 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/analyze.yml diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml new file mode 100644 index 000000000..a5c47304a --- /dev/null +++ b/.github/workflows/analyze.yml @@ -0,0 +1,36 @@ +name: Compile + +on: [pull_request] + +jobs: + analyze: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Setup Node.js + uses: actions/setup-node@v3 + with: + node-version: '18.x' + + - name: Get node version + id: node + run: | + echo "::set-output name=version::$(node -v)" + + - name: Enable Corepack + run: corepack enable + + - name: Install yarn 4 + run: yarn set version 4.x + + - name: Install modules + run: yarn + + - name: Generate tokens + run: yarn tokens:generate + + - name: Run analyze + run: yarn analyze diff --git a/package.json b/package.json index 552225e53..cf746fcc3 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,8 @@ "doc:check": "deven-documentation-skeleton check", "doc:update": "deven-documentation-skeleton update", "compile:icons": "yarn workspace @boiler/icons compile:icons", - "compile": "yarn workspace @boiler/ui-library compile && yarn workspace @boiler/ui-library analyze", + "compile": "yarn workspace @boiler/ui-library compile", + "analyze": "yarn workspace @boiler/ui-library analyze", "tokens:generate": "yarn workspace @boiler/figma-design-tokens tokens:generate", "prepare": "husky install" }, @@ -102,7 +103,7 @@ "dependencies": { "@lit-labs/react": "^1.1.1", "http-server": "^14.1.1", - "lit": "^2.7.4", + "lit-element": "^4.0.2", "nested-css-to-flat": "^1.0.5", "rimraf": "^5.0.5" }, diff --git a/packages/ui-library/src/components/forms/select/index.ts b/packages/ui-library/src/components/forms/select/index.ts index 2ec6c2b42..f820a7c11 100644 --- a/packages/ui-library/src/components/forms/select/index.ts +++ b/packages/ui-library/src/components/forms/select/index.ts @@ -1,6 +1,6 @@ import { LitElement, html, nothing } from 'lit'; -import { ClassMapDirective, classMap } from 'lit/directives/class-map.js'; -import { customElement, property, state } from 'lit/decorators.js'; +import { ClassMapDirective, classMap } from 'lit/directives/class-map'; +import { customElement, property, state } from 'lit/decorators'; import { styleCustom } from './index.css'; import { FormSizesType, SizesType } from '../../../globals/types'; import { BlrFormLabelRenderFunction } from '../../internal-components/form-label'; diff --git a/yarn.lock b/yarn.lock index 0b74bc611..ecf90909d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1574,8 +1574,8 @@ __metadata: http-server: "npm:^14.1.1" husky: "npm:^8.0.0" lint-staged: "npm:^13.1.0" - lit: "npm:^2.7.4" lit-analyzer: "npm:^2.0.2" + lit-element: "npm:^4.0.2" lit-html: "npm:^2.6.1" lodash.camelcase: "npm:4.3.0" mini-css-extract-plugin: "npm:^2.7.2" @@ -11935,7 +11935,7 @@ __metadata: languageName: node linkType: hard -"lit-element@npm:^4.0.0": +"lit-element@npm:^4.0.0, lit-element@npm:^4.0.2": version: 4.0.2 resolution: "lit-element@npm:4.0.2" dependencies: @@ -11975,7 +11975,7 @@ __metadata: languageName: node linkType: hard -"lit@npm:^2.2.1, lit@npm:^2.6.1, lit@npm:^2.7.4": +"lit@npm:^2.2.1, lit@npm:^2.6.1": version: 2.8.0 resolution: "lit@npm:2.8.0" dependencies: From 901120c3490a71990134649fb4a5a2f3f1f43283 Mon Sep 17 00:00:00 2001 From: "christian.b.hoffmann" Date: Tue, 19 Dec 2023 16:11:17 +0100 Subject: [PATCH 03/10] updated path --- packages/ui-library/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui-library/package.json b/packages/ui-library/package.json index da3d914aa..f66750a7d 100644 --- a/packages/ui-library/package.json +++ b/packages/ui-library/package.json @@ -5,7 +5,7 @@ "scripts": { "start:storybook": "sb dev -p 1337", "compile": "tsc --project tsconfig.json", - "analyze": "npx lit-analyzer \"packages/ui-library/src/**/*.{js,ts}\"", + "analyze": "npx lit-analyzer \"src/**/*.{js,ts}\"", "build:storybook": "sb build", "build": "NODE_ENV=production webpack --config webpack.prod.js", "build:types": "rimraf types && tsc --emitDeclarationOnly", From a2191573aa8719a2b3d899048bfa1c850900ed0b Mon Sep 17 00:00:00 2001 From: "christian.b.hoffmann" Date: Tue, 19 Dec 2023 16:35:32 +0100 Subject: [PATCH 04/10] pathes stuff --- packages/icons/icons-optimized/icons.ts | 2 +- packages/icons/icons-optimized/index.ts | 2 +- packages/icons/scripts/index.mjs | 2 +- .../actions/buttons/icon-button/index.stories.ts | 2 +- .../src/components/actions/buttons/icon-button/index.ts | 6 +++--- .../src/components/actions/buttons/text-button/index.ts | 6 +++--- .../ui-library/src/components/feedback/loader/index.ts | 6 +++--- .../src/components/feedback/tooltip/index.stories.ts | 4 ++-- .../src/components/feedback/tooltip/index.test.ts | 2 +- .../ui-library/src/components/feedback/tooltip/index.ts | 4 ++-- .../feedback/tooltip/tooltip-bubble/index.stories.ts | 2 +- .../components/feedback/tooltip/tooltip-bubble/index.ts | 6 +++--- .../ui-library/src/components/forms/checkbox/index.ts | 6 +++--- .../src/components/forms/number-input/index.stories.ts | 2 +- .../ui-library/src/components/forms/number-input/index.ts | 4 ++-- .../src/components/forms/radio/radio-input-group/index.ts | 6 +++--- .../src/components/forms/radio/radio-input/index.ts | 6 +++--- packages/ui-library/src/components/forms/select/index.ts | 6 +++--- .../slider-single-value/range-legend-slider/index.ts | 8 ++++---- .../slider/slider-single-value/range-slider/index.ts | 6 +++--- .../range-legend-min-max-slider/index.ts | 8 ++++---- .../slider-two-values/range-min-max-slider/index.ts | 6 +++--- .../src/components/forms/text-input/index.stories.ts | 2 +- .../ui-library/src/components/forms/text-input/index.ts | 6 +++--- .../src/components/forms/textarea/index.stories.ts | 2 +- .../ui-library/src/components/forms/textarea/index.ts | 6 +++--- .../src/components/forms/toggle-switch/index.ts | 6 +++--- .../src/components/internal-components/counter/index.ts | 6 +++--- .../form-caption-group/form-caption/index.ts | 6 +++--- .../internal-components/form-caption-group/index.ts | 6 +++--- .../form-label/form-label-inline/index.ts | 2 +- .../components/internal-components/form-label/index.ts | 4 ++-- .../ui-library/src/components/navigation/tab-bar/index.ts | 6 +++--- .../src/components/ui/button-group/index.stories.ts | 2 +- .../ui-library/src/components/ui/button-group/index.ts | 6 +++--- packages/ui-library/src/components/ui/divider/index.ts | 6 +++--- .../ui-library/src/components/ui/icon/icon-link/index.ts | 6 +++--- .../ui-library/src/components/ui/icon/index.stories.ts | 2 +- packages/ui-library/src/components/ui/icon/index.test.ts | 2 +- packages/ui-library/src/components/ui/icon/index.ts | 8 ++++---- .../_tokens-generated/index.pseudo.generated.ts | 2 +- packages/ui-library/src/links.stories.ts | 2 +- .../ui-library/src/utils/nested-typesafe-css-literals.ts | 2 +- .../src/utils/typesafe-generic-component-renderer.ts | 2 +- packages/ui-library/src/utils/wrap-values-with-css.ts | 2 +- packages/ui-library/tsconfig.json | 2 +- 46 files changed, 99 insertions(+), 99 deletions(-) diff --git a/packages/icons/icons-optimized/icons.ts b/packages/icons/icons-optimized/icons.ts index a02da8261..09746e922 100644 --- a/packages/icons/icons-optimized/icons.ts +++ b/packages/icons/icons-optimized/icons.ts @@ -1,4 +1,4 @@ -import { html } from 'lit'; +import { html } from 'lit-element'; const blr360Lg = (className: string) => html` diff --git a/packages/icons/icons-optimized/index.ts b/packages/icons/icons-optimized/index.ts index 6219860ec..ee291bf9a 100644 --- a/packages/icons/icons-optimized/index.ts +++ b/packages/icons/icons-optimized/index.ts @@ -1,4 +1,4 @@ -import { html } from 'lit'; +import { html } from 'lit-element'; const blr360Lg = (className: string) => html` diff --git a/packages/icons/scripts/index.mjs b/packages/icons/scripts/index.mjs index 9f5c4b4a1..798051fa6 100644 --- a/packages/icons/scripts/index.mjs +++ b/packages/icons/scripts/index.mjs @@ -33,7 +33,7 @@ fs.readdir(iconDir, (err, files) => { console.log('\n'); const template = ` - import { html } from 'lit'; \n + import { html } from 'lit-element'; \n ${iconTemplateStrings.join('\n')} export const IconMapping = { ${icons.map((icon) => icon.name).join(',\n')} }; diff --git a/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts b/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts index 88a5f2a01..b7e94c64d 100644 --- a/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts +++ b/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts @@ -1,5 +1,5 @@ /* eslint-disable no-console */ -import { html } from 'lit'; +import { html } from 'lit-element'; import { BlrIconButtonType, BlrIconButtonRenderFunction } from './index'; import { PureIconKeys } from '@boiler/icons'; import { ActionVariants, ActionSizes } from '../../../../globals/constants'; diff --git a/packages/ui-library/src/components/actions/buttons/icon-button/index.ts b/packages/ui-library/src/components/actions/buttons/icon-button/index.ts index c35d0c18b..9d5df6891 100644 --- a/packages/ui-library/src/components/actions/buttons/icon-button/index.ts +++ b/packages/ui-library/src/components/actions/buttons/icon-button/index.ts @@ -1,7 +1,7 @@ /* eslint-disable no-console */ -import { LitElement, html, nothing } from 'lit'; -import { classMap } from 'lit/directives/class-map.js'; -import { customElement, property, state } from 'lit/decorators.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { classMap } from 'lit-html/directives/class-map.js'; +import { customElement, property, state } from 'lit-element/decorators.js'; import { SizelessIconType } from '@boiler/icons'; import { styleCustom } from './index.css'; import { actionDark, actionLight } from '../../../../foundation/semantic-tokens/action.css'; diff --git a/packages/ui-library/src/components/actions/buttons/text-button/index.ts b/packages/ui-library/src/components/actions/buttons/text-button/index.ts index a2926231c..93cd2c81e 100644 --- a/packages/ui-library/src/components/actions/buttons/text-button/index.ts +++ b/packages/ui-library/src/components/actions/buttons/text-button/index.ts @@ -1,7 +1,7 @@ /* eslint-disable no-console */ -import { LitElement, html, nothing } from 'lit'; -import { classMap } from 'lit/directives/class-map.js'; -import { customElement, property, state } from 'lit/decorators.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { classMap } from 'lit-html/directives/class-map.js'; +import { customElement, property, state } from 'lit-element/decorators.js'; import { SizelessIconType } from '@boiler/icons'; import { styleCustom } from './index.css'; import { actionDark, actionLight } from '../../../../foundation/semantic-tokens/action.css'; diff --git a/packages/ui-library/src/components/feedback/loader/index.ts b/packages/ui-library/src/components/feedback/loader/index.ts index ecea155a8..4cd54ae6c 100644 --- a/packages/ui-library/src/components/feedback/loader/index.ts +++ b/packages/ui-library/src/components/feedback/loader/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html } from 'lit'; -import { classMap } from 'lit/directives/class-map.js'; -import { customElement, property } from 'lit/decorators.js'; +import { LitElement, html } from 'lit-element'; +import { classMap } from 'lit-html/directives/class-map.js'; +import { customElement, property } from 'lit-element/decorators.js'; import { styleCustomLight, styleCustomDark } from './index.css'; import { ActionSizesType, FeedbackVariantType } from '../../../globals/types'; import { ThemeType } from '../../../foundation/_tokens-generated/index.themes'; diff --git a/packages/ui-library/src/components/feedback/tooltip/index.stories.ts b/packages/ui-library/src/components/feedback/tooltip/index.stories.ts index 1a4bacbc1..768df6106 100644 --- a/packages/ui-library/src/components/feedback/tooltip/index.stories.ts +++ b/packages/ui-library/src/components/feedback/tooltip/index.stories.ts @@ -1,10 +1,10 @@ -import { LitElement, html } from 'lit'; +import { LitElement, html } from 'lit-element'; import { BlrTooltipRenderFunction, BlrTooltipType } from './index'; import { ThemeType, Themes } from '../../../foundation/_tokens-generated/index.themes'; import { TooltipPlacement } from '../../../globals/constants'; import { tooltipPosition } from './tooltip-position'; -import { customElement, property, query, state } from 'lit/decorators.js'; +import { customElement, property, query, state } from 'lit-element/decorators.js'; import { FormSizesType } from '../../../globals/types'; import { Placement as PlacementType } from '@floating-ui/dom'; import { BlrTooltipBubbleRenderFunction } from './tooltip-bubble'; diff --git a/packages/ui-library/src/components/feedback/tooltip/index.test.ts b/packages/ui-library/src/components/feedback/tooltip/index.test.ts index 29cda1296..681ba9a93 100644 --- a/packages/ui-library/src/components/feedback/tooltip/index.test.ts +++ b/packages/ui-library/src/components/feedback/tooltip/index.test.ts @@ -1,7 +1,7 @@ import { BlrTooltipRenderFunction, BlrTooltipType } from './index'; import { fixture, expect } from '@open-wc/testing'; -import { html } from 'lit'; +import { html } from 'lit-element'; import { querySelectorDeep } from 'query-selector-shadow-dom'; const sampleParams: BlrTooltipType = { diff --git a/packages/ui-library/src/components/feedback/tooltip/index.ts b/packages/ui-library/src/components/feedback/tooltip/index.ts index aab34a761..25f137321 100644 --- a/packages/ui-library/src/components/feedback/tooltip/index.ts +++ b/packages/ui-library/src/components/feedback/tooltip/index.ts @@ -1,5 +1,5 @@ -import { LitElement, TemplateResult, html } from 'lit'; -import { customElement, property, state } from 'lit/decorators.js'; +import { LitElement, TemplateResult, html } from 'lit-element'; +import { customElement, property, state } from 'lit-element/decorators.js'; import { Placement as PlacementType } from '@floating-ui/dom'; import { ThemeType } from '../../../foundation/_tokens-generated/index.themes'; import { genericBlrComponentRenderer } from '../../../utils/typesafe-generic-component-renderer'; diff --git a/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.stories.ts b/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.stories.ts index e0a15d573..6cf9dcc23 100644 --- a/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.stories.ts +++ b/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.stories.ts @@ -1,4 +1,4 @@ -import { html } from 'lit'; +import { html } from 'lit-element'; import { BlrTooltipBubbleRenderFunction, BlrTooltipBubbleType } from '.'; import { Themes } from '../../../../foundation/_tokens-generated/index.themes'; diff --git a/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.ts b/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.ts index 91620273e..e94e96c2d 100644 --- a/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.ts +++ b/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.ts @@ -1,9 +1,9 @@ -import { LitElement, css, html, nothing } from 'lit'; -import { customElement, property } from 'lit/decorators.js'; +import { LitElement, css, html, nothing } from 'lit-element'; +import { customElement, property } from 'lit-element/decorators.js'; import { light, dark } from './index.css'; import { ThemeType } from '../../../../foundation/_tokens-generated/index.themes'; import { genericBlrComponentRenderer } from '../../../../utils/typesafe-generic-component-renderer'; -import { classMap } from 'lit/directives/class-map.js'; +import { classMap } from 'lit-html/directives/class-map.js'; const TAG_NAME = 'blr-tooltip-bubble'; diff --git a/packages/ui-library/src/components/forms/checkbox/index.ts b/packages/ui-library/src/components/forms/checkbox/index.ts index dec922761..f5afcbc3d 100644 --- a/packages/ui-library/src/components/forms/checkbox/index.ts +++ b/packages/ui-library/src/components/forms/checkbox/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit'; -import { customElement, property, query, state } from 'lit/decorators.js'; -import { classMap } from 'lit/directives/class-map.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { customElement, property, query, state } from 'lit-element/decorators.js'; +import { classMap } from 'lit-html/directives/class-map.js'; import { BlrFormLabelInline } from '../../internal-components/form-label/form-label-inline'; import { FormSizesType } from '../../../globals/types'; diff --git a/packages/ui-library/src/components/forms/number-input/index.stories.ts b/packages/ui-library/src/components/forms/number-input/index.stories.ts index cf47e7dcf..6da91fd65 100644 --- a/packages/ui-library/src/components/forms/number-input/index.stories.ts +++ b/packages/ui-library/src/components/forms/number-input/index.stories.ts @@ -3,7 +3,7 @@ import { BlrNumberInputRenderFunction, BlrNumberInputType } from './index'; import { FormSizes, Units } from '../../../globals/constants'; import { Themes } from '../../../foundation/_tokens-generated/index.themes'; import { PureIconKeys } from '@boiler/icons/icons-optimized/icons'; -import { html } from 'lit'; +import { html } from 'lit-element'; import { action } from '@storybook/addon-actions'; const sharedStyles = html` diff --git a/packages/ui-library/src/components/forms/number-input/index.ts b/packages/ui-library/src/components/forms/number-input/index.ts index 0317a1102..ee24bcfa3 100644 --- a/packages/ui-library/src/components/forms/number-input/index.ts +++ b/packages/ui-library/src/components/forms/number-input/index.ts @@ -1,5 +1,5 @@ -import { LitElement, TemplateResult, html, nothing } from 'lit'; -import { customElement, property, query, state } from 'lit/decorators.js'; +import { LitElement, TemplateResult, html, nothing } from 'lit-element'; +import { customElement, property, query, state } from 'lit-element/decorators.js'; import { baseStyle, wrapperLight, wrapperDark, StepperComboDark, StepperComboLight } from './index.css'; import { classMap } from 'lit-html/directives/class-map.js'; import { BlrFormLabelRenderFunction } from '../../internal-components/form-label'; diff --git a/packages/ui-library/src/components/forms/radio/radio-input-group/index.ts b/packages/ui-library/src/components/forms/radio/radio-input-group/index.ts index d86c05adb..59d747434 100644 --- a/packages/ui-library/src/components/forms/radio/radio-input-group/index.ts +++ b/packages/ui-library/src/components/forms/radio/radio-input-group/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit'; -import { classMap } from 'lit/directives/class-map.js'; -import { customElement, property } from 'lit/decorators.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { classMap } from 'lit-html/directives/class-map.js'; +import { customElement, property } from 'lit-element/decorators.js'; import { styleCustom } from './index.css'; import { formDark, formLight } from '../../../../foundation/semantic-tokens/form.css'; import { radioDark, radioLight } from '../../../../foundation/component-tokens/radio.css'; diff --git a/packages/ui-library/src/components/forms/radio/radio-input/index.ts b/packages/ui-library/src/components/forms/radio/radio-input/index.ts index e38e1de2b..0db21c0af 100644 --- a/packages/ui-library/src/components/forms/radio/radio-input/index.ts +++ b/packages/ui-library/src/components/forms/radio/radio-input/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit'; -import { classMap } from 'lit/directives/class-map.js'; -import { customElement, property } from 'lit/decorators.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { classMap } from 'lit-html/directives/class-map.js'; +import { customElement, property } from 'lit-element/decorators.js'; import { styleCustom } from './index.css'; import { InputSizesType } from '../../../../globals/types'; import { formDark, formLight } from '../../../../foundation/semantic-tokens/form.css'; diff --git a/packages/ui-library/src/components/forms/select/index.ts b/packages/ui-library/src/components/forms/select/index.ts index f820a7c11..f400c5b96 100644 --- a/packages/ui-library/src/components/forms/select/index.ts +++ b/packages/ui-library/src/components/forms/select/index.ts @@ -1,6 +1,3 @@ -import { LitElement, html, nothing } from 'lit'; -import { ClassMapDirective, classMap } from 'lit/directives/class-map'; -import { customElement, property, state } from 'lit/decorators'; import { styleCustom } from './index.css'; import { FormSizesType, SizesType } from '../../../globals/types'; import { BlrFormLabelRenderFunction } from '../../internal-components/form-label'; @@ -16,6 +13,9 @@ import { genericBlrComponentRenderer } from '../../../utils/typesafe-generic-com import { BlrFormCaptionGroupRenderFunction } from '../../internal-components/form-caption-group'; import { BlrFormCaptionRenderFunction } from '../../internal-components/form-caption-group/form-caption'; +import { ClassMapDirective, classMap } from 'lit-html/directives/class-map.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { customElement, property, state } from 'lit-element/decorators.js'; type Option = { value: string; diff --git a/packages/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts b/packages/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts index d02ba893f..fc24c8292 100644 --- a/packages/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts +++ b/packages/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import { LitElement, html, nothing } from 'lit'; -import { customElement, property, state } from 'lit/decorators.js'; -import { classMap } from 'lit/directives/class-map.js'; -import { map } from 'lit/directives/map.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { customElement, property, state } from 'lit-element/decorators.js'; +import { classMap } from 'lit-html/directives/class-map.js'; +import { map } from 'lit-html/directives/map.js'; import { styleCustom } from './index.css'; import { sliderDark, sliderLight } from '../../../../../foundation/component-tokens/slider-legend.css'; import { FormSizesType, ActionVariantType } from '../../../../../globals/types'; diff --git a/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts b/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts index 0ad04c2cc..86a20837b 100644 --- a/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts +++ b/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit'; -import { customElement, property, state } from 'lit/decorators.js'; -import { classMap } from 'lit/directives/class-map.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { customElement, property, state } from 'lit-element/decorators.js'; +import { classMap } from 'lit-html/directives/class-map.js'; import { styleCustom } from './index.css'; import { sliderDark, sliderLight } from '../../../../../foundation/component-tokens/slider.css'; import { FormSizesType, ActionVariantType } from '../../../../../globals/types'; diff --git a/packages/ui-library/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts b/packages/ui-library/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts index 58dd458f9..85f81a65e 100644 --- a/packages/ui-library/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts +++ b/packages/ui-library/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import { LitElement, html, nothing } from 'lit'; -import { customElement, property, state } from 'lit/decorators.js'; -import { classMap } from 'lit/directives/class-map.js'; -import { map } from 'lit/directives/map.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { customElement, property, state } from 'lit-element/decorators.js'; +import { classMap } from 'lit-html/directives/class-map.js'; +import { map } from 'lit-html/directives/map.js'; import { styleCustom } from './index.css'; import { sliderDark, sliderLight } from '../../../../../foundation/component-tokens/slider-legend.css'; import { FormSizesType, ActionVariantType } from '../../../../../globals/types'; diff --git a/packages/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts b/packages/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts index 2dd3483a5..398716b13 100644 --- a/packages/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts +++ b/packages/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit'; -import { customElement, property, state } from 'lit/decorators.js'; -import { classMap } from 'lit/directives/class-map.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { customElement, property, state } from 'lit-element/decorators.js'; +import { classMap } from 'lit-html/directives/class-map.js'; import { styleCustom } from './index.css'; import { sliderDark, sliderLight } from '../../../../../foundation/component-tokens/slider.css'; import { FormSizesType, ActionVariantType } from '../../../../../globals/types'; diff --git a/packages/ui-library/src/components/forms/text-input/index.stories.ts b/packages/ui-library/src/components/forms/text-input/index.stories.ts index 895d247b1..1fc10d370 100644 --- a/packages/ui-library/src/components/forms/text-input/index.stories.ts +++ b/packages/ui-library/src/components/forms/text-input/index.stories.ts @@ -4,7 +4,7 @@ import { FormSizes, InputTypes } from '../../../globals/constants'; import { PureIconKeys } from '@boiler/icons'; import { Themes } from '../../../foundation/_tokens-generated/index.themes'; import { action } from '@storybook/addon-actions'; -import { html } from 'lit'; +import { html } from 'lit-element'; // Shared Style inside the Stories const sharedStyles = html` diff --git a/packages/ui-library/src/components/forms/text-input/index.ts b/packages/ui-library/src/components/forms/text-input/index.ts index 9399124ea..bab5c42c1 100644 --- a/packages/ui-library/src/components/forms/text-input/index.ts +++ b/packages/ui-library/src/components/forms/text-input/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit'; -import { classMap } from 'lit/directives/class-map.js'; -import { customElement, property, state } from 'lit/decorators.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { classMap } from 'lit-html/directives/class-map.js'; +import { customElement, property, state } from 'lit-element/decorators.js'; import { styleCustom } from './index.css'; import { formDark, formLight } from '../../../foundation/semantic-tokens/form.css'; import { textInputLight, textInputDark } from './index.css'; diff --git a/packages/ui-library/src/components/forms/textarea/index.stories.ts b/packages/ui-library/src/components/forms/textarea/index.stories.ts index 058adb8a9..f6cba6aa6 100644 --- a/packages/ui-library/src/components/forms/textarea/index.stories.ts +++ b/packages/ui-library/src/components/forms/textarea/index.stories.ts @@ -1,5 +1,5 @@ /* eslint-disable no-console */ -import { html } from 'lit'; +import { html } from 'lit-element'; import { BlrTextareaRenderFunction, BlrTextareaType } from './index'; import { FormSizes, Resizes } from '../../../globals/constants'; import { action } from '@storybook/addon-actions'; diff --git a/packages/ui-library/src/components/forms/textarea/index.ts b/packages/ui-library/src/components/forms/textarea/index.ts index 823d4fecc..3092690fb 100644 --- a/packages/ui-library/src/components/forms/textarea/index.ts +++ b/packages/ui-library/src/components/forms/textarea/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit'; -import { classMap } from 'lit/directives/class-map.js'; -import { customElement, property, query, state } from 'lit/decorators.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { classMap } from 'lit-html/directives/class-map.js'; +import { customElement, property, query, state } from 'lit-element/decorators.js'; import { styleCustom, textAreaDark, textAreaLight } from './index.css'; import { CounterVariantType, FormSizesType, WarningLimits, ResizeType } from '../../../globals/types'; import { BlrFormLabelRenderFunction } from '../../internal-components/form-label'; diff --git a/packages/ui-library/src/components/forms/toggle-switch/index.ts b/packages/ui-library/src/components/forms/toggle-switch/index.ts index 5a1300326..aac806431 100644 --- a/packages/ui-library/src/components/forms/toggle-switch/index.ts +++ b/packages/ui-library/src/components/forms/toggle-switch/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit'; -import { customElement, property, query, state } from 'lit/decorators.js'; -import { classMap } from 'lit/directives/class-map.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { customElement, property, query, state } from 'lit-element/decorators.js'; +import { classMap } from 'lit-html/directives/class-map.js'; import { SizelessIconType } from '@boiler/icons'; import { BlrFormLabelInline } from '../../internal-components/form-label/form-label-inline'; diff --git a/packages/ui-library/src/components/internal-components/counter/index.ts b/packages/ui-library/src/components/internal-components/counter/index.ts index 3075812ee..5674ab7fc 100644 --- a/packages/ui-library/src/components/internal-components/counter/index.ts +++ b/packages/ui-library/src/components/internal-components/counter/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html } from 'lit'; -import { customElement, property } from 'lit/decorators.js'; -import { classMap } from 'lit/directives/class-map.js'; +import { LitElement, html } from 'lit-element'; +import { customElement, property } from 'lit-element/decorators.js'; +import { classMap } from 'lit-html/directives/class-map.js'; import { CounterVariantType, FormSizesType } from '../../../globals/types'; import { ThemeType } from '../../../foundation/_tokens-generated/index.themes'; import { counterLight, counterDark } from './index.css'; diff --git a/packages/ui-library/src/components/internal-components/form-caption-group/form-caption/index.ts b/packages/ui-library/src/components/internal-components/form-caption-group/form-caption/index.ts index 2135624ca..caf2491f1 100644 --- a/packages/ui-library/src/components/internal-components/form-caption-group/form-caption/index.ts +++ b/packages/ui-library/src/components/internal-components/form-caption-group/form-caption/index.ts @@ -1,6 +1,6 @@ -import { LitElement, TemplateResult, html, nothing } from 'lit'; -import { customElement, property } from 'lit/decorators.js'; -import { classMap } from 'lit/directives/class-map.js'; +import { LitElement, TemplateResult, html, nothing } from 'lit-element'; +import { customElement, property } from 'lit-element/decorators.js'; +import { classMap } from 'lit-html/directives/class-map.js'; import { FormSizesType, CaptionVariantType, SizesType } from '../../../../globals/types'; import { BlrIconRenderFunction } from '../../../ui/icon'; import { SizelessIconType } from '@boiler/icons'; diff --git a/packages/ui-library/src/components/internal-components/form-caption-group/index.ts b/packages/ui-library/src/components/internal-components/form-caption-group/index.ts index a12b0e0bc..7836e690a 100644 --- a/packages/ui-library/src/components/internal-components/form-caption-group/index.ts +++ b/packages/ui-library/src/components/internal-components/form-caption-group/index.ts @@ -1,8 +1,8 @@ -import { html, LitElement, TemplateResult } from 'lit'; -import { customElement, property } from 'lit/decorators.js'; +import { html, LitElement, TemplateResult } from 'lit-element'; +import { customElement, property } from 'lit-element/decorators.js'; import { genericBlrComponentRenderer } from '../../../utils/typesafe-generic-component-renderer'; import { FormSizesType } from '../../../globals/types'; -import { classMap } from 'lit/directives/class-map.js'; +import { classMap } from 'lit-html/directives/class-map.js'; import { formCaptionGroupStyle } from './index.css'; const TAG_NAME = 'blr-form-caption-group'; diff --git a/packages/ui-library/src/components/internal-components/form-label/form-label-inline/index.ts b/packages/ui-library/src/components/internal-components/form-label/form-label-inline/index.ts index 9cd652dec..bf430cccf 100644 --- a/packages/ui-library/src/components/internal-components/form-label/form-label-inline/index.ts +++ b/packages/ui-library/src/components/internal-components/form-label/form-label-inline/index.ts @@ -1,4 +1,4 @@ -import { html } from 'lit'; +import { html } from 'lit-element'; import { InputSizesType } from '../../../../globals/types'; type FormLabelInlineType = { diff --git a/packages/ui-library/src/components/internal-components/form-label/index.ts b/packages/ui-library/src/components/internal-components/form-label/index.ts index adb5ec539..b24973d2f 100644 --- a/packages/ui-library/src/components/internal-components/form-label/index.ts +++ b/packages/ui-library/src/components/internal-components/form-label/index.ts @@ -1,7 +1,7 @@ -import { LitElement, html, nothing } from 'lit'; +import { LitElement, html, nothing } from 'lit-element'; import { InputSizesType, LabelVariantType } from '../../../globals/types'; import { formDark, formLight } from '../../../foundation/semantic-tokens/form.css'; -import { customElement, property } from 'lit/decorators.js'; +import { customElement, property } from 'lit-element/decorators.js'; import { classMap } from 'lit-html/directives/class-map.js'; import { ThemeType } from '../../../foundation/_tokens-generated/index.themes'; import { genericBlrComponentRenderer } from '../../../utils/typesafe-generic-component-renderer'; diff --git a/packages/ui-library/src/components/navigation/tab-bar/index.ts b/packages/ui-library/src/components/navigation/tab-bar/index.ts index 38cfc279d..c3c0eaff9 100644 --- a/packages/ui-library/src/components/navigation/tab-bar/index.ts +++ b/packages/ui-library/src/components/navigation/tab-bar/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit'; -import { classMap } from 'lit/directives/class-map.js'; -import { customElement, property, query, queryAll, state } from 'lit/decorators.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { classMap } from 'lit-html/directives/class-map.js'; +import { customElement, property, query, queryAll, state } from 'lit-element/decorators.js'; import { styleCustom, tabBarDark, tabBarLight } from './index.css'; import { formDark, formLight } from '../../../foundation/semantic-tokens/form.css'; diff --git a/packages/ui-library/src/components/ui/button-group/index.stories.ts b/packages/ui-library/src/components/ui/button-group/index.stories.ts index 686fb6b14..6119d78fd 100644 --- a/packages/ui-library/src/components/ui/button-group/index.stories.ts +++ b/packages/ui-library/src/components/ui/button-group/index.stories.ts @@ -2,7 +2,7 @@ import { BlrButtonGroupType, BlrButtonGroupFunction } from './index'; import { BlrTextButtonRenderFunction } from '../../actions/buttons/text-button'; import { BlrIconButtonRenderFunction } from '../../actions/buttons/icon-button'; -import { html } from 'lit'; +import { html } from 'lit-element'; import { ButtonGroupAlignmentVariants, ButtonGroupSizes } from '../../../globals/constants'; export default { diff --git a/packages/ui-library/src/components/ui/button-group/index.ts b/packages/ui-library/src/components/ui/button-group/index.ts index 129788f9a..e4b2bafd7 100644 --- a/packages/ui-library/src/components/ui/button-group/index.ts +++ b/packages/ui-library/src/components/ui/button-group/index.ts @@ -1,6 +1,6 @@ -import { LitElement, TemplateResult, html } from 'lit'; -import { customElement, property } from 'lit/decorators.js'; -import { classMap } from 'lit/directives/class-map.js'; +import { LitElement, TemplateResult, html } from 'lit-element'; +import { customElement, property } from 'lit-element/decorators.js'; +import { classMap } from 'lit-html/directives/class-map.js'; import { styleCustom } from './index.css'; import { genericBlrComponentRenderer } from '../../../utils/typesafe-generic-component-renderer'; diff --git a/packages/ui-library/src/components/ui/divider/index.ts b/packages/ui-library/src/components/ui/divider/index.ts index 02ca26945..1f910e380 100644 --- a/packages/ui-library/src/components/ui/divider/index.ts +++ b/packages/ui-library/src/components/ui/divider/index.ts @@ -1,9 +1,9 @@ -import { LitElement, html } from 'lit'; -import { customElement, property } from 'lit/decorators.js'; +import { LitElement, html } from 'lit-element'; +import { customElement, property } from 'lit-element/decorators.js'; import { DividerVariationTypes } from '../../../globals/types'; import { ThemeType } from '../../../foundation/_tokens-generated/index.themes'; import { genericBlrComponentRenderer } from '../../../utils/typesafe-generic-component-renderer'; -import { classMap } from 'lit/directives/class-map.js'; +import { classMap } from 'lit-html/directives/class-map.js'; import { dividerDark, dividerLight } from './index.css'; const TAG_NAME = 'blr-divider'; diff --git a/packages/ui-library/src/components/ui/icon/icon-link/index.ts b/packages/ui-library/src/components/ui/icon/icon-link/index.ts index bd85b52a0..1ec94e483 100644 --- a/packages/ui-library/src/components/ui/icon/icon-link/index.ts +++ b/packages/ui-library/src/components/ui/icon/icon-link/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit'; -import { classMap } from 'lit/directives/class-map.js'; -import { customElement, property } from 'lit/decorators.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { classMap } from 'lit-html/directives/class-map.js'; +import { customElement, property } from 'lit-element/decorators.js'; import { SizelessIconType } from '@boiler/icons'; import { styleCustom as iconLinkStyleCustom } from './index.css'; import { styleCustom as iconButtonStyleCustom } from '../../../actions/buttons/icon-button/index.css'; diff --git a/packages/ui-library/src/components/ui/icon/index.stories.ts b/packages/ui-library/src/components/ui/icon/index.stories.ts index a8fc5b3f8..4a3805af5 100644 --- a/packages/ui-library/src/components/ui/icon/index.stories.ts +++ b/packages/ui-library/src/components/ui/icon/index.stories.ts @@ -5,7 +5,7 @@ import { BlrIconType, BlrIconRenderFunction } from './index'; import { Sizes } from '../../../globals/constants'; import { getIconName } from '../../../utils/get-icon-name'; import { calculateIconName } from '../../../utils/calculate-icon-name'; -import { classMap } from 'lit/directives/class-map.js'; +import { classMap } from 'lit-html/directives/class-map.js'; import { SizesType } from '../../../globals/types'; export default { diff --git a/packages/ui-library/src/components/ui/icon/index.test.ts b/packages/ui-library/src/components/ui/icon/index.test.ts index 9ea90cf0d..494542e3c 100644 --- a/packages/ui-library/src/components/ui/icon/index.test.ts +++ b/packages/ui-library/src/components/ui/icon/index.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/await-thenable */ import { fixture, expect } from '@open-wc/testing'; import { BlrIconRenderFunction } from '.'; -import { classMap } from 'lit/directives/class-map.js'; +import { classMap } from 'lit-html/directives/class-map.js'; import { querySelectorDeep } from 'query-selector-shadow-dom'; const TEST_CLASS = 'test-class'; diff --git a/packages/ui-library/src/components/ui/icon/index.ts b/packages/ui-library/src/components/ui/icon/index.ts index e0a57bda9..eb191bdcc 100644 --- a/packages/ui-library/src/components/ui/icon/index.ts +++ b/packages/ui-library/src/components/ui/icon/index.ts @@ -1,11 +1,11 @@ -import { LitElement, html, nothing } from 'lit'; -import { customElement, property } from 'lit/decorators.js'; +import { LitElement, html, nothing } from 'lit-element'; +import { customElement, property } from 'lit-element/decorators.js'; import { IconMapping, IconType } from '@boiler/icons'; import { styleCustom } from './index.css'; import { SizesType } from '../../../globals/types'; import { DirectiveResult } from 'lit-html/directive'; -import { ClassMapDirective } from 'lit-html/directives/class-map'; -import { styleMap } from 'lit/directives/style-map.js'; +import { ClassMapDirective } from 'lit-html/directives/class-map.js'; +import { styleMap } from 'lit-html/directives/style-map.js'; const TAG_NAME = 'blr-icon'; diff --git a/packages/ui-library/src/foundation/_tokens-generated/index.pseudo.generated.ts b/packages/ui-library/src/foundation/_tokens-generated/index.pseudo.generated.ts index a22f8dfcd..8c22c7c8c 100644 --- a/packages/ui-library/src/foundation/_tokens-generated/index.pseudo.generated.ts +++ b/packages/ui-library/src/foundation/_tokens-generated/index.pseudo.generated.ts @@ -22,7 +22,7 @@ import { import { semanticTokens as semanticTokensDark, componentTokens as componentTokensDark } from './index.Dark.generated'; -import { CSSResult } from 'lit'; +import { CSSResult } from 'lit-element'; export function renderThemedCssStrings(renderFunc: (cT: componentTokensType, sT: semanticTokensType) => CSSResult): { tokenizedLight: CSSResult; diff --git a/packages/ui-library/src/links.stories.ts b/packages/ui-library/src/links.stories.ts index 500761326..0ff31d93a 100644 --- a/packages/ui-library/src/links.stories.ts +++ b/packages/ui-library/src/links.stories.ts @@ -1,5 +1,5 @@ /* eslint-disable no-console */ -import { html } from 'lit'; +import { html } from 'lit-element'; export default { title: 'Design System/Examples', diff --git a/packages/ui-library/src/utils/nested-typesafe-css-literals.ts b/packages/ui-library/src/utils/nested-typesafe-css-literals.ts index 6dab643b9..096ac9252 100644 --- a/packages/ui-library/src/utils/nested-typesafe-css-literals.ts +++ b/packages/ui-library/src/utils/nested-typesafe-css-literals.ts @@ -1,4 +1,4 @@ -import { CSSResult } from 'lit'; +import { CSSResult } from 'lit-element'; import { css as internalCss } from 'nested-css-to-flat/lit-css'; type cssAttributeValue = string | number; diff --git a/packages/ui-library/src/utils/typesafe-generic-component-renderer.ts b/packages/ui-library/src/utils/typesafe-generic-component-renderer.ts index 9236fabd8..99a899843 100644 --- a/packages/ui-library/src/utils/typesafe-generic-component-renderer.ts +++ b/packages/ui-library/src/utils/typesafe-generic-component-renderer.ts @@ -1,4 +1,4 @@ -import { TemplateResult, html } from 'lit'; +import { TemplateResult, html } from 'lit-element'; export const genericBlrComponentRenderer = >( tagName: string, diff --git a/packages/ui-library/src/utils/wrap-values-with-css.ts b/packages/ui-library/src/utils/wrap-values-with-css.ts index 4e2ba2ec0..2f7696fb0 100644 --- a/packages/ui-library/src/utils/wrap-values-with-css.ts +++ b/packages/ui-library/src/utils/wrap-values-with-css.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { css, unsafeCSS } from 'lit'; +import { css, unsafeCSS } from 'lit-element'; export const wrapValuesWithCss = (obj: any) => { // Iterate over each key-value pair in the object diff --git a/packages/ui-library/tsconfig.json b/packages/ui-library/tsconfig.json index 768f41888..d1898781c 100644 --- a/packages/ui-library/tsconfig.json +++ b/packages/ui-library/tsconfig.json @@ -27,5 +27,5 @@ ] }, "include": ["src"], - "exclude": [""] + "exclude": ["src/**/*.stories.ts", "src/**/*.test.ts"] } From 9660e606885126309db44ed2e28661ad39b1c8bf Mon Sep 17 00:00:00 2001 From: "christian.b.hoffmann" Date: Tue, 19 Dec 2023 16:39:49 +0100 Subject: [PATCH 05/10] github jobs renaming --- .github/workflows/analyze.yml | 2 +- .github/workflows/compile.yml | 2 +- .github/workflows/eslint.yml | 2 +- .github/workflows/test.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml index a5c47304a..50ab6528b 100644 --- a/.github/workflows/analyze.yml +++ b/.github/workflows/analyze.yml @@ -1,4 +1,4 @@ -name: Compile +name: Lit-Analyze on: [pull_request] diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 26448f5c5..ea40a2b0b 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -1,4 +1,4 @@ -name: Compile +name: TSC Compile on: [pull_request] diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml index 1ab95151b..73ebfd4f8 100644 --- a/.github/workflows/eslint.yml +++ b/.github/workflows/eslint.yml @@ -1,4 +1,4 @@ -name: eslint +name: Eslint on: [pull_request] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5cba0e71c..696a11701 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: Test +name: Unit-Tests on: [pull_request] From 8ed5725467840b40bbfd3965ad05301d8ad67a3a Mon Sep 17 00:00:00 2001 From: "christian.b.hoffmann" Date: Tue, 19 Dec 2023 16:41:35 +0100 Subject: [PATCH 06/10] ignore analyze in the pipeline --- .github/workflows/analyze.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml index 50ab6528b..1cd3c5e7c 100644 --- a/.github/workflows/analyze.yml +++ b/.github/workflows/analyze.yml @@ -6,6 +6,8 @@ jobs: analyze: runs-on: ubuntu-latest + continue-on-error: true + steps: - name: Checkout code uses: actions/checkout@v3 From 3c07f8accd4f7193c182808d6eced41b83e9a4de Mon Sep 17 00:00:00 2001 From: "christian.b.hoffmann" Date: Tue, 19 Dec 2023 16:47:05 +0100 Subject: [PATCH 07/10] test the attribute --- .github/workflows/analyze.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml index 1cd3c5e7c..de9ec0588 100644 --- a/.github/workflows/analyze.yml +++ b/.github/workflows/analyze.yml @@ -6,7 +6,7 @@ jobs: analyze: runs-on: ubuntu-latest - continue-on-error: true + #continue-on-error: true steps: - name: Checkout code From a4044674350c17e3613c7f71e5dc518c56f79c8b Mon Sep 17 00:00:00 2001 From: "christian.b.hoffmann" Date: Tue, 19 Dec 2023 16:54:58 +0100 Subject: [PATCH 08/10] removed comment --- .github/workflows/analyze.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml index de9ec0588..50ab6528b 100644 --- a/.github/workflows/analyze.yml +++ b/.github/workflows/analyze.yml @@ -6,8 +6,6 @@ jobs: analyze: runs-on: ubuntu-latest - #continue-on-error: true - steps: - name: Checkout code uses: actions/checkout@v3 From 2c828491bc93214146e9f78bce3db33db105ac1f Mon Sep 17 00:00:00 2001 From: "christian.b.hoffmann" Date: Thu, 21 Dec 2023 14:52:25 +0100 Subject: [PATCH 09/10] dont update lit --- package.json | 2 +- packages/ui-library/package.json | 1 - .../actions/buttons/icon-button/index.stories.ts | 2 +- .../actions/buttons/icon-button/index.ts | 6 +++--- .../actions/buttons/text-button/index.ts | 6 +++--- .../src/components/feedback/loader/index.ts | 6 +++--- .../components/feedback/tooltip/index.stories.ts | 4 ++-- .../src/components/feedback/tooltip/index.test.ts | 2 +- .../src/components/feedback/tooltip/index.ts | 4 ++-- .../tooltip/tooltip-bubble/index.stories.ts | 2 +- .../feedback/tooltip/tooltip-bubble/index.ts | 6 +++--- .../src/components/forms/checkbox/index.ts | 6 +++--- .../components/forms/number-input/index.stories.ts | 2 +- .../src/components/forms/number-input/index.ts | 4 ++-- .../forms/radio/radio-input-group/index.ts | 6 +++--- .../components/forms/radio/radio-input/index.ts | 6 +++--- .../src/components/forms/select/index.ts | 6 +++--- .../range-legend-slider/index.ts | 8 ++++---- .../slider-single-value/range-slider/index.ts | 6 +++--- .../range-legend-min-max-slider/index.ts | 8 ++++---- .../range-min-max-slider/index.ts | 6 +++--- .../components/forms/text-input/index.stories.ts | 2 +- .../src/components/forms/text-input/index.ts | 6 +++--- .../src/components/forms/textarea/index.stories.ts | 2 +- .../src/components/forms/textarea/index.ts | 6 +++--- .../src/components/forms/toggle-switch/index.ts | 6 +++--- .../internal-components/counter/index.ts | 6 +++--- .../form-caption-group/form-caption/index.ts | 6 +++--- .../form-caption-group/index.ts | 6 +++--- .../form-label/form-label-inline/index.ts | 2 +- .../internal-components/form-label/index.ts | 4 ++-- .../src/components/navigation/tab-bar/index.ts | 6 +++--- .../components/ui/button-group/index.stories.ts | 2 +- .../src/components/ui/button-group/index.ts | 6 +++--- .../ui-library/src/components/ui/divider/index.ts | 6 +++--- .../src/components/ui/icon/icon-link/index.ts | 6 +++--- .../src/components/ui/icon/index.stories.ts | 2 +- .../src/components/ui/icon/index.test.ts | 2 +- .../ui-library/src/components/ui/icon/index.ts | 8 ++++---- .../_tokens-generated/index.pseudo.generated.ts | 2 +- packages/ui-library/src/links.stories.ts | 2 +- .../src/utils/nested-typesafe-css-literals.ts | 2 +- .../utils/typesafe-generic-component-renderer.ts | 2 +- .../ui-library/src/utils/wrap-values-with-css.ts | 2 +- packages/ui-library/tsconfig.json | 14 ++------------ yarn.lock | 6 +++--- 46 files changed, 101 insertions(+), 112 deletions(-) diff --git a/package.json b/package.json index cf746fcc3..9271aa78a 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "dependencies": { "@lit-labs/react": "^1.1.1", "http-server": "^14.1.1", - "lit-element": "^4.0.2", + "lit": "^2.7.4", "nested-css-to-flat": "^1.0.5", "rimraf": "^5.0.5" }, diff --git a/packages/ui-library/package.json b/packages/ui-library/package.json index f66750a7d..630894c4c 100644 --- a/packages/ui-library/package.json +++ b/packages/ui-library/package.json @@ -5,7 +5,6 @@ "scripts": { "start:storybook": "sb dev -p 1337", "compile": "tsc --project tsconfig.json", - "analyze": "npx lit-analyzer \"src/**/*.{js,ts}\"", "build:storybook": "sb build", "build": "NODE_ENV=production webpack --config webpack.prod.js", "build:types": "rimraf types && tsc --emitDeclarationOnly", diff --git a/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts b/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts index b7e94c64d..88a5f2a01 100644 --- a/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts +++ b/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts @@ -1,5 +1,5 @@ /* eslint-disable no-console */ -import { html } from 'lit-element'; +import { html } from 'lit'; import { BlrIconButtonType, BlrIconButtonRenderFunction } from './index'; import { PureIconKeys } from '@boiler/icons'; import { ActionVariants, ActionSizes } from '../../../../globals/constants'; diff --git a/packages/ui-library/src/components/actions/buttons/icon-button/index.ts b/packages/ui-library/src/components/actions/buttons/icon-button/index.ts index 9d5df6891..c35d0c18b 100644 --- a/packages/ui-library/src/components/actions/buttons/icon-button/index.ts +++ b/packages/ui-library/src/components/actions/buttons/icon-button/index.ts @@ -1,7 +1,7 @@ /* eslint-disable no-console */ -import { LitElement, html, nothing } from 'lit-element'; -import { classMap } from 'lit-html/directives/class-map.js'; -import { customElement, property, state } from 'lit-element/decorators.js'; +import { LitElement, html, nothing } from 'lit'; +import { classMap } from 'lit/directives/class-map.js'; +import { customElement, property, state } from 'lit/decorators.js'; import { SizelessIconType } from '@boiler/icons'; import { styleCustom } from './index.css'; import { actionDark, actionLight } from '../../../../foundation/semantic-tokens/action.css'; diff --git a/packages/ui-library/src/components/actions/buttons/text-button/index.ts b/packages/ui-library/src/components/actions/buttons/text-button/index.ts index 93cd2c81e..a2926231c 100644 --- a/packages/ui-library/src/components/actions/buttons/text-button/index.ts +++ b/packages/ui-library/src/components/actions/buttons/text-button/index.ts @@ -1,7 +1,7 @@ /* eslint-disable no-console */ -import { LitElement, html, nothing } from 'lit-element'; -import { classMap } from 'lit-html/directives/class-map.js'; -import { customElement, property, state } from 'lit-element/decorators.js'; +import { LitElement, html, nothing } from 'lit'; +import { classMap } from 'lit/directives/class-map.js'; +import { customElement, property, state } from 'lit/decorators.js'; import { SizelessIconType } from '@boiler/icons'; import { styleCustom } from './index.css'; import { actionDark, actionLight } from '../../../../foundation/semantic-tokens/action.css'; diff --git a/packages/ui-library/src/components/feedback/loader/index.ts b/packages/ui-library/src/components/feedback/loader/index.ts index 4cd54ae6c..ecea155a8 100644 --- a/packages/ui-library/src/components/feedback/loader/index.ts +++ b/packages/ui-library/src/components/feedback/loader/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html } from 'lit-element'; -import { classMap } from 'lit-html/directives/class-map.js'; -import { customElement, property } from 'lit-element/decorators.js'; +import { LitElement, html } from 'lit'; +import { classMap } from 'lit/directives/class-map.js'; +import { customElement, property } from 'lit/decorators.js'; import { styleCustomLight, styleCustomDark } from './index.css'; import { ActionSizesType, FeedbackVariantType } from '../../../globals/types'; import { ThemeType } from '../../../foundation/_tokens-generated/index.themes'; diff --git a/packages/ui-library/src/components/feedback/tooltip/index.stories.ts b/packages/ui-library/src/components/feedback/tooltip/index.stories.ts index 768df6106..1a4bacbc1 100644 --- a/packages/ui-library/src/components/feedback/tooltip/index.stories.ts +++ b/packages/ui-library/src/components/feedback/tooltip/index.stories.ts @@ -1,10 +1,10 @@ -import { LitElement, html } from 'lit-element'; +import { LitElement, html } from 'lit'; import { BlrTooltipRenderFunction, BlrTooltipType } from './index'; import { ThemeType, Themes } from '../../../foundation/_tokens-generated/index.themes'; import { TooltipPlacement } from '../../../globals/constants'; import { tooltipPosition } from './tooltip-position'; -import { customElement, property, query, state } from 'lit-element/decorators.js'; +import { customElement, property, query, state } from 'lit/decorators.js'; import { FormSizesType } from '../../../globals/types'; import { Placement as PlacementType } from '@floating-ui/dom'; import { BlrTooltipBubbleRenderFunction } from './tooltip-bubble'; diff --git a/packages/ui-library/src/components/feedback/tooltip/index.test.ts b/packages/ui-library/src/components/feedback/tooltip/index.test.ts index 681ba9a93..29cda1296 100644 --- a/packages/ui-library/src/components/feedback/tooltip/index.test.ts +++ b/packages/ui-library/src/components/feedback/tooltip/index.test.ts @@ -1,7 +1,7 @@ import { BlrTooltipRenderFunction, BlrTooltipType } from './index'; import { fixture, expect } from '@open-wc/testing'; -import { html } from 'lit-element'; +import { html } from 'lit'; import { querySelectorDeep } from 'query-selector-shadow-dom'; const sampleParams: BlrTooltipType = { diff --git a/packages/ui-library/src/components/feedback/tooltip/index.ts b/packages/ui-library/src/components/feedback/tooltip/index.ts index 25f137321..aab34a761 100644 --- a/packages/ui-library/src/components/feedback/tooltip/index.ts +++ b/packages/ui-library/src/components/feedback/tooltip/index.ts @@ -1,5 +1,5 @@ -import { LitElement, TemplateResult, html } from 'lit-element'; -import { customElement, property, state } from 'lit-element/decorators.js'; +import { LitElement, TemplateResult, html } from 'lit'; +import { customElement, property, state } from 'lit/decorators.js'; import { Placement as PlacementType } from '@floating-ui/dom'; import { ThemeType } from '../../../foundation/_tokens-generated/index.themes'; import { genericBlrComponentRenderer } from '../../../utils/typesafe-generic-component-renderer'; diff --git a/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.stories.ts b/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.stories.ts index 6cf9dcc23..e0a15d573 100644 --- a/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.stories.ts +++ b/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.stories.ts @@ -1,4 +1,4 @@ -import { html } from 'lit-element'; +import { html } from 'lit'; import { BlrTooltipBubbleRenderFunction, BlrTooltipBubbleType } from '.'; import { Themes } from '../../../../foundation/_tokens-generated/index.themes'; diff --git a/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.ts b/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.ts index e94e96c2d..91620273e 100644 --- a/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.ts +++ b/packages/ui-library/src/components/feedback/tooltip/tooltip-bubble/index.ts @@ -1,9 +1,9 @@ -import { LitElement, css, html, nothing } from 'lit-element'; -import { customElement, property } from 'lit-element/decorators.js'; +import { LitElement, css, html, nothing } from 'lit'; +import { customElement, property } from 'lit/decorators.js'; import { light, dark } from './index.css'; import { ThemeType } from '../../../../foundation/_tokens-generated/index.themes'; import { genericBlrComponentRenderer } from '../../../../utils/typesafe-generic-component-renderer'; -import { classMap } from 'lit-html/directives/class-map.js'; +import { classMap } from 'lit/directives/class-map.js'; const TAG_NAME = 'blr-tooltip-bubble'; diff --git a/packages/ui-library/src/components/forms/checkbox/index.ts b/packages/ui-library/src/components/forms/checkbox/index.ts index f5afcbc3d..dec922761 100644 --- a/packages/ui-library/src/components/forms/checkbox/index.ts +++ b/packages/ui-library/src/components/forms/checkbox/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit-element'; -import { customElement, property, query, state } from 'lit-element/decorators.js'; -import { classMap } from 'lit-html/directives/class-map.js'; +import { LitElement, html, nothing } from 'lit'; +import { customElement, property, query, state } from 'lit/decorators.js'; +import { classMap } from 'lit/directives/class-map.js'; import { BlrFormLabelInline } from '../../internal-components/form-label/form-label-inline'; import { FormSizesType } from '../../../globals/types'; diff --git a/packages/ui-library/src/components/forms/number-input/index.stories.ts b/packages/ui-library/src/components/forms/number-input/index.stories.ts index 6da91fd65..cf47e7dcf 100644 --- a/packages/ui-library/src/components/forms/number-input/index.stories.ts +++ b/packages/ui-library/src/components/forms/number-input/index.stories.ts @@ -3,7 +3,7 @@ import { BlrNumberInputRenderFunction, BlrNumberInputType } from './index'; import { FormSizes, Units } from '../../../globals/constants'; import { Themes } from '../../../foundation/_tokens-generated/index.themes'; import { PureIconKeys } from '@boiler/icons/icons-optimized/icons'; -import { html } from 'lit-element'; +import { html } from 'lit'; import { action } from '@storybook/addon-actions'; const sharedStyles = html` diff --git a/packages/ui-library/src/components/forms/number-input/index.ts b/packages/ui-library/src/components/forms/number-input/index.ts index ee24bcfa3..0317a1102 100644 --- a/packages/ui-library/src/components/forms/number-input/index.ts +++ b/packages/ui-library/src/components/forms/number-input/index.ts @@ -1,5 +1,5 @@ -import { LitElement, TemplateResult, html, nothing } from 'lit-element'; -import { customElement, property, query, state } from 'lit-element/decorators.js'; +import { LitElement, TemplateResult, html, nothing } from 'lit'; +import { customElement, property, query, state } from 'lit/decorators.js'; import { baseStyle, wrapperLight, wrapperDark, StepperComboDark, StepperComboLight } from './index.css'; import { classMap } from 'lit-html/directives/class-map.js'; import { BlrFormLabelRenderFunction } from '../../internal-components/form-label'; diff --git a/packages/ui-library/src/components/forms/radio/radio-input-group/index.ts b/packages/ui-library/src/components/forms/radio/radio-input-group/index.ts index 59d747434..d86c05adb 100644 --- a/packages/ui-library/src/components/forms/radio/radio-input-group/index.ts +++ b/packages/ui-library/src/components/forms/radio/radio-input-group/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit-element'; -import { classMap } from 'lit-html/directives/class-map.js'; -import { customElement, property } from 'lit-element/decorators.js'; +import { LitElement, html, nothing } from 'lit'; +import { classMap } from 'lit/directives/class-map.js'; +import { customElement, property } from 'lit/decorators.js'; import { styleCustom } from './index.css'; import { formDark, formLight } from '../../../../foundation/semantic-tokens/form.css'; import { radioDark, radioLight } from '../../../../foundation/component-tokens/radio.css'; diff --git a/packages/ui-library/src/components/forms/radio/radio-input/index.ts b/packages/ui-library/src/components/forms/radio/radio-input/index.ts index 0db21c0af..e38e1de2b 100644 --- a/packages/ui-library/src/components/forms/radio/radio-input/index.ts +++ b/packages/ui-library/src/components/forms/radio/radio-input/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit-element'; -import { classMap } from 'lit-html/directives/class-map.js'; -import { customElement, property } from 'lit-element/decorators.js'; +import { LitElement, html, nothing } from 'lit'; +import { classMap } from 'lit/directives/class-map.js'; +import { customElement, property } from 'lit/decorators.js'; import { styleCustom } from './index.css'; import { InputSizesType } from '../../../../globals/types'; import { formDark, formLight } from '../../../../foundation/semantic-tokens/form.css'; diff --git a/packages/ui-library/src/components/forms/select/index.ts b/packages/ui-library/src/components/forms/select/index.ts index f400c5b96..2ec6c2b42 100644 --- a/packages/ui-library/src/components/forms/select/index.ts +++ b/packages/ui-library/src/components/forms/select/index.ts @@ -1,3 +1,6 @@ +import { LitElement, html, nothing } from 'lit'; +import { ClassMapDirective, classMap } from 'lit/directives/class-map.js'; +import { customElement, property, state } from 'lit/decorators.js'; import { styleCustom } from './index.css'; import { FormSizesType, SizesType } from '../../../globals/types'; import { BlrFormLabelRenderFunction } from '../../internal-components/form-label'; @@ -13,9 +16,6 @@ import { genericBlrComponentRenderer } from '../../../utils/typesafe-generic-com import { BlrFormCaptionGroupRenderFunction } from '../../internal-components/form-caption-group'; import { BlrFormCaptionRenderFunction } from '../../internal-components/form-caption-group/form-caption'; -import { ClassMapDirective, classMap } from 'lit-html/directives/class-map.js'; -import { LitElement, html, nothing } from 'lit-element'; -import { customElement, property, state } from 'lit-element/decorators.js'; type Option = { value: string; diff --git a/packages/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts b/packages/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts index fc24c8292..d02ba893f 100644 --- a/packages/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts +++ b/packages/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import { LitElement, html, nothing } from 'lit-element'; -import { customElement, property, state } from 'lit-element/decorators.js'; -import { classMap } from 'lit-html/directives/class-map.js'; -import { map } from 'lit-html/directives/map.js'; +import { LitElement, html, nothing } from 'lit'; +import { customElement, property, state } from 'lit/decorators.js'; +import { classMap } from 'lit/directives/class-map.js'; +import { map } from 'lit/directives/map.js'; import { styleCustom } from './index.css'; import { sliderDark, sliderLight } from '../../../../../foundation/component-tokens/slider-legend.css'; import { FormSizesType, ActionVariantType } from '../../../../../globals/types'; diff --git a/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts b/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts index 86a20837b..0ad04c2cc 100644 --- a/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts +++ b/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit-element'; -import { customElement, property, state } from 'lit-element/decorators.js'; -import { classMap } from 'lit-html/directives/class-map.js'; +import { LitElement, html, nothing } from 'lit'; +import { customElement, property, state } from 'lit/decorators.js'; +import { classMap } from 'lit/directives/class-map.js'; import { styleCustom } from './index.css'; import { sliderDark, sliderLight } from '../../../../../foundation/component-tokens/slider.css'; import { FormSizesType, ActionVariantType } from '../../../../../globals/types'; diff --git a/packages/ui-library/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts b/packages/ui-library/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts index 85f81a65e..58dd458f9 100644 --- a/packages/ui-library/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts +++ b/packages/ui-library/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import { LitElement, html, nothing } from 'lit-element'; -import { customElement, property, state } from 'lit-element/decorators.js'; -import { classMap } from 'lit-html/directives/class-map.js'; -import { map } from 'lit-html/directives/map.js'; +import { LitElement, html, nothing } from 'lit'; +import { customElement, property, state } from 'lit/decorators.js'; +import { classMap } from 'lit/directives/class-map.js'; +import { map } from 'lit/directives/map.js'; import { styleCustom } from './index.css'; import { sliderDark, sliderLight } from '../../../../../foundation/component-tokens/slider-legend.css'; import { FormSizesType, ActionVariantType } from '../../../../../globals/types'; diff --git a/packages/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts b/packages/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts index 398716b13..2dd3483a5 100644 --- a/packages/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts +++ b/packages/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit-element'; -import { customElement, property, state } from 'lit-element/decorators.js'; -import { classMap } from 'lit-html/directives/class-map.js'; +import { LitElement, html, nothing } from 'lit'; +import { customElement, property, state } from 'lit/decorators.js'; +import { classMap } from 'lit/directives/class-map.js'; import { styleCustom } from './index.css'; import { sliderDark, sliderLight } from '../../../../../foundation/component-tokens/slider.css'; import { FormSizesType, ActionVariantType } from '../../../../../globals/types'; diff --git a/packages/ui-library/src/components/forms/text-input/index.stories.ts b/packages/ui-library/src/components/forms/text-input/index.stories.ts index 1fc10d370..895d247b1 100644 --- a/packages/ui-library/src/components/forms/text-input/index.stories.ts +++ b/packages/ui-library/src/components/forms/text-input/index.stories.ts @@ -4,7 +4,7 @@ import { FormSizes, InputTypes } from '../../../globals/constants'; import { PureIconKeys } from '@boiler/icons'; import { Themes } from '../../../foundation/_tokens-generated/index.themes'; import { action } from '@storybook/addon-actions'; -import { html } from 'lit-element'; +import { html } from 'lit'; // Shared Style inside the Stories const sharedStyles = html` diff --git a/packages/ui-library/src/components/forms/text-input/index.ts b/packages/ui-library/src/components/forms/text-input/index.ts index bab5c42c1..9399124ea 100644 --- a/packages/ui-library/src/components/forms/text-input/index.ts +++ b/packages/ui-library/src/components/forms/text-input/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit-element'; -import { classMap } from 'lit-html/directives/class-map.js'; -import { customElement, property, state } from 'lit-element/decorators.js'; +import { LitElement, html, nothing } from 'lit'; +import { classMap } from 'lit/directives/class-map.js'; +import { customElement, property, state } from 'lit/decorators.js'; import { styleCustom } from './index.css'; import { formDark, formLight } from '../../../foundation/semantic-tokens/form.css'; import { textInputLight, textInputDark } from './index.css'; diff --git a/packages/ui-library/src/components/forms/textarea/index.stories.ts b/packages/ui-library/src/components/forms/textarea/index.stories.ts index f6cba6aa6..058adb8a9 100644 --- a/packages/ui-library/src/components/forms/textarea/index.stories.ts +++ b/packages/ui-library/src/components/forms/textarea/index.stories.ts @@ -1,5 +1,5 @@ /* eslint-disable no-console */ -import { html } from 'lit-element'; +import { html } from 'lit'; import { BlrTextareaRenderFunction, BlrTextareaType } from './index'; import { FormSizes, Resizes } from '../../../globals/constants'; import { action } from '@storybook/addon-actions'; diff --git a/packages/ui-library/src/components/forms/textarea/index.ts b/packages/ui-library/src/components/forms/textarea/index.ts index 3092690fb..823d4fecc 100644 --- a/packages/ui-library/src/components/forms/textarea/index.ts +++ b/packages/ui-library/src/components/forms/textarea/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit-element'; -import { classMap } from 'lit-html/directives/class-map.js'; -import { customElement, property, query, state } from 'lit-element/decorators.js'; +import { LitElement, html, nothing } from 'lit'; +import { classMap } from 'lit/directives/class-map.js'; +import { customElement, property, query, state } from 'lit/decorators.js'; import { styleCustom, textAreaDark, textAreaLight } from './index.css'; import { CounterVariantType, FormSizesType, WarningLimits, ResizeType } from '../../../globals/types'; import { BlrFormLabelRenderFunction } from '../../internal-components/form-label'; diff --git a/packages/ui-library/src/components/forms/toggle-switch/index.ts b/packages/ui-library/src/components/forms/toggle-switch/index.ts index aac806431..5a1300326 100644 --- a/packages/ui-library/src/components/forms/toggle-switch/index.ts +++ b/packages/ui-library/src/components/forms/toggle-switch/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit-element'; -import { customElement, property, query, state } from 'lit-element/decorators.js'; -import { classMap } from 'lit-html/directives/class-map.js'; +import { LitElement, html, nothing } from 'lit'; +import { customElement, property, query, state } from 'lit/decorators.js'; +import { classMap } from 'lit/directives/class-map.js'; import { SizelessIconType } from '@boiler/icons'; import { BlrFormLabelInline } from '../../internal-components/form-label/form-label-inline'; diff --git a/packages/ui-library/src/components/internal-components/counter/index.ts b/packages/ui-library/src/components/internal-components/counter/index.ts index 5674ab7fc..3075812ee 100644 --- a/packages/ui-library/src/components/internal-components/counter/index.ts +++ b/packages/ui-library/src/components/internal-components/counter/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html } from 'lit-element'; -import { customElement, property } from 'lit-element/decorators.js'; -import { classMap } from 'lit-html/directives/class-map.js'; +import { LitElement, html } from 'lit'; +import { customElement, property } from 'lit/decorators.js'; +import { classMap } from 'lit/directives/class-map.js'; import { CounterVariantType, FormSizesType } from '../../../globals/types'; import { ThemeType } from '../../../foundation/_tokens-generated/index.themes'; import { counterLight, counterDark } from './index.css'; diff --git a/packages/ui-library/src/components/internal-components/form-caption-group/form-caption/index.ts b/packages/ui-library/src/components/internal-components/form-caption-group/form-caption/index.ts index caf2491f1..2135624ca 100644 --- a/packages/ui-library/src/components/internal-components/form-caption-group/form-caption/index.ts +++ b/packages/ui-library/src/components/internal-components/form-caption-group/form-caption/index.ts @@ -1,6 +1,6 @@ -import { LitElement, TemplateResult, html, nothing } from 'lit-element'; -import { customElement, property } from 'lit-element/decorators.js'; -import { classMap } from 'lit-html/directives/class-map.js'; +import { LitElement, TemplateResult, html, nothing } from 'lit'; +import { customElement, property } from 'lit/decorators.js'; +import { classMap } from 'lit/directives/class-map.js'; import { FormSizesType, CaptionVariantType, SizesType } from '../../../../globals/types'; import { BlrIconRenderFunction } from '../../../ui/icon'; import { SizelessIconType } from '@boiler/icons'; diff --git a/packages/ui-library/src/components/internal-components/form-caption-group/index.ts b/packages/ui-library/src/components/internal-components/form-caption-group/index.ts index 7836e690a..a12b0e0bc 100644 --- a/packages/ui-library/src/components/internal-components/form-caption-group/index.ts +++ b/packages/ui-library/src/components/internal-components/form-caption-group/index.ts @@ -1,8 +1,8 @@ -import { html, LitElement, TemplateResult } from 'lit-element'; -import { customElement, property } from 'lit-element/decorators.js'; +import { html, LitElement, TemplateResult } from 'lit'; +import { customElement, property } from 'lit/decorators.js'; import { genericBlrComponentRenderer } from '../../../utils/typesafe-generic-component-renderer'; import { FormSizesType } from '../../../globals/types'; -import { classMap } from 'lit-html/directives/class-map.js'; +import { classMap } from 'lit/directives/class-map.js'; import { formCaptionGroupStyle } from './index.css'; const TAG_NAME = 'blr-form-caption-group'; diff --git a/packages/ui-library/src/components/internal-components/form-label/form-label-inline/index.ts b/packages/ui-library/src/components/internal-components/form-label/form-label-inline/index.ts index bf430cccf..9cd652dec 100644 --- a/packages/ui-library/src/components/internal-components/form-label/form-label-inline/index.ts +++ b/packages/ui-library/src/components/internal-components/form-label/form-label-inline/index.ts @@ -1,4 +1,4 @@ -import { html } from 'lit-element'; +import { html } from 'lit'; import { InputSizesType } from '../../../../globals/types'; type FormLabelInlineType = { diff --git a/packages/ui-library/src/components/internal-components/form-label/index.ts b/packages/ui-library/src/components/internal-components/form-label/index.ts index b24973d2f..adb5ec539 100644 --- a/packages/ui-library/src/components/internal-components/form-label/index.ts +++ b/packages/ui-library/src/components/internal-components/form-label/index.ts @@ -1,7 +1,7 @@ -import { LitElement, html, nothing } from 'lit-element'; +import { LitElement, html, nothing } from 'lit'; import { InputSizesType, LabelVariantType } from '../../../globals/types'; import { formDark, formLight } from '../../../foundation/semantic-tokens/form.css'; -import { customElement, property } from 'lit-element/decorators.js'; +import { customElement, property } from 'lit/decorators.js'; import { classMap } from 'lit-html/directives/class-map.js'; import { ThemeType } from '../../../foundation/_tokens-generated/index.themes'; import { genericBlrComponentRenderer } from '../../../utils/typesafe-generic-component-renderer'; diff --git a/packages/ui-library/src/components/navigation/tab-bar/index.ts b/packages/ui-library/src/components/navigation/tab-bar/index.ts index c3c0eaff9..38cfc279d 100644 --- a/packages/ui-library/src/components/navigation/tab-bar/index.ts +++ b/packages/ui-library/src/components/navigation/tab-bar/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit-element'; -import { classMap } from 'lit-html/directives/class-map.js'; -import { customElement, property, query, queryAll, state } from 'lit-element/decorators.js'; +import { LitElement, html, nothing } from 'lit'; +import { classMap } from 'lit/directives/class-map.js'; +import { customElement, property, query, queryAll, state } from 'lit/decorators.js'; import { styleCustom, tabBarDark, tabBarLight } from './index.css'; import { formDark, formLight } from '../../../foundation/semantic-tokens/form.css'; diff --git a/packages/ui-library/src/components/ui/button-group/index.stories.ts b/packages/ui-library/src/components/ui/button-group/index.stories.ts index 6119d78fd..686fb6b14 100644 --- a/packages/ui-library/src/components/ui/button-group/index.stories.ts +++ b/packages/ui-library/src/components/ui/button-group/index.stories.ts @@ -2,7 +2,7 @@ import { BlrButtonGroupType, BlrButtonGroupFunction } from './index'; import { BlrTextButtonRenderFunction } from '../../actions/buttons/text-button'; import { BlrIconButtonRenderFunction } from '../../actions/buttons/icon-button'; -import { html } from 'lit-element'; +import { html } from 'lit'; import { ButtonGroupAlignmentVariants, ButtonGroupSizes } from '../../../globals/constants'; export default { diff --git a/packages/ui-library/src/components/ui/button-group/index.ts b/packages/ui-library/src/components/ui/button-group/index.ts index e4b2bafd7..129788f9a 100644 --- a/packages/ui-library/src/components/ui/button-group/index.ts +++ b/packages/ui-library/src/components/ui/button-group/index.ts @@ -1,6 +1,6 @@ -import { LitElement, TemplateResult, html } from 'lit-element'; -import { customElement, property } from 'lit-element/decorators.js'; -import { classMap } from 'lit-html/directives/class-map.js'; +import { LitElement, TemplateResult, html } from 'lit'; +import { customElement, property } from 'lit/decorators.js'; +import { classMap } from 'lit/directives/class-map.js'; import { styleCustom } from './index.css'; import { genericBlrComponentRenderer } from '../../../utils/typesafe-generic-component-renderer'; diff --git a/packages/ui-library/src/components/ui/divider/index.ts b/packages/ui-library/src/components/ui/divider/index.ts index 1f910e380..02ca26945 100644 --- a/packages/ui-library/src/components/ui/divider/index.ts +++ b/packages/ui-library/src/components/ui/divider/index.ts @@ -1,9 +1,9 @@ -import { LitElement, html } from 'lit-element'; -import { customElement, property } from 'lit-element/decorators.js'; +import { LitElement, html } from 'lit'; +import { customElement, property } from 'lit/decorators.js'; import { DividerVariationTypes } from '../../../globals/types'; import { ThemeType } from '../../../foundation/_tokens-generated/index.themes'; import { genericBlrComponentRenderer } from '../../../utils/typesafe-generic-component-renderer'; -import { classMap } from 'lit-html/directives/class-map.js'; +import { classMap } from 'lit/directives/class-map.js'; import { dividerDark, dividerLight } from './index.css'; const TAG_NAME = 'blr-divider'; diff --git a/packages/ui-library/src/components/ui/icon/icon-link/index.ts b/packages/ui-library/src/components/ui/icon/icon-link/index.ts index 1ec94e483..bd85b52a0 100644 --- a/packages/ui-library/src/components/ui/icon/icon-link/index.ts +++ b/packages/ui-library/src/components/ui/icon/icon-link/index.ts @@ -1,6 +1,6 @@ -import { LitElement, html, nothing } from 'lit-element'; -import { classMap } from 'lit-html/directives/class-map.js'; -import { customElement, property } from 'lit-element/decorators.js'; +import { LitElement, html, nothing } from 'lit'; +import { classMap } from 'lit/directives/class-map.js'; +import { customElement, property } from 'lit/decorators.js'; import { SizelessIconType } from '@boiler/icons'; import { styleCustom as iconLinkStyleCustom } from './index.css'; import { styleCustom as iconButtonStyleCustom } from '../../../actions/buttons/icon-button/index.css'; diff --git a/packages/ui-library/src/components/ui/icon/index.stories.ts b/packages/ui-library/src/components/ui/icon/index.stories.ts index 4a3805af5..a8fc5b3f8 100644 --- a/packages/ui-library/src/components/ui/icon/index.stories.ts +++ b/packages/ui-library/src/components/ui/icon/index.stories.ts @@ -5,7 +5,7 @@ import { BlrIconType, BlrIconRenderFunction } from './index'; import { Sizes } from '../../../globals/constants'; import { getIconName } from '../../../utils/get-icon-name'; import { calculateIconName } from '../../../utils/calculate-icon-name'; -import { classMap } from 'lit-html/directives/class-map.js'; +import { classMap } from 'lit/directives/class-map.js'; import { SizesType } from '../../../globals/types'; export default { diff --git a/packages/ui-library/src/components/ui/icon/index.test.ts b/packages/ui-library/src/components/ui/icon/index.test.ts index 494542e3c..9ea90cf0d 100644 --- a/packages/ui-library/src/components/ui/icon/index.test.ts +++ b/packages/ui-library/src/components/ui/icon/index.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/await-thenable */ import { fixture, expect } from '@open-wc/testing'; import { BlrIconRenderFunction } from '.'; -import { classMap } from 'lit-html/directives/class-map.js'; +import { classMap } from 'lit/directives/class-map.js'; import { querySelectorDeep } from 'query-selector-shadow-dom'; const TEST_CLASS = 'test-class'; diff --git a/packages/ui-library/src/components/ui/icon/index.ts b/packages/ui-library/src/components/ui/icon/index.ts index eb191bdcc..e0a57bda9 100644 --- a/packages/ui-library/src/components/ui/icon/index.ts +++ b/packages/ui-library/src/components/ui/icon/index.ts @@ -1,11 +1,11 @@ -import { LitElement, html, nothing } from 'lit-element'; -import { customElement, property } from 'lit-element/decorators.js'; +import { LitElement, html, nothing } from 'lit'; +import { customElement, property } from 'lit/decorators.js'; import { IconMapping, IconType } from '@boiler/icons'; import { styleCustom } from './index.css'; import { SizesType } from '../../../globals/types'; import { DirectiveResult } from 'lit-html/directive'; -import { ClassMapDirective } from 'lit-html/directives/class-map.js'; -import { styleMap } from 'lit-html/directives/style-map.js'; +import { ClassMapDirective } from 'lit-html/directives/class-map'; +import { styleMap } from 'lit/directives/style-map.js'; const TAG_NAME = 'blr-icon'; diff --git a/packages/ui-library/src/foundation/_tokens-generated/index.pseudo.generated.ts b/packages/ui-library/src/foundation/_tokens-generated/index.pseudo.generated.ts index 8c22c7c8c..a22f8dfcd 100644 --- a/packages/ui-library/src/foundation/_tokens-generated/index.pseudo.generated.ts +++ b/packages/ui-library/src/foundation/_tokens-generated/index.pseudo.generated.ts @@ -22,7 +22,7 @@ import { import { semanticTokens as semanticTokensDark, componentTokens as componentTokensDark } from './index.Dark.generated'; -import { CSSResult } from 'lit-element'; +import { CSSResult } from 'lit'; export function renderThemedCssStrings(renderFunc: (cT: componentTokensType, sT: semanticTokensType) => CSSResult): { tokenizedLight: CSSResult; diff --git a/packages/ui-library/src/links.stories.ts b/packages/ui-library/src/links.stories.ts index 0ff31d93a..500761326 100644 --- a/packages/ui-library/src/links.stories.ts +++ b/packages/ui-library/src/links.stories.ts @@ -1,5 +1,5 @@ /* eslint-disable no-console */ -import { html } from 'lit-element'; +import { html } from 'lit'; export default { title: 'Design System/Examples', diff --git a/packages/ui-library/src/utils/nested-typesafe-css-literals.ts b/packages/ui-library/src/utils/nested-typesafe-css-literals.ts index 096ac9252..6dab643b9 100644 --- a/packages/ui-library/src/utils/nested-typesafe-css-literals.ts +++ b/packages/ui-library/src/utils/nested-typesafe-css-literals.ts @@ -1,4 +1,4 @@ -import { CSSResult } from 'lit-element'; +import { CSSResult } from 'lit'; import { css as internalCss } from 'nested-css-to-flat/lit-css'; type cssAttributeValue = string | number; diff --git a/packages/ui-library/src/utils/typesafe-generic-component-renderer.ts b/packages/ui-library/src/utils/typesafe-generic-component-renderer.ts index 99a899843..9236fabd8 100644 --- a/packages/ui-library/src/utils/typesafe-generic-component-renderer.ts +++ b/packages/ui-library/src/utils/typesafe-generic-component-renderer.ts @@ -1,4 +1,4 @@ -import { TemplateResult, html } from 'lit-element'; +import { TemplateResult, html } from 'lit'; export const genericBlrComponentRenderer = >( tagName: string, diff --git a/packages/ui-library/src/utils/wrap-values-with-css.ts b/packages/ui-library/src/utils/wrap-values-with-css.ts index 2f7696fb0..4e2ba2ec0 100644 --- a/packages/ui-library/src/utils/wrap-values-with-css.ts +++ b/packages/ui-library/src/utils/wrap-values-with-css.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { css, unsafeCSS } from 'lit-element'; +import { css, unsafeCSS } from 'lit'; export const wrapValuesWithCss = (obj: any) => { // Iterate over each key-value pair in the object diff --git a/packages/ui-library/tsconfig.json b/packages/ui-library/tsconfig.json index d1898781c..70bc31691 100644 --- a/packages/ui-library/tsconfig.json +++ b/packages/ui-library/tsconfig.json @@ -14,18 +14,8 @@ "experimentalDecorators": true, "skipLibCheck": true, "strict": true, - "useDefineForClassFields": false, - "plugins": [ - { - "name": "ts-lit-plugin", - "strict": true, - "rules": { - "no-unknown-tag-name": "off", - "no-unknown-event": "warning" - } - } - ] + "useDefineForClassFields": false }, "include": ["src"], - "exclude": ["src/**/*.stories.ts", "src/**/*.test.ts"] + "exclude": [""] } diff --git a/yarn.lock b/yarn.lock index ecf90909d..0b74bc611 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1574,8 +1574,8 @@ __metadata: http-server: "npm:^14.1.1" husky: "npm:^8.0.0" lint-staged: "npm:^13.1.0" + lit: "npm:^2.7.4" lit-analyzer: "npm:^2.0.2" - lit-element: "npm:^4.0.2" lit-html: "npm:^2.6.1" lodash.camelcase: "npm:4.3.0" mini-css-extract-plugin: "npm:^2.7.2" @@ -11935,7 +11935,7 @@ __metadata: languageName: node linkType: hard -"lit-element@npm:^4.0.0, lit-element@npm:^4.0.2": +"lit-element@npm:^4.0.0": version: 4.0.2 resolution: "lit-element@npm:4.0.2" dependencies: @@ -11975,7 +11975,7 @@ __metadata: languageName: node linkType: hard -"lit@npm:^2.2.1, lit@npm:^2.6.1": +"lit@npm:^2.2.1, lit@npm:^2.6.1, lit@npm:^2.7.4": version: 2.8.0 resolution: "lit@npm:2.8.0" dependencies: From f37fb689acac477f9c541657bde29b5161c18ff0 Mon Sep 17 00:00:00 2001 From: "christian.b.hoffmann" Date: Thu, 21 Dec 2023 14:53:22 +0100 Subject: [PATCH 10/10] dont update lit --- packages/icons/icons-optimized/icons.ts | 2 +- packages/icons/icons-optimized/index.ts | 2 +- packages/icons/scripts/index.mjs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/icons/icons-optimized/icons.ts b/packages/icons/icons-optimized/icons.ts index 09746e922..a02da8261 100644 --- a/packages/icons/icons-optimized/icons.ts +++ b/packages/icons/icons-optimized/icons.ts @@ -1,4 +1,4 @@ -import { html } from 'lit-element'; +import { html } from 'lit'; const blr360Lg = (className: string) => html` diff --git a/packages/icons/icons-optimized/index.ts b/packages/icons/icons-optimized/index.ts index ee291bf9a..6219860ec 100644 --- a/packages/icons/icons-optimized/index.ts +++ b/packages/icons/icons-optimized/index.ts @@ -1,4 +1,4 @@ -import { html } from 'lit-element'; +import { html } from 'lit'; const blr360Lg = (className: string) => html` diff --git a/packages/icons/scripts/index.mjs b/packages/icons/scripts/index.mjs index 798051fa6..9f5c4b4a1 100644 --- a/packages/icons/scripts/index.mjs +++ b/packages/icons/scripts/index.mjs @@ -33,7 +33,7 @@ fs.readdir(iconDir, (err, files) => { console.log('\n'); const template = ` - import { html } from 'lit-element'; \n + import { html } from 'lit'; \n ${iconTemplateStrings.join('\n')} export const IconMapping = { ${icons.map((icon) => icon.name).join(',\n')} };