summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAcid Chicken (硫酸鶏) <root@acid-chicken.com>2019-01-31 01:08:43 +0900
committerGitHub <noreply@github.com>2019-01-31 01:08:43 +0900
commite909eac29622b5da04688ef7e078a0f529aa7e69 (patch)
tree85ad60001679a7fe40e06b51785956b3de8b6ab7 /src
parent[ActivityPub] Use microformats on mentions (diff)
downloadsharkey-e909eac29622b5da04688ef7e078a0f529aa7e69.tar.gz
sharkey-e909eac29622b5da04688ef7e078a0f529aa7e69.tar.bz2
sharkey-e909eac29622b5da04688ef7e078a0f529aa7e69.zip
Create type definition for '*/package.json' (#4014)
* Create type definition for '*/package.json' * Update tsconfig.json
Diffstat (limited to 'src')
-rw-r--r--src/@types/package.json.d.ts3
-rw-r--r--src/config/load.ts2
-rw-r--r--src/index.ts3
-rw-r--r--src/server/api/endpoints/meta.ts2
-rw-r--r--src/server/web/index.ts2
5 files changed, 7 insertions, 5 deletions
diff --git a/src/@types/package.json.d.ts b/src/@types/package.json.d.ts
new file mode 100644
index 0000000000..7cf07c1abc
--- /dev/null
+++ b/src/@types/package.json.d.ts
@@ -0,0 +1,3 @@
+declare module '*/package.json' {
+ const version: string;
+}
diff --git a/src/config/load.ts b/src/config/load.ts
index 4e9a72edd7..ba8b4af3ce 100644
--- a/src/config/load.ts
+++ b/src/config/load.ts
@@ -7,7 +7,7 @@ import { URL } from 'url';
import * as yaml from 'js-yaml';
import { Source, Mixin } from './types';
import isUrl = require('is-url');
-const pkg = require('../../package.json');
+import * as pkg from '../../package.json';
/**
* Path of configuration directory
diff --git a/src/index.ts b/src/index.ts
index b61283b4e9..13510c9b49 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -23,6 +23,7 @@ import notesStats from './daemons/notes-stats';
import loadConfig from './config/load';
import { Config } from './config/types';
import { lessThan } from './prelude/array';
+import * as pkg from '../package.json';
const clusterLog = debug('misskey:cluster');
const ev = new Xev();
@@ -31,8 +32,6 @@ if (process.env.NODE_ENV != 'production' && process.env.DEBUG == null) {
debug.enable('misskey');
}
-const pkg = require('../package.json');
-
//#region Command line argument definitions
program
.version(pkg.version)
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index 3b2a49dbb0..6aed1b2298 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -4,8 +4,8 @@ import config from '../../../config';
import Emoji from '../../../models/emoji';
import define from '../define';
import fetchMeta from '../../../misc/fetch-meta';
+import * as pkg from '../../../../package.json';
-const pkg = require('../../../../package.json');
const client = require('../../../../built/client/meta.json');
export const meta = {
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index 69f3b8859f..afb05923cd 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -20,7 +20,7 @@ import Note, { pack as packNote } from '../../models/note';
import getNoteSummary from '../../misc/get-note-summary';
import fetchMeta from '../../misc/fetch-meta';
import Emoji from '../../models/emoji';
-const pkg = require('../../../package.json');
+import * as pkg from '../../../package.json';
const client = `${__dirname}/../../client/`;