refactor: migrate to Yarn Berry (v3.2.1)

.dockerignore

@@ -13,3 +13,10 @@ node_modules/
 redis/
 files/
 misskey-assets/
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.github/workflows/lint.yml

@@ -8,32 +8,24 @@ on:
   pull_request:
 
 jobs:
-  backend:
+  lint:
+    strategy:
+      matrix:
+        workspace:
+        - backend-771cdf
+        - client-66101c
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
       with:
+        fetch-depth: 0
         submodules: true
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v3.2.0
       with:
         node-version: 18.x
-        cache: 'yarn'
-        cache-dependency-path: |
-          packages/backend/yarn.lock
-    - run: yarn install
-    - run: yarn --cwd ./packages/backend lint
-
-  client:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 18.x
-        cache: 'yarn'
-        cache-dependency-path: |
-          packages/client/yarn.lock
-    - run: yarn install
-    - run: yarn --cwd ./packages/client lint
+    - run: corepack enable
+    - run: yarn set version berry
+    - run: yarn workspaces foreach install --immutable
+      env:
+        YARN_CHECKSUM_BEHAVIOR: update
+    - run: yarn workspace ${{ matrix.workspace }} run lint

.github/workflows/test.yml

@@ -36,12 +36,11 @@ jobs:
       uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
-        cache-dependency-path: |
-          packages/backend/yarn.lock
-          packages/client/yarn.lock
-    - name: Install dependencies
-      run: yarn install
+    - run: corepack enable
+    - run: yarn set version berry
+    - run: yarn workspaces foreach install --immutable
+      env:
+        YARN_CHECKSUM_BEHAVIOR: update
     - name: Check yarn.lock
       run: git diff --exit-code yarn.lock
     - name: Copy Configure
@@ -87,14 +86,11 @@ jobs:
       uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
-        cache-dependency-path: |
-          packages/backend/yarn.lock
-          packages/client/yarn.lock
-    - name: Install dependencies
-      run: yarn install
-    - name: Check yarn.lock
-      run: git diff --exit-code yarn.lock
+    - run: corepack enable
+    - run: yarn set version berry
+    - run: yarn workspaces foreach install --immutable
+      env:
+        YARN_CHECKSUM_BEHAVIOR: update
     - name: Copy Configure
       run: cp .github/misskey/test.yml .config
     - name: Build

.gitignore

