Refactor (#270) Remains of previous PR

* 🔀 Fix merge conflict remains

* 🐛 Duplicate Files

* 🔨 Added scripts to root

* 👷 CI Workflow

* 👷 Removed sourcemap and declaration for server

.eslintignore

@@ -0,0 +1,4 @@
+web/src/typings/vendor.d.ts
+next.config.js
+
+server/source/prisma/

.eslintrc.json

@@ -16,22 +16,20 @@
 	],
 
 	"parserOptions": {
-		"project": "./tsconfig.json"
+		"project": ["./server/tsconfig.json", "./web/src/tsconfig.json"]
 	},
 
 	"settings": {
-		"react": { "version": "detect" }
+		"react": { "version": "^16.8.0" }
 	},
 
-	"ignorePatterns": ["typings/vendor/*", "next.config.js", "dist/*", "docs/*"],
-
 	"rules": {
 		"@typescript-eslint/explicit-module-boundary-types": "off",
 
 		"jsdoc/require-param-type": "off",
 		"jsdoc/require-returns-type": "off",
 		"jsdoc/check-param-names": ["warn", { "checkDestructured": false }],
 		"jsdoc/require-param": ["warn", { "checkDestructured": false }],
-		"jsdoc/check-tag-names": ["warn", { "definedTags": ["remarks"] }]
+		"jsdoc/check-tag-names": ["warn", { "definedTags": ["link"] }]
 	}
 }

.github/workflows/prettier.yml → .github/workflows/ci.yml

@@ -1,15 +1,13 @@
-name: Prettier
+name: CI
 
 on:
   push:
-    branches:
-      - rewrite
-  workflow_dispatch:
+    branches: [rewrite]
+  pull_request:
+    branches: [rewrite]
 
 jobs:
-  format:
-    name: Run Prettier
-    if: github.event.pusher.name != 'd-zone-maintenance'
+  lint-format:
     runs-on: ubuntu-latest
     steps:
       - uses: tibdex/github-app-token@v1
@@ -37,8 +35,6 @@ jobs:
 
       - run: yarn install
 
-      - run: yarn run format
+      - run: yarn prettier . -c
 
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: 🎨 Auto format by prettier
+      - run: yarn eslint .

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,5 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn prettier . -c
+yarn eslint .

.prettierignore

