Dynamically load jQuery on the desktop

Automattic · Oct 17, 2018 · 5eb8531 · 5eb8531
1 parent c70d533
commit 5eb8531
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -3,8 +3,6 @@ const _ = require( 'lodash' );
 const path = require( 'path' );
 
 const isCalypsoClient = process.env.CALYPSO_CLIENT === 'true';
-const isCalypsoServer = process.env.CALYPSO_SERVER === 'true';
-const isCalypso = isCalypsoClient || isCalypsoServer;
 
 const modules = isCalypsoClient ? false : 'commonjs'; // only calypso should keep es6 modules
 const codeSplit = require( './server/config' ).isEnabled( 'code-splitting' );
@@ -32,7 +30,7 @@ const config = {
 		[ '@babel/plugin-proposal-class-properties', { loose: true } ],
 		[ '@babel/plugin-transform-classes', { loose: false } ],
 		[ '@babel/plugin-transform-template-literals', { loose: true } ],
-		isCalypso && [
+		[
 			path.join(
 				__dirname,
 				'server',

diff --git a/client/lib/load-script/index.js b/client/lib/load-script/index.js
@@ -48,7 +48,11 @@ export function loadjQueryDependentScript( url, callback ) {
 	// It needs to be loaded using require and npm package.
 	if ( config.isEnabled( 'desktop' ) ) {
 		debug( `Attaching jQuery from node_modules to window for "${ url }"` );
-		window.$ = window.jQuery = require( 'jquery' );
+		asyncRequire( 'jquery', $ => {
+			window.$ = window.jQuery = $;
+			loadScript( url, callback );
+		} );
+		return;
 	}
 
 	if ( window.jQuery ) {