Merge branch 'dev' into 'main'

Updated folder structure

See merge request illegitimate/illegitimate-bot!292

.dockerignore

@@ -1,5 +1,7 @@
 .git
-.yarn
+.nodemon
+.vscode
+dev
 dist
 old
 node_modules
@@ -12,9 +14,5 @@ scripts
 .node-version
 docker-compose.yml
 Dockerfile
-Dockerfile.cache
 dprint.json
 eslint.config.mjs
-nodemon-js.json
-nodemon-swc.json
-nodemon.json

.gitignore

@@ -1,7 +1,4 @@
-.vscode/
-.yarn/
 node_modules/*
 .env
 dist/
-data/
 dev/

.nodemon/debug.json

@@ -0,0 +1,14 @@
+{
+    "$schema": "https://json.schemastore.org/nodemon.json",
+    "restartable": "rs",
+    "ignore": [
+        "node_modules"
+    ],
+    "verbose": true,
+    "env": {
+        "NODE_ENV": "dev",
+        "TYPESCRIPT": "true"
+    },
+    "ext": "ts",
+    "exec": "tsx --inspect-brk"
+}

.vscode/launch.json

@@ -0,0 +1,25 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Attach to process (nvim)",
+            "type": "pwa-node",
+            "request": "attach",
+            "port": 9229,
+            "skipFiles": [
+                "<node_internals>/**",
+                "${workspaceFolder}/node_modules/**"
+            ]
+        },
+        {
+            "name": "Attach to process (vscode)",
+            "type": "node",
+            "request": "attach",
+            "port": 9229,
+            "skipFiles": [
+                "<node_internals>/**",
+                "${workspaceFolder}/node_modules/**"
+            ]
+        }
+    ]
+}

package.json

@@ -15,9 +15,10 @@
         "start": "node dist/index.js",
         "build": "swc src -d dist --strip-leading-paths",
         "watch": "swc src -d dist --strip-leading-paths --watch",
-        "dev": "nodemon --config nodemon-swc.json",
+        "dev": "nodemon --config .nodemon/swc.json",
-        "dev:ts": "nodemon --config nodemon.json src/index.ts",
+        "dev:ts": "nodemon --config .nodemon/ts.json src/index.ts",
-        "dev:js": "nodemon --config nodemon-js.json dist/index.js",
+        "dev:ts:inspect": "nodemon --config .nodemon/debug.json src/index.ts",
+        "dev:js": "nodemon --config .nodemon/js.json dist/index.js",
         "format": "dprint fmt \"**/*.ts\"",
         "check": "pnpm tscheck && pnpm lint",
         "tscheck": "tsc && echo \"TypeScript check passed!\"",

src/utils/Illegitimate.ts

@@ -17,7 +17,7 @@ let sequelize: Sequelize
 if (process.env.NODE_ENV === "dev") {
     sequelize = new Sequelize({
         dialect: "sqlite",
-        storage: "data/db.sqlite"
+        storage: "dev/db.sqlite"
     })
 } else {
     sequelize = new Sequelize(env.prod.postgresURI, { dialect: "postgres" })
@@ -75,11 +75,11 @@ class Illegitimate {
     }
 
     private loadMethods() {
-        String.prototype.removeIndents = function(this: string) {
+        String.prototype.removeIndents = function (this: string) {
             return this.replace(/^ */gm, "")
         }
 
-        String.prototype.capitalizeFirstLetter = function(this: string) {
+        String.prototype.capitalizeFirstLetter = function (this: string) {
             return this[0].toUpperCase() + this.slice(1).toLowerCase()
         }
     }