From 7d52d9a3bbfba560f8bb2007e9fec4c1cd5317ef Mon Sep 17 00:00:00 2001
From: Valeriy <ValeraS@users.noreply.github.com>
Date: Sat, 31 Aug 2019 02:26:43 +0300
Subject: [PATCH] feat(client): lazy load Monaco editor

---
 client/gatsby-node.js                         | 20 +++----------------
 client/src/__mocks__/monacoEditorMock.js      | 15 --------------
 .../templates/Challenges/classic/Editor.js    | 20 +++++++++----------
 3 files changed, 13 insertions(+), 42 deletions(-)
 delete mode 100644 client/src/__mocks__/monacoEditorMock.js

diff --git a/client/gatsby-node.js b/client/gatsby-node.js
index ae0650abb2..623f79422c 100644
--- a/client/gatsby-node.js
+++ b/client/gatsby-node.js
@@ -137,7 +137,7 @@ exports.createPages = function createPages({ graphql, actions }) {
 
 const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
 
-exports.onCreateWebpackConfig = ({ stage, plugins, actions }) => {
+exports.onCreateWebpackConfig = ({ plugins, actions }) => {
   actions.setWebpackConfig({
     node: {
       fs: 'empty'
@@ -153,24 +153,10 @@ exports.onCreateWebpackConfig = ({ stage, plugins, actions }) => {
           process.env.FREECODECAMP_NODE_ENV || 'development'
         ),
         PAYPAL_SUPPORTERS: JSON.stringify(process.env.PAYPAL_SUPPORTERS || 404)
-      })
+      }),
+      new MonacoWebpackPlugin()
     ]
   });
-  if (stage !== 'build-html') {
-    actions.setWebpackConfig({
-      plugins: [new MonacoWebpackPlugin()]
-    });
-  }
-  if (stage === 'build-html') {
-    actions.setWebpackConfig({
-      plugins: [
-        plugins.normalModuleReplacement(
-          /react-monaco-editor/,
-          require.resolve('./src/__mocks__/monacoEditorMock.js')
-        )
-      ]
-    });
-  }
 };
 
 exports.onCreateBabelConfig = ({ actions }) => {
diff --git a/client/src/__mocks__/monacoEditorMock.js b/client/src/__mocks__/monacoEditorMock.js
deleted file mode 100644
index b12f1c69c1..0000000000
--- a/client/src/__mocks__/monacoEditorMock.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/* eslint-disable */
-import React from 'react';
-
-export default props => {
-  const { width = '100%', height = '100%' } = props;
-  const fixedWidth =
-    width.toString().indexOf('%') !== -1 ? width : `${width}px`;
-  const fixedHeight =
-    height.toString().indexOf('%') !== -1 ? height : `${height}px`;
-  const style = {
-    width: fixedWidth,
-    height: fixedHeight
-  };
-  return <div style={style} className="react-monaco-editor-container" />;
-};
diff --git a/client/src/templates/Challenges/classic/Editor.js b/client/src/templates/Challenges/classic/Editor.js
index f2c41637f0..2f66795411 100644
--- a/client/src/templates/Challenges/classic/Editor.js
+++ b/client/src/templates/Challenges/classic/Editor.js
@@ -1,12 +1,13 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component, Suspense } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import MonacoEditor from 'react-monaco-editor';
+import { createSelector } from 'reselect';
 
 import { executeChallenge, updateFile } from '../redux';
 import { userSelector } from '../../../redux';
-import { createSelector } from 'reselect';
+
+const MonacoEditor = React.lazy(() => import('react-monaco-editor'));
 
 const propTypes = {
   contents: PropTypes.string,
@@ -45,7 +46,7 @@ const defineMonacoThemes = monaco => {
     return;
   }
   monacoThemesDefined = true;
-  const yellowCollor = 'FFFF00';
+  const yellowColor = 'FFFF00';
   const lightBlueColor = '9CDCFE';
   const darkBlueColor = '00107E';
   monaco.editor.defineTheme('vs-dark-custom', {
@@ -56,9 +57,9 @@ const defineMonacoThemes = monaco => {
     },
     rules: [
       { token: 'delimiter.js', foreground: lightBlueColor },
-      { token: 'delimiter.parenthesis.js', foreground: yellowCollor },
-      { token: 'delimiter.array.js', foreground: yellowCollor },
-      { token: 'delimiter.bracket.js', foreground: yellowCollor }
+      { token: 'delimiter.parenthesis.js', foreground: yellowColor },
+      { token: 'delimiter.array.js', foreground: yellowColor },
+      { token: 'delimiter.bracket.js', foreground: yellowColor }
     ]
   });
   monaco.editor.defineTheme('vs-custom', {
@@ -129,8 +130,7 @@ class Editor extends Component {
     const { contents, ext, theme, fileKey } = this.props;
     const editorTheme = theme === 'night' ? 'vs-dark-custom' : 'vs-custom';
     return (
-      <Fragment>
-        <base href='/' />
+      <Suspense fallback={<div />}>
         <MonacoEditor
           editorDidMount={this.editorDidMount}
           editorWillMount={this.editorWillMount}
@@ -141,7 +141,7 @@ class Editor extends Component {
           theme={editorTheme}
           value={contents}
         />
-      </Fragment>
+      </Suspense>
     );
   }
 }