[BREAKING] refactor: move to tRPC

.github/workflows/bundle-analysis.yml

@@ -48,11 +48,7 @@ jobs:
           ANALYZE: true
           RELATIVE_CI_KEY: ${{ secrets.RELATIVE_CI_KEY }}
           NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
-          HASURA_EVENT_SECRET: ${{ secrets.HASURA_EVENT_SECRET }}
           HASH_ALGORITHM: ${{ secrets.HASH_ALGORITHM }}
-          HASURA_ADMIN_SECRET: ${{ secrets.HASURA_ADMIN_SECRET }}
           NEXTAUTH_URL: ${{ secrets.NEXTAUTH_URL }}
           NEXT_PUBLIC_ANALYTICS_DOMAIN: ${{ secrets.NEXT_PUBLIC_ANALYTICS_DOMAIN }}
           NEXT_PUBLIC_APP_URL: ${{ secrets.NEXT_PUBLIC_APP_URL }}
-          NEXT_PUBLIC_HASURA_HTTP_ORIGIN: ${{ secrets.NEXT_PUBLIC_HASURA_HTTP_ORIGIN }}
-          NEXT_PUBLIC_HASURA_WS_ORIGIN: ${{ secrets.NEXT_PUBLIC_HASURA_WS_ORIGIN }}

.github/workflows/cypress.yml

@@ -55,7 +55,5 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
           TEST_USER_ID: ${{ secrets.TEST_USER_ID }}
-          HASURA_EVENT_SECRET: ${{ secrets.HASURA_EVENT_SECRET }}
-          NEXT_PUBLIC_HASURA_HTTP_ORIGIN: ${{ secrets.NEXT_PUBLIC_HASURA_HTTP_ORIGIN }}
           # DEBUG: 'cypress:*'
           # DEBUG_DEPTH: 9

.github/workflows/release.yml

@@ -55,11 +55,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
-          HASURA_EVENT_SECRET: ${{ secrets.HASURA_EVENT_SECRET }}
           HASH_ALGORITHM: ${{ secrets.HASH_ALGORITHM }}
-          HASURA_ADMIN_SECRET: ${{ secrets.HASURA_ADMIN_SECRET }}
           NEXTAUTH_URL: ${{ secrets.NEXTAUTH_URL }}
           NEXT_PUBLIC_ANALYTICS_DOMAIN: ${{ secrets.NEXT_PUBLIC_ANALYTICS_DOMAIN }}
           NEXT_PUBLIC_APP_URL: ${{ secrets.NEXT_PUBLIC_APP_URL }}
-          NEXT_PUBLIC_HASURA_HTTP_ORIGIN: ${{ secrets.NEXT_PUBLIC_HASURA_HTTP_ORIGIN }}
-          NEXT_PUBLIC_HASURA_WS_ORIGIN: ${{ secrets.NEXT_PUBLIC_HASURA_WS_ORIGIN }}

.gitignore

@@ -5,6 +5,7 @@ dist
 .DS_Store
 .next
 out/
+.env
 *.env.local
 .envproduction
 .vercel

.npmrc

@@ -1 +1,3 @@
-strict-peer-dependencies=false
+strict-peer-dependencies=false
+save-exact=true
+public-hoist-pattern[]=*prisma*

.prettierignore

@@ -1,10 +1,7 @@
 .github/ISSUE_TEMPLATE
 **/.next
 **/.cache
-**/generated
-services/hasura/metadata
 
 .github/PULL_REQUEST_TEMPLATE.md
 pnpm-lock.yaml
