From 88fc54644e25e7fb1f44ce7cedd90d55f1f19443 Mon Sep 17 00:00:00 2001
From: Peter Mikitsh <peter.mikitsh@gmail.com>
Date: Sun, 9 Jun 2019 21:20:36 -0700
Subject: [PATCH 1/2] add esmodule build

---
 .babelrc        | 11 -----------
 .gitignore      |  1 +
 babel.config.js | 19 +++++++++++++++++++
 package.json    |  8 +++++++-
 4 files changed, 27 insertions(+), 12 deletions(-)
 delete mode 100755 .babelrc
 create mode 100755 babel.config.js

diff --git a/.babelrc b/.babelrc
deleted file mode 100755
index 37f2890..0000000
--- a/.babelrc
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "plugins": [
-    "@babel/plugin-transform-runtime"
-  ],
-  "presets": [
-    [
-      "@babel/preset-env",
-      {loose: true}
-    ]
-  ]
-}
diff --git a/.gitignore b/.gitignore
index 167ecd9..9cd9f26 100755
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ node_modules
 .lock-wscript
 
 # The compiled/babelified modules
+esm/
 lib/
 
 # Editors
diff --git a/babel.config.js b/babel.config.js
new file mode 100755
index 0000000..346bc8d
--- /dev/null
+++ b/babel.config.js
@@ -0,0 +1,19 @@
+module.exports = function (api) {
+  api.cache(true);
+
+  return {
+    "plugins": [
+      "@babel/plugin-transform-runtime"
+    ],
+    "presets": [
+      [
+        "@babel/preset-env",
+        {
+          modules: process.env.CJS ? "cjs" : false,
+          loose: true
+        }
+      ]
+    ]
+  };
+
+}
diff --git a/package.json b/package.json
index 118a2a0..94e192e 100755
--- a/package.json
+++ b/package.json
@@ -4,6 +4,8 @@
   "version": "3.0.0",
   "homepage": "https://github.com/feathersjs/feathers-redux",
   "main": "lib/",
+  "module": "esm/",
+  "sideEffects": false,
   "keywords": [
     "feathers",
     "feathers-plugin"
@@ -32,7 +34,10 @@
     "release:minor": "npm version minor && npm publish",
     "release:major": "npm version major && npm publish",
     "changelog": "github_changelog_generator && git add CHANGELOG.md && git commit -am \"Updating changelog\"",
-    "compile": "shx rm -rf lib/ && babel -d lib/ src/",
+    "precompile": "shx rm -rf lib/ esm/",
+    "compile": "npm run compile:cjs && npm run compile:esm",
+    "compile:cjs": "CJS=1 babel -d lib/ src/",
+    "compile:esm": "babel -d esm/ src/",
     "watch": "babel --watch -d lib/ src/",
     "lint": "semistandard src/**/*.js test/**/*.js --fix",
     "mocha": "mocha --opts mocha.opts",
@@ -47,6 +52,7 @@
     ]
   },
   "directories": {
+    "esm": "esm",
     "lib": "lib"
   },
   "peerDependencies": {

From aefae0f4a54eb70d8caf59fe424300d2ec6029d3 Mon Sep 17 00:00:00 2001
From: Peter Mikitsh <peter.mikitsh@gmail.com>
Date: Sun, 9 Jun 2019 21:43:36 -0700
Subject: [PATCH 2/2] Fix unit tests

---
 babel.config.js | 2 +-
 package.json    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index 346bc8d..08e1e54 100755
--- a/babel.config.js
+++ b/babel.config.js
@@ -9,7 +9,7 @@ module.exports = function (api) {
       [
         "@babel/preset-env",
         {
-          modules: process.env.CJS ? "cjs" : false,
+          modules: process.env.ESM ? false : "cjs",
           loose: true
         }
       ]
diff --git a/package.json b/package.json
index 94e192e..6c97fa2 100755
--- a/package.json
+++ b/package.json
@@ -36,8 +36,8 @@
     "changelog": "github_changelog_generator && git add CHANGELOG.md && git commit -am \"Updating changelog\"",
     "precompile": "shx rm -rf lib/ esm/",
     "compile": "npm run compile:cjs && npm run compile:esm",
-    "compile:cjs": "CJS=1 babel -d lib/ src/",
-    "compile:esm": "babel -d esm/ src/",
+    "compile:cjs": "babel -d lib/ src/",
+    "compile:esm": "ESM=1 babel -d esm/ src/",
     "watch": "babel --watch -d lib/ src/",
     "lint": "semistandard src/**/*.js test/**/*.js --fix",
     "mocha": "mocha --opts mocha.opts",