Merge branch 'develop'

7 files changed, 33 insertions, 98 deletions

diff --git a/scripts/build-pre.js b/scripts/build-pre.js
new file mode 100644
index 0000000000..e34a97738e
--- /dev/null
+++ b/scripts/build-pre.js
@@ -0,0 +1,5 @@
+const fs = require('fs');
+const meta = require('../package.json');
+
+fs.mkdirSync(__dirname + '/../built', { recursive: true });
+fs.writeFileSync(__dirname + '/../built/meta.json', JSON.stringify({ version: meta.version }), 'utf-8');
diff --git a/scripts/build.js b/scripts/build.js
deleted file mode 100644
index 608648b953..0000000000
--- a/scripts/build.js
+++ /dev/null
@@ -1,35 +0,0 @@
-const execa = require('execa');
-
-(async () => {
-	console.log('building packages/backend ...');
-
-	await execa('npm', ['run', 'build'], {
-		cwd: __dirname + '/../packages/backend',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-
-	console.log('building packages/client ...');
-
-	await execa('npm', ['run', 'build'], {
-		cwd: __dirname + '/../packages/client',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-
-	console.log('building packages/sw ...');
-
-	await execa('npm', ['run', 'build'], {
-		cwd: __dirname + '/../packages/sw',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-
-	console.log('build finishing ...');
-
-	await execa('npm', ['run', 'gulp'], {
-		cwd: __dirname + '/../',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-})();
diff --git a/scripts/clean-all.js b/scripts/clean-all.js
index 456b88032b..2d7fe99ae4 100644
--- a/scripts/clean-all.js
+++ b/scripts/clean-all.js
@@ -1,15 +1,21 @@
+const { execSync } = require('child_process');
 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 + '/../packages/frontend/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/frontend/node_modules', { recursive: true, force: true });
 
 	fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true });
 	fs.rmSync(__dirname + '/../packages/sw/node_modules', { recursive: true, force: true });
 
 	fs.rmSync(__dirname + '/../built', { recursive: true, force: true });
 	fs.rmSync(__dirname + '/../node_modules', { recursive: true, force: true });
+
+	execSync('pnpm store prune', {
+		cwd: __dirname + '/../',
+		stdio: 'inherit',
+	});
 })();
diff --git a/scripts/clean.js b/scripts/clean.js
index 70b9d882b5..d32586914b 100644
--- a/scripts/clean.js
+++ b/scripts/clean.js
@@ -2,7 +2,7 @@ const fs = require('fs');
 
 (async () => {
 	fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../packages/client/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/frontend/built', { recursive: true, force: true });
 	fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true });
 	fs.rmSync(__dirname + '/../built', { recursive: true, force: true });
 })();
diff --git a/scripts/dev.js b/scripts/dev.js
index c5dbb7b35a..943190f8b4 100644
--- a/scripts/dev.js
+++ b/scripts/dev.js
@@ -1,39 +1,49 @@
 const execa = require('execa');
+const fs = require('fs');
 
 (async () => {
-	await execa('npm', ['run', 'clean'], {
+	await execa('pnpm', ['clean'], {
 		cwd: __dirname + '/../',
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
-	execa('npx', ['gulp', 'watch'], {
+	await execa('pnpm', ['build-pre'], {
 		cwd: __dirname + '/../',
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
-	execa('npm', ['run', 'watch'], {
-		cwd: __dirname + '/../packages/backend',
+	execa('pnpm', ['dlx', 'gulp', 'watch'], {
+		cwd: __dirname + '/../',
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
-	execa('npm', ['run', 'watch'], {
-		cwd: __dirname + '/../packages/client',
+	execa('pnpm', ['--filter', 'backend', 'watch'], {
+		cwd: __dirname + '/../',
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
-	execa('npm', ['run', 'watch'], {
-		cwd: __dirname + '/../packages/sw',
+	execa('pnpm', ['--filter', 'frontend', 'watch'], {
+		cwd: __dirname + '/../',
+		stdout: process.stdout,
+		stderr: process.stderr,
+	});
+
+	execa('pnpm', ['--filter', 'sw', 'watch'], {
+		cwd: __dirname + '/../',
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
 	const start = async () => {
 		try {
-			await execa('npm', ['run', 'start'], {
+			const exist = fs.existsSync(__dirname + '/../packages/backend/built/boot/index.js')
+			if (!exist) throw new Error('not exist yet');
+
+			await execa('pnpm', ['start'], {
 				cwd: __dirname + '/../',
 				stdout: process.stdout,
 				stderr: process.stderr,
diff --git a/scripts/install-packages.js b/scripts/install-packages.js
deleted file mode 100644
index d1dea3ebe5..0000000000
--- a/scripts/install-packages.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const execa = require('execa');
-
-(async () => {
-	console.log('installing dependencies of packages/backend ...');
-
-	await execa('yarn', ['--force', 'install'], {
-		cwd: __dirname + '/../packages/backend',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-
-	console.log('installing dependencies of packages/client ...');
-
-	await execa('yarn', ['install'], {
-		cwd: __dirname + '/../packages/client',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-
-	console.log('installing dependencies of packages/sw ...');
-
-	await execa('yarn', ['install'], {
-		cwd: __dirname + '/../packages/sw',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-})();
diff --git a/scripts/lint.js b/scripts/lint.js
deleted file mode 100644
index 72a63f4ba3..0000000000
--- a/scripts/lint.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const execa = require('execa');
-
-(async () => {
-	console.log('linting packages/backend ...');
-	await execa('npm', ['run', 'lint'], {
-		cwd: __dirname + '/../packages/backend',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-
-	console.log('linting packages/client ...');
-	await execa('npm', ['run', 'lint'], {
-		cwd: __dirname + '/../packages/client',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-
-	console.log('linting packages/sw ...');
-	await execa('npm', ['run', 'lint'], {
-		cwd: __dirname + '/../packages/sw',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-})();