build: update deps + adjust build setup

Author: yyx990803

package-lock.json

@@ -3,6 +3,7 @@
   "version": "5.0.0",
   "description": "RxJS bindings for Vue",
   "main": "dist/vue-rx.js",
+  "module": "dist/vue-rx.esm.js",
   "files": [
     "dist",
     "types/*.d.ts"
@@ -36,16 +37,17 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "buble": "^0.16.0",
-    "eslint": "^3.0.0",
-    "eslint-plugin-vue-libs": "^1.2.0",
-    "jest": "^21.2.1",
-    "rollup": "^0.50.0",
-    "rollup-plugin-buble": "^0.16.0",
+    "buble": "^0.19.3",
+    "eslint": "^4.19.1",
+    "eslint-plugin-vue-libs": "^3.0.0",
+    "jest": "^23.1.0",
+    "rollup": "^0.59.4",
+    "rollup-plugin-alias": "^1.4.0",
+    "rollup-plugin-buble": "^0.19.2",
     "rollup-watch": "^4.3.1",
     "rxjs": "^6.2.0",
-    "typescript": "^2.5.2",
-    "vue": "^2.5.0"
+    "typescript": "^2.8.2",
+    "vue": "^2.5.16"
   },
   "eslintConfig": {
     "root": true,

package.json

@@ -1,11 +1,32 @@
+const alias = require('rollup-plugin-alias')
 const buble = require('rollup-plugin-buble')
 
-module.exports = {
-  input: 'src/index.js',
-  output: {
-    file: 'dist/vue-rx.js',
-    format: 'umd',
-    name: 'VueRx',
+module.exports = [
+  {
+    input: 'src/index.js',
+    output: {
+      file: 'dist/vue-rx.esm.js',
+      format: 'es'
+    },
+    plugins: [buble()],
+    external: [
+      'rxjs',
+      'rxjs/operators'
+    ]
   },
-  plugins: [buble()]
-}
+  {
+    input: 'src/index.js',
+    output: {
+      file: 'dist/vue-rx.js',
+      format: 'umd',
+      name: 'VueRx'
+    },
+    plugins: [
+      buble(),
+      alias({
+        'rxjs/operators': 'src/umd-aliases/operators.js',
+        'rxjs': 'src/umd-aliases/rxjs.js'
+      })
+    ]
+  }
+]

rollup.config.js

@@ -27,7 +27,7 @@ export default {
     }
 
     var modifiersExists = Object.keys(modifiersFuncs).filter(
-        key => modifiers[key]
+      key => modifiers[key]
     )
 
     const subject = handle.subject

src/directives/stream.js

@@ -1,4 +1,4 @@
-/* global Vue, Rx */
+/* global Vue */
 
 import { install } from './util'
 import rxMixin from './mixin'
@@ -9,8 +9,8 @@ import subscribeTo from './methods/subscribeTo'
 import eventToObservable from './methods/eventToObservable'
 import createObservableMethod from './methods/createObservableMethod'
 
-export default function VueRx (Vue, Rx) {
-  install(Vue, Rx)
+export default function VueRx (Vue) {
+  install(Vue)
   Vue.mixin(rxMixin)
   Vue.directive('stream', streamDirective)
   Vue.prototype.$watchAsObservable = watchAsObservable
@@ -21,6 +21,6 @@ export default function VueRx (Vue, Rx) {
 }
 
 // auto install
-if (typeof Vue !== 'undefined' && typeof Rx !== 'undefined') {
-  Vue.use(VueRx, Rx)
+if (typeof Vue !== 'undefined') {
+  Vue.use(VueRx)
 }

src/index.js

@@ -0,0 +1,9 @@
+const operators = typeof require !== 'undefined'
+  ? require('rxjs/operators')
+  : typeof window !== 'undefined' && window.rxjs
+    ? window.rxjs.operators
+    : {}
+
+const { share } = operators
+
+export { share }

src/umd-aliases/operators.js

@@ -0,0 +1,25 @@
+const rxjs = typeof require !== 'undefined'
+  ? require('rxjs')
+  : typeof window !== 'undefined'
+    ? window.rxjs
+    : null
+
+if (!rxjs) {
+  throw new Error(`[vue-rx]: RxJS is not found.`)
+}
+
+const {
+  Observable,
+  Subject,
+  Subscription,
+  fromEvent,
+  NEVER
+} = rxjs
+
+export {
+  Observable,
+  Subject,
+  Subscription,
+  fromEvent,
+  NEVER
+}

src/umd-aliases/rxjs.js

@@ -6,19 +6,11 @@ const Vue = require('vue/dist/vue.js')
 const VueRx = require('../dist/vue-rx.js')
 
 // library
-const { Observable, Subject, Subscription, fromEvent } = require('rxjs')
+const { Observable } = require('rxjs')
 const { map, scan, pluck, merge, tap, filter, startWith } = require('rxjs/operators')
 
-Observable.fromEvent = fromEvent
-
-const miniRx = {
-  Observable,
-  Subscription,
-  Subject
-}
-
 Vue.config.productionTip = false
-Vue.use(VueRx, miniRx)
+Vue.use(VueRx)
 
 const nextTick = Vue.nextTick