refactor: fix client ts error

Author: yinxin630

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "typescript.tsdk": "node_modules/typescript/lib"
+}

bin/register.ts

@@ -4,9 +4,8 @@
  */
 
 import bcrypt from 'bcryptjs';
-import { promisify } from 'util';
 
-import User from '../server/models/user';
+import User, { UserDocument } from '../server/models/user';
 import Group from '../server/models/group';
 
 import options from '../utils/commandOptions';
@@ -37,10 +36,11 @@ connectDB()
         const defaultGroup = await Group.findOne({ isDefault: true });
         if (!defaultGroup) {
             exitWithError('默认群组不存在');
+            return;
         }
 
-        const salt = await promisify(bcrypt.genSalt)(saltRounds);
-        const hash = await promisify(bcrypt.hash)(password, salt);
+        const salt = await bcrypt.genSalt(saltRounds);
+        const hash = await bcrypt.hash(password, salt);
 
         let newUser = null;
         try {
@@ -52,21 +52,24 @@ connectDB()
             });
         } catch (createError) {
             if (createError.name === 'ValidationError') {
-                return exitWithError('用户名包含不支持的字符或者长度超过限制');
+                exitWithError('用户名包含不支持的字符或者长度超过限制');
+                return;
             }
             console.error(createError);
             exitWithError('创建新用户失败');
         }
 
         if (!defaultGroup.creator) {
-            defaultGroup.creator = newUser;
+            defaultGroup.creator = newUser as UserDocument;
+        }
+        if (newUser) {
+            defaultGroup.members.push(newUser._id);
         }
-        defaultGroup.members.push(newUser);
         await defaultGroup.save();
 
         console.log('注册成功');
 
-        return process.exit(0);
+        process.exit(0);
     })
     .catch((err) => {
         console.error('connect database error!');

build/build.ts

@@ -14,9 +14,9 @@ process.env.NODE_ENV = 'production';
 const spinner = ora('building for production...');
 spinner.start();
 
-rm(path.join(config.build.assetsRoot), (err) => {
+rm(path.join(config.build.assetsRoot), (err: any) => {
     if (err) throw err;
-    webpack(webpackConfig, (wErr, stats) => {
+    webpack(webpackConfig, (wErr: any, stats: any) => {
         spinner.stop();
         if (wErr) throw wErr;
         process.stdout.write(`${stats.toString({

build/check-versions.ts

@@ -6,14 +6,14 @@ import cp from 'child_process';
 
 import packageJson from '../package.json';
 
-function exec(cmd) {
+function exec(cmd: any) {
     return cp.execSync(cmd).toString().trim();
 }
 
 const versionRequirements = [
     {
         name: 'node',
-        currentVersion: semver.clean(process.version),
+        currentVersion: semver.clean(process.version) as string,
         versionRequirement: packageJson.engines.node,
     },
     {

build/dev-client.ts

@@ -5,7 +5,7 @@ import 'eventsource-polyfill';
 // @ts-ignore
 import hotClient from 'webpack-hot-middleware/client?noInfo=true&reload=true'; // eslint-disable-line import/no-unresolved
 
-hotClient.subscribe((event) => {
+hotClient.subscribe((event: any) => {
     if (event.action === 'reload') {
         window.location.reload();
     }

build/dev-server.ts

@@ -5,7 +5,6 @@ import opn from 'opn';
 import path from 'path';
 import express from 'express';
 import webpack from 'webpack';
-import proxyMiddleware from 'http-proxy-middleware';
 import webpackDevMiddleware from 'webpack-dev-middleware';
 import webpackHotMiddleware from 'webpack-hot-middleware';
 import connectionHistoryApiFallback from 'connect-history-api-fallback';
@@ -20,7 +19,6 @@ if (!process.env.NODE_ENV) {
 const host = process.env.HOST || config.dev.host;
 const port = process.env.PORT || config.dev.port;
 const autoOpenBrowser = !!config.dev.autoOpenBrowser;
-const { proxyTable } = config.dev;
 
 const app = express();
 const compiler = webpack(webpackConfig);
@@ -36,22 +34,14 @@ const hotMiddleware = webpackHotMiddleware(compiler, {
 });
 
 
-compiler.plugin('compilation', (compilation) => {
-    compilation.plugin('html-webpack-plugin-after-emit', (data, cb) => {
+compiler.plugin('compilation', (compilation: any) => {
+    compilation.plugin('html-webpack-plugin-after-emit', (data: any, cb: any) => {
         if (cb) {
             cb();
         }
     });
 });
 
-Object.keys(proxyTable).forEach((context) => {
-    let options = proxyTable[context];
-    if (typeof options === 'string') {
-        options = { target: options };
-    }
-    app.use(proxyMiddleware(options.filter || context, options));
-});
-
 app.use(connectionHistoryApiFallback());
 
 app.use(devMiddleware);

build/utils.ts

@@ -5,7 +5,7 @@ import LessPluginAutoPrefix from 'less-plugin-autoprefix';
 import ExtractTextPlugin from 'extract-text-webpack-plugin';
 import config from '../config/webpack';
 
-export function assetsPath(_path) {
+export function assetsPath(_path: any) {
     return path.posix.join('', _path);
 }
 

build/webpack.base.conf.ts

@@ -3,12 +3,12 @@ import * as utils from './utils';
 import config from '../config/webpack';
 import pages from '../config/pages';
 
-const entry = {};
+const entry: { [key: string]: string } = {};
 pages.forEach((page) => {
     entry[page.entry.key] = page.entry.file;
 });
 
-function resolve(dir) {
+function resolve(dir: any) {
     return path.join(__dirname, '..', dir);
 }
 
@@ -36,10 +36,7 @@ export default {
             {
                 test: /\.tsx?$/,
                 exclude: /node_modules/,
-                use: [
-                    'babel-loader',
-                    'ts-loader',
-                ],
+                use: ['babel-loader', 'ts-loader'],
             },
             {
                 test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,

build/webpack.dev.conf.ts

@@ -14,6 +14,7 @@ import pages from '../config/pages';
 const htmlPlugins = pages.map((page) => new HtmlWebpackPlugin(page));
 
 Object.keys(baseWebpackConfig.entry).forEach((name) => {
+    // @ts-ignore
     baseWebpackConfig.entry[name] = ['react-hot-loader/patch', './build/dev-client'].concat(baseWebpackConfig.entry[name]);
 });
 

build/webpack.prod.conf.ts

@@ -35,18 +35,6 @@ const webpackConfig = merge(baseWebpackConfig, {
         rules: utils.getStyleLoaders(),
     },
     devtool: config.build.productionSourceMap ? '#source-map' : false,
-    // optimization: {
-    //     splitChunks: {
-    //         cacheGroups: {
-    //             vendor: {
-    //                 test: module => /node_modules/.test(module.context),
-    //                 chunks: 'initial',
-    //                 name: 'vendor',
-    //                 enforce: true,
-    //             },
-    //         },
-    //     },
-    // },
     plugins: [
         // @ts-ignore
         new webpack.DefinePlugin({