Skip to content

Commit d675bb2

Browse files
jcfauchetjcfauchet
authored
Merge pull request #241 from wmertens/upgrade-qwik
upgrade qwik etc
2 parents 03dbc06 + c9f2f61 commit d675bb2

File tree

37 files changed

+3418
-3490
lines changed

37 files changed

+3418
-3490
lines changed

‎apps/web/package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,36 +36,36 @@
3636
"rehype-parse": "^9.0.1",
3737
"rehype-sanitize": "^6.0.0",
3838
"rehype-stringify": "^10.0.1",
39-
"sharp": "^0.33.5",
39+
"sharp": "^0.34.2",
4040
"unified": "^11.0.5"
4141
},
4242
"devDependencies": {
43-
"@builder.io/partytown": "^0.10.3",
44-
"@builder.io/qwik": "1.5.7",
45-
"@builder.io/qwik-city": "1.5.7",
43+
"@builder.io/qwik": "1.14.1",
44+
"@builder.io/qwik-city": "1.14.1",
4645
"@modular-forms/qwik": "^0.29.1",
47-
"@tailwindcss/postcss": "^4.0.17",
48-
"@tailwindcss/vite": "^4.0.17",
49-
"@types/compression": "^1.7.5",
46+
"@qwik.dev/partytown": "^0.11.1",
47+
"@tailwindcss/postcss": "^4.1.8",
48+
"@tailwindcss/vite": "^4.1.8",
49+
"@types/compression": "^1.8.1",
5050
"@types/eslint": "^9.6.1",
51-
"@types/node": "^20.17.28",
52-
"@vitest/ui": "^3.0.9",
51+
"@types/node": "^22.15.30",
52+
"@vitest/ui": "^3.2.2",
5353
"chokidar": "^4.0.3",
5454
"compression": "^1.8.0",
55-
"dotenv": "^16.4.7",
56-
"eslint": "^9.23.0",
57-
"eslint-config-prettier": "^9.1.0",
55+
"dotenv": "^16.5.0",
56+
"eslint": "^9.28.0",
57+
"eslint-config-prettier": "^10.1.5",
5858
"flowbite-qwik": "workspace:*",
5959
"flowbite-qwik-icons": "^0.1.9",
60-
"postcss": "^8.5.3",
60+
"postcss": "^8.5.4",
6161
"prettier": "^3.5.3",
62-
"prettier-plugin-tailwindcss": "^0.6.11",
63-
"tailwindcss": "^4.0.17",
64-
"tsx": "^4.19.3",
65-
"typescript": "^5.8.2",
66-
"typescript-eslint": "^8.28.0",
67-
"vite": "^6.2.3",
62+
"prettier-plugin-tailwindcss": "^0.6.12",
63+
"tailwindcss": "^4.1.8",
64+
"tsx": "^4.19.4",
65+
"typescript": "^5.8.3",
66+
"typescript-eslint": "^8.33.1",
67+
"vite": "^6.3.5",
6868
"vite-tsconfig-paths": "^5.1.4",
69-
"vitest": "^3.0.9"
69+
"vitest": "^3.2.2"
7070
}
7171
}

‎apps/web/src/components/Partytown/Partytown.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// @ts-expect-error strange behaviour
2-
import { partytownSnippet, PartytownConfig } from '@builder.io/partytown/integration'
1+
import { partytownSnippet, PartytownConfig } from '@qwik.dev/partytown/integration'
32

43
export const QwikPartytown = (props: PartytownConfig) => <script dangerouslySetInnerHTML={partytownSnippet(props)} />

‎apps/web/src/components/Preview/Preview.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type PreviewDisplaySize = 'mobile' | 'tablet' | 'desktop'
1717

1818
const liveDir = 'https://github.com/qwikerx/flowbite-qwik/tree/main/apps/web/src/routes'
1919

