Skip to content
This repository has been archived by the owner on Jun 27, 2019. It is now read-only.

Commit

Permalink
Tidy-up logs. Split out eslint rules into separate file. Fixes #39
Browse files Browse the repository at this point in the history
  • Loading branch information
@raphaelokon
raphaelokon committed May 19, 2017
1 parent 73f1b21 commit 22829a3
Show file tree
Hide file tree
Showing 11 changed files with 426 additions and 406 deletions.
319 changes: 319 additions & 0 deletions .eslintrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,319 @@
{
"rules": {
"no-var": "error",
"prefer-const": "error",
"accessor-pairs": 2,
"arrow-spacing": [
2,
{
"before": true,
"after": true
}
],
"block-spacing": [
2,
"always"
],
"brace-style": [
2,
"1tbs",
{
"allowSingleLine": true
}
],
"camelcase": [
2,
{
"properties": "never"
}
],
"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"
],
"func-call-spacing": [
2,
"never"
],
"handle-callback-err": [
2,
"^(err|error)$"
],
"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-constant-condition": [
2,
{
"checkLoops": false
}
],
"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-duplicate-imports": 2,
"no-empty-character-class": 2,
"no-empty-pattern": 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-global-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,
{
"allowLoop": false,
"allowSwitch": false
}
],
"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": 2,
"no-negated-in-lhs": 2,
"no-new": 2,
"no-new-func": 2,
"no-new-object": 2,
"no-new-require": 2,
"no-new-symbol": 2,
"no-new-wrappers": 2,
"no-obj-calls": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-path-concat": 2,
"no-proto": 2,
"no-redeclare": 2,
"no-regex-spaces": 2,
"no-return-assign": [
2,
"except-parens"
],
"no-self-assign": 2,
"no-self-compare": 2,
"no-sequences": 2,
"no-shadow-restricted-names": 2,
"no-sparse-arrays": 2,
"no-template-curly-in-string": 2,
"no-this-before-super": 2,
"no-throw-literal": 2,
"no-undef": 2,
"no-undef-init": 2,
"no-unexpected-multiline": 2,
"no-unmodified-loop-condition": 2,
"no-unneeded-ternary": [
2,
{
"defaultAssignment": false
}
],
"no-unreachable": 2,
"no-unsafe-finally": 2,
"no-unsafe-negation": 2,
"no-unused-vars": [
2,
{
"vars": "all",
"args": "none"
}
],
"no-useless-call": 2,
"no-useless-computed-key": 2,
"no-useless-constructor": 2,
"no-useless-escape": 2,
"no-useless-rename": 2,
"no-whitespace-before-property": 2,
"no-with": 2,
"object-property-newline": [
2,
{
"allowMultiplePropertiesPerLine": true
}
],
"one-var": [
2,
{
"initialized": "never"
}
],
"operator-linebreak": [
2,
"after",
{
"overrides": {
"?": "before",
":": "before"
}
}
],
"padded-blocks": [
2,
"never"
],
"quotes": [
2,
"single",
{
"avoidEscape": true,
"allowTemplateLiterals": true
}
],
"rest-spread-spacing": [
2,
"never"
],
"semi-spacing": [
2,
{
"before": false,
"after": true
}
],
"space-before-blocks": [
2,
"always"
],
"space-in-parens": [
2,
"never"
],
"space-infix-ops": 2,
"space-unary-ops": [
2,
{
"words": true,
"nonwords": false
}
],
"spaced-comment": [
2,
"always",
{
"line": {
"markers": [
"*package",
"!",
","
]
},
"block": {
"balanced": true,
"markers": [
"*package",
"!",
","
],
"exceptions": [
"*"
]
}
}
],
"template-curly-spacing": [
2,
"never"
],
"unicode-bom": [
2,
"never"
],
"use-isnan": 2,
"valid-typeof": 2,
"wrap-iife": [
2,
"any"
],
"yield-star-spacing": [
2,
"both"
],
"yoda": [
2,
"never"
]
},
"env": {
"es6": true,
"node": true
},
"parserOptions": {
"ecmaVersion": 7
},
"extends": "eslint:recommended"
}
8 changes: 4 additions & 4 deletions bin/archive.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ const debug = require('./utils').debug;
* @param {object} config - The passed PatternLab config.
*/
function exportPatterns(config) {
if (!isValidConfig) throw new TypeError('export→Expects config not to be empty OR of type object if not empty.');
if (!isValidConfig) throw new TypeError('export: Expects config not to be empty OR of type object if not empty.');

const archive = new Archiver('zip', {});
const exportsPath = path.resolve('./', config.patternExportDirectory, 'patterns.zip');
const output = fs.createWriteStream(exportsPath);

output.on('close', function () {
debug('patternlab→export: Exported patterns in ' + exportsPath + ' - ' + archive.pointer() + ' total bytes.');
output.on('close', () => {
debug(`export: Exported patterns in ${exportsPath} - ${archive.pointer()} total bytes.`);
});

archive.on('error', function (err) {
throw new TypeError(`export→An error occured during zipping the patterns: ${err}`);
throw new TypeError(`export: An error occured during zipping the patterns: ${err}`);
});

archive.pipe(output);
Expand Down
10 changes: 5 additions & 5 deletions bin/build.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const isValidConfig = require('./validate-config');
* @param {object} options - Additional opts to specify build mode.
*/
function build(config, options) {
if (!isValidConfig) throw new TypeError('build→Expects config not to be empty and of type object.');
if (!isValidConfig) throw new TypeError('build: Expects config not to be empty and of type object.');

// Initiate PatternLab core with the config
const patternLab = pl(config);
Expand All @@ -21,14 +21,14 @@ function build(config, options) {
* 2. Normal build
*/
if (options && options.patternsOnly) { // 1
debug(`patternlab→build: Building only patterns now into ${config.paths.public.root}`);
debug(`build: Building only patterns now into ${config.paths.public.root}`);
return patternLab.patternsonly(function () {
console.log(`patternlab→build: Yay, your patterns were successfully built ☺`); // eslint-disable-line
debug(`build: Yay, your patterns were successfully built ☺`);
}, config.cleanPublic);
} else { // 2
debug(`patternlab→build: Building your project now into ${config.paths.public.root}`);
debug(`build: Building your project now into ${config.paths.public.root}`);
return patternLab.build(function () {
console.log(`patternlab→build: Yay, your PatternLab project was successfully built ☺`); // eslint-disable-line
debug(`build: Yay, your PatternLab project was successfully built ☺`);
}, config.cleanPublic);
}
}
Expand Down
2 changes: 1 addition & 1 deletion bin/copy-source-files.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const copyFilesFromSourceToPublic = paths => wrapAsync(function*() {
copy(paths.source.fonts, '*', paths.public.fonts),
copy(paths.source.root, 'favicon.ico', paths.public.root)
];
debug('patternlab→build: Your files were copied over to ' + paths.public.root);
debug(`build: Your files were copied over to ${paths.public.root}`);
return yield Promise.all(copiedFiles);
});

Expand Down
Loading

0 comments on commit 22829a3

Please sign in to comment.