From cc4787ab7424023920bfafd3c75d444b269e5e01 Mon Sep 17 00:00:00 2001 From: Matias Giachino Date: Tue, 17 Mar 2015 15:21:18 -0700 Subject: [PATCH 1/4] Bump react dep, move mockExecuteAction to avoid context warning --- package.json | 4 ++-- tests/unit/mixins.js | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 526a64e..87bb0e0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "fluxible-action-utils", "description": "utility methods to aid in writing actions for fluxible based applications.", - "version": "0.2.0", + "version": "0.3.0", "main": "index.js", "repository": { "type": "git", @@ -16,7 +16,7 @@ }, "dependencies": { "async": "^0.9.0", - "react": "^0.12.0" + "react": "^0.13.0" }, "devDependencies": { "chai": "^2.0", diff --git a/tests/unit/mixins.js b/tests/unit/mixins.js index 7d04357..2edd969 100644 --- a/tests/unit/mixins.js +++ b/tests/unit/mixins.js @@ -12,6 +12,10 @@ GLOBAL.document = jsdom.jsdom(''); GLOBAL.window = GLOBAL.document.parentWindow; GLOBAL.navigator = GLOBAL.window.navigator; +function mockExecuteAction (action, params) { + action(params); +} + function renderComponent (classSpec, container) { var _classSpec = { mixins: [PeriodicActionsMixin], @@ -32,9 +36,7 @@ function renderComponent (classSpec, container) { }, getChildContext: function () { return { - executeAction: function (action, params) { - action(params); - } + executeAction: mockExecuteAction }; }, render: function () { From 6b5cf467d7291dad261dad96831494d64b3db914 Mon Sep 17 00:00:00 2001 From: Matias Giachino Date: Tue, 17 Mar 2015 16:20:23 -0700 Subject: [PATCH 2/4] Bump minor only, move react to peer/dev deps (allow 12 or 13) --- package.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 87bb0e0..3a2a1f2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "fluxible-action-utils", "description": "utility methods to aid in writing actions for fluxible based applications.", - "version": "0.3.0", + "version": "0.2.1", "main": "index.js", "repository": { "type": "git", @@ -15,8 +15,7 @@ "test": "npm run lint && npm run cover" }, "dependencies": { - "async": "^0.9.0", - "react": "^0.13.0" + "async": "^0.9.0" }, "devDependencies": { "chai": "^2.0", @@ -27,9 +26,13 @@ "mocha": "^2.0", "mockery": "^1.0", "precommit-hook": "^1.0", + "react": ">=0.12.0 <=0.13.x", "sinon": "^1.0", "webpack": "^1.0" }, + "peerDependencies": { + "react": ">=0.12.0 <=0.13.x" + }, "author": "Mo Kouli ", "contributors": [ { From 6e6ae5aa480f427e5ba6ce104682ac2b7529a7b4 Mon Sep 17 00:00:00 2001 From: Matias Giachino Date: Tue, 17 Mar 2015 16:28:40 -0700 Subject: [PATCH 3/4] Move react back to deps --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3a2a1f2..19e040a 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,8 @@ "test": "npm run lint && npm run cover" }, "dependencies": { - "async": "^0.9.0" + "async": "^0.9.0", + "react": ">=0.12.0 <=0.13.x" }, "devDependencies": { "chai": "^2.0", @@ -26,7 +27,6 @@ "mocha": "^2.0", "mockery": "^1.0", "precommit-hook": "^1.0", - "react": ">=0.12.0 <=0.13.x", "sinon": "^1.0", "webpack": "^1.0" }, From 21438d0f740d0f1363b11ef2060b038d03c0f9ea Mon Sep 17 00:00:00 2001 From: Matias Giachino Date: Tue, 17 Mar 2015 16:34:25 -0700 Subject: [PATCH 4/4] Revert "Move react back to deps" This reverts commit 6e6ae5aa480f427e5ba6ce104682ac2b7529a7b4. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 19e040a..3a2a1f2 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,7 @@ "test": "npm run lint && npm run cover" }, "dependencies": { - "async": "^0.9.0", - "react": ">=0.12.0 <=0.13.x" + "async": "^0.9.0" }, "devDependencies": { "chai": "^2.0", @@ -27,6 +26,7 @@ "mocha": "^2.0", "mockery": "^1.0", "precommit-hook": "^1.0", + "react": ">=0.12.0 <=0.13.x", "sinon": "^1.0", "webpack": "^1.0" },