1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-04 22:25:50 +02:00

Merge branch 'develop' into minify-bundle-backend

This commit is contained in:
syuilo
2026-01-05 21:00:37 +09:00
70 changed files with 3583 additions and 2836 deletions

View File

@@ -4,8 +4,8 @@
*/
import Redis from 'ioredis';
import { loadConfig } from '../built/config.js';
import { createPostgresDataSource } from '../built/postgres.js';
import { loadConfig } from '../src-js/config.js';
import { createPostgresDataSource } from '../src-js/postgres.js';
const config = loadConfig();
@@ -28,10 +28,8 @@ async function connectToRedis(redisOptions) {
try {
await redis.connect();
resolve();
} catch (e) {
reject(e);
} finally {
redis.disconnect(false);
}
@@ -50,7 +48,7 @@ const promises = Array
]))
.map(connectToRedis)
.concat([
connectToPostgres()
connectToPostgres(),
]);
await Promise.all(promises);

View File

@@ -14,9 +14,11 @@ async function main() {
});
}
const { loadConfig } = await import('../src/config.ts');
/** @type {import('../src/config.js')} */
const { loadConfig } = await import('../src-js/config.js');
const { genOpenapiSpec } = await import('../src/server/api/openapi/gen-spec.ts');
/** @type {import('../src/server/api/openapi/gen-spec.js')} */
const { genOpenapiSpec } = await import('../src-js/server/api/openapi/gen-spec.js');
const config = loadConfig();
const spec = genOpenapiSpec(config, true);