Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump mastarm to v5.0.2 to resolve security vulnerabilities #442

Merged
merged 6 commits into from
Jul 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ notifications:
email: false
slack: conveyal:WQxmWiu8PdmujwLw4ziW72Gc
node_js:
- '8'
- '12' # must be at least v10 for mastarm 5
cache:
yarn: true
before_install:
Expand Down
5 changes: 4 additions & 1 deletion lib/editor/util/validation.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@ export function validate (
case 'GTFS_ID':
// Indices contains list of all indexes of occurrences of the ID value.
const indices = []
const idList = entities ? entities.map(e => e[name]) : []
const idList = entities ? entities.map(e => {
// $FlowFixMe too many unions for flow to handle
return name in e ? e[name] : null
}) : []
let idx = idList.indexOf(value)
while (idx !== -1) {
indices.push(idx)
Expand Down
1 change: 1 addition & 0 deletions lib/gtfsplus/components/GtfsPlusField.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,5 +123,6 @@ export default class GtfsPlusField extends Component<Props> {
value={stopValue} />
)
}
return null
}
}
5 changes: 4 additions & 1 deletion lib/public/components/UserAccount.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ export default class UserAccount extends Component<Props> {
render () {
const {activeComponent, projectId, projects, user} = this.props
const {profile} = user
if (!profile) return console.warn('User profile not found', user)
if (!profile) {
console.warn('User profile not found', user)
return null
}
const subscriptions: Array<Subscription> = profile.app_metadata.datatools
.find(dt => dt.client_id === process.env.AUTH0_CLIENT_ID).subscriptions
const ACCOUNT_SECTIONS = [
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@
"enzyme": "^3.9.0",
"enzyme-adapter-react-15.4": "^1.3.1",
"enzyme-to-json": "^3.3.5",
"flow-bin": "^0.77.0",
"flow-bin": "0.84",
"flow-coverage-report": "^0.3.0",
"fs-extra": "^6.0.1",
"js-yaml": "^3.11.0",
"jsonwebtoken": "^7.4.1",
"mastarm": "^4.4.1",
"mastarm": "^5.0.2",
"md5-file": "^4.0.0",
"nock": "^9.0.14",
"puppeteer": "^1.11.0",
Expand Down
Loading