Merge pull request #508 from ember-cli/update-prettier

Update to prettier@2.

Author: Robert Jackson

config/ember-try.js

@@ -2,12 +2,12 @@
 
 const getChannelURL = require('ember-source-channel-url');
 
-module.exports = function() {
+module.exports = function () {
   return Promise.all([
     getChannelURL('release'),
     getChannelURL('beta'),
     getChannelURL('canary'),
-  ]).then(urls => {
+  ]).then((urls) => {
     return {
       useYarn: true,
       scenarios: [

config/environment.js

@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = function(environment) {
+module.exports = function (environment) {
   let ENV = {
     modulePrefix: 'ember-cli-htmlbars',
     environment,

ember-cli-build.js

@@ -4,7 +4,7 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 const MergeTree = require('broccoli-merge-trees');
 const { has } = require('@ember/edition-utils');
 
-module.exports = function(defaults) {
+module.exports = function (defaults) {
   let hasOctane = has('octane');
   let appTree = 'tests/dummy/app';
   if (hasOctane) {

lib/addDependencyTracker.js

@@ -15,7 +15,7 @@ function addDependencyTracker(plugin, enableInvalidation) {
   // the ast plugin that we can't access with the ast plugin generator that
   // we can access.
   let lastDependencies = {};
-  let trackedPlugin = env => {
+  let trackedPlugin = (env) => {
     let templateStackDepth = 0;
     let realPlugin = plugin(env);
     let visitor = realPlugin.visitor;
@@ -38,7 +38,7 @@ function addDependencyTracker(plugin, enableInvalidation) {
     // have to keep a stack counter of Program nodes that we've seen so far.
     visitor.Program = {
       keys: origKeys,
-      enter: node => {
+      enter: (node) => {
         templateStackDepth++;
         if (templateStackDepth === 1) {
           if (realPlugin.resetDependencies) {
@@ -48,7 +48,7 @@ function addDependencyTracker(plugin, enableInvalidation) {
         }
         if (origEnter) origEnter(node);
       },
-      exit: node => {
+      exit: (node) => {
         if (templateStackDepth === 1) {
           if (realPlugin.dependencies) {
             lastDependencies[env.meta.moduleName] = realPlugin.dependencies(env.meta.moduleName);
@@ -60,7 +60,7 @@ function addDependencyTracker(plugin, enableInvalidation) {
     };
     return realPlugin;
   };
-  trackedPlugin.getDependencies = relativePath => {
+  trackedPlugin.getDependencies = (relativePath) => {
     return lastDependencies[relativePath] || [];
   };
   return trackedPlugin;

lib/colocated-babel-plugin.js

@@ -1,6 +1,6 @@
 // For ease of debuggin / tweaking:
 // https://astexplorer.net/#/gist/bcca584efdab6c981a75618642c76a22/1e1d262eaeb47b7da66150e0781a02b96e597b25
-module.exports = function(babel) {
+module.exports = function (babel) {
   let t = babel.types;
 
   function makeSetComponentTemplateMemberExpression() {
@@ -68,7 +68,9 @@ module.exports = function(babel) {
           return;
         }
 
-        let defaultSpecifier = path.node.specifiers.find(spec => spec.exported.name === 'default');
+        let defaultSpecifier = path.node.specifiers.find(
+          (spec) => spec.exported.name === 'default'
+        );
         if (defaultSpecifier) {
           state.setComponentTemplateInjected = true;
           path.parent.body.push(

lib/colocated-broccoli-plugin.js

@@ -32,11 +32,11 @@ module.exports = class ColocatedTemplateProcessor extends Plugin {
   }
 
   inputHasFile(relativePath) {
-    return !!this.currentEntries().find(e => e.relativePath === relativePath);
+    return !!this.currentEntries().find((e) => e.relativePath === relativePath);
   }
 
   detectRootName() {
-    let entries = this.currentEntries().filter(e => !e.isDirectory());
+    let entries = this.currentEntries().filter((e) => !e.isDirectory());
 
     let [first] = entries;
     let parts = first.relativePath.split('/');
@@ -48,7 +48,7 @@ module.exports = class ColocatedTemplateProcessor extends Plugin {
       root = parts[0];
     }
 
-    if (!entries.every(e => e.relativePath.startsWith(root))) {
+    if (!entries.every((e) => e.relativePath.startsWith(root))) {
       root = null;
     }
 
@@ -203,7 +203,7 @@ module.exports = class ColocatedTemplateProcessor extends Plugin {
             `ember-cli-htmlbars: Unexpected operation when patching files for colocation.\n\tOperation:\n${JSON.stringify(
               [method, relativePath]
             )}\n\tKnown files:\n${JSON.stringify(
-              this.currentEntries().map(e => e.relativePath),
+              this.currentEntries().map((e) => e.relativePath),
               null,
               2
             )}`

lib/ember-addon-main.js

@@ -25,11 +25,11 @@ module.exports = {
 
     const semver = require('semver');
 
-    let babel = this.parent.addons.find(a => a.name === 'ember-cli-babel');
+    let babel = this.parent.addons.find((a) => a.name === 'ember-cli-babel');
     let hasBabel = babel !== undefined;
     let babelVersion = hasBabel && babel.pkg.version;
 
-    let ember = this.project.addons.find(a => a.name === 'ember-source');
+    let ember = this.project.addons.find((a) => a.name === 'ember-source');
     let hasEmberSource = ember !== undefined;
     let emberVersion = hasEmberSource && ember.pkg.version;
 
@@ -100,7 +100,7 @@ module.exports = {
     }
 
     let legacyInlinePrecompileAddon = this.parent.addons.find(
-      a => a.name === 'ember-cli-htmlbars-inline-precompile'
+      (a) => a.name === 'ember-cli-htmlbars-inline-precompile'
     );
     if (legacyInlinePrecompileAddon !== undefined) {
       let heirarchy = [];
@@ -133,7 +133,7 @@ module.exports = {
       //
       // import hbs from 'htmlbars-inline-precompile';
       // import hbs from 'ember-cli-htmlbars-inline-precompile';
-      legacyInlinePrecompileAddon.included = function() {};
+      legacyInlinePrecompileAddon.included = function () {};
     }
   },
 

lib/utils.js

@@ -14,7 +14,7 @@ const INLINE_PRECOMPILE_MODULES = Object.freeze({
 });
 
 function isInlinePrecompileBabelPluginRegistered(plugins) {
-  return plugins.some(plugin => {
+  return plugins.some((plugin) => {
     if (Array.isArray(plugin)) {
       let [pluginPathOrInstance, options] = plugin;
 
@@ -42,7 +42,7 @@ function isInlinePrecompileBabelPluginRegistered(plugins) {
 
 function isColocatedBabelPluginRegistered(plugins) {
   return plugins.some(
-    plugin => typeof plugin === 'string' && plugin === require.resolve('./colocated-babel-plugin')
+    (plugin) => typeof plugin === 'string' && plugin === require.resolve('./colocated-babel-plugin')
   );
 }
 
@@ -156,15 +156,15 @@ function initializeEmberENV(templateCompiler, EmberENV) {
   if (EmberENV.FEATURES) {
     props = Object.keys(EmberENV.FEATURES);
 
-    props.forEach(prop => {
+    props.forEach((prop) => {
       templateCompiler._Ember.FEATURES[prop] = EmberENV.FEATURES[prop];
     });
   }
 
   if (EmberENV) {
     props = Object.keys(EmberENV);
 
-    props.forEach(prop => {
+    props.forEach((prop) => {
       if (prop === 'FEATURES') {
         return;
       }

node-tests/ast_plugins_test.js

@@ -12,14 +12,14 @@ const addDependencyTracker = require('../lib/addDependencyTracker');
 const templateCompiler = require('ember-source/dist/ember-template-compiler.js');
 const CANNOT_UNREGISTER_PLUGINS = !templateCompiler.unregisterPlugin;
 
-describe('AST plugins', function() {
+describe('AST plugins', function () {
   const they = it;
   this.timeout(10000);
 
   let input, output, builder, tree, htmlbarsOptions;
 
   beforeEach(
-    co.wrap(function*() {
+    co.wrap(function* () {
       rewriterCallCount = 0;
       input = yield createTempDir();
       input.write(fixturify.readSync(`${__dirname}/fixtures`));
@@ -31,7 +31,7 @@ describe('AST plugins', function() {
   );
 
   afterEach(
-    co.wrap(function*() {
+    co.wrap(function* () {
       if (tree) {
         tree.unregisterPlugins();
         if (tree.processor.processor._cache) {
@@ -102,7 +102,7 @@ describe('AST plugins', function() {
 
   they(
     'are accepted and used.',
-    co.wrap(function*() {
+    co.wrap(function* () {
       if (CANNOT_UNREGISTER_PLUGINS) {
         this.skip();
       }
@@ -124,7 +124,7 @@ describe('AST plugins', function() {
 
   they(
     'will bust the hot cache if the dependency changes.',
-    co.wrap(function*() {
+    co.wrap(function* () {
       if (CANNOT_UNREGISTER_PLUGINS) {
         this.skip();
       }
@@ -170,20 +170,20 @@ describe('AST plugins', function() {
     })
   );
 
-  describe('with persistent caching enabled', function() {
+  describe('with persistent caching enabled', function () {
     let forcePersistenceValue;
-    before(function() {
+    before(function () {
       forcePersistenceValue = process.env.FORCE_PERSISTENCE_IN_CI;
       process.env.FORCE_PERSISTENCE_IN_CI = 'true';
     });
 
-    after(function() {
+    after(function () {
       process.env.FORCE_PERSISTENCE_IN_CI = forcePersistenceValue;
     });
 
     they(
       'will bust the persistent cache if the template cache key changes.',
-      co.wrap(function*() {
+      co.wrap(function* () {
         if (CANNOT_UNREGISTER_PLUGINS) {
           this.skip();
         }

node-tests/colocated-babel-plugin-test.js

@@ -18,10 +18,10 @@ const RuntimePlugin = [
   },
 ];
 
-describe('ColocatedBabelPlugin', function() {
+describe('ColocatedBabelPlugin', function () {
   this.slow(500);
 
-  it('can be used with decorators', function() {
+  it('can be used with decorators', function () {
     let { code } = babel.transformSync(
       stripIndent`
         import Component from '@glimmer/component';
@@ -68,7 +68,7 @@ describe('ColocatedBabelPlugin', function() {
     );
   });
 
-  it('sets the template for non-class default exports', function() {
+  it('sets the template for non-class default exports', function () {
     let { code } = babel.transformSync(
       stripIndent`
         import MyComponent from 'other-module';
@@ -88,7 +88,7 @@ describe('ColocatedBabelPlugin', function() {
     );
   });
 
-  it('sets the template for named class default exports', function() {
+  it('sets the template for named class default exports', function () {
     let { code } = babel.transformSync(
       stripIndent`
         import Component from 'somewhere';
@@ -110,7 +110,7 @@ describe('ColocatedBabelPlugin', function() {
     );
   });
 
-  it('sets the template for anonymous class default exports', function() {
+  it('sets the template for anonymous class default exports', function () {
     let { code } = babel.transformSync(
       stripIndent`
         import Component from 'somewhere';
@@ -130,7 +130,7 @@ describe('ColocatedBabelPlugin', function() {
     );
   });
 
-  it('sets the template for identifier `as default` exports', function() {
+  it('sets the template for identifier `as default` exports', function () {
     let { code } = babel.transformSync(
       stripIndent`
         import Component from 'somewhere';