From a706954cf472cf1b4c8a2713a5b914ad5aa25359 Mon Sep 17 00:00:00 2001 From: doowb Date: Mon, 19 Mar 2018 19:43:08 -0400 Subject: [PATCH] run update --- .editorconfig | 13 ++++++ .eslintrc | 24 ---------- .eslintrc.json | 117 +++++++++++++++++++++++++++++++++++++++++++++++++ .gitignore | 4 +- .travis.yml | 19 ++++---- appveyor.yml | 14 ++++++ package.json | 28 +++++++----- 7 files changed, 171 insertions(+), 48 deletions(-) create mode 100644 .editorconfig delete mode 100644 .eslintrc create mode 100644 .eslintrc.json create mode 100644 appveyor.yml diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..818e072 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,13 @@ +root = true + +[*] +indent_style = space +end_of_line = lf +charset = utf-8 +indent_size = 2 +trim_trailing_whitespace = true +insert_final_newline = true + +[{**/{actual,fixtures,expected,templates}/**,*.md}] +trim_trailing_whitespace = false +insert_final_newline = false \ No newline at end of file diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index 8ccc3bd..0000000 --- a/.eslintrc +++ /dev/null @@ -1,24 +0,0 @@ -{ - "env": { - "node": true, - "mocha": true - }, - "extends": "standard", - "rules": { - "padded-blocks": 0, - "semi": 0, - "curly": 0, - "space-before-function-paren": 0, - "space-before-blocks": 0, - "brace-style": 0, - "quotes": 0, - "new-cap": 0, - "no-multiple-empty-lines": 0, - "promise/param-names": 0, - "spaced-comment": 0, - "yoda": 0, - "keyword-spacing": 0, - "standard/object-curly-even-spacing": 0, - "comma-spacing": 0 - } -} diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..61e8895 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,117 @@ +{ + "env": { + "browser": false, + "es6": true, + "node": true, + "mocha": true + }, + + "globals": { + "document": false, + "navigator": false, + "window": false + }, + + "rules": { + "accessor-pairs": 2, + "arrow-spacing": [2, { "before": true, "after": true }], + "block-spacing": [2, "always"], + "brace-style": [2, "1tbs", { "allowSingleLine": true }], + "comma-dangle": [2, "never"], + "comma-spacing": [2, { "before": false, "after": true }], + "comma-style": [2, "last"], + "constructor-super": 2, + "curly": [2, "multi-line"], + "dot-location": [2, "property"], + "eol-last": 2, + "eqeqeq": [2, "allow-null"], + "generator-star-spacing": [2, { "before": true, "after": true }], + "handle-callback-err": [2, "^(err|error)$" ], + "indent": [2, 2, { "SwitchCase": 1 }], + "key-spacing": [2, { "beforeColon": false, "afterColon": true }], + "keyword-spacing": [2, { "before": true, "after": true }], + "new-cap": [2, { "newIsCap": true, "capIsNew": false }], + "new-parens": 2, + "no-array-constructor": 2, + "no-caller": 2, + "no-class-assign": 2, + "no-cond-assign": 2, + "no-const-assign": 2, + "no-control-regex": 2, + "no-debugger": 2, + "no-delete-var": 2, + "no-dupe-args": 2, + "no-dupe-class-members": 2, + "no-dupe-keys": 2, + "no-duplicate-case": 2, + "no-empty-character-class": 2, + "no-eval": 2, + "no-ex-assign": 2, + "no-extend-native": 2, + "no-extra-bind": 2, + "no-extra-boolean-cast": 2, + "no-extra-parens": [2, "functions"], + "no-fallthrough": 2, + "no-floating-decimal": 2, + "no-func-assign": 2, + "no-implied-eval": 2, + "no-inner-declarations": [2, "functions"], + "no-invalid-regexp": 2, + "no-irregular-whitespace": 2, + "no-iterator": 2, + "no-label-var": 2, + "no-labels": 2, + "no-lone-blocks": 2, + "no-mixed-spaces-and-tabs": 2, + "no-multi-spaces": 2, + "no-multi-str": 2, + "no-multiple-empty-lines": [2, { "max": 1 }], + "no-native-reassign": 0, + "no-negated-in-lhs": 2, + "no-new": 2, + "no-new-func": 2, + "no-new-object": 2, + "no-new-require": 2, + "no-new-wrappers": 2, + "no-obj-calls": 2, + "no-octal": 2, + "no-octal-escape": 2, + "no-proto": 0, + "no-redeclare": 2, + "no-regex-spaces": 2, + "no-return-assign": 2, + "no-self-compare": 2, + "no-sequences": 2, + "no-shadow-restricted-names": 2, + "no-spaced-func": 2, + "no-sparse-arrays": 2, + "no-this-before-super": 2, + "no-throw-literal": 2, + "no-trailing-spaces": 0, + "no-undef": 2, + "no-undef-init": 2, + "no-unexpected-multiline": 2, + "no-unneeded-ternary": [2, { "defaultAssignment": false }], + "no-unreachable": 2, + "no-unused-vars": [2, { "vars": "all", "args": "none" }], + "no-useless-call": 0, + "no-with": 2, + "one-var": [0, { "initialized": "never" }], + "operator-linebreak": [0, "after", { "overrides": { "?": "before", ":": "before" } }], + "padded-blocks": [0, "never"], + "quotes": [2, "single", "avoid-escape"], + "radix": 2, + "semi": [2, "always"], + "semi-spacing": [2, { "before": false, "after": true }], + "space-before-blocks": [2, "always"], + "space-before-function-paren": [2, "never"], + "space-in-parens": [2, "never"], + "space-infix-ops": 2, + "space-unary-ops": [2, { "words": true, "nonwords": false }], + "spaced-comment": [0, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }], + "use-isnan": 2, + "valid-typeof": 2, + "wrap-iife": [2, "any"], + "yoda": [2, "never"] + } +} diff --git a/.gitignore b/.gitignore index 1712e0a..f2a4ab2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,6 @@ # always ignore files *.DS_Store *.sublime-* -.idea -*.sock # test related, or directories generated by tests test/actual @@ -27,4 +25,4 @@ vendor temp tmp TODO.md -package-lock.json +package-lock.json \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 999e55c..6724826 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,11 @@ sudo: false +os: + - linux + - osx language: node_js node_js: - - "node" - - "8" - - "6" - - "4" - - "0.12" - - "0.10" -matrix: - fast_finish: true - allow_failures: - - node_js: "0.10" - - node_js: "0.12" + - node + - '9' + - '8' + - '6' + - '4' diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..39f4486 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,14 @@ +environment: + matrix: + - nodejs_version: '9' + - nodejs_version: '8' + - nodejs_version: '6' + - nodejs_version: '4' +install: + - ps: 'Install-Product node $env:nodejs_version' + - npm install +test_script: + - node --version + - npm --version + - npm test +build: 'off' diff --git a/package.json b/package.json index 163a0a8..5918554 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,25 @@ "name": "consolidate", "description": "Template engine consolidation library", "version": "0.15.0", + "homepage": "https://github.com/tj/consolidate.js", "author": "TJ Holowaychuk ", + "repository": "tj/consolidate.js", + "bugs": { + "url": "https://github.com/tj/consolidate.js/issues" + }, "license": "MIT", - "main": "index", - "repository": { - "type": "git", - "url": "https://github.com/visionmedia/consolidate.js.git" + "files": [ + "index.js", + "lib" + ], + "main": "index.js", + "engines": { + "node": ">= 4.0" + }, + "scripts": { + "lint": "eslint .", + "pretest": "npm run lint", + "test": "mocha" }, "dependencies": { "bluebird": "^3.1.1" @@ -73,10 +86,5 @@ "engine", "template", "view" - ], - "scripts": { - "lint": "eslint .", - "pretest": "npm run lint", - "test": "mocha" - } + ] }