Improve rollup config

Author: Ivan Zotov

.eslintrc.json

@@ -1,21 +1,20 @@
 {
   "env": {
-      "es6": true,
-      "node": true
+    "es6": true,
+    "node": true
   },
   "extends": "eslint:recommended",
   "globals": {
-      "Atomics": "readonly",
-      "SharedArrayBuffer": "readonly"
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly"
   },
   "parser": "babel-eslint",
   "parserOptions": {
-      "ecmaFeatures": {
-          "jsx": true
-      },
-      "ecmaVersion": 2018,
-      "sourceType": "module"
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "ecmaVersion": 2018,
+    "sourceType": "module"
   },
-  "rules": {
-  }
+  "rules": {}
 }

.gitignore

@@ -1,4 +1,6 @@
 .DS_Store
+es/
+lib/
 dist/
 node_modules/
 coverage/

babel.config.js

@@ -1,15 +1,13 @@
 module.exports = {
   presets: [
     [
-      "@babel/preset-env",
+      '@babel/preset-env',
       {
         targets: {
-          node: "current",
+          node: 'current',
         },
       },
     ],
   ],
-  plugins: [
-    "@babel/plugin-proposal-class-properties",
-  ],
-};
+  plugins: ['@babel/plugin-proposal-class-properties'],
+};

flow-typed/npm/@railsmob/events_v0.x.x.js.flow

