Skip to content

Commit 5e5c7d8

Browse files
committed
Merge branch 'main' into pr-fluffy-experiment
2 parents 97b3840 + 189bd8b commit 5e5c7d8

File tree

151 files changed

+10859
-18514
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+10859
-18514
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Build
22
dist
3-
lib
43
lib-types
54
/server
65

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ dist
66
node_modules
77
coverage
88
**/*.mdx
9-
discussion
9+
discussion
10+
pnpm-lock.yaml

.prettierrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"semi": true,
33
"singleQuote": true,
4-
"trailingComma": "none",
4+
"trailingComma": "all",
55
"printWidth": 90,
66
"plugins": ["prettier-plugin-tailwindcss"]
77
}

.vscode/qwik.code-snippets

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,12 @@
5656
"scope": "javascriptreact,typescriptreact",
5757
"prefix": "quseTask$",
5858
"description": "useTask$() function hook",
59-
"body": [
60-
"useTask$(({ track }) => {",
61-
" track(() => $1);",
62-
" $0",
63-
"});",
64-
""
65-
]
59+
"body": ["useTask$(({ track }) => {", " track(() => $1);", " $0", "});", ""]
6660
},
6761
"useResource": {
6862
"scope": "javascriptreact,typescriptreact",
6963
"prefix": "quseResource$",
7064
"description": "useResource$() declaration",
71-
"body": [
72-
"const $1 = useResource$(({ track, cleanup }) => {",
73-
" $0",
74-
"});",
75-
""
76-
]
65+
"body": ["const $1 = useResource$(({ track, cleanup }) => {", " $0", "});", ""]
7766
}
7867
}

apps/website/adapters/cloudflare-pages/vite.config.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ export default extendConfig(baseConfig, () => {
77
build: {
88
ssr: true,
99
rollupOptions: {
10-
input: [
11-
'apps/website/src/entry.cloudflare-pages.tsx',
12-
'@qwik-city-plan',
13-
],
10+
input: ['apps/website/src/entry.cloudflare-pages.tsx', '@qwik-city-plan'],
1411
},
1512
},
1613
plugins: [

apps/website/src/_state/component-status.type.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ export enum ComponentStatus {
22
Ready = 'Ready',
33
Beta = 'Beta',
44
Draft = 'Draft',
5-
Planned = 'Planned'
5+
Planned = 'Planned',
66
}

apps/website/src/_state/component-statuses.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,17 @@ export const statusByComponent: ComponentKitsStatuses = {
3636
Tabs: ComponentStatus.Planned,
3737
Toast: ComponentStatus.Planned,
3838
Toggle: ComponentStatus.Planned,
39-
Tooltip: ComponentStatus.Planned
39+
Tooltip: ComponentStatus.Planned,
4040
},
4141
headless: {
4242
Accordion: ComponentStatus.Beta,
43-
Autocomplete: ComponentStatus.Draft,
4443
Carousel: ComponentStatus.Planned,
44+
Combobox: ComponentStatus.Draft,
4545
Popover: ComponentStatus.Draft,
4646
Select: ComponentStatus.Draft,
47+
Separator: ComponentStatus.Beta,
4748
Tabs: ComponentStatus.Beta,
4849
Toggle: ComponentStatus.Planned,
49-
Tooltip: ComponentStatus.Draft
50-
}
50+
Tooltip: ComponentStatus.Draft,
51+
},
5152
};

apps/website/src/_state/status-tooltips.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ export const tooltipByStatus = {
66
'This component is ready for production, but the API might change.',
77
[ComponentStatus.Draft]:
88
'This component is still in development and may have bugs or missing features.',
9-
[ComponentStatus.Planned]: 'This component is planned for development.'
9+
[ComponentStatus.Planned]: 'This component is planned for development.',
1010
};

apps/website/src/constants.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { createContextId } from '@builder.io/qwik';
22
import { OldAppState } from './types';
33

4-
export const OLD_APP_STATE_CONTEXT_ID =
5-
createContextId<OldAppState>('app_state');
4+
export const OLD_APP_STATE_CONTEXT_ID = createContextId<OldAppState>('app_state');

apps/website/src/entry.ssr.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
* - npm run build
1111
*
1212
*/
13-
import {
14-
renderToStream,
15-
type RenderToStreamOptions,
16-
} from '@builder.io/qwik/server';
13+
import { renderToStream, type RenderToStreamOptions } from '@builder.io/qwik/server';
1714
import { manifest } from '@qwik-client-manifest';
1815
import Root from './root';
1916

0 commit comments

Comments
 (0)