diff --git a/.jscsrc b/.jscsrc deleted file mode 100644 index edc2a8c..0000000 --- a/.jscsrc +++ /dev/null @@ -1,99 +0,0 @@ -{ - "disallowEmptyBlocks": true, - "disallowKeywordsOnNewLine": ["else"], - "disallowMixedSpacesAndTabs": true, - "disallowMultipleLineStrings": true, - "disallowMultipleVarDecl": true, - "disallowNewlineBeforeBlockStatements": true, - "disallowQuotedKeysInObjects": "allButReserved", - "disallowSpaceAfterObjectKeys": true, - "disallowSpaceAfterPrefixUnaryOperators": true, - "disallowSpaceBeforePostfixUnaryOperators": true, - "disallowSpacesInAnonymousFunctionExpression": { - "beforeOpeningRoundBrace": true - }, - "disallowSpacesInCallExpression": true, - "disallowSpacesInFunction": { - "beforeOpeningRoundBrace": true - }, - "disallowSpacesInFunctionDeclaration": { - "beforeOpeningRoundBrace": true - }, - "disallowSpacesInNamedFunctionExpression": { - "beforeOpeningRoundBrace": true - }, - "disallowSpacesInsideArrayBrackets": "all", - "disallowSpacesInsideObjectBrackets": "all", - "disallowSpacesInsideParentheses": true, - "disallowTrailingComma": true, - "disallowYodaConditions": true, - "requireBlocksOnNewline": true, - "requireCapitalizedConstructors": true, - "requireCommaBeforeLineBreak": true, - "requireCurlyBraces": [ - "if", - "else", - "for", - "while", - "do", - "try", - "catch", - "case", - "default" - ], - "requireDotNotation": true, - "requireOperatorBeforeLineBreak": true, - "requirePaddingNewlinesBeforeKeywords": [ - "do", - "for", - "switch", - "case", - "try", - "void", - "while", - "with" - ], - "requireParenthesesAroundIIFE": true, - "requireSpaceAfterBinaryOperators": true, - "requireSpaceAfterKeywords": [ - "do", - "for", - "else", - "switch", - "case", - "try", - "catch", - "void", - "while", - "with", - "return", - "typeof" - ], - "requireSpaceBeforeBinaryOperators": true, - "requireSpaceBeforeBlockStatements": true, - "requireSpaceBeforeKeywords": [ - "else", - "while", - "catch" - ], - "requireSpaceBeforeObjectValues": true, - "requireSpaceBetweenArguments": true, - "requireSpacesInAnonymousFunctionExpression": { - "beforeOpeningCurlyBrace": true - }, - "requireSpacesInConditionalExpression": true, - "requireSpacesInForStatement": true, - "requireSpacesInFunction": { - "beforeOpeningCurlyBrace": true - }, - "requireSpacesInFunctionDeclaration": { - "beforeOpeningCurlyBrace": true - }, - "requireSpacesInNamedFunctionExpression": { - "beforeOpeningCurlyBrace": true - }, - "safeContextKeyword": [], - "validateIndentation": 2, - "validateParameterSeparator": ", ", - "validateQuoteMarks": { "mark": "'", "escape": true } -} diff --git a/.travis.yml b/.travis.yml index 077610d..15bc0a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ node_js: - "5" - "6" - "7" + - "8" cache: directories: diff --git a/package.json b/package.json index 8c7ecef..c73625e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "npm-package-json-lint-config-default", - "version": "1.0.0", + "version": "1.1.0", "description": "Default npm-package-json-lint shareable config", "keywords": [ "lint", @@ -24,23 +24,21 @@ "main": "index.js", "scripts": { "eslint": "eslint *.js --format=node_modules/eslint-formatter-pretty", - "jscs": "jscs *.js", "jsonlint": "jsonlint *.json", - "lint": "npm run npmpackagejsonlint && npm run eslint && npm run jscs && npm run jsonlint", + "lint": "npm run npmpackagejsonlint && npm run eslint && npm run jsonlint", "npmpackagejsonlint": "pjl-cli -c .npmpackagejsonlintrc.json", - "test": "mocha test" + "test": "mocha" }, "devDependencies": { - "eslint": "^3.15.0", - "eslint-config-tc": "^1.4.0", + "chai": "^4.1.0", + "eslint": "^4.3.0", + "eslint-config-tc": "^2.1.0", "eslint-formatter-pretty": "^1.1.0", "is-plain-obj": "^1.1.0", - "jscs": "^3.0.7", "jsonlint": "^1.6.2", - "mocha": "^3.2.0", - "npm-package-json-lint": "^2.0.2", - "should": "^11.2.0", - "temp-write": "^3.1.0" + "mocha": "^3.5.0", + "npm-package-json-lint": "^2.6.0", + "temp-write": "^3.3.0" }, "peerDependencies": { "npm-package-json-lint": ">= 2" diff --git a/test/tests.js b/test/tests.js index f3bf499..6457a67 100644 --- a/test/tests.js +++ b/test/tests.js @@ -1,10 +1,12 @@ 'use strict'; -const should = require('should'); +const chai = require('chai'); const isPlainObj = require('is-plain-obj'); const config = require('./../index.js'); const lint = require('./helper/testHelper.js'); +const should = chai.should(); + describe('npm-package-json-lint config tests', () => { context('npm-package-json-lint config object', () => { it('should be an object', () => { @@ -27,7 +29,7 @@ describe('npm-package-json-lint config tests', () => { const expectedErrorCount = 2; results.errors.length.should.equal(expectedErrorCount); - results.hasOwnProperty('warnings').should.be.false(); + results.hasOwnProperty('warnings').should.be.false; }); }); });