Skip to content

Commit

Permalink
deps: update flow-bin to version 0.33.0 🚀 (#429)
Browse files Browse the repository at this point in the history
* chore(package): update flow-bin to version 0.33.0

https://greenkeeper.io/

* fix: flow errors

* fix: do not cache appveyor build
  • Loading branch information
greenkeeperio-bot authored and zacharygolba committed Sep 30, 2016
1 parent d3c67a5 commit fd7bbe2
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
1 change: 1 addition & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ decl
.*/dist/.*
.*/docs/.*
.*/scripts/.*
.*/examples/.*
.*/node_modules/bcryptjs/*

[options]
Expand Down
4 changes: 0 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ environment:
services:
- mysql

cache:
- C:\projects\lux\node_modules
- C:\projects\lux\test\test-app\node_modules

install:
- ps: C:\projects\lux\scripts\appveyor\install.ps1

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"documentation": "4.0.0-beta9",
"eslint-plugin-flowtype": "2.19.0",
"faker": "3.1.0",
"flow-bin": "0.32.0",
"flow-bin": "0.33.0",
"mocha": "3.1.0",
"node-fetch": "1.6.3",
"nyc": "8.3.0",
Expand Down
4 changes: 3 additions & 1 deletion src/packages/jsonapi/interfaces.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ interface JSONAPI$LinkObject {
type JSONAPI$Link = ?(string | JSONAPI$LinkObject);

interface JSONAPI$ResourceLinksObject {
// $FlowIgnore
self?: JSONAPI$Link;
related?: JSONAPI$Link;
}
Expand Down Expand Up @@ -74,7 +75,8 @@ export interface JSONAPI$ErrorObject {
}

export interface JSONAPI$Document {
data?: JSONAPI$ResourceObject | Array<JSONAPI$ResourceObject>;
// $FlowIgnore
data?: Array<JSONAPI$ResourceObject> | JSONAPI$ResourceObject;
links?: JSONAPI$DocumentLinks;
errors?: Array<JSONAPI$ErrorObject>;
included?: Array<JSONAPI$ResourceObject>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ import { createServerError } from '../../../../server';
class ResourceMismatchError extends TypeError {
constructor(path: string, expected: mixed, actual: mixed) {
if (typeof actual === 'string') {
actual = `'${actual}'`;
actual = `'${String(actual)}'`;
}

actual = String(actual);
expected = String(expected);

super(`Expected '${expected}' for parameter '${path}' but got ${actual}.`);
}
}
Expand Down

0 comments on commit fd7bbe2

Please sign in to comment.