Merge pull request #53 from unexpectedjs/depfu/update/npm/prettier-2.0.2

Upgrade prettier to version 2.0.2
unexpectedjs · Apr 4, 2020 · 3181f82 · 3181f82
2 parents 2561e08 + b3c74fd
commit 3181f82
Show file tree

Hide file tree

Showing 16 changed files with 178 additions and 179 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ node_js:
 matrix:
   include:
     - name: Lint
-      node_js: '8'
+      node_js: '12'
       env:
         - TARGET=lint
     - name: Coverage

diff --git a/lib/Snippets.js b/lib/Snippets.js
@@ -28,7 +28,7 @@ class Snippets {
             evaluatedExampleIndex = index;
             tests.push({
               code: snippet.code,
-              flags: flags
+              flags: flags,
             });
           }
           break;
@@ -45,7 +45,7 @@ class Snippets {
 }
 
 module.exports = {
-  fromMarkdown: function(markdown) {
+  fromMarkdown: function (markdown) {
     return new Snippets(extractSnippets(markdown));
-  }
+  },
 };
diff --git a/lib/UnexpectedMarkdown.js b/lib/UnexpectedMarkdown.js
@@ -12,7 +12,7 @@ var maps = {};
 // Make the md-to-mocha transpiler avaliable as a side effect of requiring unexpected-markdown
 // so that mocha --compilers md:unexpected-markdown will work:
 // eslint-disable-next-line node/no-deprecated-api
