enable esModuleInterop

a60814billy · a60814billy · commit 8473946f39ff · 2021-06-12T15:36:32.000+08:00
diff --git a/lib/app.ts b/lib/app.ts
@@ -1,21 +1,22 @@
 // app
 // external modules
-import * as express from "express";
-import * as ejs from "ejs";
-import * as passport from "passport";
-import * as methodOverride from "method-override";
-import * as cookieParser from "cookie-parser";
-import * as session from "express-session";
-import * as fs from "fs";
-import * as path from "path";
-import * as morgan from "morgan";
-import * as helmet from "helmet";
-import * as i18n from "i18n";
-import * as flash from "connect-flash";
+import fs from "fs";
+import path from "path";
+
+import express from "express";
+import ejs from "ejs";
+import passport from "passport";
+import methodOverride from "method-override";
+import cookieParser from "cookie-parser";
+import session from "express-session";
+import morgan from "morgan";
+import helmet from "helmet";
+import i18n from "i18n";
+import flash from "connect-flash";
 import {expressMiddleware as expressPrometheusMetricsMiddleware} from "prometheus-api-metrics";
-import * as connectSessionSequelize from 'connect-session-sequelize'
-import * as passportSocketIo from 'passport.socketio'
-import * as SocketIo from 'socket.io'
+import connectSessionSequelize from 'connect-session-sequelize'
+import passportSocketIo from 'passport.socketio'
+import SocketIo from 'socket.io'
 import {Server as WsServer} from 'ws'
 // core
 import * as config from "./config";
diff --git a/lib/auth/bitbucket/index.ts b/lib/auth/bitbucket/index.ts
@@ -1,5 +1,5 @@
 import {Router} from "express";
-import * as passport from "passport";
+import passport from "passport";
 import {Strategy as BitbucketStrategy} from "passport-bitbucket-oauth2";
 
 import * as config from "../../config";
diff --git a/lib/auth/dropbox/index.ts b/lib/auth/dropbox/index.ts
@@ -1,5 +1,5 @@
 import {Router} from "express";
-import * as passport from "passport";
+import passport from "passport";
 import {Strategy as DropboxStrategy} from "passport-dropbox-oauth2";
 
 import * as config from "../../config";
diff --git a/lib/auth/email/index.ts b/lib/auth/email/index.ts
@@ -1,5 +1,5 @@
 import {Router} from "express";
-import * as  passport from "passport";
+import passport from "passport";
 import validator from "validator";
 import {Strategy as LocalStrategy} from 'passport-local';
 
diff --git a/lib/auth/facebook/index.ts b/lib/auth/facebook/index.ts
@@ -1,5 +1,5 @@
 import {Router} from "express";
-import * as passport from "passport";
+import passport from "passport";
 import {Strategy as FacebookStrategy} from "passport-facebook";
 
 import * as config from "../../config";
diff --git a/lib/auth/github/index.ts b/lib/auth/github/index.ts
@@ -1,5 +1,5 @@
 import {Router} from "express";
-import * as passport from "passport";
+import passport from "passport";
 import {Strategy as GithubStrategy} from "passport-github";
 import * as config from "../../config";
 import * as response from "../../response";
diff --git a/lib/auth/gitlab/index.ts b/lib/auth/gitlab/index.ts
@@ -1,11 +1,11 @@
 import {Router} from "express";
-import * as passport from "passport";
+import passport from "passport";
 import {Strategy as GitlabStrategy} from "passport-gitlab2";
 
 import * as config from "../../config";
 import * as response from "../../response";
 import {passportGeneralCallback, setReturnToFromReferer} from "../utils";
-import * as HttpsProxyAgent from "https-proxy-agent";
+import HttpsProxyAgent from "https-proxy-agent";
 
 const gitlabAuth = Router()
 export = gitlabAuth
diff --git a/lib/auth/google/index.ts b/lib/auth/google/index.ts
@@ -1,5 +1,5 @@
 import {Router} from "express";
