Merge branch 'main' into feat/#1040

.github/workflows/actionlint.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: actionlint
-        uses: reviewdog/[email protected].0
+        uses: reviewdog/[email protected].1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           reporter: github-pr-review

.yarnrc.yml

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.6.3.cjs
+yarnPath: .yarn/releases/yarn-3.6.4.cjs

Dockerfile

@@ -39,4 +39,4 @@ WORKDIR /app
 COPY --from=build /build .
 
 ENTRYPOINT ["node"]
-CMD ["build/index.js"]
+CMD ["build/index.mjs"]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oreorebot2/common",
   "private": true,
-  "packageManager": "[email protected].3",
+  "packageManager": "[email protected].4",
   "workspaces": [
     "packages/*"
   ],
@@ -22,11 +22,11 @@
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^4.1.1",
-    "@types/node": "20.7.1",
+    "@types/node": "20.8.2",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "eslint": "8.50.0",
-    "eslint-config-next": "13.5.3",
+    "eslint-config-next": "13.5.4",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-markdown": "^3.0.0",

packages/bot/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@oreorebot2/bot",
   "version": "1.47.2",
-  "exports": "./index.js",
+  "exports": "./index.mjs",
   "type": "module",
   "license": "MIT",
   "repository": "https://github.com/approvers/OreOreBot2",
   "author": "approvers <[email protected]>",
   "scripts": {
-    "start": "node ./build/index.js",
+    "start": "node ./build/index.mjs",
     "dev": "ts-node --esm ./src/server/index.ts",
-    "build": "esbuild ./src/server/index.ts --bundle --minify --charset=utf8 --platform=node --target=node16 --format=esm --packages=external --outfile=build/index.js",
+    "build": "esbuild ./src/server/index.ts --bundle --minify --charset=utf8 --platform=node --target=node18 --format=esm --packages=external --outfile=build/index.mjs",
     "lint": "eslint \"./src/**/*.{js,ts}\"",
     "format": "prettier --write \"./src/**/*.{js,ts,md}\"",
     "test": "vitest run",
     "coverage": "vitest run --coverage",
     "lint-staged": "lint-staged"
   },
   "engines": {
-    "node": ">=14.16"
+    "node": ">=18"
   },
   "dependencies": {
     "@discordjs/opus": "^0.9.0",
@@ -37,7 +37,7 @@
     "@codedependant/semantic-release-docker": "^4.1.0",
     "@oreorebot2/common": "workspace:*",
     "@types/deep-equal": "^1.0.1",
-    "@types/node": "20.7.1",
+    "@types/node": "20.8.2",
     "@types/yargs": "^17.0.22",
     "@vitest/coverage-v8": "^0.34.0",
     "esbuild": "^0.19.0",

packages/bot/src/server/index.ts

@@ -145,6 +145,7 @@ const channelRepository = new DiscordChannelRepository(
   client,
   GUILD_ID as Snowflake
 );
+const versionFetcher = new GenVersionFetcher();
 
 if (features.includes('COMMAND')) {
   registerAllCommandResponder({
@@ -170,7 +171,7 @@ if (features.includes('COMMAND')) {
     stats,
     sheriff: new DiscordSheriff(client),
     ping: new DiscordWS(client),
-    fetcher: new GenVersionFetcher(),
+    fetcher: versionFetcher,
     messageRepo: new DiscordMessageRepository(client),
     membersRepo: stats,
     roleRepo: roleManager,
@@ -241,17 +242,14 @@ process.on('SIGTERM', () => {
 });
 
 client.once('ready', () => {
-  const projectVersion = process.env.npm_package_version;
+  const projectVersion = versionFetcher.version;
   const connectionUser = client.user;
   if (connectionUser == null) return;
-  if (projectVersion !== undefined) {
-    connectionUser.setActivity(`v${projectVersion}`);
-  }
   console.log('======================================');
   console.log('起動しました。');
   console.log(`ログインユーザー: ${connectionUser.tag}(${connectionUser.id})`);
   console.log(`バージョン:`);
-  console.log(` - ビルド: v${projectVersion ?? 'unknown'}`);
+  console.log(` - ビルド: v${projectVersion}`);
   console.log(` - discord.js: v${version}`);
   console.log(` - Node.js: ${process.version}`);
   console.log('コンフィグ:');

packages/docs/package.json

@@ -22,6 +22,6 @@
   },
   "devDependencies": {
     "@oreorebot2/common": "workspace:*",
-    "@types/react": "18.2.23"
+    "@types/react": "18.2.25"
   }
 }