Merge pull request #1011 from townmi/account

feat(login): add no-captcha validation
chiflix · Oct 11, 2019 · 208e6c7 · 208e6c7
2 parents 552c405 + 2c4ebdc
commit 208e6c7
Show file tree

Hide file tree

Showing 25 changed files with 980 additions and 106 deletions.
diff --git a/.electron-vue/build.js b/.electron-vue/build.js
@@ -11,6 +11,7 @@ const Multispinner = require('multispinner');
 
 const mainConfig = require('./webpack.main.config');
 const rendererConfig = require('./webpack.renderer.config');
+const webConfig = require('./webpack.web.config');
 
 const doneLog = chalk.bgGreen.white(' DONE ') + ' ';
 const errorLog = chalk.bgRed.white(' ERROR ') + ' ';
@@ -60,17 +61,29 @@ function build() {
       process.exit(1);
     });
 
-  pack(rendererConfig)
-    .then(result => {
-      results += result + '\n\n';
-      m.success('renderer');
-    })
-    .catch(err => {
-      m.error('renderer');
-      console.log(`\n  ${errorLog}failed to build renderer process`);
-      console.error(`\n${err}\n`);
-      process.exit(1);
-    });
+    pack(rendererConfig)
+      .then(result => {
+        results += result + '\n\n';
+        m.success('renderer');
+      })
+      .catch(err => {
+        m.error('renderer');
+        console.log(`\n  ${errorLog}failed to build renderer process`);
+        console.error(`\n${err}\n`);
+        process.exit(1);
+      });
+
+    pack(webConfig)
+      .then(result => {
+        results += result + '\n\n';
+        m.success('renderer');
+      })
+      .catch(err => {
+        m.error('renderer');
+        console.log(`\n  ${errorLog}failed to build renderer process`);
+        console.error(`\n${err}\n`);
+        process.exit(1);
+      });
 }
 
 function pack(config) {

diff --git a/.electron-vue/dev-runner.js b/.electron-vue/dev-runner.js
@@ -12,6 +12,7 @@ const webpackHotMiddleware = require('webpack-hot-middleware');
 
 const mainConfig = require('./webpack.main.config');
 const rendererConfig = require('./webpack.renderer.config');
+const webConfig = require('./webpack.web.config');
 
 let electronProcess = null;
 let manualRestart = false;
@@ -83,6 +84,49 @@ function startRenderer() {
   });
 }
 
+
+
+function startWeb() {
+  return new Promise((resolve, reject) => {
+    webConfig.entry.index = [path.join(__dirname, 'dev-client')].concat(
+      webConfig.entry.index,
+    );
+    webConfig.mode = 'development';
+    const compiler = webpack(webConfig);
+    hotMiddleware = webpackHotMiddleware(compiler, {
+      log: false,
+      heartbeat: 2500,
+    });
+
+    compiler.hooks.compilation.tap('compilation', compilation => {
+      compilation.hooks.htmlWebpackPluginAfterEmit.tapAsync(
+        'html-webpack-plugin-after-emit',
+        (data, cb) => {
+          hotMiddleware.publish({ action: 'reload' });
+          cb();
+        },
+      );
+    });
+
+    compiler.hooks.done.tap('done', stats => {
+      logStats('Renderer', stats);
+    });
+
+    const server = new WebpackDevServer(compiler, {
+      contentBase: path.join(__dirname, '../'),
+      quiet: true,
+      before(app, ctx) {
+        app.use(hotMiddleware);
+        ctx.middleware.waitUntilValid(() => {
+          resolve();
+        });
+      },
+    });
+
+    server.listen(9081);
+  });
+}
+
 function startMain() {
   return new Promise((resolve, reject) => {
     mainConfig.entry.main = [path.join(__dirname, '../src/main/index.dev.js')].concat(
@@ -189,7 +233,7 @@ function greeting() {
 function init() {
   greeting();
 
-  Promise.all([startRenderer(), startMain()])
+  Promise.all([startRenderer(), startMain(), startWeb()])
     .then(() => {
       startElectron();
     })

diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js
@@ -59,7 +59,6 @@ let rendererConfig = {
   devtool: '#module-eval-source-map',
   entry: {
     preference: path.join(__dirname, '../src/renderer/preference.js'),
-    login: path.join(__dirname, '../src/renderer/login.ts'),
     about: path.join(__dirname, '../src/renderer/about.js'),
     labor: path.join(__dirname, '../src/renderer/labor.ts'),
     index: path.join(__dirname, '../src/renderer/main.ts'),
@@ -201,7 +200,6 @@ let rendererConfig = {
     new HtmlWebpackPlugin(generateHtmlWebpackPluginConfig('index')),
     new HtmlWebpackPlugin(generateHtmlWebpackPluginConfig('labor')),
     new HtmlWebpackPlugin(generateHtmlWebpackPluginConfig('about')),
-    new HtmlWebpackPlugin(generateHtmlWebpackPluginConfig('login')),
     new HtmlWebpackPlugin(generateHtmlWebpackPluginConfig('preference')),
     new HtmlWebpackPlugin(generateHtmlWebpackPluginConfig('browsing')),
     new webpack.HotModuleReplacementPlugin(),