Skip to content

Commit

Permalink
update eslint, prettier config, jest versions
Browse files Browse the repository at this point in the history
  • Loading branch information
paularmstrong committed Apr 17, 2018
1 parent b142553 commit 27be1ef
Show file tree
Hide file tree
Showing 30 changed files with 2,357 additions and 1,074 deletions.
241 changes: 110 additions & 131 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@
},
"sourceType": "module"
},
"plugins": [],
"extends": [
"plugin:jest/recommended",
"prettier"
],
"plugins": [
"prettier"
],
"env": {
"es6": true,
"node": true
Expand All @@ -20,135 +26,108 @@
"window": false
},
"rules": {
"accessor-pairs": 2,
"array-bracket-spacing": ["error", "always"],
"arrow-parens": [2, "always"],
"arrow-spacing": [2, { "before": true, "after": true }],
"block-spacing": [2, "always"],
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
"camelcase": 0,
"comma-dangle": [2, "never"],
"comma-spacing": [2, { "before": false, "after": true }],
"comma-style": [2, "last"],
"computed-property-spacing": ["error", "never"],
"constructor-super": 2,
"curly": [2, "all"],
"default-case": [2, { commentPattern: '^no default$' }],
"dot-location": [2, "property"],
"eol-last": 2,
"eqeqeq": [2, "allow-null"],
"generator-star-spacing": [2, { "before": true, "after": true }],
"handle-callback-err": [2, "^(err|error)$" ],
"indent": [2, 2, { "SwitchCase": 1 }],
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
"keyword-spacing": [2, { "before": true, "after": true }],
"max-len": [2, 120, 4],
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
"new-parens": 2,
"no-alert": 1,
"no-array-constructor": 2,
"no-caller": 2,
"no-case-declarations": 2,
"no-class-assign": 2,
"no-cond-assign": 2,
"no-const-assign": 2,
"no-control-regex": 2,
"no-debugger": 2,
"no-delete-var": 2,
"no-dupe-args": 2,
"no-dupe-class-members": 2,
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-duplicate-imports": 2,
"no-empty-character-class": 2,
"no-empty-pattern": 2,
"no-eval": 2,
"no-ex-assign": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-extra-boolean-cast": 2,
"no-extra-parens": [2, "functions"],
"no-extra-semi": 2,
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-func-assign": 2,
"no-implied-eval": 2,
"no-inner-declarations": [2, "functions"],
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-iterator": 2,
"no-label-var": 2,
"no-labels": [2, { "allowLoop": false, "allowSwitch": false }],
"no-lone-blocks": 2,
"no-loop-func": 2,
"no-mixed-spaces-and-tabs": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-multiple-empty-lines": [2, { "max": 1 }],
"no-native-reassign": 2,
"no-negated-in-lhs": 2,
"no-new": 2,
"no-new-func": 2,
"no-new-object": 2,
"no-new-require": 2,
"no-new-symbol": 2,
"no-new-wrappers": 2,
"no-obj-calls": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-path-concat": 2,
"no-proto": 2,
"no-redeclare": 2,
"no-regex-spaces": 2,
"no-return-assign": [2, "except-parens"],
"no-script-url": 2,
"no-self-assign": 2,
"no-self-compare": 2,
"no-sequences": 2,
"no-shadow-restricted-names": 2,
"no-spaced-func": 2,
"no-sparse-arrays": 2,
"no-this-before-super": 2,
"no-throw-literal": 2,
"no-trailing-spaces": 2,
"no-undef": 2,
"no-undef-init": 2,
"no-unexpected-multiline": 2,
"no-unmodified-loop-condition": 2,
"no-unneeded-ternary": [2, { "defaultAssignment": false }],
"no-unreachable": 2,
"no-unsafe-finally": 2,
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
"no-useless-call": 2,
"no-useless-computed-key": 2,
"no-useless-concat": 2,
"no-useless-constructor": 2,
"no-useless-escape": 2,
"no-var": 2,
"no-whitespace-before-property": 2,
"no-with": 2,
"object-curly-spacing": ["error", "always"],
"operator-linebreak": [2, "after"],
"padded-blocks": [2, "never"],
"prefer-const": 2,
"prefer-rest-params": 2,
"prefer-template": 2,
"quotes": [2, "single", "avoid-escape"],
"radix": 2,
"rest-spread-spacing": ["error"],
"semi": [2, "always"],
"semi-spacing": [2, { "before": false, "after": true }],
"space-before-blocks": [2, "always"],
"space-before-function-paren": [2, { "anonymous": "always", "named": "never" }],
"space-in-parens": [2, "never"],
"space-infix-ops": 2,
"space-unary-ops": [2, { "words": true, "nonwords": false }],
"spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }],
"template-curly-spacing": [2, "never"],
"use-isnan": 2,
"valid-typeof": 2,
"wrap-iife": [2, "outside"],
"yield-star-spacing": [2, "both"],
"yoda": [2, "never"]
"accessor-pairs": "error",
"camelcase": "off",
"constructor-super": "error",
"curly": ["error", "all"],
"default-case": ["error", { "commentPattern": "^no default$" }],
"eqeqeq": ["error", "allow-null"],
"handle-callback-err": ["error", "^(err|error)$" ],
"new-cap": ["error", { "newIsCap": true, "capIsNew": false }],
"no-alert": "warn",
"no-array-constructor": "error",
"no-caller": "error",
"no-case-declarations": "error",
"no-class-assign": "error",
"no-compare-neg-zero": "error",
"no-cond-assign": "error",
"no-console": ["error", { "allow": ["warn", "error"] }],
"no-const-assign": "error",
"no-control-regex": "error",
"no-debugger": "error",
"no-delete-var": "error",
"no-dupe-args": "error",
"no-dupe-class-members": "error",
"no-dupe-keys": "error",
"no-duplicate-case": "error",
"no-empty-character-class": "error",
"no-empty-pattern": "error",
"no-eval": "error",
"no-ex-assign": "error",
"no-extend-native": "error",
"no-extra-bind": "error",
"no-extra-boolean-cast": "error",
"no-fallthrough": "error",
"no-func-assign": "error",
"no-implied-eval": "error",
"no-inner-declarations": ["error", "functions"],
"no-invalid-regexp": "error",
"no-iterator": "error",
"no-label-var": "error",
"no-labels": ["error", { "allowLoop": false, "allowSwitch": false }],
"no-lone-blocks": "error",
"no-loop-func": "error",
"no-multi-str": "error",
"no-native-reassign": "error",
"no-negated-in-lhs": "error",
"no-new": "error",
"no-new-func": "error",
"no-new-object": "error",
"no-new-require": "error",
"no-new-symbol": "error",
"no-new-wrappers": "error",
"no-obj-calls": "error",
"no-octal": "error",
"no-octal-escape": "error",
"no-path-concat": "error",
"no-proto": "error",
"no-redeclare": "error",
"no-regex-spaces": "error",
"no-return-assign": ["error", "except-parens"],
"no-script-url": "error",
"no-self-assign": "error",
"no-self-compare": "error",
"no-sequences": "error",
"no-shadow-restricted-names": "error",
"no-sparse-arrays": "error",
"no-this-before-super": "error",
"no-throw-literal": "error",
"no-undef": "error",
"no-undef-init": "error",
"no-unexpected-multiline": "error",
"no-unmodified-loop-condition": "error",
"no-unneeded-ternary": ["error", { "defaultAssignment": false }],
"no-unreachable": "error",
"no-unsafe-finally": "error",
"no-unused-vars": ["error", { "vars": "all", "args": "none" }],
"no-useless-call": "error",
"no-useless-computed-key": "error",
"no-useless-concat": "error",
"no-useless-constructor": "error",
"no-useless-escape": "error",
"no-var": "error",
"no-with": "error",
"prefer-const": "error",
"prefer-rest-params": "error",
"prefer-template": "error",
"radix": "error",
"require-yield": "error",
"sort-imports": ["error", { "memberSyntaxSortOrder": ["none", "all", "single", "multiple"], "ignoreCase": true }],
"spaced-comment": ["error", "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }],
"use-isnan": "error",
"valid-typeof": "error",
"yoda": ["error", "never"],

"prettier/prettier": "error",

"jest/consistent-test-it": ["error", {"fn": "test"}],
"jest/no-disabled-tests": "error",
"jest/no-test-prefixes": "error",
"jest/prefer-to-be-null": "error",
"jest/prefer-to-be-undefined": "error",
"jest/prefer-to-have-length": "error",
"jest/valid-describe": "error",
"jest/valid-expect": "error",
"jest/valid-expect-in-promise": "error"
}
}
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ language: node_js
node_js:
- "6"
script:
- npm run lint
- npm run flow
- npm run test
- npm run lint:ci
- npm run flow -- check
- npm run test:ci
- npm run build
after_success:
- npm run test:coverage
5 changes: 5 additions & 0 deletions examples/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"no-console": "off"
}
}
4 changes: 2 additions & 2 deletions examples/redux/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import inquirer from 'inquirer';
import store from './src/redux';
import * as Action from './src/redux/actions';
import * as Selector from './src/redux/selectors';
import inquirer from 'inquirer';
import store from './src/redux';

