.gitignore

@@ -48,3 +48,14 @@ ormconfig.json
 *.blend3
 *.blend4
 *.blend5
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+packages/client/.yarn/*
+packages/backend/.yarn/*
+packages/sw/.yarn/*

.npmrc

@@ -1,2 +0,0 @@
-save-exact = true
-package-lock = false

.yarnrc

@@ -1 +0,0 @@
-network-timeout 600000

.yarnrc.yml

@@ -0,0 +1,11 @@
+httpTimeout: 600000
+
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
+
+yarnPath: .yarn/releases/yarn-3.2.3.cjs

package.json

@@ -6,9 +6,11 @@
 		"url": "https://akkoma.dev/FoundKeyGang/FoundKey.git"
 	},
 	"private": true,
-	"workspaces": ["packages/*"],
+	"workspaces": [
+		"packages/*"
+	],
 	"scripts": {
-		"build": "node ./scripts/build.js",
+		"build": "yarn workspaces foreach run build",
 		"start": "yarn workspace backend run start",
 		"start:test": "yarn workspace backend run start:test",
 		"init": "yarn migrate",
@@ -17,7 +19,7 @@
 		"gulp": "gulp build",
 		"watch": "yarn dev",
 		"dev": "node ./scripts/dev.js",
-		"lint": "node ./scripts/lint.js",
+		"lint": "yarn workspaces foreach run lint",
 		"cy:open": "cypress open --browser --e2e --config-file=cypress.config.ts",
 		"cy:run": "cypress run",
 		"e2e": "start-server-and-test start:test http://localhost:61812 cy:run",
@@ -45,5 +47,6 @@
 		"cypress": "10.3.0",
 		"start-server-and-test": "1.14.0",
 		"typescript": "4.7.4"
-	}
+	},
+	"packageManager": "yarn@3.2.3"
 }

packages/backend/.eslintignore

@@ -1,4 +1,4 @@
 node_modules
 /built
-/.eslintrc.js
+/.eslintrc.cjs
 /@types/**/*

packages/backend/.npmrc

@@ -1,2 +0,0 @@
-save-exact = true
-package-lock = false

packages/backend/.yarnrc

@@ -1 +0,0 @@
-network-timeout 600000

packages/backend/package.json

@@ -25,7 +25,7 @@
 		"@koa/cors": "3.1.0",
 		"@koa/multer": "3.0.0",
 		"@koa/router": "9.0.1",
-		"@peertube/http-signature": "1.6.0",
+		"@peertube/http-signature": "1.7.0",
 		"@sinonjs/fake-timers": "9.1.2",
 		"@syuilo/aiscript": "0.11.1",
 		"abort-controller": "3.0.0",
@@ -168,12 +168,13 @@
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.3",
-		"@typescript-eslint/eslint-plugin": "^5.30.0",
+		"@typescript-eslint/eslint-plugin": "^5.35.1",
 		"@typescript-eslint/parser": "^5.30.0",
 		"cross-env": "7.0.3",
 		"eslint": "^8.20.0",
 		"eslint-plugin-import": "^2.26.0",
 		"execa": "6.1.0",
+		"form-data": "^4.0.0",
 		"typescript": "^4.7.4"
 	}
 }

packages/client/.npmrc

@@ -1,2 +0,0 @@
-save-exact = true
-package-lock = false

packages/client/.yarnrc

@@ -1 +0,0 @@
-network-timeout 600000

packages/client/package.json

@@ -16,6 +16,7 @@
 		"@fortawesome/fontawesome-free": "6.1.1",
 		"@rollup/plugin-alias": "3.1.9",
 		"@rollup/plugin-json": "4.1.0",
+		"@rollup/pluginutils": "^4.2.1",
 		"@syuilo/aiscript": "0.11.1",
 		"@vitejs/plugin-vue": "^3.0.0",
 		"@vue/compiler-sfc": "3.2.37",
@@ -98,7 +99,7 @@
 		"@types/uuid": "8.3.4",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.3",
-		"@typescript-eslint/eslint-plugin": "^5.30.0",
+		"@typescript-eslint/eslint-plugin": "^5.35.1",
 		"@typescript-eslint/parser": "^5.30.0",
 		"cross-env": "7.0.3",
 		"cypress": "10.3.0",

packages/foundkey-js/.eslintignore

@@ -1,7 +1,7 @@
 node_modules
 /built
 /coverage
-/.eslintrc.js
+/.eslintrc.cjs
 /jest.config.ts
 /test
 /test-d

packages/sw/.npmrc

@@ -1,2 +0,0 @@
-save-exact = true
-package-lock = false

packages/sw/.yarnrc

@@ -1 +0,0 @@
-network-timeout 600000

packages/sw/package.json

@@ -7,7 +7,6 @@
 		"build": "node build.js",
 		"lint": "eslint src --ext .ts"
 	},
-	"resolutions": {},
 	"dependencies": {
 		"esbuild": "^0.14.13",
 		"idb-keyval": "^6.0.3"

scripts/build.js

@@ -1,43 +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/foundkey-js ...');
-
-	await execa('npm', ['run', 'build'], {
-		cwd: __dirname + '/../packages/foundkey-js',
-		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,
-	});
-})();

scripts/lint.js

@@ -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,
-	});
-})();