Skip to content

Commit

Permalink
Merge branch 'release/1.3.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
davesag committed Apr 13, 2021
2 parents cb612f2 + 512b283 commit 4b109e4
Show file tree
Hide file tree
Showing 9 changed files with 12,997 additions and 4,312 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

- restore_cache:
keys:
- dependencies-{{ checksum "package.json" }}
- dependencies-v2-{{ checksum "package.json" }}

- run:
name: Install global packages
Expand All @@ -21,7 +21,7 @@ jobs:
command: npm install

- save_cache:
key: dependencies-{{ checksum "package.json" }}
key: dependencies-v2-{{ checksum "package.json" }}
paths:
- node_modules

Expand Down
6 changes: 2 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// includes mocha plugins and env here because the code is
// designed to run in a mocha context
module.exports = {
extends: ['standard', 'prettier', 'prettier/standard'],
plugins: ['prettier', 'standard', 'import', 'promise', 'mocha'],
extends: ['standard', 'plugin:prettier/recommended'],
plugins: ['import', 'promise', 'mocha'],
parserOptions: {
sourceType: 'module'
},
Expand Down
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npx --no-install lint-staged
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ By default `makeMockModels` and `listModels` will both look for your models in f

### Prerequisites

- [NodeJS](htps://nodejs.org), version 8.10.0 or better (I use [`nvm`](https:/creationix/nvm) to manage Node versions — `brew install nvm`.)
- [NodeJS](htps://nodejs.org). I use [`nvm`](https:/creationix/nvm) to manage Node versions — `brew install nvm`.

### Initialisation

Expand All @@ -406,7 +406,6 @@ npm install

- `npm test` — runs the unit tests
- `npm run test:unit:cov` — runs the unit tests with code coverage
- `npm run test:mutants` — runs the mutation tests

### Lint it

Expand Down
Loading

0 comments on commit 4b109e4

Please sign in to comment.