From de71f2275cbba787bdb73080aebe65d847af6d4d Mon Sep 17 00:00:00 2001 From: Mike McNeil Date: Sun, 7 May 2017 17:10:50 -0500 Subject: [PATCH] Run sails generate etc --- .eslintrc | 39 +++++++++++++++++++++++++++++++++++++++ .gitignore | 3 ++- .travis.yml | 3 --- appveyor.yml | 3 --- lib/parley.js | 1 - test/.eslintrc | 20 ++++++++++++++++++++ 6 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 .eslintrc create mode 100644 test/.eslintrc diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..95e0db1 --- /dev/null +++ b/.eslintrc @@ -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"] + } + +} diff --git a/.gitignore b/.gitignore index 1bd4d97..64c8f49 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,9 @@ # sails / node.js / npm ############################ node_modules +.tmp npm-debug.log +.waterline .node_history ############################ @@ -42,5 +44,4 @@ nbproject ############################ # misc ############################ -.tmp dump.rdb diff --git a/.travis.yml b/.travis.yml index fb60c2d..105f2fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,7 @@ language: node_js node_js: - - "0.10" - - "0.12" - "4" - - "5" - "6" - "7" - "node" diff --git a/appveyor.yml b/appveyor.yml index bc5ee85..7e7811a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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" diff --git a/lib/parley.js b/lib/parley.js index 1e187ae..6565721 100644 --- a/lib/parley.js +++ b/lib/parley.js @@ -3,7 +3,6 @@ */ var util = require('util'); -var _ = require('@sailshq/lodash'); var Deferred = require('./private/Deferred'); diff --git a/test/.eslintrc b/test/.eslintrc new file mode 100644 index 0000000..694f984 --- /dev/null +++ b/test/.eslintrc @@ -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 + } + +}