Skip to content

Commit

Permalink
ci(Travis): updates Travis validations
Browse files Browse the repository at this point in the history
 - Validate against current node versions
 - Test against both Webpack 1.4.x & 2.2.x
 - Remove deprecated .eslintrc
 - .eslint.yml generated from current code ( no changes )
 - add yarn lock file set to binary in git
 - ignores console for eslint in test helpers
  • Loading branch information
joshwiens committed Jan 21, 2017
1 parent e54549e commit 2fd0c78
Show file tree
Hide file tree
Showing 8 changed files with 2,386 additions and 28 deletions.
10 changes: 0 additions & 10 deletions .eslintrc

This file was deleted.

247 changes: 247 additions & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,247 @@
env:
es6: true
node: true
extends: 'eslint:recommended'
parserOptions:
sourceType: module
rules:
accessor-pairs: error
array-bracket-spacing: 'off'
array-callback-return: error
arrow-body-style: error
arrow-parens: error
arrow-spacing: error
block-scoped-var: 'off'
block-spacing:
- error
- always
brace-style:
- error
- 1tbs
- allowSingleLine: true
callback-return: 'off'
camelcase:
- error
- properties: never
capitalized-comments: 'off'
class-methods-use-this: error
comma-dangle: 'off'
comma-spacing:
- error
- after: true
before: false
comma-style:
- error
- last
complexity: error
computed-property-spacing:
- error
- never
consistent-return: 'off'
consistent-this: error
curly: 'off'
default-case: 'off'
dot-location: error
dot-notation:
- error
- allowKeywords: true
eol-last: error
eqeqeq: 'off'
func-call-spacing: error
func-name-matching: 'off'
func-names: 'off'
func-style:
- error
- declaration
generator-star-spacing: error
global-require: 'off'
guard-for-in: error
handle-callback-err: error
id-blacklist: error
id-length: 'off'
id-match: error
indent: 'off'
init-declarations: 'off'
jsx-quotes: error
key-spacing: error
keyword-spacing: 'off'
line-comment-position: 'off'
linebreak-style:
- error
- unix
lines-around-comment: error
lines-around-directive: error
max-depth: error
max-len: 'off'
max-lines: error
max-nested-callbacks: error
max-params: 'off'
max-statements: 'off'
max-statements-per-line: error
multiline-ternary: 'off'
new-cap: error
new-parens: error
newline-after-var: 'off'
newline-before-return: 'off'
newline-per-chained-call: 'off'
no-alert: error
no-array-constructor: error
no-await-in-loop: error
no-bitwise: error
no-caller: error
no-catch-shadow: error
no-confusing-arrow: error
no-continue: error
no-div-regex: error
no-duplicate-imports: error
no-else-return: 'off'
no-empty-function: error
no-eq-null: 'off'
no-eval: error
no-extend-native: error
no-extra-bind: error
no-extra-label: error
no-extra-parens: 'off'
no-floating-decimal: error
no-implicit-globals: error
no-implied-eval: error
no-inline-comments: 'off'
no-inner-declarations:
- error
- functions
no-invalid-this: 'off'
no-iterator: error
no-label-var: error
no-labels: error
no-lone-blocks: error
no-lonely-if: error
no-loop-func: error
no-magic-numbers: 'off'
no-mixed-operators: error
no-mixed-requires: error
no-multi-assign: error
no-multi-spaces: 'off'
no-multi-str: error
no-multiple-empty-lines: error
no-native-reassign: error
no-negated-condition: 'off'
no-negated-in-lhs: error
no-nested-ternary: error
no-new: error
no-new-func: error
no-new-object: error
no-new-require: error
no-new-wrappers: error
no-octal-escape: error
no-param-reassign: 'off'
no-path-concat: error
no-plusplus:
- error
- allowForLoopAfterthoughts: true
no-process-env: error
no-process-exit: error
no-proto: error
no-prototype-builtins: error
no-restricted-globals: error
no-restricted-imports: error
no-restricted-modules: error
no-restricted-properties: error
no-restricted-syntax: error
no-return-assign: error
no-return-await: error
no-script-url: error
no-self-compare: error
no-sequences: error
no-shadow: error
no-shadow-restricted-names: error
no-spaced-func: error
no-sync: 'off'
no-tabs: 'off'
no-template-curly-in-string: error
no-ternary: 'off'
no-throw-literal: error
no-trailing-spaces:
- error
- skipBlankLines: true
no-undef-init: error
no-undefined: 'off'
no-underscore-dangle: error
no-unmodified-loop-condition: error
no-unneeded-ternary: error
no-unused-expressions: error
no-use-before-define: 'off'
no-useless-call: error
no-useless-computed-key: error
no-useless-concat: error
no-useless-constructor: error
no-useless-escape: error
no-useless-rename: error
no-useless-return: error
no-var: 'off'
no-void: error
no-warning-comments: error
no-whitespace-before-property: error
no-with: error
object-curly-newline: 'off'
object-curly-spacing: 'off'
object-property-newline:
- error
- allowMultiplePropertiesPerLine: true
object-shorthand: 'off'
one-var: 'off'
one-var-declaration-per-line: error
operator-assignment: error
operator-linebreak: 'off'
padded-blocks: 'off'
prefer-arrow-callback: 'off'
prefer-const: error
prefer-destructuring:
- error
- array: false
object: false
prefer-numeric-literals: error
prefer-promise-reject-errors: error
prefer-reflect: 'off'
prefer-rest-params: error
prefer-spread: error
prefer-template: 'off'
quote-props: 'off'
quotes: 'off'
radix:
- error
- always
require-await: error
require-jsdoc: 'off'
rest-spread-spacing: error
semi: 'off'
semi-spacing:
- error
- after: true
before: false
sort-imports: error
sort-keys: 'off'
sort-vars: error
space-before-blocks: 'off'
space-before-function-paren: 'off'
space-in-parens:
- error
- never
space-infix-ops: error
space-unary-ops: error
spaced-comment: 'off'
strict: error
symbol-description: error
template-curly-spacing: error
unicode-bom:
- error
- never
valid-jsdoc: error
vars-on-top: 'off'
wrap-iife:
- error
- any
wrap-regex: 'off'
yield-star-spacing: error
yoda:
- error
- never
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
yarn.lock -diff
* text=auto
bin/* eol=lf
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
coverage
coverage
npm-debug.log
38 changes: 29 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,32 @@
sudo: false
language: node_js
node_js:
- "0.12"
- "node"
- "iojs"
script: npm run travis

branches:
only:
- master
matrix:
fast_finish: true
include:
- os: linux
node_js: "7"
env: WEBPACK_VERSION="2.2.0" JOB_PART=lint
- os: linux
node_js: "6"
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
- os: linux
node_js: "4.7"
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
- os: linux
node_js: "7"
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
- os: linux
node_js: "4.7"
env: WEBPACK_VERSION="1.14.0" JOB_PART=test
before_install:
- nvm --version
- node --version
before_script:
- 'if [ "$WEBPACK_VERSION" ]; then yarn add webpack@^$WEBPACK_VERSION; fi'
script:
- yarn run travis:$JOB_PART
after_success:
- cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose
- cat ./coverage/coverage.json | node_modules/codecov.io/bin/codecov.io.js
- rm -rf ./coverage
- bash <(curl -s https://codecov.io/bash)
15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "Tobias Koppers @sokra",
"description": "css loader module for webpack",
"engines": {
"node": ">=0.12.0"
"node": ">=0.12.0 || >=4.3.0 <5.0.0 || >=5.10"
},
"files": ["index.js", "locals.js", "lib"],
"dependencies": {
Expand All @@ -22,15 +22,18 @@
"source-list-map": "^0.1.7"
},
"devDependencies": {
"codecov.io": "^0.1.2",
"coveralls": "^2.11.2",
"codecov": "^1.0.1",
"eslint": "3.14.0",
"istanbul": "^0.4.5",
"mocha": "^3.1.2",
"should": "^11.1.1"
"mocha": "^3.2.0",
"should": "^11.1.2"
},
"scripts": {
"test": "mocha",
"travis": "npm run cover -- --report lcovonly",
"test:cover": "npm run cover -- --report lcovonly",
"lint": "eslint lib test",
"travis:test": "npm run cover",
"travis:lint": "npm run lint",
"cover": "istanbul cover node_modules/mocha/bin/_mocha",
"publish-patch": "mocha && npm version patch && git push && git push --tags && npm publish"
},
Expand Down
4 changes: 2 additions & 2 deletions test/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function getEvaluated(output, modules) {
return "{" + module + "}";
});
} catch(e) {
console.error(output);
console.error(output); // eslint-disable-line no-console
throw e;
}
delete m.exports.toString;
Expand Down Expand Up @@ -71,7 +71,7 @@ exports.test = function test(name, input, result, query, modules) {

exports.testError = function test(name, input, onError) {
it(name, function(done) {
runLoader(cssLoader, input, undefined, {}, function(err, output) {
runLoader(cssLoader, input, undefined, {}, function(err, output) { // eslint-disable-line no-unused-vars
if (!err) {
done(new Error('Expected error to be thrown'));
} else {
Expand Down
Loading

0 comments on commit 2fd0c78

Please sign in to comment.