Eslint: add comma-dangle always multi-line rule

.eslintrc.js

@@ -4,7 +4,7 @@ const semver = require('semver');
 const reactVersion = semver.coerce(require('./package.json').dependencies.react).version;
 
 const defaultRules = {
-  'comma-dangle': [2, 'never'],
+  'comma-dangle': [2, 'always-multiline'],
   'comma-spacing': [2, { before: false, after: true }],
   curly: [2, 'multi-line'],
   eqeqeq: [2, 'smart'],

babel.config.js

@@ -7,15 +7,15 @@ module.exports = {
     ['@babel/preset-env', {
       corejs: 2,
       modules: 'commonjs',
-      useBuiltIns: 'usage'
+      useBuiltIns: 'usage',
     }],
-    ['@babel/preset-react']
+    ['@babel/preset-react'],
   ],
   plugins: compact([
     '@babel/plugin-proposal-nullish-coalescing-operator',
     '@babel/plugin-proposal-object-rest-spread',
     '@babel/plugin-proposal-optional-chaining',
     'angularjs-annotate',
-    isDevelopment && 'react-refresh/babel'
-  ])
+    isDevelopment && 'react-refresh/babel',
+  ]),
 };

bin/db-maintenance/archive-done-agenda-jobs.js

@@ -173,7 +173,7 @@ async.waterfall([
           process.stdout.clearLine();
           process.stdout.cursorTo(0);
           process.stdout.write(
-            '~' + progressPercent + '% (' + progress + '/' + total + ')'
+            '~' + progressPercent + '% (' + progress + '/' + total + ')',
           );
         }
         ++progress;
@@ -239,7 +239,7 @@ async.waterfall([
     countTotals(function () {
       done(null, progress);
     });
-  }
+  },
 
 ], function (err, totalProcessed) {
   if (err) {

bin/fillTestData/Messages.js

@@ -20,11 +20,11 @@ const argv = yargs.usage('$0 <numberOfThreads> <maxMessages>',
     return yargs
       .positional('numberOfThreads', {
         describe: 'Number of threads to add',
-        type: 'number'
+        type: 'number',
       })
       .positional('maxMessages', {
         describe: 'Maximum number of messages per thread to add',
-        type: 'number'
+        type: 'number',
       })
       .boolean('debug')
       .boolean('limit')

bin/fillTestData/Tribes.js

@@ -17,7 +17,7 @@ const argv = yargs.usage('$0 <numberOfTribes>', 'Seed database with number of tr
   return yargs
     .positional('numberOfTribes', {
       describe: 'Number of tribes to add',
-      type: 'number'
+      type: 'number',
     })
     .boolean('debug')
     .boolean('limit')
@@ -66,7 +66,7 @@ const tribeImageUUIDs = [
   '0ce0abdf-6898-4191-9a86-4f03807291b5',
   '0ebcabec-2bc5-4eee-ab17-991b9dd52eae',
   '4f7805e7-b5e6-4b40-bb32-3aafbe1bbc74',
-  '69a500a4-a16e-4c4d-9981-84fbe310d531'
+  '69a500a4-a16e-4c4d-9981-84fbe310d531',
 ];
 
 /**

bin/fillTestData/Users.js

@@ -22,7 +22,7 @@ const argv = yargs.usage('$0 <numberOfUsers>', 'Seed database with number of tri
   return yargs
     .positional('numberOfUsers', {
       describe: 'Number of users to add',
-      type: 'number'
+      type: 'number',
     })
     .array('userNames')
     .boolean('debug')

bin/install-deps.js

@@ -16,7 +16,7 @@ if (!fs.existsSync('node_modules')) {
   console.log('No "node_modules" present, installing NPM dependencies...');
   const installResult = spawnSync('npm', [ 'ci' ], {
     shell: true,
-    stdio: 'inherit'
+    stdio: 'inherit',
   }).status;
   if (installResult) {
     process.exit(installResult);
@@ -45,7 +45,7 @@ if (!fs.existsSync('node_modules')) {
     console.log('NPM dependencies out of date. Updating...');
     const installResult = spawnSync('npm', [ 'ci' ], {
       shell: true,
-      stdio: 'inherit'
+      stdio: 'inherit',
     }).status;
     if (installResult) {
       process.exit(installResult);

config/assets/default.js

@@ -9,7 +9,7 @@ module.exports = {
         'progressbar',
         'tabs',
         'tooltip',
-        'typeahead'
+        'typeahead',
       ],
       js: [
         // Non minified versions
@@ -56,18 +56,18 @@ module.exports = {
         'node_modules/angular-mailcheck/angular-mailcheck.js',
         'node_modules/angular-locker/dist/angular-locker.js',
         'node_modules/angular-confirm/angular-confirm.js',
-        'node_modules/angulargrid/angulargrid.js'
+        'node_modules/angulargrid/angulargrid.js',
       ],
-      tests: ['node_modules/angular-mocks/angular-mocks.js']
+      tests: ['node_modules/angular-mocks/angular-mocks.js'],
     },
     js: [
       'modules/core/client/app/config.js',
       'modules/core/client/app/init.js',
       'modules/*/client/*.js',
       'modules/*/client/controllers/*.js',
-      'modules/*/client/**/*.js'
+      'modules/*/client/**/*.js',
     ],
-    views: ['modules/*/client/views/**/*.html']
+    views: ['modules/*/client/views/**/*.html'],
   },
   server: {
     fontelloConfig: 'modules/core/client/fonts/fontello/config.json',
@@ -79,6 +79,6 @@ module.exports = {
     config: 'modules/*/server/config/*.js',
     policies: 'modules/*/server/policies/*.js',
     views: 'modules/*/server/views/*.html',
-    migrations: 'migrations/*.js'
-  }
+    migrations: 'migrations/*.js',
+  },
 };

config/assets/development.js

@@ -8,11 +8,11 @@ module.exports = {
     lib: {
       uibModuleTemplates: defaultAssets.client.lib.uibModuleTemplates,
       js: _.union(defaultAssets.client.lib.js, [
-        'node_modules/angulartics/src/angulartics-debug.js'
+        'node_modules/angulartics/src/angulartics-debug.js',
       ]),
-      tests: defaultAssets.client.lib.tests
+      tests: defaultAssets.client.lib.tests,
     },
     js: defaultAssets.client.js,
-    views: defaultAssets.client.views
-  }
+    views: defaultAssets.client.views,
+  },
 };

