Skip to content

Commit

Permalink
Merge branch 'master' into random-cache
Browse files Browse the repository at this point in the history
  • Loading branch information
toomuchdesign authored Sep 14, 2021
2 parents 4e98a5a + 8559efe commit dc2199c
Show file tree
Hide file tree
Showing 9 changed files with 3,379 additions and 4,952 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: CI
on:
push:
branches:
- master
pull_request:

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Use Node.js 14
uses: actions/setup-node@v1
with:
node-version: '14'

- run: npm ci
env:
HUSKY_SKIP_INSTALL: 1


- name: Upload code coverage
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
3 changes: 2 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"arrowParens": "avoid",
"bracketSpacing": false,
"singleQuote": true,
"trailingComma": "es5",
"trailingComma": "es5"
}
9 changes: 0 additions & 9 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Back to the example, we might setup `re-reselect` to retrieve data by **querying

<!-- prettier-ignore -->
```js
const getPieceOfData = createCachedSelector(
const getData = createCachedSelector(
state => state,
(state, itemId) => itemId,
(state, itemId, dataType) => dataType,
Expand Down Expand Up @@ -513,8 +513,8 @@ Thanks to you all ([emoji key][docs-all-contributors]):
[reselect-create-structured-selector]: https://github.com/reduxjs/reselect/tree/v4.0.0#createstructuredselectorinputselectors-selectorcreator--createselector
[reselect-create-selector-creator]: https://github.com/reactjs/reselect/tree/v4.0.0#createselectorcreatormemoize-memoizeoptions
[lodash-memoize]: https://lodash.com/docs/4.17.4#memoize
[ci-badge]: https://travis-ci.org/toomuchdesign/re-reselect.svg?branch=master
[ci]: https://travis-ci.org/toomuchdesign/re-reselect
[ci-badge]: https://github.com/toomuchdesign/re-reselect/actions/workflows/ci.yml/badge.svg
[ci]: https://github.com/toomuchdesign/re-reselect/actions/workflows/ci.yml
[coveralls-badge]: https://coveralls.io/repos/github/toomuchdesign/re-reselect/badge.svg?branch=master
[coveralls]: https://coveralls.io/github/toomuchdesign/re-reselect?branch=master
[npm]: https://www.npmjs.com/package/re-reselect
Expand Down
2 changes: 1 addition & 1 deletion jest/__snapshots__/bundles-snapshot.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`Dist bundle is unchanged 1`] = `
"(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('reselect')) :
typeof define === 'function' && define.amd ? define(['exports', 'reselect'], factory) :
(global = global || self, factory(global['Re-reselect'] = {}, global.Reselect));
(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global['Re-reselect'] = {}, global.Reselect));
}(this, (function (exports, reselect) { 'use strict';
function isStringOrNumber(value) {
Expand Down
Loading

0 comments on commit dc2199c

Please sign in to comment.