From 5bf847c05a14b314c6af89a6ba8e089dd1db2410 Mon Sep 17 00:00:00 2001 From: Anshuman Verma Date: Thu, 6 Jun 2019 14:53:56 +0530 Subject: [PATCH] chore(lint): fix code as per conflicting config lint code --- .eslintrc.js | 1 - bin/cli.js | 4 +--- bin/config/config-yargs.js | 1 + bin/utils/convert-argv.js | 1 + packages/generators/init-generator.ts | 2 +- packages/generators/remove-generator.ts | 2 -- packages/migrate/commonsChunkPlugin/commonsChunkPlugin.ts | 2 +- .../configFile/plugins-precedence/plugins-precedence.test.js | 3 ++- test/binCases/errors/info-verbosity/info-verbosity.test.js | 3 ++- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 5c25a39333c..1aa1b65f720 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -8,7 +8,6 @@ module.exports = { }, parserOptions: { ecmaVersion: 2017, sourceType: "module" }, rules: { - "prettier/prettier": "error", "no-useless-escape": "off", "quote-props": ["error", "as-needed"], "no-dupe-keys": "error", diff --git a/bin/cli.js b/bin/cli.js index 47a29643138..13a34913f9a 100755 --- a/bin/cli.js +++ b/bin/cli.js @@ -107,9 +107,7 @@ For more information, see https://webpack.js.org/api/cli/.`); * used in place of process.stout */ const stdout = argv.silent - ? { - write: () => {} - } // eslint-disable-line + ? { write: () => {} } // eslint-disable-line : process.stdout; function ifArg(name, fn, init) { diff --git a/bin/config/config-yargs.js b/bin/config/config-yargs.js index 2f897efc8a8..3f1f96130b8 100644 --- a/bin/config/config-yargs.js +++ b/bin/config/config-yargs.js @@ -349,6 +349,7 @@ module.exports = function(yargs) { }, p: { type: "boolean", + // eslint-disable-next-line quotes describe: 'shortcut for --optimize-minimize --define process.env.NODE_ENV="production"', group: BASIC_GROUP }, diff --git a/bin/utils/convert-argv.js b/bin/utils/convert-argv.js index 09b2d201b57..e01346137a5 100644 --- a/bin/utils/convert-argv.js +++ b/bin/utils/convert-argv.js @@ -24,6 +24,7 @@ module.exports = function(...args) { } if (argv.p) { argv["optimize-minimize"] = true; + // eslint-disable-next-line quotes argv["define"] = [].concat(argv["define"] || []).concat('process.env.NODE_ENV="production"'); if (!argv.mode) { argv.mode = "production"; diff --git a/packages/generators/init-generator.ts b/packages/generators/init-generator.ts index 8ba18e4ca65..dc24b290511 100644 --- a/packages/generators/init-generator.ts +++ b/packages/generators/init-generator.ts @@ -92,7 +92,7 @@ export default class InitGenerator extends Generator { } } - public async prompting() { + public async prompting(): Promise { const done: () => {} = this.async(); const self: this = this; let regExpForStyles: string; diff --git a/packages/generators/remove-generator.ts b/packages/generators/remove-generator.ts index 9af3b862592..7054fbcdfdc 100644 --- a/packages/generators/remove-generator.ts +++ b/packages/generators/remove-generator.ts @@ -1,4 +1,3 @@ -import * as fs from "fs"; import * as path from "path"; import * as Generator from "yeoman-generator"; @@ -34,7 +33,6 @@ export default class RemoveGenerator extends Generator { }; const { configFile } = opts; let configPath = path.resolve(process.cwd(), configFile); - const webpackConfigExists = fs.existsSync(configPath); this.webpackOptions = require(configPath); } diff --git a/packages/migrate/commonsChunkPlugin/commonsChunkPlugin.ts b/packages/migrate/commonsChunkPlugin/commonsChunkPlugin.ts index 62bc6a090e2..1cb5fad233a 100644 --- a/packages/migrate/commonsChunkPlugin/commonsChunkPlugin.ts +++ b/packages/migrate/commonsChunkPlugin/commonsChunkPlugin.ts @@ -197,7 +197,7 @@ export default function(j: JSCodeshift, ast: Node): Node { // eslint-disable-next-line cacheGroup[chunkKey] = cacheGroup[chunkKey].map( - (prop): any => + (prop): void | string => prop.key.name === "test" ? mergeTestPropArrowFunction(j, chunkKey, pathValue) : prop diff --git a/test/binCases/configFile/plugins-precedence/plugins-precedence.test.js b/test/binCases/configFile/plugins-precedence/plugins-precedence.test.js index 2f615290c41..f5ec5bdcc83 100644 --- a/test/binCases/configFile/plugins-precedence/plugins-precedence.test.js +++ b/test/binCases/configFile/plugins-precedence/plugins-precedence.test.js @@ -15,7 +15,8 @@ test("plugins-precedence", () => { "--target", "async-node", "--define", - "TEST=\"ok\"" + // eslint-disable-next-line quotes + 'TEST="ok"' ]); const summary = extractSummary(stdout); diff --git a/test/binCases/errors/info-verbosity/info-verbosity.test.js b/test/binCases/errors/info-verbosity/info-verbosity.test.js index 9fbf7b6f699..0621f2eaa15 100644 --- a/test/binCases/errors/info-verbosity/info-verbosity.test.js +++ b/test/binCases/errors/info-verbosity/info-verbosity.test.js @@ -17,6 +17,7 @@ test("info-verbosity", () => { ]); expect(stderr).toContain("Invalid values:"); - expect(stderr).toContain("Argument: info-verbosity, Given: \"false\", Choices: \"none\", \"info\", \"verbose\""); + // eslint-disable-next-line quotes + expect(stderr).toContain('Argument: info-verbosity, Given: "false", Choices: "none", "info", "verbose"'); // snapshot not needed });