Skip to content

Commit a53fa4b

Browse files
JerryWu1234JerryWu1234
authored
Merge branch 'main' into 7313_filter_file
2 parents 4a89d5a + 0b2971f commit a53fa4b

File tree

54 files changed

+745
-762
lines changed

Some content is hidden

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

54 files changed

+745
-762
lines changed

‎.changeset/approach-bed-gift.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@builder.io/qwik': patch
3+
---
4+
5+
🐞 🩹 The qwik-city ServiceWorkerRegister and qwik PrefetchServiceWorker now prefetch all their qrls to prevent under-prefetching

‎.changeset/selfish-shirts-cover.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@builder.io/qwik': patch
3+
---
4+
5+
fix: set default value of lint to false to improve the execution performance

‎.changeset/tall-paint-help.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@builder.io/qwik-city': patch
3+
---
4+
5+
fix: Write Response object in the send request event even on redirects

‎.changeset/tasty-ghosts-shout.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@builder.io/qwik': patch
3+
---
4+
5+
FIX: manual QRL grouping now works again. This is needed for Insights to work.

‎e2e/qwik-cli-e2e/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "qwik-cli-e2e",
3+
"version": "0.0.0",
34
"dependencies": {
45
"kleur": "4.1.5"
56
},

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@
111111
"@builder.io/partytown": "0.10.2",
112112
"@builder.io/qwik": "workspace:^",
113113
"@builder.io/qwik-city": "workspace:^",
114-
"@changesets/cli": "2.27.7",
114+
"@changesets/cli": "2.28.1",
115115
"@changesets/get-github-info": "0.6.0",
116-
"@changesets/types": "6.0.0",
116+
"@changesets/types": "6.1.0",
117117
"@clack/prompts": "0.7.0",
118118
"@eslint/eslintrc": "3.1.0",
119119
"@mdx-js/mdx": "3.0.1",

‎packages/docs/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@builder.io/qwik-labs": "workspace:^",
1414
"@builder.io/qwik-react": "workspace:^",
1515
"@builder.io/sdk-qwik": "0.14.31",
16-
"@docsearch/css": "3.6.1",
16+
"@docsearch/css": "3.9.0",
1717
"@emotion/react": "11.13.0",
1818
"@emotion/styled": "11.13.0",
1919
"@modular-forms/qwik": "0.23.1",
@@ -29,13 +29,11 @@
2929
"@unpic/core": "0.0.42",
3030
"@unpic/qwik": "0.0.38",
3131
"algoliasearch": "4.16.0",
32-
"autoprefixer": "10.4.19",
3332
"fflate": "0.8.2",
3433
"gray-matter": "4.0.3",
3534
"leaflet": "1.9.4",
3635
"magic-string": "0.30.11",
3736
"openai": "3.3.0",
38-
"postcss": "8.4.39",
3937
"prettier": "3.3.3",
4038
"prism-themes": "1.9.0",
4139
"prismjs": "1.29.0",
@@ -44,13 +42,15 @@
4442
"react": "18.3.1",
4543
"react-dom": "18.3.1",
4644
"snarkdown": "2.0.0",
47-
"tailwindcss": "3.4.6",
45+
"tailwindcss": "4.0.12",
46+
"@tailwindcss/vite": "4.0.12",
4847
"terser": "5.31.3",
4948
"tsm": "2.3.0",
5049
"typescript": "5.4.5",
5150
"undici": "*",
5251
"valibot": "0.33.3",
5352
"vite": "5.3.5",
53+
"vite-tsconfig-paths": "4.3.2",
5454
"vite-plugin-inspect": "0.8.5",
5555
"shiki": "3.1.0",
5656
"@shikijs/rehype": "3.1.0",

‎packages/docs/postcss.config.js

-6
This file was deleted.

‎packages/docs/src/components/docsearch/doc-search.css

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* @import '../../../node_modules/@docsearch/css/dist/style.css'; */
12
@import '@docsearch/css';
23

