From 5248df6bb6c6adc1ee90a44d3bfff2a6469f21d8 Mon Sep 17 00:00:00 2001 From: Alex Prudhomme <78121423+alexprudhomme@users.noreply.github.com> Date: Tue, 18 Feb 2025 15:41:31 -0500 Subject: [PATCH 01/11] chore(atomic-angular): add events in lit components generation https://coveord.atlassian.net/browse/KIT-3802 --- packages/atomic-angular/scripts/build-lit.mjs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/atomic-angular/scripts/build-lit.mjs b/packages/atomic-angular/scripts/build-lit.mjs index 7a21926d30e..65d0317386e 100644 --- a/packages/atomic-angular/scripts/build-lit.mjs +++ b/packages/atomic-angular/scripts/build-lit.mjs @@ -14,24 +14,29 @@ const endTag = '//#endregion Lit Declarations'; const declarationToProxyCmp = (declaration) => ` @ProxyCmp({ - inputs: [${declaration.attributes.map(attr => `'${attr.name}'`).join(', ')}] + inputs: [${declaration.attributes.map(attr => `'${attr.fieldName}'`).join(', ')}] }) @Component({ selector: '${declaration.tagName}', changeDetection: ChangeDetectionStrategy.OnPush, template: '', // eslint-disable-next-line @angular-eslint/no-inputs-metadata-property - inputs: [${declaration.attributes.map(attr => `'${attr.name}'`).join(', ')}] + inputs: [${declaration.attributes.map(attr => `'${attr.fieldName}'`).join(', ')}] }) export class ${declaration.name} { protected readonly el: HTMLElement; constructor(c: ChangeDetectorRef, el: ElementRef, protected z: NgZone) { c.detach(); this.el = el.nativeElement; + proxyOutputs(this, this.el, [${declaration.events.map(event => `'${event.name}'`).join(', ')}]); } } -export declare interface ${declaration.name} extends Lit${declaration.name} {} +export declare interface ${declaration.name} extends Lit${declaration.name} { +${declaration.events + .map(event => ` '${event.name}': EventEmitter>;`) + .join('\n')} +} ` atomicAngularComponentFileContent = atomicAngularComponentFileContent.replace(new RegExp(`${startTag}.*?${endTag}`, 'gm'), '').trimEnd() + `\n\n${startTag}\n`; @@ -49,7 +54,7 @@ for (const module of cem.modules) { } } -atomicAngularComponentFileContent+=`\n${litDeclarations.join('\n')}\nimport type {${litImports.join(',')}} from '@coveo/atomic/components';\n${endTag}`; +atomicAngularComponentFileContent += `\nimport type {${litImports.join(', ')}} from '@coveo/atomic/components';\n${endTag}`; if(litDeclarations.length > 0) { From c88a7d290bb592225940da18ae737beb8572c1e1 Mon Sep 17 00:00:00 2001 From: Alex Prudhomme <78121423+alexprudhomme@users.noreply.github.com> Date: Tue, 18 Feb 2025 16:27:40 -0500 Subject: [PATCH 02/11] chore(atomic): fix tsc path transformer for declaration files https://coveord.atlassian.net/browse/KIT-3978 --- packages/atomic/scripts/build.mjs | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/atomic/scripts/build.mjs b/packages/atomic/scripts/build.mjs index 95966cc2805..8d3a9208d33 100644 --- a/packages/atomic/scripts/build.mjs +++ b/packages/atomic/scripts/build.mjs @@ -40,6 +40,7 @@ function emit(program) { const emitOnlyDtsFiles = false; const customTransformers = { before: [svgTransformer, pathTransformer], + afterDeclarations: [pathTransformer], }; return program.emit( From b775721b063cd979df2ccfe265397bde97cef8bb Mon Sep 17 00:00:00 2001 From: Alex Prudhomme <78121423+alexprudhomme@users.noreply.github.com> Date: Tue, 18 Feb 2025 16:38:07 -0500 Subject: [PATCH 03/11] chore(atomic): replace lit-html with lit https://coveord.atlassian.net/browse/KIT-3977 --- package-lock.json | 1 - packages/atomic/package.json | 1 - packages/atomic/src/components.d.ts | 6 +-- .../atomic-commerce-breadbox.new.stories.tsx | 2 +- ...ommerce-load-more-products.new.stories.tsx | 2 +- ...tomic-commerce-no-products.new.stories.tsx | 2 +- ...omic-commerce-product-list.new.stories.tsx | 2 +- ...commerce-products-per-page.new.stories.tsx | 2 +- ...mic-commerce-query-summary.new.stories.tsx | 2 +- ...atomic-commerce-search-box.new.stories.tsx | 2 +- ...ic-commerce-category-facet.new.stories.tsx | 2 +- .../atomic-commerce-facet.new.stories.tsx | 2 +- .../atomic-commerce-facets.new.stories.tsx | 2 +- ...mic-commerce-numeric-facet.new.stories.tsx | 2 +- .../atomic-product-image.new.stories.tsx | 2 +- .../atomic-product-link.new.stories.tsx | 2 +- ...c-product-multi-value-text.new.stories.tsx | 2 +- ...earch-box-instant-products.new.stories.tsx | 2 +- .../atomic-icon/atomic-icon.new.stories.tsx | 2 +- .../atomic-numeric-range.new.stories.tsx | 2 +- .../atomic-timeframe.new.stories.tsx | 2 +- .../atomic-timeframe/atomic-timeframe.tsx | 2 +- .../atomic/src/components/common/button.ts | 4 +- .../components/common/facets/facet-common.tsx | 2 +- .../facet-number-input/facet-number-input.tsx | 2 +- .../facet-search/facet-search-aria-live.ts | 2 +- .../common/facets/timeframe-facet-common.tsx | 18 ++++---- .../atomic/src/components/common/heading.ts | 2 +- .../common/interface/interface-common.tsx | 1 - .../src/components/common/radio-button.ts | 2 +- .../atomic/src/components/common/types.ts | 42 ------------------- .../insight/atomic-insight-interface/store.ts | 7 +++- .../atomic-ipx-recs-list.stories.tsx | 2 +- .../atomic-recs-list.new.stories.tsx | 2 +- .../atomic-external.new.stories.tsx | 2 +- .../atomic-facet/atomic-facet.new.stories.tsx | 2 +- .../atomic-numeric-facet.new.stories.tsx | 2 +- .../atomic-timeframe-facet.new.stories.tsx | 2 +- .../atomic-format-currency.new.stories.tsx | 2 +- .../atomic-format-number.new.stories.tsx | 2 +- .../atomic-format-unit.new.stories.tsx | 2 +- .../atomic-field-condition.new.stories.tsx | 2 +- ...search-box-instant-results.new.stories.tsx | 2 +- ...search-box-instant-results.new.stories.tsx | 2 +- ...-search-box-recent-queries.new.stories.tsx | 2 +- .../atomic-tab-manager.new.stories.tsx | 2 +- .../atomic/src/decorators/binding-guard.ts | 2 +- packages/atomic/src/decorators/error-guard.ts | 2 +- packages/atomic/src/decorators/types.ts | 4 +- packages/atomic/src/directives/hidden.ts | 4 +- .../commerce/commerce-interface-wrapper.tsx | 2 +- .../commerce-product-list-wrapper.tsx | 2 +- .../commerce-product-template-wrapper.tsx | 4 +- ...merce-recommendation-interface-wrapper.tsx | 2 +- .../commerce-recommendation-list-wrapper.tsx | 2 +- ...rce-searchbox-instant-products-wrapper.tsx | 2 +- .../common/facets-decorator.tsx | 2 +- .../insight/insight-interface-wrapper.tsx | 8 ++-- .../search/recs-interface-wrapper.tsx | 2 +- .../search/search-interface-wrapper.tsx | 2 +- 60 files changed, 77 insertions(+), 119 deletions(-) delete mode 100644 packages/atomic/src/components/common/types.ts diff --git a/package-lock.json b/package-lock.json index e14cbdc6b27..c3494f4efba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59820,7 +59820,6 @@ "jest-environment-node": "29.7.0", "jest-localstorage-mock": "2.4.26", "lightningcss": "1.29.1", - "lit-html": "3.2.1", "local-web-server": "5.4.0", "natural-orderby": "5.0.0", "ora": "8.2.0", diff --git a/packages/atomic/package.json b/packages/atomic/package.json index bc54a361989..a8c60cc05b9 100644 --- a/packages/atomic/package.json +++ b/packages/atomic/package.json @@ -131,7 +131,6 @@ "jest-environment-node": "29.7.0", "jest-localstorage-mock": "2.4.26", "lightningcss": "1.29.1", - "lit-html": "3.2.1", "local-web-server": "5.4.0", "natural-orderby": "5.0.0", "ora": "8.2.0", diff --git a/packages/atomic/src/components.d.ts b/packages/atomic/src/components.d.ts index 0d3460f6d36..4d28fc1c117 100644 --- a/packages/atomic/src/components.d.ts +++ b/packages/atomic/src/components.d.ts @@ -5,7 +5,7 @@ * It contains typing information for all components that exist in this project. */ import { HTMLStencilElement, JSXBase } from "@stencil/core/internal"; -import { AutomaticFacet, CategoryFacetSortCriterion, DateFilterRange, DateRangeRequest, FacetResultsMustMatch, FacetSortCriterion, FoldedResult, GeneratedAnswer, GeneratedAnswerCitation, InlineLink, InteractiveCitation, InteractiveResult, LogLevel as LogLevel1, RangeFacetRangeAlgorithm, RangeFacetSortCriterion, Result, ResultTemplate, ResultTemplateCondition, SearchEngine, SearchStatus } from "@coveo/headless"; +import { AutomaticFacet, CategoryFacetSortCriterion, DateFilterRange, DateRangeRequest, FacetResultsMustMatch, FacetSortCriterion, FoldedResult, GeneratedAnswer, GeneratedAnswerCitation, InlineLink, InteractiveCitation, InteractiveResult, LogLevel as LogLevel1, NumericFilter, NumericFilterState, RangeFacetRangeAlgorithm, RangeFacetSortCriterion, RelativeDateUnit, Result, ResultTemplate, ResultTemplateCondition, SearchEngine, SearchStatus } from "@coveo/headless"; import { CategoryFacet, CommerceEngine, DateFacet, InteractiveProduct, LogLevel, NumericFacet, Product, ProductListing, ProductListingSummaryState, ProductTemplate, ProductTemplateCondition, RegularFacet, Search, SearchSummaryState, Summary } from "@coveo/headless/commerce"; import { CommerceBindings as Bindings, CommerceInitializationOptions } from "./components/commerce/atomic-commerce-interface/atomic-commerce-interface"; import { Range } from "./components/commerce/facets/facet-number-input/atomic-commerce-facet-number-input"; @@ -18,7 +18,6 @@ import { AriaLabelGenerator } from "./components/commerce/search-box-suggestions import { AtomicInterface } from "./utils/initialization-utils"; import { AnyBindings } from "./components/common/interface/bindings"; import { NumberInputType } from "./components/common/facets/facet-number-input/number-input-type"; -import { NumericFilter, NumericFilterState, RelativeDateUnit } from "./components/common/types"; import { InsightEngine, FacetSortCriterion as InsightFacetSortCriterion, FoldedResult as InsightFoldedResult, InteractiveResult as InsightInteractiveResult, LogLevel as InsightLogLevel, RangeFacetRangeAlgorithm as InsightRangeFacetRangeAlgorithm, RangeFacetSortCriterion as InsightRangeFacetSortCriterion, Result as InsightResult, ResultTemplate as InsightResultTemplate, ResultTemplateCondition as InsightResultTemplateCondition, UserAction as IUserAction } from "@coveo/headless/insight"; import { InsightInitializationOptions } from "./components/insight/atomic-insight-interface/atomic-insight-interface"; import { InsightStore } from "./components/insight/atomic-insight-interface/store"; @@ -36,7 +35,7 @@ import { Bindings as Bindings1 } from "./components/search/atomic-search-interfa import { SearchStore } from "./components/search/atomic-search-interface/store"; import { AriaLabelGenerator as AriaLabelGenerator1 } from "./components/search/search-box-suggestions/atomic-search-box-instant-results/atomic-search-box-instant-results"; import { InitializationOptions } from "./components/search/atomic-search-interface/atomic-search-interface"; -export { AutomaticFacet, CategoryFacetSortCriterion, DateFilterRange, DateRangeRequest, FacetResultsMustMatch, FacetSortCriterion, FoldedResult, GeneratedAnswer, GeneratedAnswerCitation, InlineLink, InteractiveCitation, InteractiveResult, LogLevel as LogLevel1, RangeFacetRangeAlgorithm, RangeFacetSortCriterion, Result, ResultTemplate, ResultTemplateCondition, SearchEngine, SearchStatus } from "@coveo/headless"; +export { AutomaticFacet, CategoryFacetSortCriterion, DateFilterRange, DateRangeRequest, FacetResultsMustMatch, FacetSortCriterion, FoldedResult, GeneratedAnswer, GeneratedAnswerCitation, InlineLink, InteractiveCitation, InteractiveResult, LogLevel as LogLevel1, NumericFilter, NumericFilterState, RangeFacetRangeAlgorithm, RangeFacetSortCriterion, RelativeDateUnit, Result, ResultTemplate, ResultTemplateCondition, SearchEngine, SearchStatus } from "@coveo/headless"; export { CategoryFacet, CommerceEngine, DateFacet, InteractiveProduct, LogLevel, NumericFacet, Product, ProductListing, ProductListingSummaryState, ProductTemplate, ProductTemplateCondition, RegularFacet, Search, SearchSummaryState, Summary } from "@coveo/headless/commerce"; export { CommerceBindings as Bindings, CommerceInitializationOptions } from "./components/commerce/atomic-commerce-interface/atomic-commerce-interface"; export { Range } from "./components/commerce/facets/facet-number-input/atomic-commerce-facet-number-input"; @@ -49,7 +48,6 @@ export { AriaLabelGenerator } from "./components/commerce/search-box-suggestions export { AtomicInterface } from "./utils/initialization-utils"; export { AnyBindings } from "./components/common/interface/bindings"; export { NumberInputType } from "./components/common/facets/facet-number-input/number-input-type"; -export { NumericFilter, NumericFilterState, RelativeDateUnit } from "./components/common/types"; export { InsightEngine, FacetSortCriterion as InsightFacetSortCriterion, FoldedResult as InsightFoldedResult, InteractiveResult as InsightInteractiveResult, LogLevel as InsightLogLevel, RangeFacetRangeAlgorithm as InsightRangeFacetRangeAlgorithm, RangeFacetSortCriterion as InsightRangeFacetSortCriterion, Result as InsightResult, ResultTemplate as InsightResultTemplate, ResultTemplateCondition as InsightResultTemplateCondition, UserAction as IUserAction } from "@coveo/headless/insight"; export { InsightInitializationOptions } from "./components/insight/atomic-insight-interface/atomic-insight-interface"; export { InsightStore } from "./components/insight/atomic-insight-interface/store"; diff --git a/packages/atomic/src/components/commerce/atomic-commerce-breadbox/atomic-commerce-breadbox.new.stories.tsx b/packages/atomic/src/components/commerce/atomic-commerce-breadbox/atomic-commerce-breadbox.new.stories.tsx index e609a74e231..ed5efebc858 100644 --- a/packages/atomic/src/components/commerce/atomic-commerce-breadbox/atomic-commerce-breadbox.new.stories.tsx +++ b/packages/atomic/src/components/commerce/atomic-commerce-breadbox/atomic-commerce-breadbox.new.stories.tsx @@ -9,7 +9,7 @@ import { getSampleCommerceEngineConfiguration, } from '@coveo/headless/commerce'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; const {context, ...restOfConfiguration} = getSampleCommerceEngineConfiguration(); diff --git a/packages/atomic/src/components/commerce/atomic-commerce-load-more-products/atomic-commerce-load-more-products.new.stories.tsx b/packages/atomic/src/components/commerce/atomic-commerce-load-more-products/atomic-commerce-load-more-products.new.stories.tsx index 57b90974ac4..9fbaf9a0bb2 100644 --- a/packages/atomic/src/components/commerce/atomic-commerce-load-more-products/atomic-commerce-load-more-products.new.stories.tsx +++ b/packages/atomic/src/components/commerce/atomic-commerce-load-more-products/atomic-commerce-load-more-products.new.stories.tsx @@ -5,7 +5,7 @@ import { import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; const {decorator, play} = wrapInCommerceInterface({skipFirstSearch: true}); diff --git a/packages/atomic/src/components/commerce/atomic-commerce-no-products/atomic-commerce-no-products.new.stories.tsx b/packages/atomic/src/components/commerce/atomic-commerce-no-products/atomic-commerce-no-products.new.stories.tsx index 87da69b01e7..6e35ab3488c 100644 --- a/packages/atomic/src/components/commerce/atomic-commerce-no-products/atomic-commerce-no-products.new.stories.tsx +++ b/packages/atomic/src/components/commerce/atomic-commerce-no-products/atomic-commerce-no-products.new.stories.tsx @@ -5,7 +5,7 @@ import { import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; const {play} = wrapInCommerceInterface({skipFirstSearch: true}); const {decorator, play: preprocessedPlayed} = wrapInCommerceInterface({ diff --git a/packages/atomic/src/components/commerce/atomic-commerce-product-list/atomic-commerce-product-list.new.stories.tsx b/packages/atomic/src/components/commerce/atomic-commerce-product-list/atomic-commerce-product-list.new.stories.tsx index 529e10ed5fa..b8741df5b88 100644 --- a/packages/atomic/src/components/commerce/atomic-commerce-product-list/atomic-commerce-product-list.new.stories.tsx +++ b/packages/atomic/src/components/commerce/atomic-commerce-product-list/atomic-commerce-product-list.new.stories.tsx @@ -5,7 +5,7 @@ import { import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit-html/static.js'; +import {html} from 'lit'; // TODO KIT-3640 - Add stories for table display diff --git a/packages/atomic/src/components/commerce/atomic-commerce-products-per-page/atomic-commerce-products-per-page.new.stories.tsx b/packages/atomic/src/components/commerce/atomic-commerce-products-per-page/atomic-commerce-products-per-page.new.stories.tsx index 3084966d52a..093cbd6c742 100644 --- a/packages/atomic/src/components/commerce/atomic-commerce-products-per-page/atomic-commerce-products-per-page.new.stories.tsx +++ b/packages/atomic/src/components/commerce/atomic-commerce-products-per-page/atomic-commerce-products-per-page.new.stories.tsx @@ -2,7 +2,7 @@ import {wrapInCommerceInterface} from '@/storybook-utils/commerce/commerce-inter import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; const {decorator, play} = wrapInCommerceInterface({}); diff --git a/packages/atomic/src/components/commerce/atomic-commerce-query-summary/atomic-commerce-query-summary.new.stories.tsx b/packages/atomic/src/components/commerce/atomic-commerce-query-summary/atomic-commerce-query-summary.new.stories.tsx index b5e237d4854..64ba3d42d37 100644 --- a/packages/atomic/src/components/commerce/atomic-commerce-query-summary/atomic-commerce-query-summary.new.stories.tsx +++ b/packages/atomic/src/components/commerce/atomic-commerce-query-summary/atomic-commerce-query-summary.new.stories.tsx @@ -3,7 +3,7 @@ import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import {CommerceEngineConfiguration} from '@coveo/headless/commerce'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; const {decorator, play} = wrapInCommerceInterface({ skipFirstSearch: false, diff --git a/packages/atomic/src/components/commerce/atomic-commerce-search-box/atomic-commerce-search-box.new.stories.tsx b/packages/atomic/src/components/commerce/atomic-commerce-search-box/atomic-commerce-search-box.new.stories.tsx index 1f1e159c316..46f9251a15b 100644 --- a/packages/atomic/src/components/commerce/atomic-commerce-search-box/atomic-commerce-search-box.new.stories.tsx +++ b/packages/atomic/src/components/commerce/atomic-commerce-search-box/atomic-commerce-search-box.new.stories.tsx @@ -5,7 +5,7 @@ import { import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; const {decorator, play} = wrapInCommerceInterface({skipFirstSearch: true}); diff --git a/packages/atomic/src/components/commerce/facets/atomic-commerce-category-facet/atomic-commerce-category-facet.new.stories.tsx b/packages/atomic/src/components/commerce/facets/atomic-commerce-category-facet/atomic-commerce-category-facet.new.stories.tsx index 28fc9cb33b0..b2f0aa1750a 100644 --- a/packages/atomic/src/components/commerce/facets/atomic-commerce-category-facet/atomic-commerce-category-facet.new.stories.tsx +++ b/packages/atomic/src/components/commerce/facets/atomic-commerce-category-facet/atomic-commerce-category-facet.new.stories.tsx @@ -6,7 +6,7 @@ import { import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit-html'; +import {html} from 'lit'; const {play, decorator} = wrapInCommerceInterface({skipFirstSearch: true}); diff --git a/packages/atomic/src/components/commerce/facets/atomic-commerce-facet/atomic-commerce-facet.new.stories.tsx b/packages/atomic/src/components/commerce/facets/atomic-commerce-facet/atomic-commerce-facet.new.stories.tsx index 21c4ba62067..4a3de7b51ae 100644 --- a/packages/atomic/src/components/commerce/facets/atomic-commerce-facet/atomic-commerce-facet.new.stories.tsx +++ b/packages/atomic/src/components/commerce/facets/atomic-commerce-facet/atomic-commerce-facet.new.stories.tsx @@ -6,7 +6,7 @@ import { import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit-html'; +import {html} from 'lit'; const {play, decorator} = wrapInCommerceInterface({skipFirstSearch: true}); diff --git a/packages/atomic/src/components/commerce/facets/atomic-commerce-facets/atomic-commerce-facets.new.stories.tsx b/packages/atomic/src/components/commerce/facets/atomic-commerce-facets/atomic-commerce-facets.new.stories.tsx index 9acc2ce2308..5ab5483b9b9 100644 --- a/packages/atomic/src/components/commerce/facets/atomic-commerce-facets/atomic-commerce-facets.new.stories.tsx +++ b/packages/atomic/src/components/commerce/facets/atomic-commerce-facets/atomic-commerce-facets.new.stories.tsx @@ -5,7 +5,7 @@ import { import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; const {decorator, play} = wrapInCommerceInterface({skipFirstSearch: true}); diff --git a/packages/atomic/src/components/commerce/facets/atomic-commerce-numeric-facet/atomic-commerce-numeric-facet.new.stories.tsx b/packages/atomic/src/components/commerce/facets/atomic-commerce-numeric-facet/atomic-commerce-numeric-facet.new.stories.tsx index d2b0fc3f7ca..cd0941b677a 100644 --- a/packages/atomic/src/components/commerce/facets/atomic-commerce-numeric-facet/atomic-commerce-numeric-facet.new.stories.tsx +++ b/packages/atomic/src/components/commerce/facets/atomic-commerce-numeric-facet/atomic-commerce-numeric-facet.new.stories.tsx @@ -6,7 +6,7 @@ import { import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit-html'; +import {html} from 'lit'; const {play, decorator} = wrapInCommerceInterface({skipFirstSearch: true}); diff --git a/packages/atomic/src/components/commerce/product-template-components/atomic-product-image/atomic-product-image.new.stories.tsx b/packages/atomic/src/components/commerce/product-template-components/atomic-product-image/atomic-product-image.new.stories.tsx index d6f55510d72..5415b4fe64d 100644 --- a/packages/atomic/src/components/commerce/product-template-components/atomic-product-image/atomic-product-image.new.stories.tsx +++ b/packages/atomic/src/components/commerce/product-template-components/atomic-product-image/atomic-product-image.new.stories.tsx @@ -5,7 +5,7 @@ import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; import type {Decorator} from '@storybook/web-components'; -import {html} from 'lit-html'; +import {html} from 'lit'; const styledDivDecorator: Decorator = (story) => { return html`
${story()}
`; diff --git a/packages/atomic/src/components/commerce/product-template-components/atomic-product-link/atomic-product-link.new.stories.tsx b/packages/atomic/src/components/commerce/product-template-components/atomic-product-link/atomic-product-link.new.stories.tsx index 40fc4431e2b..44f50900d31 100644 --- a/packages/atomic/src/components/commerce/product-template-components/atomic-product-link/atomic-product-link.new.stories.tsx +++ b/packages/atomic/src/components/commerce/product-template-components/atomic-product-link/atomic-product-link.new.stories.tsx @@ -4,7 +4,7 @@ import {wrapInProductTemplate} from '@/storybook-utils/commerce/commerce-product import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit-html'; +import {html} from 'lit'; const { decorator: commerceInterfaceDecorator, diff --git a/packages/atomic/src/components/commerce/product-template-components/atomic-product-multi-value-text/atomic-product-multi-value-text.new.stories.tsx b/packages/atomic/src/components/commerce/product-template-components/atomic-product-multi-value-text/atomic-product-multi-value-text.new.stories.tsx index d416b279c18..cbcd31c7153 100644 --- a/packages/atomic/src/components/commerce/product-template-components/atomic-product-multi-value-text/atomic-product-multi-value-text.new.stories.tsx +++ b/packages/atomic/src/components/commerce/product-template-components/atomic-product-multi-value-text/atomic-product-multi-value-text.new.stories.tsx @@ -5,7 +5,7 @@ import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import {getSampleCommerceEngineConfiguration} from '@coveo/headless/commerce'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; const baseConfiguration = getSampleCommerceEngineConfiguration(); diff --git a/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-instant-products/atomic-commerce-search-box-instant-products.new.stories.tsx b/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-instant-products/atomic-commerce-search-box-instant-products.new.stories.tsx index faf552cd480..3d2783bf0a3 100644 --- a/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-instant-products/atomic-commerce-search-box-instant-products.new.stories.tsx +++ b/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-instant-products/atomic-commerce-search-box-instant-products.new.stories.tsx @@ -6,7 +6,7 @@ import type { Meta, StoryObj as Story, } from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; const {decorator, play} = wrapInCommerceInterface({skipFirstSearch: true}); diff --git a/packages/atomic/src/components/common/atomic-icon/atomic-icon.new.stories.tsx b/packages/atomic/src/components/common/atomic-icon/atomic-icon.new.stories.tsx index 69a644ae0df..9ec72d5cbae 100644 --- a/packages/atomic/src/components/common/atomic-icon/atomic-icon.new.stories.tsx +++ b/packages/atomic/src/components/common/atomic-icon/atomic-icon.new.stories.tsx @@ -4,7 +4,7 @@ import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-w import bgIcons from '@salesforce-ux/design-system/design-tokens/dist/bg-standard.common'; import {userEvent, waitFor, expect} from '@storybook/test'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; import {within} from 'shadow-dom-testing-library'; import AssetsList from '../../../../docs/assets.json'; diff --git a/packages/atomic/src/components/common/atomic-numeric-range/atomic-numeric-range.new.stories.tsx b/packages/atomic/src/components/common/atomic-numeric-range/atomic-numeric-range.new.stories.tsx index 845a2c911db..e3589d126ff 100644 --- a/packages/atomic/src/components/common/atomic-numeric-range/atomic-numeric-range.new.stories.tsx +++ b/packages/atomic/src/components/common/atomic-numeric-range/atomic-numeric-range.new.stories.tsx @@ -2,7 +2,7 @@ import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-wrapper'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; const {decorator, play} = wrapInSearchInterface(); diff --git a/packages/atomic/src/components/common/atomic-timeframe/atomic-timeframe.new.stories.tsx b/packages/atomic/src/components/common/atomic-timeframe/atomic-timeframe.new.stories.tsx index dd9d6210496..e85aa57174e 100644 --- a/packages/atomic/src/components/common/atomic-timeframe/atomic-timeframe.new.stories.tsx +++ b/packages/atomic/src/components/common/atomic-timeframe/atomic-timeframe.new.stories.tsx @@ -2,7 +2,7 @@ import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-wrapper'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; const {decorator, play} = wrapInSearchInterface(); diff --git a/packages/atomic/src/components/common/atomic-timeframe/atomic-timeframe.tsx b/packages/atomic/src/components/common/atomic-timeframe/atomic-timeframe.tsx index 7a615c5bee3..a1cfc4b2d99 100644 --- a/packages/atomic/src/components/common/atomic-timeframe/atomic-timeframe.tsx +++ b/packages/atomic/src/components/common/atomic-timeframe/atomic-timeframe.tsx @@ -1,6 +1,6 @@ +import {RelativeDateUnit} from '@coveo/headless'; import {Component, Prop} from '@stencil/core'; import {Timeframe} from '../facets/timeframe-facet-common'; -import {RelativeDateUnit} from '../types'; /** * The `atomic-timeframe` component defines a timeframe of an `atomic-timeframe-facet`, and therefore must be defined within an `atomic-timeframe-facet` component. diff --git a/packages/atomic/src/components/common/button.ts b/packages/atomic/src/components/common/button.ts index 6cf9f260a64..b96edf6069e 100644 --- a/packages/atomic/src/components/common/button.ts +++ b/packages/atomic/src/components/common/button.ts @@ -1,5 +1,5 @@ -import {html} from 'lit-html'; -import {ifDefined} from 'lit-html/directives/if-defined.js'; +import {html} from 'lit'; +import {ifDefined} from 'lit/directives/if-defined.js'; import {createRipple} from '../../utils/ripple'; import { getRippleColorForButtonStyle, diff --git a/packages/atomic/src/components/common/facets/facet-common.tsx b/packages/atomic/src/components/common/facets/facet-common.tsx index 93679ac59a0..34cbddd27a5 100644 --- a/packages/atomic/src/components/common/facets/facet-common.tsx +++ b/packages/atomic/src/components/common/facets/facet-common.tsx @@ -1,5 +1,5 @@ +import {FacetValue, SearchStatusState} from '@coveo/headless'; import {i18n} from 'i18next'; -import {FacetValue, SearchStatusState} from '../types'; export interface FacetValueProps { i18n: i18n; diff --git a/packages/atomic/src/components/common/facets/facet-number-input/facet-number-input.tsx b/packages/atomic/src/components/common/facets/facet-number-input/facet-number-input.tsx index f703f4029a6..dd6d466669e 100644 --- a/packages/atomic/src/components/common/facets/facet-number-input/facet-number-input.tsx +++ b/packages/atomic/src/components/common/facets/facet-number-input/facet-number-input.tsx @@ -1,7 +1,7 @@ +import {NumericFilter, NumericFilterState} from '@coveo/headless'; import {Component, h, State, Prop, Event, EventEmitter} from '@stencil/core'; import {AnyBindings} from '../../interface/bindings'; import {Button} from '../../stencil-button'; -import {NumericFilter, NumericFilterState} from '../../types'; import {NumberInputType} from './number-input-type'; /** diff --git a/packages/atomic/src/components/common/facets/facet-search/facet-search-aria-live.ts b/packages/atomic/src/components/common/facets/facet-search/facet-search-aria-live.ts index a5987fafa54..97a25adc457 100644 --- a/packages/atomic/src/components/common/facets/facet-search/facet-search-aria-live.ts +++ b/packages/atomic/src/components/common/facets/facet-search/facet-search-aria-live.ts @@ -1,5 +1,5 @@ +import {Facet, FacetSearchState} from '@coveo/headless'; import {i18n} from 'i18next'; -import {Facet, FacetSearchState} from '../../types'; import {shouldUpdateFacetSearchComponent} from './facet-search-utils'; export function announceFacetSearchResultsWithAriaLive( diff --git a/packages/atomic/src/components/common/facets/timeframe-facet-common.tsx b/packages/atomic/src/components/common/facets/timeframe-facet-common.tsx index c3071c8c839..3ac6491c006 100644 --- a/packages/atomic/src/components/common/facets/timeframe-facet-common.tsx +++ b/packages/atomic/src/components/common/facets/timeframe-facet-common.tsx @@ -1,11 +1,4 @@ -import {h, VNode} from '@stencil/core'; -import {FocusTargetController} from '../../../utils/accessibility-utils'; -import {parseDate} from '../../../utils/date-utils'; -import {getFieldValueCaption} from '../../../utils/field-utils'; -import {randomID} from '../../../utils/utils'; -import {InsightBindings} from '../../insight/atomic-insight-interface/atomic-insight-interface'; -import {Bindings as SearchBindings} from '../../search/atomic-search-interface/atomic-search-interface'; -import {Hidden} from '../stencil-hidden'; +import {FocusTargetController} from '@/src/utils/accessibility-utils'; import { DateFacet, DateFacetValue, @@ -18,7 +11,14 @@ import { RelativeDatePeriod, RelativeDateUnit, SearchStatusState, -} from '../types'; +} from '@coveo/headless'; +import {h, VNode} from '@stencil/core'; +import {parseDate} from '../../../utils/date-utils'; +import {getFieldValueCaption} from '../../../utils/field-utils'; +import {randomID} from '../../../utils/utils'; +import {InsightBindings} from '../../insight/atomic-insight-interface/atomic-insight-interface'; +import {Bindings as SearchBindings} from '../../search/atomic-search-interface/atomic-search-interface'; +import {Hidden} from '../stencil-hidden'; import {shouldDisplayInputForFacetRange} from './facet-common'; import {FacetInfo} from './facet-common-store'; import {FacetContainer} from './facet-container/facet-container'; diff --git a/packages/atomic/src/components/common/heading.ts b/packages/atomic/src/components/common/heading.ts index b50a9fc2bb3..3ba1023ae34 100644 --- a/packages/atomic/src/components/common/heading.ts +++ b/packages/atomic/src/components/common/heading.ts @@ -1,4 +1,4 @@ -import {ifDefined} from 'lit-html/directives/if-defined.js'; +import {ifDefined} from 'lit/directives/if-defined.js'; import {html, literal, unsafeStatic} from 'lit/static-html.js'; export interface HeadingProps { diff --git a/packages/atomic/src/components/common/interface/interface-common.tsx b/packages/atomic/src/components/common/interface/interface-common.tsx index ecddc42dc9c..098c5bf4a91 100644 --- a/packages/atomic/src/components/common/interface/interface-common.tsx +++ b/packages/atomic/src/components/common/interface/interface-common.tsx @@ -25,7 +25,6 @@ export interface BaseAtomicInterface host: HTMLElement; bindings: AnyBindings; error?: Error; - updateIconAssetsPath(): void; registerFieldsToInclude?: () => void; // Fix: Removed the question mark and added a semicolon. } diff --git a/packages/atomic/src/components/common/radio-button.ts b/packages/atomic/src/components/common/radio-button.ts index 0707601dc59..04b336c51b4 100644 --- a/packages/atomic/src/components/common/radio-button.ts +++ b/packages/atomic/src/components/common/radio-button.ts @@ -1,6 +1,6 @@ import {html, TemplateResult} from 'lit'; -import {ifDefined} from 'lit-html/directives/if-defined.js'; import {classMap} from 'lit/directives/class-map.js'; +import {ifDefined} from 'lit/directives/if-defined.js'; import {ref, RefOrCallback} from 'lit/directives/ref.js'; import {createRipple} from '../../utils/ripple'; import { diff --git a/packages/atomic/src/components/common/types.ts b/packages/atomic/src/components/common/types.ts deleted file mode 100644 index c1d66b82d24..00000000000 --- a/packages/atomic/src/components/common/types.ts +++ /dev/null @@ -1,42 +0,0 @@ -// TODO: revisit using Core Headless Interfaces when using other sub-packages -export { - SearchStatus, - SearchStatusState, - FacetSortCriterion, - SpecificFacetSearchResult, - FacetSearchState, - FacetState, - Facet, - CategoryFacetSearchResult, - CategoryFacetState, - CategoryFacetSearch, - FacetManagerPayload, - FacetValue, - FacetValueState, - FacetManager, - FacetConditionsManager, - FacetValueRequest, - CategoryFacetValueRequest, - Pager, - RelativeDatePeriod, - RelativeDateUnit, - RelativeDate, - DateFacetState, - DateFacet, - DateFacetValue, - DateRangeOptions, - DateRangeRequest, - DateFilterState, - DateFilter, - QuerySummary, - NumericFacetValue, - NumericFacetState, - NumericFacet, - NumericFilterState, - NumericFilter, - NumericRangeOptions, - NumericRangeRequest, - CategoryFacet, - CategoryFacetSortCriterion, - RangeFacetSortCriterion, -} from '@coveo/headless'; diff --git a/packages/atomic/src/components/insight/atomic-insight-interface/store.ts b/packages/atomic/src/components/insight/atomic-insight-interface/store.ts index a41d5e70d0d..6343427e38f 100644 --- a/packages/atomic/src/components/insight/atomic-insight-interface/store.ts +++ b/packages/atomic/src/components/insight/atomic-insight-interface/store.ts @@ -1,5 +1,9 @@ import {DEFAULT_MOBILE_BREAKPOINT} from '@/src/utils/replace-breakpoint'; -import {InsightEngine} from '@coveo/headless/insight'; +import { + DateFacetValue, + InsightEngine, + NumericFacetValue, +} from '@coveo/headless/insight'; import { FacetInfo, FacetStore, @@ -16,7 +20,6 @@ import { unsetLoadingFlag, waitUntilAppLoaded, } from '../../common/interface/store'; -import {DateFacetValue, NumericFacetValue} from '../../common/types'; import {makeDesktopQuery} from '../atomic-insight-layout/insight-layout'; interface Data { diff --git a/packages/atomic/src/components/ipx/atomic-ipx-recs-list/atomic-recs-list/atomic-ipx-recs-list.stories.tsx b/packages/atomic/src/components/ipx/atomic-ipx-recs-list/atomic-recs-list/atomic-ipx-recs-list.stories.tsx index 7808b0ea56e..4c1864b47c3 100644 --- a/packages/atomic/src/components/ipx/atomic-ipx-recs-list/atomic-recs-list/atomic-ipx-recs-list.stories.tsx +++ b/packages/atomic/src/components/ipx/atomic-ipx-recs-list/atomic-recs-list/atomic-ipx-recs-list.stories.tsx @@ -1,5 +1,5 @@ import recsStory from 'atomic-storybook/recommendation/recs-story'; -import {html} from 'lit-html'; +import {html} from 'lit'; const {defaultModuleExport, exportedStory} = recsStory( 'atomic-ipx-recs-list', diff --git a/packages/atomic/src/components/recommendations/atomic-recs-list/atomic-recs-list.new.stories.tsx b/packages/atomic/src/components/recommendations/atomic-recs-list/atomic-recs-list.new.stories.tsx index f8fb62872de..8fe67116d19 100644 --- a/packages/atomic/src/components/recommendations/atomic-recs-list/atomic-recs-list.new.stories.tsx +++ b/packages/atomic/src/components/recommendations/atomic-recs-list/atomic-recs-list.new.stories.tsx @@ -2,7 +2,7 @@ import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInRecommendationInterface} from '@/storybook-utils/search/recs-interface-wrapper'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit-html/static.js'; +import {html} from 'lit'; const {decorator, play} = wrapInRecommendationInterface(); diff --git a/packages/atomic/src/components/search/atomic-external/atomic-external.new.stories.tsx b/packages/atomic/src/components/search/atomic-external/atomic-external.new.stories.tsx index a3dee05375a..e39f99ea517 100644 --- a/packages/atomic/src/components/search/atomic-external/atomic-external.new.stories.tsx +++ b/packages/atomic/src/components/search/atomic-external/atomic-external.new.stories.tsx @@ -1,5 +1,5 @@ import {Meta, StoryObj} from '@storybook/web-components'; -import {html} from 'lit-html'; +import {html} from 'lit'; const meta: Meta = { component: 'atomic-external', diff --git a/packages/atomic/src/components/search/facets/atomic-facet/atomic-facet.new.stories.tsx b/packages/atomic/src/components/search/facets/atomic-facet/atomic-facet.new.stories.tsx index 96d319a1e06..13ce787ef6c 100644 --- a/packages/atomic/src/components/search/facets/atomic-facet/atomic-facet.new.stories.tsx +++ b/packages/atomic/src/components/search/facets/atomic-facet/atomic-facet.new.stories.tsx @@ -3,7 +3,7 @@ import {facetDecorator} from '@/storybook-utils/common/facets-decorator'; import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-wrapper'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit-html'; +import {html} from 'lit'; const {decorator, play} = wrapInSearchInterface(); diff --git a/packages/atomic/src/components/search/facets/atomic-numeric-facet/atomic-numeric-facet.new.stories.tsx b/packages/atomic/src/components/search/facets/atomic-numeric-facet/atomic-numeric-facet.new.stories.tsx index 2c427cb57aa..dc18df0ba1e 100644 --- a/packages/atomic/src/components/search/facets/atomic-numeric-facet/atomic-numeric-facet.new.stories.tsx +++ b/packages/atomic/src/components/search/facets/atomic-numeric-facet/atomic-numeric-facet.new.stories.tsx @@ -3,7 +3,7 @@ import {facetDecorator} from '@/storybook-utils/common/facets-decorator'; import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-wrapper'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit-html'; +import {html} from 'lit'; import {within} from 'shadow-dom-testing-library'; const {decorator, play} = wrapInSearchInterface({ diff --git a/packages/atomic/src/components/search/facets/atomic-timeframe-facet/atomic-timeframe-facet.new.stories.tsx b/packages/atomic/src/components/search/facets/atomic-timeframe-facet/atomic-timeframe-facet.new.stories.tsx index 2463e46775c..dc4a9cea194 100644 --- a/packages/atomic/src/components/search/facets/atomic-timeframe-facet/atomic-timeframe-facet.new.stories.tsx +++ b/packages/atomic/src/components/search/facets/atomic-timeframe-facet/atomic-timeframe-facet.new.stories.tsx @@ -3,7 +3,7 @@ import {facetDecorator} from '@/storybook-utils/common/facets-decorator'; import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-wrapper'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit-html'; +import {html} from 'lit'; import {within} from 'shadow-dom-testing-library'; const {decorator, play} = wrapInSearchInterface({ diff --git a/packages/atomic/src/components/search/formats/atomic-format-currency.new.stories.tsx b/packages/atomic/src/components/search/formats/atomic-format-currency.new.stories.tsx index 52b3e251ddb..5b6221fb823 100644 --- a/packages/atomic/src/components/search/formats/atomic-format-currency.new.stories.tsx +++ b/packages/atomic/src/components/search/formats/atomic-format-currency.new.stories.tsx @@ -3,7 +3,7 @@ import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInResult} from '@/storybook-utils/search/result-wrapper'; import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-wrapper'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit-html/static.js'; +import {html} from 'lit'; const {decorator: resultDecorator, engineConfig} = wrapInResult({ preprocessRequest: (r) => { diff --git a/packages/atomic/src/components/search/formats/atomic-format-number.new.stories.tsx b/packages/atomic/src/components/search/formats/atomic-format-number.new.stories.tsx index 184d4cc4975..0d0d2f8b380 100644 --- a/packages/atomic/src/components/search/formats/atomic-format-number.new.stories.tsx +++ b/packages/atomic/src/components/search/formats/atomic-format-number.new.stories.tsx @@ -3,7 +3,7 @@ import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInResult} from '@/storybook-utils/search/result-wrapper'; import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-wrapper'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit-html/static.js'; +import {html} from 'lit'; const {decorator: resultDecorator, engineConfig} = wrapInResult({ preprocessRequest: (r) => { diff --git a/packages/atomic/src/components/search/formats/atomic-format-unit.new.stories.tsx b/packages/atomic/src/components/search/formats/atomic-format-unit.new.stories.tsx index 415932187db..fcdbd7c7c1d 100644 --- a/packages/atomic/src/components/search/formats/atomic-format-unit.new.stories.tsx +++ b/packages/atomic/src/components/search/formats/atomic-format-unit.new.stories.tsx @@ -3,7 +3,7 @@ import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInResult} from '@/storybook-utils/search/result-wrapper'; import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-wrapper'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit-html/static.js'; +import {html} from 'lit'; const {decorator: resultDecorator, engineConfig} = wrapInResult({ preprocessRequest: (r) => { diff --git a/packages/atomic/src/components/search/result-template-components/atomic-field-condition/atomic-field-condition.new.stories.tsx b/packages/atomic/src/components/search/result-template-components/atomic-field-condition/atomic-field-condition.new.stories.tsx index 5a5b4a14766..80f767f4020 100644 --- a/packages/atomic/src/components/search/result-template-components/atomic-field-condition/atomic-field-condition.new.stories.tsx +++ b/packages/atomic/src/components/search/result-template-components/atomic-field-condition/atomic-field-condition.new.stories.tsx @@ -3,7 +3,7 @@ import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInResult} from '@/storybook-utils/search/result-wrapper'; import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-wrapper'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; const {decorator: resultDecorator, engineConfig} = wrapInResult(); const {decorator: searchInterfaceDecorator, play} = diff --git a/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-instant-results/atomic-search-box-instant-results.new.stories.tsx b/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-instant-results/atomic-search-box-instant-results.new.stories.tsx index 70cf8d7422e..dce01924614 100644 --- a/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-instant-results/atomic-search-box-instant-results.new.stories.tsx +++ b/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-instant-results/atomic-search-box-instant-results.new.stories.tsx @@ -2,7 +2,7 @@ import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-wrapper'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; import {within} from 'shadow-dom-testing-library'; const {decorator, play} = wrapInSearchInterface({ diff --git a/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-query-suggestions/atomic-search-box-instant-results.new.stories.tsx b/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-query-suggestions/atomic-search-box-instant-results.new.stories.tsx index 0aa98d8ac57..235168d5644 100644 --- a/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-query-suggestions/atomic-search-box-instant-results.new.stories.tsx +++ b/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-query-suggestions/atomic-search-box-instant-results.new.stories.tsx @@ -2,7 +2,7 @@ import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-wrapper'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; import {within} from 'shadow-dom-testing-library'; const {decorator, play} = wrapInSearchInterface(); diff --git a/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-recent-queries/atomic-search-box-recent-queries.new.stories.tsx b/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-recent-queries/atomic-search-box-recent-queries.new.stories.tsx index 6a1a48da7ae..319ff37c2fd 100644 --- a/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-recent-queries/atomic-search-box-recent-queries.new.stories.tsx +++ b/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-recent-queries/atomic-search-box-recent-queries.new.stories.tsx @@ -3,7 +3,7 @@ import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-wrapper'; import {userEvent} from '@storybook/test'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; import {within} from 'shadow-dom-testing-library'; const {decorator, play} = wrapInSearchInterface(); diff --git a/packages/atomic/src/components/search/tabs/atomic-tab-manager/atomic-tab-manager.new.stories.tsx b/packages/atomic/src/components/search/tabs/atomic-tab-manager/atomic-tab-manager.new.stories.tsx index 6e08a61dc08..8c156a09ef5 100644 --- a/packages/atomic/src/components/search/tabs/atomic-tab-manager/atomic-tab-manager.new.stories.tsx +++ b/packages/atomic/src/components/search/tabs/atomic-tab-manager/atomic-tab-manager.new.stories.tsx @@ -2,7 +2,7 @@ import {parameters} from '@/storybook-utils/common/common-meta-parameters'; import {renderComponent} from '@/storybook-utils/common/render-component'; import {wrapInSearchInterface} from '@/storybook-utils/search/search-interface-wrapper'; import type {Meta, StoryObj as Story} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; const {decorator, play} = wrapInSearchInterface({ search: { diff --git a/packages/atomic/src/decorators/binding-guard.ts b/packages/atomic/src/decorators/binding-guard.ts index f768dd80f0a..e5a0889a00b 100644 --- a/packages/atomic/src/decorators/binding-guard.ts +++ b/packages/atomic/src/decorators/binding-guard.ts @@ -1,5 +1,5 @@ import {html, LitElement, nothing} from 'lit'; -import type {TemplateResultType} from 'lit-html/directive-helpers.js'; +import type {TemplateResultType} from 'lit/directive-helpers.js'; import type { GenericRender, InitializableComponent, diff --git a/packages/atomic/src/decorators/error-guard.ts b/packages/atomic/src/decorators/error-guard.ts index 9e8c3f925ec..9dbb1701f48 100644 --- a/packages/atomic/src/decorators/error-guard.ts +++ b/packages/atomic/src/decorators/error-guard.ts @@ -1,5 +1,5 @@ import {html, LitElement} from 'lit'; -import {TemplateResultType} from 'lit-html/directive-helpers.js'; +import {TemplateResultType} from 'lit/directive-helpers.js'; import { GenericRender, InitializableComponent, diff --git a/packages/atomic/src/decorators/types.ts b/packages/atomic/src/decorators/types.ts index 18468e3bf6f..b8740277d4b 100644 --- a/packages/atomic/src/decorators/types.ts +++ b/packages/atomic/src/decorators/types.ts @@ -1,5 +1,5 @@ -import {TemplateResult} from 'lit-html'; -import {TemplateResultType} from 'lit-html/directive-helpers.js'; +import {TemplateResult} from 'lit'; +import {TemplateResultType} from 'lit/directive-helpers.js'; import {AnyBindings} from '../components/common/interface/bindings'; export type GenericRender = TemplateResult; diff --git a/packages/atomic/src/directives/hidden.ts b/packages/atomic/src/directives/hidden.ts index edf2034cf43..5f514590fcf 100644 --- a/packages/atomic/src/directives/hidden.ts +++ b/packages/atomic/src/directives/hidden.ts @@ -1,7 +1,7 @@ import {LitElement, noChange} from 'lit'; -import {directive, Directive, Part, PartType} from 'lit-html/directive.js'; +import {directive, Directive, Part, PartType} from 'lit/directive.js'; -// TODO: KIT-3822: Add unit tests for this directive. +// TODO: KIT-3973: Add unit tests for this directive. class DisplayIfDirective extends Directive { render(_condition: boolean, _children: T) { return noChange; diff --git a/packages/atomic/storybook-utils/commerce/commerce-interface-wrapper.tsx b/packages/atomic/storybook-utils/commerce/commerce-interface-wrapper.tsx index 3706e43e383..beabd9d95b6 100644 --- a/packages/atomic/storybook-utils/commerce/commerce-interface-wrapper.tsx +++ b/packages/atomic/storybook-utils/commerce/commerce-interface-wrapper.tsx @@ -4,7 +4,7 @@ import { } from '@coveo/headless/commerce'; import {within} from '@storybook/test'; import {Decorator, StoryContext} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; import type * as _ from '../../src/components.js'; export const wrapInCommerceInterface = ({ diff --git a/packages/atomic/storybook-utils/commerce/commerce-product-list-wrapper.tsx b/packages/atomic/storybook-utils/commerce/commerce-product-list-wrapper.tsx index 8e3fd7e47b3..c3c25fb6b56 100644 --- a/packages/atomic/storybook-utils/commerce/commerce-product-list-wrapper.tsx +++ b/packages/atomic/storybook-utils/commerce/commerce-product-list-wrapper.tsx @@ -1,5 +1,5 @@ import {Decorator} from '@storybook/web-components'; -import {html} from 'lit-html'; +import {html} from 'lit'; export const wrapInCommerceProductList = (): { decorator: Decorator; diff --git a/packages/atomic/storybook-utils/commerce/commerce-product-template-wrapper.tsx b/packages/atomic/storybook-utils/commerce/commerce-product-template-wrapper.tsx index f35485ad0a4..f7a702bd8ca 100644 --- a/packages/atomic/storybook-utils/commerce/commerce-product-template-wrapper.tsx +++ b/packages/atomic/storybook-utils/commerce/commerce-product-template-wrapper.tsx @@ -1,11 +1,11 @@ import {Decorator} from '@storybook/web-components'; -import {html, TemplateResult} from 'lit-html'; +import {html, TemplateResult} from 'lit'; export const wrapInProductTemplate = (): { decorator: Decorator; } => { const decorator: Decorator = (story) => { - // lit-html does not support adding expressions to `template` tags + // lit does not support adding expressions to `template` tags // https://lit.dev/docs/templates/expressions/#invalid-locations const templateTag = document.createElement('template'); diff --git a/packages/atomic/storybook-utils/commerce/commerce-recommendation-interface-wrapper.tsx b/packages/atomic/storybook-utils/commerce/commerce-recommendation-interface-wrapper.tsx index 31edf46c4f3..753a788a916 100644 --- a/packages/atomic/storybook-utils/commerce/commerce-recommendation-interface-wrapper.tsx +++ b/packages/atomic/storybook-utils/commerce/commerce-recommendation-interface-wrapper.tsx @@ -5,7 +5,7 @@ import { } from '@coveo/headless/commerce'; import {within} from '@storybook/test'; import {Decorator, StoryContext} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; import type * as _ from '../../src/components.js'; export const wrapInCommerceRecommendationInterface = ( diff --git a/packages/atomic/storybook-utils/commerce/commerce-recommendation-list-wrapper.tsx b/packages/atomic/storybook-utils/commerce/commerce-recommendation-list-wrapper.tsx index 8572b78bada..9cdf5ea7ac3 100644 --- a/packages/atomic/storybook-utils/commerce/commerce-recommendation-list-wrapper.tsx +++ b/packages/atomic/storybook-utils/commerce/commerce-recommendation-list-wrapper.tsx @@ -1,5 +1,5 @@ import {Decorator} from '@storybook/web-components'; -import {html} from 'lit-html/static.js'; +import {html} from 'lit'; export const wrapInCommerceRecommendationList = (): { decorator: Decorator; diff --git a/packages/atomic/storybook-utils/commerce/commerce-searchbox-instant-products-wrapper.tsx b/packages/atomic/storybook-utils/commerce/commerce-searchbox-instant-products-wrapper.tsx index 4c1a310f3f8..34d189a3154 100644 --- a/packages/atomic/storybook-utils/commerce/commerce-searchbox-instant-products-wrapper.tsx +++ b/packages/atomic/storybook-utils/commerce/commerce-searchbox-instant-products-wrapper.tsx @@ -1,5 +1,5 @@ import {Decorator} from '@storybook/web-components'; -import {html} from 'lit-html/static.js'; +import {html} from 'lit'; export const wrapInCommerceSearchBoxInstantProducts = (): { decorator: Decorator; diff --git a/packages/atomic/storybook-utils/common/facets-decorator.tsx b/packages/atomic/storybook-utils/common/facets-decorator.tsx index 3cf7a61cccb..f0af79ce52e 100644 --- a/packages/atomic/storybook-utils/common/facets-decorator.tsx +++ b/packages/atomic/storybook-utils/common/facets-decorator.tsx @@ -1,5 +1,5 @@ import {Decorator} from '@storybook/web-components'; -import {html} from 'lit/static-html.js'; +import {html} from 'lit'; export const facetDecorator: Decorator = (story, context) => html`