Skip to content

Commit

Permalink
get right with linter
Browse files Browse the repository at this point in the history
  • Loading branch information
Pinwheeler committed Dec 28, 2024
1 parent c828433 commit c82b3eb
Show file tree
Hide file tree
Showing 12 changed files with 80 additions and 111 deletions.
9 changes: 5 additions & 4 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ module.exports = {
},
rules: {
// Leave these off, they're dumb
"react/display-name": "off",
"react/prop-types": "off",
}
"import/namespace": "off",
},
},

// Typescript
Expand All @@ -77,8 +77,9 @@ module.exports = {
],

rules: {
"@typescript-eslint/no-unused-vars": "warn"
}
"@typescript-eslint/no-unused-vars": "warn",
"import/namespace": "off",
},
},

// Node
Expand Down
25 changes: 7 additions & 18 deletions app/entry.server.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
import * as Sentry from "@sentry/remix";
import { PassThrough } from "node:stream";

import type { AppLoadContext, EntryContext } from "@remix-run/node";
import type { EntryContext } from "@remix-run/node";
import { createReadableStreamFromReadable } from "@remix-run/node";
import { RemixServer } from "@remix-run/react";
import * as isbotModule from "isbot";
import { renderToPipeableStream } from "react-dom/server";

export const handleError = Sentry.wrapHandleErrorWithSentry((error, { request }) => {
// Custom handleError implementation
});
// export const handleError = Sentry.wrapHandleErrorWithSentry((error, { request }) => {
// // Custom handleError implementation
// });

const ABORT_DELAY = 5_000;

export default function handleRequest(
request: Request,
responseStatusCode: number,
responseHeaders: Headers,
remixContext: EntryContext,
loadContext: AppLoadContext
remixContext: EntryContext
) {
let prohibitOutOfOrderStreaming =
const prohibitOutOfOrderStreaming =
isBotRequest(request.headers.get("user-agent")) || remixContext.isSpaMode;

return prohibitOutOfOrderStreaming
Expand All @@ -38,9 +35,6 @@ export default function handleRequest(
);
}

// We have some Remix apps in the wild already running with isbot@3 so we need
// to maintain backwards compatibility even though we want new apps to use
// isbot@4. That way, we can ship this as a minor Semver update to @remix-run/dev.
function isBotRequest(userAgent: string | null) {
if (!userAgent) {
return false;
Expand All @@ -51,11 +45,6 @@ function isBotRequest(userAgent: string | null) {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ("default" in isbotModule && typeof isbotModule.default === "function") {
return isbotModule.default(userAgent);
}

return false;
}

Expand Down Expand Up @@ -157,4 +146,4 @@ function handleBrowserRequest(

setTimeout(abort, ABORT_DELAY);
});
}
}
2 changes: 1 addition & 1 deletion app/func/__tests__/add_person.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { expect, fit } from "@jest/globals";
import { expect } from "@jest/globals";
import add_person from "../add_person";
import { FRIZZLE, PB_RED, PROJECT_START } from "./common";
import { can_a_pairing_be_made, floating_people } from "../utils";
Expand Down
2 changes: 1 addition & 1 deletion app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ export function ErrorBoundary() {
</body>
</html>
);
}
}
1 change: 1 addition & 0 deletions app/routes/_index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import { redirect } from "@remix-run/node";

export function headers({
Expand Down
1 change: 0 additions & 1 deletion app/routes/home.login.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from "react";
import { ActionFunctionArgs } from "@remix-run/node";
import { Form, Link, useActionData } from "@remix-run/react";
import { PROJECT_PASS, authenticator } from "~/services/auth.server";
Expand Down
22 changes: 1 addition & 21 deletions app/routes/home.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
import { Outlet, useActionData } from "@remix-run/react";
import { Outlet } from "@remix-run/react";
import { LoaderFunctionArgs, LinksFunction } from "@remix-run/node";
import { Footer } from "~/routes/project.$projectId/components/ui/Footer";

import { ErrorResponse } from "~/models/Error.model";

type ActionData = {
action: string;
error: ErrorResponse;
};

import homeStyles from "~/styles/home.css?url";
import { authenticator } from "~/services/auth.server";

Expand All @@ -24,19 +17,6 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
};

export default function Home() {
let signUpErrorResponse: ErrorResponse = {};
let loginErrorResponse: ErrorResponse = {};

const actionData = useActionData<ActionData>();

if (actionData?.error && actionData?.action == "sign-up") {
signUpErrorResponse = actionData?.error;
}

if (actionData?.error && actionData?.action == "login") {
loginErrorResponse = actionData?.error;
}

return (
<div className="layout-wrapper dashboard-container">
<main className="dashboard-content-container">
Expand Down
2 changes: 1 addition & 1 deletion app/routes/project.$projectId/ProjectView.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useContext } from "react";
import React, { useContext } from "react";
import { ProjectContext } from "./contexts/ProjectContext";
import { Workspace } from "./contexts/Workspace";
import { Button } from "~/ui/Button";
Expand Down
2 changes: 1 addition & 1 deletion app/routes/project.$projectId/components/ui/BannerView.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useContext } from "react";
import React, { useContext } from "react";
import { ProjectContext } from "../../contexts/ProjectContext";
import ReactDOM from "react-dom";
import parritIcon from "~/styles/images/parrit-head.svg";
Expand Down
2 changes: 1 addition & 1 deletion app/routes/project.$projectId/contexts/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createContext, useState } from "react";
import React, { createContext, useState } from "react";
import classNames from "classnames";
import { ProjectView } from "../ProjectView";
import { Footer } from "../components/ui/Footer";
Expand Down
6 changes: 2 additions & 4 deletions app/routes/project.$projectId/route.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import {
ActionFunctionArgs,
LinksFunction,
LoaderFunctionArgs,
redirect,
} from "@remix-run/node";