34
.docsearch {

‎packages/docs/src/components/header/header.css

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@reference "tailwindcss";
2+
13
.header-container {
24
height: var(--header-height);
35
background: var(--bg-color);

‎packages/docs/src/components/on-this-page/on-this-page.css

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@reference "tailwindcss";
2+
13
.on-this-page {
24
@apply py-8 pt-10;
35
@apply text-base;

‎packages/docs/src/components/package-manager-tabs/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ const CopyButton = component$(() => {
9898
return (
9999
<button
100100
onClick$={copyToClipboard$}
101-
class="px-5 rounded absolute right-0 top-0 text-white h-full group"
101+
class="px-5 rounded-sm absolute right-0 top-0 text-white h-full group"
102102
aria-label={isClickedSig.value ? 'Copied to clipboard' : 'Copy to clipboard'}
103103
title={isClickedSig.value ? 'Copied!' : 'Copy to clipboard'}
104104
>

‎packages/docs/src/components/sidebar/sidebar.css

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@reference "tailwindcss";
2+
13
.sidebar {
24
@apply hidden lg:block;
35

‎packages/docs/src/global.css

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
@import 'tailwindcss';
2+
3+
@theme {
4+
--color-interactive-blue: '#009dfd';
5+
}
6+
17
/* latin */
28
@font-face {
39
font-family: 'Poppins';
@@ -43,10 +49,6 @@
4349
text-shadow: none;
4450
}
4551

46-
@tailwind base;
47-
@tailwind components;
48-
@tailwind utilities;
49-
5052
* {
5153
-webkit-tap-highlight-color: transparent;
5254
-webkit-touch-callout: none;
@@ -273,7 +275,7 @@ body {
273275

274276
.menu-open .menu a:hover {
275277
@apply bg-transparent;
276-
color: rgb(241 245 249 / var(--tw-text-opacity)) !important;
278+
color: rgb(241 245 249) !important;
277279
}
278280
}
279281
@media (min-width: 1024px) {

‎packages/docs/src/repl/repl.css

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@tailwind components;
1+
@reference "tailwindcss";
22

33
.repl {
44
color: var(--text-color);
@@ -207,13 +207,11 @@
207207
white-space: pre-wrap;
208208
}
209209

210-
@layer components {
211-
.sm-grid-column {
212-
grid-template-columns: 100%;
213-
}
214-
.md-grid-column {
215-
grid-template-columns: minmax(200px, 25%) auto;
216-
}
210+
@utility sm-grid-column {
211+
grid-template-columns: 100%;
212+
}
213+
@utility md-grid-column {
214+
grid-template-columns: minmax(200px, 25%) auto;
217215
}
218216

219217
.output-modules {

‎packages/docs/src/root.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ export default component$(() => {
5555
<meta charset="utf-8" />
5656
<script dangerouslySetInnerHTML={uwu} />
5757
<RouterHead />
58+
5859
<ServiceWorkerRegister />
5960

6061
<script dangerouslySetInnerHTML={`(${collectSymbols})()`} />
@@ -68,7 +69,6 @@ export default component$(() => {
6869
>
6970
<RouterOutlet />
7071
<RealMetricsOptimization builderApiKey={BUILDER_PUBLIC_API_KEY} />
71-
{/* Core Web Vitals experiment until November 8: Do not bring back any SW until then! Reach out to @maiieul first if you believe you have a good reason to change this. */}
7272
</body>
7373
</QwikCityProvider>
7474
);

‎packages/docs/src/routes/(blog)/blog/(articles)/framer-motion-qwik/index.mdx

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ const MyComponent = () => {
6363
backgroundColor: ['#ff008c', '#d309e1', '#9c1aff', '#7700ff', '#ff008c'],
6464
transition: { duration: 2 },
6565
}}
66-
className="h-52 w-52 rounded bg-green-500"
66+
className="h-52 w-52 rounded-sm bg-green-500"
6767
/>
6868
);
6969
};
@@ -92,7 +92,7 @@ const MyComponent = () => (
9292
backgroundColor: ['#ff008c', '#d309e1', '#9c1aff', '#7700ff', '#ff008c'],
9393
transition: { duration: 2 },
9494
}}
95-
className="h-52 w-52 rounded bg-green-500"
95+
className="h-52 w-52 rounded-sm bg-green-500"
9696
/>
9797
);
9898

‎packages/docs/src/routes/(blog)/blog/components/articles-grid.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const ArticlesGrid = component$(() => {
99
{blogArticles.map((post, key) => (
1010
<article
1111
key={key}
12-
class="group rounded-xl overflow-hidden shadow-sm hover:shadow-xl transition-shadow duration-300 cursor-pointer z-10"
12+
class="group rounded-xl overflow-hidden shadow-xs hover:shadow-xl transition-shadow duration-300 cursor-pointer z-10"
1313
>
1414
<a href={post.path}>
1515
<div class="relative h-48 overflow-hidden">

‎packages/docs/src/routes/(blog)/blog/components/featured-article.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const FeaturedArticle = component$(() => {
3232
{blogArticles[0].tags.map((tag, key) => (
3333
<span
3434
key={key}
35-
class="mb-4 px-3 py-1 mr-2 text-xs text-[#0e201a] bg-white rounded-full backdrop-blur-sm"
35+
class="mb-4 px-3 py-1 mr-2 text-xs text-[#0e201a] bg-white rounded-full backdrop-blur-xs"
3636
>
3737
{tag}
3838
</span>

‎packages/docs/src/routes/(ecosystem)/ecosystem.css

+5
Original file line numberDiff line numberDiff line change
@@ -252,3 +252,8 @@
252252
[data-theme='dark'] [alt='Twitter'] {
253253
filter: invert(1);
254254
}
255+
256+
.custom-grid-cols-240px-1fr-tailwind-workaround {
257+
/* temporary workaround .grid-cols-\[240px\,1fr\] is not currently working in tailwind */
258+
grid-template-columns: 240px 1fr;
259+
}

‎packages/docs/src/routes/(ecosystem)/ecosystem/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export default component$(() => {
2323

2424
return (
2525
<>
26-
<div class="ecosystem lg:grid grid-cols-[240px,1fr] m-auto max-w-screen-xl gap-8">
26+
<div class="ecosystem lg:grid grid-cols-[240px,1fr] m-auto max-w-screen-xl gap-8 custom-grid-cols-240px-1fr-tailwind-workaround">
2727
<EcosystemMenu />
2828
<MobileEcosystemMenu />
2929

‎packages/docs/src/routes/(ecosystem)/media/media.css

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@reference "tailwindcss";
2+
13
.media {
24
margin: 10px auto;
35
padding: 0 20px;
@@ -100,5 +102,5 @@
100102
}
101103

102104
.info-bg {
103-
@apply uppercase text-white bg-black bg-opacity-40 backdrop-blur-md px-1 rounded-md;
105+
@apply uppercase text-white bg-black/40 backdrop-blur-md px-1 rounded-md;
104106
}

‎packages/docs/src/routes/api/api.css

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@reference "tailwindcss";
2+
13
.docs.api h1:not(.overview) {
24
font-size: 2rem;
35
}

‎packages/docs/src/routes/api/qwik-optimizer/api.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@
406406
}
407407
],
408408
"kind": "Interface",
409-
"content": "```typescript\nexport interface QwikBundle \n```\n\n\n<table><thead><tr><th>\n\nProperty\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[dynamicImports?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\\[\\]\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[imports?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\\[\\]\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[isTask?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nboolean\n\n\n</td><td>\n\n_(Optional)_ Not precise, but an indication of whether this import may be a task\n\n\n</td></tr>\n<tr><td>\n\n[origins?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\\[\\]\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[size](#)\n\n\n</td><td>\n\n\n</td><td>\n\nnumber\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[symbols?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\\[\\]\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n</tbody></table>",
409+
"content": "```typescript\nexport interface QwikBundle \n```\n\n\n<table><thead><tr><th>\n\nProperty\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[dynamicImports?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\\[\\]\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[hasSymbols?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nboolean\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[imports?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\\[\\]\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[origins?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\\[\\]\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[size](#)\n\n\n</td><td>\n\n\n</td><td>\n\nnumber\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[symbols?](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring\\[\\]\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n</tbody></table>",
410410
"editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/optimizer/src/types.ts",
411411
"mdFile": "qwik.qwikbundle.md"
412412
},

‎packages/docs/src/routes/api/qwik-optimizer/index.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1320,13 +1320,13 @@ _(Optional)_
13201320
</td></tr>
13211321
<tr><td>
13221322

1323-
[imports?](#)
1323+
[hasSymbols?](#)
13241324

13251325
</td><td>
13261326

13271327
</td><td>
13281328

1329-
string[]
1329+
boolean
13301330

13311331
</td><td>
13321332

@@ -1335,17 +1335,17 @@ _(Optional)_
13351335
</td></tr>
13361336
<tr><td>
13371337

1338-
[isTask?](#)
1338+
[imports?](#)
13391339

13401340
</td><td>
13411341

13421342
</td><td>
13431343

1344-
boolean
1344+
string[]
13451345

13461346
</td><td>
13471347

1348-
_(Optional)_ Not precise, but an indication of whether this import may be a task
1348+
_(Optional)_
13491349

13501350
</td></tr>
13511351
<tr><td>

‎packages/docs/src/routes/demo/cookbook/drag&drop/advanced/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default component$(() => {
2222
<div class="flex min-h-screen justify-center gap-8 bg-gray-50 p-8">
2323
<div
2424
data-dropzone
25-
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-sm transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
25+
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-xs transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
2626
preventdefault:dragover
2727
preventdefault:drop
2828
onDragOver$={sync$((_: DragEvent, currentTarget: HTMLDivElement) => {
@@ -100,7 +100,7 @@ export default component$(() => {
100100
</div>
101101

102102
<div
103-
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-sm transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
103+
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-xs transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
104104
data-dropzone
105105
preventdefault:dragover
106106
preventdefault:drop

‎packages/docs/src/routes/demo/cookbook/drag&drop/basic/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default component$(() => {
1616
return (
1717
<div class="flex min-h-screen justify-center gap-8 bg-gray-50 p-8">
1818
<div
19-
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-sm transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
19+
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-xs transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
2020
preventdefault:dragover
2121
preventdefault:drop
2222
onDragOver$={sync$((_: DragEvent, currentTarget: HTMLDivElement) => {
@@ -66,7 +66,7 @@ export default component$(() => {
6666
</div>
6767

6868
<div
69-
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-sm transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
69+
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-xs transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
7070
preventdefault:dragover
7171
preventdefault:drop
7272
onDragOver$={sync$((_: DragEvent, currentTarget: HTMLDivElement) => {

‎packages/docs/src/routes/docs/(qwik)/advanced/eslint/styles.css

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@reference "tailwindcss";
2+
13
.docs .panel {
24
@apply rounded-md;
35
@apply mt-4;

‎packages/docs/src/routes/docs/cookbook/drag&drop/index.mdx

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default component$(() => {
4141
return (
4242
<div class="flex min-h-screen justify-center gap-8 bg-gray-50 p-8">
4343
<div
44-
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-sm transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
44+
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-xs transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
4545
preventdefault:dragover
4646
preventdefault:drop
4747
onDragOver$={sync$((_: DragEvent, currentTarget: HTMLDivElement) => {
@@ -91,7 +91,7 @@ export default component$(() => {
9191
</div>
9292

9393
<div
94-
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-sm transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
94+
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-xs transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
9595
preventdefault:dragover
9696
preventdefault:drop
9797
onDragOver$={sync$((_: DragEvent, currentTarget: HTMLDivElement) => {
@@ -179,7 +179,7 @@ export default component$(() => {
179179
<div class="flex min-h-screen justify-center gap-8 bg-gray-50 p-8">
180180
<div
181181
data-dropzone
182-
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-sm transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
182+
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-xs transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
183183
preventdefault:dragover
184184
preventdefault:drop
185185
onDragOver$={sync$((_: DragEvent, currentTarget: HTMLDivElement) => {
@@ -257,7 +257,7 @@ export default component$(() => {
257257
</div>
258258

259259
<div
260-
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-sm transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
260+
class="h-[25em] w-80 rounded-xl border-2 border-dashed border-gray-300 bg-white p-6 shadow-xs transition-all duration-300 hover:border-gray-400 [&[data-over]]:border-blue-300 [&[data-over]]:bg-blue-50"
261261
data-dropzone
262262
preventdefault:dragover
263263
preventdefault:drop

0 commit comments

Comments
 (0)