Skip to content

Commit d99cb7e

Browse files
authored
Merge pull request #7679 from QwikDev/v2-merge-main
chore: merge main into v2
2 parents f2dbf54 + 8b71024 commit d99cb7e

File tree

7 files changed

+21
-12
lines changed

7 files changed

+21
-12
lines changed

.changeset/fancy-nights-chew.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@builder.io/qwik': patch
3+
---
4+
5+
Removed backdrop-filter of vite-error-overlay to prevent perf issues with multiple errors

.changeset/shiny-lies-sip.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@builder.io/qwik': patch
3+
---
4+
5+
fix(ssr): support q-manifest resolution under Bun runtime (#7565)

packages/docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@mui/material": "5.16.4",
1515
"@mui/system": "5.16.4",
1616
"@mui/x-data-grid": "6.20.4",
17-
"@qwik-ui/headless": "0.6.3",
17+
"@qwik-ui/headless": "0.6.7",
1818
"@qwik.dev/core": "workspace:*",
1919
"@qwik.dev/partytown": "0.11.1",
2020
"@qwik.dev/react": "workspace:*",

packages/docs/src/routes/docs/(qwikrouter)/guides/mdx/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ export const Tags = component$(() => {
195195
</ul>
196196
);
197197
});
198+
```
198199

199200
## `useContent()`
200201

@@ -209,4 +210,3 @@ The `headings` array includes data about a markdown file's `<h1>` to `<h6>` [htm
209210

210211
Menus are contextual data declared with `menu.md` files. See [menus file definition](/docs/(qwikcity)/advanced/menu/index.mdx) for more information on the file format and location.
211212

212-
```

packages/qwik/src/optimizer/src/plugins/vite-error.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ vite-error-overlay {
1919
2020
vite-error-overlay::part(backdrop) {
2121
background: rgb(2 11 17 / 60%);
22-
backdrop-filter: blur(20px) brightness(0.4) saturate(3);
2322
}
2423
2524
vite-error-overlay::part(window) {

packages/qwik/src/optimizer/src/plugins/vite.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
191191
pluginOpts.input = viteConfig.build?.lib.entry;
192192
}
193193
}
194-
if (sys.env === 'node') {
194+
if (sys.env === 'node' || sys.env === 'bun') {
195195
const fs: typeof import('fs') = await sys.dynamicImport('node:fs');
196196

197197
try {
@@ -575,7 +575,7 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
575575
);
576576

577577
const sys = qwikPlugin.getSys();
578-
if (tmpClientManifestPath && sys.env === 'node') {
578+
if (tmpClientManifestPath && (sys.env === 'node' || sys.env === 'bun')) {
579579
// Client build should write the manifest to a tmp dir
580580
const fs: typeof import('fs') = await sys.dynamicImport('node:fs');
581581
await fs.promises.writeFile(tmpClientManifestPath, clientManifestStr);
@@ -590,7 +590,7 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
590590
// ssr build
591591

592592
const sys = qwikPlugin.getSys();
593-
if (sys.env === 'node') {
593+
if (sys.env === 'node' || sys.env === 'bun') {
594594
const outputs = Object.keys(rollupBundle);
595595

596596
// In order to simplify executing the server script with a common script
@@ -811,7 +811,7 @@ const findQwikRoots = async (
811811
packageJsonDir: string
812812
): Promise<QwikPackages[]> => {
813813
const paths = new Map<string, string>();
814-
if (sys.env === 'node') {
814+
if (sys.env === 'node' || sys.env === 'bun') {
815815
const fs: typeof import('fs') = await sys.dynamicImport('node:fs');
816816
let prevPackageJsonDir: string | undefined;
817817
do {

pnpm-lock.yaml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)