Skip to content

Commit fea7425

Browse files
wmertenswmertens
committed
wip crashes on web server build
1 parent 03dbc06 commit fea7425

File tree

24 files changed

+3342
-3404
lines changed

24 files changed

+3342
-3404
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/vite.config.ts‎

Lines changed: 11 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,17 @@ const isDuringVercelDeployment = Boolean(process.env.VERCEL)
2929
export default defineConfig(({ command, mode }): UserConfig => {
3030
return {
3131
plugins: [
32-
tailwindcss(),
32+
{
33+
name: 'spy',
34+
resolveId: {
35+
order: 'pre',
36+
handler: (...args) => {
37+
console.log('resolveId', ...args)
38+
},
39+
},
40+
},
3341
qwikCity({ trailingSlash: false }),
42+
tailwindcss(),
3443
qwikVite({
3544
devTools: {
3645
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/composables/use-badge-classes.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { twMerge } from 'tailwind-merge'
44
import clsx from 'clsx'
55
import type { IconProps } from 'flowbite-qwik-icons'
66
import { useFlowbiteThemable } from '~/components/FlowbiteThemable/composables/use-flowbite-themable'
7-
import { LinkProps } from '@builder.io/qwik-city'
7+
import type { LinkProps } from '@builder.io/qwik-city'
88

99
const defaultBadgeClasses = 'mr-2 px-2.5 py-0.5 rounded-sm flex items-center justify-center gap-1'
1010
const badgeLinkClasses = 'bg-blue-100 hover:bg-blue-200 text-blue-800 dark:text-blue-800 dark:hover:bg-blue-300'

‎packages/lib/src/components/Breadcrumb/BreadcrumbItem.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { PropsOf, Slot, component$, useComputed$, Component } from '@builder.io/
22
import { useBreadcrumbItemClasses } from './composables/use-breadcrumb-item-classes'
33
import type { IconProps } from 'flowbite-qwik-icons'
44
import { IconArrowRightOutline, IconHomeOutline } from 'flowbite-qwik-icons'
5-
import { LinkProps } from '@builder.io/qwik-city'
5+
import type { LinkProps } from '@builder.io/qwik-city'
66

77
type BreadcrumbItemProps = PropsOf<'a'> & {
88
home?: boolean
@@ -24,7 +24,7 @@ export const BreadcrumbItem = component$<BreadcrumbItemProps>(({ href, tag = 'a'
2424
(!!ArrowIcon ? (
2525
<ArrowIcon class="mx-1 h-3 w-3 text-gray-400 rtl:rotate-180" />
2626
) : (
27-
<IconArrowRightOutline class="ml-1 mr-2 h-3 w-3 text-gray-400 rtl:rotate-180" />
27+
<IconArrowRightOutline class="mr-2 ml-1 h-3 w-3 text-gray-400 rtl:rotate-180" />
2828
))}
2929
<TagComponent href={href} class={breadcrumbItemClasses.value}>
3030
{!!HomeIcon && <HomeIcon class="me-2.5 h-3 w-3 text-gray-400" />}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ButtonGradient, ButtonMonochromeGradient, ButtonSize, ButtonVariant } f
33
import { useButtonClasses } from '~/components/Button/composables/use-button-classes'
44
import { useButtonSpinner } from '~/components/Button/composables/use-button-spinner'
55
import { Spinner } from '~/components/Spinner/Spinner'
6-
import { Link, LinkProps } from '@builder.io/qwik-city'
6+
import { Link, type LinkProps } from '@builder.io/qwik-city'
77
import type { IconProps } from 'flowbite-qwik-icons'
88

99
export type ButtonProps = PropsOf<'button'> &

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ export const ButtonGroup: FunctionComponent<ButtonGroupProps> = ({ children, ...
3333
if (props.outline) {
3434
child.props['outline'] = true
3535
}
36-
child.props['class'] = child.immutableProps?.['class']
37-
? child.immutableProps['class'] + ' ' + positionClass[position]
38-
: positionClass[position]
36+
// hack for qwik v1, check if this works in v2
37+
const immutableProps = (child as unknown as { immutableProps: Record<string, unknown> } | undefined)?.immutableProps
38+
child.props.class = immutableProps?.class ? immutableProps.class + ' ' + positionClass[position] : positionClass[position]
3939

4040
components.push({
4141
id: index,

0 commit comments

Comments
 (0)