Update core, pass clientName to client

Author: derrickreimer

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.0
+
+- Update core to fix body serialization bug.
+- Pass along `clientName` with form submission.
+
 ## 1.1.0
 
 - Accept `site` + `form` combo (in lieu of `id`) for identifying forms.

package-lock.json

@@ -45,7 +45,7 @@
     ]
   },
   "dependencies": {
-    "@statickit/core": "^1.4.0",
+    "@statickit/core": "^1.5.0",
     "hyperscript": "^2.0.2"
   },
   "devDependencies": {
@@ -61,6 +61,7 @@
     "rollup": "1.17.0",
     "rollup-plugin-babel": "4.3.3",
     "rollup-plugin-commonjs": "10.0.1",
+    "rollup-plugin-json": "4.0.0",
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-terser": "5.1.1",
     "sort-package-json": "1.22.1"

package.json

@@ -912,9 +912,11 @@ var statickit = (function () {
   	return to;
   };
 
+  var version = "1.5.0";
+
   var serializeBody = function serializeBody(data) {
     if (data instanceof FormData) return data;
-    JSON.stringify(data);
+    return JSON.stringify(data);
   };
 
   var submissionUrl = function submissionUrl(props) {
@@ -929,6 +931,13 @@ var statickit = (function () {
       return "".concat(endpoint, "/j/forms/").concat(id, "/submissions");
     }
   };
+
+  var clientHeader = function clientHeader(_ref) {
+    var clientName = _ref.clientName;
+    var label = "@statickit/core@".concat(version);
+    if (!clientName) return label;
+    return "".concat(clientName, " ").concat(label);
+  };
   /**
    * The client constructor.
    */
@@ -991,13 +1000,14 @@ var statickit = (function () {
     var request = {
       method: 'POST',
       mode: 'cors',
-      body: serializeBody(data)
+      body: serializeBody(data),
+      headers: {
+        'StaticKit-Client': clientHeader(props)
+      }
     };
 
     if (!(data instanceof FormData)) {
-      request.headers = {
-        'Content-Type': 'application/json'
-      };
+      request.headers['Content-Type'] = 'application/json';
     }
 
     return fetchImpl(url, request).then(function (response) {
@@ -2459,12 +2469,6 @@ var statickit = (function () {
   }
   });
 
-  var toCamel = function toCamel(s) {
-    return s.replace(/([-_][a-z])/gi, function ($1) {
-      return $1.toUpperCase().replace('-', '').replace('_', '');
-    });
-  };
-
   /*
   object-assign
   (c) Sindre Sorhus
@@ -2554,6 +2558,14 @@ var statickit = (function () {
   	return to;
   };
 
+  var toCamel = function toCamel(s) {
+    return s.replace(/([-_][a-z])/gi, function ($1) {
+      return $1.toUpperCase().replace('-', '').replace('_', '');
+    });
+  };
+
+  var version$1 = "1.1.0";
+
   var onSuccess = function onSuccess(config, _resp) {
     var h = config.h,
         form = config.form;
@@ -2637,6 +2649,7 @@ var statickit = (function () {
       site: site,
       form: key,
       endpoint: endpoint,
+      clientName: "@statickit/html@".concat(version$1),
       data: formData
     }).then(function (result) {
       if (result.response.status == 200) {

public/statickit.js

@@ -2,6 +2,7 @@ import babel from 'rollup-plugin-babel';
 import commonjs from 'rollup-plugin-commonjs';
 import nodeResolve from 'rollup-plugin-node-resolve';
 import { terser } from 'rollup-plugin-terser';
+import json from 'rollup-plugin-json';
 
 const unbundledPlugins = [
   nodeResolve({
@@ -10,15 +11,17 @@ const unbundledPlugins = [
   commonjs(),
   babel({
     exclude: 'node_modules/**'
-  })
+  }),
+  json()
 ];
 
 const bundlePlugins = [
   nodeResolve(),
   commonjs(),
   babel({
     exclude: 'node_modules/**'
-  })
+  }),
+  json()
 ];
 
 export default [
@@ -46,7 +49,6 @@ export default [
     plugins: unbundledPlugins,
     output: {
       format: 'cjs',
-      name: 'statickit',
       file: __dirname + '/dist/statickit.cjs.js'
     }
   },
@@ -56,7 +58,6 @@ export default [
     plugins: unbundledPlugins,
     output: {
       format: 'esm',
-      name: 'statickit',
       file: __dirname + '/dist/statickit.esm.js'
     }
   }

public/statickit.min.js

@@ -1,6 +1,7 @@
 import h from 'hyperscript';
-import { toCamel } from './utils';
 import objectAssign from 'object-assign';
+import { toCamel } from './utils';
+import { version } from '../package.json';
 
 const onSuccess = (config, _resp) => {
   const { h, form } = config;
@@ -94,6 +95,7 @@ const submit = config => {
       site: site,
       form: key,
       endpoint: endpoint,
+      clientName: `@statickit/html@${version}`,
       data: formData
     })
     .then(result => {

rollup.config.js

@@ -1,4 +1,5 @@
 import sk from '../src';
+import { version } from '../package.json';
 
 const successClient = (data, opts) => ({
   submitForm: props => {
@@ -97,6 +98,7 @@ it('calls the success callback', () => {
       expect(props.id).toBe('xxx');
       expect(props.site).toBe('yyy');
       expect(props.form).toBe('zzz');
+      expect(props.clientName).toBe(`@statickit/html@${version}`);
     }
   });