Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(starters/empty): avoid p element gotchas #6236

Merged
merged 5 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ body:
id: system-info
attributes:
label: System Info
description: Output of `npx envinfo --system --npmPackages '{vite,undici,@builder.io/*}' --binaries --browsers`
description: Output of `npx envinfo --system --npmPackages '{vite,undici,typescript,@builder.io/*}' --binaries --browsers`
render: shell
placeholder: System, Binaries, Browsers
validations:
Expand Down
4 changes: 3 additions & 1 deletion packages/qwik-city/runtime/src/qwik-city-component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ export const QwikCityProvider = component$<QwikCityProps>((props) => {
useStyles$(`:root{view-transition-name:none}`);
const env = useQwikCityEnv();
if (!env?.params) {
throw new Error(`Missing Qwik City Env Data`);
throw new Error(
`Missing Qwik City Env Data for help visit https://github.com/QwikDev/qwik/issues/6237`
);
}

const urlEnv = useServerData<string>('url');
Expand Down
42 changes: 23 additions & 19 deletions packages/qwik-city/runtime/src/sw-register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,30 @@ import type { QPrefetchData, QPrefetchMessage } from './service-worker/types';
}
});

navigator.serviceWorker
.register('__url')
.then((reg) => {
initServiceWorker = () => {
swReg = reg;
queuedEventDetails.forEach(sendPrefetch!);
sendPrefetch!({ bundles: queuedEventDetails });
};
if ('serviceWorker' in navigator) {
navigator.serviceWorker
.register('__url')
.then((reg) => {
initServiceWorker = () => {
swReg = reg;
queuedEventDetails.forEach(sendPrefetch!);
sendPrefetch!({ bundles: queuedEventDetails });
};

if (reg.installing) {
reg.installing.addEventListener('statechange', (ev: any) => {
if (ev.target.state == 'activated') {
initServiceWorker!();
}
});
} else if (reg.active) {
initServiceWorker!();
}
})
.catch((e) => console.error(e));
if (reg.installing) {
reg.installing.addEventListener('statechange', (ev: any) => {
if (ev.target.state == 'activated') {
initServiceWorker!();
}
});
} else if (reg.active) {
initServiceWorker!();
}
})
.catch((e) => console.error(e));
} else {
console.log('Service worker not supported in this browser.');
}
})([]);

interface QwikServiceWorker extends ServiceWorker {
Expand Down
3 changes: 3 additions & 0 deletions starters/apps/base/src/entry.ssr.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,8 @@ export default function (opts: RenderToStreamOptions) {
lang: "en-us",
...opts.containerAttributes,
},
serverData: {
...opts.serverData,
},
});
}
4 changes: 2 additions & 2 deletions starters/apps/empty/src/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ export default component$(() => {
return (
<>
<h1>Hi 👋</h1>
<p>
<div>
Can't wait to see what you build with qwik!
<br />
Happy coding.
</p>
</div>
</>
);
});
Expand Down
3 changes: 3 additions & 0 deletions starters/apps/site-with-visual-cms/src/entry.ssr.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,8 @@ export default function (opts: RenderToStreamOptions) {
lang: "en-us",
...opts.containerAttributes,
},
serverData: {
...opts.serverData,
},
});
}
Loading