Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

📦 NEW: Remix 2.4.0 support #15

Merged
merged 1 commit into from
Dec 21, 2023
Merged

📦 NEW: Remix 2.4.0 support #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
],
//import
"import/no-cycle": "error",
"import/no-unresolved": "error",
"import/no-default-export": "warn",
"import/order": [
"error",
Expand Down
2 changes: 1 addition & 1 deletion app/entry.client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from "react";

import { RemixBrowser } from "@remix-run/react";
import { hydrateRoot } from "react-dom/client";
import type { Locales } from "remix-utils";
import type { Locales } from "remix-utils/locales/server";

import { LocaleProvider } from "~/utils";

Expand Down
11 changes: 7 additions & 4 deletions app/entry.server.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { PassThrough } from "stream";

import { Response } from "@remix-run/node";
import type { EntryContext } from "@remix-run/node";
import {
createReadableStreamFromReadable,
type EntryContext,
} from "@remix-run/node";
import { RemixServer } from "@remix-run/react";
import isbot from "isbot";
import { renderToPipeableStream } from "react-dom/server";
import { getClientLocales } from "remix-utils";
import { getClientLocales } from "remix-utils/locales/server";

import { LocaleProvider, getCookie, Logger } from "~/utils";

Expand Down Expand Up @@ -34,11 +36,12 @@ export default function handleRequest(
{
[callbackName]() {
const body = new PassThrough();
const stream = createReadableStreamFromReadable(body);

responseHeaders.set("Content-Type", "text/html");

resolve(
new Response(body, {
new Response(stream, {
status: didError ? 500 : responseStatusCode,
headers: responseHeaders,
}),
Expand Down
17 changes: 5 additions & 12 deletions app/root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ import { Fragment, useEffect, useState } from "react";

import { Dialog, Transition } from "@headlessui/react";
import { Bars3Icon, XCircleIcon, XMarkIcon } from "@heroicons/react/24/outline";
import { cssBundleHref } from "@remix-run/css-bundle";
import type {
LinksFunction,
LoaderArgs,
V2_MetaFunction as MetaFunction,
LoaderFunctionArgs,
MetaFunction,
} from "@remix-run/node";
import {
Form,
Expand All @@ -31,22 +30,16 @@ import { getUserTier } from "./modules/user";
import tailwindStylesheetUrl from "./styles/tailwind.css";

export const links: LinksFunction = () => [
{ rel: "preload", href: tailwindStylesheetUrl, as: "style" },
{ rel: "stylesheet", href: tailwindStylesheetUrl, as: "style" },
...(cssBundleHref
? [
{ rel: "preload", href: cssBundleHref, as: "style" },
{ rel: "stylesheet", href: cssBundleHref },
]
: []),
{ rel: "stylesheet preload prefetch", href: tailwindStylesheetUrl, as: "style" },

];

export const meta: MetaFunction = () => [
{ title: "Notee" },
{ name: "description", content: "Notee App" },
];

export async function loader({ request }: LoaderArgs) {
export async function loader({ request }: LoaderFunctionArgs) {
const isAnonymous = await isAnonymousSession(request);

if (isAnonymous) {
Expand Down
4 changes: 2 additions & 2 deletions app/routes/_index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type { LoaderArgs } from "@remix-run/node";
import type { LoaderFunctionArgs } from "@remix-run/node";
import { useLoaderData } from "@remix-run/react";

import { ButtonLink } from "~/components";
import { isAnonymousSession } from "~/modules/auth";
import { getPricingPlan, PricingTable } from "~/modules/price";
import { getDefaultCurrency, response } from "~/utils";

export async function loader({ request }: LoaderArgs) {
export async function loader({ request }: LoaderFunctionArgs) {
const isAnonymous = await isAnonymousSession(request);

if (!isAnonymous) {
Expand Down
4 changes: 2 additions & 2 deletions app/routes/api.customer-portal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { ActionArgs } from "@remix-run/node";
import type { ActionFunctionArgs } from "@remix-run/node";

import { requireAuthSession } from "~/modules/auth";
import { createBillingPortalSession } from "~/modules/billing-portal";
import { getBillingInfo } from "~/modules/user";
import { response } from "~/utils";

export async function action({ request }: ActionArgs) {
export async function action({ request }: ActionFunctionArgs) {
const authSession = await requireAuthSession(request);
const { userId } = authSession;

Expand Down
4 changes: 2 additions & 2 deletions app/routes/api.subscribe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ActionArgs } from "@remix-run/node";
import type { ActionFunctionArgs } from "@remix-run/node";
import { parseFormAny } from "react-zorm";
import { z } from "zod";

Expand All @@ -10,7 +10,7 @@ import { response, parseData, SupaStripeStackError } from "~/utils";

export type SubscribeApiAction = typeof action;

export async function action({ request }: ActionArgs) {
export async function action({ request }: ActionFunctionArgs) {
const authSession = await requireAuthSession(request);
const { userId } = authSession;

Expand Down
4 changes: 2 additions & 2 deletions app/routes/api.webhook.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ActionArgs } from "@remix-run/node";
import type { ActionFunctionArgs } from "@remix-run/node";
import { z } from "zod";

import { stripe } from "~/integrations/stripe";
Expand Down Expand Up @@ -52,7 +52,7 @@ async function getStripeEvent(request: Request) {
}
}

export async function action({ request }: ActionArgs) {
export async function action({ request }: ActionFunctionArgs) {
const event = await getStripeEvent(request);
const eventId = event.id;

Expand Down
6 changes: 3 additions & 3 deletions app/routes/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CloudArrowUpIcon, TrashIcon } from "@heroicons/react/24/outline";
import type { ActionArgs, LoaderArgs } from "@remix-run/node";
import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/node";
import {
Form,
useActionData,
Expand Down Expand Up @@ -27,7 +27,7 @@ import {
*
*/

export async function loader({ request }: LoaderArgs) {
export async function loader({ request }: LoaderFunctionArgs) {
const authSession = await requireAuthSession(request);
const { userId } = authSession;

Expand Down Expand Up @@ -56,7 +56,7 @@ const NoteFormSchema = z.object({
content: z.string().trim().min(1),
});

export async function action({ request }: ActionArgs) {
export async function action({ request }: ActionFunctionArgs) {
const authSession = await requireAuthSession(request);
const { userId } = authSession;

Expand Down
4 changes: 2 additions & 2 deletions app/routes/checkout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { SparklesIcon } from "@heroicons/react/24/outline";
import type { LoaderArgs } from "@remix-run/node";
import type { LoaderFunctionArgs } from "@remix-run/node";
import { Link, useLoaderData, useSubmit } from "@remix-run/react";

import { useInterval } from "~/hooks";
import { requireAuthSession } from "~/modules/auth";
import { getSubscription } from "~/modules/subscription";
import { response } from "~/utils";

export async function loader({ request }: LoaderArgs) {
export async function loader({ request }: LoaderFunctionArgs) {
const authSession = await requireAuthSession(request);
const { userId } = authSession;

Expand Down
4 changes: 2 additions & 2 deletions app/routes/healthcheck.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// learn more: https://fly.io/docs/reference/configuration/#services-http_checks
import type { LoaderArgs } from "@remix-run/node";
import type { LoaderFunctionArgs } from "@remix-run/node";

import { db } from "~/database";

export async function loader({ request }: LoaderArgs) {
export async function loader({ request }: LoaderFunctionArgs) {
const host =
request.headers.get("X-Forwarded-Host") ?? request.headers.get("host");

Expand Down
8 changes: 3 additions & 5 deletions app/routes/join.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import * as React from "react";

import type { ActionArgs, LoaderArgs } from "@remix-run/node";
import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/node";
import {
Form,
Link,
Expand All @@ -21,7 +19,7 @@ import {
SupaStripeStackError,
} from "~/utils";

export async function loader({ request }: LoaderArgs) {
export async function loader({ request }: LoaderFunctionArgs) {
try {
const isAnonymous = await isAnonymousSession(request);

Expand All @@ -45,7 +43,7 @@ const JoinFormSchema = z.object({
redirectTo: z.string().optional(),
});

export async function action({ request }: ActionArgs) {
export async function action({ request }: ActionFunctionArgs) {
try {
const payload = await parseData(
parseFormAny(await request.formData()),
Expand Down
6 changes: 3 additions & 3 deletions app/routes/login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ActionArgs, LoaderArgs } from "@remix-run/node";
import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/node";
import {
Form,
Link,
Expand All @@ -17,7 +17,7 @@ import {
} from "~/modules/auth";
import { response, isFormProcessing, parseData } from "~/utils";

export async function loader({ request }: LoaderArgs) {
export async function loader({ request }: LoaderFunctionArgs) {
try {
const isAnonymous = await isAnonymousSession(request);

Expand All @@ -40,7 +40,7 @@ const LoginFormSchema = z.object({
redirectTo: z.string().optional(),
});

export async function action({ request }: ActionArgs) {
export async function action({ request }: ActionFunctionArgs) {
try {
const payload = await parseData(
parseFormAny(await request.formData()),
Expand Down
4 changes: 2 additions & 2 deletions app/routes/logout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { ActionArgs } from "@remix-run/node";
import type { ActionFunctionArgs } from "@remix-run/node";

import { destroyAuthSession } from "~/modules/auth";
import { response } from "~/utils";

export async function action({ request }: ActionArgs) {
export async function action({ request }: ActionFunctionArgs) {
return destroyAuthSession(request);
}

Expand Down
6 changes: 3 additions & 3 deletions app/routes/subscription.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { InformationCircleIcon } from "@heroicons/react/24/outline";
import type { ActionArgs, LoaderArgs } from "@remix-run/node";
import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/node";
import {
Form,
useFetcher,
Expand All @@ -14,7 +14,7 @@ import { getSubscription } from "~/modules/subscription";
import { deleteUser, getBillingInfo, getUserTier } from "~/modules/user";
import { getDefaultCurrency, response, isFormProcessing, tw } from "~/utils";

export async function loader({ request }: LoaderArgs) {
export async function loader({ request }: LoaderFunctionArgs) {
const authSession = await requireAuthSession(request);
const { userId } = authSession;

Expand Down Expand Up @@ -42,7 +42,7 @@ export async function loader({ request }: LoaderArgs) {
}
}

export async function action({ request }: ActionArgs) {
export async function action({ request }: ActionFunctionArgs) {
const authSession = await requireAuthSession(request);
const { userId } = authSession;

Expand Down
3 changes: 1 addition & 2 deletions app/utils/http.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Currency } from "@prisma/client";
import type { ResponseInit } from "@remix-run/node";
import { redirect, json, defer } from "@remix-run/node";
import countryToCurrency from "country-to-currency";
import { getClientLocales } from "remix-utils";
import { getClientLocales } from "remix-utils/locales/server";
import { z } from "zod";

import { DEFAULT_CURRENCY } from "./env";
Expand Down
2 changes: 1 addition & 1 deletion app/utils/locale-provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { createContext, useContext, useMemo } from "react";

import type { Locales } from "remix-utils";
import type { Locales } from "remix-utils/locales/server";

import { SupaStripeStackError } from "./error";

Expand Down
47 changes: 24 additions & 23 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,47 +24,48 @@
},
"dependencies": {
"@headlessui/react": "^1.7.17",
"@heroicons/react": "^2.0.18",
"@heroicons/react": "^2.1.1",
"@paralleldrive/cuid2": "^2.2.2",
"@prisma/client": "^5.2.0",
"@remix-run/css-bundle": "^1.19.3",
"@prisma/client": "^5.7.1",
"@remix-run/node": "*",
"@remix-run/react": "*",
"@remix-run/serve": "*",
"@supabase/supabase-js": "^2.33.1",
"cookie": "^0.5.0",
"country-to-currency": "^1.0.11",
"isbot": "^3.6.13",
"pino": "^8.15.0",
"@supabase/supabase-js": "^2.39.1",
"autoprefixer": "^10.4.16",
"cookie": "^0.6.0",
"country-to-currency": "^1.1.0",
"intl-parse-accept-language": "^1.0.0",
"isbot": "^3.7.1",
"pino": "^8.17.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-zorm": "^0.9.0",
"remix-utils": "^6.6.0",
"remix-utils": "^7.4.0",
"stripe": "^11.18.0",
"tailwind-merge": "^1.14.0",
"zod": "^3.22.2"
"tailwind-merge": "^2.1.0",
"zod": "^3.22.4"
},
"devDependencies": {
"@remix-run/dev": "*",
"@remix-run/eslint-config": "*",
"@tailwindcss/forms": "^0.5.6",
"@tailwindcss/typography": "^0.5.9",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.10",
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.18",
"cross-env": "^7.0.3",
"dotenv-cli": "^7.3.0",
"eslint": "^8.48.0",
"eslint-config-prettier": "^9.0.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-tailwindcss": "^3.13.0",
"npm-run-all": "^4.1.5",
"pino-pretty": "^10.2.0",
"prettier": "3.0.3",
"prisma": "^5.2.0",
"pino-pretty": "^10.3.0",
"prettier": "3.1.1",
"prisma": "^5.7.1",
"tailwind-scrollbar": "^3.0.5",
"tailwindcss": "^3.3.3",
"ts-node": "^10.9.1",
"tailwindcss": "^3.4.0",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.2.2"
"typescript": "^5.3.3"
},
"engines": {
"node": ">=18"
Expand Down
Loading