diff --git a/fosscord-server.code-workspace b/fosscord-server.code-workspace
index 1d6774ad..f2df1e9e 100644
--- a/fosscord-server.code-workspace
+++ b/fosscord-server.code-workspace
@@ -15,10 +15,6 @@
],
"settings": {
"files.exclude": {
- ".gitignore": true,
- ".npmignore": true,
- ".prettierrc": true,
- ".vscode": true,
"*.ansi": true,
}
}
diff --git a/package.json b/package.json
index 59c66811..f1242d2b 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,6 @@
"setup": "npm install --omit optional && ts-patch install -s && patch-package && npm run build",
"depclean": "node scripts/depclean.js",
"depcheck": "node scripts/depcheck.js",
- "syncdeps": "node scripts/install.js",
"build": "node scripts/build.js",
"postinstall": "patch-package",
"genschemas": "node scripts/generate_schemas.js",
diff --git a/scripts/build.js b/scripts/build.js
index 49353c87..f5ec6bac 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -8,7 +8,6 @@ if(argv.includes("help")) {
console.log(`Fosscord build script help:
Arguments:
clean Cleans up previous builds
- copyonly Only copy source files, don't build (useful for updating assets)
verbose Enable verbose logging
logerrors Log build errors to console
pretty-errors Pretty-print build errors
@@ -18,7 +17,6 @@ Arguments:
let steps = 3, i = 0;
if (argv.includes("clean")) steps++;
-if (argv.includes("copyonly")) steps--;
const verbose = argv.includes("verbose") || argv.includes("v");
const logerr = argv.includes("logerrors");
@@ -29,13 +27,11 @@ if(silent) console.error = console.log = function(){}
if (argv.includes("clean")) {
console.log(`[${++i}/${steps}] Cleaning...`);
- parts.forEach((a) => {
- let d = "../" + a + "/dist";
- if (fs.existsSync(d)) {
- fs.rmSync(d, { recursive: true });
- if (verbose) console.log(`Deleted ${d}!`);
- }
- });
+ let d = "dist";
+ if (fs.existsSync(d)) {
+ fs.rmSync(d, { recursive: true });
+ if (verbose) console.log(`Deleted ${d}!`);
+ }
}
console.log(`[${++i}/${steps}] Checking if dependencies were installed correctly...`);
@@ -43,42 +39,39 @@ console.log(`[${++i}/${steps}] Checking if dependencies were installed correctly
if(!fs.existsSync(path.join(__dirname, "..", "node_modules", "exif-be-gone", "index.js")))
execIn("npm run build", path.join(__dirname, "..", "node_modules", "exif-be-gone"));
+console.log(`[${++i}/${steps}] Compiling src files ...`);
-if (!argv.includes("copyonly")) {
- console.log(`[${++i}/${steps}] Compiling src files ...`);
+let buildFlags = ''
+if(pretty) buildFlags += '--pretty '
- let buildFlags = ''
- if(pretty) buildFlags += '--pretty '
-
- try {
- execSync(
- 'node "' +
- path.join(__dirname, "..", "node_modules", "typescript", "lib", "tsc.js") +
- '" -p "' +
- path.join(__dirname, "..") +
- '" ' + buildFlags,
- {
- cwd: path.join(__dirname, ".."),
- shell: true,
- env: process.env,
- encoding: "utf8"
- }
- )
- } catch (error) {
- if(verbose || logerr) {
- error.stdout.split(/\r?\n/).forEach((line) => {
- let _line = line.replace('dist/','',1);
- if(!pretty && _line.includes('.ts(')) {
- //reformat file path for easy jumping
- _line = _line.replace('(',':',1).replace(',',':',1).replace(')','',1)
- }
- console.error(_line);
- })
- }
- console.error(`Build failed! Please check build.log for info!`);
- if(!silent){
- if(pretty) fs.writeFileSync("build.log.ansi", error.stdout);
- fs.writeFileSync("build.log", error.stdout.replaceAll(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, ''));
+try {
+ execSync(
+ 'node "' +
+ path.join(__dirname, "..", "node_modules", "typescript", "lib", "tsc.js") +
+ '" -p "' +
+ path.join(__dirname, "..") +
+ '" ' + buildFlags,
+ {
+ cwd: path.join(__dirname, ".."),
+ shell: true,
+ env: process.env,
+ encoding: "utf8"
}
+ )
+} catch (error) {
+ if(verbose || logerr) {
+ error.stdout.split(/\r?\n/).forEach((line) => {
+ let _line = line.replace('dist/','',1);
+ if(!pretty && _line.includes('.ts(')) {
+ //reformat file path for easy jumping
+ _line = _line.replace('(',':',1).replace(',',':',1).replace(')','',1)
+ }
+ console.error(_line);
+ })
+ }
+ console.error(`Build failed! Please check build.log for info!`);
+ if(!silent){
+ if(pretty) fs.writeFileSync("build.log.ansi", error.stdout);
+ fs.writeFileSync("build.log", error.stdout.replaceAll(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, ''));
}
}
\ No newline at end of file
diff --git a/scripts/utils.js b/scripts/utils.js
index ca41bcf2..84aaeed6 100644
--- a/scripts/utils.js
+++ b/scripts/utils.js
@@ -46,7 +46,6 @@ function getLines(output) {
module.exports = {
//consts
- parts,
//functions
copyRecursiveSync, execIn, getLines
};
diff --git a/plugins/example-plugin/build.sh b/src/plugins/example-plugin/build.sh
index 1b36607b..1b36607b 100755
--- a/plugins/example-plugin/build.sh
+++ b/src/plugins/example-plugin/build.sh
diff --git a/plugins/example-plugin/index.ts b/src/plugins/example-plugin/index.ts
index ec1ed7b5..d5db6563 100644
--- a/plugins/example-plugin/index.ts
+++ b/src/plugins/example-plugin/index.ts
@@ -1,7 +1,7 @@
-import { Plugin } from "@fosscord/util"
+/*import { Plugin } from "@fosscord/util"
export default class TestPlugin extends Plugin {
onPluginLoaded(): void {
console.log("Hello from test plugin! IT WORKS!!!!!!!");
}
-}
\ No newline at end of file
+}*/
\ No newline at end of file
diff --git a/plugins/example-plugin/plugin.json b/src/plugins/example-plugin/plugin.json
index 980edbdf..980edbdf 100644
--- a/plugins/example-plugin/plugin.json
+++ b/src/plugins/example-plugin/plugin.json
diff --git a/plugins/example-plugin/tsconfig.json b/src/plugins/example-plugin/tsconfig.json
index 7efe9434..7efe9434 100644
--- a/plugins/example-plugin/tsconfig.json
+++ b/src/plugins/example-plugin/tsconfig.json
|
