Workspaces refactor #86

Merged
norm merged 189 commits from refactor/workspaces into main 2022-08-28 14:46:45 +00:00
27 changed files with 37285 additions and 36534 deletions
Showing only changes of commit 6bb3f39c36 - Show all commits

11
.gitignore vendored
View file

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

2
.npmrc
View file

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

783
.yarn/releases/yarn-3.2.3.cjs vendored Executable file

File diff suppressed because one or more lines are too long

View file

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

11
.yarnrc.yml Normal file
View file

@ -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

View file

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

View file

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

View file

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

View file

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

View file

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

File diff suppressed because it is too large Load diff

View file

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

View file

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

View file

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

File diff suppressed because it is too large Load diff

View file

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

File diff suppressed because it is too large Load diff

View file

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

View file

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

View file

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

File diff suppressed because it is too large Load diff

View file

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

View file

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

31719
yarn.lock

File diff suppressed because it is too large Load diff