Merge branch 'master' into dev

2020-04-03 20:13:54 +08:00
parent 12f02dda98 e350c5f070
commit d625b0d567
36 changed files with 220 additions and 82 deletions
@@ -9,6 +9,8 @@ module.exports = {
  },
  resolve: {
    alias: {
+      '@': path.join(__dirname, '../../src/main'),
+      events: path.join(__dirname, '../../src/main/events'),
      common: path.join(__dirname, '../../src/common'),
    },
    extensions: ['*', '.js', '.json', '.node'],