From e909eac29622b5da04688ef7e078a0f529aa7e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Thu, 31 Jan 2019 01:08:43 +0900 Subject: [PATCH] Create type definition for '*/package.json' (#4014) * Create type definition for '*/package.json' * Update tsconfig.json --- src/@types/package.json.d.ts | 3 +++ src/config/load.ts | 2 +- src/index.ts | 3 +-- src/server/api/endpoints/meta.ts | 2 +- src/server/web/index.ts | 2 +- tsconfig.json | 3 ++- 6 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 src/@types/package.json.d.ts diff --git a/src/@types/package.json.d.ts b/src/@types/package.json.d.ts new file mode 100644 index 000000000..7cf07c1ab --- /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 4e9a72edd..ba8b4af3c 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 b61283b4e..13510c9b4 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 3b2a49dbb..6aed1b229 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 69f3b8859..afb05923c 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/`; diff --git a/tsconfig.json b/tsconfig.json index ff4eaf917..0cfd63c69 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,7 +15,8 @@ "noLib": false, "strict": true, "strictNullChecks": false, - "experimentalDecorators": true + "experimentalDecorators": true, + "resolveJsonModule": true }, "compileOnSave": false, "include": [