From 6d1ce481985435e83a7650753889f901d1d3a2cc Mon Sep 17 00:00:00 2001 From: Xeltica Date: Mon, 18 Oct 2021 01:55:39 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E5=91=A8=E3=82=8A=E3=81=AA=E3=82=93=E3=81=A8=E3=81=8B=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-meta.js | 8 ++++++++ package.json | 3 ++- src/backend/render.ts | 2 +- src/backend/server.ts | 3 ++- src/config.ts | 2 +- src/meta.json | 1 + tsconfig.json | 1 + 7 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 build-meta.js create mode 100644 src/meta.json diff --git a/build-meta.js b/build-meta.js new file mode 100644 index 0000000..99dd3a7 --- /dev/null +++ b/build-meta.js @@ -0,0 +1,8 @@ +const { readFileSync, writeFileSync } = require('fs'); + +const { version } = JSON.parse(readFileSync('./package.json', { + encoding: 'UTF-8', + flag: 'r', +})); + +writeFileSync('built/meta.json', JSON.stringify({ version })); diff --git a/package.json b/package.json index db20108..ebcdf21 100644 --- a/package.json +++ b/package.json @@ -6,11 +6,12 @@ "author": "Xeltica", "private": true, "scripts": { - "build": "run-p build:*", + "build": "run-s build:backend build:frontend build:meta", "build:frontend": "webpack", "build:backend": "run-p build:backend-source build:views build:styles", "build:backend-source": "tsc", "build:views": "copyfiles -u 1 src/backend/views/*.pug ./built/", + "build:meta": "node ./build-meta.js", "build:styles": "sass styles/:built/assets", "start": "node built/app.js", "dev": "run-p dev:*", diff --git a/src/backend/render.ts b/src/backend/render.ts index 80e7c8d..eed5750 100644 --- a/src/backend/render.ts +++ b/src/backend/render.ts @@ -1,5 +1,5 @@ import views from 'koa-views'; -import { version } from '../../package.json'; +import { version } from '../meta.json'; export const render = views(__dirname + '/views', { extension: 'pug', diff --git a/src/backend/server.ts b/src/backend/server.ts index 4188d61..6ce6b33 100644 --- a/src/backend/server.ts +++ b/src/backend/server.ts @@ -6,13 +6,14 @@ import { config } from '../config'; import { render } from './render'; import { router } from './router'; import { getUserByToolsToken } from './functions/users'; +import { version } from '../meta.json'; import 'reflect-metadata'; export default (): void => { const app = new Koa(); - console.log('Misskey Tools'); + console.log('Misskey Tools v' + version); console.log('Initializing DB connection...'); diff --git a/src/config.ts b/src/config.ts index 1f03a35..ac40b05 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,3 +1,3 @@ import fs from 'fs'; -export const config = Object.freeze(JSON.parse(fs.readFileSync(__dirname + '/../../config.json', 'utf-8'))); +export const config = Object.freeze(JSON.parse(fs.readFileSync(__dirname + '/../config.json', 'utf-8'))); diff --git a/src/meta.json b/src/meta.json new file mode 100644 index 0000000..1353d53 --- /dev/null +++ b/src/meta.json @@ -0,0 +1 @@ +{"version": null} diff --git a/tsconfig.json b/tsconfig.json index 0843dd3..6be2d18 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,6 +3,7 @@ "target": "es5", "module": "commonjs", "outDir": "./built/", + "rootDir": "./src/", "strict": true, "strictPropertyInitialization": false, "typeRoots": [