rework build process

EmeraldBlock · Oct 3, 2021 · ff0c20c · ff0c20c
1 parent 021acab
commit ff0c20c
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ This bot is written in [TypeScript](https://www.typescriptlang.org/). It's prett
 ### DISCLAIMER: While these instructions are relatively generic, I am not guaranteeing that following them will not cause any damage to your computer. *Make sure you understand what you are doing!*
 <br>
 
-This bot requires [Node.js](https://nodejs.org/). I'm not sure the specific versions that work, but any 16.X should work fine.
+This bot requires [Node.js](https://nodejs.org/). I'm not sure the specific versions that work, but any 16.7+ should work fine.
 
 Make sure you've created an [application](https://discord.com/developers/applications) in the Discord Developer Portal and have added a bot. ([Tutorial](https://discordjs.guide/preparations/setting-up-a-bot-application.html) from the Discord.js Guide)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,14 +4,14 @@
   "description": "A Discord bot core.",
   "license": "ISC",
   "author": "EmeraldBlock",
-  "main": "./dist/index.js",
+  "main": "./dist/js/index.js",
   "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "node --experimental-json-modules .",
     "dev": "npx nodemon",
     "lint": "npx eslint .",
-    "build": "npx rimraf ./dist/ && npx tsc"
+    "build": "node ./tools/clear-copy.js && npx tsc"
   },
   "dependencies": {
     "chalk": "^4.1.1",
@@ -24,7 +24,6 @@
     "eslint": "^7.26.0",
     "eslint-plugin-jsdoc": "^34.2.0",
     "nodemon": "^2.0.7",
-    "rimraf": "^3.0.2",
     "ts-node": "^9.1.1",
     "typescript": "^4.2.4"
   }

diff --git a/src/commands/eval.ts → src/ts/commands/eval.ts b/src/commands/eval.ts → src/ts/commands/eval.ts
diff --git a/src/commands/help.ts → src/ts/commands/help.ts b/src/commands/help.ts → src/ts/commands/help.ts
diff --git a/src/config/config.json → src/ts/config/config.json b/src/config/config.json → src/ts/config/config.json
diff --git a/src/config/secrets.example.json → src/ts/config/secrets.example.json b/src/config/secrets.example.json → src/ts/config/secrets.example.json
diff --git a/src/errors.ts → src/ts/errors.ts b/src/errors.ts → src/ts/errors.ts
diff --git a/src/global.d.ts → src/ts/global.d.ts b/src/global.d.ts → src/ts/global.d.ts
diff --git a/src/index.ts → src/ts/index.ts b/src/index.ts → src/ts/index.ts
diff --git a/src/time.ts → src/ts/time.ts b/src/time.ts → src/ts/time.ts
diff --git a/src/utils.ts → src/ts/utils.ts b/src/utils.ts → src/ts/utils.ts
diff --git a/tools/clear-copy.js b/tools/clear-copy.js
@@ -0,0 +1,11 @@
+import fs from "fs";
+
+import chalk from "chalk";
+
+fs.rmSync("./dist/", { recursive: true, force: true });
+fs.mkdirSync("./dist/");
+try {
+    fs.cpSync("./src/assets/", "./dist/assets/", { recursive: true });
+} catch {
+    console.log(`No ${chalk.yellow("assets")} folder found.`);
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
-        "rootDir": "./src/",
-        "outDir": "./dist/",
+        "rootDir": "./src/ts/",
+        "outDir": "./dist/js/",
         "allowJs": true,
         "module": "ESNext",
         "target": "ESNext",
@@ -11,5 +11,6 @@
         "resolveJsonModule": true,
         "sourceMap": true,
         "esModuleInterop": true
-    }
+    },
+    "include": ["./src/ts/**/*"]
 }