Feature/fix dev (#39)

* feat: github actionsでdockerイメージをビルドする

* fix: change workflow name and install ca

* fix: apt-getで運が悪いとコケる対策

* fix: 開発環境が動作するように

* enhance: 開発環境のtscをswcに変更

* feat: 開発環境をいい感じ™にした

* feat: add devcontainer

.devcontainer/devcontainer.json

@@ -0,0 +1,6 @@
+{
+	"name": "taiyme/misskey dev",
+	"dockerComposeFile": ["../docker-compose.dev.yml"],
+	"service": "web",
+	"workspaceFolder": "/workspaces"
+}

Dockerfile.dev

@@ -0,0 +1,10 @@
+FROM node:lts
+
+RUN apt update && apt install -y git
+
+COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
+COPY packages/backend/package.json ./packages/backend/
+COPY packages/client/package.json ./packages/client/
+COPY packages/sw/package.json ./packages/sw/
+
+RUN corepack enable

docker-compose.dev.yml

@@ -0,0 +1,41 @@
+version: '3'
+services:
+  web:
+    build:
+      context: .
+      dockerfile: Dockerfile.dev
+    ports:
+      - 3000:3000
+    networks:
+      - internal_network
+      - external_network
+    tty: true
+    volumes:
+      - .:/workspaces:cached
+      - ./.config:/misskey/.config:ro
+    depends_on:
+      - db
+      - redis
+
+  redis:
+    restart: always
+    image: redis:4.0-alpine
+    networks:
+      - internal_network
+    volumes:
+      - ./redis:/data
+
+  db:
+    restart: always
+    image: postgres:12.2-alpine
+    networks:
+      - internal_network
+    env_file:
+      - ./.config/docker.env
+    volumes:
+      - ./db:/var/lib/postgresql/data
+
+networks:
+  internal_network:
+    internal: true
+  external_network:

docker-compose.yml

@@ -4,7 +4,7 @@ services:
   web:
     build:
       context: .
-      cache_from: 
+      cache_from:
         - ghcr.io/taiyme/misskey:buildcache
     restart: always
     ports:
@@ -15,6 +15,9 @@ services:
     volumes:
       - ./files:/misskey/files
       - ./.config:/misskey/.config:ro
+    depends_on:
+      - db
+      - redis
 
   redis:
     restart: always

package.json

@@ -45,12 +45,14 @@
 		"js-yaml": "4.1.0"
 	},
 	"devDependencies": {
+		"@pnpm/logger": "^5.0.0",
 		"@types/gulp": "4.0.9",
 		"@types/gulp-rename": "2.0.1",
 		"@typescript-eslint/parser": "5.36.2",
 		"cross-env": "7.0.3",
 		"cypress": "10.7.0",
 		"start-server-and-test": "1.14.0",
+		"tasuku": "^2.0.1",
 		"typescript": "4.8.3"
 	}
 }

packages/backend/package.json

@@ -51,7 +51,6 @@
 		"cbor": "8.1.0",
 		"chalk": "5.0.1",
 		"chalk-template": "0.4.0",
-		"chokidar": "3.5.3",
 		"cli-highlight": "2.1.11",
 		"color-convert": "2.0.1",
 		"content-disposition": "0.5.4",
@@ -183,6 +182,7 @@
 		"@types/ws": "8.5.3",
 		"@typescript-eslint/eslint-plugin": "5.36.2",
 		"@typescript-eslint/parser": "5.36.2",
+		"chokidar": "3.5.3",
 		"cross-env": "7.0.3",
 		"eslint": "8.23.0",
 		"eslint-plugin-import": "2.26.0",

packages/backend/watch.mjs

@@ -1,22 +1,7 @@
 import { execa } from 'execa';
 
 (async () => {
-	// なぜかchokidarが動かない影響で、watchされない
-	/*
-	execa('tsc-alias', ['-w', '-p', 'tsconfig.json'], {
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-	*/
-
-	setInterval(() => {
-		execa('tsc-alias', ['-p', 'tsconfig.json'], {
-			stdout: process.stdout,
-			stderr: process.stderr,
-		});
-	}, 3000);
-
-	execa('tsc', ['-w', '-p', 'tsconfig.json'], {
+	execa('swc', ['src', '-d', 'built', '-D', '-w'], {
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});

packages/client/package.json

@@ -1,4 +1,5 @@
 {
+	"name": "client",
 	"private": true,
 	"scripts": {
 		"watch": "vite build --watch --mode development",

packages/sw/package.json

@@ -1,4 +1,5 @@
 {
+	"name": "sw",
 	"private": true,
 	"scripts": {
 		"watch": "node build.js watch",
@@ -14,4 +15,4 @@
 	"devDependencies": {
 		"eslint": "^8.2.0"
 	}
-}
+}