Merge pull request #35 from marmelab/fix_build

fzaninotto · web-flow · commit da1fc6acb318 · 2018-01-11T17:38:25.000+01:00
[RFR] Fix webpack build
diff --git a/README.md b/README.md
@@ -419,14 +419,14 @@ Add a `script` tag referencing the library:
 <script src="../lib/json-graphql-server.min.js"></script>
 ```
 
-It will expose the `GraphQLClientServer` as a global object:
+It will expose the `JsonGraphqlServer` as a global object:
 
 ```html
 <script type="text/javascript">
     window.addEventListener('load', function() {
         const data = [...];
 
-        const server = GraphQLClientServer({
+        const server = JsonGraphqlServer({
             data,
             url: 'http://localhost:3000/graphql'
         });
@@ -458,11 +458,11 @@ npm install json-graphql-server
 ```
 
 ```js
-import GraphQLClientServer from 'json-graphql-server';
+import JsonGraphqlServer from 'json-graphql-server';
 
 const data = [...];
 
-const server = GraphQLClientServer({
+const server = JsonGraphqlServer({
     data,
     url: 'http://localhost:3000/graphql'
 });
@@ -489,10 +489,10 @@ xhr.send(body);
 
 ```js
 import fetchMock from 'fetch-mock';
-import GraphQLClientServer from 'json-graphql-server';
+import JsonGraphqlServer from 'json-graphql-server';
 
 const data = [...];
-const server = GraphQLClientServer({ data });
+const server = JsonGraphqlServer({ data });
 
 fetchMock.post('http://localhost:3000/graphql', server.getHandler());
 
diff --git a/bin/json-graphql-server.js b/bin/json-graphql-server.js
@@ -1,22 +1,21 @@
 #!/usr/bin/env node
 require('reify');
-const path = require('path');
-const express = require('express');
-const cors = require('cors');
-const JsonGraphqlServer = require('../src/');
-
-// fixme the build fails without those
-global.window = false;
-global.document = false;
-global.navigator = false;
+var path = require('path');
+var express = require('express');
+var cors = require('cors');
+var JsonGraphqlServer = require('../lib/json-graphql-server.node.min').default;
 
 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();
 
 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}/`;
 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,11 +1,11 @@
 <!doctype html>
 <html lang="en">
     <head>
-        <meta charset="UTF-8">
+        <meta charset="utf-8" />
     </head>
     <body>
         <button id="button">Load posts</button>
-        <script src="../lib/json-graphql-server.min.js"></script>
+        <script src="../lib/json-graphql-server.client.min.js"></script>
         <script type="text/javascript">
             window.addEventListener('load', function() {
                 const data = {
@@ -35,29 +35,28 @@
                     ],
                 };
 
-                try {
-                    const server = GraphQLClientServer({ data, url: "http://localhost:3000/graphql" });
-                    server.start();
-                } catch(error) {
-                    console.error({error});
-                }
-                
-                window.document.getElementById('button').addEventListener('click', function () {            
-                    const xhr = new XMLHttpRequest();
-                    xhr.open("POST", "http://localhost:3000/graphql", true);
-                    xhr.setRequestHeader("Content-Type", "application/json");
-                    xhr.setRequestHeader("Accept", "application/json");
-                    xhr.onerror = function(error) {
-                        console.error(error);
-                    }
-                    xhr.onload = function() {
-                        const result = JSON.parse(xhr.responseText);
-                        console.log('data returned:', result);
-                        alert('Found ' + result.data.allPosts.length + ' posts');
-                    }
-                    const body = JSON.stringify({ query: 'query allPosts { allPosts { id } }' });
-                    xhr.send(body);
+                const server = JsonGraphqlServer({
+                    data,
+                    url: 'http://localhost:3000/graphql'
                 });
+
+                server.start();
+            });
+            window.document.getElementById('button').addEventListener('click', function () {            
+                const xhr = new XMLHttpRequest();
+                xhr.open("POST", "http://localhost:3000/graphql", true);
+                xhr.setRequestHeader("Content-Type", "application/json");
+                xhr.setRequestHeader("Accept", "application/json");
+                xhr.onerror = function(error) {
+                    console.error(error);
+                }
+                xhr.onload = function() {
+                    const result = JSON.parse(xhr.responseText);
+                    console.log('data returned:', result);
+                    alert('Found ' + result.data.allPosts.length + ' posts');
+                }
+                const body = JSON.stringify({ query: 'query allPosts { allPosts { id } }' });
+                xhr.send(body);
             });
         </script>
     </body>
diff --git a/package.json b/package.json
@@ -1,7 +1,8 @@
 {
     "name": "json-graphql-server",
     "version": "1.0.2",
-    "main": "src/index",
+    "main": "lib/json-graphql-server.node.min.js",
+    "browser": "lib/json-graphql-server.client.min.js",
     "repository": "git@github.com:marmelab/json-graphql-server.git",
     "authors": [
         "François Zaninotto",
@@ -62,8 +63,7 @@
         "graphql-type-json": "~0.1.4",
         "inflection": "~1.12.0",
         "lodash.merge": "~4.6.0",
-        "reify": "~0.12.0",
-        "xhr-mock": "2.0.2"
+        "reify": "~0.12.0"
     },
     "bin": {
         "json-graphql-server": "bin/json-graphql-server.js"
diff --git a/src/client.js b/src/client.js
@@ -0,0 +1,7 @@
+import GraphQLClientServer from './graphQLClientServer';
+
+if (typeof window !== 'undefined') {
+    window.JsonGraphqlServer = GraphQLClientServer;
+}
+
+export default GraphQLClientServer;
diff --git a/src/index.js b/src/index.js
diff --git a/src/node.js b/src/node.js
@@ -0,0 +1,3 @@
+import jsonGraphqlExpress from './jsonGraphqlExpress';
+
+export default jsonGraphqlExpress;
diff --git a/webpack.config.js b/webpack.config.js
@@ -18,21 +18,13 @@ if (process.env.NODE_ENV === 'production') {
             'process.env.NODE_ENV': JSON.stringify('production'),
         })
     );
-    outputFile = libraryName + '.min.js';
+    outputFile = target => `${libraryName}.${target}.min.js`;
 } else {
-    outputFile = libraryName + '.js';
+    outputFile = target => `${libraryName}.${target}.js`;
 }
 
-const config = {
-    entry: __dirname + '/src/index.js',
+const defaultConfig = {
     devtool: 'source-map',
-    output: {
-        path: __dirname + '/lib',
-        filename: outputFile,
-        library: libraryName,
-        libraryTarget: 'umd',
-        umdNamedDefine: true,
-    },
     module: {
         rules: [
             {
@@ -49,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];

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import jsonGraphqlExpress from './jsonGraphqlExpress';`
	`2`	`+`
	`3`	`+export default jsonGraphqlExpress;`