20-
export const Preview = component$<PreviewProps>(({ url, class: classNames, height = 200, title, codeContent, ...props }) => {
20+
export const Preview = component$<PreviewProps>(({ url, class: classNames, height = 200, title, codeContent, ...rest }) => {
2121
useStyles$(styles)
2222

2323
const { isDark } = useDarkMode()
@@ -49,7 +49,7 @@ export const Preview = component$<PreviewProps>(({ url, class: classNames, heigh
4949
#
5050
</Link>
5151
</Heading>
52-
{props.description && <p class="mb-8 text-gray-600 dark:text-gray-400">{props.description}</p>}
52+
{rest.description && <p class="mb-8 text-gray-600 dark:text-gray-400">{rest.description}</p>}
5353
<div class="relative flex w-full justify-between rounded-t-xl border border-gray-200 bg-gray-50 p-4 dark:border-gray-600 dark:bg-gray-700">
5454
<Button
5555
color="light"
@@ -151,7 +151,7 @@ export const Preview = component$<PreviewProps>(({ url, class: classNames, heigh
151151
},
152152
]}
153153
>
154-
<iframe loading="lazy" ref={iframe} src={iframeSrc.value} height={height} {...props} title={title} class={['w-full', classNames]} />
154+
<iframe loading="lazy" ref={iframe} src={iframeSrc.value} height={height} {...rest} title={title} class={['w-full', classNames]} />
155155
</div>
156156
</div>
157157

‎apps/web/src/generated-examples.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1630,7 +1630,7 @@ export const examples: Record<string, Example[]> = {
16301630
description: 'Customize the pagination buttons by passing a custom button component.',
16311631
url: '/examples/[theme-rtl]/pagination/07-with-custom-button',
16321632
content:
1633-
"import { component$, useSignal, Slot } from '@builder.io/qwik'\nimport { Pagination, PaginationButtonProps } from 'flowbite-qwik'\n\nconst CustomButton = component$<PaginationButtonProps>(({ active, ...props }) => {\n return (\n <button\n type=\"button\"\n class={[\n 'h-10 w-12 border border-gray-300 bg-white py-2 leading-tight text-gray-500 enabled:hover:bg-gray-100 enabled:hover:text-gray-700 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:enabled:hover:bg-gray-700 dark:enabled:hover:text-white',\n {\n 'bg-orange-500 text-white hover:bg-orange-600 hover:text-white dark:bg-orange-500 dark:text-white dark:hover:bg-orange-600 dark:hover:text-white':\n active,\n },\n ]}\n {...props}\n >\n <Slot />\n </button>\n )\n})\nexport default component$(() => {\n const currentPage = useSignal(1)\n\n return (\n <>\n <div class=\"flex gap-3 p-3 text-center\">\n <Pagination totalPages={100} currentPage={currentPage} paginationButton={CustomButton} />\n </div>\n </>\n )\n})",
1633+
"import { component$, useSignal, Slot } from '@builder.io/qwik'\nimport { Pagination, PaginationButtonProps } from 'flowbite-qwik'\n\nconst CustomButton = component$<PaginationButtonProps>(({ active, ...rest }) => {\n return (\n <button\n type=\"button\"\n class={[\n 'h-10 w-12 border border-gray-300 bg-white py-2 leading-tight text-gray-500 enabled:hover:bg-gray-100 enabled:hover:text-gray-700 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:enabled:hover:bg-gray-700 dark:enabled:hover:text-white',\n {\n 'bg-orange-500 text-white hover:bg-orange-600 hover:text-white dark:bg-orange-500 dark:text-white dark:hover:bg-orange-600 dark:hover:text-white':\n active,\n },\n ]}\n {...rest}\n >\n <Slot />\n </button>\n )\n})\nexport default component$(() => {\n const currentPage = useSignal(1)\n\n return (\n <>\n <div class=\"flex gap-3 p-3 text-center\">\n <Pagination totalPages={100} currentPage={currentPage} paginationButton={CustomButton} />\n </div>\n </>\n )\n})",
16341634
height: '150',
16351635
},
16361636
],

‎apps/web/src/routes/examples/[theme-rtl]/pagination/07-with-custom-button/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { staticGenerateHandler } from '~/routes/examples/layout'
99
import { StaticGenerateHandler } from '@builder.io/qwik-city'
1010
import { Pagination, PaginationButtonProps } from 'flowbite-qwik'
1111

12-
const CustomButton = component$<PaginationButtonProps>(({ active, ...props }) => {
12+
const CustomButton = component$<PaginationButtonProps>(({ active, ...rest }) => {
1313
return (
1414
<button
1515
type="button"
@@ -20,7 +20,7 @@ const CustomButton = component$<PaginationButtonProps>(({ active, ...props }) =>
2020
active,
2121
},
2222
]}
23-
{...props}
23+
{...rest}
2424
>
2525
<Slot />
2626
</button>

‎apps/web/vite.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import tsconfigPaths from 'vite-tsconfig-paths'
99
// @ts-ignore
1010
import pkg from './package.json'
1111
import { watchExamplesRoutes, watchDocsRoutes } from './vite-plugin'
12-
import { partytownVite } from '@builder.io/partytown/utils'
12+
import { partytownVite } from '@qwik.dev/partytown/utils'
1313
import { join } from 'path'
1414
// @ts-ignore
1515
import tailwindcss from '@tailwindcss/vite'
@@ -29,8 +29,8 @@ const isDuringVercelDeployment = Boolean(process.env.VERCEL)
2929
export default defineConfig(({ command, mode }): UserConfig => {
3030
return {
3131
plugins: [
32-
tailwindcss(),
3332
qwikCity({ trailingSlash: false }),
33+
tailwindcss(),
3434
qwikVite({
3535
devTools: {
3636
clickToSource: false,

‎package.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
"author": "",
2323
"license": "",
2424
"devDependencies": {
25-
"@typescript-eslint/eslint-plugin": "^8.28.0",
26-
"@typescript-eslint/parser": "^7.18.0",
25+
"@typescript-eslint/eslint-plugin": "^8.33.1",
26+
"@typescript-eslint/parser": "^8.33.1",
2727
"husky": "^9.1.7",
28-
"typescript": "^5.8.2"
28+
"typescript": "^5.8.3"
2929
},
3030
"dependencies": {
3131
"npm-run-all": "^4.1.5",
32-
"vitest": "^3.0.9"
33-
}
32+
"vitest": "^3.2.2"
33+
},
34+
"packageManager": "pnpm@9.15.5+sha512.845196026aab1cc3f098a0474b64dfbab2afe7a1b4e91dd86895d8e4aa32a7a6d03049e2d0ad770bbe4de023a7122fb68c1a1d6e0d033c7076085f9d5d4800d4"
3435
}

‎packages/cli/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
],
2828
"devDependencies": {
2929
"@types/eslint": "^9.6.1",
30-
"@types/node": "^20.17.28",
31-
"eslint": "^9.23.0",
32-
"typescript": "^5.8.2",
33-
"typescript-eslint": "^8.28.0",
34-
"vite": "^6.2.3"
30+
"@types/node": "^22.15.30",
31+
"eslint": "^9.28.0",
32+
"typescript": "^5.8.3",
33+
"typescript-eslint": "^8.33.1",
34+
"vite": "^6.3.5"
3535
},
3636
"dependencies": {
37-
"@clack/prompts": "^0.10.0",
37+
"@clack/prompts": "^0.11.0",
3838
"identify-monorepo-root": "^1.0.9",
3939
"prettier": "^3.5.3"
4040
}

‎packages/lib/package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -66,30 +66,30 @@
6666
"flowbite-qwik-icons": "^0.1.9"
6767
},
6868
"devDependencies": {
69-
"@builder.io/qwik": "1.5.7",
70-
"@builder.io/qwik-city": "1.5.7",
71-
"@floating-ui/dom": "^1.6.13",
72-
"@tailwindcss/postcss": "^4.0.17",
73-
"@tailwindcss/vite": "^4.0.17",
69+
"@builder.io/qwik": "1.14.1",
70+
"@builder.io/qwik-city": "1.14.1",
71+
"@floating-ui/dom": "^1.7.1",
72+
"@tailwindcss/postcss": "^4.1.8",
73+
"@tailwindcss/vite": "^4.1.8",
7474
"@types/eslint": "^9.6.1",
75-
"@types/node": "^20.17.28",
76-
"@vitest/coverage-v8": "^3.0.9",
75+
"@types/node": "^22.15.30",
76+
"@vitest/coverage-v8": "^3.2.2",
7777
"clsx": "^2.1.1",
78-
"eslint": "^9.23.0",
79-
"eslint-config-prettier": "^9.1.0",
80-
"lint-staged": "^15.5.0",
78+
"eslint": "^9.28.0",
79+
"eslint-config-prettier": "^10.1.5",
80+
"lint-staged": "^16.1.0",
8181
"np": "^10.2.0",
82-
"postcss": "^8.5.3",
82+
"postcss": "^8.5.4",
8383
"prettier": "^3.5.3",
84-
"prettier-plugin-tailwindcss": "^0.6.11",
85-
"tsc-alias": "^1.8.13",
86-
"tsx": "^4.19.3",
87-
"tailwind-merge": "^3.1.0",
88-
"tailwindcss": "^4.0.17",
89-
"typescript": "^5.8.2",
90-
"typescript-eslint": "^8.28.0",
91-
"vite": "^6.2.3",
84+
"prettier-plugin-tailwindcss": "^0.6.12",
85+
"tailwind-merge": "^3.3.0",
86+
"tailwindcss": "^4.1.8",
87+
"tsc-alias": "^1.8.16",
88+
"tsx": "^4.19.4",
89+
"typescript": "^5.8.3",
90+
"typescript-eslint": "^8.33.1",
91+
"vite": "^6.3.5",
9292
"vite-tsconfig-paths": "^5.1.4",
93-
"vitest": "^3.0.9"
93+
"vitest": "^3.2.2"
9494
}
9595
}

‎packages/lib/src/components/Badge/Badge.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ import { component$ } from '@builder.io/qwik'
22
import { BadgeClassesProps, useBadgeClasses } from './composables/use-badge-classes'
33
import { IconCloseOutline } from 'flowbite-qwik-icons'
44

5-
export const Badge = component$<BadgeClassesProps>(({ icon: Icon, tag = 'a', onClose$, ...props }) => {
6-
const { badgeClasses, badgeChipsClasses } = useBadgeClasses(props)
5+
export const Badge = component$<BadgeClassesProps>(({ icon: Icon, tag = 'a', onClose$, ...rest }) => {
6+
const { badgeClasses, badgeChipsClasses } = useBadgeClasses(rest)
77

88
const LinkComponent = tag !== 'a' ? tag : 'a'
9-
const BadgeComponent = props.href ? LinkComponent : 'span'
9+
const BadgeComponent = rest.href ? LinkComponent : 'span'
1010

1111
return (
12-
<BadgeComponent {...props} class={badgeClasses.value}>
12+
<BadgeComponent {...rest} class={badgeClasses.value}>
1313
{!!Icon && <Icon />}
14-
{props.content}
14+
{rest.content}
1515

16-
{props.chips && (
16+
{rest.chips && (
1717
<button onClick$={onClose$} type="button" class={badgeChipsClasses.value} aria-label="Remove">
18-
<IconCloseOutline class="w-2 h-2" />
18+
<IconCloseOutline class="h-2 w-2" />
1919
<span class="sr-only">Remove badge</span>
2020
</button>
2121
)}

0 commit comments

Comments
 (0)