Add trailing comma function support to comma-dangle and prettier config

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "singleQuote": true,
+  "bracketSpacing": false,
+  "trailingComma": "all"
+}

CHANGELOG.md

@@ -6,6 +6,8 @@
 * Added a `typescript` and `typescript-react` config [[#54](https://github.com/Shopify/eslint-plugin-shopify/pull/54)]
 
 ### Changed
+* `plugin:shopify/prettier` will now enforce trailing commas in function parameter calls
+* `comma-dangle` will now enforce multi-line function parameters
 * Removed `plugin:shopify/esnext` as an included extension of the `plugin:shopify/prettier` config. `plugin:shopify/esnext` must now be extended by the consumer to use the `plugin:shopify/prettier`.
 
   Example (`package.json`):

circle.yml

@@ -2,7 +2,7 @@ machine:
   environment:
     PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
   node:
-    version: 6.11.1
+    version: 8.9.1
 
 dependencies:
   override:

lib/config/all.js

@@ -61,6 +61,6 @@ module.exports = {
     require('./rules/shopify'),
     require('./rules/sort-class-members'),
     require('./rules/typescript'),
-    require('./rules/typescript-react')
+    require('./rules/typescript-react'),
   ),
 };

lib/config/core.js

@@ -16,6 +16,6 @@ module.exports = {
     require('./rules/shopify'),
     require('./rules/strict-mode'),
     require('./rules/stylistic-issues'),
-    require('./rules/variables')
+    require('./rules/variables'),
   ),
 };

lib/config/esnext.js

@@ -36,6 +36,6 @@ module.exports = {
       'no-await-in-loop': 'off',
       'object-curly-spacing': 'off',
       'no-invalid-this': 'off',
-    }
+    },
   ),
 };

lib/config/prettier.js

@@ -8,7 +8,7 @@ module.exports = {
       'error',
       {
         singleQuote: true,
-        trailingComma: 'es5',
+        trailingComma: 'all',
         bracketSpacing: false,
         jsxBracketSameLine: false,
       },

lib/config/rules/possible-errors.js

@@ -10,7 +10,16 @@ module.exports = {
   // Disallow comparing against -0
   'no-compare-neg-zero': 'error',
   // Disallow or enforce trailing commas
-  'comma-dangle': ['error', 'always-multiline'],
+  'comma-dangle': [
+    'error',
+    {
+      arrays: 'always-multiline',
+      objects: 'always-multiline',
+      imports: 'always-multiline',
+      exports: 'always-multiline',
+      functions: 'always-multiline',
+    },
+  ],
   // Disallow assignment in conditional expressions
   'no-cond-assign': 'error',
   // Disallow use of console

lib/rules/jquery-dollar-sign-reference.js

@@ -132,7 +132,7 @@ module.exports = {
 
         const checkDescriptor = Object.getOwnPropertyDescriptor(
           nonChainingMethods,
-          prop
+          prop,
         );
         const check = checkDescriptor && checkDescriptor.value;
         if (
@@ -193,7 +193,7 @@ module.exports = {
       if (isjQueryRef && hasRegularValue) {
         context.report(
           node,
-          'Don’t use a $-prefixed identifier for a non-jQuery value.'
+          'Don’t use a $-prefixed identifier for a non-jQuery value.',
         );
       } else if (!isjQueryRef && hasDefinitejQueryValue) {
         context.report(node, 'Use a $-prefixed identifier for a jQuery value.');
@@ -214,7 +214,7 @@ module.exports = {
       checkForValidjQueryReference(
         node,
         node.id,
-        getFinalAssignmentValue(node.init)
+        getFinalAssignmentValue(node.init),
       );
     }
 
@@ -226,7 +226,7 @@ module.exports = {
       checkForValidjQueryReference(
         node,
         node.left,
-        getFinalAssignmentValue(node.right)
+        getFinalAssignmentValue(node.right),
       );
     }
 

lib/rules/prefer-class-properties.js

@@ -86,7 +86,7 @@ module.exports = {
         }
 
         getTopLevelThisAssignmentExpressions(constructor.value).forEach(
-          checkConstructorThisAssignment
+          checkConstructorThisAssignment,
         );
       } else {
         getClassInstanceProperties(node).forEach(propertyNode => {

lib/rules/prefer-early-return.js

@@ -56,7 +56,7 @@ module.exports = {
       if (hasSimplifiableConditionalBody(body)) {
         context.report(
           body,
-          'Prefer an early return to a conditionally-wrapped function body'
+          'Prefer an early return to a conditionally-wrapped function body',
         );
       }
     }

lib/rules/prefer-twine.js

@@ -16,7 +16,7 @@ module.exports = {
           if (specifier.local.name !== 'Twine') {
             context.report(
               node,
-              'You should use "Twine" as the reference name when importing twine.'
+              'You should use "Twine" as the reference name when importing twine.',
             );
           }
         });

tests/lib/rules/binary-assignment-parens.js

@@ -16,7 +16,7 @@ const validNonBooleanExamples = [].concat(
     {code: `var foo = ( 'bar' ${operator} 'baz' );`, options: ['never']},
     {code: `var foo; foo = 'bar' ${operator} 'baz';`},
     {code: `var foo; foo = ('bar' ${operator} 'baz');`, options: ['never']},
-  ])
+  ]),
 );
 
 const validBooleanExamples = [].concat(
@@ -27,7 +27,7 @@ const validBooleanExamples = [].concat(
     {code: `var foo; foo = ('bar' ${operator} 'baz')`},
     {code: `var foo; foo = ( 'bar' ${operator} 'baz' )`},
     {code: `var foo; foo = 'bar' ${operator} 'baz'`, options: ['never']},
-  ])
+  ]),
 );
 
 const validLogicalExamples = [
@@ -149,7 +149,7 @@ const invalidBooleanExamples = [].concat(
         },
       ],
     },
-  ])
+  ]),
 );
 
 function errors(count, needsParens) {
@@ -261,7 +261,7 @@ ruleTester.run('binary-assignment-parens', rule, {
   valid: [].concat(
     validNonBooleanExamples,
     validBooleanExamples,
-    validLogicalExamples
+    validLogicalExamples,
   ),
   invalid: [].concat(invalidBooleanExamples, invalidLogicalExamples),
 });