chore: unify error usage

MichaelDeBoey · MichaelDeBoey · commit c41bbbfc64fc · 2022-12-08T03:44:11.000+01:00
diff --git a/docs/guides/optimistic-ui.md b/docs/guides/optimistic-ui.md
@@ -198,8 +198,8 @@ export const action = async ({ request }: ActionArgs) => {
   try {
     const project = await createProject(newProject);
     return redirect(`/projects/${project.id}`);
-  } catch (e: unknown) {
-    console.error(e);
+  } catch (error: unknown) {
+    console.error(error);
     return json("Sorry, we couldn't create the project", {
       status: 500,
     });
diff --git a/integration/form-data-test.ts b/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");
diff --git a/integration/server-source-maps-test.ts b/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);
           }
         }
diff --git a/packages/remix-cloudflare-pages/worker.ts b/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,
         });
       }
diff --git a/packages/remix-cloudflare-workers/worker.ts b/packages/remix-cloudflare-workers/worker.ts
@@ -84,7 +84,7 @@ export async function handleAsset(
       cacheControl,
       ...options,
     });
-  } catch (error) {
+  } catch (error: unknown) {
     if (
       error instanceof MethodNotAllowedError ||
       error instanceof NotFoundError
diff --git a/packages/remix-deno/server.ts b/packages/remix-deno/server.ts
@@ -12,7 +12,7 @@ function defaultCacheControl(url: URL, assetsPublicPath = "/build/") {
 }
 
 export function createRequestHandler<
-  Context extends AppLoadContext | undefined = undefined,
+  Context extends AppLoadContext | undefined = undefined
 >({
   build,
   mode,
@@ -29,8 +29,8 @@ export function createRequestHandler<
       const loadContext = await getLoadContext?.(request);
 
       return handleRequest(request, loadContext);
-    } catch (e) {
-      console.error(e);
+    } catch (error: unknown) {
+      console.error(error);
 
       return new Response("Internal Error", { status: 500 });
     }
@@ -53,7 +53,7 @@ export async function serveStaticFiles(
     cacheControl?: string | ((url: URL) => string);
     publicDir?: string;
     assetsPublicPath?: string;
-  },
+  }
 ) {
   const url = new URL(request.url);
 
@@ -84,7 +84,7 @@ export async function serveStaticFiles(
 }
 
 export function createRequestHandlerWithStaticFiles<
-  Context extends AppLoadContext | undefined = undefined,
+  Context extends AppLoadContext | undefined = undefined
 >({
   build,
   mode,
@@ -108,7 +108,7 @@ export function createRequestHandlerWithStaticFiles<
   return async (request: Request) => {
     try {
       return await serveStaticFiles(request, staticFiles);
-    } catch (error) {
+    } catch (error: unknown) {
       if (!(error instanceof FileNotFoundError)) {
         throw error;
       }
diff --git a/packages/remix-dev/__tests__/create-test.ts b/packages/remix-dev/__tests__/create-test.ts
@@ -665,8 +665,8 @@ describe("the create command", () => {
             "--typescript",
           ]);
           return res;
-        } catch (err) {
-          throw err;
+        } catch (error: unknown) {
+          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");
     });
   });
 });
diff --git a/packages/remix-dev/__tests__/utils/withApp.ts b/packages/remix-dev/__tests__/utils/withApp.ts
@@ -9,7 +9,7 @@ const retry = async (
 ) => {
   try {
     await callback();
-  } catch (error) {
+  } catch (error: unknown) {
     if (times === 0) throw error;
     setTimeout(() => retry(callback, times - 1), delayMs);
   }
diff --git a/packages/remix-dev/cli/commands.ts b/packages/remix-dev/cli/commands.ts
@@ -94,7 +94,7 @@ export async function init(
     if (deleteScript) {
       await fse.remove(initScriptDir);
     }
-  } catch (error) {
+  } catch (error: unknown) {
     if (error instanceof Error) {
       error.message = `${colors.error("🚨 Oops, remix.init failed")}\n\n${
         error.message
@@ -222,7 +222,7 @@ export async function codemod(
       dry,
       force,
     });
-  } catch (error) {
+  } catch (error: unknown) {
     if (error instanceof CodemodError) {
       console.error(`${colors.red("Error:")} ${error.message}`);
       if (error.additionalInfo) console.info(colors.gray(error.additionalInfo));
diff --git a/packages/remix-dev/cli/create.ts b/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}`
     );
   }
 }
