update dependencies.

app-ui/frame/PreferencesPrompt.jsx

@@ -6,7 +6,7 @@
 'use strict'
 
 import React from 'react'
-import R from 'ramda'
+import lodash from 'lodash'
 import { Checkbox, Input, Radio, Select, Tabs } from 'antd'
 import MyFrame from './MyFrame'
 import classnames from 'classnames'
@@ -63,7 +63,7 @@ export default class PreferencesPrompt extends React.Component {
     this.setState({
       show: false
     }, () => {
-      let prefs = R.pick(pref_keys, this.state)
+      let prefs = lodash.pick(this.state, pref_keys)
 
       Agent.pact('setPref', prefs)
         .then(() => {
@@ -124,7 +124,8 @@ export default class PreferencesPrompt extends React.Component {
     return (
       <div className="ln">
         <div>{lang.language}</div>
-        <div className="inform">{lang.should_restart_after_change_language}</div>
+        <div
+          className="inform">{lang.should_restart_after_change_language}</div>
         <div>
           <Select
             value={this.state.user_language || ''}
@@ -169,11 +170,11 @@ export default class PreferencesPrompt extends React.Component {
         <div>
           <div className="inform">{lang.pref_after_cmd_info}</div>
           {/*<Input*/}
-            {/*type="textarea"*/}
-            {/*rows={8}*/}
-            {/*defaultValue={this.state.after_cmd}*/}
-            {/*placeholder={lang.pref_after_cmd_placeholder}*/}
-            {/*onChange={(e) => this.updateAfterCmd(e.target.value)}*/}
+          {/*type="textarea"*/}
+          {/*rows={8}*/}
+          {/*defaultValue={this.state.after_cmd}*/}
+          {/*placeholder={lang.pref_after_cmd_placeholder}*/}
+          {/*onChange={(e) => this.updateAfterCmd(e.target.value)}*/}
           {/*/>*/}
           <CodeMirror
             className="pref-cm"

app-ui/styles/main.css

@@ -316,8 +316,8 @@ mark {
 }
 .clearfix::before,
 .clearfix::after {
-  content: '';
   display: table;
+  content: '';
 }
 .clearfix::after {
   clear: both;
@@ -623,29 +623,30 @@ mark {
 [ant-click-animating-without-extra-node='true'] {
   position: relative;
 }
+html {
+  --antd-wave-shadow-color: #1890ff;
+}
 [ant-click-animating-without-extra-node='true']::after,
 .ant-click-animating-node {
   position: absolute;
-  top: -1px;
-  right: -1px;
-  bottom: -1px;
-  left: -1px;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
   display: block;
-  border: 0 solid #1890ff;
   border-radius: inherit;
+  box-shadow: 0 0 0 0 #1890ff;
+  box-shadow: 0 0 0 0 var(--antd-wave-shadow-color);
   opacity: 0.2;
   animation: fadeEffect 2s cubic-bezier(0.08, 0.82, 0.17, 1), waveEffect 0.4s cubic-bezier(0.08, 0.82, 0.17, 1);
   animation-fill-mode: forwards;
-  pointer-events: none;
   content: '';
+  pointer-events: none;
 }
 @keyframes waveEffect {
   100% {
-    top: -6px;
-    right: -6px;
-    bottom: -6px;
-    left: -6px;
-    border-width: 6px;
+    box-shadow: 0 0 0 #1890ff;
+    box-shadow: 0 0 0 6px var(--antd-wave-shadow-color);
   }
 }
 @keyframes fadeEffect {
@@ -1838,6 +1839,9 @@ mark {
   height: 20px;
   margin: 0;
 }
+.ant-scroll-number-symbol {
+  vertical-align: top;
+}
 @keyframes antZoomBadgeIn {
   0% {
     transform: scale(0) translate(50%, -50%);
@@ -2637,8 +2641,8 @@ mark {
   border-radius: inherit;
   opacity: 0.35;
   transition: opacity 0.2s;
-  pointer-events: none;
   content: '';
+  pointer-events: none;
 }
 .ant-btn .anticon {
   transition: margin-left 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
@@ -2647,13 +2651,15 @@ mark {
 .ant-btn .anticon.anticon-minus > svg {
   shape-rendering: optimizeSpeed;
 }
+.ant-btn.ant-btn-loading {
+  position: relative;
+  pointer-events: none;
+}
 .ant-btn.ant-btn-loading::before {
   display: block;
 }
 .ant-btn.ant-btn-loading:not(.ant-btn-circle):not(.ant-btn-circle-outline):not(.ant-btn-icon-only) {
-  position: relative;
   padding-left: 29px;
-  pointer-events: none;
 }
 .ant-btn.ant-btn-loading:not(.ant-btn-circle):not(.ant-btn-circle-outline):not(.ant-btn-icon-only) .anticon:not(:last-child) {
   margin-left: -14px;
@@ -3317,16 +3323,16 @@ a.ant-btn-sm {
 }
 .ant-card-head::before,
 .ant-card-head::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-card-head::after {
   clear: both;
 }
 .ant-card-head::before,
 .ant-card-head::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-card-head::after {
   clear: both;
@@ -3367,16 +3373,16 @@ a.ant-btn-sm {
 }
 .ant-card-body::before,
 .ant-card-body::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-card-body::after {
   clear: both;
 }
 .ant-card-body::before,
 .ant-card-body::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-card-body::after {
   clear: both;
@@ -3423,16 +3429,16 @@ a.ant-btn-sm {
 }
 .ant-card-actions::before,
 .ant-card-actions::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-card-actions::after {
   clear: both;
 }
 .ant-card-actions::before,
 .ant-card-actions::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-card-actions::after {
   clear: both;
@@ -3491,16 +3497,16 @@ a.ant-btn-sm {
 }
 .ant-card-meta::before,
 .ant-card-meta::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-card-meta::after {
   clear: both;
 }
 .ant-card-meta::before,
 .ant-card-meta::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-card-meta::after {
   clear: both;
@@ -5045,6 +5051,7 @@ a.ant-btn-sm {
   white-space: nowrap;
   text-align: center;
   vertical-align: top;
+  pointer-events: none;
 }
 .ant-calendar-range {
   width: 552px;
@@ -5084,6 +5091,7 @@ a.ant-btn-sm {
   line-height: 34px;
   text-align: center;
   transform: translateX(-50%);
+  pointer-events: none;
 }
 .ant-calendar-range-right .ant-calendar-date-input-wrap {
   margin-left: -90px;
@@ -6392,18 +6400,20 @@ li.ant-calendar-time-picker-select-option-disabled:hover {
 .ant-empty-footer {
   margin-top: 16px;
 }
-.ant-empty-small {
-  margin: 8px 0;
-}
-.ant-empty-small .ant-empty-image {
-  height: 35px;
-}
 .ant-empty-normal {
   margin: 32px 0;
+  color: rgba(0, 0, 0, 0.25);
 }
 .ant-empty-normal .ant-empty-image {
   height: 40px;
 }
+.ant-empty-small {
+  margin: 8px 0;
+  color: rgba(0, 0, 0, 0.25);
+}
+.ant-empty-small .ant-empty-image {
+  height: 35px;
+}
 .ant-form {
   box-sizing: border-box;
   margin: 0;
@@ -6528,16 +6538,16 @@ input[type='checkbox'].disabled {
 }
 .ant-form-item-control::before,
 .ant-form-item-control::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-form-item-control::after {
   clear: both;
 }
 .ant-form-item-control::before,
 .ant-form-item-control::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-form-item-control::after {
   clear: both;
@@ -7162,16 +7172,16 @@ form .ant-input-group-wrapper {
 }
 .ant-row::before,
 .ant-row::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-row::after {
   clear: both;
 }
 .ant-row::before,
 .ant-row::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-row::after {
   clear: both;
@@ -10491,16 +10501,16 @@ textarea.ant-input {
 }
 .ant-input-group.ant-input-group-compact::before,
 .ant-input-group.ant-input-group-compact::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-input-group.ant-input-group-compact::after {
   clear: both;
 }
 .ant-input-group.ant-input-group-compact::before,
 .ant-input-group.ant-input-group-compact::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-input-group.ant-input-group-compact::after {
   clear: both;
@@ -11085,7 +11095,7 @@ textarea.ant-input-number {
 }
 .ant-list-empty-text {
   padding: 16px;
-  color: rgba(0, 0, 0, 0.45);
+  color: rgba(0, 0, 0, 0.25);
   font-size: 12px;
   text-align: center;
 }
@@ -11518,16 +11528,16 @@ textarea.ant-mention-wrapper .ant-mention-editor {
 }
 .ant-menu::before,
 .ant-menu::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-menu::after {
   clear: both;
 }
 .ant-menu::before,
 .ant-menu::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-menu::after {
   clear: both;
@@ -11724,7 +11734,9 @@ textarea.ant-mention-wrapper .ant-mention-editor {
   width: 6px;
   height: 1.5px;
   background: #fff;
+  background: rgba(0, 0, 0, 0.65) \9;
   background-image: linear-gradient(to right, rgba(0, 0, 0, 0.65), rgba(0, 0, 0, 0.65));
+  background-image: none \9;
   border-radius: 2px;
   transition: background 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), transform 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), top 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
   content: '';
@@ -12311,7 +12323,7 @@ textarea.ant-mention-wrapper .ant-mention-editor {
 .ant-modal-footer {
   padding: 10px 16px;
   text-align: right;
-  background: tranparent;
+  background: transparent;
   border-top: 1px solid #e8e8e8;
   border-radius: 0 0 2px 2px;
 }
@@ -12382,16 +12394,16 @@ textarea.ant-mention-wrapper .ant-mention-editor {
 }
 .ant-modal-confirm-body-wrapper::before,
 .ant-modal-confirm-body-wrapper::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-modal-confirm-body-wrapper::after {
   clear: both;
 }
 .ant-modal-confirm-body-wrapper::before,
 .ant-modal-confirm-body-wrapper::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-modal-confirm-body-wrapper::after {
   clear: both;
@@ -13191,8 +13203,8 @@ textarea.ant-pagination-options-quick-jumper input {
   width: 8.48528137px;
   height: 8.48528137px;
   background: transparent;
-  border-width: 4.24264069px;
   border-style: solid;
+  border-width: 4.24264069px;
   transform: rotate(45deg);
 }
 .ant-popover-placement-top > .ant-popover-content > .ant-popover-arrow,
@@ -13499,9 +13511,9 @@ textarea.ant-pagination-options-quick-jumper input {
   width: 16px;
   height: 16px;
   background-color: #fff;
-  border-width: 1px;
-  border-style: solid;
   border-color: #d9d9d9;
+  border-style: solid;
+  border-width: 1px;
   border-radius: 100px;
   transition: all 0.3s;
 }
@@ -13535,7 +13547,7 @@ textarea.ant-pagination-options-quick-jumper input {
   border-color: #1890ff;
 }
 .ant-radio-checked .ant-radio-inner::after {
-  transform: scale(0.875);
+  transform: scale(1);
   opacity: 1;
   transition: all 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
 }
@@ -13945,8 +13957,8 @@ span.ant-radio + * {
   display: inline-block;
   width: 0;
   visibility: hidden;
-  pointer-events: none;
   content: '.';
+  pointer-events: none;
 }
 .ant-select-lg {
   font-size: 14px;
@@ -14058,16 +14070,16 @@ span.ant-radio + * {
 }
 .ant-select-selection--multiple::before,
 .ant-select-selection--multiple::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-select-selection--multiple::after {
   clear: both;
 }
 .ant-select-selection--multiple::before,
 .ant-select-selection--multiple::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-select-selection--multiple::after {
   clear: both;
@@ -14686,8 +14698,8 @@ span.ant-radio + * {
   background: #fff;
   opacity: 0;
   transition: all 0.3s;
-  pointer-events: none;
   content: '';
+  pointer-events: none;
 }
 .ant-spin-blur {
   clear: both;
@@ -15207,7 +15219,7 @@ span.ant-radio + * {
 .ant-steps-label-vertical .ant-steps-item-title::after {
   display: none;
 }
-.ant-steps-label-vertical.ant-steps-small .ant-steps-item-icon {
+.ant-steps-label-vertical.ant-steps-small:not(.ant-steps-dot) .ant-steps-item-icon {
   margin-left: 40px;
 }
 .ant-steps-dot .ant-steps-item-title {
@@ -15472,16 +15484,16 @@ span.ant-radio + * {
 }
 .ant-table-wrapper::before,
 .ant-table-wrapper::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-table-wrapper::after {
   clear: both;
 }
 .ant-table-wrapper::before,
 .ant-table-wrapper::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-table-wrapper::after {
   clear: both;
@@ -15511,11 +15523,14 @@ span.ant-radio + * {
   border-radius: 2px 2px 0 0;
   border-collapse: collapse;
 }
+.ant-table-thead > tr {
+  background: #fafafa;
+}
 .ant-table-thead > tr > th {
   color: rgba(0, 0, 0, 0.85);
   font-weight: 500;
   text-align: left;
-  background: #fafafa;
+  background: transparent;
   border-bottom: 1px solid #e8e8e8;
   transition: background 0.3s ease;
 }
@@ -15592,8 +15607,9 @@ span.ant-radio + * {
 .ant-table-thead > tr > th.ant-table-column-has-actions {
   position: relative;
   background-clip: padding-box;
-  /* stylelint-disable-next-line */
-  -webkit-background-clip: border-box;
+}
+.ant-table-thead > tr > th.ant-table-column-has-actions.ant-table-column-has-filters {
+  padding-right: 30px !important;
 }
 .ant-table-thead > tr > th.ant-table-column-has-actions.ant-table-column-has-filters .anticon-filter.ant-table-filter-open,
 .ant-table-thead > tr > th.ant-table-column-has-actions.ant-table-column-has-filters .ant-table-filter-icon.ant-table-filter-open {
@@ -15623,24 +15639,21 @@ span.ant-radio + * {
 .ant-table-thead > tr > th.ant-table-column-has-actions.ant-table-column-has-sorters:active .ant-table-column-sorter-down:not(.on) {
   color: rgba(0, 0, 0, 0.45);
 }
-.ant-table-thead > tr > th.ant-table-column-has-actions.ant-table-column-has-sorters,
-.ant-table-thead > tr > th.ant-table-column-has-actions.ant-table-column-has-filters {
-  padding-right: 30px !important;
-}
-.ant-table-thead > tr > th.ant-table-column-has-actions.ant-table-column-has-sorters.ant-table-column-has-filters {
-  padding-right: 54px !important;
+.ant-table-thead > tr > th .ant-table-header-column {
+  display: inline-block;
+  vertical-align: top;
 }
-.ant-table-thead > tr > th .ant-table-column-sorters {
+.ant-table-thead > tr > th .ant-table-header-column .ant-table-column-sorters {
   display: table;
 }
-.ant-table-thead > tr > th .ant-table-column-sorters > .ant-table-column-title {
+.ant-table-thead > tr > th .ant-table-header-column .ant-table-column-sorters > .ant-table-column-title {
   display: table-cell;
   vertical-align: middle;
 }
-.ant-table-thead > tr > th .ant-table-column-sorters > *:not(.ant-table-column-sorter) {
+.ant-table-thead > tr > th .ant-table-header-column .ant-table-column-sorters > *:not(.ant-table-column-sorter) {
   position: relative;
 }
-.ant-table-thead > tr > th .ant-table-column-sorters::before {
+.ant-table-thead > tr > th .ant-table-header-column .ant-table-column-sorters::before {
   position: absolute;
   top: 0;
   right: 0;
@@ -15650,7 +15663,7 @@ span.ant-radio + * {
   transition: all 0.3s;
   content: '';
 }
-.ant-table-thead > tr > th .ant-table-column-sorters:hover::before {
+.ant-table-thead > tr > th .ant-table-header-column .ant-table-column-sorters:hover::before {
   background: rgba(0, 0, 0, 0.04);
 }
 .ant-table-thead > tr > th.ant-table-column-has-sorters {
@@ -15679,9 +15692,6 @@ span.ant-radio + * {
 .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td {
   background: #e6f7ff;
 }
-.ant-table-thead > tr:hover {
-  background: none;
-}
 .ant-table-footer {
   position: relative;
   padding: 16px 16px;
@@ -15743,17 +15753,6 @@ span.ant-radio + * {
 .ant-table-tbody > tr > td {
   padding: 16px 16px;
 }
-.ant-table-thead > tr > th.ant-table-selection-column-custom .ant-table-selection {
-  margin-right: -15px;
-}
-.ant-table-thead > tr > th.ant-table-selection-column,
-.ant-table-tbody > tr > td.ant-table-selection-column {
-  text-align: center;
-}
-.ant-table-thead > tr > th.ant-table-selection-column .ant-radio-wrapper,
-.ant-table-tbody > tr > td.ant-table-selection-column .ant-radio-wrapper {
-  margin-right: 0;
-}
 .ant-table-expand-icon-th,
 .ant-table-row-expand-icon-cell {
   width: 50px;
@@ -15822,7 +15821,7 @@ span.ant-radio + * {
   position: relative;
   z-index: 1;
   padding: 16px 16px;
-  color: rgba(0, 0, 0, 0.45);
+  color: rgba(0, 0, 0, 0.25);
   font-size: 12px;
   text-align: center;
   background: #fff;
@@ -15945,9 +15944,6 @@ span.ant-radio + * {
 .ant-table-row-spaced::after {
   content: '.';
 }
-.ant-table-row[class*='ant-table-row-level-0'] .ant-table-selection-column > span {
-  display: inline-block;
-}
 tr.ant-table-expanded-row,
 tr.ant-table-expanded-row:hover {
   background: #fbfbfb;
@@ -16045,6 +16041,23 @@ tr.ant-table-expanded-row td > .ant-table-wrapper {
 .ant-table.ant-table-scroll-position-right .ant-table-fixed-right {
   box-shadow: none;
 }
+.ant-table colgroup > col.ant-table-selection-col {
+  width: 60px;
+}
+.ant-table-thead > tr > th.ant-table-selection-column-custom .ant-table-selection {
+  margin-right: -15px;
+}
+.ant-table-thead > tr > th.ant-table-selection-column,
+.ant-table-tbody > tr > td.ant-table-selection-column {
+  text-align: center;
+}
+.ant-table-thead > tr > th.ant-table-selection-column .ant-radio-wrapper,
+.ant-table-tbody > tr > td.ant-table-selection-column .ant-radio-wrapper {
+  margin-right: 0;
+}
+.ant-table-row[class*='ant-table-row-level-0'] .ant-table-selection-column > span {
+  display: inline-block;
+}
 .ant-table-middle > .ant-table-title,
 .ant-table-middle > .ant-table-footer {
   padding: 12px 8px;
@@ -16068,7 +16081,7 @@ tr.ant-table-expanded-row td > .ant-table-wrapper {
   padding: 12px 8px;
 }
 .ant-table-middle tr.ant-table-expanded-row td > .ant-table-wrapper {
-  margin: -12px -16px -13px;
+  margin: -12px -8px -13px;
 }
 .ant-table-small {
   border: 1px solid #e8e8e8;
@@ -16186,7 +16199,7 @@ tr.ant-table-expanded-row td > .ant-table-wrapper {
   border-left: 1px solid #e8e8e8;
 }
 .ant-table-small tr.ant-table-expanded-row td > .ant-table-wrapper {
-  margin: -8px -16px -9px;
+  margin: -8px -8px -9px;
 }
 .ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container {
   height: 40px;
@@ -16343,16 +16356,16 @@ tr.ant-table-expanded-row td > .ant-table-wrapper {
 }
 .ant-tabs::before,
 .ant-tabs::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-tabs::after {
   clear: both;
 }
 .ant-tabs::before,
 .ant-tabs::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-tabs::after {
   clear: both;
@@ -16386,16 +16399,16 @@ tr.ant-table-expanded-row td > .ant-table-wrapper {
 }
 .ant-tabs-nav-container::before,
 .ant-tabs-nav-container::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-tabs-nav-container::after {
   clear: both;
 }
 .ant-tabs-nav-container::before,
 .ant-tabs-nav-container::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-tabs-nav-container::after {
   clear: both;
@@ -16570,6 +16583,7 @@ tr.ant-table-expanded-row td > .ant-table-wrapper {
 .ant-tabs .ant-tabs-bottom-content > .ant-tabs-tabpane-inactive {
   height: 0;
   padding: 0 !important;
+  overflow: hidden;
   opacity: 0;
   pointer-events: none;
 }
@@ -16727,7 +16741,15 @@ tr.ant-table-expanded-row td > .ant-table-wrapper {
 }
 .no-flex > .ant-tabs-content > .ant-tabs-tabpane-inactive,
 .ant-tabs-no-animation > .ant-tabs-content > .ant-tabs-tabpane-inactive {
-  display: none;
+  height: 0;
+  padding: 0 !important;
+  overflow: hidden;
+  opacity: 0;
+  pointer-events: none;
+}
+.no-flex > .ant-tabs-content > .ant-tabs-tabpane-inactive input,
+.ant-tabs-no-animation > .ant-tabs-content > .ant-tabs-tabpane-inactive input {
+  visibility: hidden;
 }
 .ant-tabs-left-content > .ant-tabs-content-animated,
 .ant-tabs-right-content > .ant-tabs-content-animated {
@@ -16736,7 +16758,15 @@ tr.ant-table-expanded-row td > .ant-table-wrapper {
 }
 .ant-tabs-left-content > .ant-tabs-tabpane-inactive,
 .ant-tabs-right-content > .ant-tabs-tabpane-inactive {
-  display: none;
+  height: 0;
+  padding: 0 !important;
+  overflow: hidden;
+  opacity: 0;
+  pointer-events: none;
+}
+.ant-tabs-left-content > .ant-tabs-tabpane-inactive input,
+.ant-tabs-right-content > .ant-tabs-tabpane-inactive input {
+  visibility: hidden;
 }
 .ant-tag {
   box-sizing: border-box;
@@ -16757,7 +16787,7 @@ tr.ant-table-expanded-row td > .ant-table-wrapper {
   background: #fafafa;
   border: 1px solid #d9d9d9;
   border-radius: 2px;
-  cursor: pointer;
+  cursor: default;
   opacity: 1;
   transition: all 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
 }
@@ -17074,16 +17104,16 @@ li.ant-time-picker-panel-select-option-disabled:hover {
 }
 .ant-time-picker-panel-combobox::before,
 .ant-time-picker-panel-combobox::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-time-picker-panel-combobox::after {
   clear: both;
 }
 .ant-time-picker-panel-combobox::before,
 .ant-time-picker-panel-combobox::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-time-picker-panel-combobox::after {
   clear: both;
@@ -17444,8 +17474,8 @@ textarea.ant-time-picker-input {
   position: absolute;
   width: 0;
   height: 0;
-  border-style: solid;
   border-color: transparent;
+  border-style: solid;
 }
 .ant-tooltip-placement-top .ant-tooltip-arrow,
 .ant-tooltip-placement-topLeft .ant-tooltip-arrow,
@@ -18021,7 +18051,10 @@ span.ant-transfer-list-search-action {
   background-color: #bae7ff;
 }
 .ant-tree li span.ant-tree-checkbox {
-  margin: 4px 4px 0 2px;
+  top: initial;
+  height: 24px;
+  margin: 0 4px 0 2px;
+  padding: 4px 0;
 }
 .ant-tree li span.ant-tree-switcher,
 .ant-tree li span.ant-tree-iconEle {
@@ -18898,16 +18931,16 @@ div.ant-typography-edit-content {
 }
 .ant-upload-list::before,
 .ant-upload-list::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-upload-list::after {
   clear: both;
 }
 .ant-upload-list::before,
 .ant-upload-list::after {
-  content: '';
   display: table;
+  content: '';
 }
 .ant-upload-list::after {
   clear: both;

app/version.js

@@ -1 +1 @@
-exports.version = [3,3,13,5374];
+exports.version = [3,3,13,5384];

package.json

@@ -11,14 +11,15 @@
     "dev": "cross-env ENV=dev electron app",
     "less": "npm run _ln && lessc app-ui/styles/main.less app-ui/styles/main.css",
     "build": "gulp ver && npm run less && npm run dll && npm run build2",
-    "build2": "webpack --progress --profile --colors",
+    "build2": "webpack --config scripts/webpack.config.js --progress --profile --colors",
     "w": "npm run build2 -- -w",
     "pack": "gulp pack",
     "pack-mac": "gulp pack --platform=macOS",
     "pack-win": "gulp pack --platform=win64",
     "pack-win32": "gulp pack --platform=win32",
     "zip": "gulp zip",
-    "make": "webpack -p --progress && gulp pack && gulp zip"
+    "make": "gulp pack && gulp zip",
+    "build-and-make": "npm run build && npm run make"
   },
   "repository": {
     "type": "git",
@@ -31,18 +32,19 @@
   },
   "homepage": "https://oldj.github.io/SwitchHosts/",
   "dependencies": {
-    "antd": "^3.6.5",
-    "codemirror": "^5.39.0",
-    "express": "^4.16.3",
-    "ramda": "^0.24.1",
-    "react": "^16.4.1",
+    "antd": "^3.16.5",
+    "classnames": "^2.2.6",
+    "codemirror": "^5.46.0",
+    "lodash": "^4.17.11",
+    "moment": "^2.24.0",
+    "react": "^16.8.6",
     "react-codemirror": "^1.0.0",
-    "react-dom": "^16.4.1"
+    "react-dom": "^16.8.6"
   },
   "devDependencies": {
-    "@babel/cli": "^7.1.2",
-    "@babel/core": "^7.1.2",
-    "@babel/plugin-proposal-class-properties": "^7.1.0",
+    "@babel/cli": "^7.4.3",
+    "@babel/core": "^7.4.3",
+    "@babel/plugin-proposal-class-properties": "^7.4.0",
     "@babel/plugin-proposal-decorators": "^7.1.2",
     "@babel/plugin-proposal-do-expressions": "^7.0.0",
     "@babel/plugin-proposal-export-default-from": "^7.0.0",
@@ -66,21 +68,21 @@
     "@babel/preset-flow": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "^7.0.0",
-    "autoprefixer": "^6.7.2",
+    "@svgr/webpack": "^4.2.0",
+    "autoprefixer": "^9.5.1",
     "ava": "^1.4.1",
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.4",
     "babel-plugin-import": "^1.10.0",
     "chalk": "^1.1.3",
-    "classnames": "^2.2.6",
     "connect-history-api-fallback": "^1.5.0",
     "copy-webpack-plugin": "^4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "^0.28.11",
     "devtron": "^1.4.0",
     "electron": "^3.1.8",
-    "electron-packager": "^9.1.0",
-    "eslint": "^3.14.1",
+    "electron-packager": "^13.1.1",
+    "eslint": "^5.16.0",
     "eslint-config-standard": "^6.2.1",
     "eslint-friendly-formatter": "^2.0.7",
     "eslint-loader": "^1.9.0",
@@ -93,31 +95,30 @@
     "file-loader": "^0.10.1",
     "friendly-errors-webpack-plugin": "^1.7.0",
     "function-bind": "^1.1.1",
-    "gulp": "^4.0.0",
+    "gulp": "^4.0.1",
     "gulp-shell": "^0.6.5",
     "html-webpack-plugin": "^2.30.1",
-    "http-proxy-middleware": "^0.17.3",
+    "http-proxy-middleware": "^0.19.1",
     "js-beautify": "^1.7.5",
     "less": "^2.7.3",
     "less-loader": "^4.1.0",
     "less-plugin-lists": "^1.1.2",
     "loader-utils": "^1.1.0",
-    "moment": "^2.22.2",
     "nyc": "^10.1.2",
     "opn": "^4.0.2",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.4.0",
     "rimraf": "^2.6.2",
     "semver": "^5.5.0",
-    "sortablejs": "^1.7.0",
+    "sortablejs": "^1.9.0",
     "spectron": "^3.8.0",
     "style-loader": "^0.16.1",
     "uglify-loader": "^2.0.0",
     "uglifyjs-webpack-plugin": "^1.3.0",
     "url-loader": "^0.5.9",
-    "webpack": "^4.21.0",
+    "webpack": "^4.30.0",
     "webpack-bundle-analyzer": "^2.13.1",
-    "webpack-cli": "^3.1.2",
+    "webpack-cli": "^3.3.1",
     "webpack-dev-middleware": "^1.12.2",
     "webpack-hot-middleware": "^2.22.2",
     "webpack-merge": "^2.6.1",
@@ -126,29 +127,16 @@
     "yargs": "^6.5.0"
   },
   "ava": {
-    "files": [
-      "src/**/*.ava.js",
-      "test/*.js",
-      "!**/node_modules/**/*.*"
-    ],
-    "source": [
-      "**/*.{js,jsx}",
-      "!dist/**/*"
-    ],
+    "files": ["src/**/*.ava.js", "test/*.js", "!**/node_modules/**/*.*"],
+    "source": ["**/*.{js,jsx}", "!dist/**/*"],
     "match": [],
     "concurrency": 5,
     "failFast": true,
     "tap": true,
     "powerAssert": false,
-    "require": [
-      "babel-polyfill",
-      "babel-register"
-    ],
+    "require": ["babel-polyfill", "babel-register"],
     "babel": {
-      "presets": [
-        "latest",
-        "stage-0"
-      ]
+      "presets": ["latest", "stage-0"]
     }
   }
-}
+}

webpack.config.js → scripts/webpack.config.js

@@ -12,7 +12,7 @@ const WebpackNotifierPlugin = require('webpack-notifier')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const LESSPluginLists = require('less-plugin-lists')
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
-const version = require('./app/version').version.join('.')
+const version = require('../app/version').version.join('.')
 
 module.exports = {
   mode: 'production',
@@ -98,12 +98,13 @@ module.exports = {
     }),
     new webpack.DllReferencePlugin({
       context: __dirname,
-      manifest: require('./tmp/manifest.json')
+      manifest: require('../tmp/manifest.json')
     }),
     new webpack.IgnorePlugin(new RegExp('^(electron|fs|path)$')),
     new WebpackNotifierPlugin({
       title: 'SwitchHosts!',
-      alwaysNotify: true
+      alwaysNotify: true,
+      excludeWarnings: true
     }),
     new webpack.BannerPlugin(`SwitchHosts! [file] v${version}, ${moment().format('YYYY-MM-DD HH:mm:ss')}`)
   ]