@@ -9,6 +9,15 @@
 node_modules
 report.*.json
 
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+packages/*/.yarn/*
+
 # Cypress
 cypress/screenshots
 cypress/videos

.node-version

@@ -1 +1 @@
-v18.0.0
+v18.2.0

.yarnrc.yml

@@ -0,0 +1,13 @@
+httpTimeout: 600000
+
+nmHoistingLimits: none
+
+nodeLinker: pnpm
+
+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"
+
+progressBarStyle: "patrick"

CHANGELOG.md

@@ -11,7 +11,7 @@ You should also include the user name that made the change.
 
 ## 12.x.x (unreleased)
 ### NOTE
-- From this version, Node 18.0.0 or later is required.
+- From this version, Node 18.2.0 or later is required.
 
 ### Improvements
 - enhance: ドライブに画像ファイルをアップロードするときオリジナル画像を破棄してwebpublicのみ保持するオプション @tamaina
@@ -28,6 +28,7 @@ You should also include the user name that made the change.
 - Perform port diagnosis at startup only when Listen fails @mei23
 - Rate limiting is now also usable for non-authenticated users. @Johann150
   Admins should make sure the reverse proxy sets the `X-Forwarded-For` header to the original address.
+- Migrate to Yarn v3.2.0 @ThatOneCalculator
 
 ### Bugfixes
 - Client: fix settings page @tamaina

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.0.0-alpine3.15 AS base
+FROM node:18.2.0-alpine3.15 AS base
 
 ARG NODE_ENV=production
 

gulpfile.js

@@ -16,11 +16,11 @@ gulp.task('copy:backend:views', () =>
 );
 
 gulp.task('copy:client:fonts', () =>
-	gulp.src('./packages/client/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_client_dist_/fonts/'))
+	gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_client_dist_/fonts/'))
 );
 
 gulp.task('copy:client:fontawesome', () =>
-	gulp.src('./packages/client/node_modules/@fortawesome/fontawesome-free/**/*').pipe(gulp.dest('./built/_client_dist_/fontawesome/'))
+	gulp.src('./node_modules/@fortawesome/fontawesome-free/**/*').pipe(gulp.dest('./built/_client_dist_/fontawesome/'))
 );
 
 gulp.task('copy:client:locales', cb => {

package.json

@@ -6,19 +6,24 @@
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
+	"packageManager": "[email protected]",
+	"workspaces": [
+		"packages/client",
+		"packages/backend",
+		"packages/sw"
+	],
 	"private": true,
 	"scripts": {
-		"postinstall": "node ./scripts/install-packages.js",
-		"build": "node ./scripts/build.js",
-		"start": "cd packages/backend && node --experimental-json-modules ./built/index.js",
-		"start:test": "cd packages/backend && cross-env NODE_ENV=test node --experimental-json-modules ./built/index.js",
+		"build": "yarn workspaces foreach run build",
+		"start": "cd packages/backend && yarn node --experimental-json-modules ./built/index.js",
+		"start:test": "cd packages/backend && cross-env NODE_ENV=test yarn node --experimental-json-modules ./built/index.js",
 		"init": "npm run migrate",
 		"migrate": "cd packages/backend && npx typeorm migration:run -d ormconfig.js",
 		"migrateandstart": "npm run migrate && npm run start",
 		"gulp": "gulp build",
 		"watch": "npm run dev",
 		"dev": "node ./scripts/dev.js",
-		"lint": "node ./scripts/lint.js",
+		"lint": "yarn workspaces foreach run lint",
 		"cy:open": "cypress open",
 		"cy:run": "cypress run",
 		"e2e": "start-server-and-test start:test http://localhost:61812 cy:run",
@@ -30,6 +35,7 @@
 		"cleanall": "npm run clean-all"
 	},
 	"dependencies": {
+		"eslint": "^8.16.0",
 		"execa": "5.1.1",
 		"gulp": "4.0.2",
 		"gulp-cssnano": "2.1.3",
@@ -41,10 +47,14 @@
 	"devDependencies": {
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
-		"@typescript-eslint/parser": "5.18.0",
+		"@typescript-eslint/eslint-plugin": "latest",
+		"@typescript-eslint/parser": "5.27.0",
 		"cross-env": "7.0.3",
-		"cypress": "9.5.3",
+		"cypress": "9.7.0",
+		"eslint-plugin-import": "^2.26.0",
+		"eslint-plugin-vue": "latest",
 		"start-server-and-test": "1.14.0",
-		"typescript": "4.6.3"
+		"typescript": "4.7.2",
+		"vue-eslint-parser": "^9.0.2"
 	}
 }

packages/backend/package.json

@@ -9,17 +9,18 @@
 		"mocha": "cross-env NODE_ENV=test TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" mocha",
 		"test": "npm run mocha"
 	},
+	"packageManager": "[email protected]",
 	"resolutions": {
 		"chokidar": "^3.3.1",
 		"lodash": "^4.17.21"
 	},
 	"dependencies": {
-		"@bull-board/koa": "3.10.4",
+		"@bull-board/koa": "3.11.0",
 		"@discordapp/twemoji": "14.0.2",
-		"@elastic/elasticsearch": "7.11.0",
-		"@koa/cors": "3.1.0",
+		"@elastic/elasticsearch": "7.17.0",
+		"@koa/cors": "3.3.0",
 		"@koa/multer": "3.0.0",
-		"@koa/router": "9.0.1",
+		"@koa/router": "9.4.0",
 		"@peertube/http-signature": "1.6.0",
 		"@sinonjs/fake-timers": "9.1.2",
 		"@syuilo/aiscript": "0.11.1",
@@ -28,7 +29,7 @@
 		"archiver": "5.3.1",
 		"autobind-decorator": "2.4.0",
 		"autwh": "0.1.0",
-		"aws-sdk": "2.1135.0",
+		"aws-sdk": "2.1145.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.5",
 		"broadcast-channel": "4.12.0",
@@ -46,16 +47,16 @@
 		"feed": "4.2.2",
 		"file-type": "17.1.1",
 		"fluent-ffmpeg": "2.1.2",
-		"got": "12.0.4",
+		"got": "12.1.0",
 		"hpagent": "0.1.2",
-		"ip-cidr": "3.0.8",
+		"ip-cidr": "3.0.10",
 		"is-svg": "4.3.2",
 		"js-yaml": "4.1.0",
 		"jsdom": "19.0.0",
 		"json5": "2.2.1",
 		"json5-loader": "4.0.1",
 		"jsonld": "5.2.0",
-		"jsrsasign": "10.5.22",
+		"jsrsasign": "10.5.23",
 		"koa": "2.13.4",
 		"koa-bodyparser": "4.3.0",
 		"koa-favicon": "2.1.0",
@@ -70,7 +71,7 @@
 		"misskey-js": "0.0.14",
 		"mocha": "10.0.0",
 		"ms": "3.0.0-canary.1",
-		"multer": "1.4.4",
+		"multer": "1.4.5-lts.1",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.2.4",
 		"nodemailer": "6.7.5",
@@ -96,14 +97,14 @@
 		"s-age": "1.1.2",
 		"sanitize-html": "2.7.0",
 		"semver": "7.3.7",
-		"sharp": "0.29.3",
+		"sharp": "0.30.6",
 		"speakeasy": "2.0.0",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"style-loader": "3.3.1",
 		"summaly": "2.5.0",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "5.11.15",
+		"systeminformation": "5.11.16",
 		"tinycolor2": "1.4.2",
 		"tmp": "0.2.1",
 		"ts-loader": "9.3.0",
@@ -117,12 +118,11 @@
 		"uuid": "8.3.2",
 		"web-push": "3.5.0",
 		"websocket": "1.0.34",
-		"ws": "8.6.0",
+		"ws": "8.7.0",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
-		"@redocly/openapi-core": "1.0.0-beta.97",
-		"@types/semver": "7.3.9",
+		"@redocly/openapi-core": "1.0.0-beta.100",
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "3.15.8",
 		"@types/cbor": "6.0.0",
@@ -141,11 +141,11 @@
 		"@types/koa-mount": "4.0.1",
 		"@types/koa-send": "4.1.3",
 		"@types/koa-views": "7.0.0",
-		"@types/koa__cors": "3.1.1",
+		"@types/koa__cors": "3.3.0",
 		"@types/koa__multer": "2.0.4",
 		"@types/koa__router": "8.0.11",
 		"@types/mocha": "9.1.1",
-		"@types/node": "17.0.35",
+		"@types/node": "17.0.36",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.4",
 		"@types/oauth": "0.9.1",
@@ -158,6 +158,7 @@
 		"@types/redis": "4.0.11",
 		"@types/rename": "1.0.4",
 		"@types/sanitize-html": "2.6.2",
+		"@types/semver": "7.3.9",
 		"@types/sharp": "0.30.2",
 		"@types/sinonjs__fake-timers": "8.1.2",
 		"@types/speakeasy": "2.0.7",
@@ -167,13 +168,12 @@
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.3",
-		"@typescript-eslint/eslint-plugin": "5.26.0",
-		"@typescript-eslint/parser": "5.26.0",
-		"typescript": "4.7.2",
+		"@typescript-eslint/eslint-plugin": "5.27.0",
+		"@typescript-eslint/parser": "5.27.0",
+		"cross-env": "7.0.3",
 		"eslint": "8.16.0",
 		"eslint-plugin-import": "2.26.0",
-
-		"cross-env": "7.0.3",
-		"execa": "6.1.0"
+		"execa": "6.1.0",
+		"typescript": "4.7.2"
 	}
 }

packages/backend/src/server/web/index.ts

@@ -135,7 +135,7 @@ router.get('/twemoji/(.*)', async ctx => {
 	ctx.set('Content-Security-Policy', 'default-src \'none\'; style-src \'unsafe-inline\'');
 
 	await send(ctx as any, path, {
-		root: `${_dirname}/../../../node_modules/@discordapp/twemoji/dist/svg/`,
+		root: `${_dirname}/../../../../../node_modules/@discordapp/twemoji/dist/svg/`,
 		maxage: ms('30 days'),
 	});
 });

packages/backend/test/tsconfig.json

@@ -27,7 +27,7 @@
 			"@/*": ["../src/*"]
 		},
 		"typeRoots": [
-			"../node_modules/@types",
+			"../../../node_modules/@types",
 			"../src/@types"
 		],
 		"lib": [