Skip to content

Commit c41bbbf

Browse files
committed
chore: unify error usage
1 parent c4aedb3 commit c41bbbf

File tree

31 files changed

+61
-61
lines changed

31 files changed

+61
-61
lines changed

docs/guides/optimistic-ui.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ export const action = async ({ request }: ActionArgs) => {
198198
try {
199199
const project = await createProject(newProject);
200200
return redirect(`/projects/${project.id}`);
201-
} catch (e: unknown) {
202-
console.error(e);
201+
} catch (error: unknown) {
202+
console.error(error);
203203
return json("Sorry, we couldn't create the project", {
204204
status: 500,
205205
});

integration/form-data-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ test.beforeAll(async () => {
1414
export async function action({ request }) {
1515
try {
1616
await request.formData()
17-
} catch (err) {
17+
} catch {
1818
return json("no pizza");
1919
}
2020
return json("pizza");

integration/server-source-maps-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ test.beforeAll(async () => {
1818
export function loader() {
1919
try {
2020
throw new Error("💩");
21-
} catch (err) {
21+
} catch {
2222
return json(err.stack);
2323
}
2424
}

packages/remix-cloudflare-pages/worker.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ export function createPagesFunctionHandler<Env = any>({
7474
return async (context: EventContext<Env, any, any>) => {
7575
try {
7676
return await handleFetch(context);
77-
} catch (e) {
78-
if (process.env.NODE_ENV === "development" && e instanceof Error) {
79-
console.error(e);
80-
return new Response(e.message || e.toString(), {
77+
} catch (error: unknown) {
78+
if (process.env.NODE_ENV === "development" && error instanceof Error) {
79+
console.error(error);
80+
return new Response(error.message || error.toString(), {
8181
status: 500,
8282
});
8383
}

packages/remix-cloudflare-workers/worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export async function handleAsset(
8484
cacheControl,
8585
...options,
8686
});
87-
} catch (error) {
87+
} catch (error: unknown) {
8888
if (
8989
error instanceof MethodNotAllowedError ||
9090
error instanceof NotFoundError

packages/remix-deno/server.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function defaultCacheControl(url: URL, assetsPublicPath = "/build/") {
1212
}
1313

1414
export function createRequestHandler<
15-
Context extends AppLoadContext | undefined = undefined,
15+
Context extends AppLoadContext | undefined = undefined
1616
>({
1717
build,
1818
mode,
@@ -29,8 +29,8 @@ export function createRequestHandler<
2929
const loadContext = await getLoadContext?.(request);
3030

3131
return handleRequest(request, loadContext);
32-
} catch (e) {
33-
console.error(e);
32+
} catch (error: unknown) {
33+
console.error(error);
3434

3535
return new Response("Internal Error", { status: 500 });
3636
}
@@ -53,7 +53,7 @@ export async function serveStaticFiles(
5353
cacheControl?: string | ((url: URL) => string);
5454
publicDir?: string;
5555
assetsPublicPath?: string;
56-
},
56+
}
5757
) {
5858
const url = new URL(request.url);
5959

@@ -84,7 +84,7 @@ export async function serveStaticFiles(
8484
}
8585

8686
export function createRequestHandlerWithStaticFiles<
87-
Context extends AppLoadContext | undefined = undefined,
87+
Context extends AppLoadContext | undefined = undefined
8888
>({
8989
build,
9090
mode,
@@ -108,7 +108,7 @@ export function createRequestHandlerWithStaticFiles<
108108
return async (request: Request) => {
109109
try {
110110
return await serveStaticFiles(request, staticFiles);
111-
} catch (error) {
111+
} catch (error: unknown) {
112112
if (!(error instanceof FileNotFoundError)) {
113113
throw error;
114114
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -665,8 +665,8 @@ describe("the create command", () => {
665665
"--typescript",
666666
]);
667667
return res;
668-
} catch (err) {
669-
throw err;
668+
} catch (error: unknown) {
669+
throw error;
670670
}
671671
}).rejects.toMatchInlineSnapshot(
672672
`[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", () => {
822822
});
823823
it("uses the proxy from env var", async () => {
824824
let projectDir = await getProjectDir("template");
825-
let err: Error | undefined;
825+
let error: Error | undefined;
826826
let prevProxy = process.env.HTTPS_PROXY;
827827
try {
828828
process.env.HTTPS_PROXY = "http://127.0.0.1:33128";
@@ -834,12 +834,12 @@ describe("the create command", () => {
834834
"--no-install",
835835
"--typescript",
836836
]);
837-
} catch (e) {
838-
err = e;
837+
} catch (err) {
838+
error = err;
839839
} finally {
840840
process.env.HTTPS_PROXY = prevProxy;
841841
}
842-
expect(err?.message).toMatch("127.0.0.1:33");
842+
expect(error?.message).toMatch("127.0.0.1:33");
843843
});
844844
});
845845
});

packages/remix-dev/__tests__/utils/withApp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const retry = async (
99
) => {
1010
try {
1111
await callback();
12-
} catch (error) {
12+
} catch (error: unknown) {
1313
if (times === 0) throw error;
1414
setTimeout(() => retry(callback, times - 1), delayMs);
1515
}

packages/remix-dev/cli/commands.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export async function init(
9494
if (deleteScript) {
9595
await fse.remove(initScriptDir);
9696
}
97-
} catch (error) {
97+
} catch (error: unknown) {
9898
if (error instanceof Error) {
9999
error.message = `${colors.error("🚨 Oops, remix.init failed")}\n\n${
100100
error.message
@@ -222,7 +222,7 @@ export async function codemod(
222222
dry,
223223
force,
224224
});
225-
} catch (error) {
225+
} catch (error: unknown) {
226226
if (error instanceof CodemodError) {
227227
console.error(`${colors.red("Error:")} ${error.message}`);
228228
if (error.additionalInfo) console.info(colors.gray(error.additionalInfo));

packages/remix-dev/cli/create.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ export async function createApp({
176176
let appPkg: any;
177177
try {
178178
appPkg = require(pkgJsonPath);
179-
} catch (err) {
179+
} catch {
180180
throw Error(
181181
"🚨 The provided template must be a Remix project with a `package.json` " +
182182
`file, but that file does not exist in ${pkgJsonPath}.`
@@ -244,12 +244,12 @@ async function extractLocalTarball(
244244
gunzip(),
245245
tar.extract(projectDir, { strip: 1 })
246246
);
247-
} catch (err) {
247+
} catch (error: unknown) {
248248
throw Error(
249249
"🚨 There was a problem extracting the file from the provided template.\n\n" +
250250
` Template filepath: \`${filePath}\`\n` +
251251
` Destination directory: \`${projectDir}\`\n` +
252-
` ${err}`
252+
` ${error}`
253253
);
254254
}
255255
}

0 commit comments

Comments
 (0)