Update prettier to v2 (#11579)

Co-authored-by: Nicolò Ribaudo <nicolo.ribaudo@gmail.com>
babel · Jun 7, 2020 · 4108524 · 4108524
1 parent 426acf3
commit 4108524
Show file tree

Hide file tree

Showing 147 changed files with 1,021 additions and 1,109 deletions.
diff --git a/Gulpfile.js b/Gulpfile.js
@@ -33,7 +33,7 @@ function getIndexFromPackage(name) {
 }
 
 function compilationLogger() {
-  return through.obj(function(file, enc, callback) {
+  return through.obj(function (file, enc, callback) {
     fancyLog(`Compiling '${chalk.cyan(file.relative)}'...`);
     callback(null, file);
   });
@@ -48,7 +48,7 @@ function errorsLogger() {
 }
 
 function rename(fn) {
-  return through.obj(function(file, enc, callback) {
+  return through.obj(function (file, enc, callback) {
     file.path = fn(file);
     callback(null, file);
   });

diff --git a/babel.config.js b/babel.config.js
@@ -1,6 +1,6 @@
 "use strict";
 
-module.exports = function(api) {
+module.exports = function (api) {
   const env = api.env();
 
   const includeCoverage = process.env.BABEL_COVERAGE === "true";

diff --git a/codemods/babel-plugin-codemod-object-assign-to-object-spread/src/index.js b/codemods/babel-plugin-codemod-object-assign-to-object-spread/src/index.js
@@ -1,6 +1,6 @@
 import syntaxObjectRestSpread from "@babel/plugin-syntax-object-rest-spread";
 
-export default function({ types: t }) {
+export default function ({ types: t }) {
   return {
     inherits: syntaxObjectRestSpread,
 

diff --git a/codemods/babel-plugin-codemod-optional-catch-binding/src/index.js b/codemods/babel-plugin-codemod-optional-catch-binding/src/index.js
@@ -1,6 +1,6 @@
 import syntaxOptionalCatchBinding from "@babel/plugin-syntax-optional-catch-binding";
 
-export default function({ types: t }) {
+export default function ({ types: t }) {
   return {
     inherits: syntaxOptionalCatchBinding,
 

diff --git a/eslint/babel-eslint-parser/src/analyze-scope.js b/eslint/babel-eslint-parser/src/analyze-scope.js
@@ -237,7 +237,7 @@ class Referencer extends OriginalReferencer {
         this._checkIdentifierOrVisit(name);
       }
     }
-    scope.__define = function() {
+    scope.__define = function () {
       return parentScope.__define.apply(parentScope, arguments);
     };
 

diff --git a/eslint/babel-eslint-parser/src/convert/index.js b/eslint/babel-eslint-parser/src/convert/index.js
@@ -2,7 +2,7 @@ import convertTokens from "./convertTokens";
 import convertComments from "./convertComments";
 import convertAST from "./convertAST";
 
-export default function(ast, code) {
+export default function (ast, code) {
   ast.tokens = convertTokens(ast.tokens, code);
   convertComments(ast.comments);
   convertAST(ast, code);

diff --git a/eslint/babel-eslint-parser/test/index.js b/eslint/babel-eslint-parser/test/index.js
@@ -84,7 +84,7 @@ describe("Babel and Espree", () => {
   });
 
   describe("compatibility", () => {
-    it("should allow ast.analyze to be called without options", function() {
+    it("should allow ast.analyze to be called without options", function () {
       const ast = parseForESLint("`test`", {
         eslintScopeManager: true,
         eslintVisitorKeys: true,

diff --git a/eslint/babel-eslint-plugin/src/rules/semi.js b/eslint/babel-eslint-plugin/src/rules/semi.js
@@ -57,13 +57,13 @@ function report(context, node, missing) {
   if (!missing) {
     message = "Missing semicolon.";
     loc = loc.end;
-    fix = function(fixer) {
+    fix = function (fixer) {
       return fixer.insertTextAfter(lastToken, ";");
     };
   } else {
     message = "Extra semicolon.";
     loc = loc.start;
-    fix = function(fixer) {
+    fix = function (fixer) {
       return fixer.remove(lastToken);
     };
   }

diff --git a/eslint/babel-eslint-plugin/test/rules/no-invalid-this.js b/eslint/babel-eslint-plugin/test/rules/no-invalid-this.js
@@ -50,8 +50,8 @@ function MODULES(pattern) {
  */
 function extractPatterns(patterns, type) {
   // Clone and apply the pattern environment.
-  const patternsList = patterns.map(function(pattern) {
-    return pattern[type].map(function(applyCondition) {
+  const patternsList = patterns.map(function (pattern) {
+    return pattern[type].map(function (applyCondition) {
       const thisPattern = cloneDeep(pattern);
 
       applyCondition(thisPattern);

diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "lodash": "^4.17.13",
     "mergeiterator": "^1.2.5",
     "output-file-sync": "^2.0.0",
-    "prettier": "^1.19.1",
+    "prettier": "^2.0.5",
     "pump": "^3.0.0",
     "rimraf": "^2.6.3",
     "rollup": "1.27.9",

diff --git a/packages/babel-cli/src/babel/dir.js b/packages/babel-cli/src/babel/dir.js
@@ -22,7 +22,7 @@ function outputFileSync(filePath: string, data: string | Buffer): void {
   fs.writeFileSync(filePath, data);
 }
 
-export default async function({
+export default async function ({
   cliOptions,
   babelOptions,
 }: CmdOptions): Promise<void> {
@@ -143,7 +143,7 @@ export default async function({
   let startTime = null;
 
   const logSuccess = debounce(
-    function() {
+    function () {
       if (startTime === null) {
         // This should never happen, but just in case it's better
         // to ignore the log message rather than making @babel/cli crash.
@@ -189,7 +189,7 @@ export default async function({
   if (cliOptions.watch) {
     const chokidar = util.requireChokidar();
 
-    filenames.forEach(function(filenameOrDir: string): void {
+    filenames.forEach(function (filenameOrDir: string): void {
       const watcher = chokidar.watch(filenameOrDir, {
         persistent: true,
         ignoreInitial: true,
@@ -203,8 +203,8 @@ export default async function({
       // when we are sure that all the files have been compiled.
       let processing = 0;
 
-      ["add", "change"].forEach(function(type: string): void {
-        watcher.on(type, async function(filename: string) {
+      ["add", "change"].forEach(function (type: string): void {
+        watcher.on(type, async function (filename: string) {
           processing++;
           if (startTime === null) startTime = process.hrtime();
 

diff --git a/packages/babel-cli/src/babel/file.js b/packages/babel-cli/src/babel/file.js
@@ -16,7 +16,7 @@ type CompilationOutput = {
   map: Object,
 };
 
-export default async function({
+export default async function ({
   cliOptions,
   babelOptions,
 }: CmdOptions): Promise<void> {
@@ -41,7 +41,7 @@ export default async function({
         const consumer = new sourceMap.SourceMapConsumer(result.map);
         const sources = new Set();
 
-        consumer.eachMapping(function(mapping) {
+        consumer.eachMapping(function (mapping) {
           if (mapping.source != null) sources.add(mapping.source);
 
           map.addMapping({
@@ -111,13 +111,13 @@ export default async function({
 
       process.stdin.setEncoding("utf8");
 
-      process.stdin.on("readable", function() {
+      process.stdin.on("readable", function () {
         const chunk = process.stdin.read();
         // $FlowIgnore
         if (chunk !== null) code += chunk;
       });
 
-      process.stdin.on("end", function() {
+      process.stdin.on("end", function () {
         resolve(code);
       });
       process.stdin.on("error", reject);
@@ -144,7 +144,7 @@ export default async function({
   async function walk(filenames: Array<string>): Promise<void> {
     const _filenames = [];
 
-    filenames.forEach(function(filename) {
+    filenames.forEach(function (filename) {
       if (!fs.existsSync(filename)) return;
 
       const stat = fs.statSync(filename);
@@ -157,7 +157,7 @@ export default async function({
             cliOptions.includeDotfiles,
             cliOptions.extensions,
           )
-          .forEach(function(filename) {
+          .forEach(function (filename) {
             _filenames.push(path.join(dirname, filename));
           });
       } else {
@@ -166,7 +166,7 @@ export default async function({
     });
 
     const results = await Promise.all(
-      _filenames.map(async function(filename: string): Promise<Object> {
+      _filenames.map(async function (filename: string): Promise<Object> {
         let sourceFilename = filename;
         if (cliOptions.outFile) {
           sourceFilename = path.relative(
@@ -224,7 +224,7 @@ export default async function({
             pollInterval: 10,
           },
         })
-        .on("all", function(type: string, filename: string): void {
+        .on("all", function (type: string, filename: string): void {
           if (
             !util.isCompilableExtension(filename, cliOptions.extensions) &&
             !filenames.includes(filename)

diff --git a/packages/babel-cli/src/babel/options.js b/packages/babel-cli/src/babel/options.js
@@ -189,15 +189,15 @@ export default function parseArgv(args: Array<string>): CmdOptions | null {
 
   const errors = [];
 
-  let filenames = commander.args.reduce(function(globbed, input) {
+  let filenames = commander.args.reduce(function (globbed, input) {
     let files = glob.sync(input);
     if (!files.length) files = [input];
     return globbed.concat(files);
   }, []);
 
   filenames = uniq(filenames);
 
-  filenames.forEach(function(filename) {
+  filenames.forEach(function (filename) {
     if (!fs.existsSync(filename)) {
       errors.push(filename + " does not exist");
     }
@@ -255,7 +255,7 @@ export default function parseArgv(args: Array<string>): CmdOptions | null {
 
   if (errors.length) {
     console.error("babel:");
-    errors.forEach(function(e) {
+    errors.forEach(function (e) {
       console.error("  " + e);
     });
     return null;

diff --git a/packages/babel-cli/src/babel/util.js b/packages/babel-cli/src/babel/util.js
@@ -33,7 +33,7 @@ export function readdirForCompilable(
   includeDotfiles: boolean,
   altExts?: Array<string>,
 ): Array<string> {
-  return readdir(dirname, includeDotfiles, function(filename) {
+  return readdir(dirname, includeDotfiles, function (filename) {
     return isCompilableExtension(filename, altExts);
   });
 }
@@ -96,7 +96,7 @@ export function compile(
 
 export function deleteDir(path: string): void {
   if (fs.existsSync(path)) {
-    fs.readdirSync(path).forEach(function(file) {
+    fs.readdirSync(path).forEach(function (file) {
       const curPath = path + "/" + file;
       if (fs.lstatSync(curPath).isDirectory()) {
         // recurse
@@ -110,7 +110,7 @@ export function deleteDir(path: string): void {
   }
 }
 
-process.on("uncaughtException", function(err) {
+process.on("uncaughtException", function (err) {
   console.error(err);
   process.exitCode = 1;
 });