Merge branch 'dev' into pedro/allow-any-mode

remix-run · Aug 9, 2023 · 6ffeaf2 · 6ffeaf2
2 parents 5894f13 + fc8a3e2
commit 6ffeaf2
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 13 deletions.
diff --git a/.changeset/lovely-drinks-bow.md b/.changeset/lovely-drinks-bow.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+allow jsx in js files during hmr
diff --git a/packages/remix-dev/__tests__/utils/withApp.ts b/packages/remix-dev/__tests__/utils/withApp.ts
@@ -36,6 +36,6 @@ export default async <Result>(
     // errors when attempting to removing the temporary directory.
     // Retrying a couple times seems to get it to succeed.
     // See https://github.com/jprichardson/node-fs-extra/issues?q=EBUSY%3A+resource+busy+or+locked%2C+rmdir
-    retry(async () => await fse.remove(TEMP_DIR), 3, 200);
+    await retry(async () => await fse.remove(TEMP_DIR), 3, 200);
   }
 };
diff --git a/packages/remix-dev/cli/commands.ts b/packages/remix-dev/cli/commands.ts
@@ -147,7 +147,7 @@ export async function watch(
       : await readConfig(remixRootOrConfig);
 
   let resolved = await resolveDev(config);
-  devServer.liveReload(config, resolved);
+  void devServer.liveReload(config, resolved);
   return await new Promise(() => {});
 }
 

diff --git a/packages/remix-dev/compiler/compiler.ts b/packages/remix-dev/compiler/compiler.ts
@@ -56,7 +56,7 @@ export let create = async (ctx: Context): Promise<Compiler> => {
       if (error === undefined) {
         error = thrown;
       }
-      cancel();
+      void cancel();
       return err(thrown);
     };
 

diff --git a/packages/remix-dev/compiler/fileWatchCache.ts b/packages/remix-dev/compiler/fileWatchCache.ts
@@ -111,7 +111,7 @@ export function createFileWatchCache(): FileWatchCache {
   ): Promise<CacheValue<T>> {
     promiseForCacheKey.set(key, promise);
 
-    promise
+    void promise
       .catch(() => {
         // Swallow errors to prevent the build from crashing and remove the
         // rejected promise from the cache so consumers can retry

diff --git a/packages/remix-dev/compiler/js/plugins/hmr.ts b/packages/remix-dev/compiler/js/plugins/hmr.ts
@@ -139,7 +139,7 @@ declare global {
             sourceCode,
             output: {
               contents: resultCode,
-              loader: args.path.endsWith("x") ? "tsx" : "ts",
+              loader: "tsx",
               resolveDir: path.dirname(args.path),
             },
           };

diff --git a/packages/remix-dev/compiler/watch.ts b/packages/remix-dev/compiler/watch.ts
@@ -58,7 +58,7 @@ export async function watch(
 
   let restart = debounce(async () => {
     let start = Date.now();
-    compiler.dispose();
+    void compiler.dispose();
 
     try {
       ctx.config = await reloadConfig(ctx.config.rootDirectory);
@@ -130,6 +130,6 @@ export async function watch(
 
   return async () => {
     await watcher.close().catch(() => undefined);
-    compiler.dispose();
+    void compiler.dispose();
   };
 }
diff --git a/packages/remix-react/components.tsx b/packages/remix-react/components.tsx
@@ -412,11 +412,13 @@ function useKeyedPrefetchLinks(matches: AgnosticDataRouteMatch[]) {
   React.useEffect(() => {
     let interrupted: boolean = false;
 
-    getKeyedPrefetchLinks(matches, manifest, routeModules).then((links) => {
-      if (!interrupted) {
-        setKeyedPrefetchLinks(links);
+    void getKeyedPrefetchLinks(matches, manifest, routeModules).then(
+      (links) => {
+        if (!interrupted) {
+          setKeyedPrefetchLinks(links);
+        }
       }
-    });
+    );
 
     return () => {
       interrupted = true;

diff --git a/packages/remix-react/data.ts b/packages/remix-react/data.ts
@@ -175,7 +175,7 @@ export async function parseDeferredReadableStream(
     }
 
     // Read the rest of the stream and resolve deferred promises
-    (async () => {
+    void (async () => {
       try {
         for await (let section of sectionReader) {
           // Determine event type and data

diff --git a/packages/remix-serve/cli.ts b/packages/remix-serve/cli.ts
@@ -38,7 +38,7 @@ let onListen = () => {
     );
   }
   if (process.env.NODE_ENV === "development") {
-    broadcastDevReady(build);
+    void broadcastDevReady(build);
   }
 };