Removed unused kb images. Update deps. Fix cpu load increase when too…

…lbar enabled #281
wavebox · Jun 27, 2017 · 8891f83 · 8891f83
1 parent 83abdef
commit 8891f83
Show file tree

Hide file tree

Showing 27 changed files with 46 additions and 35 deletions.
diff --git a/.github/kb_google_unread_counts_setup1.png b/.github/kb_google_unread_counts_setup1.png
diff --git a/.github/kb_google_unread_counts_setup2.png b/.github/kb_google_unread_counts_setup2.png
diff --git a/.github/kb_google_unread_counts_setup3.png b/.github/kb_google_unread_counts_setup3.png
diff --git a/.github/kb_google_unread_counts_setup4.png b/.github/kb_google_unread_counts_setup4.png
diff --git a/.github/kb_google_unread_counts_setup5.png b/.github/kb_google_unread_counts_setup5.png
diff --git a/.github/kb_google_unread_counts_setup6.png b/.github/kb_google_unread_counts_setup6.png
diff --git a/.github/kb_import_export_1.png b/.github/kb_import_export_1.png
diff --git a/.github/kb_import_export_2.png b/.github/kb_import_export_2.png
diff --git a/.github/kb_import_export_3.png b/.github/kb_import_export_3.png
diff --git a/.github/kb_import_export_4.png b/.github/kb_import_export_4.png
diff --git a/.github/kb_multiple_machines_1.png b/.github/kb_multiple_machines_1.png
diff --git a/.github/kb_multiple_machines_2.png b/.github/kb_multiple_machines_2.png
diff --git a/.github/kb_multiple_machines_3.png b/.github/kb_multiple_machines_3.png
diff --git a/.github/kb_staying_signedin_microsoft.png b/.github/kb_staying_signedin_microsoft.png
diff --git a/.github/kb_staying_signedin_sso1.png b/.github/kb_staying_signedin_sso1.png
diff --git a/.github/kb_staying_signedin_sso2.png b/.github/kb_staying_signedin_sso2.png
diff --git a/.github/kb_staying_signedin_sso3.png b/.github/kb_staying_signedin_sso3.png
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
   "dependencies": {
     "babel-cli": "6.24.1",
     "babel-core": "6.25.0",
-    "babel-loader": "7.0.0",
+    "babel-loader": "7.1.0",
     "babel-plugin-transform-class-properties": "6.24.1",
     "babel-preset-es2015": "6.24.1",
     "babel-preset-react": "6.24.1",
@@ -52,12 +52,12 @@
     "less": "2.7.2",
     "less-loader": "4.0.4",
     "style-loader": "0.18.2",
-    "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
-    "url-loader": "0.5.8",
-    "uuid": "3.0.1",
-    "webpack": "2.6.1",
+    "url-loader": "0.5.9",
+    "uglify-es": "3.0.20",
+    "uuid": "3.1.0",
+    "webpack": "3.0.0",
     "webpack-target-electron-renderer": "0.4.0",
-    "yargs": "8.0.1"
+    "yargs": "8.0.2"
   },
   "devDependencies": {
     "standard": "10.0.2",

diff --git a/src/app/package.json b/src/app/package.json
@@ -17,9 +17,9 @@
     "mkdirp": "0.5.1",
     "nodehun": "2.0.11",
     "unused-filename": "1.0.0",
-    "uuid": "3.0.1",
+    "uuid": "3.1.0",
     "winreg": "1.2.4",
-    "yargs": "8.0.1"
+    "yargs": "8.0.2"
   },
   "optionalDependencies": {
     "electron-windows-notifications": "1.1.13",

diff --git a/src/scenes/content/package.json b/src/scenes/content/package.json
@@ -7,16 +7,16 @@
   "dependencies": {
     "alt": "0.18.6",
     "fbjs": "0.8.12",
-    "material-ui": "0.18.3",
+    "material-ui": "0.18.4",
     "prop-types": "15.5.10",
-    "react": "15.5.4",
-    "react-addons-shallow-compare": "15.5.2",
-    "react-dom": "15.5.4",
+    "react": "15.6.1",
+    "react-addons-shallow-compare": "15.6.0",
+    "react-dom": "15.6.1",
     "react-portal-tooltip": "1.1.5",
     "react-tap-event-plugin": "2.0.1",
     "react-timer-mixin": "0.13.3",
     "urijs": "1.18.10",
-    "uuid": "3.0.1"
+    "uuid": "3.1.0"
   },
   "devDependencies": {
     "standard": "10.0.2",

diff --git a/src/scenes/content/src/Scenes/BrowserScene/BrowserToolbar.js b/src/scenes/content/src/Scenes/BrowserScene/BrowserToolbar.js
@@ -115,10 +115,14 @@ export default class BrowserToolbar extends React.Component {
             <IconButton onClick={isLoading ? handleStop : handleReload}>
               <FontIcon className='material-icons'>{isLoading ? 'close' : 'refresh'}</FontIcon>
             </IconButton>
-            <CircularProgress
-              size={18}
-              thickness={2}
-              style={{ transition: 'opacity 1s', margin: 10, opacity: isLoading ? 1 : 0 }} />
+            {isLoading ? (
+              <CircularProgress
+                size={18}
+                thickness={2}
+                style={{ margin: 10 }} />
+            ) : (
+              <div style={{ width: 18, height: 18, margin: 10 }} />
+            )}
           </ToolbarGroup>
           <ToolbarGroup style={{ minWidth: 0 }}>
             <ToolbarTitle text={this.externalUrl(currentUrl)} style={{ fontSize: '14px' }} />

diff --git a/src/scenes/content/webpack.config.js b/src/scenes/content/webpack.config.js
@@ -46,7 +46,8 @@ module.exports = function (env) {
         ignore: [ '.DS_Store' ]
       }),
 
-      // Minify in production
+      // Minify & optimization
+      new webpack.optimize.ModuleConcatenationPlugin(),
       isProduction ? new webpack.optimize.UglifyJsPlugin({}) : undefined
     ].filter((p) => !!p),
     resolve: {

diff --git a/src/scenes/mailboxes/package.json b/src/scenes/mailboxes/package.json
@@ -10,23 +10,23 @@
     "bootstrap-grid": "2.0.1",
     "color": "1.0.3",
     "fbjs": "0.8.12",
-    "material-ui": "0.18.3",
+    "material-ui": "0.18.4",
     "phoenix": "phoenixframework/phoenix#v1.2.4",
     "prop-types": "15.5.10",
     "qs": "6.4.0",
     "querystring": "0.2.0",
-    "react": "15.5.4",
-    "react-addons-shallow-compare": "15.5.2",
-    "react-color": "2.12.0",
-    "react-dom": "15.5.4",
+    "react": "15.6.1",
+    "react-addons-shallow-compare": "15.6.0",
+    "react-color": "2.13.0",
+    "react-dom": "15.6.1",
     "react-portal-tooltip": "1.1.5",
     "react-router": "4.1.1",
     "react-router-dom": "4.1.1",
     "react-tap-event-plugin": "2.0.1",
     "react-timer-mixin": "0.13.3",
     "string-hash": "1.1.3",
     "urijs": "1.18.10",
-    "uuid": "3.0.1",
+    "uuid": "3.1.0",
     "valid-url": "1.0.9"
   },
   "devDependencies": {

diff --git a/src/scenes/mailboxes/src/Scenes/AppScene/Mailbox/MailboxWebView/MailboxNavigationToolbar.js b/src/scenes/mailboxes/src/Scenes/AppScene/Mailbox/MailboxWebView/MailboxNavigationToolbar.js
@@ -134,11 +134,15 @@ export default class MailboxNavigationToolbar extends React.Component {
               style={{ fontSize: '14px', color: Colors.blueGrey50 }} />
           </ToolbarGroup>
           <ToolbarGroup lastChild>
-            <CircularProgress
-              size={18}
-              thickness={2}
-              color={Colors.cyan200}
-              style={{ transition: 'opacity 1s', margin: 10, opacity: isLoading ? 1 : 0 }} />
+            {isLoading ? (
+              <CircularProgress
+                size={18}
+                thickness={2}
+                color={Colors.cyan200}
+                style={{ margin: 10 }} />
+            ) : (
+              <div style={{ width: 18, height: 18, margin: 10 }} />
+            )}
           </ToolbarGroup>
         </Toolbar>
       </Paper>

diff --git a/src/scenes/mailboxes/webpack.config.js b/src/scenes/mailboxes/webpack.config.js
@@ -50,7 +50,8 @@ module.exports = function (env) {
         ignore: [ '.DS_Store' ]
       }),
 
-      // Minify in production
+      // Minify & optimization
+      new webpack.optimize.ModuleConcatenationPlugin(),
       isProduction ? new webpack.optimize.UglifyJsPlugin({}) : undefined
     ].filter((p) => !!p),
     resolve: {

diff --git a/src/scenes/monitor/package.json b/src/scenes/monitor/package.json
@@ -7,10 +7,10 @@
   "dependencies": {
     "alt": "0.18.6",
     "fbjs": "0.8.12",
-    "material-ui": "0.18.3",
-    "react": "15.5.4",
-    "react-addons-shallow-compare": "15.5.2",
-    "react-dom": "15.5.4",
+    "material-ui": "0.18.4",
+    "react": "15.6.1",
+    "react-addons-shallow-compare": "15.6.0",
+    "react-dom": "15.6.1",
     "prop-types": "15.5.10",
     "react-tap-event-plugin": "2.0.1"
   },

diff --git a/src/scenes/monitor/webpack.config.js b/src/scenes/monitor/webpack.config.js
@@ -46,7 +46,8 @@ module.exports = function (env) {
         ignore: [ '.DS_Store' ]
       }),
 
-      // Minify in production
+      // Minify & optimization
+      new webpack.optimize.ModuleConcatenationPlugin(),
       isProduction ? new webpack.optimize.UglifyJsPlugin({}) : undefined
     ].filter((p) => !!p),
     resolve: {