fix: this problem

fix #5
yangmingshan · Mar 23, 2019 · 65547df · 65547df
1 parent 8c920e9
commit 65547df
Show file tree

Hide file tree

Showing 12 changed files with 2,853 additions and 1,939 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1 @@
 dist/
-__tests__/
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,11 +1,5 @@
 module.exports = {
   root: true,
-  parserOptions: {
-    sourceType: 'module'
-  },
-  env: {
-    browser: true
-  },
   extends: 'standard',
   rules: {
     'space-before-function-paren': [2, 'never']

diff --git a/README.md b/README.md
@@ -8,6 +8,14 @@ You can install it via [yarn](https://yarnpkg.com) or [npm](https://npmjs.com).
 $ yarn add vue-bus
 $ npm install vue-bus --save
 ```
+And it's available on [jsdelivr](https://cdn.jsdelivr.net/npm/vue-bus/dist/vue-bus.js) or [unpkg](https://unpkg.com/vue-bus/dist/vue-bus.js).
+```html
+<!-- development version -->
+<script src="https://cdn.jsdelivr.net/npm/vue-bus/dist/vue-bus.js"></script>
+
+<!-- production version -->
+<script src="https://cdn.jsdelivr.net/npm/vue-bus/dist/vue-bus.min.js"></script>
+```
 When used with a module system, you must explicitly install the bus via Vue.use():
 ```js
 import Vue from 'vue';

diff --git a/__tests__/index.js b/__tests__/index.js
@@ -1,3 +1,4 @@
+/* global test expect */
 const Vue = require('vue')
 const VueBus = require('../dist/vue-bus.common')
 
@@ -9,12 +10,12 @@ test('Vue.bus', () => {
       return { count: 0 }
     },
     created() {
-      this.$bus.on('add', num => { this.count += num })
-      this.$bus.once('addOnce', num => { this.count += num })
+      Vue.bus.on('add', num => { this.count += num })
+      Vue.bus.once('addOnce', num => { this.count += num })
     },
     methods: {
       clean() {
-        this.$bus.off('add')
+        Vue.bus.off('add')
       }
     }
   })
@@ -88,3 +89,51 @@ test('this.$bus', () => {
   vm2.fireOnce()
   expect(vm1.count).toBe(3)
 })
+
+test('pass bus function as argument', () => {
+  const vm = new Vue({
+    data() {
+      return { count: 0 }
+    },
+    created() {
+      this.listen(this.$bus.on)
+      this.listenOnce(this.$bus.once)
+    },
+    methods: {
+      listen(on) {
+        on('add', num => { this.count += num })
+      },
+      listenOnce(once) {
+        once('addOnce', num => { this.count += num })
+      },
+      clean(off) {
+        off('add')
+      }
+    }
+  })
+
+  const obj = {
+    fire(emit) {
+      emit('add', 1)
+    },
+    fireOnce(emit) {
+      emit('addOnce', 1)
+    }
+  }
+
+  obj.fire(Vue.bus.emit)
+  expect(vm.count).toBe(1)
+
+  obj.fire(Vue.bus.emit)
+  expect(vm.count).toBe(2)
+
+  vm.clean(Vue.bus.off)
+  obj.fire(Vue.bus.emit)
+  expect(vm.count).toBe(2)
+
+  obj.fireOnce(Vue.bus.emit)
+  expect(vm.count).toBe(3)
+
+  obj.fireOnce(Vue.bus.emit)
+  expect(vm.count).toBe(3)
+})
diff --git a/dist/vue-bus.common.js b/dist/vue-bus.common.js
@@ -1,5 +1,5 @@
-/**
- * vue-bus v1.1.0
+/*!
+ * vue-bus v1.2.1
  * https://github.com/yangmingshan/vue-bus
  * @license MIT
  */
@@ -11,27 +11,31 @@ function VueBus(Vue) {
   Object.defineProperties(bus, {
     on: {
       get: function get() {
-        return this.$on
+        return this.$on.bind(this)
       }
     },
     once: {
       get: function get() {
-        return this.$once
+        return this.$once.bind(this)
       }
     },
     off: {
       get: function get() {
-        return this.$off
+        return this.$off.bind(this)
       }
     },
     emit: {
       get: function get() {
-        return this.$emit
+        return this.$emit.bind(this)
       }
     }
   });
 
-  Vue.bus = bus;
+  Object.defineProperty(Vue, 'bus', {
+    get: function get() {
+      return bus
+    }
+  });
 
   Object.defineProperty(Vue.prototype, '$bus', {
     get: function get() {

diff --git a/dist/vue-bus.esm.js b/dist/vue-bus.esm.js
@@ -1,5 +1,5 @@
-/**
- * vue-bus v1.1.0
+/*!
+ * vue-bus v1.2.1
  * https://github.com/yangmingshan/vue-bus
  * @license MIT
  */
@@ -9,27 +9,31 @@ function VueBus(Vue) {
   Object.defineProperties(bus, {
     on: {
       get: function get() {
-        return this.$on
+        return this.$on.bind(this)
       }
     },
     once: {
       get: function get() {
-        return this.$once
+        return this.$once.bind(this)
       }
     },
     off: {
       get: function get() {
-        return this.$off
+        return this.$off.bind(this)
       }
     },
     emit: {
       get: function get() {
-        return this.$emit
+        return this.$emit.bind(this)
       }
     }
   });
 
-  Vue.bus = bus;
+  Object.defineProperty(Vue, 'bus', {
+    get: function get() {
+      return bus
+    }
+  });
 
   Object.defineProperty(Vue.prototype, '$bus', {
     get: function get() {

diff --git a/dist/vue-bus.js b/dist/vue-bus.js
@@ -1,53 +1,57 @@
-/**
- * vue-bus v1.1.0
+/*!
+ * vue-bus v1.2.1
  * https://github.com/yangmingshan/vue-bus
  * @license MIT
  */
 (function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-	typeof define === 'function' && define.amd ? define(factory) :
-	(global.VueBus = factory());
-}(this, (function () { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+  typeof define === 'function' && define.amd ? define(factory) :
+  (global = global || self, global.VueBus = factory());
+}(this, function () { 'use strict';
 
-function VueBus(Vue) {
-  var bus = new Vue();
+  function VueBus(Vue) {
+    var bus = new Vue();
 
-  Object.defineProperties(bus, {
-    on: {
-      get: function get() {
-        return this.$on
-      }
-    },
-    once: {
-      get: function get() {
-        return this.$once
+    Object.defineProperties(bus, {
+      on: {
+        get: function get() {
+          return this.$on.bind(this)
+        }
+      },
+      once: {
+        get: function get() {
+          return this.$once.bind(this)
+        }
+      },
+      off: {
+        get: function get() {
+          return this.$off.bind(this)
+        }
+      },
+      emit: {
+        get: function get() {
+          return this.$emit.bind(this)
+        }
       }
-    },
-    off: {
+    });
+
+    Object.defineProperty(Vue, 'bus', {
       get: function get() {
-        return this.$off
+        return bus
       }
-    },
-    emit: {
+    });
+
+    Object.defineProperty(Vue.prototype, '$bus', {
       get: function get() {
-        return this.$emit
+        return bus
       }
-    }
-  });
-
-  Vue.bus = bus;
-
-  Object.defineProperty(Vue.prototype, '$bus', {
-    get: function get() {
-      return bus
-    }
-  });
-}
+    });
+  }
 
-if (typeof window !== 'undefined' && window.Vue) {
-  window.Vue.use(VueBus);
-}
+  if (typeof window !== 'undefined' && window.Vue) {
+    window.Vue.use(VueBus);
+  }
 
-return VueBus;
+  return VueBus;
 
-})));
+}));
diff --git a/dist/vue-bus.min.js b/dist/vue-bus.min.js
diff --git a/package.json b/package.json
@@ -1,11 +1,19 @@
 {
   "name": "vue-bus",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A event bus for Vue.js",
   "main": "dist/vue-bus.common.js",
   "module": "dist/vue-bus.esm.js",
+  "unpkg": "dist/vue-bus.js",
+  "jsdelivr": "dist/vue-bus.js",
+  "typings": "types/index.d.ts",
+  "files": [
+    "src",
+    "dist/*.js",
+    "types/*.d.ts"
+  ],
   "scripts": {
-    "lint": "eslint src",
+    "lint": "eslint src __tests__",
     "build": "rimraf dist && rollup -c && uglifyjs dist/vue-bus.js -c -m --comments -o dist/vue-bus.min.js",
     "test": "jest && codecov"
   },
@@ -25,24 +33,23 @@
   },
   "homepage": "https://github.com/yangmingshan/vue-bus#readme",
   "devDependencies": {
-    "buble": "^0.18.0",
-    "codecov": "^3.0.0",
-    "eslint": "^4.16.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-node": "^5.2.1",
-    "eslint-plugin-promise": "^3.6.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "jest": "^22.1.4",
-    "rimraf": "^2.6.2",
-    "rollup": "^0.55.0",
-    "rollup-plugin-buble": "^0.18.0",
-    "uglify-js": "^3.3.8",
-    "vue": "^2.5.13"
+    "buble": "^0.19.7",
+    "codecov": "^3.2.0",
+    "eslint": "^5.15.3",
+    "eslint-config-standard": "^12.0.0",
+    "eslint-plugin-import": "^2.16.0",
+    "eslint-plugin-node": "^8.0.1",
+    "eslint-plugin-promise": "^4.0.1",
+    "eslint-plugin-standard": "^4.0.0",
+    "jest": "^24.5.0",
+    "rimraf": "^2.6.3",
+    "rollup": "^1.7.0",
+    "rollup-plugin-buble": "^0.19.6",
+    "uglify-js": "^3.5.1",
+    "vue": "^2.6.10"
   },
   "jest": {
     "coverageDirectory": "./coverage/",
     "collectCoverage": true
-  },
-  "typings": "types/index.d.ts"
+  }
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -1,7 +1,7 @@
 import { version } from './package.json'
 import buble from 'rollup-plugin-buble'
 
-const banner = `/**
+const banner = `/*!
  * vue-bus v${version}
  * https://github.com/yangmingshan/vue-bus
  * @license MIT