Skip to content

Commit

Permalink
[change] #1 set "comma-dangle" to "always-multiline"
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Mollweide committed Sep 20, 2016
1 parent f8418df commit ffdb0e5
Show file tree
Hide file tree
Showing 32 changed files with 252 additions and 229 deletions.
6 changes: 3 additions & 3 deletions configurations/es5-browser.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module.exports = {

extends: [
'./es5.js'
'./es5.js',
].map(require.resolve),
env: {
browser: true,
node: false,
amd: false,
mocha: false,
jasmine: false
}
jasmine: false,
},

};
6 changes: 3 additions & 3 deletions configurations/es5-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ module.exports = {

extends: [
'./es5.js',
'../rules/node.js'
'../rules/node.js',
].map(require.resolve),
env: {
browser: false,
node: true,
amd: false,
mocha: false,
jasmine: false
}
jasmine: false,
},
};
6 changes: 3 additions & 3 deletions configurations/es5.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ module.exports = {
'../rules/best-practices',
'../rules/errors',
'../rules/style',
'../rules/variables'
'../rules/variables',
].map(require.resolve),
env: {},
parserOptions: {
ecmaVersion: 5,
sourceType: 'module'
}
sourceType: 'module',
},

};
6 changes: 3 additions & 3 deletions configurations/es6-browser.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module.exports = {

extends: [
'./es6.js'
'./es6.js',
].map(require.resolve),
env: {
browser: true,
node: false,
amd: false,
mocha: false,
jasmine: false
}
jasmine: false,
},

};
7 changes: 4 additions & 3 deletions configurations/es6-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ module.exports = {

extends: [
'./es6.js',
'../rules/node.js'
'../rules/node.js',
].map(require.resolve),
env: {
browser: false,
node: true,
amd: false,
mocha: false,
jasmine: false
}
jasmine: false,
},

};
58 changes: 29 additions & 29 deletions configurations/es6-react.js
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
module.exports = {
plugins: [
'plugins': [
'jsx-a11y',
'react'
'react',
],
extends: [
'extends': [
'./es6.js',
'../rules/react',
'../rules/react-a11y'
'../rules/react-a11y',
].map(require.resolve),
env: {
browser: true,
node: false,
amd: false,
mocha: false,
jasmine: false
'env': {
'browser': true,
'node': false,
'amd': false,
'mocha': false,
'jasmine': false,
},
parserOptions: {
ecmaVersion: 6,
sourceType: 'module',
ecmaFeatures: {
generators: false,
objectLiteralDuplicateProperties: false,
jsx: true
}
'parserOptions': {
'ecmaVersion': 6,
'sourceType': 'module',
'ecmaFeatures': {
'generators': false,
'objectLiteralDuplicateProperties': false,
'jsx': true,
},
},
ecmaFeatures: {
jsx: true
'ecmaFeatures': {
'jsx': true,
},
settings: {
'settings': {
'import/resolver': {
node: {
extensions: ['.js', '.jsx', '.json']
}
'node': {
'extensions': ['.js', '.jsx', '.json'],
},
},
'react': {
'pragma': 'React',
'version': '0.15',
},
react: {
pragma: 'React',
version: '0.15'
}
}
},

};
18 changes: 9 additions & 9 deletions configurations/es6.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
module.exports = {

env: {
es6: true
es6: true,
},
plugins: [
'import'
'import',
],

settings: {
'import/resolver': {
node: {
extensions: ['.js', '.json']
}
}
extensions: ['.js', '.json'],
},
},
},
extends: [
'../rules/node-disable',
Expand All @@ -21,16 +21,16 @@ module.exports = {
'../rules/style',
'../rules/variables',
'../rules/imports',
'../rules/es6'
'../rules/es6',
].map(require.resolve),

parserOptions: {
ecmaVersion: 6,
sourceType: 'module',
ecmaFeatures: {
generators: false,
objectLiteralDuplicateProperties: false
}
}
objectLiteralDuplicateProperties: false,
},
},

};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@namics/eslint-config",
"version": "1.0.0",
"version": "2.0.0",
"description": "Default configurations for eslint",
"author": "Simon Mollweide <simon.mollweide@namics.com>",
"license": "MIT",
Expand Down
3 changes: 3 additions & 0 deletions processing/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
"extends": "../configurations/es5-node.js"
};
55 changes: 30 additions & 25 deletions processing/utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict';
/* eslint "no-console": 0 */

var fs = require('fs');

Expand All @@ -7,8 +8,8 @@ module.exports = {
/**
*
* @method getStats
* @param {string} dirFileName
* @returns {object} getStats
* @param {string} dirFileName - the directory name
* @returns {Object} getStats
* @public
*/
getStats: function (dirFileName) {
Expand All @@ -18,8 +19,8 @@ module.exports = {
/**
*
* @method isDir
* @param {string} dirName
* @returns {boolean} isDir
* @param {string} dirName - the directory name
* @returns {boolean} isDir - is directory
* @public
*/
existDir: function (dirName) {
Expand All @@ -28,16 +29,18 @@ module.exports = {

try {
isDir = this.getStats(dirName).isDirectory();
} catch (err) {}
} catch (err) {
isDir = false;
}

return isDir;
},

/**
*
* @method existFile
* @param {string} path
* @returns {boolean} isFile
* @param {string} path - the path
* @returns {boolean} isFile - is given path a file or not
* @public
*/
existFile: function (path) {
Expand All @@ -46,16 +49,19 @@ module.exports = {

try {
isFile = this.getStats(path).isFile();
} catch (err) {}
} catch (err) {
isFile = false;
}

return isFile;
},

/**
*
* @method writeFile
* @param {string} path
* @param {object} data
* @param {string} path - the path
* @param {Object} data - the data object
* @returns {void}
* @public
*/
writeFile: function (path, data) {
Expand All @@ -65,8 +71,8 @@ module.exports = {
/**
*
* @method readFile
* @param {string} path
* @returns {string}
* @param {string} path - the path
* @returns {string} returns the file data
* @public
*/
readFile: function (path) {
Expand All @@ -76,13 +82,14 @@ module.exports = {
/**
*
* @method writeFile
* @param {string} dir
* @param {Array|undefined} ignoreFiles
* @param {string} dir - the directory path
* @param {Array|undefined} ignoreFiles - the files which should be ignored
* @returns {Array} the result set
* @public
*/
readDir: function (dir, ignoreFiles) {
var results = [],
list = [];
var results = [];
var list = [];

ignoreFiles = ignoreFiles || [];

Expand All @@ -92,11 +99,11 @@ module.exports = {
console.error('Folder "' + err.path + '" not found!');
}

list.forEach(function(file) {
list.forEach(function (file) {
if (ignoreFiles.indexOf(file) < 0) {
results.push({
path: dir + '/' + file,
file: file
file: file,
});
}
});
Expand All @@ -107,14 +114,12 @@ module.exports = {
* Capitalizes the first letter of the given string.
*
* @method capitalize
* @param {String} str
* The original string
* @return {String}
* The capitalized string
* @param {string} str - The original string
* @returns {string} The capitalized string
*/
capitalize: function(str) {
capitalize: function (str) {
// Capitalize the first letter
return str.substr(0, 1).toUpperCase().concat(str.substr(1));
}
},

};
};
Loading

0 comments on commit ffdb0e5

Please sign in to comment.