Revert "Build: Async load HappyChat and network detection (#11714)" (#…

…11840) This reverts commit 4ed09ed.
Automattic · Mar 7, 2017 · 1008869 · 1008869
1 parent 4ed09ed
commit 1008869
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/client/boot/index.js b/client/boot/index.js
@@ -203,11 +203,11 @@ function reduxStoreReady( reduxStore ) {
 	}
 
 	if ( config.isEnabled( 'network-connection' ) ) {
-		asyncRequire( 'lib/network-connection', netConn => netConn.init( reduxStore ) );
+		require( 'lib/network-connection' ).init( reduxStore );
 	}
 
 	if ( config.isEnabled( 'css-hot-reload' ) ) {
-		asyncRequire( 'lib/css-hot-reload', cssHotReload => cssHotReload() );
+		require( 'lib/css-hot-reload' )();
 	}
 
 	// Render Layout only for non-isomorphic sections.

diff --git a/client/layout/index.jsx b/client/layout/index.jsx
@@ -10,8 +10,7 @@ var React = require( 'react' ),
 /**
  * Internal dependencies
  */
-var AsyncLoad = require( 'components/async-load' ),
-	MasterbarLoggedIn = require( 'layout/masterbar/logged-in' ),
+var MasterbarLoggedIn = require( 'layout/masterbar/logged-in' ),
 	MasterbarLoggedOut = require( 'layout/masterbar/logged-out' ),
 	observe = require( 'lib/mixins/data-observe' ),
 	GlobalNotices = require( 'components/global-notices' ),
@@ -31,7 +30,8 @@ var AsyncLoad = require( 'components/async-load' ),
 	QueryPreferences = require( 'components/data/query-preferences' ),
 	KeyboardShortcutsMenu,
 	Layout,
-	SupportUser;
+	SupportUser,
+	Happychat = require( 'components/happychat' );
 
 import { isOffline } from 'state/application/selectors';
 import { hasSidebar } from 'state/ui/selectors';
@@ -201,7 +201,7 @@ Layout = React.createClass( {
 					isEnabled={ translator.isEnabled() }
 					isActive={ translator.isActivated() }/>
 				{ this.renderPreview() }
-				{ config.isEnabled( 'happychat' ) && this.props.chatIsOpen && <AsyncLoad require="components/happychat" /> }
+				{ config.isEnabled( 'happychat' ) && this.props.chatIsOpen && <Happychat /> }
 			</div>
 		);
 	}