-import * as passport from "passport";
+import passport from "passport";
 import {Strategy as GoogleStrategy} from "passport-google-oauth20";
 
 import * as config from "../../config";
diff --git a/lib/auth/index.ts b/lib/auth/index.ts
@@ -1,6 +1,6 @@
 import {Router} from "express";
 
-import * as passport from "passport";
+import passport from "passport";
 import * as config from "../config";
 import * as logger from "../logger";
 import * as models from "../models";
diff --git a/lib/auth/ldap/index.ts b/lib/auth/ldap/index.ts
@@ -1,6 +1,6 @@
 import {Router} from "express";
-import * as passport from "passport";
-import * as LDAPStrategy from "passport-ldapauth";
+import passport from "passport";
+import LDAPStrategy from "passport-ldapauth";
 
 import * as config from "../../config";
 import * as models from "../../models";
diff --git a/lib/auth/mattermost/index.ts b/lib/auth/mattermost/index.ts
@@ -1,5 +1,5 @@
 import {Router} from "express";
-import * as passport from "passport";
+import passport from "passport";
 
 require('babel-polyfill')
 require('isomorphic-fetch')
diff --git a/lib/auth/oauth2/index.ts b/lib/auth/oauth2/index.ts
@@ -1,5 +1,5 @@
 import {Router} from 'express'
-import * as passport from 'passport'
+import passport from 'passport'
 
 import * as config from '../../config'
 import {passportGeneralCallback, setReturnToFromReferer} from '../utils'
diff --git a/lib/auth/openid/index.ts b/lib/auth/openid/index.ts
@@ -1,5 +1,5 @@
 import {Router} from "express";
-import * as passport from "passport";
+import passport from "passport";
 import {Strategy as OpenIDStrategy} from "@passport-next/passport-openid";
 
 import * as config from "../../config";
diff --git a/lib/auth/saml/index.ts b/lib/auth/saml/index.ts
@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import {Router} from "express";
-import * as passport from "passport";
+import passport from "passport";
 import {Strategy as SamlStrategy} from "passport-saml";
 
 import * as config from "../../config";
diff --git a/lib/auth/twitter/index.ts b/lib/auth/twitter/index.ts
@@ -1,5 +1,5 @@
 import {Router} from "express";
-import * as passport from "passport";
+import passport from "passport";
 import {Strategy as TwitterStrategy} from "passport-twitter";
 
 import * as config from "../../config";
diff --git a/lib/config/index.ts b/lib/config/index.ts
@@ -2,7 +2,7 @@ import * as  crypto from "crypto";
 import * as  fs from "fs";
 import * as  path from "path";
 import {merge} from "lodash";
-import * as  deepFreeze from "deep-freeze";
+import deepFreeze from "deep-freeze";
 
 import {Environment, Permission} from "./enum";
 import * as logger from "../logger";
diff --git a/lib/csp.ts b/lib/csp.ts
@@ -1,5 +1,5 @@
 import * as config from "./config";
-import * as uuid from "uuid";
+import uuid from "uuid";
 
 const CspStrategy: any = {}
 
diff --git a/lib/history/index.ts b/lib/history/index.ts
@@ -1,6 +1,6 @@
 // history
 // external modules
-import * as LZString from '@hackmd/lz-string'
+import LZString from '@hackmd/lz-string'
 
 import * as models from '../models'
 import * as logger from '../logger'
diff --git a/lib/imageRouter/azure.ts b/lib/imageRouter/azure.ts
@@ -1,7 +1,7 @@
 'use strict'
 import * as path from "path";
 
-import * as azure from "azure-storage";
+import azure from "azure-storage";
 
 import * as config from "../config";
 import * as logger from "../logger";
diff --git a/lib/imageRouter/imgur.ts b/lib/imageRouter/imgur.ts
@@ -1,5 +1,5 @@
 'use strict'
-import * as imgur from "@hackmd/imgur";
+import imgur from "@hackmd/imgur";
 
 import * as config from "../config";
 import * as logger from "../logger";
