digirati-annotation-redux
Advanced tools
Comparing version 1.0.0-rc.8 to 1.0.0-rc.9
@@ -0,4 +1,12 @@ | ||
import _extends from 'babel-runtime/helpers/extends'; | ||
import { applyMiddleware, combineReducers, compose, createStore } from 'redux'; | ||
import { intlReducer } from 'react-intl-redux'; | ||
import { addLocaleData } from 'react-intl'; | ||
import middleware from './middleware'; | ||
import translations from './locale'; | ||
import enLocaleData from 'react-intl/locale-data/en'; | ||
import cyLocaleData from 'react-intl/locale-data/cy'; | ||
addLocaleData([].concat(enLocaleData, cyLocaleData)); | ||
var composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose; | ||
@@ -11,4 +19,12 @@ | ||
var extraMiddleware = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : []; | ||
var locale = arguments[2]; | ||
return createStore(combineReducers(reducers), composeEnhancers(applyMiddleware.apply(undefined, [].concat(middleware, extraMiddleware)))); | ||
return createStore(combineReducers(_extends({}, reducers, { | ||
intl: intlReducer | ||
})), { | ||
intl: { | ||
locale: locale, | ||
messages: translations[locale] | ||
} | ||
}, composeEnhancers(applyMiddleware.apply(undefined, [].concat(middleware, extraMiddleware)))); | ||
} |
@@ -105,3 +105,3 @@ import _regeneratorRuntime from 'babel-runtime/regenerator'; | ||
body: JSON.stringify(body), | ||
credentials: 'same-origin', | ||
credentials: 'include', | ||
redirect: 'follow' | ||
@@ -108,0 +108,0 @@ }).then(function (response) { |
'use strict'; | ||
exports.__esModule = true; | ||
var _extends2 = require('babel-runtime/helpers/extends'); | ||
var _extends3 = _interopRequireDefault(_extends2); | ||
exports.default = createCustomStore; | ||
@@ -8,2 +13,6 @@ | ||
var _reactIntlRedux = require('react-intl-redux'); | ||
var _reactIntl = require('react-intl'); | ||
var _middleware = require('./middleware'); | ||
@@ -13,4 +22,18 @@ | ||
var _locale = require('./locale'); | ||
var _locale2 = _interopRequireDefault(_locale); | ||
var _en = require('react-intl/locale-data/en'); | ||
var _en2 = _interopRequireDefault(_en); | ||
var _cy = require('react-intl/locale-data/cy'); | ||
var _cy2 = _interopRequireDefault(_cy); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
(0, _reactIntl.addLocaleData)([].concat(_en2.default, _cy2.default)); | ||
var composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || _redux.compose; | ||
@@ -23,5 +46,13 @@ | ||
var extraMiddleware = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : []; | ||
var locale = arguments[2]; | ||
return (0, _redux.createStore)((0, _redux.combineReducers)(reducers), composeEnhancers(_redux.applyMiddleware.apply(undefined, [].concat(_middleware2.default, extraMiddleware)))); | ||
return (0, _redux.createStore)((0, _redux.combineReducers)((0, _extends3.default)({}, reducers, { | ||
intl: _reactIntlRedux.intlReducer | ||
})), { | ||
intl: { | ||
locale: locale, | ||
messages: _locale2.default[locale] | ||
} | ||
}, composeEnhancers(_redux.applyMiddleware.apply(undefined, [].concat(_middleware2.default, extraMiddleware)))); | ||
} | ||
module.exports = exports['default']; |
@@ -240,3 +240,3 @@ 'use strict'; | ||
body: JSON.stringify(body), | ||
credentials: 'same-origin', | ||
credentials: 'include', | ||
redirect: 'follow' | ||
@@ -243,0 +243,0 @@ }).then(function (response) { |
{ | ||
"name": "digirati-annotation-redux", | ||
"version": "1.0.0-rc.8", | ||
"version": "1.0.0-rc.9", | ||
"description": "Describe annotation-redux here", | ||
@@ -24,2 +24,3 @@ "main": "es/index.js", | ||
"immutability-helper": "^2.1.2", | ||
"react-intl": "^2.4.0", | ||
"react-redux": "^5.0.3", | ||
@@ -38,3 +39,3 @@ "redux": "^3.6.0", | ||
"babel-plugin-transform-regenerator": "^6.24.1", | ||
"digirati-test-environment": "^0.7.0", | ||
"digirati-test-environment": "^1.0.0-rc.9", | ||
"jest": "^20.0.0", | ||
@@ -41,0 +42,0 @@ "nwb": "0.15.x" |
222885
84
5447
10
+ Addedreact-intl@^2.4.0
+ Addedintl-format-cache@2.2.9(transitive)
+ Addedintl-messageformat@2.2.0(transitive)
+ Addedintl-messageformat-parser@1.4.0(transitive)
+ Addedintl-relativeformat@2.2.0(transitive)
+ Addedreact-intl@2.9.0(transitive)