Merge pull request #134 from RhoInc/dev-v2.5.0

Safety Histogram v2.5.0

.babelrc

@@ -1,3 +1,3 @@
 {
-    "presets": ["env"]
+    "presets": ["@babel/preset-env"]
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "safety-histogram",
   "description": "Histogram showing distribution of lab measures, vital signs and other related measures in clinical trials.",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "author": "Rho, Inc.",
   "license": "MIT",
   "homepage": "https://github.com/rhoinc/safety-histogram#readme",
@@ -30,18 +30,23 @@
     "bundle": "rollup -c",
     "check-settings-schema": "node ./scripts/check-settings-schema.js",
     "format": "npm run format-src && npm run format-bundle",
-    "format-src": "prettier --print-width=100 --tab-width=4 --single-quote --write \"./src/**/*.js\"",
+    "format-src": "prettier --print-width=100 --tab-width=4 --single-quote --write \"./src/**/!(*styles).js\"",
     "format-bundle": "prettier --print-width=100 --tab-width=4 --single-quote --write ./safetyHistogram.js",
+    "test": "node ./test/shapiro-wilk-normality-test/generate-results.js && node ./test/kolmogorov-smirnov-two-sample-test/generate-results.js",
     "test-page": "start chrome ./test-page/index.html && start firefox ./test-page/index.html && start iexplore file://%CD%/test-page/index.html",
     "watch": "rollup -c -w"
   },
   "devDependencies": {
-    "babel-plugin-external-helpers": "^6.22.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-register": "^6.26.0",
-    "prettier": "^1.18.2",
-    "rollup": "^0.66.6",
-    "rollup-plugin-babel": "^3.0.7",
+    "@babel/core": "^7.4.5",
+    "@babel/plugin-external-helpers": "^7.2.0",
+    "@babel/preset-env": "^7.4.5",
+    "@babel/register": "^7.7.0",
+    "csv-parse": "^4.8.2",
+    "csv-writer": "^1.5.0",
+    "node-fetch": "^2.6.0",
+    "prettier": "^1.19.1",
+    "rollup": "^1.27.1",
+    "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-json": "^4.0.0"
   },
   "repository": {
@@ -50,5 +55,8 @@
   },
   "bugs": {
     "url": "https://github.com/RhoInc/safety-histogram/issues"
+  },
+  "optionalDependencies": {
+    "jerzy": "^0.2.1"
   }
-}
+}

rollup.config.js

@@ -1,9 +1,9 @@
-import json from 'rollup-plugin-json';
 import babel from 'rollup-plugin-babel';
+import json from 'rollup-plugin-json';
 
-var pkg = require('./package.json');
+const pkg = require('./package.json');
 
-module.exports = {
+export default {
     input: pkg.module,
     output: {
         name: pkg.name
@@ -22,24 +22,24 @@ module.exports = {
         },
     },
     external: (function() {
-        var dependencies = pkg.dependencies;
+        const dependencies = Object.keys(pkg.dependencies)
+            .filter(dependency => dependency !== 'jerzy');
 
-        return Object.keys(dependencies);
+        return dependencies;
     }()),
     plugins: [
-        json({
-            include: ['settings-schema.json']
-        }),
         babel({
             exclude: 'node_modules/**',
             presets: [
-                [ 'env', {modules: false} ]
-            ],
-            plugins: [
-                'external-helpers'
+                [ '@babel/preset-env' ]
             ],
+            //plugins: [
+            //    '@babel/plugin-external-helpers'
+            //],
             babelrc: false
         }),
+        json({
+            include: ['settings-schema.json']
+        }),
     ]
 };
-