import hydrateProjectServer from "./hydrateProject.server";
Expand Down Expand Up @@ -48,6 +47,5 @@ export async function loader(args: LoaderFunctionArgs) {
return await hydrateProjectServer(args);
}

export default function () {
return <App />;
}
const ProjectPage = () => <App />;
export default ProjectPage;
117 changes: 59 additions & 58 deletions app/routes/sentry-example-page.tsx
Original file line number Diff line number Diff line change
@@ -1,65 +1,66 @@

export default function SentryExamplePage() {
return (
<div>
<main
return (
<div>
<main
style={{
minHeight: "100vh",
display: "flex",
flexDirection: "column",
justifyContent: "center",
alignItems: "center",
}}
>
<h1 style={{ fontSize: "4rem", margin: "14px 0" }}>
{/* biome-ignore lint/a11y/noSvgWithoutTitle: <explanation> */}
<svg
style={{
minHeight: "100vh",
display: "flex",
flexDirection: "column",
justifyContent: "center",
alignItems: "center",
height: "1em",
}}
>

<h1 style={{ fontSize: "4rem", margin: "14px 0" }}>
{/* biome-ignore lint/a11y/noSvgWithoutTitle: <explanation> */}
<svg
style={{
height: "1em",
}}
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 200 44"
>
<path
fill="currentColor"
d="M124.32,28.28,109.56,9.22h-3.68V34.77h3.73V15.19l15.18,19.58h3.26V9.22h-3.73ZM87.15,23.54h13.23V20.22H87.14V12.53h14.93V9.21H83.34V34.77h18.92V31.45H87.14ZM71.59,20.3h0C66.44,19.06,65,18.08,65,15.7c0-2.14,1.89-3.59,4.71-3.59a12.06,12.06,0,0,1,7.07,2.55l2-2.83a14.1,14.1,0,0,0-9-3c-5.06,0-8.59,3-8.59,7.27,0,4.6,3,6.19,8.46,7.52C74.51,24.74,76,25.78,76,28.11s-2,3.77-5.09,3.77a12.34,12.34,0,0,1-8.3-3.26l-2.25,2.69a15.94,15.94,0,0,0,10.42,3.85c5.48,0,9-2.95,9-7.51C79.75,23.79,77.47,21.72,71.59,20.3ZM195.7,9.22l-7.69,12-7.64-12h-4.46L186,24.67V34.78h3.84V24.55L200,9.22Zm-64.63,3.46h8.37v22.1h3.84V12.68h8.37V9.22H131.08ZM169.41,24.8c3.86-1.07,6-3.77,6-7.63,0-4.91-3.59-8-9.38-8H154.67V34.76h3.8V25.58h6.45l6.48,9.2h4.44l-7-9.82Zm-10.95-2.5V12.6h7.17c3.74,0,5.88,1.77,5.88,4.84s-2.29,4.86-5.84,4.86Z M29,2.26a4.67,4.67,0,0,0-8,0L14.42,13.53A32.21,32.21,0,0,1,32.17,40.19H27.55A27.68,27.68,0,0,0,12.09,17.47L6,28a15.92,15.92,0,0,1,9.23,12.17H4.62A.76.76,0,0,1,4,39.06l2.94-5a10.74,10.74,0,0,0-3.36-1.9l-2.91,5a4.54,4.54,0,0,0,1.69,6.24A4.66,4.66,0,0,0,4.62,44H19.15a19.4,19.4,0,0,0-8-17.31l2.31-4A23.87,23.87,0,0,1,23.76,44H36.07a35.88,35.88,0,0,0-16.41-31.8l4.67-8a.77.77,0,0,1,1.05-.27c.53.29,20.29,34.77,20.66,35.17a.76.76,0,0,1-.68,1.13H40.6q.09,1.91,0,3.81h4.78A4.59,4.59,0,0,0,50,39.43a4.49,4.49,0,0,0-.62-2.28Z"
/>
</svg>
</h1>
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 200 44"
>
<path
fill="currentColor"
d="M124.32,28.28,109.56,9.22h-3.68V34.77h3.73V15.19l15.18,19.58h3.26V9.22h-3.73ZM87.15,23.54h13.23V20.22H87.14V12.53h14.93V9.21H83.34V34.77h18.92V31.45H87.14ZM71.59,20.3h0C66.44,19.06,65,18.08,65,15.7c0-2.14,1.89-3.59,4.71-3.59a12.06,12.06,0,0,1,7.07,2.55l2-2.83a14.1,14.1,0,0,0-9-3c-5.06,0-8.59,3-8.59,7.27,0,4.6,3,6.19,8.46,7.52C74.51,24.74,76,25.78,76,28.11s-2,3.77-5.09,3.77a12.34,12.34,0,0,1-8.3-3.26l-2.25,2.69a15.94,15.94,0,0,0,10.42,3.85c5.48,0,9-2.95,9-7.51C79.75,23.79,77.47,21.72,71.59,20.3ZM195.7,9.22l-7.69,12-7.64-12h-4.46L186,24.67V34.78h3.84V24.55L200,9.22Zm-64.63,3.46h8.37v22.1h3.84V12.68h8.37V9.22H131.08ZM169.41,24.8c3.86-1.07,6-3.77,6-7.63,0-4.91-3.59-8-9.38-8H154.67V34.76h3.8V25.58h6.45l6.48,9.2h4.44l-7-9.82Zm-10.95-2.5V12.6h7.17c3.74,0,5.88,1.77,5.88,4.84s-2.29,4.86-5.84,4.86Z M29,2.26a4.67,4.67,0,0,0-8,0L14.42,13.53A32.21,32.21,0,0,1,32.17,40.19H27.55A27.68,27.68,0,0,0,12.09,17.47L6,28a15.92,15.92,0,0,1,9.23,12.17H4.62A.76.76,0,0,1,4,39.06l2.94-5a10.74,10.74,0,0,0-3.36-1.9l-2.91,5a4.54,4.54,0,0,0,1.69,6.24A4.66,4.66,0,0,0,4.62,44H19.15a19.4,19.4,0,0,0-8-17.31l2.31-4A23.87,23.87,0,0,1,23.76,44H36.07a35.88,35.88,0,0,0-16.41-31.8l4.67-8a.77.77,0,0,1,1.05-.27c.53.29,20.29,34.77,20.66,35.17a.76.76,0,0,1-.68,1.13H40.6q.09,1.91,0,3.81h4.78A4.59,4.59,0,0,0,50,39.43a4.49,4.49,0,0,0-.62-2.28Z"
/>
</svg>
</h1>

<p>Get started by sending us a sample error:</p>
<p>Get started by sending us a sample error:</p>

<button
type="button"
style={{
padding: "12px",
cursor: "pointer",
backgroundColor: "#AD6CAA",
borderRadius: "4px",
border: "none",
color: "white",
fontSize: "14px",
margin: "18px",
}}
onClick={() => {
throw new Error("Sentry Example Frontend Error");
}}
>
Throw error!
</button>
<button
type="button"
style={{
padding: "12px",
cursor: "pointer",
backgroundColor: "#AD6CAA",
borderRadius: "4px",
border: "none",
color: "white",
fontSize: "14px",
margin: "18px",
}}
onClick={() => {
throw new Error("Sentry Example Frontend Error");
}}
>
Throw error!
</button>

<p>
Next, look for the error on the{" "}
<a href="https://rurai.sentry.io/issues/?project=4508546855272448">Issues Page</a>.
</p>
<p style={{ marginTop: "24px" }}>
For more information, see{" "}
<a href="https://docs.sentry.io/platforms/javascript/guides/remix/">
https://docs.sentry.io/platforms/javascript/guides/remix/
</a>
</p>
</main>
</div>
);
<p>
Next, look for the error on the{" "}
<a href="https://rurai.sentry.io/issues/?project=4508546855272448">
Issues Page
</a>
.
</p>
<p style={{ marginTop: "24px" }}>
For more information, see{" "}
<a href="https://docs.sentry.io/platforms/javascript/guides/remix/">
https://docs.sentry.io/platforms/javascript/guides/remix/
</a>
</p>
</main>
</div>
);
}

0 comments on commit c82b3eb

Please sign in to comment.