@@ -1,11 +1,10 @@
 .yarn/*
-.next/*
-dist/*
-docs/*
+**/.next/*
 .vscode/*
 .pnp.js
 **/coverage/*
 **/build/*
 yarn.lock
 **/patches/*
 public/img/*
+server/source/prisma/*

Procfile

@@ -0,0 +1 @@
+web: yarn start

package.json

@@ -9,7 +9,11 @@
 	],
 	"scripts": {
 		"commit": "gitmoji --commit",
-		"format": "prettier --write ."
+		"lint": "eslint .",
+		"format": "prettier --write .",
+		"postinstall": "husky install",
+		"dev": "yarn workspace server dev",
+		"start": "yarn workspace server start"
 	},
 	"devDependencies": {
 		"@typescript-eslint/eslint-plugin": "latest",
@@ -20,6 +24,7 @@
 		"eslint-plugin-jsdoc": "^30.7.9",
 		"eslint-plugin-react": "latest",
 		"gitmoji-cli": "^3.2.12",
+		"husky": "^6.0.0",
 		"prettier": "^2.2.1",
 		"prettier-plugin-jsdoc": "^0.2.12",
 		"typescript": "^4.1.3"
@@ -30,7 +35,9 @@
 		"tabWidth": 2,
 		"semi": false,
 		"singleQuote": true,
-		"jsdocParser": true
+		"plugins": [
+			"prettier-plugin-jsdoc"
+		]
 	},
 	"homepage": "https://github.com/vegeta897/d-zone#readme",
 	"repository": {

server/source/main.ts

@@ -12,11 +12,14 @@ import { createSocketServer, connectSocketChat } from './socket'
 
 import { createNextServer } from './next'
 
+/** Main entry point for runtime */
 async function main() {
 	const DISCORD_TOKEN = process.env['DISCORD_TOKEN']
 	const PORT = process.env['PORT'] || 8080
 	const DEV = !process.env['PRODUCTION']
 
+	if (!DISCORD_TOKEN) throw new Error('DISCORD_TOKEN not set')
+
 	const logger = new Logger()
 	const prisma = new PrismaClient()
 
@@ -27,7 +30,7 @@ async function main() {
 	const socketServer = createSocketServer(httpServer, logger.getChildLogger())
 
 	const chatModules = [
-		await createDiscordModule(DISCORD_TOKEN!, prisma, logger.getChildLogger()),
+		await createDiscordModule(DISCORD_TOKEN, prisma, logger.getChildLogger()),
 	]
 
 	connectSocketChat(chatModules, socketServer)

server/source/socket/index.ts

@@ -24,6 +24,12 @@ export const createSocketServer = (httpServer: http.Server, logger: Logger) => {
 	return server
 }
 
+/**
+ * Connects socket to chat modules
+ *
+ * @param chatModules - Chat modules
+ * @param socket - Socket server
+ */
 export function connectSocketChat(
 	chatModules: ChatModule[],
 	socket: Server<ClientEvents, ServerEvents>

server/source/socket/type.ts

@@ -11,4 +11,4 @@ type ServerChatEvents = {
 	[K in keyof ChatEvents]: (argument: ChatEvents[K][0]) => void
 }
 
-export interface ServerEvents extends ServerChatEvents {}
+export type ServerEvents = ServerChatEvents

server/tsconfig.json

@@ -6,9 +6,6 @@
 		"module": "commonjs",
 		"lib": ["es2020"],
 
-		"rootDir": "./source",
-		"sourceMap": true,
-
-		"declaration": true
+		"rootDir": "./source"
 	}
 }

web/src/modules/game/engine/index.ts

@@ -36,18 +36,18 @@ export default class Engine {
 	}
 
 	/**
-	 * Starts the game loop.
-<<<<<<< HEAD:src/modules/game/engine/index.ts
+	 * Starts the game loop. <<<<<<< HEAD:src/modules/game/engine/index.ts
 	 *
 	 * Note: `setInterval` is used instead of `requestAnimationFrame` because all
 	 * logic runs at a fixed rate.
 	 *
-=======
+	 * =======
 	 *
 	 * Note: `setInterval` is used instead of `requestAnimationFrame` because all
 	 * logic runs at a fixed rate.
 	 *
->>>>>>> feat/comms:web/src/modules/game/engine/index.ts
+	 * >>>>>>> feat/comms:web/src/modules/game/engine/index.ts
+	 *
 	 * @param fps - The target number of times per second to run the interval at.
 	 */
 	start(fps: number): void {

web/src/modules/game/renderer/index.ts

@@ -19,11 +19,7 @@ export default class Renderer {
 	/** The PIXI application itself */
 	app!: PIXI.Application
 	/** The viewport container which manages camera movement. */
-<<<<<<< HEAD:src/modules/game/renderer/index.ts
-	view!: Viewport<IPlugins>
-=======
 	view!: Viewport
->>>>>>> feat/comms:web/src/modules/game/renderer/index.ts
 	/** The culler which prevents off-camera objects from rendering. */
 	cull!: SpatialHash
 

web/src/modules/game/renderer/wheel-stepped.ts

@@ -9,14 +9,14 @@ const wheelSteppedOptions = {
 	steps: [0.25, 0.5, 1, 2, 3, 4, 5, 6, 8],
 }
 
-function getClosestIndex(arr: number[], target: number): number {
-	let closest = 0
-	arr.forEach((value, index) => {
-		if (Math.abs(value - target) < Math.abs(arr[closest] - target))
-			closest = index
-	})
-	return closest
-}
+const getClosestIndex = (arr: number[], target: number) =>
+	arr.reduce(
+		(closest, value, index) =>
+			Math.abs(value - target) < Math.abs(arr[closest] - target)
+				? index
+				: closest,
+		0
+	)
 
 export default class WheelStepped extends Plugin {
 	private options: {

web/src/modules/game/resources/index.ts

@@ -2,11 +2,7 @@ import { initLoader, runLoader } from './loader'
 import { Animations, IResources, Sheet } from '../typings'
 import { LoaderResource } from 'pixi.js-legacy'
 import { SPRITE_JSON_PATH } from '../config/sprite'
-<<<<<<< HEAD:web/src/modules/game/resources/index.ts
-import { buildAnimations } from 'web/modules/game/resources/animations'
-=======
 import { buildAnimations } from 'root/modules/game/resources/animations'
->>>>>>> feat/comms:src/modules/game/renderer/resources/resources.ts
 
 /** A manager for sprite-related resources. */
 export default class Resources implements IResources {

web/src/pages/_app.tsx

@@ -1,6 +1,7 @@
 import React from 'react'
 import { AppProps } from 'next/app'
 
+// eslint-disable-next-line jsdoc/require-jsdoc
 export default function App({ Component, pageProps }: AppProps) {
 	return <Component {...pageProps} />
 }

web/src/tsconfig.json

@@ -1,19 +1,19 @@
 {
+	"extends": "../../tsconfig.json",
+
 	"compilerOptions": {
 		"target": "es5",
+		"module": "esnext",
+
 		"lib": ["dom", "dom.iterable", "esnext"],
+
 		"allowJs": true,
-		"skipLibCheck": true,
-		"strict": false,
-		"forceConsistentCasingInFileNames": true,
 		"noEmit": true,
-		"esModuleInterop": true,
-		"module": "esnext",
-		"moduleResolution": "node",
-		"resolveJsonModule": true,
 		"isolatedModules": true,
 		"jsx": "preserve"
 	},
-	"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+
+	"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "**/*.d.ts"],
+
 	"exclude": ["node_modules"]
 }