diff --git a/packages/remix-dev/cli/migrate/jscodeshift.ts b/packages/remix-dev/cli/migrate/jscodeshift.ts
@@ -46,7 +46,7 @@ export const run = async <TransformOptions extends Options = Options>({
   try {
     let { error } = await jscodeshift(transformPath, files, options);
     return error === 0;
-  } catch (error) {
+  } catch (error: unknown) {
     return false;
   }
 };
diff --git a/packages/remix-dev/cli/run.ts b/packages/remix-dev/cli/run.ts
@@ -266,7 +266,7 @@ export async function run(argv: string[] = process.argv.slice(2)) {
                   try {
                     await validateNewProjectPath(String(input));
                     return true;
-                  } catch (error) {
+                  } catch (error: unknown) {
                     if (error instanceof Error && error.message) {
                       return error.message;
                     }
diff --git a/packages/remix-dev/codemod/utils/task.ts b/packages/remix-dev/codemod/utils/task.ts
@@ -15,7 +15,7 @@ export const task = async <Result>(
     let result = await callback(spinner);
     spinner.succeed(typeof succeed === "string" ? succeed : succeed(result));
     return result;
-  } catch (error) {
+  } catch (error: unknown) {
     if (error instanceof CodemodError) {
       spinner.fail(error.message);
       if (error.additionalInfo) log.info(error.additionalInfo);
diff --git a/packages/remix-dev/compiler/plugins/serverBareModulesPlugin.ts b/packages/remix-dev/compiler/plugins/serverBareModulesPlugin.ts
@@ -81,7 +81,7 @@ export function serverBareModulesPlugin(
         ) {
           try {
             require.resolve(path);
-          } catch (error) {
+          } catch (error: unknown) {
             onWarning(
               `The path "${path}" is imported in ` +
                 `${relative(process.cwd(), importer)} but ` +
diff --git a/packages/remix-dev/compiler/remixCompiler.ts b/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);
   }
 };
 
diff --git a/packages/remix-dev/compiler/routeExports.ts b/packages/remix-dev/compiler/routeExports.ts
@@ -19,7 +19,7 @@ export async function getRouteModuleExports(
   let cached: CachedRouteExports | null = null;
   try {
     cached = await cache.getJson(config.cacheDirectory, key);
-  } catch (error) {
+  } catch (error: unknown) {
     // Ignore cache read errors.
   }
 
@@ -28,7 +28,7 @@ export async function getRouteModuleExports(
     cached = { hash, exports };
     try {
       await cache.putJson(config.cacheDirectory, key, cached);
-    } catch (error) {
+    } catch (error: unknown) {
       // Ignore cache put errors.
     }
   }
diff --git a/packages/remix-dev/compiler/watch.ts b/packages/remix-dev/compiler/watch.ts
@@ -65,7 +65,7 @@ export async function watch(
 
     try {
       config = await readConfig(config.rootDirectory);
-    } catch (error) {
+    } catch (error: unknown) {
       onCompileFailure(error as Error);
       return;
     }
@@ -110,7 +110,7 @@ export async function watch(
 
       try {
         config = await readConfig(config.rootDirectory);
-      } catch (error) {
+      } catch (error: unknown) {
         onCompileFailure(error as Error);
         return;
       }
diff --git a/packages/remix-dev/config.ts b/packages/remix-dev/config.ts
@@ -319,7 +319,7 @@ export async function readConfig(
         appConfigModule = await import(pathToFileURL(configFile).href);
       }
       appConfig = appConfigModule?.default || appConfigModule;
-    } catch (error) {
+    } catch (error: unknown) {
       throw new Error(
         `Error loading Remix config at ${configFile}\n${String(error)}`
       );
diff --git a/packages/remix-dev/devServer/serve.ts b/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.`
     );
diff --git a/packages/remix-dev/env.ts b/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;
   }
 
diff --git a/packages/remix-express/server.ts b/packages/remix-express/server.ts
@@ -61,7 +61,7 @@ export function createRequestHandler({
       )) as NodeResponse;
 
       await sendRemixResponse(res, response);
-    } catch (error) {
+    } catch (error: unknown) {
       // Express doesn't support async functions, so we have to pass along the
       // error manually using next().
       next(error);
diff --git a/packages/remix-react/routeModules.ts b/packages/remix-react/routeModules.ts
@@ -158,7 +158,7 @@ export async function loadRouteModule(
     let routeModule = await import(/* webpackIgnore: true */ route.module);
     routeModulesCache[route.id] = routeModule;
     return routeModule;
-  } catch (error) {
+  } catch (error: unknown) {
     // User got caught in the middle of a deploy and the CDN no longer has the
     // asset we're trying to import! Reload from the server and the user
     // (should) get the new manifest--unless the developer purged the static
diff --git a/packages/remix-react/scroll-restoration.tsx b/packages/remix-react/scroll-restoration.tsx
@@ -47,7 +47,7 @@ export function ScrollRestoration(props: ScriptProps) {
       if (typeof storedY === "number") {
         window.scrollTo(0, storedY);
       }
-    } catch (error) {
+    } catch (error: unknown) {
       console.error(error);
       sessionStorage.removeItem(STORAGE_KEY);
     }
diff --git a/packages/remix-react/transition.ts b/packages/remix-react/transition.ts
@@ -1461,7 +1461,7 @@ async function callLoader(match: ClientMatch, url: URL, signal: AbortSignal) {
     let { params } = match;
     let value = await match.route.loader({ params, url, signal });
     return { match, value };
-  } catch (error) {
+  } catch (error: unknown) {
     return { match, value: error };
   }
 }
@@ -1479,7 +1479,7 @@ async function callAction(
       signal,
     });
     return { match, value };
-  } catch (error) {
+  } catch (error: unknown) {
     return { match, value: error };
   }
 }
diff --git a/packages/remix-server-runtime/cookies.ts b/packages/remix-server-runtime/cookies.ts
@@ -187,7 +187,7 @@ function encodeData(value: any): string {
 function decodeData(value: string): any {
   try {
     return JSON.parse(decodeURIComponent(myEscape(atob(value))));
-  } catch (error) {
+  } catch (error: unknown) {
     return {};
   }
 }
diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts
@@ -127,7 +127,7 @@ async function handleDataRequestRR(
     }
 
     return response;
-  } catch (error) {
+  } catch (error: unknown) {
     if (isResponse(error)) {
       error.headers.set("X-Remix-Catch", "yes");
       return error;
@@ -217,7 +217,7 @@ async function handleDocumentRequestRR(
     context = await staticHandler.query(request, {
       requestContext: loadContext,
     });
-  } catch (error) {
+  } catch (error: unknown) {
     if (!request.signal.aborted && serverMode !== ServerMode.Test) {
       console.error(error);
     }
@@ -352,7 +352,7 @@ async function handleDocumentRequestRR(
     return await handleDocumentRequestFunction(
       ...handleDocumentRequestParameters
     );
-  } catch (error) {
+  } catch (error: unknown) {
     handleDocumentRequestParameters[1] = 500;
     appState.trackBoundaries = false;
     appState.error = await serializeError(error as Error);
@@ -389,7 +389,7 @@ async function handleResourceRequestRR(
       "Expected a Response to be returned from queryRoute"
     );
     return response;
-  } catch (error) {
+  } catch (error: unknown) {
     if (isResponse(error)) {
       // Note: Not functionally required but ensures that our response headers
       // match identically to what Remix returns
diff --git a/rollup.config.js b/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}`);
diff --git a/rollup.utils.js b/rollup.utils.js
diff --git a/scripts/copy-build-to-dist.mjs b/scripts/copy-build-to-dist.mjs
diff --git a/scripts/release.js b/scripts/release.js
diff --git a/scripts/utils.js b/scripts/utils.js

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ test.beforeAll(async () => {`
`14`	`14`	`export async function action({ request }) {`
`15`	`15`	`try {`
`16`	`16`	`await request.formData()`
`17`		`- } catch (err) {`
	`17`	`+ } catch {`
`18`	`18`	`return json("no pizza");`
`19`	`19`	`}`
`20`	`20`	`return json("pizza");`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ test.beforeAll(async () => {`
`18`	`18`	`export function loader() {`
`19`	`19`	`try {`
`20`	`20`	`throw new Error("💩");`
`21`		`- } catch (err) {`
	`21`	`+ } catch {`
`22`	`22`	`return json(err.stack);`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ const retry = async (`
`9`	`9`	`) => {`
`10`	`10`	`try {`
`11`	`11`	`await callback();`
`12`		`- } catch (error) {`
	`12`	`+ } catch (error: unknown) {`
`13`	`13`	`if (times === 0) throw error;`
`14`	`14`	`setTimeout(() => retry(callback, times - 1), delayMs);`
`15`	`15`	`}`