♻️ Remove backend package (#1305)

apps/landing/next.config.js

@@ -19,12 +19,7 @@ const nextConfig = {
   i18n: i18n,
   productionBrowserSourceMaps: true,
   output: "standalone",
-  transpilePackages: [
+  transpilePackages: ["@rallly/icons", "@rallly/ui", "@rallly/tailwind-config"],
-    "@rallly/backend",
-    "@rallly/icons",
-    "@rallly/ui",
-    "@rallly/tailwind-config",
-  ],
   webpack(config) {
     config.module.rules.push({
       test: /\.svg$/,

apps/web/next.config.js

@@ -18,7 +18,6 @@ const nextConfig = {
     process.env.NEXT_PUBLIC_SELF_HOSTED === "true" ? "standalone" : undefined,
   productionBrowserSourceMaps: true,
   transpilePackages: [
-    "@rallly/backend",
     "@rallly/database",
     "@rallly/icons",
     "@rallly/ui",

apps/web/package.json

@@ -24,14 +24,13 @@
     "@next/bundle-analyzer": "^12.3.4",
     "@radix-ui/react-slot": "^1.0.1",
     "@radix-ui/react-switch": "^1.0.2",
-    "@rallly/backend": "*",
     "@rallly/billing": "*",
     "@rallly/database": "*",
+    "@rallly/emails": "*",
     "@rallly/icons": "*",
     "@rallly/languages": "*",
     "@rallly/tailwind-config": "*",
     "@rallly/ui": "*",
-    "@rallly/emails": "*",
     "@sentry/nextjs": "*",
     "@svgr/webpack": "^6.5.1",
     "@t3-oss/env-nextjs": "^0.11.0",
@@ -40,6 +39,7 @@
     "@trpc/client": "^10.13.0",
     "@trpc/next": "^10.13.0",
     "@trpc/react-query": "^10.13.0",
+    "@trpc/server": "^10.13.0",
     "@upstash/ratelimit": "^1.2.1",
     "@vercel/functions": "^1.0.2",
     "@vercel/kv": "^2.0.0",
@@ -51,9 +51,9 @@
     "cookie": "^0.6.0",
     "crypto": "^1.0.1",
     "dayjs": "^1.11.10",
-    "i18next": "^22.4.9",
     "i18next-icu": "^2.3.0",
     "i18next-resources-to-backend": "^1.1.4",
+    "i18next": "^22.4.9",
     "ics": "^3.1.0",
     "intl-messageformat": "^10.3.4",
     "iron-session": "^6.3.1",
@@ -71,8 +71,8 @@
     "posthog-js": "^1.154.0",
     "posthog-node": "^4.0.1",
     "react-big-calendar": "^1.8.1",
-    "react-hook-form": "^7.42.1",
     "react-hook-form-persist": "^3.0.0",
+    "react-hook-form": "^7.42.1",
     "react-i18next": "^12.1.4",
     "react-remove-scroll": "^2.5.6",
     "react-use": "^17.4.0",

apps/web/src/app/guest.ts

@@ -1,8 +1,8 @@
-import { randomid } from "@rallly/backend/utils/nanoid";
 import { NextRequest, NextResponse } from "next/server";
 import { encode, JWT } from "next-auth/jwt";
 
 import { absoluteUrl } from "@/utils/absolute-url";
+import { randomid } from "@/utils/nanoid";
 
 function getCookieSettings() {
   const secure = absoluteUrl().startsWith("https://");

apps/web/src/app/providers.tsx

@@ -1,5 +1,4 @@
 "use client";
-import { AppRouter } from "@rallly/backend/trpc/routers";
 import { TooltipProvider } from "@rallly/ui/tooltip";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { createTRPCReact } from "@trpc/react-query";
@@ -9,6 +8,7 @@ import { useState } from "react";
 
 import { I18nProvider } from "@/app/i18n/client";
 import { UserProvider } from "@/components/user-provider";
+import { AppRouter } from "@/trpc/routers";
 import { ConnectedDayjsProvider } from "@/utils/dayjs";
 import { trpcConfig } from "@/utils/trpc/config";
 

apps/web/src/pages/[locale]/auth/disable-notifications.tsx

@@ -1,9 +1,9 @@
-import { DisableNotificationsPayload } from "@rallly/backend";
-import { decryptToken } from "@rallly/backend/session";
 import { prisma } from "@rallly/database";
 import { GetServerSideProps } from "next";
 
+import type { DisableNotificationsPayload } from "@/trpc/types";
 import { getServerSession } from "@/utils/auth";
+import { decryptToken } from "@/utils/session";
 
 const Page = () => {
   return null;

apps/web/src/pages/api/trpc/[trpc].ts

@@ -1,5 +1,3 @@
-import { createTRPCContext } from "@rallly/backend/trpc/context";
-import { AppRouter, appRouter } from "@rallly/backend/trpc/routers";
 import * as Sentry from "@sentry/nextjs";
 import { createNextApiHandler } from "@trpc/server/adapters/next";
 import { Ratelimit } from "@upstash/ratelimit";
@@ -7,6 +5,8 @@ import { kv } from "@vercel/kv";
 import requestIp from "request-ip";
 
 import { posthog, posthogApiHandler } from "@/app/posthog";
+import { createTRPCContext } from "@/trpc/context";
+import { AppRouter, appRouter } from "@/trpc/routers";
 import { absoluteUrl, shortUrl } from "@/utils/absolute-url";
 import { getServerSession, isEmailBlocked } from "@/utils/auth";
 import { isSelfHosted } from "@/utils/constants";

apps/web/src/trpc/routers/auth.ts

@@ -1,8 +1,9 @@
 import { prisma } from "@rallly/database";
 import { z } from "zod";
 
-import { createToken, decryptToken } from "../../session";
+import { generateOtp } from "@/utils/nanoid";
-import { generateOtp } from "../../utils/nanoid";
+import { createToken, decryptToken } from "@/utils/session";
+
 import { publicProcedure, rateLimitMiddleware, router } from "../trpc";
 import { RegistrationTokenPayload } from "../types";
 

apps/web/src/trpc/routers/polls/comments.ts

@@ -1,7 +1,8 @@
 import { prisma } from "@rallly/database";
 import { z } from "zod";
 
-import { createToken } from "../../../session";
+import { createToken } from "@/utils/session";
+
 import { publicProcedure, router } from "../../trpc";
 import { DisableNotificationsPayload } from "../../types";
 

apps/web/src/trpc/routers/polls/participants.ts

@@ -2,7 +2,8 @@ import { prisma } from "@rallly/database";
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
 
-import { createToken } from "../../../session";
+import { createToken } from "@/utils/session";
+
 import { publicProcedure, rateLimitMiddleware, router } from "../../trpc";
 import { DisableNotificationsPayload } from "../../types";
 

apps/web/src/trpc/routers/user.ts

@@ -1,7 +1,8 @@
 import { prisma } from "@rallly/database";
 import { z } from "zod";
 
-import { getSubscriptionStatus } from "../../utils/auth";
+import { getSubscriptionStatus } from "@/utils/subscription";
+
 import {
   possiblyPublicProcedure,
   privateProcedure,

apps/web/src/trpc/trpc.ts

@@ -1,7 +1,8 @@
 import { initTRPC, TRPCError } from "@trpc/server";
 import superjson from "superjson";
 
-import { getSubscriptionStatus } from "../utils/auth";
+import { getSubscriptionStatus } from "@/utils/subscription";
+
 import { TRPCContext } from "./context";
 
 const t = initTRPC.context<TRPCContext>().create({

apps/web/src/utils/auth.ts

@@ -1,6 +1,3 @@
-import { RegistrationTokenPayload } from "@rallly/backend";
-import { decryptToken } from "@rallly/backend/session";
-import { generateOtp, randomid } from "@rallly/backend/utils/nanoid";
 import { prisma } from "@rallly/database";
 import {
   GetServerSidePropsContext,
@@ -19,11 +16,14 @@ import { Provider } from "next-auth/providers/index";
 
 import { posthog } from "@/app/posthog";
 import { env } from "@/env";
+import type { RegistrationTokenPayload } from "@/trpc/types";
 import { absoluteUrl } from "@/utils/absolute-url";
 import { CustomPrismaAdapter } from "@/utils/auth/custom-prisma-adapter";
 import { mergeGuestsIntoUser } from "@/utils/auth/merge-user";
 import { getEmailClient } from "@/utils/emails";
 import { getValueByPath } from "@/utils/get-value-by-path";
+import { generateOtp, randomid } from "@/utils/nanoid";
+import { decryptToken } from "@/utils/session";
 
 const providers: Provider[] = [
   // When a user registers, we don't want to go through the email verification process

apps/web/src/utils/trpc/client.ts

@@ -1,6 +1,6 @@
-import { AppRouter } from "@rallly/backend/trpc/routers";
 import { createTRPCNext } from "@trpc/next";
 
+import type { AppRouter } from "@/trpc/routers";
 import { trpcConfig } from "@/utils/trpc/config";
 
 export const trpc = createTRPCNext<AppRouter>({

packages/backend/.eslintrc.js

@@ -1,4 +0,0 @@
-/** @type {import("eslint").Linter.Config} */
-module.exports = {
-  ...require("@rallly/eslint-config")(__dirname),
-};

packages/backend/index.ts

@@ -1 +0,0 @@
-export * from "./trpc/types";

packages/backend/next/edge.ts

@@ -1,11 +0,0 @@
-import type { IncomingMessage, ServerResponse } from "http";
-import { getIronSession } from "iron-session/edge";
-
-import { sessionConfig } from "../session-config";
-
-export const getSession = async (
-  req: Request | IncomingMessage,
-  res: Response | ServerResponse,
-) => {
-  return getIronSession(req, res, sessionConfig);
-};

packages/backend/next/index.ts

@@ -1 +0,0 @@
-export * from "./utils";

packages/backend/next/utils.ts

@@ -1,29 +0,0 @@
-import { GetServerSideProps } from "next";
-
-export function composeGetServerSideProps(
-  ...fns: GetServerSideProps[]
-): GetServerSideProps {
-  return async (ctx) => {
-    const res = { props: {} };
-    for (const getServerSideProps of fns) {
-      const fnRes = await getServerSideProps(ctx);
-
-      if ("notFound" in fnRes) {
-        return fnRes;
-      }
-
-      if ("redirect" in fnRes) {
-        return fnRes;
-      }
-
-      if ("props" in fnRes) {
-        res.props = {
-          ...res.props,
-          ...fnRes.props,
-        };
-      }
-    }
-
-    return res;
-  };
-}

packages/backend/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "@rallly/backend",
-  "version": "0.0.0",
-  "private": true,
-  "scripts": {
-    "lint": "eslint .",
-    "type-check": "tsc --pretty --noEmit"
-  },
-  "main": "src/index.ts",
-  "types": "src/index.ts",
-  "dependencies": {
-    "@rallly/database": "*",
-    "@rallly/features": "*",
-    "@rallly/emails": "*",
-    "@rallly/utils": "*",
-    "@trpc/server": "^10.13.0",
-    "iron-session": "^6.3.1",
-    "spacetime": "^7.4.7",
-    "stripe": "^13.2.0"
-  }
-}

packages/backend/tsconfig.json

@@ -1,5 +0,0 @@
-{
-  "extends": "@rallly/tsconfig/next.json",
-  "include": ["**/*.ts", "**/*.tsx", "**/*.js"],
-  "exclude": ["node_modules"],
-}

yarn.lock

@@ -4943,9 +4943,9 @@
   integrity sha512-pCLZfIgcnneq1AocPLvstALawZYWS/sbhujd4mwUwA3UXFBWC/D31ysPlbz7R1dhjxhhPaIM+C6pz8vmr2ctpw==
 
 "@trpc/server@^10.13.0":
-  version "10.13.2"
+  version "10.45.2"
-  resolved "https://registry.npmjs.org/@trpc/server/-/server-10.13.2.tgz"
+  resolved "https://registry.yarnpkg.com/@trpc/server/-/server-10.45.2.tgz#5f2778c4810f93b5dc407146334f8da70a0b51fb"
-  integrity sha512-/5L09a7EHxRy1D6RIFsIt5fMJ8bBspMp/eDPjAH7T033f9AMyYx0jWU7r5lswoBVSbdUDJgxKyLzwXIrVNVisg==
+  integrity sha512-wOrSThNNE4HUnuhJG6PfDRp4L2009KDVxsd+2VYH8ro6o/7/jwYZ8Uu5j+VaW+mOmc8EHerHzGcdbGNQSAUPgg==
 
 "@trysound/sax@0.2.0":
   version "0.2.0"