remove webpack build

Enable a build that is exclusively babel-based, to eliminate some of
the complexity of building leo-core.

rename leo.js bin to cli.js and graphql.js to api.js to more closely
align with purpose.

Author: ChristopherBiscardi

packages/leo-core/.babelrc

@@ -0,0 +1,14 @@
+{
+  presets: ["react", "es2015", "stage-0"],
+  plugins: [
+      "transform-runtime",
+      ["module-resolver", {
+        "root": ["./src"]
+      }]
+  ],
+  env: {
+    "development": {
+      "sourceMaps": "inline"
+    }
+  }
+}

packages/leo-core/Makefile

@@ -6,6 +6,6 @@ help:
 
 dist: ## build everything for production
 	rm -rf ./build
-	../../node_modules/.bin/webpack -d
+	npm run build-leo-cli
 	./scripts/prepend-env.sh
 	npm run build-runtime-assets

packages/leo-core/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@sa-labs/leo-core",
   "version": "0.7.0",
-  "description": "The Declarative static site generator. Core module.",
+  "description": "The modular static site generator. Core module.",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build-runtime-assets": "babel --presets react,es2015 runtime-assets --out-dir build/",
+    "build-leo-cli": "babel src --out-dir build/",
+    "build-runtime-assets": "babel runtime-assets --out-dir build/",
     "dist": "make dist"
   },
   "repository": {
@@ -26,7 +27,7 @@
   },
   "homepage": "https://github.com/superawesomelabs/leo#readme",
   "bin": {
-    "leo": "build/leo.js"
+    "leo": "build/cli.js"
   },
   "peerDependencies": {
     "@sa-labs/graphql-directory-api": "file:../graphql-directory-api"
@@ -63,11 +64,13 @@
     "react": "^15.2.1",
     "react-document-title": "^2.0.2",
     "react-dom": "^15.2.1",
-    "react-router": "^2.3.0",
     "serialize-javascript": "^1.1.2",
     "superagent": "^2.1.0",
-    "webpack": "^2.2.0-rc.1",
+    "webpack": "^2.2.1",
     "webpack-require": "0.0.16",
     "xmlhttprequest": "^1.8.0"
+  },
+  "devDependencies": {
+    "babel-plugin-module-resolver": "^2.5.0"
   }
 }

packages/leo-core/runtime-assets/routes.js

@@ -1,31 +1 @@
-import React, { Component } from "react";
-import { Route, IndexRoute } from "react-router";
-
-class NoMatch extends Component {
-  render() {
-    return <div>404</div>;
-  }
-}
-
-class App extends Component {
-  render() {
-    return <div>{this.props.children}</div>;
-  }
-}
-class Home extends Component {
-  render() {
-    return (
-      <section>
-        <h1>Welcome to LEO</h1>
-        <p>Write a routes.js file to get started</p>
-      </section>
-    );
-  }
-}
-
-export default (
-  <Route path="/" component={App}>
-    <IndexRoute component={Home} />
-    <Route path="*" component={NoMatch} />
-  </Route>
-)
+export default "welcome to LEO"

packages/leo-core/scripts/prepend-env.sh

@@ -1,4 +1,4 @@
-ed -s ./build/leo.js << 'EOF'
+ed -s ./build/cli.js << 'EOF'
 0a
 #! /usr/bin/env node
 .

packages/leo-core/src/graphql.js renamed to packages/leo-core/src/api.js

@@ -1,9 +1,9 @@
 var program = require('commander');
-var graphql = require('./src/graphql').default;
-var schema = require('./src/schema').default;
-var develop = require('./src/develop').default;
-var build = require('./src/build').default;
-var db = require('./src/db').default;
+var api = require('./api').default;
+var schema = require('./schema').default;
+var develop = require('./develop').default;
+var build = require('./build').default;
+var db = require('./db').default;
 
 program
   .version('0.0.1');
@@ -22,10 +22,10 @@ program
   .action(build);
 
 program
-  .command('graphql')
-  .alias('g')
+  .command('api')
+  .alias('a')
   .description('Test the graphql server for use with tools')
-  .action(graphql);
+  .action(api);
 
 program
   .command('schema')

packages/leo-core/index.js renamed to packages/leo-core/src/cli.js

@@ -9,11 +9,6 @@ import { genDatabase } from "@sa-labs/graphql-directory-api";
 import config from "./webpack.config.develop";
 import enablePlugins from "utils/enable-plugins";
 import loadLeorc from "utils/load-leorc";
-import graphql, {
-  GraphQLSchema,
-  GraphQLObjectType,
-  GraphQLNonNull
-} from "graphql/type";
 
 export default () => {
   loadLeorc((err, conf) => {
@@ -55,19 +50,18 @@ export default () => {
         const configWithUrlsAndPlugins = Object
           .entries(configWithUrls)
           .map(([ key, wpConfig ]) => {
-            //                                               console.log(key, wpConfig);
             return enablePlugins({ bundleType: key, config: wpConfig, conf });
           });
-        //      console.log('config', configWithUrlsAndPlugins);
         debug("enabled plugins");
         let compiler;
         try {
           compiler = webpack(configWithUrlsAndPlugins);
         } catch (e) {
-          console.log("webpack error");
+          debug("webpack error");
           console.log(e.message);
           throw e;
         }
+        debug("running webpack");
         compiler.run((err, stats) => {
           debug("ran client and static webpack builds");
           if (err) {
@@ -76,12 +70,12 @@ export default () => {
             return console.error(chalk.red(err));
           }
           const jsonStats = stats.toJson();
-          if (jsonStats.errors.length > 0) {
+          if (stats.hasErrors()) {
             //soft failure
             debug("soft failure");
             jsonStats.errors.forEach(e => console.error(chalk.red(e)));
           }
-          if (jsonStats.warnings.length > 0) {
+          if (stats.hasWarnings()) {
             debug("softer failure");
             jsonStats.warnings.forEach(
               warning => console.warn(chalk.yellow(warning))

packages/leo-core/src/develop.js

@@ -25,6 +25,7 @@ function writeSchemaFiles(schema, shouldLog) {
 
   // Save JSON of full schema introspection for Babel Relay Plugin to use
   (async () => {
+    try {
     debug("resolving schema");
     var result = await graphql(schema, introspectionQuery);
     if (result.errors) {
@@ -39,6 +40,9 @@ function writeSchemaFiles(schema, shouldLog) {
       );
       shouldLog ? console.log("wrote `./dist/api/schema.json`") : null;
     }
+  } catch (e) {
+    console.warn(e);
+  }
   })();
 
   // Save user readable type system shorthand of schema

packages/leo-core/src/schema.js

@@ -127,6 +127,7 @@ export default ({ conf, data, urls }) => {
     },
     client: {
       entry: { client: clientEntry },
+      devtool: "cheap-eval-source-map",
       output: {
         // chunkhash can't be used in hmr
         filename: "js/client.js",