Merge pull request #3998 from PiPeep/comma-dangle

Switch to using comma-dangle: always-multiline

Author: bgw

.eslintrc

@@ -30,9 +30,7 @@ rules:
   brace-style: 2
   space-after-keywords: 2
   strict: 2
-  # We actually have a transform to support this and we fix this for bundled
-  # releases but not for the npm package, so enforce it strictly
-  comma-dangle: [2, never]
+  comma-dangle: [2, always-multiline]
   # Make this a warning for now. We do this in a few places so we might need to
   # disable
   no-unused-expressions: 2

Gruntfile.js

@@ -29,11 +29,11 @@ module.exports = function(grunt) {
       './*.gem',
       './docs/_site',
       './examples/shared/*.js',
-      '.module-cache'
+      '.module-cache',
     ],
     jshint: require('./grunt/config/jshint'),
     /*eslint-disable camelcase */
-    compare_size: require('./grunt/config/compare_size')
+    compare_size: require('./grunt/config/compare_size'),
     /*eslint-enable camelcase */
   });
 
@@ -91,44 +91,44 @@ module.exports = function(grunt) {
   grunt.registerTask('build:basic', [
     'jsx:normal',
     'version-check',
-    'browserify:basic'
+    'browserify:basic',
   ]);
   grunt.registerTask('build:addons', [
     'jsx:normal',
-    'browserify:addons'
+    'browserify:addons',
   ]);
   grunt.registerTask('build:transformer', [
     'jsx:normal',
-    'browserify:transformer'
+    'browserify:transformer',
   ]);
   grunt.registerTask('build:min', [
     'jsx:normal',
     'version-check',
-    'browserify:min'
+    'browserify:min',
   ]);
   grunt.registerTask('build:addons-min', [
     'jsx:normal',
-    'browserify:addonsMin'
+    'browserify:addonsMin',
   ]);
   grunt.registerTask('build:withCodeCoverageLogging', [
     'jsx:normal',
     'version-check',
-    'browserify:withCodeCoverageLogging'
+    'browserify:withCodeCoverageLogging',
   ]);
   grunt.registerTask('build:test', [
     'delete-build-modules',
     'jsx:test',
     'version-check',
-    'populist:test'
+    'populist:test',
   ]);
   grunt.registerTask('build:npm-react', [
     'version-check',
     'jsx:normal',
-    'npm-react:release'
+    'npm-react:release',
   ]);
   grunt.registerTask('build:gem-react-source', [
     'build',
-    'gem-react-source:release'
+    'gem-react-source:release',
   ]);
 
   grunt.registerTask('webdriver-phantomjs', webdriverPhantomJSTask);
@@ -138,7 +138,7 @@ module.exports = function(grunt) {
   grunt.registerTask('test:webdriver:phantomjs', [
     'connect',
     'webdriver-phantomjs',
-    'webdriver-jasmine:local'
+    'webdriver-jasmine:local',
   ]);
 
   grunt.registerTask('test:full', [
@@ -152,7 +152,7 @@ module.exports = function(grunt) {
     'sauce-tunnel',
     'webdriver-jasmine:saucelabs_android',
     'webdriver-jasmine:saucelabs_firefox',
-    'webdriver-jasmine:saucelabs_chrome'
+    'webdriver-jasmine:saucelabs_chrome',
   ]);
 
   grunt.registerTask('test:webdriver:saucelabs', [
@@ -161,7 +161,7 @@ module.exports = function(grunt) {
 
     'connect',
     'sauce-tunnel',
-    'webdriver-jasmine:saucelabs_' + (process.env.BROWSER_NAME || 'ie8')
+    'webdriver-jasmine:saucelabs_' + (process.env.BROWSER_NAME || 'ie8'),
   ]);
 
   grunt.registerTask('test:webdriver:saucelabs:modern', [
@@ -173,7 +173,7 @@ module.exports = function(grunt) {
     'webdriver-jasmine:saucelabs_android',
     'webdriver-jasmine:saucelabs_firefox',
     'webdriver-jasmine:saucelabs_chrome',
-    'webdriver-jasmine:saucelabs_ie11'
+    'webdriver-jasmine:saucelabs_ie11',
   ]);
 
   grunt.registerTask('test:webdriver:saucelabs:ie', [
@@ -185,7 +185,7 @@ module.exports = function(grunt) {
     'webdriver-jasmine:saucelabs_ie8',
     'webdriver-jasmine:saucelabs_ie9',
     'webdriver-jasmine:saucelabs_ie10',
-    'webdriver-jasmine:saucelabs_ie11'
+    'webdriver-jasmine:saucelabs_ie11',
   ]);
 
   grunt.registerTask('test:webdriver:saucelabs:ios', [
@@ -196,13 +196,13 @@ module.exports = function(grunt) {
     'sauce-tunnel',
     'webdriver-jasmine:saucelabs_ios6_1',
     'webdriver-jasmine:saucelabs_ios5_1',
-    'webdriver-jasmine:saucelabs_ios4'
+    'webdriver-jasmine:saucelabs_ios4',
   ]);
 
   grunt.registerTask('test:coverage', [
     'build:withCodeCoverageLogging',
     'test:webdriver:phantomjs',
-    'coverage:parse'
+    'coverage:parse',
   ]);
   grunt.registerTask('fasttest', function() {
     grunt.task.run('test');
@@ -231,7 +231,7 @@ module.exports = function(grunt) {
     'npm-react:pack',
     'npm-react-tools:release',
     'npm-react-tools:pack',
-    'compare_size'
+    'compare_size',
   ]);
 
   // Automate the release!
@@ -251,7 +251,7 @@ module.exports = function(grunt) {
     'release:starter',
     'compress',
     'release:docs',
-    'release:msg'
+    'release:msg',
   ]);
 
   // The default task - build - to keep setup easy.

grunt/config/browserify.js

@@ -51,19 +51,19 @@ function simpleBannerify(src) {
 // Our basic config which we'll add to to make our other builds
 var basic = {
   entries: [
-    './build/modules/React.js'
+    './build/modules/React.js',
   ],
   outfile: './build/react.js',
   debug: false,
   standalone: 'React',
   transforms: [envify({NODE_ENV: 'development'})],
   plugins: [collapser],
-  after: [derequire, simpleBannerify]
+  after: [derequire, simpleBannerify],
 };
 
 var min = {
   entries: [
-    './build/modules/React.js'
+    './build/modules/React.js',
   ],
   outfile: './build/react.min.js',
   debug: false,
@@ -73,12 +73,12 @@ var min = {
   // No need to derequire because the minifier will mangle
   // the "require" calls.
 
-  after: [/*derequire,*/ minify, bannerify]
+  after: [/*derequire,*/ minify, bannerify],
 };
 
 var transformer = {
   entries:[
-    './vendor/browser-transforms.js'
+    './vendor/browser-transforms.js',
   ],
   outfile: './build/JSXTransformer.js',
   debug: false,
@@ -89,25 +89,25 @@ var transformer = {
   // collapser passes a number; this would throw.
 
   // plugins: [collapser],
-  after: [derequire, simpleBannerify]
+  after: [derequire, simpleBannerify],
 };
 
 var addons = {
   entries: [
-    './build/modules/ReactWithAddons.js'
+    './build/modules/ReactWithAddons.js',
   ],
   outfile: './build/react-with-addons.js',
   debug: false,
   standalone: 'React',
   packageName: 'React (with addons)',
   transforms: [envify({NODE_ENV: 'development'})],
   plugins: [collapser],
-  after: [derequire, simpleBannerify]
+  after: [derequire, simpleBannerify],
 };
 
 var addonsMin = {
   entries: [
-    './build/modules/ReactWithAddons.js'
+    './build/modules/ReactWithAddons.js',
   ],
   outfile: './build/react-with-addons.min.js',
   debug: false,
@@ -118,21 +118,21 @@ var addonsMin = {
   // No need to derequire because the minifier will mangle
   // the "require" calls.
 
-  after: [/*derequire,*/ minify, bannerify]
+  after: [/*derequire,*/ minify, bannerify],
 };
 
 var withCodeCoverageLogging = {
   entries: [
-    './build/modules/React.js'
+    './build/modules/React.js',
   ],
   outfile: './build/react.js',
   debug: true,
   standalone: 'React',
   transforms: [
     envify({NODE_ENV: 'development'}),
-    require('coverify')
+    require('coverify'),
   ],
-  plugins: [collapser]
+  plugins: [collapser],
 };
 
 module.exports = {
@@ -141,5 +141,5 @@ module.exports = {
   transformer: transformer,
   addons: addons,
   addonsMin: addonsMin,
-  withCodeCoverageLogging: withCodeCoverageLogging
+  withCodeCoverageLogging: withCodeCoverageLogging,
 };

grunt/config/compare_size.js

@@ -4,14 +4,14 @@ var gzip = require('gzip-js');
 
 module.exports = {
   files: [
-    'build/*.js'
+    'build/*.js',
   ],
   options: {
     compress: {
       gz: function(contents) {
         return gzip.zip(contents, {}).length;
-      }
+      },
     },
-    cache: '.grunt/sizecache.json'
-  }
+    cache: '.grunt/sizecache.json',
+  },
 };

grunt/config/compress.js

@@ -7,10 +7,10 @@ var version = grunt.config.data.pkg.version;
 module.exports = {
   starter: {
     options: {
-      archive: './build/react-' + version + '.zip'
+      archive: './build/react-' + version + '.zip',
     },
     files: [
-      {cwd: './build/starter', src: ['**'], dest: 'react-' + version + '/'}
-    ]
-  }
+      {cwd: './build/starter', src: ['**'], dest: 'react-' + version + '/'},
+    ],
+  },
 };

grunt/config/jshint.js

@@ -3,7 +3,7 @@
 module.exports = {
   src: {
     options: {
-      jshintrc: './src/.jshintrc'
+      jshintrc: './src/.jshintrc',
     },
     files: {
       // We don't care about src/vendor (we shouldn't be touching this), and
@@ -12,16 +12,16 @@ module.exports = {
         './src/**/*.js',
         '!./src/vendor/**',
         '!./src/**/__tests__/**',
-        '!./src/test/**'
-      ]
-    }
+        '!./src/test/**',
+      ],
+    },
   },
   project: {
     options: {
-      jshintrc: './.jshintrc'
+      jshintrc: './.jshintrc',
     },
     files: {
-      src: ['./Gruntfile.js', './grunt/**/*.js', './bin/*.js', './vendor/*.js']
-    }
-  }
+      src: ['./Gruntfile.js', './grunt/**/*.js', './bin/*.js', './vendor/*.js'],
+    },
+  },
 };

grunt/config/jsx.js

@@ -5,37 +5,37 @@ var grunt = require('grunt');
 
 var rootIDs = [
   'React',
-  'ReactWithAddons'
+  'ReactWithAddons',
 ];
 
 var normal = {
   rootIDs: rootIDs,
   getConfig: function() {
     return {
-      commonerConfig: grunt.config.data.pkg.commonerConfig
+      commonerConfig: grunt.config.data.pkg.commonerConfig,
     };
   },
   sourceDir: 'src',
-  outputDir: 'build/modules'
+  outputDir: 'build/modules',
 };
 
 
 var test = {
   rootIDs: rootIDs.concat([
     'test/all.js',
-    '**/__tests__/*.js'
+    '**/__tests__/*.js',
   ]),
   getConfig: function() {
     return assign({}, normal.getConfig(), {
-      mocking: true
+      mocking: true,
     });
   },
   sourceDir: 'src',
-  outputDir: 'build/modules'
+  outputDir: 'build/modules',
 };
 
 
 module.exports = {
   normal: normal,
-  test: test
+  test: test,
 };

grunt/config/populist.js

@@ -7,7 +7,7 @@ module.exports = function(grunt) {
     // (build/jasmine/jasmine.js) as global.jasmine, and to require the
     // 'all' module (build/jasmine/all.js) but not expose it globally.
     args: ['jasmine:jasmine', 'all:'],
-    outfile: './build/jasmine.js'
+    outfile: './build/jasmine.js',
   };
 
   var filterExpr = grunt.option('filter');
@@ -22,11 +22,11 @@ module.exports = function(grunt) {
     rootDirectory: 'build/modules',
     args: ['test/all:harness'],
     requires: [filterExpr],
-    outfile: './build/react-test.js'
+    outfile: './build/react-test.js',
   };
 
   return {
     jasmine: jasmine,
-    test: test
+    test: test,
   };
 };