From 08d5aca13230308cb80199cf7a64e2d9752038f6 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Sat, 13 Aug 2022 04:21:48 +0200 Subject: [PATCH] Update scripts, update workspace, add launch.json --- .vscode/launch.json | 20 ++++++++ fosscord-server.code-workspace | 28 ++-------- package-lock.json | Bin 838348 -> 840738 bytes scripts/depcheck.js | 2 +- scripts/depclean.js | 91 ++++++++++++++++----------------- scripts/install.js | 23 --------- scripts/rights.js | 2 +- scripts/update_schemas.js | 2 +- scripts/utils.js | 2 - 9 files changed, 72 insertions(+), 98 deletions(-) create mode 100644 .vscode/launch.json delete mode 100644 scripts/install.js diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..1ddf16e7f --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,20 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "launch", + "name": "Launch Program", + "skipFiles": [ + "/**" + ], + "program": "${file}", + "outFiles": [ + "${workspaceFolder}/**/*.js" + ] + } + ] +} \ No newline at end of file diff --git a/fosscord-server.code-workspace b/fosscord-server.code-workspace index 4a7440f67..1d6774adf 100644 --- a/fosscord-server.code-workspace +++ b/fosscord-server.code-workspace @@ -1,22 +1,16 @@ { "folders": [ { - "path": "bundle" + "path": "src/" }, { - "path": "api" + "path": "assets/" }, { - "path": "cdn" + "path": "scripts/" }, { - "path": "gateway" - }, - { - "path": "util" - }, - { - "path": "plugins" + "path": "." } ], "settings": { @@ -26,18 +20,6 @@ ".prettierrc": true, ".vscode": true, "*.ansi": true, - "benchmarks": true, - "database.db": true, - "files/": true, - "jest": true, - "locales/[!e]*": true, - "locales/e[!n]*": true, - "node_modules": true, - "package-lock.json": true, - "patches": true, - "README.md": true, - "tests/": true, - "tsconfig.tsbuildinfo": true } } -} +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index a97e75be2b2923dedbc5574e8587c3730b3735aa..2da3174eebafdffcfe1571914522f6a31b0cbb27 100644 GIT binary patch delta 1492 zcmchXTWBLy7=W2fW-^(~W?e5$+il%#y0${PNhX&`qOxp~O(ypyY0|VQ=uR$8(%jli z(@7#K>O%!Vy9Dw`~96R`~v5 zqu#E!!o)f1xOC-}8}bn`djVgPf%O~NB<%0W&9J|s)WZF@kW-0;n$y1#v**LQvYX+O zp%x=FVu#@ubBa0+Z#Ym5`1fVQ5Q;0+u>Aq9hNpY@L*h||>=Oh&zkm;kAMVM8K?qWa zi$=i55cqBz9Y*Z1`#5R>;|@wmF`Yvvlg&!SVzowmb3VUek@l{!9JlD@LTot_4hJ&a zM!4Z&y$h@%$~Fp2+r~H7Q@*6H(P0X0CgpMY7_JVhMM?IA?bG15OuT zX{R%t*7Cf~9t)cm8C}U{p=YCMKez04a;1_dT(r)%{f$7hunsYol=$~{>_Nb9A~UeM zggxBPXmhKFODH4=38e%nZuL~Mz5mDLU4)pq2qg7iiVSg5F$tG-s$bx&K*f({8eBGi zI^SC5YJ90)gSAUUaA5UE&k|F~!?5}sJRhM<>I_%mBsFrUtK53F2xo4nPKamkk?)|W zG_0_LDKw}wtg!a6av(1@7~R`P6cdLeFn668g6(U>*zXpP!B0Er7~D5aYG$Mlq*|(# z`ib^c{-@y5=HH4-f6FnE&|Ljdg(2|hG)cizDHR62BMNoj=NGOi>AugXRZqk1o5bWH cIeq?p()6##ow!Gy5MQ}OCJ?dr3}p`g29q`7X#fBK delta 493 zcmZ3q!uZTo;|c30hj5xre$c=%T|tGNW3n*6*k%pJKWvk$h2@%^INF^!7=f4xh?#+y z1&CR3{p#B&LU%u_%P*2AC(Mh8hND=T^ED8)^qvMMQ=r z28XzqMdX`DIcFyMdl?r;Whd!Z6bEMII|fFS<(cFMWMvyOn=DCXfVC@EEf->;q(m!tm2I3(+^bfSTLGSf8WI>Hr@Ul7mr|Z zMruw@RNA;o`s&tbjKhzjp+-z*#x#XPh^W=+P?o2<4MNp22 { - console.log(`Installing all packages for ${part}...`); - execIn("npm i", path.join(__dirname, "..", "..", part)); -}); +console.log(`Installing all packages...`); +execIn("npm i", path.join(__dirname, "..")); -parts.forEach((part) => { - let partDir = path.join(__dirname, "..", "..", part); - let distDir = path.join(partDir, "dist"); - let start = 0; - start = getLines( - execIn("npm ls --parseable --package-lock-only -a", partDir) - ); - if (fs.existsSync(distDir)) - fs.rmSync(distDir, { - recursive: true, - force: true, - }); - let x = { - dependencies: [], - devDependencies: [], - invalidDirs: [], - invalidFiles: [], - missing: [], - using: [], - }; - let dcproc = execIn("npx depcheck --json", partDir); - if(dcproc.stdout) x = JSON.parse(dcproc.stdout); - else x = JSON.parse(dcproc); +let partDir = path.join(__dirname, ".."); +let distDir = path.join(partDir, "dist"); +let start = 0; +start = getLines( + execIn("npm ls --parseable --package-lock-only -a", partDir) +); +if (fs.existsSync(distDir)) + fs.rmSync(distDir, { + recursive: true, + force: true, + }); +let x = { + dependencies: [], + devDependencies: [], + invalidDirs: [], + invalidFiles: [], + missing: [], + using: [], +}; +let dcproc = execIn("npx depcheck --json", partDir); +if(dcproc.stdout) x = JSON.parse(dcproc.stdout); +else x = JSON.parse(dcproc); - fs.writeFileSync( - path.join(__dirname, "..", `depclean.out.${part}.json`), - JSON.stringify(x, null, "\t"), - { encoding: "utf8" } - ); +fs.writeFileSync( + path.join(__dirname, "..", `depclean.out.json`), + JSON.stringify(x, null, "\t"), + { encoding: "utf8" } +); - let depsToRemove = x.dependencies.join(" "); - if (depsToRemove) execIn(`npm r --save ${depsToRemove}`, partDir); +let depsToRemove = x.dependencies.join(" "); +if (depsToRemove) execIn(`npm r --save ${depsToRemove}`, partDir); - depsToRemove = x.devDependencies.join(" "); - if (depsToRemove) execIn(`npm r --save --dev ${depsToRemove}`, partDir); +depsToRemove = x.devDependencies.join(" "); +if (depsToRemove) execIn(`npm r --save --dev ${depsToRemove}`, partDir); + +if (removeModules && fs.existsSync(path.join(partDir, "node_modules"))) + fs.rmSync(path.join(partDir, "node_modules"), { + recursive: true, + force: true, + }); +let end = getLines( + execIn("npm ls --parseable --package-lock-only -a", partDir) +); +console.log(`${part}: ${start} -> ${end} (diff: ${start - end})`); - if (removeModules && fs.existsSync(path.join(partDir, "node_modules"))) - fs.rmSync(path.join(partDir, "node_modules"), { - recursive: true, - force: true, - }); - let end = getLines( - execIn("npm ls --parseable --package-lock-only -a", partDir) - ); - console.log(`${part}: ${start} -> ${end} (diff: ${start - end})`); -}); console.log("Installing required packages for bundle..."); execIn(`npm i --save ${bundleRequired.join(" ")}`, path.join(__dirname, "..")); diff --git a/scripts/install.js b/scripts/install.js deleted file mode 100644 index db9dadbc6..000000000 --- a/scripts/install.js +++ /dev/null @@ -1,23 +0,0 @@ -const path = require("path"); -const fs = require("fs"); -const parts = ["api", "util", "cdn", "gateway"]; - -const bundle = require("../package.json"); - -for (const part of parts) { - const { devDependencies, dependencies } = require(path.join( - "..", - "..", - part, - "package.json" - )); - bundle.devDependencies = { ...bundle.devDependencies, ...devDependencies }; - bundle.dependencies = { ...bundle.dependencies, ...dependencies }; - delete bundle.dependencies["@fosscord/util"]; -} - -fs.writeFileSync( - path.join(__dirname, "..", "package.json"), - JSON.stringify(bundle, null, "\t"), - { encoding: "utf8" } -); diff --git a/scripts/rights.js b/scripts/rights.js index c363b0c50..20fd139c7 100644 --- a/scripts/rights.js +++ b/scripts/rights.js @@ -6,7 +6,7 @@ const { argv, stdout, exit } = require("process"); const { execIn, getLines, parts } = require("./utils"); -let lines = fs.readFileSync(path.join(__dirname, "..", "..", "util", "src","util","Rights.ts")).toString() +let lines = fs.readFileSync(path.join(__dirname, "..", "src", "util", "util","Rights.ts")).toString() let lines2 = lines.split("\n"); let lines3 = lines2.filter(y=>y.includes(": BitFlag(")); let lines4 = lines3.map(x=>x.split("//")[0].trim()) diff --git a/scripts/update_schemas.js b/scripts/update_schemas.js index a018120b9..361bedc13 100644 --- a/scripts/update_schemas.js +++ b/scripts/update_schemas.js @@ -6,4 +6,4 @@ const { argv, stdout, exit } = require("process"); const { execIn, getLines, parts } = require("./utils"); -execIn("node scripts/generate_schema.js", path.join("..", "api")); \ No newline at end of file +execIn("node scripts/generate_schema.js", path.join('.')); \ No newline at end of file diff --git a/scripts/utils.js b/scripts/utils.js index f4b1ad7f6..ca41bcf20 100644 --- a/scripts/utils.js +++ b/scripts/utils.js @@ -4,8 +4,6 @@ const { env } = require("process"); const { execSync } = require("child_process"); const { argv, stdout, exit } = require("process"); -const parts = ["api", "util", "cdn", "gateway", "bundle"]; - function copyRecursiveSync(src, dest) { //if (verbose) console.log(`cpsync: ${src} -> ${dest}`); let exists = fs.existsSync(src);