const REPO = 'paularmstrong/normalizr';

Expand Down
31 changes: 19 additions & 12 deletions examples/redux/src/api/schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@ import { schema } from '../../../../src';

export const user = new schema.Entity('users');

export const commit = new schema.Entity('commits', {
author: user,
committer: user
}, { idAttribute: 'sha' });
export const commit = new schema.Entity(
'commits',
{
author: user,
committer: user
},
{ idAttribute: 'sha' }
);

export const label = new schema.Entity('labels');

Expand All @@ -15,21 +19,24 @@ export const milestone = new schema.Entity('milestones', {

export const issue = new schema.Entity('issues', {
assignee: user,
assignees: [ user ],
labels: [ label ],
assignees: [user],
labels: [label],
milestone,
user
});

export const pullRequest = new schema.Entity('pullRequests', {
assignee: user,
assignees: [ user ],
labels: [ label ],
assignees: [user],
labels: [label],
milestone,
user
});

export const issueOrPullRequest = new schema.Array({
issues: issue,
pullRequests: pullRequest
}, (entity) => entity.pull_request ? 'pullRequests' : 'issues');
export const issueOrPullRequest = new schema.Array(
{
issues: issue,
pullRequests: pullRequest
},
(entity) => (entity.pull_request ? 'pullRequests' : 'issues')
);
7 changes: 2 additions & 5 deletions examples/redux/src/redux/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ import * as schema from '../api/schema';
import api from '../api';
import reducer from './reducer';
import thunk from 'redux-thunk';
import { createStore, applyMiddleware } from 'redux';
import { applyMiddleware, createStore } from 'redux';

export default createStore(
reducer,
applyMiddleware(thunk.withExtraArgument({ api, schema }))
);
export default createStore(reducer, applyMiddleware(thunk.withExtraArgument({ api, schema })));
25 changes: 14 additions & 11 deletions examples/redux/src/redux/modules/commits.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as Repo from './repos';
import { commit } from '../../api/schema';
import { denormalize, normalize } from '../../../../../src';
import { ADD_ENTITIES, addEntities } from '../actions';
import { denormalize, normalize } from '../../../../../src';

export const STATE_KEY = 'commits';

Expand All @@ -22,16 +22,19 @@ export const getCommits = ({ page = 0 } = {}) => (dispatch, getState, { api, sch
const state = getState();
const owner = Repo.selectOwner(state);
const repo = Repo.selectRepo(state);
return api.repos.getCommits({
owner,
repo
}).then((response) => {
const data = normalize(response, [ schema.commit ]);
dispatch(addEntities(data.entities));
return response;
}).catch((error) => {
console.error(error);
});
return api.repos
.getCommits({
owner,
repo
})
.then((response) => {
const data = normalize(response, [schema.commit]);
dispatch(addEntities(data.entities));
return response;
})
.catch((error) => {
console.error(error);
});
};

export const selectHydrated = (state, id) => denormalize(id, commit, state);
Loading

0 comments on commit 27be1ef

Please sign in to comment.