diff --git a/src/allnet.ts b/src/allnet.ts index 82b03fd..babee6e 100644 --- a/src/allnet.ts +++ b/src/allnet.ts @@ -1,8 +1,7 @@ -import addHours = require("date-fns/add_hours"); -import express = require("express"); -import iconv = require("iconv-lite"); -import read = require("raw-body"); - +import addHours from "date-fns/add_hours"; +import express from "express"; +import iconv from "iconv-lite"; +import read from "raw-body"; import { unzipSync } from "zlib"; import { startupHost, startupUri } from "./switchboard"; diff --git a/src/billing.ts b/src/billing.ts index 6e9a335..dea3336 100644 --- a/src/billing.ts +++ b/src/billing.ts @@ -1,5 +1,5 @@ -import read = require("raw-body"); -import express = require("express"); +import read from "raw-body"; +import express from "express"; import { createSign } from "crypto"; import { inflateRawSync } from "zlib"; diff --git a/src/chunithm.ts b/src/chunithm.ts index cf04def..7d90aed 100644 --- a/src/chunithm.ts +++ b/src/chunithm.ts @@ -1,5 +1,5 @@ -import compression = require("compression"); -import express = require("express"); +import compression from "compression"; +import express from "express"; const app = express(); diff --git a/src/diva.ts b/src/diva.ts index c9d011a..f435086 100644 --- a/src/diva.ts +++ b/src/diva.ts @@ -1,5 +1,5 @@ -import express = require("express"); -import read = require("raw-body"); +import express from "express"; +import read from "raw-body"; import { Form } from "multiparty"; import { inflateSync } from "zlib"; diff --git a/src/idz/decoder/createProfile.ts b/src/idz/decoder/createProfile.ts index cdf04aa..74df56e 100644 --- a/src/idz/decoder/createProfile.ts +++ b/src/idz/decoder/createProfile.ts @@ -1,4 +1,4 @@ -import iconv = require("iconv-lite"); +import iconv from "iconv-lite"; import { car } from "./_car"; import { chara } from "./_chara"; diff --git a/src/idz/decoder/createTeam.ts b/src/idz/decoder/createTeam.ts index 3025aa7..d568c90 100644 --- a/src/idz/decoder/createTeam.ts +++ b/src/idz/decoder/createTeam.ts @@ -1,4 +1,4 @@ -import iconv = require("iconv-lite"); +import iconv from "iconv-lite"; import { RequestCode } from "./_defs"; import { CreateTeamRequest } from "../request/createTeam"; diff --git a/src/idz/encoder/_team.ts b/src/idz/encoder/_team.ts index 18543d2..45a8d73 100644 --- a/src/idz/encoder/_team.ts +++ b/src/idz/encoder/_team.ts @@ -1,4 +1,4 @@ -import iconv = require("iconv-lite"); +import iconv from "iconv-lite"; import { CreateAutoTeamResponse } from "../response/createAutoTeam"; import { LoadTeamResponse } from "../response/loadTeam"; diff --git a/src/idz/encoder/loadGeneralReward.ts b/src/idz/encoder/loadGeneralReward.ts index cfdc93f..aec55a1 100644 --- a/src/idz/encoder/loadGeneralReward.ts +++ b/src/idz/encoder/loadGeneralReward.ts @@ -1,4 +1,4 @@ -import iconv = require("iconv-lite"); +import iconv from "iconv-lite"; import { LoadGeneralRewardResponse } from "../response/loadGeneralReward"; diff --git a/src/idz/encoder/loadProfile2.ts b/src/idz/encoder/loadProfile2.ts index 066b14f..44f9dce 100644 --- a/src/idz/encoder/loadProfile2.ts +++ b/src/idz/encoder/loadProfile2.ts @@ -1,4 +1,4 @@ -import iconv = require("iconv-lite"); +import iconv from "iconv-lite"; import { encodeBitmap } from "./_bitmap"; import { encodeCar } from "./_car"; diff --git a/src/idz/encoder/loadProfile3.ts b/src/idz/encoder/loadProfile3.ts index abdb551..4cdb5e8 100644 --- a/src/idz/encoder/loadProfile3.ts +++ b/src/idz/encoder/loadProfile3.ts @@ -1,4 +1,4 @@ -import iconv = require("iconv-lite"); +import iconv from "iconv-lite"; import { encodeBitmap } from "./_bitmap"; import { encodeCar } from "./_car"; diff --git a/src/idz/encoder/loadTopTen.ts b/src/idz/encoder/loadTopTen.ts index febaf71..d289418 100644 --- a/src/idz/encoder/loadTopTen.ts +++ b/src/idz/encoder/loadTopTen.ts @@ -1,4 +1,4 @@ -import iconv = require("iconv-lite"); +import iconv from "iconv-lite"; import { LoadTopTenResponse } from "../response/loadTopTen"; diff --git a/src/idz/encoder/updateProvisionalStoreRank.ts b/src/idz/encoder/updateProvisionalStoreRank.ts index 6befaa2..74faedc 100644 --- a/src/idz/encoder/updateProvisionalStoreRank.ts +++ b/src/idz/encoder/updateProvisionalStoreRank.ts @@ -1,4 +1,4 @@ -import iconv = require("iconv-lite"); +import iconv from "iconv-lite"; import { UpdateProvisionalStoreRankResponse } from "../response/updateProvisionalStoreRank"; diff --git a/src/index.ts b/src/index.ts index e4cee78..de27431 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,9 +1,8 @@ import "dotenv/config"; - -import fs = require("fs"); -import https = require("https"); -import http = require("http"); -import net = require("net"); +import fs from "fs"; +import https from "https"; +import http from "http"; +import net from "net"; import aimedb from "./aimedb"; import allnet from "./allnet"; diff --git a/tsconfig.json b/tsconfig.json index 209a7c6..93f9dca 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "esModuleInterop": true, "lib": ["es2017", "esnext.asynciterable"], "module": "commonjs", "moduleResolution": "node",