-require.extensions['.md'] = function(module, fileName) {
+require.extensions['.md'] = function (module, fileName) {
   var sourceMapWithCode = convertMarkdownToMocha(
     fs.readFileSync(fileName, 'utf-8'),
     fileName
@@ -40,9 +40,9 @@ try {
 if (sourceMapSupport) {
   sourceMapSupport.install({
     handleUncaughtExceptions: false,
-    retrieveSourceMap: function(source) {
+    retrieveSourceMap: function (source) {
       return maps[source] ? { url: null, map: maps[source] } : null;
-    }
+    },
   });
 }
 
@@ -64,7 +64,7 @@ class UnexpectedMarkdown {
 
     var index = 0;
     var renderer = new marked.Renderer();
-    renderer.code = function(code) {
+    renderer.code = function (code) {
       var snippet = snippets.get(index);
       var previousSnippet = snippets.get(index - 1);
       index += 1;
@@ -108,7 +108,7 @@ class UnexpectedMarkdown {
     const snippets = await this.getSnippets(options);
 
     var index = 0;
-    var updatedContent = this.content.replace(snippetRegexp, function(
+    var updatedContent = this.content.replace(snippetRegexp, function (
       $0,
       htmlComments,
       lang

diff --git a/lib/convertMarkdownToMocha.js b/lib/convertMarkdownToMocha.js
@@ -19,7 +19,7 @@ try {
     var babelResult = babelCore.transform(code, {
       ...babelOptions,
       sourceMaps: false,
-      compact: false
+      compact: false,
     });
 
     return babelResult.code.replace(/'use strict';/, '');
@@ -49,17 +49,17 @@ function instrumentReturns(astNode, exampleNumber) {
               operator: '=',
               left: {
                 type: 'Identifier',
-                name: `__returnValue${exampleNumber}`
+                name: `__returnValue${exampleNumber}`,
               },
-              right: statement.argument
-            }
+              right: statement.argument,
+            },
           },
           {
             type: 'BreakStatement',
             label: {
               type: 'Identifier',
-              name: `example${exampleNumber}`
-            }
+              name: `example${exampleNumber}`,
+            },
           }
         );
       } else if (statement.type === 'IfStatement') {
@@ -85,7 +85,7 @@ function makeTryCatchConstruct(exampleNumber, topLevelStatements) {
         return endOfExampleX(err);
       }
       if (isPromise(__returnValueX)) {
-        return __returnValueX.then(function() {
+        return __returnValueX.then(function () {
           return endOfExampleX();
         }, endOfExampleX);
       } else {
@@ -114,7 +114,7 @@ function makeTryCatchConstruct(exampleNumber, topLevelStatements) {
 
 function countLinesUntilIndex(text, untilIndex) {
   var count = 0;
-  text.replace(/\r\n?|\n\r?/g, function($0, index) {
+  text.replace(/\r\n?|\n\r?/g, function ($0, index) {
     if (index < untilIndex) {
       count += 1;
     }
@@ -155,7 +155,7 @@ function compileCodeBlocksToAst(codeBlocks, fileName) {
 
     for (const [
       statementIndex,
-      topLevelStatement
+      topLevelStatement,
     ] of topLevelStatements.entries()) {
       switch (topLevelStatement.type) {
         case 'VariableDeclaration':
@@ -170,10 +170,10 @@ function compileCodeBlocksToAst(codeBlocks, fileName) {
                 loc: topLevelStatement.loc,
                 type: 'VariableDeclarator',
                 id: topLevelStatement.id,
-                init: topLevelStatement
-              }
+                init: topLevelStatement,
+              },
             ],
-            kind: 'var'
+            kind: 'var',
           };
           topLevelStatements[statementIndex] = newStatement;
           break;
@@ -226,22 +226,22 @@ function compileCodeBlocksToAst(codeBlocks, fileName) {
               operator: '=',
               left: {
                 type: 'Identifier',
-                name: 'message'
+                name: 'message',
               },
               right: {
                 type: 'CallExpression',
                 callee: {
                   type: 'Identifier',
-                  name: 'cleanStackTrace'
+                  name: 'cleanStackTrace',
                 },
                 arguments: [
                   {
                     type: 'Identifier',
-                    name: 'message'
-                  }
-                ]
-              }
-            }
+                    name: 'message',
+                  },
+                ],
+              },
+            },
           });
           check.unshift(esprima.parse(cleanStackTrace.toString()).body[0]);
         }
@@ -261,7 +261,7 @@ function compileCodeBlocksToAst(codeBlocks, fileName) {
   return top;
 }
 
-module.exports = function(mdSrc, fileName) {
+module.exports = function (mdSrc, fileName) {
   if (fileName) {
     fileName = pathModule.relative(process.cwd(), fileName);
   } else {
@@ -283,9 +283,9 @@ module.exports = function(mdSrc, fileName) {
           unexpected = require('unexpected');
           unexpected.output.preferredWidth = 80;
         }
-        describe('', function() {});
+        describe('', function () {});
       }
-    )
+    ),
   };
   /* eslint-enable */
 
@@ -302,7 +302,7 @@ module.exports = function(mdSrc, fileName) {
     var transpiledCode = transpile(
       preambleSeparator +
         codeBlocks
-          .map(function(codeBlock) {
+          .map(function (codeBlock) {
             return codeBlock.flags.async
               ? `(function unexpectedMarkdownScope() {${codeBlock.code}})("unexpectedMarkdownScope");`
               : codeBlock.code;
@@ -335,14 +335,15 @@ module.exports = function(mdSrc, fileName) {
     var itExpressionStatement = parseFunctionBody(
       /* istanbul ignore next */
       function f() {
-        it('', function() {
+        it('', function () {
           var expect = unexpected.clone();
         });
       }
     )[0];
     /* eslint-enable */
-    itExpressionStatement.expression.arguments[0].value = `example #${exampleNumber} (${fileName}:${codeBlock.lineNumber +
-      1}:1) should ${
+    itExpressionStatement.expression.arguments[0].value = `example #${exampleNumber} (${fileName}:${
+      codeBlock.lineNumber + 1
+    }:1) should ${
       typeof codeBlock.output === 'string'
         ? 'fail with the correct error message'
         : 'succeed'

diff --git a/lib/createExpect.js b/lib/createExpect.js
@@ -1,5 +1,5 @@
 /* global unexpected */
-module.exports = function(options) {
+module.exports = function (options) {
   options = { ...options };
   var expect;
   if (options.unexpected) {

diff --git a/lib/evaluateSnippets.js b/lib/evaluateSnippets.js
@@ -15,7 +15,7 @@ try {
     var babelResult = babelCore.transform(code, {
       ...babelOptions,
       sourceMaps: false,
-      compact: false
+      compact: false,
     });
 
     return babelResult.code.replace(/'use strict';/, '');
@@ -52,7 +52,7 @@ function getErrorMessage(expect, format, error) {
   }
 }
 
-module.exports = async function(snippets, options) {
+module.exports = async function (snippets, options) {
   var oldGlobal = Object.assign({}, global);
   var expect = createExpect(options);
   global.expect = expect.clone();
@@ -63,15 +63,15 @@ module.exports = async function(snippets, options) {
       '\n//---------------------preamble----------------------\n';
     var separator = '\n//---------------------separator---------------------\n';
 
-    var exampleSnippets = snippets.filter(function(snippet) {
+    var exampleSnippets = snippets.filter(function (snippet) {
       return snippet.lang === 'javascript' && snippet.flags.evaluate;
     });
 
     if (exampleSnippets.length) {
       var codeForTranspilation =
         preambleSeparator +
         exampleSnippets
-          .map(function(snippet) {
+          .map(function (snippet) {
             return snippet.flags.async
               ? `(function () {${snippet.code}})();`
               : snippet.code;

diff --git a/lib/extractSnippets.js b/lib/extractSnippets.js
@@ -23,11 +23,11 @@ function parseSnippetInfo(lang) {
 
   return {
     lang: lang,
-    flags: flags
+    flags: flags,
   };
 }
 
-module.exports = function(markdown) {
+module.exports = function (markdown) {
   var snippets = [];
   var m;
   while ((m = snippetRegexp.exec(markdown))) {

diff --git a/lib/magicpenDarkSyntaxTheme.js b/lib/magicpenDarkSyntaxTheme.js
@@ -1,6 +1,6 @@
 module.exports = {
   name: 'dark-syntax-theme',
-  installInto: function(pen) {
+  installInto: function (pen) {
     pen.installTheme('html', {
       jsComment: '#888',
       jsFunctionName: 'jsKeyword',
@@ -28,7 +28,7 @@ module.exports = {
       prismKeyword: '#F92672',
       prismRegex: '#AE81FF',
 
-      prismFunction: []
+      prismFunction: [],
     });
-  }
+  },
 };
diff --git a/lib/magicpenGithubSyntaxTheme.js b/lib/magicpenGithubSyntaxTheme.js
@@ -1,6 +1,6 @@
 module.exports = {
   name: 'github-syntax-theme',
-  installInto: function(pen) {
+  installInto: function (pen) {
     pen.installTheme('html', {
       // Mimic github theme
       prismComment: 'jsComment',
@@ -28,7 +28,7 @@ module.exports = {
 
       prismFunction: '#000000',
 
-      prismImportant: ['#0086b3', 'bold']
+      prismImportant: ['#0086b3', 'bold'],
     });
-  }
+  },
 };
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "eslint-plugin-standard": "^4.0.0",
     "mocha": "^7.0.0",
     "nyc": "^15.0.0",
-    "prettier": "~1.19.1",
+    "prettier": "~2.0.2",
     "unexpected": "^11.12.1"
   },
   "author": "Sune Simonsen",

diff --git a/test/Snippets.spec.js b/test/Snippets.spec.js
@@ -18,7 +18,7 @@ describe('Snippets', () => {
           'foo',
           '  at bar (/path/to/file.js:x:y)',
           '  at quux (/path/to/file.js:x:y)',
-          '```'
+          '```',
         ].join('\n')
       );
 
@@ -28,8 +28,8 @@ describe('Snippets', () => {
             'throw new Error("foo\\n  at bar (/somewhere.js:1:2)\\n  at quux (/blah.js:3:4)\\n  at baz (/yadda.js:5:6)")',
           flags: { evaluate: true },
           output:
-            'foo\n  at bar (/path/to/file.js:x:y)\n  at quux (/path/to/file.js:x:y)'
-        }
+            'foo\n  at bar (/path/to/file.js:x:y)\n  at quux (/path/to/file.js:x:y)',
+        },
       ]);
     });
   });