Skip to content

Commit

Permalink
Merge branch 'master' into SFINT-5784
Browse files Browse the repository at this point in the history
  • Loading branch information
mmitiche authored Nov 5, 2024
2 parents 21eca32 + 9952c20 commit 3c21086
Show file tree
Hide file tree
Showing 52 changed files with 1,117 additions and 168 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.16.0
22.11.0
128 changes: 47 additions & 81 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
]
},
"engines": {
"node": "^20.9.0",
"node": "^20.9.0 || ^22.11.0",
"npm": ">=8.6.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/atomic-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@
"typescript": "5.4.5"
},
"engines": {
"node": "^20.9.0"
"node": "^20.9.0 || ^22.11.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"tslib": "2.6.3"
},
"engines": {
"node": "^20.9.0"
"node": "^20.9.0 || ^22.11.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ AtomicProductExcerpt,
AtomicProductFieldCondition,
AtomicProductImage,
AtomicProductLink,
AtomicProductMultiValueText,
AtomicProductNumericFieldValue,
AtomicProductPrice,
AtomicProductRating,
Expand Down Expand Up @@ -210,6 +211,7 @@ AtomicProductExcerpt,
AtomicProductFieldCondition,
AtomicProductImage,
AtomicProductLink,
AtomicProductMultiValueText,
AtomicProductNumericFieldValue,
AtomicProductPrice,
AtomicProductRating,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1388,6 +1388,28 @@ export class AtomicProductLink {
export declare interface AtomicProductLink extends Components.AtomicProductLink {}


@ProxyCmp({
inputs: ['delimiter', 'field', 'maxValuesToDisplay']
})
@Component({
selector: 'atomic-product-multi-value-text',
changeDetection: ChangeDetectionStrategy.OnPush,
template: '<ng-content></ng-content>',
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
inputs: ['delimiter', 'field', 'maxValuesToDisplay'],
})
export class AtomicProductMultiValueText {
protected el: HTMLElement;
constructor(c: ChangeDetectorRef, r: ElementRef, protected z: NgZone) {
c.detach();
this.el = r.nativeElement;
}
}


export declare interface AtomicProductMultiValueText extends Components.AtomicProductMultiValueText {}


@ProxyCmp({
inputs: ['field']
})
Expand Down Expand Up @@ -1893,14 +1915,14 @@ export declare interface AtomicRecsList extends Components.AtomicRecsList {}


@ProxyCmp({
inputs: ['classes', 'content', 'density', 'display', 'imageSize', 'result', 'stopPropagation']
inputs: ['classes', 'content', 'density', 'display', 'imageSize', 'linkContent', 'result', 'stopPropagation']
})
@Component({
selector: 'atomic-recs-result',
changeDetection: ChangeDetectionStrategy.OnPush,
template: '<ng-content></ng-content>',
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
inputs: ['classes', 'content', 'density', 'display', 'imageSize', 'result', 'stopPropagation'],
inputs: ['classes', 'content', 'density', 'display', 'imageSize', 'linkContent', 'result', 'stopPropagation'],
})
export class AtomicRecsResult {
protected el: HTMLElement;
Expand Down
2 changes: 1 addition & 1 deletion packages/atomic-hosted-page/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@
"@types/node": "20.14.12"
},
"engines": {
"node": "^20.9.0"
"node": "^20.9.0 || ^22.11.0"
}
}
2 changes: 1 addition & 1 deletion packages/atomic-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"react-dom": ">=18.0.0"
},
"engines": {
"node": "^20.9.0"
"node": "^20.9.0 || ^22.11.0"
},
"exports": {
".": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export const AtomicProductExcerpt = /*@__PURE__*/createReactComponent<JSX.Atomic
export const AtomicProductFieldCondition = /*@__PURE__*/createReactComponent<JSX.AtomicProductFieldCondition, HTMLAtomicProductFieldConditionElement>('atomic-product-field-condition');
export const AtomicProductImage = /*@__PURE__*/createReactComponent<JSX.AtomicProductImage, HTMLAtomicProductImageElement>('atomic-product-image');
export const AtomicProductLink = /*@__PURE__*/createReactComponent<JSX.AtomicProductLink, HTMLAtomicProductLinkElement>('atomic-product-link');
export const AtomicProductMultiValueText = /*@__PURE__*/createReactComponent<JSX.AtomicProductMultiValueText, HTMLAtomicProductMultiValueTextElement>('atomic-product-multi-value-text');
export const AtomicProductNumericFieldValue = /*@__PURE__*/createReactComponent<JSX.AtomicProductNumericFieldValue, HTMLAtomicProductNumericFieldValueElement>('atomic-product-numeric-field-value');
export const AtomicProductPrice = /*@__PURE__*/createReactComponent<JSX.AtomicProductPrice, HTMLAtomicProductPriceElement>('atomic-product-price');
export const AtomicProductRating = /*@__PURE__*/createReactComponent<JSX.AtomicProductRating, HTMLAtomicProductRatingElement>('atomic-product-rating');
Expand Down
2 changes: 1 addition & 1 deletion packages/atomic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,6 @@
},
"license": "Apache-2.0",
"engines": {
"node": "^20.9.0"
"node": "^20.9.0 || ^22.11.0"
}
}
Loading

0 comments on commit 3c21086

Please sign in to comment.