Merge pull request #299 from ember-codemods/dependabot/npm_and_yarn/prettier-2.0.5

Author: Robert Jackson

lib/logger.js

@@ -1,7 +1,7 @@
 const { createLogger, format, transports } = require('winston');
 const { combine, timestamp, printf } = format;
 
-const logFormatter = printf(info => {
+const logFormatter = printf((info) => {
   return `${info.timestamp} [${info.level}] ${info.message}`;
 });
 

package.json

@@ -48,7 +48,7 @@
     "eslint-plugin-prettier": "^3.1.3",
     "execa": "^4.0.0",
     "jest": "^25.4.0",
-    "prettier": "^1.19.1",
+    "prettier": "^2.0.5",
     "release-it": "^13.5.6",
     "release-it-lerna-changelog": "^2.3.0"
   },

test/run-test.js

@@ -21,8 +21,8 @@ const execOpts = { cwd: inputDir, stderr: 'inherit' };
   emberServe.stderr.pipe(process.stderr);
   emberServe.stdout.pipe(process.stdout);
 
-  await new Promise(resolve => {
-    emberServe.stdout.on('data', data => {
+  await new Promise((resolve) => {
+    emberServe.stdout.on('data', (data) => {
       if (data.toString().includes('Build successful')) {
         resolve();
       }

transforms/angle-brackets/index.js

@@ -36,7 +36,7 @@ function getOptions() {
   return options;
 }
 
-module.exports = function(file) {
+module.exports = function (file) {
   const options = getOptions();
   let invokableData = options.telemetry ? getInvokableData(getTelemetry()) : {};
   try {

transforms/angle-brackets/transform.js

@@ -25,7 +25,7 @@ function isAttribute(key) {
  */
 function shouldSkipAttribute(key, config) {
   if (config.skipAttributesThatMatchRegex && config.skipAttributesThatMatchRegex.length) {
-    return config.skipAttributesThatMatchRegex.some(rx => {
+    return config.skipAttributesThatMatchRegex.some((rx) => {
       // Get the user provided string and convert it to regex.
       const match = /^\/(.*)\/([a-z]*)$/.exec(rx);
       if (match) {
@@ -82,7 +82,7 @@ function transformTagName(tagName) {
 }
 
 function transformNestedSubExpression(subExpression) {
-  let positionalArgs = subExpression.params.map(param => {
+  let positionalArgs = subExpression.params.map((param) => {
     if (param.type === 'SubExpression') {
       return transformNestedSubExpression(param);
     } else if (param.type === 'StringLiteral') {
@@ -94,7 +94,7 @@ function transformNestedSubExpression(subExpression) {
 
   let namedArgs = [];
   if (subExpression.hash.pairs.length > 0) {
-    namedArgs = subExpression.hash.pairs.map(pair => {
+    namedArgs = subExpression.hash.pairs.map((pair) => {
       if (pair.value.type === 'SubExpression') {
         let nestedValue = transformNestedSubExpression(pair.value);
         return `${pair.key}=${nestedValue}`;
@@ -125,7 +125,7 @@ function shouldSkipFile(fileInfo, config) {
 }
 
 function transformAttrs(tagName, attrs, config) {
-  return attrs.map(a => {
+  return attrs.map((a) => {
     let _key = a.key;
     let _valueType = a.value.type;
     let _value;
@@ -144,7 +144,7 @@ function transformAttrs(tagName, attrs, config) {
         _value = a.value;
       } else {
         const params = a.value.params
-          .map(p => {
+          .map((p) => {
             if (p.type === 'SubExpression') {
               return transformNestedSubExpression(p);
             } else if (p.type === 'StringLiteral') {
@@ -290,7 +290,7 @@ function shouldSkipDataTestParams(params, includeValuelessDataTestAttributes) {
     const dataAttrs = getDataAttributesFromParams(params);
     // This is true for nodes with data-* attributes too,
     // as long as there is one with data-test-* attribute.
-    return !dataAttrs.some(attr => attr.original.startsWith('data-test-'));
+    return !dataAttrs.some((attr) => attr.original.startsWith('data-test-'));
   }
   return true;
 }
@@ -305,11 +305,11 @@ function isDataAttrPathExpression(node) {
 }
 
 function getDataAttributesFromParams(params) {
-  return params.filter(it => isDataAttrPathExpression(it));
+  return params.filter((it) => isDataAttrPathExpression(it));
 }
 
 function getNonDataAttributesFromParams(params) {
-  return params.filter(it => !isDataAttrPathExpression(it));
+  return params.filter((it) => !isDataAttrPathExpression(it));
 }
 
 function shouldIgnoreMustacheStatement(fullName, config, invokableData) {
@@ -319,10 +319,7 @@ function shouldIgnoreMustacheStatement(fullName, config, invokableData) {
   let name = fullName;
   // replace `::` with `/`, and ignore the path before $
   if (isWallStreet(name)) {
-    name = name
-      .split('$')
-      .pop()
-      .replace('::', '/');
+    name = name.split('$').pop().replace('::', '/');
   }
 
   if (isTelemetryData) {

yarn.lock

@@ -5467,10 +5467,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
-  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
+prettier@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
+  integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
 
 pretty-format@^25.4.0:
   version "25.4.0"