diff --git a/package.json b/package.json index 8978163d98..2f64a030d9 100644 --- a/package.json +++ b/package.json @@ -30,9 +30,10 @@ "mocha": "pnpm --filter backend run mocha", "test": "pnpm run mocha", "format": "pnpm -r --parallel run format", - "clean": "pnpm node ./scripts/clean.mjs", - "clean-all": "pnpm node ./scripts/clean-all.mjs", - "cleanall": "pnpm run clean-all" + "clean": "pnpm node ./scripts/clean-built.mjs", + "clean-npm": "pnpm node ./scripts/clean-npm.mjs", + "clean-cargo": "pnpm node ./scripts/clean-cargo.mjs", + "clean-all": "pnpm run clean && pnpm run clean-cargo && pnpm run clean-npm" }, "resolutions": { "chokidar": "^3.3.1" diff --git a/scripts/clean.mjs b/scripts/clean-built.mjs similarity index 100% rename from scripts/clean.mjs rename to scripts/clean-built.mjs diff --git a/scripts/clean-cargo.mjs b/scripts/clean-cargo.mjs new file mode 100644 index 0000000000..cb567dc1ee --- /dev/null +++ b/scripts/clean-cargo.mjs @@ -0,0 +1,12 @@ +import path, { join } from "node:path"; +import { fileURLToPath } from "node:url"; +import { execa } from "execa"; + +(async () => { + const __dirname = path.dirname(fileURLToPath(import.meta.url)); + + execa("cargo", ["clean"], { + cwd: join(__dirname, "/../packages/backend/native-utils"), + stdio: "inherit", + }); +})(); diff --git a/scripts/clean-all.mjs b/scripts/clean-npm.mjs similarity index 56% rename from scripts/clean-all.mjs rename to scripts/clean-npm.mjs index f8708f740f..ff5cac0ab1 100644 --- a/scripts/clean-all.mjs +++ b/scripts/clean-npm.mjs @@ -6,59 +6,30 @@ import { execa } from "execa"; (async () => { const __dirname = path.dirname(fileURLToPath(import.meta.url)); - fs.rmSync(join(__dirname, "/../packages/backend/built"), { - recursive: true, - force: true, - }); fs.rmSync(join(__dirname, "/../packages/backend/node_modules"), { recursive: true, force: true, }); - - fs.rmSync(join(__dirname, "/../packages/backend/native-utils/built"), { - recursive: true, - force: true, - }); fs.rmSync(join(__dirname, "/../packages/backend/native-utils/node_modules"), { recursive: true, force: true, }); - - fs.rmSync(join(__dirname, "/../packages/client/built"), { - recursive: true, - force: true, - }); fs.rmSync(join(__dirname, "/../packages/client/node_modules"), { recursive: true, force: true, }); - - fs.rmSync(join(__dirname, "/../packages/sw/built"), { - recursive: true, - force: true, - }); fs.rmSync(join(__dirname, "/../packages/sw/node_modules"), { recursive: true, force: true, }); - fs.rmSync(join(__dirname, "/../packages/firefish-js/built"), { - recursive: true, - force: true, - }); fs.rmSync(join(__dirname, "/../packages/firefish-js/node_modules"), { recursive: true, force: true, }); - fs.rmSync(join(__dirname, "/../packages/megalodon/lib"), { - recursive: true, - force: true, - }); fs.rmSync(join(__dirname, "/../packages/megalodon/node_modules"), { recursive: true, force: true, }); - - fs.rmSync(join(__dirname, "/../built"), { recursive: true, force: true }); fs.rmSync(join(__dirname, "/../node_modules"), { recursive: true, force: true, @@ -68,9 +39,4 @@ import { execa } from "execa"; cwd: join(__dirname, "/../"), stdio: "inherit", }); - - execa("cargo", ["clean"], { - cwd: join(__dirname, "/../packages/backend/native-utils"), - stdio: "inherit", - }); })();