diff --git a/lib/imageRouter/index.ts b/lib/imageRouter/index.ts
@@ -3,10 +3,10 @@ import * as path from "path";
 import {noop} from 'lodash'
 
 import {Router} from "express";
-import * as formidable from "formidable";
-import * as readChunk from "read-chunk";
-import * as imageType from "image-type";
-import * as mime from "mime-types";
+import formidable from "formidable";
+import readChunk from "read-chunk";
+import imageType from "image-type";
+import mime from "mime-types";
 
 import * as config from "../config";
 import * as logger from "../logger";
diff --git a/lib/imageRouter/lutim.ts b/lib/imageRouter/lutim.ts
@@ -1,4 +1,4 @@
-import * as  lutim from "lutim";
+import lutim from "lutim";
 
 import * as  config from "../config";
 import * as logger from "../logger";
diff --git a/lib/imageRouter/minio.ts b/lib/imageRouter/minio.ts
@@ -1,7 +1,7 @@
 import * as fs from "fs";
 import * as path from "path";
 
-import * as Minio from "minio";
+import Minio from "minio";
 
 import * as config from "../config";
 import {getImageMimeType} from "../utils";
diff --git a/lib/letter-avatars.ts b/lib/letter-avatars.ts
@@ -1,6 +1,6 @@
 // external modules
 import * as crypto from "crypto";
-import * as randomcolor from "randomcolor";
+import randomcolor from "randomcolor";
 
 import * as config from "./config";
 
diff --git a/lib/middleware/tooBusy.ts b/lib/middleware/tooBusy.ts
@@ -1,4 +1,4 @@
-import * as toobusy from "toobusy-js";
+import toobusy from "toobusy-js";
 
 import * as config from "../config";
 import * as response from "../response";
diff --git a/lib/models/author.ts b/lib/models/author.ts
@@ -1,10 +1,9 @@
 // external modules
