Add reorganized file structure, add lint and CI

onethirtyfive · Jun 21, 2023 · c39f900 · c39f900
1 parent 5667332
commit c39f900
Show file tree

Hide file tree

Showing 82 changed files with 849 additions and 1,512 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,59 @@
+{
+  "root": true,
+  "env": {
+    "browser": true,
+    "es2022": true
+  },
+  "extends": [
+    "plugin:@typescript-eslint/recommended",
+    "plugin:react/recommended",
+    "plugin:react-hooks/recommended",
+    "plugin:prettier/recommended"
+  ],
+  "plugins": ["react", "@typescript-eslint", "@emotion"],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "sourceType": "module",
+    "ecmaVersion": 2022
+  },
+  "rules": {
+    "react/react-in-jsx-scope": "off",
+    "no-console": ["warn", { "allow": ["warn", "error", "info"] }],
+    "linebreak-style": ["warn", "unix"],
+    "react/jsx-fragments": ["warn", "syntax"],
+    "no-undef": 1,
+    "@typescript-eslint/no-empty-function": 0,
+    "@typescript-eslint/no-empty-interface": 0,
+    "react/jsx-curly-brace-presence": ["warn", "never"],
+    "eqeqeq": ["warn", "smart"],
+    "react/no-unknown-property": ["error", { "ignore": ["css"] }],
+    "@emotion/no-vanilla": "error",
+    "@emotion/import-from-emotion": "error",
+    "@emotion/styled-import": "error",
+    "@emotion/syntax-preference": [2, "string"],
+    "@typescript-eslint/no-unused-vars": [
+      "warn",
+      { "destructuredArrayIgnorePattern": "^_" }
+    ]
+  },
+  "overrides": [
+    {
+      "files": ["**/*.test.ts", "**/*.test.tsx"],
+      "globals": {
+        "global": "writable"
+      },
+      "env": {
+        "jest": true
+      }
+    },
+    {
+      "files": ["server.mjs"],
+      "env": {
+        "node": true
+      }
+    }
+  ]
+}
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,36 @@
+name: ci
+
+permissions: {}
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch: {}
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - run: corepack enable
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: yarn
+
+      - name: 📦 Install dependencies
+        run: yarn --frozen-lockfile
+
+      - name: 🧪 Test project
+        run: yarn test
+
+      - name: 📝 Lint
+        run: yarn lint
+
+      - name: 💪 Type check
+        run: yarn test:typecheck
diff --git a/capacitor.config.ts b/capacitor.config.ts
diff --git a/cypress.config.ts b/cypress.config.ts
diff --git a/cypress/e2e/test.cy.ts b/cypress/e2e/test.cy.ts
diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
diff --git a/index.html b/index.html
@@ -28,6 +28,6 @@
   </head>
   <body>
     <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
+    <script type="module" src="/src/index.tsx"></script>
   </body>
 </html>
diff --git a/ionic.config.json b/ionic.config.json
diff --git a/package.json b/package.json
@@ -9,7 +9,8 @@
     "build": "vite build",
     "preview": "vite preview",
     "test": "vitest",
-    "lint": "eslint"
+    "test:typecheck": "tsc",
+    "lint": "eslint src"
   },
   "dependencies": {
     "express": "^4.18.2",
@@ -19,49 +20,55 @@
   "devDependencies": {
     "@emotion/babel-plugin": "^11.11.0",
     "@emotion/css": "^11.11.2",
+    "@emotion/eslint-plugin": "^11.11.0",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@ionic/core": "^7.0.14",
-    "@ionic/react-router": "^7.0.0",
     "@ionic/react": "^7.0.14",
+    "@ionic/react-router": "^7.0.0",
     "@reduxjs/toolkit": "^1.9.5",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
     "@types/js-cookie": "^3.0.3",
     "@types/lodash": "^4.14.195",
+    "@types/react": "^18.2.13",
     "@types/react-dom": "^18.2.6",
-    "@types/react-router-dom": "^5.3.3",
     "@types/react-router": "^5.1.20",
-    "@types/react": "^18.2.13",
+    "@types/react-router-dom": "^5.3.3",
     "@types/ua-parser-js": "^0.7.36",
+    "@typescript-eslint/eslint-plugin": "^5.60.0",
+    "@typescript-eslint/parser": "^5.60.0",
     "@vitejs/plugin-react": "^4.0.1",
-    "cypress": "^12.15.0",
     "date-fns": "^2.30.0",
-    "eslint-plugin-react": "^7.32.2",
     "eslint": "^8.43.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "ionicons": "^7.1.2",
     "js-cookie": "^3.0.5",
     "jsdom": "^22.1.0",
     "lemmy-js-client": "0.18.0-rc.1",
     "lodash": "^4.17.21",
     "photoswipe": "^5.3.7",
+    "prettier": "^2.8.8",
+    "react": "^18.2.0",
     "react-animate-height": "^3.1.1",
     "react-dom": "^18.2.0",
     "react-markdown": "^8.0.7",
     "react-photoswipe-gallery": "^2.2.7",
     "react-redux": "^8.1.0",
-    "react-router-dom": "^5.3.4",
     "react-router": "^5.3.4",
+    "react-router-dom": "^5.3.4",
     "react-virtuoso": "^4.3.10",
-    "react": "^18.2.0",
     "remark-gfm": "^3.0.1",
     "terser": "^5.18.1",
     "typescript": "^5.1.3",
     "ua-parser-js": "^1.0.35",
+    "vite": "^4.3.9",
     "vite-plugin-pwa": "^0.16.4",
     "vite-plugin-svgr": "^3.2.0",
-    "vite": "^4.3.9",
     "vitest": "^0.32.0"
   }
 }
diff --git a/server.mjs b/server.mjs
@@ -105,8 +105,9 @@ app.use(
   })
 );
 
-const PORT = process.env.PORT || 3000;
+const PORT = process.env.PORT || 5173;
 
 ViteExpress.listen(app, PORT, () =>
-  console.log(`Server is listening on port ${PORT}...`)
+  // eslint-disable-next-line no-console
+  console.log(`Server is on http://localhost:${PORT}`)
 );
diff --git a/src/ActorRedirect.tsx b/src/ActorRedirect.tsx
@@ -1,6 +1,7 @@
 import { Redirect, useLocation, useParams } from "react-router";
 import { useAppSelector } from "./store";
 import { jwtIssSelector } from "./features/auth/authSlice";
+import React from "react";
 
 interface ActorRedirectProps {
   children?: React.ReactNode;
@@ -14,7 +15,7 @@ export default function ActorRedirect({ children }: ActorRedirectProps) {
   if (!iss || !actor) return <>{children}</>;
   if (iss === actor) return <>{children}</>;
 
-  const [first, second, wrongActor, ...rest] = location.pathname.split("/");
+  const [first, second, _wrongActor, ...rest] = location.pathname.split("/");
 
   return <Redirect to={[first, second, iss, ...rest].join("/")} push={false} />;
 }
diff --git a/src/App.test.tsx b/src/App.test.tsx
@@ -1,8 +1,7 @@
-import React from 'react';
-import { render } from '@testing-library/react';
-import App from './App';
+import { render } from "@testing-library/react";
+import App from "./App";
 
-test('renders without crashing', () => {
+test("renders without crashing", () => {
   const { baseElement } = render(<App />);
   expect(baseElement).toBeDefined();
 });