Merge branch 'dev' into pattern-engines

Author: geoffp

.eslintrc

@@ -5,70 +5,79 @@
   },
   "globals": {},
   "rules": {
-    "block-scoped-var": 2,
+    "block-scoped-var": 0,
     "camelcase": 0,
-    "curly": [
-      2,
-      "all"
-    ],
-    "dot-notation": [
-      1,
-      {
-        "allowKeywords": true
-      }
-    ],
-    "eqeqeq": [
-      2,
-      "allow-null"
-    ],
-    "global-strict": [
-      0,
-      "never"
-    ],
+    "comma-spacing": [1, {"before": false, "after": true}],
+    "consistent-return": 2,
+    "curly": [2, "all"],
+    "dot-notation": [1, { "allowKeywords": true }],
+    "eqeqeq": [2, "allow-null"],
+    "global-strict": [0, "never"],
     "guard-for-in": 2,
-    "key-spacing": [
-      0
-    ],
+    "indent": [2, 2, {"SwitchCase": 1, "VariableDeclarator": 1}],
+    "lines-around-comment": [2, {
+      "beforeBlockComment": true,
+      "beforeLineComment": true,
+      "allowBlockStart": true,
+      "allowObjectStart": true,
+      "allowArrayStart": true
+    }],
+    "key-spacing": 0,
+    "keyword-spacing": 1,
     "new-cap": 0,
+    "no-alert": 2,
     "no-bitwise": 2,
     "no-caller": 2,
-    "no-cond-assign": [
-      2,
-      "except-parens"
-    ],
+    "no-cond-assign": [2, "except-parens"],
     "no-debugger": 2,
+    "no-dupe-args": 2,
+    "no-dupe-keys": 2,
     "no-empty": 2,
     "no-eval": 2,
     "no-extend-native": 2,
+    "no-extra-bind": 2,
     "no-extra-parens": 0,
+    "no-extra-semi": 2,
+    "no-func-assign": 2,
+    "no-implied-eval": 2,
+    "no-invalid-regexp": 2,
     "no-irregular-whitespace": 1,
     "no-iterator": 2,
     "no-loop-func": 2,
     "no-mixed-requires": 0,
     "no-multi-str": 2,
-    "no-multi-spaces": 0,
+    "no-multi-spaces": 1,
+    "no-native-reassign": 2,
     "no-new": 2,
+    "no-param-reassign": 1,
     "no-proto": 2,
+    "no-redeclare": 0,
     "no-script-url": 2,
+    "no-self-assign": 2,
+    "no-self-compare": 2,
     "no-sequences": 2,
     "no-shadow": 2,
     "no-undef": 2,
-    "no-underscore-dangle": 1,
-    "no-unused-vars": 2,
+    "no-underscore-dangle": 0,
+    "no-unreachable": 1,
+    "no-unused-vars": 1,
+    "no-use-before-define": 1,
+    "no-useless-call": 2,
+    "no-useless-concat": 2,
     "no-with": 2,
-    "quotes": [
-      0,
-      "single"
-    ],
-    "semi": [
-      0,
-      "never"
-    ],
+    "quotes": [0, "single"],
+    "radix": 2,
+    "semi": [0, "never"],
     "strict": 0,
+    "space-before-blocks": 1,
+    "space-before-function-paren": [1, {
+      "anonymous": "always",
+      "named": "never"
+    }],
+    "space-in-parens": [1, "never"],
+    "space-infix-ops": 1,
     "valid-typeof": 2,
-    "wrap-iife": [
-      2,
-      "inside"
-    ]
+    "vars-on-top": 0,
+    "wrap-iife": [2, "inside"]
   }
 }

.github/CONTRIBUTING.md

@@ -1,5 +1,5 @@
 # Contributing to Patternlab Node
-If you'd like to contribute to Pattern Lab Node, please do so! There is always a lot of ground to cover and something for your wheelhouse.  
+If you'd like to contribute to Pattern Lab Node, please do so! There is always a lot of ground to cover and something for your wheelhouse.
 
 No pull request is too small. Check out any [up for grabs issues](https://github.com/pattern-lab/patternlab-node/labels/up%20for%20grabs) as a good way to get your feet wet, or add some more unit tests.
 
@@ -9,4 +9,7 @@ No pull request is too small. Check out any [up for grabs issues](https://github
 3. If you can, add some unit tests using the existing patterns in the `./test` directory
 
 ##Coding style
-Regarding code style like indentation and whitespace, follow the conventions you see used in the source already. Add enough source code comments to help the next person.
+Two files combine within the project to define and maintain our coding style.
+
+* The `.editorconfig` controls spaces / tabs within supported editors. Check out their [site](http://editorconfig.org/).
+* The `.eslintrc` defines our javascript standards. Some editors will evaluate this real-time - otherwise it's run using `grunt|gulp build`