Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "webext-redux",
"version": "2.1.7",
"name": "webext-redux-w-errors",
"version": "2.1.12",
"description": "A set of utilities for building Redux applications in Web Extensions.",
"main": "lib/index.js",
"typings": "./index.d.ts",
Expand All @@ -26,7 +26,8 @@
"homepage": "https://github.com/tshaddix/webext-redux#readme",
"dependencies": {
"lodash.assignin": "^4.2.0",
"lodash.clonedeep": "^4.5.0"
"lodash.clonedeep": "^4.5.0",
"serialize-error": "^7.0.1"
},
"devDependencies": {
"@babel/cli": "^7.2.3",
Expand Down
8 changes: 2 additions & 6 deletions src/store/Store.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ import { withSerializer, withDeserializer, noop } from "../serialization";
import shallowDiff from '../strategies/shallowDiff/patch';
import {getBrowserAPI} from '../util';

const backgroundErrPrefix = '\nLooks like there is an error in the background page. ' +
'You might want to inspect your background page for more details.\n';


const defaultOpts = {
portName: DEFAULT_PORT_NAME,
state: {},
Expand Down Expand Up @@ -160,9 +156,9 @@ class Store {
const {error, value} = resp;

if (error) {
const bgErr = new Error(`${backgroundErrPrefix}${error}`);
const err = assignIn(new Error(error.message), error);

reject(assignIn(bgErr, error));
reject(err);
} else {
resolve(value && value.payload);
}
Expand Down
5 changes: 3 additions & 2 deletions src/wrap-store/wrapStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
import { withSerializer, withDeserializer, noop } from "../serialization";
import {getBrowserAPI} from '../util';
import shallowDiff from '../strategies/shallowDiff/diff';
import { serializeError } from 'serialize-error';

/**
* Responder for promisified results
Expand All @@ -26,7 +27,7 @@ const promiseResponder = (dispatchResult, send) => {
.catch((err) => {
console.error('error dispatching result:', err);
send({
error: err.message,
error: serializeError(err),
value: null
});
});
Expand Down Expand Up @@ -81,7 +82,7 @@ export default (store, {
try {
dispatchResult = store.dispatch(action);
} catch (e) {
dispatchResult = Promise.reject(e.message);
dispatchResult = Promise.reject(e);
console.error(e);
}

Expand Down