Merge pull request #286 from oslabs-beta/master

dyanamic import fix

Author: mjmiguel

.babelrc

@@ -12,7 +12,6 @@
   "plugins": [
     ["@babel/transform-runtime"],
     ["@babel/proposal-class-properties"],
-    ["@babel/proposal-object-rest-spread"],
-    ["@babel/plugin-syntax-dynamic-import"]
+    ["@babel/proposal-object-rest-spread"]
   ]
 }

package.json

@@ -302,13 +302,11 @@
     "@babel/core": "^7.10.3",
     "@babel/plugin-proposal-class-properties": "^7.10.4",
     "@babel/plugin-proposal-object-rest-spread": "^7.10.4",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.10.3",
     "@babel/preset-env": "^7.10.3",
     "@babel/preset-react": "^7.10.1",
     "@babel/preset-typescript": "^7.10.4",
     "@jest-runner/electron": "^3.0.0",
-    "@loadable/component": "^5.13.1",
     "@testing-library/jest-dom": "^5.11.0",
     "@testing-library/react": "^10.4.3",
     "@types/cookie": "^0.4.0",

src/client/components/composer/NewRequest/ComposerNewRequest.jsx

@@ -1,19 +1,15 @@
 import React from "react";
 import uuid from "uuid/v4"; // (Universally Unique Identifier)--generates a unique ID
 import gql from "graphql-tag";
-import loadable from "@loadable/component";
-
 import HeaderEntryForm from "./HeaderEntryForm.jsx";
 import BodyEntryForm from "./BodyEntryForm.jsx";
 import GRPCProtoEntryForm from "./GRPCProtoEntryForm.jsx";
 import FieldEntryForm from "./FieldEntryForm.jsx";
 import CookieEntryForm from "./CookieEntryForm.jsx";
 import historyController from "../../../controllers/historyController";
 import GraphQLIntrospectionLog from "./GraphQLIntrospectionLog";
-
-// lazy loading to reduce bundle size (codemirror)
-const GraphQLBodyEntryForm = loadable(() => import('./GraphQLBodyEntryForm'));
-const GraphQLVariableEntryForm = loadable(() => import('./GraphQLVariableEntryForm')); 
+import GraphQLBodyEntryForm from "./GraphQLBodyEntryForm";
+import GraphQLVariableEntryForm from "./GraphQLVariableEntryForm";
 
 
 const ComposerNewRequest = ({

src/client/components/containers/ContentsContainer.tsx

@@ -1,9 +1,5 @@
 import * as React from "react";
-import loadable from "@loadable/component";
-
-// lazy loading to reduce bundle size (chart.js)
-const BarGraph = loadable(() => import('../display/BarGraph'))
-
+import BarGraph from "../display/BarGraph"
 import ReqResContainer from "./ReqResContainer.jsx";
 import NavBarContainer from "./NavBarContainer.jsx";