Skip to content
This repository has been archived by the owner on Oct 1, 2019. It is now read-only.

Commit

Permalink
Merge node-lts into master
Browse files Browse the repository at this point in the history
  • Loading branch information
indeyets committed Nov 1, 2016
2 parents a360a23 + 1240fb6 commit 4cf017d
Show file tree
Hide file tree
Showing 138 changed files with 2,217 additions and 5,210 deletions.
41 changes: 36 additions & 5 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
{
"extends": "eslint:recommended",
"extends": [
"eslint:recommended",
"plugin:flowtype/recommended"
],
"parser": "babel-eslint",
"plugins": [
"babel",
"import",
"lodash",
"prefer-object-spread",
"react"
"react",
"flowtype"
],
"parserOptions": {
"ecmaVersion": 6,
"ecmaVersion": 2107,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
},
}
},
"settings": {
"flowtype": {
"onlyFilesWithFlowAnnotation": true
},
"import/ignore": [
"node_modules"
],
"react": {
"pragma": "React",
"version": "15.0"
Expand Down Expand Up @@ -121,6 +131,27 @@
"react/self-closing-comp": 2,
"react/sort-comp": 2,
"react/sort-prop-types": 2,
"react/style-prop-object": 2
"react/style-prop-object": 2,

"flowtype/boolean-style": [2, "boolean"],
"flowtype/define-flow-type": 2,
"flowtype/delimiter-dangle": [2, "never"],
"flowtype/generic-spacing": [2, "never"],
"flowtype/no-dupe-keys": 2,
"flowtype/no-weak-types": 1,
"flowtype/require-parameter-type": 2,
"flowtype/require-return-type": [2, "always", {
"annotateUndefined": "never",
"excludeArrowFunctions": "expressionsOnly"
}],
"flowtype/require-valid-file-annotation": [2, "never"],
"flowtype/semi": [2, "always"],
"flowtype/sort-keys": [2, "asc", { "caseSensitive": true, "natural": true }],
"flowtype/space-after-type-colon": [2, "always"],
"flowtype/space-before-generic-bracket": [2, "never"],
"flowtype/space-before-type-colon": [2, "never"],
"flowtype/type-id-match": [2, "^([A-Z][A-Za-z0-9]*)$"],
"flowtype/union-intersection-spacing": [2, "always"],
"flowtype/use-flow-type": 2
}
}
19 changes: 19 additions & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[include]
./src/*

[ignore]
.*/node_modules/fbjs/*
.*/node_modules/react-leaflet/*
.*/node_modules/react-render-hook/src/react-devtools/backend/attachRenderer.js
.*/node_modules/react-render-hook/src/react-devtools/backend/backend.js

[libs]
./src/definitions/lib

[options]
module.ignore_non_literal_requires=true
esproposal.decorators=ignore
esproposal.class_instance_fields=enable

suppress_type=$FlowIssue
suppress_type=$FlowFixMe
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v6.7
v6.9
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ sudo: required # requirement for postgres 9.5
dist: trusty

node_js:
- "6.5"
- "6.7"
- "6.9"

services:
- postgresql
Expand Down
4 changes: 2 additions & 2 deletions deploy/production/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ sphinx:
- "127.0.0.1:9306:9306"
restart: always
app:
image: "quay.io/dipstudio/libertysoil:1.7.2"
image: "quay.io/dipstudio/libertysoil:1.8.0"
ports:
- "127.0.0.1:8000:8000"
links:
Expand All @@ -49,7 +49,7 @@ app:
- "./secrets.env"
restart: always
queue:
image: "quay.io/dipstudio/libertysoil:1.7.2"
image: "quay.io/dipstudio/libertysoil:1.8.0"
links:
- db
- redis
Expand Down

0 comments on commit 4cf017d

Please sign in to comment.