-import * as Sequelize from "sequelize";
 
 export = function (sequelize, DataTypes) {
   const Author = sequelize.define('Author', {
     id: {
-      type: Sequelize.INTEGER,
+      type: DataTypes.INTEGER,
       primaryKey: true,
       autoIncrement: true
     },
diff --git a/lib/models/note.ts b/lib/models/note.ts
@@ -1,26 +1,26 @@
 // external modules
 import * as fs from "fs";
 import * as path from "path";
-import * as LZString from "@hackmd/lz-string";
+import LZString from "@hackmd/lz-string";
 import base64url from "base64url";
-import * as markdown_it from "markdown-it";
-import * as metaMarked from "@hackmd/meta-marked";
-import * as cheerio from "cheerio";
-import * as shortId from "shortid";
+import markdownIt from "markdown-it";
+import metaMarked from "@hackmd/meta-marked";
+import cheerio from "cheerio";
+import shortId from "shortid";
 import * as Sequelize from "sequelize";
-import * as async from "async";
-import * as moment from "moment";
-import * as DiffMatchPatch from "@hackmd/diff-match-patch";
+import async from "async";
+import moment from "moment";
+import DiffMatchPatch from "@hackmd/diff-match-patch";
 
 // core
 import * as config from "../config";
 import * as logger from "../logger";
 import {stripTags} from "../string";
 
 // ot
-import * as ot from "ot";
+import ot from "ot";
 
-const md = markdown_it()
+const md = markdownIt()
 const dmp = new DiffMatchPatch()
 // permission types
 const permissionTypes = ['freely', 'editable', 'limited', 'locked', 'protected', 'private']
diff --git a/lib/models/revision.ts b/lib/models/revision.ts
@@ -1,9 +1,9 @@
 // external modules
 import * as Sequelize from "sequelize";
-import * as  async from "async";
-import * as  moment from "moment";
+import async from "async";
+import moment from "moment";
 import * as  childProcess from "child_process";
-import * as  shortId from "shortid";
+import shortId from "shortid";
 import * as  path from "path";
 import * as  util from "util";
 
diff --git a/lib/models/user.ts b/lib/models/user.ts
@@ -2,7 +2,7 @@
 // external modules
 import * as Sequelize from "sequelize";
 
-import * as Scrypt from "scrypt-kdf";
+import Scrypt from "scrypt-kdf";
 // core
 import * as logger from "../logger";
 import {generateAvatarURL} from "../letter-avatars";
diff --git a/lib/note/noteActions.ts b/lib/note/noteActions.ts
@@ -1,10 +1,10 @@
 import * as fs from "fs";
 import * as path from "path";
 
-import * as markdownpdf from "markdown-pdf";
-import * as shortId from "shortid";
-import * as querystring from "querystring";
-import * as moment from "moment";
+import markdownpdf from "markdown-pdf";
+import shortId from "shortid";
+import querystring from "querystring";
+import moment from "moment";
 // const { Pandoc } = require('@hackmd/pandoc.js')
 
 import * as config from "../config";
diff --git a/lib/realtime/realtime.ts b/lib/realtime/realtime.ts
@@ -1,11 +1,11 @@
 // realtime
 // external modules
-import * as cookie from "cookie";
-import * as cookieParser from "cookie-parser";
-import * as url from "url";
-import * as randomcolor from "randomcolor";
-import * as Chance from "chance";
-import * as moment from "moment";
+import cookie from "cookie";
+import cookieParser from "cookie-parser";
+import url from "url";
+import randomcolor from "randomcolor";
+import Chance from "chance";
+import moment from "moment";
 import {get} from "lodash";
 
 // core
@@ -15,7 +15,7 @@ import * as history from "../history";
 import * as models from "../models";
 
 // ot
-import * as ot from "ot";
+import ot from "ot";
 
 import {ProcessQueue} from "./processQueue";
 import {RealtimeClientConnection} from "./realtimeClientConnection";
diff --git a/lib/realtime/realtimeCleanDanglingUserJob.ts b/lib/realtime/realtimeCleanDanglingUserJob.ts
@@ -1,6 +1,6 @@
 'use strict'
 
-import * as async from "async";
+import async from "async";
 
 import * as config from "../config";
 import * as logger from "../logger";
diff --git a/lib/realtime/realtimeUpdateDirtyNoteJob.ts b/lib/realtime/realtimeUpdateDirtyNoteJob.ts
@@ -1,4 +1,4 @@
-import * as moment from "moment";
+import moment from "moment";
 
 import * as config from "../config";
 import * as logger from "../logger";
diff --git a/lib/routes.ts b/lib/routes.ts
@@ -10,7 +10,7 @@ import * as userController from "./user";
 import * as noteController from "./note";
 
 import * as response from "./response";
-import * as bodyParser from "body-parser";
+import bodyParser from "body-parser";
 
 const appRouter = Router()
 
diff --git a/lib/user/index.ts b/lib/user/index.ts
@@ -1,5 +1,5 @@
-import * as archiver from 'archiver'
-import * as async from 'async'
+import archiver from 'archiver'
+import async from 'async'
 import * as response from '../response'
 import * as config from '../config'
 import * as models from '../models'
diff --git a/lib/utils.ts b/lib/utils.ts
@@ -1,8 +1,8 @@
 import * as fs from "fs";
 import * as path from "path";
 
-import * as mime from "mime-types";
-import * as bodyParser from "body-parser";
+import mime from "mime-types";
+import bodyParser from "body-parser";
 
 export function isSQLite(sequelize) {
   return sequelize.options.dialect === 'sqlite'
diff --git a/lib/web/middleware/checkVersion.ts b/lib/web/middleware/checkVersion.ts
@@ -1,6 +1,6 @@
 import {promisify} from "util";
 
-import * as request from "request";
+import request from "request";
 
 import * as logger from "../../logger";
 import * as config from "../../config";
diff --git a/lib/workers/dmpWorker.ts b/lib/workers/dmpWorker.ts
diff --git a/tsconfig.json b/tsconfig.json
