[RFR] Fix webpack build

djhi · djhi · commit d711c81ad0fa · 2018-01-11T17:11:29.000+01:00
-  [x] One target for node
- [x] Another for the browser
diff --git a/example/index.html b/example/index.html
@@ -1,11 +1,9 @@
 <!doctype html>
 <html lang="en">
-    <head>
-        <meta charset="UTF-8">
-    </head>
+    <head></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 +33,29 @@
                     ],
                 };
 
-                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 = GraphQLClientServer({
+                    data,
+                    url: 'http://localhost:3000/graphql'
                 });
+
+                server.start();
+            });
+            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");
+                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.GraphQLClientServer = 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,13 +18,16 @@ if (process.env.NODE_ENV === 'production') {
             'process.env.NODE_ENV': JSON.stringify('production'),
         })
     );
-    outputFile = libraryName + '.min.js';
+    outputFile = libraryName + '.[name].min.js';
 } else {
-    outputFile = libraryName + '.js';
+    outputFile = libraryName + '.[name].js';
 }
 
 const config = {
-    entry: __dirname + '/src/index.js',
+    entry: {
+        node: __dirname + '/src/node.js',
+        client: __dirname + '/src/client.js',
+    },
     devtool: 'source-map',
     output: {
         path: __dirname + '/lib',

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