Merge branch 'develop'

CHANGELOG.md

@@ -7,6 +7,10 @@
 
 -->
 
+## 12.96.1 (2021/11/13)
+### Improvements
+- npm scriptの互換性を向上
+
 ## 12.96.0 (2021/11/13)
 
 ### Improvements

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.96.0",
+	"version": "12.96.1",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -28,7 +28,9 @@
 		"mocha": "cd packages/backend && cross-env TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" npx mocha",
 		"test": "npm run mocha",
 		"format": "gulp format",
-		"clean": "node ./scripts/clean.js"
+		"clean": "node ./scripts/clean.js",
+		"clean-all": "node ./scripts/clean-all.js",
+		"cleanall": "npm run clean-all"
 	},
 	"dependencies": {
 		"@types/gulp": "4.0.9",

scripts/clean-all.js

@@ -0,0 +1,12 @@
+const fs = require('fs');
+
+(async () => {
+	fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/backend/node_modules', { recursive: true, force: true });
+
+	fs.rmSync(__dirname + '/../packages/client/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/client/node_modules', { recursive: true, force: true });
+
+	fs.rmSync(__dirname + '/../built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../node_modules', { recursive: true, force: true });
+})();

scripts/clean.js

@@ -1,13 +1,7 @@
 const fs = require('fs');
-const execa = require('execa');
 
 (async () => {
 	fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../packages/backend/node_modules', { recursive: true, force: true });
-
 	fs.rmSync(__dirname + '/../packages/client/built', { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../packages/client/node_modules', { recursive: true, force: true });
-
 	fs.rmSync(__dirname + '/../built', { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../node_modules', { recursive: true, force: true });
 })();