wip
This commit is contained in:
parent
83c6cc546b
commit
9425de3ba6
|
|
@ -46,6 +46,7 @@ docker-compose.yml
|
||||||
built
|
built
|
||||||
built-test
|
built-test
|
||||||
js-built
|
js-built
|
||||||
|
src-js
|
||||||
/data
|
/data
|
||||||
/.cache-loader
|
/.cache-loader
|
||||||
/db
|
/db
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import { DataSource } from 'typeorm';
|
import { DataSource } from 'typeorm';
|
||||||
import { loadConfig } from './built/config.js';
|
import { loadConfig } from './src-js/config.js';
|
||||||
import { entities } from './built/postgres.js';
|
import { entities } from './src-js/postgres.js';
|
||||||
|
|
||||||
const isConcurrentIndexMigrationEnabled = process.env.MISSKEY_MIGRATION_CREATE_INDEX_CONCURRENTLY === '1';
|
const isConcurrentIndexMigrationEnabled = process.env.MISSKEY_MIGRATION_CREATE_INDEX_CONCURRENTLY === '1';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,10 +12,10 @@
|
||||||
"start:test": "cross-env NODE_ENV=test pnpm compile-config && cross-env NODE_ENV=test node ./built/boot/entry.js",
|
"start:test": "cross-env NODE_ENV=test pnpm compile-config && cross-env NODE_ENV=test node ./built/boot/entry.js",
|
||||||
"migrate": "pnpm compile-config && pnpm typeorm migration:run -d ormconfig.js",
|
"migrate": "pnpm compile-config && pnpm typeorm migration:run -d ormconfig.js",
|
||||||
"revert": "pnpm compile-config && pnpm typeorm migration:revert -d ormconfig.js",
|
"revert": "pnpm compile-config && pnpm typeorm migration:revert -d ormconfig.js",
|
||||||
"cli": "pnpm compile-config && node ./built/boot/cli.js",
|
"cli": "pnpm compile-config && node ./src-js/boot/cli.js",
|
||||||
"check:connect": "pnpm compile-config && node ./scripts/check_connect.js",
|
"check:connect": "pnpm compile-config && node ./scripts/check_connect.js",
|
||||||
"compile-config": "node ./scripts/compile_config.js",
|
"compile-config": "node ./scripts/compile_config.js",
|
||||||
"build": "swc src -d built -D --strip-leading-paths && node ./build.js",
|
"build": "swc src -d src-js -D --strip-leading-paths && node ./build.js",
|
||||||
"build:test": "swc test-server -d built-test -D --config-file test-server/.swcrc --strip-leading-paths",
|
"build:test": "swc test-server -d built-test -D --config-file test-server/.swcrc --strip-leading-paths",
|
||||||
"watch:swc": "swc src -d built -D -w --strip-leading-paths",
|
"watch:swc": "swc src -d built -D -w --strip-leading-paths",
|
||||||
"build:tsc": "tsgo -p tsconfig.json && tsc-alias -p tsconfig.json",
|
"build:tsc": "tsgo -p tsconfig.json && tsc-alias -p tsconfig.json",
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import Redis from 'ioredis';
|
import Redis from 'ioredis';
|
||||||
import { loadConfig } from '../built/config.js';
|
import { loadConfig } from '../src-js/config.js';
|
||||||
import { createPostgresDataSource } from '../built/postgres.js';
|
import { createPostgresDataSource } from '../src-js/postgres.js';
|
||||||
|
|
||||||
const config = loadConfig();
|
const config = loadConfig();
|
||||||
|
|
||||||
|
|
@ -28,10 +28,8 @@ async function connectToRedis(redisOptions) {
|
||||||
try {
|
try {
|
||||||
await redis.connect();
|
await redis.connect();
|
||||||
resolve();
|
resolve();
|
||||||
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
reject(e);
|
reject(e);
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
redis.disconnect(false);
|
redis.disconnect(false);
|
||||||
}
|
}
|
||||||
|
|
@ -50,7 +48,7 @@ const promises = Array
|
||||||
]))
|
]))
|
||||||
.map(connectToRedis)
|
.map(connectToRedis)
|
||||||
.concat([
|
.concat([
|
||||||
connectToPostgres()
|
connectToPostgres(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
await Promise.all(promises);
|
await Promise.all(promises);
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,8 @@
|
||||||
* SPDX-License-Identifier: AGPL-3.0-only
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import { writeFileSync, existsSync } from 'node:fs';
|
||||||
import { execa } from 'execa';
|
import { execa } from 'execa';
|
||||||
import { writeFileSync, existsSync } from "node:fs";
|
|
||||||
|
|
||||||
async function main() {
|
async function main() {
|
||||||
if (!process.argv.includes('--no-build')) {
|
if (!process.argv.includes('--no-build')) {
|
||||||
|
|
@ -19,10 +19,10 @@ async function main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @type {import('../src/config.js')} */
|
/** @type {import('../src/config.js')} */
|
||||||
const { loadConfig } = await import('../built/config.js');
|
const { loadConfig } = await import('../src-js/config.js');
|
||||||
|
|
||||||
/** @type {import('../src/server/api/openapi/gen-spec.js')} */
|
/** @type {import('../src/server/api/openapi/gen-spec.js')} */
|
||||||
const { genOpenapiSpec } = await import('../built/server/api/openapi/gen-spec.js');
|
const { genOpenapiSpec } = await import('../src-js/server/api/openapi/gen-spec.js');
|
||||||
|
|
||||||
const config = loadConfig();
|
const config = loadConfig();
|
||||||
const spec = genOpenapiSpec(config, true);
|
const spec = genOpenapiSpec(config, true);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue