Skip to content

Commit

Permalink
Merge pull request #60 from 4Catalyzer/update
Browse files Browse the repository at this point in the history 
Update dependencies
  • Loading branch information
@taion
taion authored Apr 18, 2018
2 parents 5c1a143 + dceeaff commit 59f268a
Show file tree
Hide file tree
Showing 10 changed files with 14,941 additions and 801 deletions.
13,043 changes: 13,043 additions & 0 deletions examples/playground/package-lock.json
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions examples/playground/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"version": "0.1.0",
"private": true,
"devDependencies": {
"react-scripts": "0.9.5"
"react-scripts": "1.1.4"
},
"dependencies": {
"farce": "../..",
"redux": "^3.6.0"
"farce": "^0.2.5",
"redux": "^3.7.2"
},
"scripts": {
"start": "react-scripts start"
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ module.exports = config => {
},

webpack: {
mode: 'development',
module: {
rules: [
{ test: /\.js$/, exclude: /node_modules/, use: 'babel-loader' },
Expand All @@ -24,7 +25,6 @@ module.exports = config => {
__DEV__: true,
}),
],
devtool: 'cheap-module-inline-source-map',
},

webpackMiddleware: {
Expand Down
38 changes: 19 additions & 19 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,48 +41,48 @@
"homepage": "https://github.com/4Catalyzer/farce#readme",
"dependencies": {
"dom-helpers": "^3.3.1",
"invariant": "^2.2.2",
"invariant": "^2.2.4",
"is-promise": "^2.1.0",
"query-string": "^5.0.1",
"redux": "^3.7.2",
"query-string": "^5.1.1",
"redux": "^4.0.0",
"warning": "^3.0.0"
},
"devDependencies": {
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-eslint": "^7.2.3",
"babel-loader": "^7.1.2",
"babel-eslint": "^8.2.3",
"babel-loader": "^7.1.4",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-plugin-dev-expression": "^0.2.1",
"babel-plugin-istanbul": "^4.1.5",
"babel-plugin-istanbul": "^4.1.6",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.1",
"babel-preset-stage-1": "^6.24.1",
"chai": "^4.1.2",
"codecov": "^3.0.0",
"cross-env": "^5.1.3",
"cross-env": "^5.1.4",
"dirty-chai": "^2.0.1",
"eslint": "^4.13.1",
"eslint-config-4catalyzer": "^0.3.3",
"eslint": "^4.19.1",
"eslint-config-4catalyzer": "^0.4.1",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-prettier": "^2.4.0",
"eslint-plugin-import": "^2.11.0",
"eslint-plugin-prettier": "^2.6.0",
"husky": "^0.14.3",
"karma": "^2.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.1",
"karma-firefox-launcher": "^1.1.0",
"karma-mocha": "^1.3.0",
"karma-mocha-reporter": "^2.2.5",
"karma-sinon-chai": "^1.3.3",
"karma-sinon-chai": "^1.3.4",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.9",
"lint-staged": "^6.0.0",
"mocha": "^4.0.1",
"prettier": "^1.9.2",
"karma-webpack": "^3.0.0",
"lint-staged": "^7.0.4",
"mocha": "^5.1.0",
"prettier": "^1.12.1",
"rimraf": "^2.6.2",
"sinon": "^4.1.3",
"sinon-chai": "^2.14.0",
"webpack": "^3.10.0"
"sinon": "^4.5.0",
"sinon-chai": "^3.0.0",
"webpack": "^4.6.0"
}
}
6 changes: 3 additions & 3 deletions test/BrowserProcotol.test.js → test/BrowserProtocol.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ describe('BrowserProtocol', () => {
delta: -1,
state: { the: 'state' },
});
listener.reset();
listener.resetHistory();

window.history.back();
await timeout(20);
Expand All @@ -121,7 +121,7 @@ describe('BrowserProtocol', () => {
delta: -1,
state: undefined,
});
listener.reset();
listener.resetHistory();
});

it('should support subscribing and unsubscribing', async () => {
Expand Down Expand Up @@ -150,7 +150,7 @@ describe('BrowserProtocol', () => {
action: 'POP',
pathname: '/bar',
});
listener.reset();
listener.resetHistory();

unsubscribe();

Expand Down
6 changes: 3 additions & 3 deletions test/HashProcotol.test.js → test/HashProtocol.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ describe('HashProtocol', () => {
delta: -1,
state: { the: 'state' },
});
listener.reset();
listener.resetHistory();

window.history.back();
await timeout(20);
Expand All @@ -118,7 +118,7 @@ describe('HashProtocol', () => {
delta: -1,
state: undefined,
});
listener.reset();
listener.resetHistory();
});

it('should support subscribing and unsubscribing', async () => {
Expand Down Expand Up @@ -152,7 +152,7 @@ describe('HashProtocol', () => {
action: 'POP',
pathname: '/bar',
});
listener.reset();
listener.resetHistory();

unsubscribe();

Expand Down
6 changes: 3 additions & 3 deletions test/MemoryProtocol.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ describe('MemoryProtocol', () => {
action: 'POP',
pathname: '/bar',
});
listener.reset();
listener.resetHistory();

unsubscribe();

Expand All @@ -108,7 +108,7 @@ describe('MemoryProtocol', () => {
pathname: '/foo',
delta: -2,
});
listener.reset();
listener.resetHistory();

protocol.go(-1);

Expand All @@ -122,7 +122,7 @@ describe('MemoryProtocol', () => {
pathname: '/baz',
delta: 2,
});
listener.reset();
listener.resetHistory();

protocol.go(+1);

Expand Down
10 changes: 5 additions & 5 deletions test/createHistory.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe('createHistory', () => {
listener = sinon.spy();
unlisten = history.listen(listener);

listener.reset();
listener.resetHistory();
});

afterEach(() => {
Expand All @@ -30,7 +30,7 @@ describe('createHistory', () => {
pathname: '/bar',
index: 1,
});
listener.reset();
listener.resetHistory();

history.goBack();

Expand All @@ -39,7 +39,7 @@ describe('createHistory', () => {
pathname: '/foo',
index: 0,
});
listener.reset();
listener.resetHistory();

history.goForward();

Expand All @@ -48,7 +48,7 @@ describe('createHistory', () => {
pathname: '/bar',
index: 1,
});
listener.reset();
listener.resetHistory();

history.go(-1);

Expand All @@ -57,7 +57,7 @@ describe('createHistory', () => {
pathname: '/foo',
index: 0,
});
listener.reset();
listener.resetHistory();
});

it('should support replace', () => {
Expand Down
4 changes: 2 additions & 2 deletions test/createStoreHistory.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('createStoreHistory', () => {
listener = sinon.spy();
unlisten = history.listen(listener);

listener.reset();
listener.resetHistory();
});

afterEach(() => {
Expand All @@ -45,7 +45,7 @@ describe('createStoreHistory', () => {
pathname: '/bar',
index: 1,
});
listener.reset();
listener.resetHistory();

store.dispatch({
type: 'UNKNOWN',
Expand Down
Loading

0 comments on commit 59f268a

Please sign in to comment.