config/assets/production.js

@@ -8,14 +8,14 @@ module.exports = {
     lib: {
       uibModuleTemplates: defaultAssets.client.lib.uibModuleTemplates,
       js: _.union(defaultAssets.client.lib.js, [
-        'node_modules/angulartics-google-analytics/lib/angulartics-ga.js'
+        'node_modules/angulartics-google-analytics/lib/angulartics-ga.js',
       ]),
-      tests: defaultAssets.client.lib.tests
+      tests: defaultAssets.client.lib.tests,
     },
     js: _.union(defaultAssets.client.js, [
       'public/dist/uib-templates.js',
-      'public/dist/templates.js'
+      'public/dist/templates.js',
     ]),
-    views: defaultAssets.client.views
-  }
+    views: defaultAssets.client.views,
+  },
 };

config/assets/test.js

@@ -9,13 +9,13 @@ module.exports = {
       uibModuleTemplates: defaultAssets.client.lib.uibModuleTemplates,
       css: defaultAssets.client.lib.css,
       js: _.union(defaultAssets.client.lib.js, [
-        'testutils/client/angulartics-null.testutil.js'
+        'testutils/client/angulartics-null.testutil.js',
       ]),
       less: defaultAssets.client.lib.less,
-      tests: defaultAssets.client.lib.tests
+      tests: defaultAssets.client.lib.tests,
     },
     less: defaultAssets.client.less,
     js: defaultAssets.client.js,
-    views: defaultAssets.client.views
-  }
+    views: defaultAssets.client.views,
+  },
 };

config/client/i18n.js

@@ -64,8 +64,8 @@ i18n
   .init({
     ...(isTest ? {
       resources: {
-        en: {}
-      }
+        en: {},
+      },
     } : {}),
     fallbackLng: 'en', // a default app locale
     // allow keys to be phrases having `:`, `.`
@@ -74,16 +74,16 @@ i18n
     // saveMissing: true, // @TODO send not translated keys to endpoint
     interpolation: {
       escapeValue: false, // react already safes from xss
-      format
+      format,
     },
     detection: {
       lookupCookie: 'i18n',
       order: ['cookie'],
-      caches: ['cookie']
+      caches: ['cookie'],
     },
     react: {
-      useSuspense: false
-    }
+      useSuspense: false,
+    },
     // saveMissingPlurals: true,
     // debug: true // show missing translation keys in console.log
   });

config/config.js

@@ -76,7 +76,7 @@ const initGlobalConfigFolders = function (config) {
   // Appending files
   config.folders = {
     server: {},
-    client: {}
+    client: {},
   };
 
   // Setting globbed client paths
@@ -91,9 +91,9 @@ const initGlobalConfigFiles = function (config, assets) {
   config.files = {
     server: {},
     client: {
-      lib: {}
+      lib: {},
     },
-    webpack: {}
+    webpack: {},
   };
 
   // Setting Globbed model files
@@ -154,7 +154,7 @@ const initGlobalConfig = function () {
    */
   let config = _.extend(
     require(path.join(process.cwd(), 'config/env/default')),
-    require(path.join(process.cwd(), 'config/env/', process.env.NODE_ENV)) || {}
+    require(path.join(process.cwd(), 'config/env/', process.env.NODE_ENV)) || {},
   );
   config = _.merge(config, (fs.existsSync('./config/env/local.js') && require('./env/local.js')) || {});
 
@@ -166,7 +166,7 @@ const initGlobalConfig = function () {
 
   // Expose configuration utilities
   config.utils = {
-    getGlobbedPaths: getGlobbedPaths
+    getGlobbedPaths: getGlobbedPaths,
   };
 
   return config;