yume/yumechi-no-kuni
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2024.11.0-yumechinokuni.1 #9

Merged
yume merged 13 commits from develop into master 2024-11-10 02:06:13 -06:00
Conversation 0 Commits 13 Files changed 9 +17 -2
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 48b935e88c - Show all commits

6
packages/backend/src/config.ts
View file

@ -155,6 +155,8 @@ export type Config = {
signToActivityPubGet: boolean | undefined; signToActivityPubGet: boolean | undefined;
version: string; version: string;
gitDescribe: string;
gitCommit: string;
publishTarballInsteadOfProvideRepositoryUrl: boolean; publishTarballInsteadOfProvideRepositoryUrl: boolean;
setupPassword: string | undefined; setupPassword: string | undefined;
host: string; host: string;
@ -218,7 +220,7 @@ export function loadConfig(): Config {
const config = yaml.load(fs.readFileSync(path, 'utf-8')) as Source; const config = yaml.load(fs.readFileSync(path, 'utf-8')) as Source;
const url = tryCreateUrl(config.url ?? process.env.MISSKEY_URL ?? ''); const url = tryCreateUrl(config.url ?? process.env.MISSKEY_URL ?? '');
const version = meta.version; const { version, gitDescribe, gitCommit } = meta;
const host = url.host; const host = url.host;
const hostname = url.hostname; const hostname = url.hostname;
const scheme = url.protocol.replace(/:$/, ''); const scheme = url.protocol.replace(/:$/, '');
@ -236,6 +238,8 @@ export function loadConfig(): Config {
return { return {
version, version,
gitCommit,
gitDescribe,
publishTarballInsteadOfProvideRepositoryUrl: !!config.publishTarballInsteadOfProvideRepositoryUrl, publishTarballInsteadOfProvideRepositoryUrl: !!config.publishTarballInsteadOfProvideRepositoryUrl,
setupPassword: config.setupPassword, setupPassword: config.setupPassword,
url: url.origin, url: url.origin,

2
packages/backend/src/server/NodeinfoServerService.ts
View file

@ -105,6 +105,8 @@ export class NodeinfoServerService {
name: meta.maintainerName, name: meta.maintainerName,
email: meta.maintainerEmail, email: meta.maintainerEmail,
}, },
gitCommit: this.config.gitCommit,
gitDescribe: this.config.gitDescribe,
langs: meta.langs, langs: meta.langs,
tosUrl: meta.termsOfServiceUrl, tosUrl: meta.termsOfServiceUrl,
privacyPolicyUrl: meta.privacyPolicyUrl, privacyPolicyUrl: meta.privacyPolicyUrl,

11
scripts/build-pre.js
View file

@ -4,14 +4,23 @@
*/ */
const fs = require('fs'); const fs = require('fs');
const child_process = require('child_process');
const packageJsonPath = __dirname + '/../package.json' const packageJsonPath = __dirname + '/../package.json'
function build() { function build() {
try { try {
const gitDescribe = child_process.execSync('git describe --tags --always').toString().trim();
const gitCommit = child_process.execSync('git rev-parse HEAD').toString().trim();
const json = fs.readFileSync(packageJsonPath, 'utf-8') const json = fs.readFileSync(packageJsonPath, 'utf-8')
const meta = JSON.parse(json); const meta = JSON.parse(json);
fs.mkdirSync(__dirname + '/../built', { recursive: true }); fs.mkdirSync(__dirname + '/../built', { recursive: true });
fs.writeFileSync(__dirname + '/../built/meta.json', JSON.stringify({ version: meta.version }), 'utf-8'); fs.writeFileSync(__dirname + '/../built/meta.json',
JSON.stringify(
{
version: meta.version,
gitCommit: gitCommit,
gitDescribe: gitDescribe,
}), 'utf-8');
} catch (e) { } catch (e) {
console.error(e) console.error(e)
} }