chore: unify error usage

docs/guides/optimistic-ui.md

@@ -201,8 +201,8 @@ export const action: ActionFunction = async ({
   try {
     const project = await createProject(newProject);
     return redirect(`/projects/${project.id}`);
-  } catch (e) {
-    console.error(e);
+  } catch (error) {
+    console.error(error);
     return json("Sorry, we couldn't create the project", {
       status: 500,
     });

integration/form-data-test.ts

@@ -14,7 +14,7 @@ test.beforeAll(async () => {
         export async function action({ request }) {
           try {
             await request.formData()
-          } catch (err) {
+          } catch {
             return json("no pizza");
           }
           return json("pizza");

integration/server-source-maps-test.ts

@@ -18,7 +18,7 @@ test.beforeAll(async () => {
         export function loader() {
           try {
             throw new Error("💩");
-          } catch (err) {
+          } catch {
             return json(err.stack);
           }
         }

packages/remix-cloudflare-pages/worker.ts

@@ -74,10 +74,10 @@ export function createPagesFunctionHandler<Env = any>({
   return async (context: EventContext<Env, any, any>) => {
     try {
       return await handleFetch(context);
-    } catch (e) {
-      if (process.env.NODE_ENV === "development" && e instanceof Error) {
-        console.error(e);
-        return new Response(e.message || e.toString(), {
+    } catch (error: unknown) {
+      if (process.env.NODE_ENV === "development" && error instanceof Error) {
+        console.error(error);
+        return new Response(error.message || error.toString(), {
           status: 500,
         });
       }

packages/remix-deno/server.ts

@@ -27,8 +27,8 @@ export function createRequestHandler<Context = unknown>({
       const loadContext = await getLoadContext?.(request);
 
       return handleRequest(request, loadContext);
-    } catch (e) {
-      console.error(e);
+    } catch (error) {
+      console.error(error);
 
       return new Response("Internal Error", { status: 500 });
     }
@@ -51,7 +51,7 @@ export async function serveStaticFiles(
     cacheControl?: string | ((url: URL) => string);
     publicDir?: string;
     assetsPublicPath?: string;
-  },
+  }
 ) {
   const url = new URL(request.url);
 

packages/remix-dev/__tests__/create-test.ts

@@ -665,8 +665,8 @@ describe("the create command", () => {
             "--typescript",
           ]);
           return res;
-        } catch (err) {
-          throw err;
+        } catch (error) {
+          throw error;
         }
       }).rejects.toMatchInlineSnapshot(
         `[Error: 🚨 The template could not be verified because you do not have access to the repository. Please double check the access rights of this repo and try again.]`
@@ -822,7 +822,7 @@ describe("the create command", () => {
     });
     it("uses the proxy from env var", async () => {
       let projectDir = await getProjectDir("template");
-      let err: Error | undefined;
+      let error: Error | undefined;
       let prevProxy = process.env.HTTPS_PROXY;
       try {
         process.env.HTTPS_PROXY = "http://127.0.0.1:33128";
@@ -834,12 +834,12 @@ describe("the create command", () => {
           "--no-install",
           "--typescript",
         ]);
-      } catch (e) {
-        err = e;
+      } catch (err) {
+        error = err;
       } finally {
         process.env.HTTPS_PROXY = prevProxy;
       }
-      expect(err?.message).toMatch("127.0.0.1:33");
+      expect(error?.message).toMatch("127.0.0.1:33");
     });
   });
 });

packages/remix-dev/cli/create.ts

@@ -176,7 +176,7 @@ export async function createApp({
   let appPkg: any;
   try {
     appPkg = require(pkgJsonPath);
-  } catch (err) {
+  } catch {
     throw Error(
       "🚨 The provided template must be a Remix project with a `package.json` " +
         `file, but that file does not exist in ${pkgJsonPath}.`
@@ -244,12 +244,12 @@ async function extractLocalTarball(
       gunzip(),
       tar.extract(projectDir, { strip: 1 })
     );
-  } catch (err) {
+  } catch (error: unknown) {
     throw Error(
       "🚨 There was a problem extracting the file from the provided template.\n\n" +
         `  Template filepath: \`${filePath}\`\n` +
         `  Destination directory: \`${projectDir}\`\n` +
-        `  ${err}`
+        `  ${error}`
     );
   }
 }

packages/remix-dev/compiler/remixCompiler.ts

@@ -32,8 +32,8 @@ export const compile = async (
     let browserPromise = compiler.browser.compile(assetsManifestChannel);
     let serverPromise = compiler.server.compile(assetsManifestChannel);
     await Promise.all([browserPromise, serverPromise]);
-  } catch (err) {
-    options.onCompileFailure?.(err as Error);
+  } catch (error: unknown) {
+    options.onCompileFailure?.(error as Error);
   }
 };
 

packages/remix-dev/devServer/serve.ts

@@ -18,7 +18,7 @@ function purgeAppRequireCache(buildPath: string) {
 function tryImport(packageName: string) {
   try {
     return require(packageName);
-  } catch (err) {
+  } catch {
     throw new Error(
       `Could not locate ${packageName}. Verify that you have it installed to use the dev command.`
     );

packages/remix-dev/env.ts

@@ -6,7 +6,7 @@ export async function loadEnv(rootDirectory: string): Promise<void> {
   let envPath = path.join(rootDirectory, ".env");
   try {
     await fse.readFile(envPath);
-  } catch (e) {
+  } catch {
     return;
   }
 

packages/remix-server-runtime/router/history.ts

@@ -458,7 +458,7 @@ function warning(cond: any, message: string) {
       // enabling "pause on exceptions" in your JavaScript debugger.
       throw new Error(message);
       // eslint-disable-next-line no-empty
-    } catch (e) {}
+    } catch {}
   }
 }
 

packages/remix-server-runtime/router/router.ts

@@ -2030,22 +2030,25 @@ export function unstable_createStaticHandler(
             actionData: null,
             actionHeaders: {},
           };
-    } catch (e) {
+    } catch (error: unknown) {
       // If the user threw/returned a Response in callLoaderOrAction, we throw
       // it to bail out and then return or throw here based on whether the user
       // returned or threw
-      if (isQueryRouteResponse(e)) {
-        if (e.type === ResultType.error && !isRedirectResponse(e.response)) {
-          throw e.response;
+      if (isQueryRouteResponse(error)) {
+        if (
+          error.type === ResultType.error &&
+          !isRedirectResponse(error.response)
+        ) {
+          throw error.response;
         }
-        return e.response;
+        return error.response;
       }
       // Redirects are always returned since they don't propagate to catch
       // boundaries
-      if (isRedirectResponse(e)) {
-        return e;
+      if (isRedirectResponse(error)) {
+        return error;
       }
-      throw e;
+      throw error;
     }
   }
 
@@ -2324,7 +2327,7 @@ function normalizeNavigateOptions(
       searchParams.append("index", "");
     }
     parsedPath.search = `?${searchParams}`;
-  } catch (e) {
+  } catch {
     return {
       path,
       error: getInternalRouterError(400),
@@ -2548,9 +2551,9 @@ async function callLoaderOrAction(
         `"${match.route.id}" but didn't return anything from your \`${type}\` ` +
         `function. Please return a value or \`null\`.`
     );
-  } catch (e) {
+  } catch (error: unknown) {
     resultType = ResultType.error;
-    result = e;
+    result = error;
   } finally {
     request.signal.removeEventListener("abort", onReject);
   }
@@ -3051,11 +3054,11 @@ async function resolveDeferredData(
         type: ResultType.data,
         data: result.deferredData.unwrappedData,
       };
-    } catch (e) {
+    } catch (error: unknown) {
       // Handle any TrackedPromise._error values encountered while unwrapping
       return {
         type: ResultType.error,
-        error: e,
+        error,
       };
     }
   }

packages/remix-server-runtime/router/utils.ts

@@ -801,7 +801,7 @@ export function warning(cond: any, message: string): void {
       // enabling "pause on exceptions" in your JavaScript debugger.
       throw new Error(message);
       // eslint-disable-next-line no-empty
-    } catch (e) {}
+    } catch {}
   }
 }
 

rollup.config.js

@@ -6,7 +6,7 @@ module.exports = function rollup(options) {
     let configPath = path.join("packages", dir, "rollup.config.js");
     try {
       fs.readFileSync(configPath);
-    } catch (e) {
+    } catch {
       return [];
     }
     let packageBuild = require(`.${path.sep}${configPath}`);

rollup.utils.js

@@ -16,7 +16,7 @@ if (process.env.REMIX_LOCAL_BUILD_DIRECTORY) {
   );
   try {
     fse.readdirSync(path.join(appDir, "node_modules"));
-  } catch (e) {
+  } catch {
     console.error(
       "Oops! You pointed REMIX_LOCAL_BUILD_DIRECTORY to a directory that " +
         "does not have a node_modules/ folder. Please `npm install` in that " +

scripts/copy-build-to-dist.mjs

@@ -11,7 +11,7 @@ if (process.env.REMIX_LOCAL_BUILD_DIRECTORY) {
   let appDir = path.join(ROOT_DIR, process.env.REMIX_LOCAL_BUILD_DIRECTORY);
   try {
     fse.readdirSync(path.join(appDir, "node_modules"));
-  } catch (e) {
+  } catch  {
     console.error(
       "Oops! You pointed `REMIX_LOCAL_BUILD_DIRECTORY` to a directory that " +
         "does not have a `node_modules` folder. Please `npm install` in that " +
@@ -62,7 +62,7 @@ async function copyBuildToDist() {
           });
         })()
       );
-    } catch (e) {}
+    } catch {}
   }
 
   // Write an export shim for @remix-run/node/globals types

scripts/release.js

@@ -173,7 +173,7 @@ async function execStart(nextVersion) {
   await gitPull("dev");
   try {
     checkoutNewBranch(releaseBranch);
-  } catch (e) {
+  } catch {
     throw Error(
       `Branch ${chalk.bold(
         releaseBranch
@@ -243,10 +243,10 @@ async function gitMerge(from, to, opts = {}) {
   let summary;
   try {
     summary = await git.merge([from]);
-  } catch (err) {
-    savedError = err;
+  } catch (error) {
+    savedError = error;
     // @ts-ignore
-    summary = err.git;
+    summary = error.git;
   }
 
   if (summary.conflicts.length > 0) {
@@ -281,9 +281,9 @@ async function gitPull(branch) {
       console.error(chalk.red("Merge failed.\n"));
       throw Error(resp);
     }
-  } catch (e) {
+  } catch (error) {
     console.error(chalk.red(`Error rebasing to origin/${branch}`));
-    throw e;
+    throw error;
   }
 }
 

scripts/utils.js

@@ -80,7 +80,7 @@ async function updatePackageConfig(packageName, transform) {
     }
     transform(json);
     await jsonfile.writeFile(file, json, { spaces: 2 });
-  } catch (err) {
+  } catch {
     return;
   }
 }