From 807d61691509840b68ca200348eeb38e51bead33 Mon Sep 17 00:00:00 2001 From: Claire Olmstead Date: Mon, 28 Oct 2024 13:45:20 -0700 Subject: [PATCH 1/4] fix paths --- .../ui/accordion/accordion-trigger.svelte | 26 +++++++++---------- .../ui/dialog/dialog-overlay.svelte | 22 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/lib/shadcnComponents/ui/accordion/accordion-trigger.svelte b/src/lib/shadcnComponents/ui/accordion/accordion-trigger.svelte index 42d7ce1..b51e6f0 100644 --- a/src/lib/shadcnComponents/ui/accordion/accordion-trigger.svelte +++ b/src/lib/shadcnComponents/ui/accordion/accordion-trigger.svelte @@ -3,24 +3,24 @@ import { Chevron } from '../../../../lib/assets'; import { cn } from '../../../utils/utils'; - type $$Props = AccordionPrimitive.TriggerProps; - type $$Events = AccordionPrimitive.TriggerEvents; + type $$Props = AccordionPrimitive.TriggerProps; + type $$Events = AccordionPrimitive.TriggerEvents; - let className: $$Props['class'] = undefined; - export let level: AccordionPrimitive.HeaderProps['level'] = 3; - export { className as class }; + let className: $$Props['class'] = undefined; + export let level: AccordionPrimitive.HeaderProps['level'] = 3; + export {className as class}; - svg]:rotate-180', className )} - {...$$restProps} - on:click - > - - - + {...$$restProps} + on:click + > + + + diff --git a/src/lib/shadcnComponents/ui/dialog/dialog-overlay.svelte b/src/lib/shadcnComponents/ui/dialog/dialog-overlay.svelte index 36262c0..9bfa7b8 100644 --- a/src/lib/shadcnComponents/ui/dialog/dialog-overlay.svelte +++ b/src/lib/shadcnComponents/ui/dialog/dialog-overlay.svelte @@ -3,19 +3,19 @@ import { fade } from 'svelte/transition'; import { cn } from '../../../utils/utils.js'; - type $$Props = DialogPrimitive.OverlayProps; + type $$Props = DialogPrimitive.OverlayProps; - let className: $$Props['class'] = undefined; - export let transition: $$Props['transition'] = fade; - export let transitionConfig: $$Props['transitionConfig'] = { - duration: 150, - }; - export { className as class }; + let className: $$Props['class'] = undefined; + export let transition: $$Props['transition'] = fade; + export let transitionConfig: $$Props['transitionConfig'] = { + duration: 150, + }; + export {className as class}; From 0e46145c91e5ef248d9af6f95baff1c2af97187d Mon Sep 17 00:00:00 2001 From: Claire Olmstead Date: Mon, 28 Oct 2024 13:56:41 -0700 Subject: [PATCH 2/4] ... --- .../ui/accordion/accordion-trigger.svelte | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/shadcnComponents/ui/accordion/accordion-trigger.svelte b/src/lib/shadcnComponents/ui/accordion/accordion-trigger.svelte index b51e6f0..42d7ce1 100644 --- a/src/lib/shadcnComponents/ui/accordion/accordion-trigger.svelte +++ b/src/lib/shadcnComponents/ui/accordion/accordion-trigger.svelte @@ -3,24 +3,24 @@ import { Chevron } from '../../../../lib/assets'; import { cn } from '../../../utils/utils'; - type $$Props = AccordionPrimitive.TriggerProps; - type $$Events = AccordionPrimitive.TriggerEvents; + type $$Props = AccordionPrimitive.TriggerProps; + type $$Events = AccordionPrimitive.TriggerEvents; - let className: $$Props['class'] = undefined; - export let level: AccordionPrimitive.HeaderProps['level'] = 3; - export {className as class}; + let className: $$Props['class'] = undefined; + export let level: AccordionPrimitive.HeaderProps['level'] = 3; + export { className as class }; - svg]:rotate-180', className )} - {...$$restProps} - on:click - > - - - + {...$$restProps} + on:click + > + + + From 6d8ef43fecd47e87374d6dec290b24d0f14bf6fb Mon Sep 17 00:00:00 2001 From: Claire Olmstead Date: Mon, 28 Oct 2024 14:13:51 -0700 Subject: [PATCH 3/4] format --- .../ui/dialog/dialog-overlay.svelte | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/shadcnComponents/ui/dialog/dialog-overlay.svelte b/src/lib/shadcnComponents/ui/dialog/dialog-overlay.svelte index 9bfa7b8..36262c0 100644 --- a/src/lib/shadcnComponents/ui/dialog/dialog-overlay.svelte +++ b/src/lib/shadcnComponents/ui/dialog/dialog-overlay.svelte @@ -3,19 +3,19 @@ import { fade } from 'svelte/transition'; import { cn } from '../../../utils/utils.js'; - type $$Props = DialogPrimitive.OverlayProps; + type $$Props = DialogPrimitive.OverlayProps; - let className: $$Props['class'] = undefined; - export let transition: $$Props['transition'] = fade; - export let transitionConfig: $$Props['transitionConfig'] = { - duration: 150, - }; - export {className as class}; + let className: $$Props['class'] = undefined; + export let transition: $$Props['transition'] = fade; + export let transitionConfig: $$Props['transitionConfig'] = { + duration: 150, + }; + export { className as class }; From bf0c7194c067da44bc8d6f3fe8cf074df5aa1b6f Mon Sep 17 00:00:00 2001 From: Claire Olmstead Date: Mon, 28 Oct 2024 14:40:56 -0700 Subject: [PATCH 4/4] fix bits-ui in dependencies --- package.json | 2 +- scripts/package.cjs | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 780a99c..d5cb9e1 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,6 @@ "@sveltejs/vite-plugin-svelte": "^2.5.3", "@typescript-eslint/parser": "^8.8.0", "autoprefixer": "^10.4.13", - "bits-ui": "^0.21.16", "eslint": "^8.50.0", "eslint-config-prettier": "^9.0.0", "eslint-plugin-html": "^7.1.0", @@ -64,6 +63,7 @@ }, "dependencies": { "@storybook/addons": "^7.6.17", + "bits-ui": "^0.21.16", "clsx": "^2.1.1", "svelte": "^4.2.19", "tailwind-merge": "^2.5.2" diff --git a/scripts/package.cjs b/scripts/package.cjs index 418dd7d..ec1837d 100644 --- a/scripts/package.cjs +++ b/scripts/package.cjs @@ -31,9 +31,6 @@ rootPackage.style = { // Don't keep dev dependencies delete rootPackage['devDependencies']; -rootPackage.devDependencies = { - 'bits-ui': '^0.21.16', -}; // Write it out fs.writeFileSync(`${path.join(__dirname, '../dist', 'package.json')}`, JSON.stringify(rootPackage, null, 2), (err) => {