[eslint] enable object-shorthand, space-before-function-paren

.eslintrc

@@ -31,13 +31,23 @@
         "no-shadow": 1,
         "no-var": 2,
         "object-curly-spacing": [2, "always"],
+        "object-shorthand": ["error", "always", {
+            "ignoreConstructors": false,
+            "avoidQuotes": true,
+        }],
         "one-var": [2, "never"],
         "prefer-const": 2,
         "quotes": [2, "single", {
             "allowTemplateLiterals": true,
             "avoidEscape": true,
         }],
         "semi": [2, "always"],
+        "space-before-function-paren": ["error", {
+            "anonymous": "always",
+            "named": "never",
+            "asyncArrow": "always",
+        }],
+
         "eslint-plugin/consistent-output": [
             "error",
             "always",

resolvers/webpack/index.js

@@ -163,7 +163,7 @@ exports.resolve = function (source, file, settings) {
 const MAX_CACHE = 10;
 const _cache = [];
 function getResolveSync(configPath, webpackConfig, cwd) {
-  const cacheKey = { configPath: configPath, webpackConfig: webpackConfig };
+  const cacheKey = { configPath, webpackConfig };
   let cached = find(_cache, function (entry) { return isEqual(entry.key, cacheKey); });
   if (!cached) {
     cached = {
@@ -265,7 +265,7 @@ function createWebpack1ResolveSync(webpackRequire, resolveConfig, plugins) {
   resolver.apply(
     resolveConfig.packageAlias
       ? new DirectoryDescriptionFileFieldAliasPlugin('package.json', resolveConfig.packageAlias)
-      : function() {},
+      : function () {},
     new ModuleAliasPlugin(resolveConfig.alias || {}),
     makeRootPlugin(ModulesInRootPlugin, 'module', resolveConfig.root),
     new ModulesInDirectoriesPlugin(
@@ -302,7 +302,7 @@ function createWebpack1ResolveSync(webpackRequire, resolveConfig, plugins) {
 
   resolver.apply.apply(resolver, resolvePlugins);
 
-  return function() {
+  return function () {
     return resolver.resolveSync.apply(resolver, arguments);
   };
 }
@@ -391,7 +391,7 @@ function findExternal(source, externals, context, resolveSync) {
 }
 
 function findConfigPath(configPath, packageDir) {
-  const extensions = Object.keys(interpret.extensions).sort(function(a, b) {
+  const extensions = Object.keys(interpret.extensions).sort(function (a, b) {
     return a === '.js' ? -1 : b === '.js' ? 1 : a.length - b.length;
   });
   let extension;

resolvers/webpack/test/config.js

@@ -101,7 +101,7 @@ describe('config', function () {
       .and.equal(path.join(__dirname, 'files', 'some', 'goofy', 'path', 'foo.js'));
   });
 
-  it('finds the config at option env when config is a function', function() {
+  it('finds the config at option env when config is a function', function () {
     const settings = {
       config: require(path.join(__dirname, './files/webpack.function.config.js')),
       env: {
@@ -113,7 +113,7 @@ describe('config', function () {
       .and.equal(path.join(__dirname, 'files', 'some', 'goofy', 'path', 'bar.js'));
   });
 
-  it('finds the config at option env when config is an array of functions', function() {
+  it('finds the config at option env when config is an array of functions', function () {
     const settings = {
       config: require(path.join(__dirname, './files/webpack.function.config.multiple.js')),
       env: {
@@ -125,7 +125,7 @@ describe('config', function () {
       .and.equal(path.join(__dirname, 'files', 'some', 'goofy', 'path', 'bar.js'));
   });
 
-  it('passes argv to config when it is a function', function() {
+  it('passes argv to config when it is a function', function () {
     const settings = {
       config: require(path.join(__dirname, './files/webpack.function.config.js')),
       argv: {
@@ -137,7 +137,7 @@ describe('config', function () {
       .and.equal(path.join(__dirname, 'files', 'some', 'bar', 'bar.js'));
   });
 
-  it('passes a default empty argv object to config when it is a function', function() {
+  it('passes a default empty argv object to config when it is a function', function () {
     const settings = {
       config: require(path.join(__dirname, './files/webpack.function.config.js')),
       argv: undefined,
@@ -146,7 +146,7 @@ describe('config', function () {
     expect(function () { resolve('baz', file, settings); }).to.not.throw(Error);
   });
 
-  it('prevents async config using', function() {
+  it('prevents async config using', function () {
     const settings = {
       config: require(path.join(__dirname, './files/webpack.config.async.js')),
     };

src/rules/default.js

@@ -10,7 +10,7 @@ module.exports = {
     schema: [],
   },
 
-  create: function (context) {
+  create(context) {
 
     function checkDefault(specifierType, node) {
 

src/rules/dynamic-import-chunkname.js

@@ -24,7 +24,7 @@ module.exports = {
     }],
   },
 
-  create: function (context) {
+  create(context) {
     const config = context.options[0];
     const { importFunctions = [] } = config || {};
     const { webpackChunknameFormat = '[0-9a-zA-Z-_/.]+' } = config || {};

src/rules/export.js

@@ -54,7 +54,7 @@ module.exports = {
     schema: [],
   },
 
-  create: function (context) {
+  create(context) {
     const namespace = new Map([[rootProgram, new Map()]]);
 
     function addNamed(name, node, parent, isType) {

src/rules/exports-last.js

@@ -15,9 +15,9 @@ module.exports = {
     schema: [],
   },
 
-  create: function (context) {
+  create(context) {
     return {
-      Program: function ({ body }) {
+      Program({ body }) {
         const lastNonExportStatementIndex = body.reduce(function findLastIndex(acc, item, index) {
           if (isNonExportStatement(item)) {
             return index;

src/rules/extensions.js

@@ -103,7 +103,7 @@ module.exports = {
     },
   },
 
-  create: function (context) {
+  create(context) {
 
     const props = buildProperties(context);
 

src/rules/first.js

@@ -21,8 +21,8 @@ module.exports = {
     ],
   },
 
-  create: function (context) {
-    function isPossibleDirective (node) {
+  create(context) {
+    function isPossibleDirective(node) {
       return node.type === 'ExpressionStatement' &&
         node.expression.type === 'Literal' &&
         typeof node.expression.value === 'string';

src/rules/named.js

@@ -21,7 +21,7 @@ module.exports = {
     ],
   },
 
-  create: function (context) {
+  create(context) {
     const options = context.options[0] || {};
 
     function checkSpecifiers(key, type, node) {

src/rules/newline-after-import.js

@@ -72,7 +72,7 @@ module.exports = {
       },
     ],
   },
-  create: function (context) {
+  create(context) {
     let level = 0;
     const requireCalls = [];
 
@@ -138,7 +138,7 @@ after ${type} statement not followed by another ${type}.`,
     return {
       ImportDeclaration: checkImport,
       TSImportEqualsDeclaration: checkImport,
-      CallExpression: function(node) {
+      CallExpression(node) {
         if (isStaticRequire(node) && level === 0) {
           requireCalls.push(node);
         }

src/rules/no-absolute-path.js

@@ -11,7 +11,7 @@ module.exports = {
     schema: [ makeOptionsSchema() ],
   },
 
-  create: function (context) {
+  create(context) {
     function reportIfAbsolute(source) {
       if (typeof source.value === 'string' && isAbsolute(source.value)) {
         context.report(source, 'Do not import modules using an absolute path');

src/rules/no-amd.js

@@ -18,7 +18,7 @@ module.exports = {
     schema: [],
   },
 
-  create: function (context) {
+  create(context) {
     return {
       'CallExpression': function (node) {
         if (context.getScope().type !== 'module') return;

src/rules/no-anonymous-default-export.js

@@ -86,7 +86,7 @@ module.exports = {
     ],
   },
 
-  create: function (context) {
+  create(context) {
     const options = Object.assign({}, defaults, context.options[0]);
 
     return {

src/rules/no-commonjs.js

@@ -88,7 +88,7 @@ module.exports = {
     },
   },
 
-  create: function (context) {
+  create(context) {
     const options = normalizeLegacyOptions(context.options);
 
     return {

src/rules/no-cycle.js

@@ -36,7 +36,7 @@ module.exports = {
     })],
   },
 
-  create: function (context) {
+  create(context) {
     const myPath = context.getPhysicalFilename ? context.getPhysicalFilename() : context.getFilename();
     if (myPath === '<text>') return {}; // can't cycle-check a non-file
 

src/rules/no-deprecated.js

@@ -21,7 +21,7 @@ module.exports = {
     schema: [],
   },
 
-  create: function (context) {
+  create(context) {
     const deprecated = new Map();
     const namespaces = new Map();
 

src/rules/no-duplicates.js

@@ -261,7 +261,7 @@ module.exports = {
     ],
   },
 
-  create: function (context) {
+  create(context) {
     // Prepare the resolver from options.
     const considerQueryStringOption = context.options[0] &&
       context.options[0]['considerQueryString'];
@@ -300,7 +300,7 @@ module.exports = {
         }
       },
 
-      'Program:exit'() {
+      'Program:exit': function () {
         checkImports(imported, context);
         checkImports(nsImported, context);
         checkImports(defaultTypesImported, context);

src/rules/no-dynamic-require.js

@@ -38,7 +38,7 @@ module.exports = {
     ],
   },
 
-  create: function (context) {
+  create(context) {
     const options = context.options[0] || {};
 
     return {

src/rules/no-extraneous-dependencies.js

@@ -252,7 +252,7 @@ module.exports = {
     ],
   },
 
-  create: function (context) {
+  create(context) {
     const options = context.options[0] || {};
     const filename = context.getPhysicalFilename ? context.getPhysicalFilename() : context.getFilename();
     const deps = getDependencies(context, options.packageDir) || extractDepFields({});

src/rules/no-mutable-exports.js

@@ -9,7 +9,7 @@ module.exports = {
     schema: [],
   },
 
-  create: function (context) {
+  create(context) {
     function checkDeclaration(node) {
       const { kind } = node;
       if (kind === 'var' || kind === 'let') {

src/rules/no-named-as-default-member.js

@@ -21,7 +21,7 @@ module.exports = {
     schema: [],
   },
 
-  create: function(context) {
+  create(context) {
 
     const fileImports = new Map();
     const allPropertyLookups = new Map();

src/rules/no-named-as-default.js

@@ -11,7 +11,7 @@ module.exports = {
     schema: [],
   },
 
-  create: function (context) {
+  create(context) {
     function checkDefault(nameKey, defaultSpecifier) {
       // #566: default is a valid specifier
       if (defaultSpecifier[nameKey].name === 'default') return;

src/rules/no-named-default.js

@@ -9,7 +9,7 @@ module.exports = {
     schema: [],
   },
 
-  create: function (context) {
+  create(context) {
     return {
       'ImportDeclaration': function (node) {
         node.specifiers.forEach(function (im) {

src/rules/no-namespace.js

@@ -32,7 +32,7 @@ module.exports = {
     }],
   },
 
-  create: function (context) {
+  create(context) {
     const firstOption = context.options[0] || {};
     const ignoreGlobs = firstOption.ignore;
 

src/rules/no-nodejs-modules.js

@@ -31,7 +31,7 @@ module.exports = {
     ],
   },
 
-  create: function (context) {
+  create(context) {
     const options = context.options[0] || {};
     const allowed = options.allow || [];
 

src/rules/no-self-import.js

@@ -30,7 +30,7 @@ module.exports = {
 
     schema: [],
   },
-  create: function (context) {
+  create(context) {
     return moduleVisitor((source, node) => {
       isImportingSelf(context, node, source.value);
     }, { commonjs: true });

src/rules/no-unresolved.js

@@ -22,7 +22,7 @@ module.exports = {
     ],
   },
 
-  create: function (context) {
+  create(context) {
     function checkSourceValue(source) {
       const shouldCheckCase = !CASE_SENSITIVE_FS
         && (!context.options[0] || context.options[0].caseSensitive !== false);

src/rules/no-unused-modules.js

@@ -32,7 +32,7 @@ try {
       // https://github.com/eslint/eslint/blob/v5.2.0/lib/util/glob-util.js#L174-L269
       listFilesToProcess = function (src, extensions) {
         return originalListFilesToProcess(src, {
-          extensions: extensions,
+          extensions,
         });
       };
     } catch (e) {
@@ -54,7 +54,7 @@ try {
 if (FileEnumerator) {
   listFilesToProcess = function (src, extensions) {
     const e = new FileEnumerator({
-      extensions: extensions,
+      extensions,
     });
 
     return Array.from(e.iterateFiles(src), ({ filePath, ignored }) => ({

src/rules/no-webpack-loader-syntax.js

@@ -18,7 +18,7 @@ module.exports = {
     schema: [],
   },
 
-  create: function (context) {
+  create(context) {
     return moduleVisitor((source, node) => {
       reportIfNonStandard(context, node, source.value);
     }, { commonjs: true });