Compare commits
4 commits
127487dc38
...
c813fd4694
Author | SHA1 | Date | |
---|---|---|---|
c813fd4694 | |||
12e74f8300 | |||
3091581b67 | |||
9a8564a78e |
16 changed files with 17771 additions and 17864 deletions
|
@ -10,8 +10,3 @@ down:
|
|||
.PHONY: up
|
||||
up:
|
||||
podman-compose up --detach
|
||||
sleep 2
|
||||
podman-compose exec db psql \
|
||||
--user=firefish \
|
||||
--dbname=firefish_db \
|
||||
--command='CREATE EXTENSION pgroonga;'
|
||||
|
|
|
@ -14,3 +14,5 @@ services:
|
|||
- "POSTGRES_DB=firefish_db"
|
||||
ports:
|
||||
- "5432:5432"
|
||||
volumes:
|
||||
- "../neko/install.sql:/docker-entrypoint-initdb.d/install.sql:ro"
|
||||
|
|
|
@ -40,6 +40,7 @@ services:
|
|||
- .config/docker.env
|
||||
volumes:
|
||||
- ./db:/var/lib/postgresql/data
|
||||
- ./neko/install.sql:/docker-entrypoint-initdb.d/install.sql:ro
|
||||
|
||||
networks:
|
||||
calcnet:
|
||||
|
|
|
@ -98,10 +98,10 @@
|
|||
sudo -u postgres psql --command="CREATE DATABASE ${POSTGRES_DB} OWNER ${POSTGRES_USER} encoding = 'UTF8';"
|
||||
```
|
||||
|
||||
7. PGroonga を有効化する
|
||||
7. データベースに変更を加える
|
||||
|
||||
```bash
|
||||
sudo -u postgres psql --dbname="${POSTGRES_DB}" --command='CREATE EXTENSION pgroonga;'
|
||||
sudo -u postgres psql --dbname="${POSTGRES_DB}" --file=neko/install.sql
|
||||
```
|
||||
|
||||
8. Firefish をビルドする
|
||||
|
@ -207,13 +207,7 @@ x86_64 アーキテクチャの Linux のマシン上では、[`registry.code.na
|
|||
podman-compose up db --detach
|
||||
```
|
||||
|
||||
7. PGroonga を有効にする(`firefish` と `firefish_db` はそれぞれ自分が決めたユーザー名とデータベース名に変えて実行する)
|
||||
|
||||
```bash
|
||||
podman-compose exec db psql --user=firefish --dbname=firefish_db --command='CREATE EXTENSION pgroonga;'
|
||||
```
|
||||
|
||||
8. Firefish を起動する
|
||||
7. Firefish を起動する
|
||||
|
||||
```bash
|
||||
podman-compose up --detach
|
||||
|
|
|
@ -90,10 +90,10 @@
|
|||
db: firefish_db # これ
|
||||
```
|
||||
|
||||
11. 以下のコマンドを実行して PGroonga の拡張機能を有効にする(`firefish_db` の部分は自分のデータベース名に変えて実行)
|
||||
11. 以下のコマンドを実行してデータベースに変更を加える(`firefish_db` の部分は自分のデータベース名に変えて実行)
|
||||
|
||||
```bash
|
||||
sudo -u postgres psql --command="CREATE EXTENSION pgroonga;" --dbname=firefish_db
|
||||
sudo -u postgres psql --dbname=firefish_db --file=neko/install.sql
|
||||
```
|
||||
|
||||
12. 新しい Firefish のディレクトリに入ってビルドする
|
||||
|
@ -148,11 +148,11 @@ Docker を使う場合には以下の `podman`, `podman-compose`, `--podman` を
|
|||
cp -r firefish.old/.config firefish
|
||||
```
|
||||
|
||||
6. 以下のコマンドを実行して PGroonga を有効にする(`firefish` と `firefish_db` はそれぞれ `.config/docker.env` や `.config/default.yml` に書いた PostgreSQL のユーザー名とデータベース名に置き換える)
|
||||
6. 以下のコマンドを実行してデータベースに変更を加える
|
||||
|
||||
```bash
|
||||
podman-compose up db --detach
|
||||
podman-compose exec db psql --command='CREATE EXTENSION pgroonga;' --user=firefish --dbname=firefish_db
|
||||
podman-compose exec db sh -c 'psql --user="$POSTGRES_USER" --dbname="$POSTGRES_DB" --file=/docker-entrypoint-initdb.d/install.sql'
|
||||
```
|
||||
|
||||
7. コンテナイメージをダウンロードまたはビルドする
|
||||
|
|
1
neko/install.sql
Normal file
1
neko/install.sql
Normal file
|
@ -0,0 +1 @@
|
|||
CREATE EXTENSION IF NOT EXISTS pgroonga;
|
17511
neko/pnpm-lock.yaml
17511
neko/pnpm-lock.yaml
File diff suppressed because it is too large
Load diff
24
package.json
24
package.json
|
@ -30,9 +30,6 @@
|
|||
"clean-all": "pnpm run clean && pnpm run clean-cargo && pnpm run clean-npm",
|
||||
"cleanall": "pnpm run clean-all"
|
||||
},
|
||||
"resolutions": {
|
||||
"chokidar": "3.3.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@bull-board/api": "5.13.0",
|
||||
"@bull-board/ui": "5.13.0",
|
||||
|
@ -40,25 +37,18 @@
|
|||
"@tensorflow/tfjs": "4.16.0",
|
||||
"gulp": "4.0.2",
|
||||
"gulp-cssnano": "2.1.3",
|
||||
"gulp-rename": "2.0.0",
|
||||
"gulp-replace": "1.1.4",
|
||||
"gulp-terser": "2.1.0",
|
||||
"js-yaml": "4.1.0",
|
||||
"seedrandom": "3.0.5"
|
||||
"js-yaml": "4.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@biomejs/biome": "1.5.1",
|
||||
"@biomejs/cli-darwin-arm64": "1.5.1",
|
||||
"@biomejs/cli-darwin-x64": "1.5.1",
|
||||
"@biomejs/cli-linux-arm64": "1.5.1",
|
||||
"@biomejs/cli-linux-x64": "1.5.1",
|
||||
"@types/gulp": "4.0.17",
|
||||
"@types/gulp-rename": "2.0.6",
|
||||
"@types/node": "20.11.0",
|
||||
"add": "2.0.6",
|
||||
"cross-env": "7.0.3",
|
||||
"@biomejs/biome": "1.5.2",
|
||||
"@biomejs/cli-darwin-arm64": "1.5.2",
|
||||
"@biomejs/cli-darwin-x64": "1.5.2",
|
||||
"@biomejs/cli-linux-arm64": "1.5.2",
|
||||
"@biomejs/cli-linux-x64": "1.5.2",
|
||||
"@types/node": "20.11.5",
|
||||
"execa": "8.0.1",
|
||||
"install-peers": "^1.0.4",
|
||||
"pnpm": "8.14.1",
|
||||
"typescript": "5.3.3"
|
||||
}
|
||||
|
|
442
packages/backend/native-utils/Cargo.lock
generated
442
packages/backend/native-utils/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -14,29 +14,27 @@ napi = ["dep:napi-derive"]
|
|||
crate-type = ["cdylib", "lib"]
|
||||
|
||||
[dependencies]
|
||||
async-trait = "0.1.75"
|
||||
async-trait = "0.1.77"
|
||||
cfg-if = "1.0.0"
|
||||
chrono = "0.4.31"
|
||||
cuid2 = "0.1.2"
|
||||
derive_more = "0.99.17"
|
||||
idna = "0.5.0"
|
||||
jsonschema = "0.17.1"
|
||||
once_cell = "1.19.0"
|
||||
parse-display = "0.8.2"
|
||||
rand = "0.8.5"
|
||||
schemars = { version = "0.8.16", features = ["chrono"] }
|
||||
sea-orm = { version = "0.12.10", features = ["sqlx-postgres", "runtime-tokio-rustls"] }
|
||||
serde = { version = "1.0.193", features = ["derive"] }
|
||||
serde_json = "1.0.108"
|
||||
serde_yaml = "0.9.29"
|
||||
thiserror = "1.0.52"
|
||||
sea-orm = { version = "0.12.11", features = ["sqlx-postgres", "runtime-tokio-rustls"] }
|
||||
serde = { version = "1.0.195", features = ["derive"] }
|
||||
serde_json = "1.0.111"
|
||||
serde_yaml = "0.9.30"
|
||||
thiserror = "1.0.56"
|
||||
tokio = { version = "1.35.1", features = ["full"] }
|
||||
url = "2.5.0"
|
||||
utoipa = "4.1.0"
|
||||
|
||||
# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
|
||||
napi = { version = "2.14.1", default-features = false, features = ["napi9", "tokio_rt"] }
|
||||
napi-derive = { version = "2.14.5", optional = true }
|
||||
napi = { version = "2.14.2", default-features = false, features = ["napi9", "tokio_rt"] }
|
||||
napi-derive = { version = "2.14.6", optional = true }
|
||||
basen = "0.1.0"
|
||||
|
||||
[dev-dependencies]
|
||||
|
|
|
@ -13,21 +13,21 @@ default = []
|
|||
convert = ["dep:native-utils", "dep:indicatif", "dep:futures"]
|
||||
|
||||
[dependencies]
|
||||
serde_json = "1.0.108"
|
||||
serde_json = "1.0.111"
|
||||
native-utils = { path = "../", optional = true }
|
||||
indicatif = { version = "0.17.7", features = ["tokio"], optional = true }
|
||||
tokio = { version = "1.35.1", features = ["full"] }
|
||||
futures = { version = "0.3.30", optional = true }
|
||||
serde_yaml = "0.9.29"
|
||||
serde = { version = "1.0.193", features = ["derive"] }
|
||||
serde_yaml = "0.9.30"
|
||||
serde = { version = "1.0.195", features = ["derive"] }
|
||||
urlencoding = "2.1.3"
|
||||
redis = { version = "0.24.0", features = ["tokio-rustls-comp"] }
|
||||
sea-orm = "0.12.10"
|
||||
sea-orm = "0.12.11"
|
||||
url = { version = "2.5.0", features = ["serde"] }
|
||||
basen = "0.1.0"
|
||||
|
||||
[dependencies.sea-orm-migration]
|
||||
version = "0.12.10"
|
||||
version = "0.12.11"
|
||||
features = [
|
||||
# Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
|
||||
# View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.
|
||||
|
|
|
@ -41,11 +41,11 @@
|
|||
"ajv": "8.12.0",
|
||||
"archiver": "6.0.1",
|
||||
"argon2": "^0.31.2",
|
||||
"aws-sdk": "2.1535.0",
|
||||
"aws-sdk": "2.1538.0",
|
||||
"axios": "1.6.5",
|
||||
"bcryptjs": "2.4.3",
|
||||
"blurhash": "2.0.5",
|
||||
"bull": "4.12.0",
|
||||
"bull": "4.12.2",
|
||||
"cacheable-lookup": "TheEssem/cacheable-lookup",
|
||||
"cbor-x": "1.5.8",
|
||||
"chalk": "5.3.0",
|
||||
|
@ -65,7 +65,7 @@
|
|||
"firefish-js": "workspace:*",
|
||||
"got": "14.0.0",
|
||||
"gunzip-maybe": "1.4.2",
|
||||
"happy-dom": "13.0.4",
|
||||
"happy-dom": "13.1.4",
|
||||
"hpagent": "1.2.0",
|
||||
"ioredis": "5.3.2",
|
||||
"ip-cidr": "4.0.0",
|
||||
|
@ -73,7 +73,7 @@
|
|||
"js-yaml": "4.1.0",
|
||||
"json5": "2.2.3",
|
||||
"jsonld": "8.3.2",
|
||||
"jsrsasign": "10.9.0",
|
||||
"jsrsasign": "11.0.0",
|
||||
"koa": "2.15.0",
|
||||
"koa-body": "6.0.1",
|
||||
"koa-bodyparser": "4.4.1",
|
||||
|
@ -128,13 +128,13 @@
|
|||
"typeorm": "0.3.19",
|
||||
"ulid": "2.3.0",
|
||||
"uuid": "9.0.1",
|
||||
"web-push": "3.6.6",
|
||||
"web-push": "3.6.7",
|
||||
"websocket": "1.0.34",
|
||||
"xev": "3.0.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@swc/cli": "0.1.63",
|
||||
"@swc/core": "1.3.102",
|
||||
"@swc/core": "1.3.104",
|
||||
"@types/adm-zip": "0.5.5",
|
||||
"@types/bcryptjs": "2.4.6",
|
||||
"@types/escape-regexp": "0.0.3",
|
||||
|
@ -152,8 +152,8 @@
|
|||
"@types/koa__cors": "5.0.0",
|
||||
"@types/koa__multer": "2.0.7",
|
||||
"@types/koa__router": "12.0.4",
|
||||
"@types/node": "20.11.0",
|
||||
"@types/node-fetch": "2.6.10",
|
||||
"@types/node": "20.11.5",
|
||||
"@types/node-fetch": "2.6.11",
|
||||
"@types/nodemailer": "6.4.14",
|
||||
"@types/oauth": "0.9.4",
|
||||
"@types/opencc-js": "1.0.3",
|
||||
|
|
|
@ -32,8 +32,7 @@
|
|||
"@types/tinycolor2": "1.4.6",
|
||||
"@types/uuid": "9.0.7",
|
||||
"@vitejs/plugin-vue": "5.0.3",
|
||||
"@vue/compiler-sfc": "3.4.12",
|
||||
"@vue/runtime-core": "3.4.12",
|
||||
"@vue/runtime-core": "3.4.14",
|
||||
"autobind-decorator": "2.4.0",
|
||||
"autosize": "6.0.1",
|
||||
"blurhash": "2.0.5",
|
||||
|
@ -66,12 +65,12 @@
|
|||
"mfm-js": "0.24.0",
|
||||
"moment": "^2.30.1",
|
||||
"photoswipe": "5.4.3",
|
||||
"prettier": "3.2.1",
|
||||
"prettier": "3.2.4",
|
||||
"prismjs": "1.29.0",
|
||||
"punycode": "2.3.1",
|
||||
"rollup": "4.9.5",
|
||||
"s-age": "1.1.2",
|
||||
"sass": "1.69.7",
|
||||
"sass": "1.70.0",
|
||||
"seedrandom": "3.0.5",
|
||||
"stringz": "2.1.0",
|
||||
"swiper": "11.0.5",
|
||||
|
@ -86,8 +85,8 @@
|
|||
"uuid": "9.0.1",
|
||||
"vite": "5.0.11",
|
||||
"vite-plugin-compression": "0.5.1",
|
||||
"vue": "3.4.12",
|
||||
"vue-draggable-plus": "^0.3.4",
|
||||
"vue": "3.4.14",
|
||||
"vue-draggable-plus": "^0.3.5",
|
||||
"vue-plyr": "^7.0.0",
|
||||
"vue-prism-editor": "2.0.0-alpha.2"
|
||||
}
|
||||
|
|
|
@ -19,11 +19,11 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@swc/cli": "0.1.63",
|
||||
"@swc/core": "1.3.102",
|
||||
"@swc/core": "1.3.104",
|
||||
"@swc/types": "0.1.5",
|
||||
"@types/node": "20.11.0",
|
||||
"@types/node": "20.11.5",
|
||||
"ts-node": "10.9.2",
|
||||
"tsd": "0.30.3",
|
||||
"tsd": "0.30.4",
|
||||
"typescript": "5.3.3"
|
||||
},
|
||||
"files": [
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@swc/cli": "0.1.63",
|
||||
"@swc/core": "1.3.102",
|
||||
"@swc/core": "1.3.104",
|
||||
"@swc/core-android-arm64": "1.3.11",
|
||||
"firefish-js": "workspace:*",
|
||||
"idb-keyval": "6.2.1",
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
neko/pnpm-lock.yaml
|
17565
pnpm-lock.yaml
Normal file
17565
pnpm-lock.yaml
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue