Skip to content

Commit

Permalink
Run sails generate etc
Browse files Browse the repository at this point in the history
  • Loading branch information
mikermcneil committed May 7, 2017
1 parent d82ea5b commit de71f22
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 8 deletions.
39 changes: 39 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
// ╔═╗╔═╗╦ ╦╔╗╔╔╦╗┬─┐┌─┐
// ║╣ ╚═╗║ ║║║║ ║ ├┬┘│
// o╚═╝╚═╝╩═╝╩╝╚╝ ╩ ┴└─└─┘
// A set of basic conventions designed to complement the .jshintrc file.
// For the master copy of this file, see the `.eslintrc` template file in
// the `sails-generate` package (https://www.npmjs.com/package/sails-generate.)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// For more information about any of the rules below, check out the relevant
// reference page on eslint.org. For example, to get details on "no-sequences",
// you would visit `http://eslint.org/docs/rules/no-sequences`.
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

"env": {
"node": true
},

"rules": {
"callback-return": [2, ["callback", "cb", "next", "done", "proceed"]],
"camelcase": [1, {"properties": "always"}],
"comma-style": [2, "last"],
"curly": [2],
"eqeqeq": [2, "always"],
"eol-last": [1],
"handle-callback-err": [2],
"indent": [2, 2, {"SwitchCase": 1}],
"linebreak-style": [2, "unix"],
"no-mixed-spaces-and-tabs": [2, "smart-tabs"],
"no-return-assign": [2, "always"],
"no-sequences": [2],
"no-trailing-spaces": [1],
"no-undef": [2],
"no-unexpected-multiline": [1],
"no-unused-vars": [1],
"one-var": [2, "never"],
"semi": [2, "always"]
}

}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
# sails / node.js / npm
############################
node_modules
.tmp
npm-debug.log
.waterline
.node_history

############################
Expand All @@ -42,5 +44,4 @@ nbproject
############################
# misc
############################
.tmp
dump.rdb
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
language: node_js

node_js:
- "0.10"
- "0.12"
- "4"
- "5"
- "6"
- "7"
- "node"
Expand Down
3 changes: 0 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
# Test against these versions of Node.js.
environment:
matrix:
- nodejs_version: "0.10"
- nodejs_version: "0.12"
- nodejs_version: "4"
- nodejs_version: "5"
- nodejs_version: "6"
- nodejs_version: "7"

Expand Down
1 change: 0 additions & 1 deletion lib/parley.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/

var util = require('util');
var _ = require('@sailshq/lodash');
var Deferred = require('./private/Deferred');


Expand Down
20 changes: 20 additions & 0 deletions test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
// ╔═╗╔═╗╦ ╦╔╗╔╔╦╗┬─┐┌─┐ ┌─┐┬ ┬┌─┐┬─┐┬─┐┬┌┬┐┌─┐
// ║╣ ╚═╗║ ║║║║ ║ ├┬┘│ │ │└┐┌┘├┤ ├┬┘├┬┘│ ││├┤
// o╚═╝╚═╝╩═╝╩╝╚╝ ╩ ┴└─└─┘ └─┘ └┘ └─┘┴└─┴└─┴─┴┘└─┘
// ┌─ ┌─┐┌─┐┬─┐ ┌─┐┬ ┬┌┬┐┌─┐┌┬┐┌─┐┌┬┐┌─┐┌┬┐ ┌┬┐┌─┐┌─┐┌┬┐┌─┐ ─┐
// │ ├┤ │ │├┬┘ ├─┤│ │ │ │ ││││├─┤ │ ├┤ ││ │ ├┤ └─┐ │ └─┐ │
// └─ └ └─┘┴└─ ┴ ┴└─┘ ┴ └─┘┴ ┴┴ ┴ ┴ └─┘─┴┘ ┴ └─┘└─┘ ┴ └─┘ ─┘
// > An .eslintrc configuration override for use with the tests in this directory.
//
// (See .eslintrc in the root directory of this package for more info.)

"extends": [
"../.eslintrc"
],

"env": {
"mocha": true
}

}

0 comments on commit de71f22

Please sign in to comment.