Fix build for all targets

djhi · djhi · commit db9d16003e5c · 2024-04-16T12:06:50.000+02:00
diff --git a/Makefile b/Makefile
@@ -26,3 +26,5 @@ run: ## Launch server with example data
 
 build: ## Build production release
 	@yarn vite build
+	@yarn vite build -c ./vite.config.node.js
+	@yarn vite build -c ./vite.config.umd.js
diff --git a/README.md b/README.md
@@ -448,15 +448,15 @@ Then use the `jsonGraphqlExpress` express middleware:
 
 ```js
 import express from 'express';
-import jsonGraphqlExpress from 'json-graphql-server';
+import jsonGraphqlExpress from 'json-graphql-server/node';
 
 const PORT = 3000;
 const app = express();
 const data = {
     // ... your data
 };
 
-app.use('/graphql', jsonGraphqlExpress.default(data));
+app.use('/graphql', jsonGraphqlExpress(data));
 app.listen(PORT);
 ```
 
@@ -469,7 +469,7 @@ Useful when using XMLHttpRequest directly or libraries such as [axios](https://w
 Add a `script` tag referencing the library:
 
 ```html
-<script src="../lib/json-graphql-server.client.min.js"></script>
+<script src="../dist/json-graphql-server.umd.js"></script>
 ```
 
 It will expose the `JsonGraphqlServer` as a global object:
diff --git a/bin/json-graphql-server.cjs b/bin/json-graphql-server.cjs
@@ -3,7 +3,7 @@ require('reify');
 var path = require('path');
 var express = require('express');
 var cors = require('cors');
-var JsonGraphqlServer = require('../dist/json-graphql-server').default;
+var JsonGraphqlServer = require('../dist/json-graphql-server-node').default;
 
 var dataFilePath = process.argv.length > 2 ? process.argv[2] : './data.json';
 var data = require(path.join(process.cwd(), dataFilePath));
@@ -23,7 +23,7 @@ process.argv.forEach((arg, index) => {
 });
 
 app.use(cors());
-app.use('/', JsonGraphqlServer({ data }).getHandler());
+app.use('/', JsonGraphqlServer(data));
 app.listen(PORT, HOST);
 var msg = `GraphQL server running with your data at http://${HOST}:${PORT}/`;
 console.log(msg); // eslint-disable-line no-console
diff --git a/example/index.html b/example/index.html
@@ -5,7 +5,7 @@
     </head>
     <body>
         <button id="button">Load posts</button>
-        <script src="../lib/json-graphql-server.client.min.js"></script>
+        <script src="../dist/json-graphql-server.umd.cjs"></script>
         <script type="text/javascript">
             window.addEventListener('load', function() {
                 const data = {
diff --git a/package.json b/package.json
@@ -2,12 +2,16 @@
     "name": "json-graphql-server",
     "version": "2.4.1",
     "type": "module",
-    "main": "./dist/json-graphql-server.umd.cjs",
+    "main": "./dist/json-graphql-server.cjs",
     "module": "./dist/json-graphql-server.js",
     "exports": {
         ".": {
             "import": "./dist/json-graphql-server.js",
-            "require": "./dist/json-graphql-server.umd.cjs"
+            "require": "./dist/json-graphql-server.cjs"
+        },
+        "./node": {
+            "import": "./dist/json-graphql-server-node.js",
+            "require": "./dist/json-graphql-server-node.cjs"
         }
     },
     "repository": "git@github.com:marmelab/json-graphql-server.git",
@@ -69,4 +73,4 @@
     "bin": {
         "json-graphql-server": "bin/json-graphql-server.js"
     }
-}
+}
diff --git a/src/handleRequest.js b/src/handleRequest.js
@@ -51,13 +51,11 @@ export default function (data) {
 
         const query = JSON.parse(body);
 
-        return graphql(
+        return graphql({
             schema,
-            query.query,
-            undefined,
-            undefined,
-            query.variables
-        ).then(
+            source: query.query,
+            variableValues: query.variables
+        }).then(
             (result) => ({
                 status: 200,
                 headers: { 'Content-Type': 'application/json' },
diff --git a/vite.config.js b/vite.config.js
@@ -9,8 +9,7 @@ export default defineConfig({
             // Could also be a dictionary or array of multiple entry points
             entry: resolve(__dirname, 'src/client.js'),
             name: 'JsonGraphqlServer',
-            // the proper extensions will be added
-            fileName: 'json-graphql-server',
+            formats: ['es', 'cjs'],
         },
         sourcemap: true,
         minify: process.env.NODE_ENV === 'production',
diff --git a/vite.config.node.js b/vite.config.node.js
@@ -0,0 +1,24 @@
+import { resolve } from 'path';
+import { defineConfig } from 'vite';
+
+import pkg from './package.json';
+
+export default defineConfig({
+    build: {
+        lib: {
+            // Could also be a dictionary or array of multiple entry points
+            entry: resolve(__dirname, 'src/node.js'),
+            name: 'JsonGraphqlServer',
+            formats: ['es', 'cjs'],
+            fileName: 'json-graphql-server-node',
+        },
+        sourcemap: true,
+        minify: process.env.NODE_ENV === 'production',
+        emptyOutDir: false,
+        rollupOptions: {
+            // make sure to externalize deps that shouldn't be bundled
+            // into your library
+            external: Object.keys(pkg.dependencies),
+        },
+    },
+});
diff --git a/vite.config.umd.js b/vite.config.umd.js
@@ -0,0 +1,19 @@
+import { resolve } from 'path';
+import { defineConfig } from 'vite';
+
+import pkg from './package.json';
+
+export default defineConfig({
+    build: {
+        lib: {
+            // Could also be a dictionary or array of multiple entry points
+            entry: resolve(__dirname, 'src/client.js'),
+            name: 'JsonGraphqlServer',
+            formats: ['umd'],
+            fileName: 'json-graphql-server',
+        },
+        sourcemap: true,
+        minify: process.env.NODE_ENV === 'production',
+        emptyOutDir: false
+    },
+});
