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.

Sign up for GitHub

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

Jump to bottom

fix(remix-run/react): fix import.meta.hot type clash #8459

Merged
merged 2 commits into from
Jan 9, 2024
Merged

fix(remix-run/react): fix import.meta.hot type clash #8459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56eba3b
fix(remix-dev/vite): fix import.meta.hot type clash
markdalgleish Jan 8, 2024
a1086b9
Merge branch 'dev' into markdalgleish/fix-vite-import-meta-hot-types
markdalgleish Jan 9, 2024
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
5 changes: 5 additions & 0 deletions .changeset/ninety-ducks-sin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@remix-run/react": patch
---

Vite: Fix type conflict with `import.meta.hot` from the existing Remix compiler
8 changes: 2 additions & 6 deletions packages/remix-react/browser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,6 @@ declare global {

export interface RemixBrowserProps {}

declare global {
interface ImportMeta {
hot: any;
}
}

let router: Router;
let routerInitialized = false;
let hmrAbortController: AbortController | undefined;
Expand All @@ -75,7 +69,9 @@ type CriticalCssReducer = () => typeof window.__remixContext.criticalCss;
// The critical CSS can only be cleared, so the reducer always returns undefined
let criticalCssReducer: CriticalCssReducer = () => undefined;

// @ts-expect-error
if (import.meta && import.meta.hot) {
// @ts-expect-error
import.meta.hot.accept(
"remix:manifest",
async ({
Expand Down
1 change: 1 addition & 0 deletions packages/remix-react/routeModules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ export async function loadRouteModule(
// assets, the manifest path, but not the documents 😬
if (
window.__remixContext.isSpaMode &&
// @ts-expect-error
typeof import.meta.hot !== "undefined"
) {
// In SPA Mode (which implies vite) we don't want to perform a hard reload
Expand Down