-**/schema.graphql
 **/email/templates/*.html

README-zh.md

@@ -58,7 +58,6 @@
 - [![TailwindCSS](https://img.shields.io/badge/tailwindcss-%2338B2AC.svg?style=for-the-badge&logo=tailwind-css&logoColor=white)](https://tailwindcss.com/)
 - [![cypress](https://img.shields.io/badge/-cypress-%23E5E5E5?style=for-the-badge&logo=cypress&logoColor=058a5e)](https://www.cypress.io/)
 - [![Jest](https://img.shields.io/badge/-jest-%23C21325?style=for-the-badge&logo=jest&logoColor=white)](https://jestjs.io/)
-- [urql](https://github.com/FormidableLabs/urql)
 - [next-auth](https://github.com/nextauthjs/next-auth)
 - [tiptap](https://tiptap.dev)
 - [Plausible](https://github.com/plausible/analytics)

README.md

@@ -58,7 +58,6 @@ You can have a [self-hosted](https://chirpy.dev/docs/self-hosted) version of Chi
 - [![TailwindCSS](https://img.shields.io/badge/tailwindcss-%2338B2AC.svg?style=for-the-badge&logo=tailwind-css&logoColor=white)](https://tailwindcss.com/)
 - [![cypress](https://img.shields.io/badge/-cypress-%23E5E5E5?style=for-the-badge&logo=cypress&logoColor=058a5e)](https://www.cypress.io/)
 - [![Jest](https://img.shields.io/badge/-jest-%23C21325?style=for-the-badge&logo=jest&logoColor=white)](https://jestjs.io/)
-- [urql](https://github.com/FormidableLabs/urql)
 - [next-auth](https://github.com/nextauthjs/next-auth)
 - [tiptap](https://tiptap.dev)
 - [Plausible](https://github.com/plausible/analytics)

apps/comment-bootstrapper/package.json

@@ -21,7 +21,7 @@
     "dotenv": "16.0.3",
     "dotenv-cli": "6.0.0",
     "dotenv-expand": "9.0.0",
-    "eslint": "8.27.0",
+    "eslint": "8.28.0",
     "jest": "29.3.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",

apps/comment-bootstrapper/src/lib/comment-bootstrapper.ts

@@ -1,8 +1,8 @@
 import { EVENT_CLICK_CONTAINER } from '@chirpy-dev/utils';
 
 import { ERR_UNMATCHED_DOMAIN } from '../../../main/src/server/common/error-code';
+import type { PagePayload } from '../../../main/src/server/services/page';
 import type { ResponseError } from '../../../main/src/server/types/error';
-import type { GetPagByUrl } from '../../../main/src/server/types/page';
 import {
   observeAndBroadcastThemeChange,
   observeWidgetLoadedEvent,
@@ -49,7 +49,7 @@ export async function initCommentWidget(): Promise<void> {
       origin + pathname,
     )}&title=${encodeURIComponent(window.document.title)}`,
   );
-  const page: GetPagByUrl = await res.json();
+  const page: PagePayload = await res.json();
   if (isResponseError(page)) {
     if (page.code == ERR_UNMATCHED_DOMAIN) {
       return console.error(page.error);
@@ -96,7 +96,7 @@ export async function initCommentWidget(): Promise<void> {
   renderTarget.append(iframe);
 }
 
-function isResponseError(res: GetPagByUrl): res is ResponseError {
+function isResponseError(res: PagePayload): res is ResponseError {
   return !!(res as ResponseError).error;
 }
 

apps/e2e/cypress/plugins/index.ts

@@ -20,9 +20,5 @@ export default function Plugins(
     0,
     23,
   );
-  config.env.HASURA_EVENT_SECRET = process.env.HASURA_EVENT_SECRET;
-  config.env.NEXT_PUBLIC_HASURA_HTTP_ORIGIN =
-    process.env.NEXT_PUBLIC_HASURA_HTTP_ORIGIN;
-
   return config;
 }

apps/e2e/cypress/support/commands.ts

@@ -28,8 +28,6 @@ import '@testing-library/cypress/add-commands';
 import { waitGraphql } from '../fixtures/utils';
 
 Cypress.Commands.add('login', () => {
-  cy.intercept(Cypress.env('NEXT_PUBLIC_HASURA_HTTP_ORIGIN')).as('graphql');
-
   cy.visit('/auth/sign-in?allowAnonymous=true');
   cy.get('input[name=name]').type(Cypress.env('TEST_USER_ID'));
   cy.get('button[type=submit]').click();

apps/e2e/package.json

@@ -15,7 +15,7 @@
     "dotenv": "16.0.3",
     "dotenv-cli": "6.0.0",
     "dotenv-expand": "9.0.0",
-    "eslint": "8.27.0",
+    "eslint": "8.28.0",
     "typescript": "4.9.3"
   },
   "publishConfig": {

apps/emails/config.production.js

@@ -14,10 +14,7 @@ module.exports = {
   build: {
     templates: {
       destination: {
-        path: path.resolve(
-          __dirname,
-          '../main/src/server/services/email/templates',
-        ),
+        path: path.resolve(__dirname, '../../packages/emails/src/templates'),
       },
     },
   },

apps/emails/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@chirpy-dev/emails",
+  "name": "@chirpy-dev/emails-app",
   "version": "0.0.1",
   "license": "AGPL-3.0-or-later",
   "main": "./config.js",
@@ -19,7 +19,5 @@
     "tailwindcss-email-variants": "2.0.0",
     "tailwindcss-mso": "1.3.0"
   },
-  "publishConfig": {
-    "access": "public"
-  }
+  "private": true
 }

apps/main/.env-tmpl

@@ -1,12 +1,7 @@
 # Default value for local development
-NEXT_PUBLIC_HASURA_HTTP_ORIGIN="http://localhost:8080/v1/graphql"
-NEXT_PUBLIC_HASURA_WS_ORIGIN="ws://localhost:8080/v1/graphql"
 NEXT_PUBLIC_APP_URL=http://localhost:3000
 NEXT_PUBLIC_ANALYTICS_DOMAIN=http://localhost:8000
 
-HASURA_ADMIN_SECRET=myadminsecretkey
-HASURA_EVENT_SECRET=myeventsecretkey
-
 NEXTAUTH_URL=http://localhost:3000
 # Copy the key of `HASURA_GRAPHQL_JWT_SECRET` from `services/hasura/docker-compose.local.yaml`, it used by next-auth and hasura
 NEXTAUTH_SECRET=

apps/main/.env.docker

@@ -1,7 +1,5 @@
 
 # Used by docker to generate runtime public env var
-NEXT_PUBLIC_HASURA_HTTP_ORIGIN=
-NEXT_PUBLIC_HASURA_WS_ORIGIN=
 NEXT_PUBLIC_APP_URL=
 NEXT_PUBLIC_ANALYTICS_DOMAIN=
 NEXT_PUBLIC_VAPID=

apps/main/next.config.js

@@ -31,10 +31,16 @@ const nextConfig = {
     scrollRestoration: true,
     legacyBrowsers: false,
     transpilePackages: [
+      '@chirpy-dev/emails',
       '@chirpy-dev/ui',
       '@chirpy-dev/utils',
       '@chirpy-dev/graphql',
       '@chirpy-dev/types',
+      '@chirpy-dev/trpc',
+    ],
+    swcPlugins: [
+      // Allow Date/Map in getStaticProps
+      ['next-superjson-plugin', {}],
     ],
   },
   async rewrites() {
@@ -106,6 +112,14 @@ const nextConfig = {
       test: /\.html$/,
       loader: 'html-loader',
     });
+    if (!isServer) {
+      config.resolve.fallback = {
+        ...config.resolve.fallback,
+        net: false,
+        tls: false,
+        fs: false,
+      };
+    }
     return config;
   },
 };

apps/main/package.json

@@ -15,18 +15,17 @@
     "test:coverage": "DEBUG_PRINT_LIMIT=999999 jest --silent=false --coverage"
   },
   "dependencies": {
-    "@chirpy-dev/graphql": "workspace:*",
+    "@chirpy-dev/emails": "workspace:*",
+    "@chirpy-dev/trpc": "workspace:*",
     "@chirpy-dev/types": "workspace:*",
     "@chirpy-dev/ui": "workspace:*",
     "@chirpy-dev/utils": "workspace:*",
     "@radix-ui/colors": "0.1.8",
-    "@sendinblue/client": "3.2.2",
     "@tensorflow-models/toxicity": "1.2.2",
     "@tensorflow/tfjs": "3.18.0",
     "@tensorflow/tfjs-converter": "3.18.0",
     "@tensorflow/tfjs-core": "3.18.0",
     "cors": "2.8.5",
-    "eta": "1.12.3",
     "github-slugger": "1.5.0",
     "graphql": "16.6.0",
     "graphql-tag": "2.12.6",
@@ -35,14 +34,13 @@
     "html-loader": "4.2.0",
     "jsonwebtoken": "8.5.1",
     "lodash": "4.17.21",
-    "next": "13.0.4",
-    "next-auth": "4.16.4",
+    "next": "13.0.5",
     "next-axiom": "0.15.1",
     "next-connect": "0.13.0",
     "next-mdx-remote": "3.0.8",
     "next-plausible": "3.6.4",
+    "next-superjson-plugin": "0.4.9",
     "next-themes": "0.2.1",
-    "next-urql": "4.0.0",
     "nodemailer": "6.7.8",
     "react": "18.2.0",
     "react-dom": "18.2.0",
@@ -54,7 +52,6 @@
     "shiki": "0.11.1",
     "superjson": "1.11.0",
     "type-fest": "3.2.0",
-    "urql": "3.0.3",
     "web-push": "3.5.0",
     "wonka": "6.1.1",
     "ws": "8.11.0"
@@ -65,7 +62,7 @@
     "@chirpy-dev/eslint-config": "workspace:*",
     "@chirpy-dev/service-worker": "workspace:*",
     "@chirpy-dev/tsconfigs": "workspace:*",
-    "@next/bundle-analyzer": "13.0.4",
+    "@next/bundle-analyzer": "13.0.5",
     "@relative-ci/agent": "4.1.1",
     "@types/cors": "2.8.12",
     "@types/github-slugger": "1.3.0",
@@ -82,10 +79,9 @@
     "dotenv": "16.0.3",
     "dotenv-cli": "6.0.0",
     "dotenv-expand": "9.0.0",
-    "eslint": "8.27.0",
+    "eslint": "8.28.0",
     "jest": "29.3.1",
     "postcss": "8.4.19",
-    "stellate": "1.17.1",
     "tailwindcss": "3.2.4",
     "typescript": "4.9.3",
     "webpack": "5.75.0"