Skip to content

Commit

Permalink
Update boilerplate
Browse files Browse the repository at this point in the history
  • Loading branch information
mikermcneil committed Dec 10, 2017
1 parent 654ae07 commit 8fdbf83
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 51 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@
"no-trailing-spaces": ["warn"],
"no-undef": ["error"],
"no-unexpected-multiline": ["warn"],
"no-unused-vars": ["warn"],
"no-unreachable": ["warn"],
"no-unused-vars": ["warn", {"caughtErrors":"all", "caughtErrorsIgnorePattern": "^unused($|[A-Z].*$)"}],
"no-use-before-define": ["error", {"functions":false}],
"one-var": ["warn", "never"],
"quotes": ["warn", "single", {"avoidEscape":false, "allowTemplateLiterals":true}],
Expand Down
9 changes: 3 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
# sails / node.js / npm
############################
node_modules
.tmp
npm-debug.log
package-lock.json
.waterline
.node_history

############################
Expand All @@ -42,10 +45,4 @@ nbproject
############################
# misc
############################
.tmp
dump.rdb
testApp
-coverage
-isolate-0x*
ssl
package-lock.json
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
./.jshintrc
./.editorconfig
./.travis.yml
./appveyor.yml
./example
./examples
./test
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# ╔╦╗╦═╗╔═╗╦ ╦╦╔═╗ ┬ ┬┌┬┐┬ #
# ║ ╠╦╝╠═╣╚╗╔╝║╚═╗ └┬┘││││ #
# o ╩ ╩╚═╩ ╩ ╚╝ ╩╚═╝o ┴ ┴ ┴┴─┘ #
Expand Down
3 changes: 1 addition & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ test_script:
# But seriously, always good to audit this kind of stuff for debugging.)
- node --version
- npm --version
# Run the actual tests.
# (But note that we skip linting.)
# Run the actual tests (but note that we skip linting.)
- npm run custom-tests


Expand Down
54 changes: 13 additions & 41 deletions test/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,48 +1,20 @@
{
// ╔═╗╔═╗╦ ╦╔╗╔╔╦╗┬─┐┌─┐
// ║╣ ╚═╗║ ║║║║ ║ ├┬┘│
// o╚═╝╚═╝╩═╝╩╝╚╝ ╩ ┴└─└─┘
// A set of basic conventions (similar to .jshintrc) for use within any
// arbitrary JavaScript / Node.js package -- inside or outside Sails.js.
// 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`.
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// ╔═╗╔═╗╦ ╦╔╗╔╔╦╗┬─┐┌─┐ ┌─┐┬ ┬┌─┐┬─┐┬─┐┬┌┬┐┌─┐
// ║╣ ╚═╗║ ║║║║ ║ ├┬┘│ │ │└┐┌┘├┤ ├┬┘├┬┘│ ││├┤
// 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": {
"node": true,
"mocha": true
},

"parserOptions": {
"ecmaVersion": 5
},

"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": [1, 2, {"SwitchCase": 1}],
"linebreak-style": [2, "unix"],
"no-dupe-keys": [2],
"no-duplicate-case": [2],
"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"],
"quotes": [1, "single", { "avoidEscape": false, "allowTemplateLiterals": true }],
"semi": [2, "always"]
}

}

0 comments on commit 8fdbf83

Please sign in to comment.