Revert "[minor][feat] implement code splitting support with webpack 3. (

#538)" This reverts commit 3540cc0.
electrode-io · Oct 6, 2017 · d88513e · d88513e
1 parent 32c1598
commit d88513e
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 72 deletions.
diff --git a/packages/electrode-archetype-react-app-dev/config/babel/babelrc-client b/packages/electrode-archetype-react-app-dev/config/babel/babelrc-client
@@ -48,8 +48,7 @@
     ],
     "transform-node-env-inline",
     "lodash",
-    "transform-runtime",
-    "syntax-dynamic-import"
+    "transform-runtime"
   ],
   "env": {
     "production": {

diff --git a/packages/electrode-archetype-react-app-dev/package.json b/packages/electrode-archetype-react-app-dev/package.json
@@ -25,8 +25,6 @@
     "babel-core": "^6.4.0",
     "babel-eslint": "^7.0.0",
     "babel-loader": "^7.0.0",
-    "babel-plugin-dynamic-import-node": "^1.0.2",
-    "babel-plugin-dynamic-import-webpack": "^1.0.1",
     "babel-plugin-i18n-id-hashing": "^2.1.0",
     "babel-plugin-lodash": "^3.1.3",
     "babel-plugin-minify-dead-code-elimination": "^0.1.7",

diff --git a/packages/electrode-archetype-react-app/arch-clap.js b/packages/electrode-archetype-react-app/arch-clap.js
@@ -410,7 +410,7 @@ Individual .babelrc files were generated for you in src/client and src/server
       desc: false,
       dep: [".clean.lib:client", ".mk.lib.client.dir", ".build.client.babelrc"],
       task: mkCmd(
-        `babel --plugins dynamic-import-node`,
+        `babel`,
         `--source-maps=inline --copy-files --out-dir ${AppMode.lib.client}`,
         `${AppMode.src.client}`
       )
@@ -572,7 +572,7 @@ Individual .babelrc files were generated for you in src/client and src/server
           .map(n => `--watch ${n}`)
           .join(" ");
         AppMode.setEnv(AppMode.src.dir);
-        const node = AppMode.isSrc ? `babel-node --plugins dynamic-import-node` : "node";
+        const node = AppMode.isSrc ? `babel-node` : "node";
         const serverIndex = Path.join(AppMode.src.server, "index.js");
         return exec(
           `nodemon`,

diff --git a/packages/electrode-archetype-react-app/config/babel/.babelrc b/packages/electrode-archetype-react-app/config/babel/.babelrc
@@ -48,8 +48,7 @@
     ],
     "transform-node-env-inline",
     "lodash",
-    "transform-runtime",
-    "syntax-dynamic-import"
+    "transform-runtime"
   ],
   "env": {
     "production": {

diff --git a/...enerator-electrode/generators/app/templates/src/client/components/demo-code-splitting.jsx b/...enerator-electrode/generators/app/templates/src/client/components/demo-code-splitting.jsx
diff --git a/packages/generator-electrode/generators/app/templates/src/client/components/home.jsx b/packages/generator-electrode/generators/app/templates/src/client/components/home.jsx
@@ -6,7 +6,6 @@
  * To start your own app, please replace or remove these files:
  *
  * - this file (home.jsx)
- * - demo-code-splitting.jsx
  * - demo-buttons.jsx
  * - demo-pure-states.jsx
  * - demo-states.jsx
@@ -16,8 +15,6 @@
  */
 
 import React from "react";
-import PropTypes from "prop-types";
-import { Link } from "react-router";
 import "../styles/normalize.css";
 import "../styles/raleway.css";
 import skeleton from "../styles/skeleton.css";
@@ -30,48 +27,28 @@ import { DemoButtons } from "./demo-buttons";
 import Notifications from "react-notify-toast";
 /*<% } %>*/
 
-const Home = props => {
-  const {children} = props;
-
-  return (
-    <div className={custom.container}>
-      {/*<% if (pwa) { %>*/}
-        <Notifications />
-      {/*<% } %>*/}
-
-      <section className={custom.header}>
-        <h2 className={skeleton.title}>
-          Hello from {" "}
-          <a href="https://github.com/electrode-io">{"Electrode"} <img
-            src={electrodePng}/></a>
-        </h2>
-      </section>
-
-      <div className={custom["docs-section"]}>
-        <DemoStates/>
-      </div>
-
-      <div className={custom["docs-section"]}>
-        <DemoPureStates/>
-      </div>
-
-      <div className={custom["docs-section"]}>
-        <DemoButtons/>
-      </div>
-
-      <div className={custom["docs-section"]}>
-        <h6 className={custom["docs-header"]}>
-          Demo Code Splitting <Link to="/splitting">Load Here</Link>
-        </h6>
-
-        {children}
-      </div>
+export default () =>
+  <div className={custom.container}>
+    {/*<% if (pwa) { %>*/}
+    <Notifications />
+    {/*<% } %>*/}
+
+    <section className={custom.header}>
+      <h2 className={skeleton.title}>
+        Hello from {" "}
+        <a href="https://github.com/electrode-io">{"Electrode"} <img src={electrodePng} /></a>
+      </h2>
+    </section>
+
+    <div className={custom["docs-section"]}>
+      <DemoStates />
     </div>
-  );
-};
 
-Home.propTypes = {
-  children: PropTypes.node
-};
+    <div className={custom["docs-section"]}>
+      <DemoPureStates />
+    </div>
 
-export default Home;
+    <div className={custom["docs-section"]}>
+      <DemoButtons />
+    </div>
+  </div>;
diff --git a/packages/generator-electrode/generators/app/templates/src/client/routes.jsx b/packages/generator-electrode/generators/app/templates/src/client/routes.jsx
@@ -1,14 +1,5 @@
+import React from "react";
+import { Route } from "react-router";
 import Home from "./components/home";
 
-export const routes = {
-  path: "/",
-  component: Home,
-  childRoutes: [{
-    path: "splitting",
-    getComponent(nextState, callback) {
-      import(/* webpackChunkName: "splitting" */ "./components/demo-code-splitting").then(module => {
-        callback(null, module.default);
-      });
-    }
-  }]
-};
+export const routes = <Route path="/" component={Home} />;