From 9af09a416697df068b9dc23730a94734aeba458f Mon Sep 17 00:00:00 2001 From: Jiawen Geng Date: Fri, 11 Jan 2019 00:09:53 +0800 Subject: [PATCH 01/14] build: migrate to circle 2.0 (#98) --- .circleci/config.yml | 27 +++++++++++++++++++++++++++ circle.yml | 3 --- 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..b26d84b --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,27 @@ +version: 2 + +jobs: + build: + docker: + - image: vuejs/ci + working_directory: ~/repo + steps: + - checkout + - restore_cache: + keys: + - dependency-cache-{{ checksum "package.json" }} + - dependency-cache- + - run: npm install + - run: npm run test + - run: npm run lint + - save_cache: + key: dependency-cache-{{ checksum "package.json" }} + paths: + - node_modules + + +workflows: + version: 2 + test: + jobs: + - build diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 7fa19bc..0000000 --- a/circle.yml +++ /dev/null @@ -1,3 +0,0 @@ -machine: - node: - version: 8 From 3ec0244d2472ba6801770882b99aa4b9130fd642 Mon Sep 17 00:00:00 2001 From: Haven Date: Fri, 11 Jan 2019 00:11:11 +0800 Subject: [PATCH 02/14] feat(optionMergeStrategies): add default strat for subscriptions (#95) --- src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.js b/src/index.js index d525d3a..5e29cd2 100644 --- a/src/index.js +++ b/src/index.js @@ -18,6 +18,7 @@ export default function VueRx (Vue) { Vue.prototype.$subscribeTo = subscribeTo Vue.prototype.$eventToObservable = eventToObservable Vue.prototype.$createObservableMethod = createObservableMethod + Vue.config.optionMergeStrategies.subscriptions = Vue.config.optionMergeStrategies.data; } // auto install From 4d1edc9e878932f08496f2493b04b227a4576b64 Mon Sep 17 00:00:00 2001 From: Evan You Date: Thu, 10 Jan 2019 11:11:57 -0500 Subject: [PATCH 03/14] lint --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 5e29cd2..7c73403 100644 --- a/src/index.js +++ b/src/index.js @@ -18,7 +18,7 @@ export default function VueRx (Vue) { Vue.prototype.$subscribeTo = subscribeTo Vue.prototype.$eventToObservable = eventToObservable Vue.prototype.$createObservableMethod = createObservableMethod - Vue.config.optionMergeStrategies.subscriptions = Vue.config.optionMergeStrategies.data; + Vue.config.optionMergeStrategies.subscriptions = Vue.config.optionMergeStrategies.data } // auto install From dc12029b8a3907c06affd7ef65141eed6b408da6 Mon Sep 17 00:00:00 2001 From: Evan You Date: Thu, 10 Jan 2019 11:12:04 -0500 Subject: [PATCH 04/14] 6.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f0957f..3044ebd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-rx", - "version": "6.0.1", + "version": "6.1.0", "description": "RxJS bindings for Vue", "main": "dist/vue-rx.js", "module": "dist/vue-rx.esm.js", From dcd0ab860450ecfa31141fd1f7f6d83440490e18 Mon Sep 17 00:00:00 2001 From: Jiawen Geng Date: Sun, 13 Jan 2019 10:43:33 +0800 Subject: [PATCH 05/14] split lint task to make ci work properly (#99) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3044ebd..9ebd699 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "scripts": { "dev": "rollup -c rollup.config.js -w", "build": "rollup -c rollup.config.js", - "lint": "eslint src test example --fix", + "lint": "eslint src test example", "test": "npm run test:unit && npm run test:types", "test:unit": "jest", "test:types": "tsc -p types/test", From 32918138b24914036951b3f05a886885c0067e56 Mon Sep 17 00:00:00 2001 From: Natalia Tepluhina Date: Tue, 29 Jan 2019 23:05:52 +0200 Subject: [PATCH 06/14] fix: fixed Wikipedia example to use RxJS ajax (#102) --- example/wiki-search.html | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/example/wiki-search.html b/example/wiki-search.html index a0cbd58..ae36aa9 100644 --- a/example/wiki-search.html +++ b/example/wiki-search.html @@ -1,4 +1,3 @@ - @@ -23,18 +22,14 @@

{{ results.term }}