Inshur · ericbondinshur · Sep 10, 2024 · Sep 11, 2024 · Sep 11, 2024 · Sep 11, 2024
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ node_modules
 
 # production
 /build
+/dist
 
 # misc
 .DS_Store

diff --git a/api/package.json b/api/package.json
@@ -10,17 +10,17 @@
   },
   "dependencies": {
     "cors": "^2.8.5",
-    "debug": "^4.3.1",
-    "dotenv": "^8.2.0",
-    "express": "^4.17.1"
+    "debug": "^4.3.7",
+    "dotenv": "^16.4.5",
+    "express": "^4.20.0"
   },
   "devDependencies": {
-    "@types/cors": "^2.8.10",
-    "@types/debug": "^4.1.5",
-    "@types/express": "^4.17.11",
-    "ts-node": "^9.1.1",
-    "ts-node-dev": "^1.1.1",
-    "typescript": "^4.2.2"
+    "@types/cors": "^2.8.17",
+    "@types/debug": "^4.1.12",
+    "@types/express": "^4.17.21",
+    "ts-node": "^10.9.2",
+    "ts-node-dev": "^2.0.0",
+    "typescript": "^5.6.2"
   },
   "workspaces": {
     "nohoist": [

diff --git a/jest-setup.ts b/jest-setup.ts
@@ -0,0 +1 @@
+import "@testing-library/jest-dom";
diff --git a/jest.config.ts b/jest.config.ts
@@ -0,0 +1,28 @@
+export default {
+  testEnvironment: "jest-environment-jsdom",
+  setupFilesAfterEnv: ["<rootDir>/jest-setup.ts"],
+  transform: {
+    "^.+\\.(t|j)sx?$": [
+      "@swc/jest",
+      {
+        jsc: {
+          parser: {
+            tsx: true,
+            syntax: "typescript",
+          },
+          transform: {
+            react: {
+              runtime: "automatic",
+            },
+          },
+        },
+        isModule: "unknown",
+      },
+    ],
+  },
+  moduleNameMapper: {
+    "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$":
+      "<rootDir>/src/tests/__mocks__/fileMock.ts",
+    "\\.(css|less|scss|sass)$": "<rootDir>/src/tests/__mocks__/styleMock.ts",
+  },
+};
diff --git a/package.json b/package.json
@@ -9,28 +9,32 @@
     ]
   },
   "dependencies": {
-    "@testing-library/jest-dom": "^5.11.9",
-    "@testing-library/react": "^11.2.5",
-    "@testing-library/user-event": "^12.7.3",
-    "@types/jest": "^26.0.20",
-    "@types/node": "^14.14.31",
-    "@types/react": "^17.0.2",
-    "@types/react-dom": "^17.0.1",
-    "concurrently": "^6.0.0",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-scripts": "4.0.3",
-    "typescript": "~4.2.2"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
+  },
+  "devDependencies": {
+    "@rsbuild/core": "^1.0.1",
+    "@rsbuild/plugin-react": "^1.0.1",
+    "@swc/core": "^1.4.8",
+    "@swc/jest": "^0.2.36",
+    "@testing-library/jest-dom": "^6.4.2",
+    "@testing-library/react": "^14.2.1",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^22.5.4",
+    "@types/react": "^18.3.5",
+    "@types/react-dom": "^18.3.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "concurrently": "^9.0.0",
+    "ts-node": "^10.9.2",
+    "typescript": "~5.6.2"
   },
   "scripts": {
-    "start": "concurrently \"react-scripts start\" \"yarn start:api\"",
+    "start": "concurrently \"rsbuild dev --open\" \"yarn start:api\"",
     "start:api": "yarn --cwd api start:dev",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
-  },
-  "eslintConfig": {
-    "extends": "react-app"
+    "test": "jest",
+    "build": "rsbuild build",
+    "eject": "rsbuild eject"
   },
   "browserslist": {
     "production": [

diff --git a/public/index.html b/public/index.html
@@ -2,19 +2,19 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="<%= assetPrefix %>/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
       content="Web site created using create-react-app"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="<%= assetPrefix %>/logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link rel="manifest" href="<%= assetPrefix %>/manifest.json" />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

diff --git a/rsbuild.config.ts b/rsbuild.config.ts
@@ -0,0 +1,9 @@
+import { defineConfig } from '@rsbuild/core';
+import { pluginReact } from '@rsbuild/plugin-react';
+
+export default defineConfig({
+    plugins: [pluginReact()],
+    html: {
+        template: './public/index.html',
+    },
+});
diff --git a/src/App.test.tsx b/src/App.test.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
-import { render } from '@testing-library/react';
-import App from './App';
+import { render } from "@testing-library/react";
+import "@testing-library/jest-dom";
+import App from "./App";
 
-test('renders learn react link', () => {
+test("renders learn react link", () => {
   const { getByText } = render(<App />);
   const linkElement = getByText(/learn react/i);
   expect(linkElement).toBeInTheDocument();

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,6 +1,5 @@
-import React from 'react';
-import logo from './logo.svg';
-import './App.css';
+import logo from "./logo.svg";
+import "./App.css";
 
 function App() {
   return (

diff --git a/src/tests/__mocks__/fileMock.ts b/src/tests/__mocks__/fileMock.ts
@@ -0,0 +1 @@
+module.exports = "test-file-stub";
diff --git a/src/tests/__mocks__/styleMock.ts b/src/tests/__mocks__/styleMock.ts
@@ -0,0 +1 @@
+module.exports = {};
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,11 +1,7 @@
 {
   "compilerOptions": {
-    "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
+    "target": "ESNext",
+    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -20,7 +16,5 @@
     "jsx": "react-jsx",
     "noFallthroughCasesInSwitch": true
   },
-  "include": [
-    "src"
-  ]
+  "include": ["src"]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ node_modules @@
     # production
     /build
+    /dist
     # misc
     .DS_Store
@@ Expand Down @@