@@ -5,13 +5,6 @@
  */
 
 declare module "src/Events" {
-  /**
- * @typedef {(args: any) => any} ListenerFn
- * @typedef {{
-id: string,
-fn: ListenerFn,...
-}} Listener
- */
   declare export default class Events {
     static SEP: string;
     static ANY: string;
@@ -24,11 +17,18 @@ fn: ListenerFn,...
 
     /**
  * @type {{
-[name: string]: Array<Listener>,...
+[name: string]: Array<{
+id: string,
+fn: Function,...
+}>,...
 }}
  */
     listeners: {
-      [name: string]: Array<Listener>,
+      [name: string]: Array<{
+        id: string,
+        fn: Function,
+        ...
+      }>,
       ...
     };
     id: (name: string, id: string) => string;
@@ -37,21 +37,21 @@ fn: ListenerFn,...
 
     /**
      * @param {string} eventId
-     * @param {ListenerFn} fn
+     * @param {Function} fn
      */
-    on: (eventId: string, fn: (args: any) => any) => void;
+    on: (eventId: string, fn: Function) => void;
 
     /**
      * @param {string} eventId
-     * @param {ListenerFn} fn
+     * @param {Function} fn
      */
-    once: (eventId: string, fn: (args: any) => any) => void;
+    once: (eventId: string, fn: Function) => void;
 
     /**
      * @param {string} eventId
-     * @param {ListenerFn} fn
+     * @param {Function} fn
      */
-    off: (eventId: string, fn: (args: any) => any) => void;
+    off: (eventId: string, fn: Function) => void;
 
     /**
      * @param {string} eventId
@@ -64,12 +64,6 @@ fn: ListenerFn,...
      */
     parse: (eventId: string) => string[];
   }
-  declare export type ListenerFn = (args: any) => any;
-  declare export type Listener = {
-    id: string,
-    fn: (args: any) => any,
-    ...
-  };
 }
 
 declare module "index" {

package.json

@@ -1,12 +1,14 @@
 {
   "name": "@railsmob/events",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Simple and well-tested events",
-  "main": "dist/index.js",
+  "main": "lib/index.js",
+  "unpkg": "dist/index.js",
+  "module": "es/index.js",
+  "types": "./typings/index.d.ts",
   "author": "Ivan Zotov <[email protected]> (http://ivanzotov.com/)",
   "license": "MIT",
   "private": false,
-  "types": "./typings/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/railsmob/events.git"
@@ -23,10 +25,12 @@
     "build": "rollup -c",
     "tsc": "tsc -p .",
     "flow": "flow",
+    "flowgen": "flowgen typings/index.d.ts -o flow-typed/npm/@railsmob/events_v0.x.x.js.flow",
     "debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
-    "format": "prettier --write '__tests__/**/*.js' 'src/**/*.js' 'index.js'"
+    "format": "prettier --write \"{__tests__,src,typings}/**/*.{js,ts}\" \"./*.{js,json}\""
   },
   "files": [
+    "src",
     "dist",
     "typings",
     "flow-typed"
@@ -39,10 +43,12 @@
     "babel-jest": "^24.9.0",
     "eslint": "^6.7.1",
     "flow-bin": "^0.113.0",
+    "flowgen": "^1.10.0",
     "jest": "^24.9.0",
     "prettier": "^1.19.1",
     "rollup": "^1.27.5",
     "rollup-plugin-babel": "^4.3.3",
+    "rollup-plugin-terser": "^5.1.3",
     "typescript": "^3.7.3"
   },
   "jest": {

rollup.config.js

@@ -1,14 +1,56 @@
 import babel from 'rollup-plugin-babel';
+import { terser } from 'rollup-plugin-terser';
 
-module.exports = {
-  input: 'index.js',
-  output: {
-    file: 'dist/index.js',
-    format: 'cjs',
-  },
-  plugins: [
-    babel({
-      exclude: 'node_modules/**',
-    }),
-  ],
-};
+export default [
+  // CommonJS
+  {
+    input: 'index.js',
+    output: {
+      file: 'lib/index.js',
+      format: 'cjs',
+      indent: false,
+    },
+    plugins: [babel()],
+  },
+  // ES
+  {
+    input: 'index.js',
+    output: {
+      file: 'es/index.js',
+      format: 'es',
+      indent: false,
+    },
+    plugins: [babel()],
+  },
+  // UMD Dev
+  {
+    input: 'index.js',
+    output: {
+      file: 'dist/index.js',
+      format: 'umd',
+      name: 'RailsmobEvents',
+      indent: false,
+    },
+    plugins: [
+      babel({
+        exclude: 'node_modules/**',
+      }),
+    ],
+  },
+  // UMD Prod
+  {
+    input: 'index.js',
+    output: {
+      file: 'dist/index.min.js',
+      format: 'umd',
+      name: 'RailsmobEvents',
+      indent: false,
+    },
+    plugins: [
+      babel({
+        exclude: 'node_modules/**',
+      }),
+      terser(),
+    ],
+  },
+];

src/Events.js

@@ -1,8 +1,3 @@
-/**
- * @typedef {(args: any) => any} ListenerFn
- * @typedef {{ id: string, fn: ListenerFn }} Listener
- */
-
 export default class Events {
   static SEP = ':';
   static ANY = 'any';
@@ -11,10 +6,10 @@ export default class Events {
    * @param {string} name
    * @param {string} id
    */
-  static id = (name, id) => `${name}${Events.SEP}${id}`;
+  static id = (name, id) => name + Events.SEP + id;
 
   /**
-   * @type {{ [name: string]: Array<Listener> }}
+   * @type {{ [name: string]: Array<{ id: string, fn: Function }> }}
    */
   listeners = {};
 
@@ -25,7 +20,7 @@ export default class Events {
 
   /**
    * @param {string} eventId
-   * @param {ListenerFn} fn
+   * @param {Function} fn
    */
   on = (eventId, fn) => {
     const [name, id] = this.parse(eventId);
@@ -35,11 +30,11 @@ export default class Events {
 
   /**
    * @param {string} eventId
-   * @param {ListenerFn} fn
+   * @param {Function} fn
    */
   once = (eventId, fn) => {
     /**
-     * @type {ListenerFn}
+     * @type {(args: any) => any}
      */
     const handler = args => {
       fn(args);
@@ -50,7 +45,7 @@ export default class Events {
 
   /**
    * @param {string} eventId
-   * @param {ListenerFn} fn
+   * @param {Function} fn
    */
   off = (eventId, fn) => {
     const [name, id] = this.parse(eventId);

tsconfig.json

@@ -8,8 +8,5 @@
     "declaration": true,
     "emitDeclarationOnly": true
   },
-  "files": [
-    "./index.js",
-    "./src/Events.js"
-  ]
-}
+  "files": ["./index.js", "./src/Events.js"]
+}