@instructure/quiz-core 22.5.1-rc.3 → 22.5.1-rc.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/es/configureStore.js +18 -10
  2. package/lib/configureStore.js +18 -10
  3. package/package.json +9 -9
package/es/configureStore.js CHANGED
@@ -1,7 +1,6 @@
1
1
  import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
2
2
  import { createStore, applyMiddleware } from 'redux';
3
3
  import { combineReducers } from 'redux-immutable';
4
- import union from 'lodash/union';
5
4
  import flowRight from 'lodash/flowRight';
6
5
 
7
6
  // middleware
@@ -56,10 +55,14 @@ import sharedBanks from './common/reducers/sharedBanks';
56
55
  export function configureStore(_ref) {
57
56
  var _ref$extraMiddleware = _ref.extraMiddleware,
58
57
  extraMiddleware = _ref$extraMiddleware === void 0 ? [] : _ref$extraMiddleware,
58
+ _ref$initialState = _ref.initialState,
59
+ initialState = _ref$initialState === void 0 ? void 0 : _ref$initialState,
59
60
  _ref$inDevelopment = _ref.inDevelopment,
60
61
  inDevelopment = _ref$inDevelopment === void 0 ? false : _ref$inDevelopment,
61
- _ref$initialState = _ref.initialState,
62
- initialState = _ref$initialState === void 0 ? void 0 : _ref$initialState;
62
+ _ref$isTest = _ref.isTest,
63
+ isTest = _ref$isTest === void 0 ? false : _ref$isTest,
64
+ _ref$middlewareOverri = _ref.middlewareOverrides,
65
+ middlewareOverrides = _ref$middlewareOverri === void 0 ? {} : _ref$middlewareOverri;
63
66
  var loggerMiddleware = createLogger({
64
67
  // immutable state returned as raw JS
65
68
  // for readability's sake
@@ -71,13 +74,18 @@ export function configureStore(_ref) {
71
74
  return "SDK action %c".concat(String(action.type));
72
75
  }
73
76
  });
74
- var kinesisMiddleware = eventLoggerMiddlewareCreator();
75
- var websocketMiddleware = createQuizTimerWebSocketMiddleware();
76
- var baseMiddleware = [alertTimerMiddleware, crossDomainMessagingMiddleware, multi, kinesisMiddleware, thunkMiddleware, websocketMiddleware];
77
- var devMiddleware = [loggerMiddleware];
78
- var middlewareToApply = inDevelopment ? union(baseMiddleware, devMiddleware) : baseMiddleware;
79
- middlewareToApply = union(middlewareToApply, extraMiddleware);
80
- var createStoreWithMiddlewareApplied = flowRight(applyMiddleware.apply(void 0, _toConsumableArray(middlewareToApply)),
77
+ var getMiddleware = function getMiddleware(implementation, override) {
78
+ return isTest && override ? override : implementation;
79
+ };
80
+ var middlewares = [getMiddleware(alertTimerMiddleware, middlewareOverrides.alertTimerMiddleware), getMiddleware(crossDomainMessagingMiddleware, middlewareOverrides.crossDomainMessagingMiddleware), getMiddleware(multi, middlewareOverrides.multiMiddleware), getMiddleware(eventLoggerMiddlewareCreator(), middlewareOverrides.kinesisMiddleware), getMiddleware(thunkMiddleware, middlewareOverrides.thunkMiddleware), getMiddleware(createQuizTimerWebSocketMiddleware(), middlewareOverrides.websocketMiddleware)];
81
+ var devMiddleware = [getMiddleware(loggerMiddleware, middlewareOverrides.logger)];
82
+ if (inDevelopment) {
83
+ middlewares.push.apply(middlewares, devMiddleware);
84
+ }
85
+ if (extraMiddleware && extraMiddleware.length > 0) {
86
+ middlewares.push.apply(middlewares, _toConsumableArray(extraMiddleware));
87
+ }
88
+ var createStoreWithMiddlewareApplied = flowRight(applyMiddleware.apply(void 0, middlewares),
81
89
  // todo: tweak middleware to handle (re)routing with devtools
82
90
  window.devToolsExtension ? window.devToolsExtension({
83
91
  name: 'quiz-core'
package/lib/configureStore.js CHANGED
@@ -9,7 +9,6 @@ exports["default"] = void 0;
9
9
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
10
10
  var _redux = require("redux");
11
11
  var _reduxImmutable = require("redux-immutable");
12
- var _union = _interopRequireDefault(require("lodash/union"));
13
12
  var _flowRight = _interopRequireDefault(require("lodash/flowRight"));
14
13
  var _reduxLogger = _interopRequireDefault(require("redux-logger"));
15
14
  var _reduxMulti = _interopRequireDefault(require("redux-multi"));
@@ -64,10 +63,14 @@ var _sharedBanks = _interopRequireDefault(require("./common/reducers/sharedBanks
64
63
  function configureStore(_ref) {
65
64
  var _ref$extraMiddleware = _ref.extraMiddleware,
66
65
  extraMiddleware = _ref$extraMiddleware === void 0 ? [] : _ref$extraMiddleware,
66
+ _ref$initialState = _ref.initialState,
67
+ initialState = _ref$initialState === void 0 ? void 0 : _ref$initialState,
67
68
  _ref$inDevelopment = _ref.inDevelopment,
68
69
  inDevelopment = _ref$inDevelopment === void 0 ? false : _ref$inDevelopment,
69
- _ref$initialState = _ref.initialState,
70
- initialState = _ref$initialState === void 0 ? void 0 : _ref$initialState;
70
+ _ref$isTest = _ref.isTest,
71
+ isTest = _ref$isTest === void 0 ? false : _ref$isTest,
72
+ _ref$middlewareOverri = _ref.middlewareOverrides,
73
+ middlewareOverrides = _ref$middlewareOverri === void 0 ? {} : _ref$middlewareOverri;
71
74
  var loggerMiddleware = (0, _reduxLogger["default"])({
72
75
  // immutable state returned as raw JS
73
76
  // for readability's sake
@@ -79,13 +82,18 @@ function configureStore(_ref) {
79
82
  return "SDK action %c".concat(String(action.type));
80
83
  }
81
84
  });
82
- var kinesisMiddleware = (0, _eventLoggerMiddleware["default"])();
83
- var websocketMiddleware = (0, _quizTimerWebSocketMiddleware.createQuizTimerWebSocketMiddleware)();
84
- var baseMiddleware = [_alertTimerMiddleware["default"], _crossDomainMessagingMiddleware["default"], _reduxMulti["default"], kinesisMiddleware, _reduxThunk["default"], websocketMiddleware];
85
- var devMiddleware = [loggerMiddleware];
86
- var middlewareToApply = inDevelopment ? (0, _union["default"])(baseMiddleware, devMiddleware) : baseMiddleware;
87
- middlewareToApply = (0, _union["default"])(middlewareToApply, extraMiddleware);
88
- var createStoreWithMiddlewareApplied = (0, _flowRight["default"])(_redux.applyMiddleware.apply(void 0, (0, _toConsumableArray2["default"])(middlewareToApply)),
85
+ var getMiddleware = function getMiddleware(implementation, override) {
86
+ return isTest && override ? override : implementation;
87
+ };
88
+ var middlewares = [getMiddleware(_alertTimerMiddleware["default"], middlewareOverrides.alertTimerMiddleware), getMiddleware(_crossDomainMessagingMiddleware["default"], middlewareOverrides.crossDomainMessagingMiddleware), getMiddleware(_reduxMulti["default"], middlewareOverrides.multiMiddleware), getMiddleware((0, _eventLoggerMiddleware["default"])(), middlewareOverrides.kinesisMiddleware), getMiddleware(_reduxThunk["default"], middlewareOverrides.thunkMiddleware), getMiddleware((0, _quizTimerWebSocketMiddleware.createQuizTimerWebSocketMiddleware)(), middlewareOverrides.websocketMiddleware)];
89
+ var devMiddleware = [getMiddleware(loggerMiddleware, middlewareOverrides.logger)];
90
+ if (inDevelopment) {
91
+ middlewares.push.apply(middlewares, devMiddleware);
92
+ }
93
+ if (extraMiddleware && extraMiddleware.length > 0) {
94
+ middlewares.push.apply(middlewares, (0, _toConsumableArray2["default"])(extraMiddleware));
95
+ }
96
+ var createStoreWithMiddlewareApplied = (0, _flowRight["default"])(_redux.applyMiddleware.apply(void 0, middlewares),
89
97
  // todo: tweak middleware to handle (re)routing with devtools
90
98
  window.devToolsExtension ? window.devToolsExtension({
91
99
  name: 'quiz-core'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@instructure/quiz-core",
3
- "version": "22.5.1-rc.3+9e80eae7f",
3
+ "version": "22.5.1-rc.5+e1fde763f",
4
4
  "license": "MIT",
5
5
  "description": "The Quiz React SDK by Instructure Inc.",
6
6
  "author": "Instructure, Inc. Engineering and Product Design",
@@ -46,11 +46,11 @@
46
46
  "@instructure/emotion": "10.14.0",
47
47
  "@instructure/grading-utils": "^1.0.0",
48
48
  "@instructure/outcomes-ui": "3.2.3",
49
- "@instructure/quiz-common": "22.5.1-rc.3+9e80eae7f",
50
- "@instructure/quiz-i18n": "22.5.1-rc.3+9e80eae7f",
51
- "@instructure/quiz-interactions": "22.5.1-rc.3+9e80eae7f",
52
- "@instructure/quiz-number-input": "22.5.1-rc.3+9e80eae7f",
53
- "@instructure/quiz-rce": "22.5.1-rc.3+9e80eae7f",
49
+ "@instructure/quiz-common": "22.5.1-rc.5+e1fde763f",
50
+ "@instructure/quiz-i18n": "22.5.1-rc.5+e1fde763f",
51
+ "@instructure/quiz-interactions": "22.5.1-rc.5+e1fde763f",
52
+ "@instructure/quiz-number-input": "22.5.1-rc.5+e1fde763f",
53
+ "@instructure/quiz-rce": "22.5.1-rc.5+e1fde763f",
54
54
  "@instructure/ui-a11y-content": "10.14.0",
55
55
  "@instructure/ui-alerts": "10.14.0",
56
56
  "@instructure/ui-avatar": "10.14.0",
@@ -109,7 +109,7 @@
109
109
  "file-saver": "~2.0.5",
110
110
  "humps": "^2.0.0",
111
111
  "immutable": "^3.8.1",
112
- "instructure-validations": "22.5.1-rc.3+9e80eae7f",
112
+ "instructure-validations": "22.5.1-rc.5+e1fde763f",
113
113
  "ipaddr.js": "^1.5.4",
114
114
  "isomorphic-fetch": "^2.2.0",
115
115
  "isuuid": "^0.1.0",
@@ -158,7 +158,7 @@
158
158
  "jquery": "^2.2.3",
159
159
  "karma-junit-reporter": "^2.0.1",
160
160
  "most-subject": "^5.3.0",
161
- "quiz-presets": "22.5.1-rc.3+9e80eae7f",
161
+ "quiz-presets": "22.5.1-rc.5+e1fde763f",
162
162
  "react": "^16.8.6",
163
163
  "react-addons-test-utils": "^15.6.2",
164
164
  "react-dom": "^16.8.6",
@@ -174,5 +174,5 @@
174
174
  "publishConfig": {
175
175
  "access": "public"
176
176
  },
177
- "gitHead": "9e80eae7f4e99735bd7692001dfec5eaeae9ea31"
177
+ "gitHead": "e1fde763f287e302f0b7741e47679a9c05ba5b5d"
178
178
  }