Fix binary

djhi · djhi · commit 54fde96e15d2 · 2018-01-11T17:31:19.000+01:00
diff --git a/bin/json-graphql-server.js b/bin/json-graphql-server.js
@@ -3,20 +3,19 @@ require('reify');
 const path = require('path');
 const express = require('express');
 const cors = require('cors');
-const JsonGraphqlServer = require('../src/');
+const JsonGraphqlServer = require('../lib/json-graphql-server.node.min').default;
 
-// 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));
-var PORT = 3000;
-var app = express();
+const dataFilePath = process.argv.length > 2 ? process.argv[2] : './data.json';
+const data = require(path.join(process.cwd(), dataFilePath));
+const PORT = 3000;
+const app = express();
 
 app.use(cors());
-app.use('/', JsonGraphqlServer.jsonGraphqlExpress(data));
+app.use('/', JsonGraphqlServer(data));
 app.listen(PORT);
-var msg = `GraphQL server running with your data at http://localhost:${PORT}/`;
+const msg = `GraphQL server running with your data at http://localhost:${PORT}/`;
 console.log(msg); // eslint-disable-line no-console
+
+process.on('unhandledRejection', (reason, p) => {
+    console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
diff --git a/example/index.html b/example/index.html
@@ -1,6 +1,8 @@
 <!doctype html>
 <html lang="en">
-    <head></head>
+    <head>
+        <meta charset="utf-8" />
+    </head>
     <body>
         <button id="button">Load posts</button>
         <script src="../lib/json-graphql-server.client.min.js"></script>
@@ -42,7 +44,6 @@
             });
             window.document.getElementById('button').addEventListener('click', function () {            
                 const xhr = new XMLHttpRequest();
-                xhr.responseType = 'json';
                 xhr.open("POST", "http://localhost:3000/graphql", true);
                 xhr.setRequestHeader("Content-Type", "application/json");
                 xhr.setRequestHeader("Accept", "application/json");
diff --git a/webpack.config.js b/webpack.config.js
@@ -18,24 +18,13 @@ if (process.env.NODE_ENV === 'production') {
             'process.env.NODE_ENV': JSON.stringify('production'),
         })
     );
-    outputFile = libraryName + '.[name].min.js';
+    outputFile = target => `${libraryName}.${target}.min.js`;
 } else {
-    outputFile = libraryName + '.[name].js';
+    outputFile = target => `${libraryName}.${target}.js`;
 }
 
-const config = {
-    entry: {
-        node: __dirname + '/src/node.js',
-        client: __dirname + '/src/client.js',
-    },
+const defaultConfig = {
     devtool: 'source-map',
-    output: {
-        path: __dirname + '/lib',
-        filename: outputFile,
-        library: libraryName,
-        libraryTarget: 'umd',
-        umdNamedDefine: true,
-    },
     module: {
         rules: [
             {
@@ -52,4 +41,28 @@ const config = {
     plugins,
 };
 
-module.exports = config;
+const serverConfig = Object.assign({}, defaultConfig, {
+    target: 'node',
+    entry: __dirname + '/src/node.js',
+    output: {
+        path: path.resolve(__dirname, 'lib'),
+        filename: outputFile('node'),
+        library: libraryName,
+        libraryTarget: 'umd',
+        umdNamedDefine: true,
+    }
+});
+
+const clientConfig = Object.assign({}, defaultConfig, {
+    target: 'web',
+    entry: __dirname + '/src/client.js',
+    output: {
+        path: path.resolve(__dirname, 'lib'),
+        filename: outputFile('client'),
+        library: libraryName,
+        libraryTarget: 'umd',
+        umdNamedDefine: true,
+    }
+});
+
+module.exports = [serverConfig, clientConfig];
