From 4ad3dc9b720cd1ba6235c56efad9c83ec6dc38eb Mon Sep 17 00:00:00 2001 From: Yoshua Wuyts Date: Tue, 5 Jul 2016 13:22:22 +0200 Subject: [PATCH] deps: bump to barracks 8 --- examples/http/client.js | 2 +- index.js | 10 ++++++---- package.json | 2 +- tests/browser/freeze.js | 2 +- tests/browser/hooks.js | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/examples/http/client.js b/examples/http/client.js index 6c6e6fb..7ca0145 100644 --- a/examples/http/client.js +++ b/examples/http/client.js @@ -15,7 +15,7 @@ const app = choo({ console.log(data) console.groupEnd() }, - onState: function (data, state, prev, createSend) { + onStateChange: function (data, state, prev, createSend) { console.groupCollapsed('State') console.log(prev) console.log(state) diff --git a/index.js b/index.js index f739f04..5c140f6 100644 --- a/index.js +++ b/index.js @@ -17,7 +17,7 @@ module.exports = choo function choo (opts) { opts = opts || {} - const _store = start._store = barracks(xtend(opts, { onState: render })) + const _store = start._store = barracks(xtend(opts, { onStateChange: render })) var _router = start._router = null var _defaultRoute = null var _rootNode = null @@ -36,7 +36,7 @@ function choo (opts) { serverState = serverState || {} assert.equal(typeof route, 'string', 'choo.app.toString: route must be a string') assert.equal(typeof serverState, 'object', 'choo.app.toString: serverState must be an object') - _store.start({ noSubscriptions: true, noReducers: true, noEffects: true }) + _store.start({ subscriptions: false, reducers: false, effects: false }) const state = _store.state({ state: serverState }) const router = createRouter(_defaultRoute, _routes, createSend) @@ -81,7 +81,9 @@ function choo (opts) { // update the DOM after every state mutation // (obj, obj, obj, str, fn) -> null function render (data, state, prev, name, createSend) { - if (opts.onState) opts.onState(data, state, prev, name, createSend) + if (opts.onStateChange) { + opts.onStateChange(data, state, prev, name, createSend) + } const newTree = _router(state.location.pathname, state, prev) _rootNode = yo.update(_rootNode, newTree) @@ -119,7 +121,7 @@ function choo (opts) { return function chooWrap (params, state) { const nwPrev = prev const nwState = prev = xtend(state, { params: params }) - if (!opts.noFreeze) Object.freeze(nwState) + if (opts.freeze !== false) Object.freeze(nwState) return child(nwState, nwPrev, send) } } diff --git a/package.json b/package.json index 9c98058..bed0342 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ ], "license": "MIT", "dependencies": { - "barracks": "^7.0.3", + "barracks": "^8.0.0", "document-ready": "~1.0.2", "global": "^4.3.0", "hash-match": "^1.0.2", diff --git a/tests/browser/freeze.js b/tests/browser/freeze.js index a073bf8..078f3df 100644 --- a/tests/browser/freeze.js +++ b/tests/browser/freeze.js @@ -25,7 +25,7 @@ test('freeze (default)', function (t) { test('noFreeze', function (t) { t.plan(2) - const app = choo({noFreeze: true}) + const app = choo({freeze: false}) app.model({ state: { diff --git a/tests/browser/hooks.js b/tests/browser/hooks.js index 278ce01..b38caea 100644 --- a/tests/browser/hooks.js +++ b/tests/browser/hooks.js @@ -18,7 +18,7 @@ test('hooks', function (t) { t.equal(caller, '/', 'onAction: caller name') t.equal(typeof createSend, 'function', 'onAction: createSend fn') }, - onState: function (action, state, prev, createSend) { + onStateChange: function (action, state, prev, createSend) { t.deepEqual(action, {foo: 'bar'}, 'onState: action data') t.deepEqual(state.clicks, 1, 'onState: new state: 1 clicks') t.deepEqual(prev.clicks, 0, 'onState: prev state: 0 clicks')