From b5f6b2ccc64d1f9d7bf868a0bc3b41d13ffeb09d Mon Sep 17 00:00:00 2001 From: Aleksey Gurtovoy Date: Wed, 29 Jan 2025 10:36:55 -0600 Subject: [PATCH] chore: upgrade @makeswift/runtime to 0.23.3 --- .changeset/seven-flies-wonder.md | 5 + .../accordions/accordions.makeswift.tsx | 7 +- .../card-carousel/card-carousel.makeswift.tsx | 7 +- .../carousel/carousel.makeswift.tsx | 7 +- .../product-card/product-card.makeswift.tsx | 7 +- .../components/product-detail/register.ts | 10 +- .../products-carousel.makeswift.tsx | 7 +- .../products-list/products-list.makeswift.tsx | 7 +- .../site-footer/site-footer.makeswift.tsx | 16 +- .../site-header/site-header.makeswift.tsx | 30 +-- .../site-theme/components/accordion.ts | 14 +- .../site-theme/components/button.ts | 14 +- .../components/site-theme/components/card.ts | 14 +- .../site-theme/components/carousel.ts | 14 +- .../site-theme/components/footer.ts | 8 +- .../site-theme/components/header/banner.ts | 12 +- .../site-theme/components/header/index.ts | 8 +- .../site-theme/components/header/nav.ts | 56 ++--- .../components/site-theme/components/logo.ts | 8 +- .../site-theme/components/price-label.ts | 14 +- .../site-theme/components/product-card.ts | 14 +- .../site-theme/components/section.ts | 14 +- .../site-theme/components/slide-show.ts | 8 +- .../components/site-theme/register.ts | 12 +- .../slideshow/slideshow.makeswift.tsx | 6 +- core/package.json | 2 +- pnpm-lock.yaml | 197 ++++-------------- 27 files changed, 206 insertions(+), 312 deletions(-) create mode 100644 .changeset/seven-flies-wonder.md diff --git a/.changeset/seven-flies-wonder.md b/.changeset/seven-flies-wonder.md new file mode 100644 index 0000000000..d05c54b984 --- /dev/null +++ b/.changeset/seven-flies-wonder.md @@ -0,0 +1,5 @@ +--- +"@bigcommerce/catalyst-core": patch +--- + +Upgrade `@makeswift/runtime` to the [0.23.3 release](https://github.com/makeswift/makeswift/releases). diff --git a/core/lib/makeswift/components/accordions/accordions.makeswift.tsx b/core/lib/makeswift/components/accordions/accordions.makeswift.tsx index 93334de645..c04c5214d9 100644 --- a/core/lib/makeswift/components/accordions/accordions.makeswift.tsx +++ b/core/lib/makeswift/components/accordions/accordions.makeswift.tsx @@ -1,4 +1,4 @@ -import { List, Select, Shape, Slot, Style, TextInput } from '@makeswift/runtime/controls'; +import { Group, List, Select, Slot, Style, TextInput } from '@makeswift/runtime/controls'; import { Accordion, Accordions } from '@/vibes/soul/primitives/accordions'; import { runtime } from '~/lib/makeswift/runtime'; @@ -42,8 +42,9 @@ runtime.registerComponent( className: Style(), accordions: List({ label: 'Accordions', - type: Shape({ - type: { + type: Group({ + label: 'Accordion item', + props: { title: TextInput({ label: 'Title', defaultValue: 'This is an accordion title' }), children: Slot(), }, diff --git a/core/lib/makeswift/components/card-carousel/card-carousel.makeswift.tsx b/core/lib/makeswift/components/card-carousel/card-carousel.makeswift.tsx index 08a23641ee..be5bfe7063 100644 --- a/core/lib/makeswift/components/card-carousel/card-carousel.makeswift.tsx +++ b/core/lib/makeswift/components/card-carousel/card-carousel.makeswift.tsx @@ -1,10 +1,10 @@ import { Checkbox, + Group, Image, Link, List, Select, - Shape, Style, TextInput, } from '@makeswift/runtime/controls'; @@ -49,8 +49,9 @@ runtime.registerComponent( className: Style(), cards: List({ label: 'Cards', - type: Shape({ - type: { + type: Group({ + label: 'Card', + props: { title: TextInput({ label: 'Title', defaultValue: 'Title' }), imageSrc: Image({ label: 'Image' }), imageAlt: TextInput({ label: 'Image Alt', defaultValue: 'Card image' }), diff --git a/core/lib/makeswift/components/carousel/carousel.makeswift.tsx b/core/lib/makeswift/components/carousel/carousel.makeswift.tsx index 28ad6f7582..d0d2635d51 100644 --- a/core/lib/makeswift/components/carousel/carousel.makeswift.tsx +++ b/core/lib/makeswift/components/carousel/carousel.makeswift.tsx @@ -1,4 +1,4 @@ -import { Checkbox, List, Select, Shape, Slot, Style, TextInput } from '@makeswift/runtime/controls'; +import { Checkbox, Group, List, Select, Slot, Style, TextInput } from '@makeswift/runtime/controls'; import { Carousel, @@ -64,8 +64,9 @@ runtime.registerComponent( className: Style(), slides: List({ label: 'Items', - type: Shape({ - type: { + type: Group({ + label: 'Item', + props: { name: TextInput({ label: 'Name', defaultValue: '' }), children: Slot(), }, diff --git a/core/lib/makeswift/components/product-card/product-card.makeswift.tsx b/core/lib/makeswift/components/product-card/product-card.makeswift.tsx index d0a03655f8..b871b121c6 100644 --- a/core/lib/makeswift/components/product-card/product-card.makeswift.tsx +++ b/core/lib/makeswift/components/product-card/product-card.makeswift.tsx @@ -1,6 +1,6 @@ 'use client'; -import { Checkbox, Combobox, Select, Shape, Style, TextInput } from '@makeswift/runtime/controls'; +import { Checkbox, Combobox, Group, Select, Style, TextInput } from '@makeswift/runtime/controls'; import useSWR from 'swr'; import { runtime } from '~/lib/makeswift/runtime'; @@ -81,8 +81,9 @@ runtime.registerComponent(MakeswiftProductCard, { ], defaultValue: 'light', }), - badge: Shape({ - type: { + badge: Group({ + label: 'Badge', + props: { show: Checkbox({ label: 'Show badge', defaultValue: true }), text: TextInput({ label: 'Badge text', defaultValue: 'New' }), }, diff --git a/core/lib/makeswift/components/product-detail/register.ts b/core/lib/makeswift/components/product-detail/register.ts index a3cca2006d..6530d6fa32 100644 --- a/core/lib/makeswift/components/product-detail/register.ts +++ b/core/lib/makeswift/components/product-detail/register.ts @@ -1,4 +1,4 @@ -import { List, Select, Shape, Slot, TextArea, TextInput } from '@makeswift/runtime/controls'; +import { Group, List, Select, Slot, TextArea, TextInput } from '@makeswift/runtime/controls'; import { runtime } from '~/lib/makeswift/runtime'; @@ -6,9 +6,9 @@ import { DescriptionSource, MakeswiftProductDetail } from './client'; export const COMPONENT_TYPE = 'catalyst-makeswift-product-detail-description'; -const description = Shape({ +const description = Group({ label: 'Description', - type: { + props: { source: Select({ label: 'Source', options: [ @@ -33,9 +33,9 @@ runtime.registerComponent(MakeswiftProductDetail, { description, accordions: List({ label: 'Product info', - type: Shape({ + type: Group({ label: 'Product info section', - type: { + props: { title: TextInput({ label: 'Title', defaultValue: 'Section' }), content: Slot(), }, diff --git a/core/lib/makeswift/components/products-carousel/products-carousel.makeswift.tsx b/core/lib/makeswift/components/products-carousel/products-carousel.makeswift.tsx index c6ee56de6c..64d431938a 100644 --- a/core/lib/makeswift/components/products-carousel/products-carousel.makeswift.tsx +++ b/core/lib/makeswift/components/products-carousel/products-carousel.makeswift.tsx @@ -3,10 +3,10 @@ import { Checkbox, Combobox, + Group, List, Number, Select, - Shape, Style, TextInput, } from '@makeswift/runtime/controls'; @@ -85,8 +85,9 @@ runtime.registerComponent( limit: Number({ label: 'Max collection items', defaultValue: 12 }), additionalProducts: List({ label: 'Additional products', - type: Shape({ - type: { + type: Group({ + label: 'Product', + props: { title: TextInput({ label: 'Title', defaultValue: 'Product title' }), entityId: Combobox({ label: 'Product', diff --git a/core/lib/makeswift/components/products-list/products-list.makeswift.tsx b/core/lib/makeswift/components/products-list/products-list.makeswift.tsx index 2304393371..ca9e00fdab 100644 --- a/core/lib/makeswift/components/products-list/products-list.makeswift.tsx +++ b/core/lib/makeswift/components/products-list/products-list.makeswift.tsx @@ -2,10 +2,10 @@ import { Combobox, + Group, List, Number, Select, - Shape, Style, TextInput, } from '@makeswift/runtime/controls'; @@ -70,8 +70,9 @@ runtime.registerComponent( limit: Number({ label: 'Max collection items', defaultValue: 12 }), additionalProducts: List({ label: 'Additional products', - type: Shape({ - type: { + type: Group({ + label: 'Product', + props: { title: TextInput({ label: 'Title', defaultValue: 'Product title' }), entityId: Combobox({ label: 'Product', diff --git a/core/lib/makeswift/components/site-footer/site-footer.makeswift.tsx b/core/lib/makeswift/components/site-footer/site-footer.makeswift.tsx index 7ebc5d6592..5e33db7057 100644 --- a/core/lib/makeswift/components/site-footer/site-footer.makeswift.tsx +++ b/core/lib/makeswift/components/site-footer/site-footer.makeswift.tsx @@ -1,4 +1,4 @@ -import { Checkbox, Image, Link, List, Number, Shape, TextInput } from '@makeswift/runtime/controls'; +import { Checkbox, Group, Image, Link, List, Number, TextInput } from '@makeswift/runtime/controls'; import { runtime } from '~/lib/makeswift/runtime'; @@ -6,10 +6,10 @@ import { MakeswiftFooter } from './site-footer.client'; export const COMPONENT_TYPE = 'catalyst-makeswift-footer'; -const logo = Shape({ +const logo = Group({ label: 'Logo', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { show: Checkbox({ label: 'Show logo', defaultValue: true }), src: Image({ label: 'Logo' }), alt: TextInput({ label: 'Alt text', defaultValue: 'Logo alt' }), @@ -20,9 +20,9 @@ const logo = Shape({ const links = List({ label: 'Links', - type: Shape({ + type: Group({ label: 'Link', - type: { + props: { label: TextInput({ label: 'Text', defaultValue: 'Text' }), link: Link({ label: 'URL' }), }, @@ -38,9 +38,9 @@ runtime.registerComponent(MakeswiftFooter, { logo, sections: List({ label: 'Sections', - type: Shape({ + type: Group({ label: 'Section', - type: { + props: { title: TextInput({ label: 'Title', defaultValue: 'Section' }), links, }, diff --git a/core/lib/makeswift/components/site-header/site-header.makeswift.tsx b/core/lib/makeswift/components/site-header/site-header.makeswift.tsx index 69aec1267e..664f6dfbac 100644 --- a/core/lib/makeswift/components/site-header/site-header.makeswift.tsx +++ b/core/lib/makeswift/components/site-header/site-header.makeswift.tsx @@ -1,11 +1,11 @@ import { Checkbox, + Group, Image, Link, List, Number, Select, - Shape, Slot, TextInput, } from '@makeswift/runtime/controls'; @@ -16,10 +16,10 @@ import { MakeswiftHeader } from './site-header.client'; export const COMPONENT_TYPE = 'catalyst-makeswift-header'; -const banner = Shape({ +const banner = Group({ label: 'Banner', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { show: Checkbox({ label: 'Show banner', defaultValue: false }), allowClose: Checkbox({ label: 'Allow banner to close', defaultValue: true }), id: TextInput({ label: 'Banner ID', defaultValue: 'black_friday_2025' }), @@ -34,9 +34,9 @@ const logoGroup = ( height: number; }, ) => - Shape({ + Group({ label, - type: { + props: { src: Image({ label: 'Logo' }), alt: TextInput({ label: 'Alt text', defaultValue: 'Logo alt' }), width: Number({ label: 'Max width', suffix: 'px', defaultValue: defaults.width }), @@ -44,10 +44,10 @@ const logoGroup = ( }, }); -const logo = Shape({ +const logo = Group({ label: 'Logo', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { desktop: logoGroup('Desktop', { width: 200, height: 40 }), mobile: logoGroup('Mobile', { width: 100, height: 40 }), link: Link({ label: 'Logo link' }), @@ -56,9 +56,9 @@ const logo = Shape({ const links = List({ label: 'Links', - type: Shape({ + type: Group({ label: 'Link', - type: { + props: { label: TextInput({ label: 'Text', defaultValue: 'Text' }), link: Link({ label: 'URL' }), }, @@ -68,9 +68,9 @@ const links = List({ const groups = List({ label: 'Groups', - type: Shape({ + type: Group({ label: 'Link group', - type: { + props: { label: TextInput({ label: 'Text', defaultValue: 'Text' }), link: Link({ label: 'URL' }), links, @@ -88,9 +88,9 @@ runtime.registerComponent(MakeswiftHeader, { logo, links: List({ label: 'Additional links', - type: Shape({ + type: Group({ label: 'Link', - type: { + props: { label: TextInput({ label: 'Text', defaultValue: 'Text' }), link: Link({ label: 'URL' }), groups, diff --git a/core/lib/makeswift/components/site-theme/components/accordion.ts b/core/lib/makeswift/components/site-theme/components/accordion.ts index e64768e76c..982eb3d1d2 100644 --- a/core/lib/makeswift/components/site-theme/components/accordion.ts +++ b/core/lib/makeswift/components/site-theme/components/accordion.ts @@ -1,4 +1,4 @@ -import { Color, Shape } from '@makeswift/runtime/controls'; +import { Color, Group } from '@makeswift/runtime/controls'; import { FontFamily } from '~/lib/makeswift/controls/font-tokens'; import { hsl } from '~/lib/makeswift/utils/color'; @@ -15,10 +15,10 @@ const colorGroup = ( contentText: string; }, ) => - Shape({ + Group({ label, - layout: Shape.Layout.Inline, - type: { + preferredLayout: Group.Layout.Inline, + props: { titleText: Color({ label: 'Title text', defaultValue: defaults.titleText }), titleTextHover: Color({ label: 'Title text hover', defaultValue: defaults.titleTextHover }), titleIcon: Color({ label: 'Title icon', defaultValue: defaults.titleIcon }), @@ -27,10 +27,10 @@ const colorGroup = ( }, }); -export const accordion = Shape({ +export const accordion = Group({ label: 'Accordion', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { titleFontFamily: FontFamily({ label: 'Title font', defaultValue: FontFamily.Accent }), contentFontFamily: FontFamily({ label: 'Content font', defaultValue: FontFamily.Body }), light: colorGroup('Light', { diff --git a/core/lib/makeswift/components/site-theme/components/button.ts b/core/lib/makeswift/components/site-theme/components/button.ts index 95f7c6d5ad..f64879408c 100644 --- a/core/lib/makeswift/components/site-theme/components/button.ts +++ b/core/lib/makeswift/components/site-theme/components/button.ts @@ -1,4 +1,4 @@ -import { Color, Shape } from '@makeswift/runtime/controls'; +import { Color, Group } from '@makeswift/runtime/controls'; import { FontFamily } from '~/lib/makeswift/controls/font-tokens'; import { hsl } from '~/lib/makeswift/utils/color'; @@ -14,10 +14,10 @@ const colorGroup = ( border: string; }, ) => - Shape({ + Group({ label, - layout: Shape.Layout.Inline, - type: { + preferredLayout: Group.Layout.Inline, + props: { background: Color({ label: 'Background', defaultValue: defaults.background }), backgroundHover: Color({ label: 'Background hover', defaultValue: defaults.backgroundHover }), foreground: Color({ label: 'Foreground', defaultValue: defaults.foreground }), @@ -25,10 +25,10 @@ const colorGroup = ( }, }); -export const button = Shape({ +export const button = Group({ label: 'Button', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { fontFamily: FontFamily({ label: 'Font', defaultValue: FontFamily.Body }), primary: colorGroup('Primary', { background: hsl(colors.primary), diff --git a/core/lib/makeswift/components/site-theme/components/card.ts b/core/lib/makeswift/components/site-theme/components/card.ts index a48243ab66..7adacd0b15 100644 --- a/core/lib/makeswift/components/site-theme/components/card.ts +++ b/core/lib/makeswift/components/site-theme/components/card.ts @@ -1,4 +1,4 @@ -import { Color, Number, Shape } from '@makeswift/runtime/controls'; +import { Color, Group, Number } from '@makeswift/runtime/controls'; import { hsl } from '~/lib/makeswift/utils/color'; @@ -12,20 +12,20 @@ const colorGroup = ( icon: string; }, ) => - Shape({ + Group({ label, - layout: Shape.Layout.Inline, - type: { + preferredLayout: Group.Layout.Inline, + props: { background: Color({ label: 'Background', defaultValue: defaults.background }), text: Color({ label: 'Text', defaultValue: defaults.text }), icon: Color({ label: 'Icon', defaultValue: defaults.icon }), }, }); -export const card = Shape({ +export const card = Group({ label: 'Card', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { borderRadius: Number({ label: 'Border radius', suffix: 'px', defaultValue: 16 }), focus: Color({ label: 'Focus', defaultValue: hsl(colors.primary) }), light: colorGroup('Light', { diff --git a/core/lib/makeswift/components/site-theme/components/carousel.ts b/core/lib/makeswift/components/site-theme/components/carousel.ts index e78f507801..6221b63d69 100644 --- a/core/lib/makeswift/components/site-theme/components/carousel.ts +++ b/core/lib/makeswift/components/site-theme/components/carousel.ts @@ -1,4 +1,4 @@ -import { Color, Shape } from '@makeswift/runtime/controls'; +import { Color, Group } from '@makeswift/runtime/controls'; import { hsl } from '~/lib/makeswift/utils/color'; @@ -11,19 +11,19 @@ const colorGroup = ( scrollbar: string; }, ) => - Shape({ + Group({ label, - layout: Shape.Layout.Inline, - type: { + preferredLayout: Group.Layout.Inline, + props: { button: Color({ label: 'Button', defaultValue: defaults.button }), scrollbar: Color({ label: 'Scrollbar', defaultValue: defaults.scrollbar }), }, }); -export const carousel = Shape({ +export const carousel = Group({ label: 'Carousel', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { focus: Color({ label: 'Focus', defaultValue: hsl(colors.primary) }), light: colorGroup('Light', { button: hsl(colors.foreground), diff --git a/core/lib/makeswift/components/site-theme/components/footer.ts b/core/lib/makeswift/components/site-theme/components/footer.ts index 06601b948d..b4de9564fd 100644 --- a/core/lib/makeswift/components/site-theme/components/footer.ts +++ b/core/lib/makeswift/components/site-theme/components/footer.ts @@ -1,13 +1,13 @@ -import { Color, Shape } from '@makeswift/runtime/controls'; +import { Color, Group } from '@makeswift/runtime/controls'; import { hsl } from '~/lib/makeswift/utils/color'; import { colors } from '../base-colors'; -export const footer = Shape({ +export const footer = Group({ label: 'Footer', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { background: Color({ label: 'Background', defaultValue: hsl(colors.background) }), borderTop: Color({ label: 'Border top', defaultValue: hsl(colors.contrast[100]) }), borderBottom: Color({ label: 'Border bottom', defaultValue: hsl(colors.primary) }), diff --git a/core/lib/makeswift/components/site-theme/components/header/banner.ts b/core/lib/makeswift/components/site-theme/components/header/banner.ts index 845f226793..a7503eb81f 100644 --- a/core/lib/makeswift/components/site-theme/components/header/banner.ts +++ b/core/lib/makeswift/components/site-theme/components/header/banner.ts @@ -1,12 +1,12 @@ -import { Color, Shape } from '@makeswift/runtime/controls'; +import { Color, Group } from '@makeswift/runtime/controls'; import { hsl } from '~/lib/makeswift/utils/color'; import { colors } from '../../base-colors'; -const closeButton = Shape({ +const closeButton = Group({ label: 'Close button', - type: { + props: { icon: Color({ label: 'Icon', defaultValue: hsl(colors.foreground, 0.5) }), iconHover: Color({ label: 'Icon hover', defaultValue: hsl(colors.foreground) }), background: Color({ label: 'Background', defaultValue: 'transparent' }), @@ -17,10 +17,10 @@ const closeButton = Shape({ }, }); -export const banner = Shape({ +export const banner = Group({ label: 'Banner', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { background: Color({ label: 'Background', defaultValue: hsl(colors.primary) }), text: Color({ label: 'Text', defaultValue: hsl(colors.foreground) }), focus: Color({ label: 'Focus', defaultValue: hsl(colors.foreground) }), diff --git a/core/lib/makeswift/components/site-theme/components/header/index.ts b/core/lib/makeswift/components/site-theme/components/header/index.ts index a37c87026c..c6294b99e8 100644 --- a/core/lib/makeswift/components/site-theme/components/header/index.ts +++ b/core/lib/makeswift/components/site-theme/components/header/index.ts @@ -1,12 +1,12 @@ -import { Shape } from '@makeswift/runtime/controls'; +import { Group } from '@makeswift/runtime/controls'; import { banner } from './banner'; import { nav } from './nav'; -export const header = Shape({ +export const header = Group({ label: 'Header', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { banner, nav, }, diff --git a/core/lib/makeswift/components/site-theme/components/header/nav.ts b/core/lib/makeswift/components/site-theme/components/header/nav.ts index 3462a625d8..3b343f400a 100644 --- a/core/lib/makeswift/components/site-theme/components/header/nav.ts +++ b/core/lib/makeswift/components/site-theme/components/header/nav.ts @@ -1,4 +1,4 @@ -import { Color, Shape } from '@makeswift/runtime/controls'; +import { Color, Group } from '@makeswift/runtime/controls'; import { FontFamily, type FontFamilyCssVar } from '~/lib/makeswift/controls/font-tokens'; import { hsl } from '~/lib/makeswift/utils/color'; @@ -16,10 +16,10 @@ const elementGroup = ( backgroundHover: string; }, ) => - Shape({ + Group({ label, - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { fontFamily: FontFamily({ label: 'Font', defaultValue: defaults.fontFamily }), text: Color({ label: 'Text', defaultValue: defaults.text }), textHover: Color({ label: 'Text hover', defaultValue: defaults.textHover }), @@ -31,10 +31,10 @@ const elementGroup = ( }, }); -const button = Shape({ +const button = Group({ label: 'Button', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { icon: Color({ label: 'Icon', defaultValue: hsl(colors.foreground) }), iconHover: Color({ label: 'Icon hover', defaultValue: hsl(colors.foreground) }), background: Color({ label: 'Background', defaultValue: hsl(colors.background) }), @@ -42,19 +42,19 @@ const button = Shape({ }, }); -const menu = Shape({ +const menu = Group({ label: 'Menu', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { background: Color({ label: 'Background', defaultValue: hsl(colors.background) }), border: Color({ label: 'Border', defaultValue: hsl(colors.foreground, 0.05) }), }, }); -const mobile = Shape({ +const mobile = Group({ label: 'Mobile', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { background: Color({ label: 'Background', defaultValue: hsl(colors.background) }), divider: Color({ label: 'Divider', defaultValue: hsl(colors.contrast[100]) }), buttonIcon: Color({ label: 'Button icon', defaultValue: hsl(colors.foreground) }), @@ -75,10 +75,10 @@ const mobile = Shape({ }, }); -const search = Shape({ +const search = Group({ label: 'Search', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { background: Color({ label: 'Background', defaultValue: hsl(colors.background) }), border: Color({ label: 'Border', defaultValue: hsl(colors.foreground, 0.05) }), divider: Color({ label: 'Divider', defaultValue: hsl(colors.foreground, 0.05) }), @@ -88,10 +88,10 @@ const search = Shape({ }, }); -const searchResult = Shape({ +const searchResult = Group({ label: 'Search result', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { title: Color({ label: 'Title', defaultValue: hsl(colors.foreground) }), titleFontFamily: FontFamily({ label: 'Title font', defaultValue: FontFamily.Accent }), link: elementGroup('Link', { @@ -104,19 +104,19 @@ const searchResult = Shape({ }, }); -const cartCount = Shape({ +const cartCount = Group({ label: 'Cart count', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { text: Color({ label: 'Text', defaultValue: hsl(colors.background) }), background: Color({ label: 'Background', defaultValue: hsl(colors.foreground) }), }, }); -const locale = Shape({ +const locale = Group({ label: 'Locale', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { background: Color({ label: 'Background', defaultValue: hsl(colors.background) }), link: elementGroup('Link', { fontFamily: FontFamily.Body, @@ -129,10 +129,10 @@ const locale = Shape({ }, }); -export const nav = Shape({ +export const nav = Group({ label: 'Navigation', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { background: Color({ label: 'Background', defaultValue: hsl(colors.background) }), floatingBorder: Color({ label: 'Floating border', defaultValue: hsl(colors.foreground, 0.1) }), focus: Color({ label: 'Focus', defaultValue: hsl(colors.primary) }), diff --git a/core/lib/makeswift/components/site-theme/components/logo.ts b/core/lib/makeswift/components/site-theme/components/logo.ts index 1f1c9c6578..5ed99842a6 100644 --- a/core/lib/makeswift/components/site-theme/components/logo.ts +++ b/core/lib/makeswift/components/site-theme/components/logo.ts @@ -1,14 +1,14 @@ -import { Color, Shape } from '@makeswift/runtime/controls'; +import { Color, Group } from '@makeswift/runtime/controls'; import { FontFamily } from '~/lib/makeswift/controls/font-tokens'; import { hsl } from '~/lib/makeswift/utils/color'; import { colors } from '../base-colors'; -export const logo = Shape({ +export const logo = Group({ label: 'Logo', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { fontFamily: FontFamily({ label: 'Font', defaultValue: FontFamily.Heading }), text: Color({ label: 'Text', defaultValue: hsl(colors.foreground) }), focus: Color({ label: 'Focus', defaultValue: hsl(colors.primary) }), diff --git a/core/lib/makeswift/components/site-theme/components/price-label.ts b/core/lib/makeswift/components/site-theme/components/price-label.ts index a70a2e390a..3bfe76a046 100644 --- a/core/lib/makeswift/components/site-theme/components/price-label.ts +++ b/core/lib/makeswift/components/site-theme/components/price-label.ts @@ -1,4 +1,4 @@ -import { Color, Shape } from '@makeswift/runtime/controls'; +import { Color, Group } from '@makeswift/runtime/controls'; import { hsl } from '~/lib/makeswift/utils/color'; @@ -11,19 +11,19 @@ const colorGroup = ( saleText: string; }, ) => - Shape({ + Group({ label, - layout: Shape.Layout.Inline, - type: { + preferredLayout: Group.Layout.Inline, + props: { text: Color({ label: 'Text', defaultValue: defaults.text }), saleText: Color({ label: 'Sale text', defaultValue: defaults.saleText }), }, }); -export const priceLabel = Shape({ +export const priceLabel = Group({ label: 'Price label', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { light: colorGroup('Light', { text: hsl(colors.foreground), saleText: hsl(colors.foreground), diff --git a/core/lib/makeswift/components/site-theme/components/product-card.ts b/core/lib/makeswift/components/site-theme/components/product-card.ts index 8ff9e80e23..36ed8ce899 100644 --- a/core/lib/makeswift/components/site-theme/components/product-card.ts +++ b/core/lib/makeswift/components/site-theme/components/product-card.ts @@ -1,4 +1,4 @@ -import { Color, Number, Shape } from '@makeswift/runtime/controls'; +import { Color, Group, Number } from '@makeswift/runtime/controls'; import { hsl } from '~/lib/makeswift/utils/color'; @@ -12,20 +12,20 @@ const colorGroup = ( subtitle: string; }, ) => - Shape({ + Group({ label, - layout: Shape.Layout.Inline, - type: { + preferredLayout: Group.Layout.Inline, + props: { background: Color({ label: 'Background', defaultValue: defaults.background }), title: Color({ label: 'Title', defaultValue: defaults.title }), subtitle: Color({ label: 'Subtitle', defaultValue: defaults.subtitle }), }, }); -export const productCard = Shape({ +export const productCard = Group({ label: 'Product card', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { borderRadius: Number({ label: 'Border radius', suffix: 'px', defaultValue: 16 }), focus: Color({ label: 'Focus', defaultValue: hsl(colors.primary) }), light: colorGroup('Light', { diff --git a/core/lib/makeswift/components/site-theme/components/section.ts b/core/lib/makeswift/components/site-theme/components/section.ts index 0ec9f06386..787291c97d 100644 --- a/core/lib/makeswift/components/site-theme/components/section.ts +++ b/core/lib/makeswift/components/site-theme/components/section.ts @@ -1,10 +1,10 @@ -import { Number, Shape } from '@makeswift/runtime/controls'; +import { Group, Number } from '@makeswift/runtime/controls'; const widthGroup = (label: string) => - Shape({ + Group({ label, - layout: Shape.Layout.Inline, - type: { + preferredLayout: Group.Layout.Inline, + props: { medium: Number({ label: 'Medium', suffix: 'px', defaultValue: 768 }), lg: Number({ label: 'Large', suffix: 'px', defaultValue: 1024 }), xl: Number({ label: 'XL', suffix: 'px', defaultValue: 1200 }), @@ -12,10 +12,10 @@ const widthGroup = (label: string) => }, }); -export const section = Shape({ +export const section = Group({ label: 'Section', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { maxWidth: widthGroup('Max width'), }, }); diff --git a/core/lib/makeswift/components/site-theme/components/slide-show.ts b/core/lib/makeswift/components/site-theme/components/slide-show.ts index f96a44789b..fbde0c72cd 100644 --- a/core/lib/makeswift/components/site-theme/components/slide-show.ts +++ b/core/lib/makeswift/components/site-theme/components/slide-show.ts @@ -1,14 +1,14 @@ -import { Color, Shape } from '@makeswift/runtime/controls'; +import { Color, Group } from '@makeswift/runtime/controls'; import { FontFamily } from '~/lib/makeswift/controls/font-tokens'; import { hsl } from '~/lib/makeswift/utils/color'; import { colors } from '../base-colors'; -export const slideshow = Shape({ +export const slideshow = Group({ label: 'Slideshow', - layout: Shape.Layout.Popover, - type: { + preferredLayout: Group.Layout.Popover, + props: { titleFontFamily: FontFamily({ label: 'Title font', defaultValue: FontFamily.Heading }), descriptionFontFamily: FontFamily({ label: 'Description font', defaultValue: FontFamily.Body }), numberFontFamily: FontFamily({ label: 'Number font', defaultValue: FontFamily.Accent }), diff --git a/core/lib/makeswift/components/site-theme/register.ts b/core/lib/makeswift/components/site-theme/register.ts index 933016610c..6cdfb71ee8 100644 --- a/core/lib/makeswift/components/site-theme/register.ts +++ b/core/lib/makeswift/components/site-theme/register.ts @@ -1,4 +1,4 @@ -import { Shape } from '@makeswift/runtime/controls'; +import { Group } from '@makeswift/runtime/controls'; import { fontFamilyTokens } from '~/lib/makeswift/controls/font-tokens'; import { runtime } from '~/lib/makeswift/runtime'; @@ -13,14 +13,14 @@ runtime.registerComponent(MakeswiftSiteTheme, { label: 'MakeswiftSiteTheme (private)', hidden: true, props: { - fontTokens: Shape({ + fontTokens: Group({ label: 'Fonts', - layout: Shape.Layout.Popover, - type: fontFamilyTokens, + preferredLayout: Group.Layout.Popover, + props: fontFamilyTokens, }), - components: Shape({ + components: Group({ label: 'Components', - type: components, + props: components, }), }, }); diff --git a/core/lib/makeswift/components/slideshow/slideshow.makeswift.tsx b/core/lib/makeswift/components/slideshow/slideshow.makeswift.tsx index 9a45c4ab23..2879149d0d 100644 --- a/core/lib/makeswift/components/slideshow/slideshow.makeswift.tsx +++ b/core/lib/makeswift/components/slideshow/slideshow.makeswift.tsx @@ -1,11 +1,11 @@ import { Checkbox, + Group, Image, Link, List, Number, Select, - Shape, Style, TextArea, TextInput, @@ -73,8 +73,8 @@ runtime.registerComponent( className: Style(), slides: List({ label: 'Slides', - type: Shape({ - type: { + type: Group({ + props: { title: TextInput({ label: 'Title', defaultValue: 'Slide title' }), showDescription: Checkbox({ label: 'Show description', defaultValue: true }), description: TextArea({ label: 'Description', defaultValue: 'Slide description' }), diff --git a/core/package.json b/core/package.json index 5771318719..f631f8e4ee 100644 --- a/core/package.json +++ b/core/package.json @@ -17,7 +17,7 @@ "@conform-to/react": "^1.2.2", "@conform-to/zod": "^1.2.2", "@icons-pack/react-simple-icons": "^10.2.0", - "@makeswift/runtime": "0.0.0-snapshot-20250108161914", + "@makeswift/runtime": "^0.23.3", "@radix-ui/react-accordion": "^1.2.2", "@radix-ui/react-alert-dialog": "^1.1.3", "@radix-ui/react-checkbox": "^1.1.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0196046758..a5e7e0bffe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,8 +39,8 @@ importers: specifier: ^10.2.0 version: 10.2.0(react@19.0.0) '@makeswift/runtime': - specifier: 0.0.0-snapshot-20250108161914 - version: 0.0.0-snapshot-20250108161914(@types/react-dom@19.0.2(@types/react@19.0.1))(@types/react@19.0.1)(next@15.2.0-canary.27(@playwright/test@1.49.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.23.3 + version: 0.23.3(@types/react-dom@19.0.2(@types/react@19.0.1))(@types/react@19.0.1)(next@15.2.0-canary.27(@playwright/test@1.49.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@radix-ui/react-accordion': specifier: ^1.2.2 version: 1.2.2(@types/react-dom@19.0.2(@types/react@19.0.1))(@types/react@19.0.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) @@ -303,7 +303,7 @@ importers: devDependencies: '@bigcommerce/eslint-config': specifier: ^2.10.0 - version: 2.10.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(@types/node@20.17.10)(babel-plugin-macros@3.1.0))(typescript@5.7.2) + version: 2.10.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(babel-plugin-macros@3.1.0))(typescript@5.7.2) '@bigcommerce/eslint-config-catalyst': specifier: workspace:^ version: link:../eslint-config-catalyst @@ -385,7 +385,7 @@ importers: devDependencies: '@bigcommerce/eslint-config': specifier: ^2.10.0 - version: 2.10.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(@types/node@20.17.10)(babel-plugin-macros@3.1.0))(typescript@5.7.2) + version: 2.10.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(babel-plugin-macros@3.1.0))(typescript@5.7.2) '@bigcommerce/eslint-config-catalyst': specifier: workspace:^ version: link:../eslint-config-catalyst @@ -1379,25 +1379,25 @@ packages: resolution: {integrity: sha512-qC72D4+CDdjGqJvkFMMEAtancHUQ7/d/tAiHf64z8MopFDmcrtbcJuerDtFceuAfQJ2pDSfCKCtbqoGBNnwg0w==} engines: {node: '>=8'} - '@makeswift/controls@0.0.0-snapshot-20250108161914': - resolution: {integrity: sha512-bYcV60IenaNLiFbHC9j75y7VVqXx/SM/iUvMggTatK4G7dHI72w0h+mOfbeztZXZYGRFYn4+adSc950QpThL0A==} + '@makeswift/controls@0.1.7': + resolution: {integrity: sha512-DaZeA3rrtzIE9j1TcN4nu1uFUHjkA8yVSmsbNqz22PxC4bOp8DiRtblkk6brWOmoNYlMAaEq7va5ct8ZK2Cv8w==} - '@makeswift/next-plugin@0.3.0': - resolution: {integrity: sha512-pGe0D6KrVxZcyaM8hFCIK806yNV6YJtRcjjD+2Wpn5qkFStIMTlACkGRVHVLftFyfi8/E3lGkbR05Jo3aTecwQ==} + '@makeswift/next-plugin@0.3.1': + resolution: {integrity: sha512-du4Z+0vw3FgGUEsE590gq5WaEeAIOeM2nv8STXpfMAzaTBvTV335RZNxm538d142JBy0SyD4EdNISJQTZ6X41g==} peerDependencies: - next: ^13.4.0 || ^14.0.0 + next: ^13.4.0 || ^14.0.0 || ^15.0.0 - '@makeswift/prop-controllers@0.0.0-snapshot-20250108161914': - resolution: {integrity: sha512-OpjPnDOgdjGpZrSSGhupBFrwsDjEilIet/Ew6PONXkznXIzBvG3N+lLVEcMv31yHcrwawxuDtFIGTcjtuX0UtQ==} + '@makeswift/prop-controllers@0.4.0': + resolution: {integrity: sha512-vx+KhbIEI7ob4P9x9a1baLS9iiR8BqLgFegxKKsJRKBjfN2Ez7x/MumQwFmPtWmBXfQvgdHPDBisgpJXM17Xjw==} - '@makeswift/runtime@0.0.0-snapshot-20250108161914': - resolution: {integrity: sha512-ZYhXYeIQCz+qo9JnTnbpfv/Ffh00HapWXt/u2hfHOzdW7MWKtIS66lizsGJt00sYC+h1mkXEAwjQD2o1w0ypSA==} + '@makeswift/runtime@0.23.3': + resolution: {integrity: sha512-pxbYJRZM2DBc2VGETh0Am7d/O66Fd63LaDCjiT56JcCBEUww0iXwYq7geoDPmQBgndme/PaisVfpfZH3FBZnvw==} peerDependencies: - '@types/react': ^18.0.0 - '@types/react-dom': ^18.0.0 + '@types/react': ^18.0.0 || ^19.0.0 + '@types/react-dom': ^18.0.0 || ^19.0.0 next: ^13.4.0 || ^14.0.0 || ^15.0.0 - react: ^18.0.0 || ^19.0.0 || 19.0.0-rc - react-dom: ^18.0.0 || ^19.0.0 || 19.0.0-rc + react: ^18.0.0 || ^19.0.0 + react-dom: ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@types/react': optional: true @@ -5251,6 +5251,9 @@ packages: requires-port@1.0.0: resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} + reselect@5.1.1: + resolution: {integrity: sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==} + resolve-cwd@3.0.0: resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==} engines: {node: '>=8'} @@ -6305,40 +6308,6 @@ snapshots: '@bcoe/v8-coverage@0.2.3': {} - '@bigcommerce/eslint-config@2.10.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(@types/node@20.17.10)(babel-plugin-macros@3.1.0))(typescript@5.7.2)': - dependencies: - '@bigcommerce/eslint-plugin': 1.3.1(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1)(typescript@5.7.2) - '@rushstack/eslint-patch': 1.10.4 - '@stylistic/eslint-plugin': 2.7.2(eslint@8.57.1)(typescript@5.7.2) - '@typescript-eslint/eslint-plugin': 8.14.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1)(typescript@5.7.2) - '@typescript-eslint/parser': 8.14.0(eslint@8.57.1)(typescript@5.7.2) - eslint: 8.57.1 - eslint-config-prettier: 9.1.0(eslint@8.57.1) - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1) - eslint-plugin-gettext: 1.2.0 - eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) - eslint-plugin-jest: 28.8.3(@typescript-eslint/eslint-plugin@8.14.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1)(jest@29.7.0(babel-plugin-macros@3.1.0))(typescript@5.7.2) - eslint-plugin-jest-dom: 5.5.0(eslint@8.57.1) - eslint-plugin-jest-formatting: 3.1.0(eslint@8.57.1) - eslint-plugin-jsdoc: 50.2.2(eslint@8.57.1) - eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1) - eslint-plugin-prettier: 5.2.1(@types/eslint@9.6.1)(eslint-config-prettier@9.1.0(eslint@8.57.1))(eslint@8.57.1)(prettier@3.4.2) - eslint-plugin-react: 7.37.2(eslint@8.57.1) - eslint-plugin-react-hooks: 5.0.0(eslint@8.57.1) - eslint-plugin-switch-case: 1.1.2 - eslint-plugin-testing-library: 7.1.1(eslint@8.57.1)(typescript@5.7.2) - prettier: 3.4.2 - optionalDependencies: - typescript: 5.7.2 - transitivePeerDependencies: - - '@testing-library/dom' - - '@types/eslint' - - eslint-import-resolver-node - - eslint-import-resolver-webpack - - eslint-plugin-import-x - - jest - - supports-color - '@bigcommerce/eslint-config@2.10.0(@types/eslint@9.6.1)(eslint@8.57.1)(jest@29.7.0(babel-plugin-macros@3.1.0))(typescript@5.7.2)': dependencies: '@bigcommerce/eslint-plugin': 1.3.1(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1)(typescript@5.7.2) @@ -7220,7 +7189,7 @@ snapshots: dependencies: '@lukeed/csprng': 1.1.0 - '@makeswift/controls@0.0.0-snapshot-20250108161914': + '@makeswift/controls@0.1.7': dependencies: color: 3.2.1 css-box-model: 1.2.1 @@ -7229,20 +7198,20 @@ snapshots: uuid: 9.0.1 zod: 3.24.1 - '@makeswift/next-plugin@0.3.0(next@15.2.0-canary.27(@playwright/test@1.49.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))': + '@makeswift/next-plugin@0.3.1(next@15.2.0-canary.27(@playwright/test@1.49.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))': dependencies: enhanced-resolve: 5.10.0 escalade: 3.1.1 next: 15.2.0-canary.27(@playwright/test@1.49.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) semver: 7.6.3 - '@makeswift/prop-controllers@0.0.0-snapshot-20250108161914': + '@makeswift/prop-controllers@0.4.0': dependencies: - '@makeswift/controls': 0.0.0-snapshot-20250108161914 + '@makeswift/controls': 0.1.7 ts-pattern: 5.5.0 zod: 3.24.1 - '@makeswift/runtime@0.0.0-snapshot-20250108161914(@types/react-dom@19.0.2(@types/react@19.0.1))(@types/react@19.0.1)(next@15.2.0-canary.27(@playwright/test@1.49.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': + '@makeswift/runtime@0.23.3(@types/react-dom@19.0.2(@types/react@19.0.1))(@types/react@19.0.1)(next@15.2.0-canary.27(@playwright/test@1.49.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@emotion/cache': 11.14.0 '@emotion/css': 11.13.5 @@ -7250,9 +7219,9 @@ snapshots: '@emotion/server': 11.11.0(@emotion/css@11.13.5) '@emotion/sheet': 1.4.0 '@emotion/utils': 1.4.2 - '@makeswift/controls': 0.0.0-snapshot-20250108161914 - '@makeswift/next-plugin': 0.3.0(next@15.2.0-canary.27(@playwright/test@1.49.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)) - '@makeswift/prop-controllers': 0.0.0-snapshot-20250108161914 + '@makeswift/controls': 0.1.7 + '@makeswift/next-plugin': 0.3.1(next@15.2.0-canary.27(@playwright/test@1.49.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)) + '@makeswift/prop-controllers': 0.4.0 '@popmotion/popcorn': 0.4.4 '@redux-devtools/extension': 3.3.0(redux@4.2.1) '@types/is-hotkey': 0.1.10 @@ -7281,6 +7250,7 @@ snapshots: react-player: 1.15.3(react@19.0.0) redux: 4.2.1 redux-thunk: 2.4.2(redux@4.2.1) + reselect: 5.1.1 scroll-into-view-if-needed: 2.2.31 slate: 0.91.4 slate-hyperscript: 0.77.0(slate@0.91.4) @@ -9278,8 +9248,8 @@ snapshots: '@typescript-eslint/parser': 8.14.0(eslint@8.57.1)(typescript@5.7.2) eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1) - eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1) + eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1) eslint-plugin-react: 7.37.2(eslint@8.57.1) eslint-plugin-react-hooks: 5.0.0(eslint@8.57.1) @@ -9302,38 +9272,19 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1): + eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1): dependencies: '@nolyfill/is-core-module': 1.0.39 debug: 4.3.7 enhanced-resolve: 5.17.1 eslint: 8.57.1 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) - fast-glob: 3.3.2 - get-tsconfig: 4.8.1 - is-bun-module: 1.2.1 - is-glob: 4.0.3 - optionalDependencies: - eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) - transitivePeerDependencies: - - '@typescript-eslint/parser' - - eslint-import-resolver-node - - eslint-import-resolver-webpack - - supports-color - - eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1): - dependencies: - '@nolyfill/is-core-module': 1.0.39 - debug: 4.3.7 - enhanced-resolve: 5.17.1 - eslint: 8.57.1 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) fast-glob: 3.3.2 get-tsconfig: 4.8.1 is-bun-module: 1.2.1 is-glob: 4.0.3 optionalDependencies: - eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) transitivePeerDependencies: - '@typescript-eslint/parser' - eslint-import-resolver-node @@ -9346,7 +9297,7 @@ snapshots: debug: 4.3.7 enhanced-resolve: 5.17.1 eslint: 8.57.1 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) fast-glob: 3.3.2 get-tsconfig: 4.8.1 is-bun-module: 1.2.1 @@ -9359,35 +9310,23 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): - dependencies: - debug: 3.2.7 - optionalDependencies: - '@typescript-eslint/parser': 8.14.0(eslint@8.57.1)(typescript@5.7.2) - eslint: 8.57.1 - eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1) - transitivePeerDependencies: - - supports-color - - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: '@typescript-eslint/parser': 8.14.0(eslint@8.57.1)(typescript@5.7.2) eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1) + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1) transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: '@typescript-eslint/parser': 8.14.0(eslint@8.57.1)(typescript@5.7.2) eslint: 8.57.1 - eslint-import-resolver-node: 0.3.9 eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-plugin-import@2.31.0)(eslint@8.57.1) transitivePeerDependencies: - supports-color @@ -9402,64 +9341,6 @@ snapshots: dependencies: gettext-parser: 4.2.0 - eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): - dependencies: - '@rtsao/scc': 1.1.0 - array-includes: 3.1.8 - array.prototype.findlastindex: 1.2.5 - array.prototype.flat: 1.3.2 - array.prototype.flatmap: 1.3.2 - debug: 3.2.7 - doctrine: 2.1.0 - eslint: 8.57.1 - eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) - hasown: 2.0.2 - is-core-module: 2.15.1 - is-glob: 4.0.3 - minimatch: 3.1.2 - object.fromentries: 2.0.8 - object.groupby: 1.0.3 - object.values: 1.2.0 - semver: 6.3.1 - string.prototype.trimend: 1.0.8 - tsconfig-paths: 3.15.0 - optionalDependencies: - '@typescript-eslint/parser': 8.14.0(eslint@8.57.1)(typescript@5.7.2) - transitivePeerDependencies: - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - supports-color - - eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): - dependencies: - '@rtsao/scc': 1.1.0 - array-includes: 3.1.8 - array.prototype.findlastindex: 1.2.5 - array.prototype.flat: 1.3.2 - array.prototype.flatmap: 1.3.2 - debug: 3.2.7 - doctrine: 2.1.0 - eslint: 8.57.1 - eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) - hasown: 2.0.2 - is-core-module: 2.15.1 - is-glob: 4.0.3 - minimatch: 3.1.2 - object.fromentries: 2.0.8 - object.groupby: 1.0.3 - object.values: 1.2.0 - semver: 6.3.1 - string.prototype.trimend: 1.0.8 - tsconfig-paths: 3.15.0 - optionalDependencies: - '@typescript-eslint/parser': 8.14.0(eslint@8.57.1)(typescript@5.7.2) - transitivePeerDependencies: - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - supports-color - eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.14.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1): dependencies: '@rtsao/scc': 1.1.0 @@ -11490,6 +11371,8 @@ snapshots: requires-port@1.0.0: {} + reselect@5.1.1: {} + resolve-cwd@3.0.0: dependencies: resolve-from: 5.0.0