Skip to content

Commit

Permalink
Merge branch 'main' into storybook
Browse files Browse the repository at this point in the history
  • Loading branch information
iva2k committed Jul 22, 2024
2 parents 2d3b592 + 114e968 commit f6ab606
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 16 deletions.
16 changes: 9 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,19 +205,20 @@ Currently there are no plans to implement additional frameworks (either listed b

Note that there are 2 branches for Isolated component development - Histoire and Storybook, which can be merged into UI branch of choice for your app.

<!-- markdownlint-disable MD033 -->
<!-- prettier-ignore -->
| Git Branch | UI Framework | Dark Theme | Svelte 5 | Notes [Legend: ⬤ Yes / ⭘ No ] |
|-|-|:-:|:-:|-|
| main | (none) ||| |
| [histoire](../../tree/histoire) | (none) || | Isolated component development. `pnpm story:build` fails (w/Svelte 5). |
| [storybook](../../tree/storybook) | (none) || | Isolated component development. |
| [ui-agnostic](../../tree/ui-agnostic) | [AgnosticUI](https://github.com/AgnosticUI/agnosticui) ||| Worked with Svelte 5 next.41|
| [ui-bootstrap](../../tree/ui-bootstrap) | [Bootstrap](https://github.com/twbs/bootstrap) ||| [Sveltestrap](https://github.com/sveltestrap/sveltestrap), Themes from [Bootswatch](https://github.com/thomaspark/bootswatch). `pnpm check` fails (w/Svelte 5). [[sveltestrap#79]](https://github.com/sveltestrap/sveltestrap/issues/79) |
| [ui-bulma](../../tree/ui-bulma) | [Bulma](https://bulma.io/) ||| |
| [ui-carbon](../../tree/ui-carbon) | [Carbon](https://carbon-components-svelte.onrender.com/) || | |
| [histoire](../../tree/histoire) | (none) || | Isolated component development. |
| [storybook](../../tree/storybook) | (none) || | Isolated component development. |
| [ui-agnostic](../../tree/ui-agnostic) | [AgnosticUI](https://github.com/AgnosticUI/agnosticui) ||| |
| [ui-bootstrap](../../tree/ui-bootstrap) | [Bootstrap](https://github.com/twbs/bootstrap) ||| [Sveltestrap](https://github.com/sveltestrap/sveltestrap), Themes from [Bootswatch](https://github.com/thomaspark/bootswatch).<br>⭘ [[sveltestrap#79]](https://github.com/sveltestrap/sveltestrap/issues/79) |
| [ui-bulma](../../tree/ui-bulma) | [Bulma](https://bulma.io/) ||| |
| [ui-carbon](../../tree/ui-carbon) | [Carbon](https://carbon-components-svelte.onrender.com/) || | |
| [ui-framework7](../../tree/ui-framework7) | [Framework7](https://framework7.io/svelte/introduction.html) ||| |
| [ui-shoelace](../../tree/ui-shoelace) | [Shoelace](https://shoelace.style/) ||| |
| [ui-svelteui](../../tree/ui-svelteui) | [SvelteUI](https://www.svelteui.org) ||| [[svelteuidev#491]](https://github.com/svelteuidev/svelteui/issues/491) |
| [ui-svelteui](../../tree/ui-svelteui) | [SvelteUI](https://www.svelteui.org) ||| [[svelteuidev#491]](https://github.com/svelteuidev/svelteui/issues/491) |
| [ui-tailwindcss](../../tree/ui-tailwindcss) | [TailwindCSS](https://tailwindcss.com) | | | May use components, e.g. [Flowbite](https://flowbite.com/docs/getting-started/introduction/) |
| [ui-konsta](../../tree/ui-konsta) | [Konsta](https://konstaui.com/svelte) || | (Requires TailwindCSS) |
| | [svelte-ux](https://svelte-ux.techniq.dev) | | | (Requires TailwindCSS) |
Expand All @@ -234,6 +235,7 @@ Note that there are 2 branches for Isolated component development - Histoire and
| | [Melt UI](https://melt-ui.com) | | | |
| | [Bits UI](https://bits-ui.com) | | | |
| | [shadcn-svelte](https://www.shadcn-svelte.com) | | | |
<!-- markdownlint-enable MD033 -->

## Conclusion

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"globals": "^15.8.0",
"minimist": "^1.2.8",
"object-hash": "^3.0.0",
"pnpm": "^9.5.0",
"pnpm": "^9.6.0",
"postcss": "^8.4.39",
"postcss-cli": "^11.0.0",
"postcss-html": "^1.7.0",
Expand Down Expand Up @@ -170,10 +170,10 @@
"workbox-routing": "^7.1.0",
"workbox-window": "^7.1.0"
},
"packageManager": "pnpm@9.5.0",
"packageManager": "pnpm@9.6.0",
"engines": {
"npm": ">=7.0.0",
"pnpm": ">=8.14.0",
"pnpm": ">=9.0.0",
"node": ">=20.0.0"
},
"type": "module",
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion scripts/git-run-all-in-branches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export TARGET_BRANCHES=(
"main"
"storybook"
"ui-bulma"
"ui-carbon"
"ui-shoelace"
"ui-svelteui"
"ui-tailwindcss"
Expand All @@ -50,7 +51,6 @@ export BROKEN_TARGET_BRANCHES=(
"histoire" # `pnpm story:build`: CompileError: The $ name is reserved, and cannot be used for variables and imports
"ui-agnostic" # `pnpm build`: CompileError: Declaring or accessing a prop starting with `$$` is illegal ($$props.$$slots)
"ui-bootstrap" # `pnpm check`: Error: Argument of type 'typeof Col' is not assignable to parameter of type 'ConstructorOfATypedSvelteComponent'.
"ui-carbon" # `pnpm build:base`: "Error: The 'swSrc' file can't be read. ENOENT: no such file or directory"
"ui-framework7" # `pnpm build:base`: "Error: The 'swSrc' file can't be read. ENOENT: no such file or directory" - service worker build fails, probably due to all components not compatible with Svelte 5, buncho "ARIA role" issues, etc.
"ui-konsta" # `pnpm check`: Error: Argument of type 'typeof App' is not assignable to parameter of type 'ConstructorOfATypedSvelteComponent'.
)
Expand Down

0 comments on commit f6ab606

Please sign in to comment.