Merge pull request #10 from marmelab/cli

[RFR] Make cli work

Author: fzaninotto

Makefile

@@ -13,7 +13,7 @@ clean: ## Clean up the lib folder for building
 	@rm -rf lib
 
 build: clean ## Compile ES6 files to JS
-	NODE_ENV=development ./node_modules/.bin/rollup -c
+	./node_modules/.bin/webpack
 
 watch: ## continuously compile ES6 files to JS
 	NODE_ENV=development ./node_modules/.bin/rollup -c --watch

bin/index.js bin/json-graphql-server.jsbin/index.js renamed to bin/json-graphql-server.js

@@ -1,7 +1,13 @@
 #!/usr/bin/env node
+
 var path = require('path');
-var JsonGraphqlServer = require('./../lib/');
 var express = require('express');
+var JsonGraphqlServer = require('../lib/');
+
+// fixme the build fails without those
+global.window = false;
+global.document = false;
+global.navigator = false;
 
 var dataFilePath = process.argv.length > 2 ? process.argv[2] : './data.json';
 var data = require(path.join(process.cwd(), dataFilePath));

package.json

@@ -1,12 +1,16 @@
 {
   "name": "json-graphql-server",
   "version": "1.0.0",
-  "main": "index.js",
+  "main": "lib/index",
   "repository": "[email protected]:marmelab/json-graphql-server.git",
   "authors": [
     "François Zaninotto",
     "Gildas Garcia"
   ],
+  "files": [
+    "*.md",
+    "lib"
+  ],
   "license": "MIT",
   "scripts": {
     "build": "make build",
@@ -30,6 +34,8 @@
     "babel-core": "~6.25.0",
     "babel-eslint": "~7.2.3",
     "babel-jest": "~20.0.3",
+    "babel-loader": "^7.1.1",
+    "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-external-helpers": "~6.22.0",
     "babel-preset-es2015": "~6.24.1",
     "babel-preset-stage-0": "~6.24.1",
@@ -50,7 +56,8 @@
     "rollup-plugin-node-builtins": "~2.1.2",
     "rollup-plugin-node-globals": "~1.1.0",
     "rollup-plugin-node-resolve": "~3.0.0",
-    "rollup-watch": "~4.0.0"
+    "rollup-watch": "~4.0.0",
+    "webpack": "~3.2.0"
   },
   "dependencies": {
     "apollo-client": "~1.2.0",
@@ -65,6 +72,6 @@
     "lodash.merge": "~4.6.0"
   },
   "bin": {
-    "json-graphql-server": "bin/index.js"
+    "json-graphql-server": "bin/json-graphql-server.js"
   }
 }

webpack.config.js

@@ -0,0 +1,19 @@
+const path = require('path');
+
+module.exports = {
+    entry: './src/index.js',
+    output: {
+        path: path.join(__dirname, 'lib'),
+        filename: 'index.js',
+        libraryTarget: 'umd',
+    },
+    module: {
+        loaders: [
+            {
+                test: /\.js$/,
+                exclude: /node_modules/,
+                loader: 'babel-loader',
+            },
+        ],
+    },
+};