Setup Prettier with ESLint integration

.eslintrc.js

@@ -5,16 +5,19 @@ module.exports = {
     sourceType: 'module'
   },
   plugins: [
-    'ember'
+    'ember',
+    'prettier'
   ],
   extends: [
     'eslint:recommended',
-    'plugin:ember/recommended'
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended'
   ],
   env: {
     browser: true
   },
   rules: {
+    'comma-dangle': ['error', 'always-multiline']
   },
   overrides: [
     // node files

.prettierrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  singleQuote: true,
+  trailingComma: 'es5',
+};

addon/apollo/query-manager.js

@@ -1,12 +1,12 @@
-import { inject as service } from "@ember/service";
-import EmberObject from "@ember/object";
-import { alias } from "@ember/object/computed";
-import { A } from "@ember/array";
+import { inject as service } from '@ember/service';
+import EmberObject from '@ember/object';
+import { alias } from '@ember/object/computed';
+import { A } from '@ember/array';
 
 export default EmberObject.extend({
   apollo: service(),
   apolloClient: alias('apollo.client'),
-  
+
   activeSubscriptions: null,
 
   init() {
@@ -60,7 +60,7 @@ export default EmberObject.extend({
     return this.get('apollo').managedWatchQuery(this, opts, resultKey);
   },
 
-   /**
+  /**
    * Tracks a subscription in the list of active subscriptions, which will all be
    * cancelled when `unsubcribeAll` is called.
    *
@@ -97,7 +97,7 @@ export default EmberObject.extend({
    * @return {!Promise}
    * @public
    */
-  unsubscribeAll(onlyStale=false) {
+  unsubscribeAll(onlyStale = false) {
     let subscriptions = this.get('activeSubscriptions');
     subscriptions.forEach(subscription => {
       if (!onlyStale || subscription.stale) {

addon/mixins/base-query-manager.js

@@ -1,11 +1,11 @@
-import { inject as service } from "@ember/service";
-import Mixin from "@ember/object/mixin";
-import { computed } from "@ember/object";
+import { inject as service } from '@ember/service';
+import Mixin from '@ember/object/mixin';
+import { computed } from '@ember/object';
 
 export default Mixin.create({
   apolloService: service('apollo'),
 
   apollo: computed(function() {
     return this.get('apolloService').createQueryManager();
-  })
+  }),
 });

addon/mixins/component-query-manager.js

@@ -1,4 +1,4 @@
-import Mixin from "@ember/object/mixin";
+import Mixin from '@ember/object/mixin';
 import BaseQueryManager from 'ember-apollo-client/mixins/base-query-manager';
 
 export default Mixin.create(BaseQueryManager, {

addon/mixins/object-query-manager.js

@@ -1,4 +1,4 @@
-import Mixin from "@ember/object/mixin";
+import Mixin from '@ember/object/mixin';
 import BaseQueryManager from 'ember-apollo-client/mixins/base-query-manager';
 
 export default Mixin.create(BaseQueryManager, {

addon/mixins/route-query-manager.js

@@ -1,4 +1,4 @@
-import Mixin from "@ember/object/mixin";
+import Mixin from '@ember/object/mixin';
 import BaseQueryManager from 'ember-apollo-client/mixins/base-query-manager';
 
 export default Mixin.create(BaseQueryManager, {
@@ -13,10 +13,10 @@ export default Mixin.create(BaseQueryManager, {
   },
 
   willDestroy() {
-    let apollo = this.get('apollo')
+    let apollo = this.get('apollo');
     if (apollo.unsubscribeAll) {
       this.get('apollo').unsubscribeAll(false);
     }
     this._super(...arguments);
-  }
+  },
 });

addon/services/apollo.js

@@ -1,22 +1,22 @@
 import Ember from 'ember';
-import Service from "@ember/service"
-import EmberObject, { get, setProperties, computed } from "@ember/object";
-import { A } from "@ember/array";
-import { deprecate } from "@ember/application/deprecations";
-import { isArray } from "@ember/array";
-import { isNone, isPresent } from "@ember/utils";
-import { getOwner } from "@ember/application";
-import { merge } from "@ember/polyfills";
-import RSVP from "rsvp";
-import { run } from "@ember/runloop";
-import { alias } from "@ember/object/computed";
-import { ApolloClient } from "apollo-client";
-import { createHttpLink } from "apollo-link-http";
-import { InMemoryCache } from "apollo-cache-inmemory";
-import { apolloObservableKey } from "ember-apollo-client";
-import QueryManager from "ember-apollo-client/apollo/query-manager";
-import copyWithExtras from "ember-apollo-client/utils/copy-with-extras";
-import { registerWaiter } from "@ember/test";
+import Service from '@ember/service';
+import EmberObject, { get, setProperties, computed } from '@ember/object';
+import { A } from '@ember/array';
+import { deprecate } from '@ember/application/deprecations';
+import { isArray } from '@ember/array';
+import { isNone, isPresent } from '@ember/utils';
+import { getOwner } from '@ember/application';
+import { merge } from '@ember/polyfills';
+import RSVP from 'rsvp';
+import { run } from '@ember/runloop';
+import { alias } from '@ember/object/computed';
+import { ApolloClient } from 'apollo-client';
+import { createHttpLink } from 'apollo-link-http';
+import { InMemoryCache } from 'apollo-cache-inmemory';
+import { apolloObservableKey } from 'ember-apollo-client';
+import QueryManager from 'ember-apollo-client/apollo/query-manager';
+import copyWithExtras from 'ember-apollo-client/utils/copy-with-extras';
+import { registerWaiter } from '@ember/test';
 import fetch from 'fetch';
 
 function newDataFunc(observable, resultKey, resolve, mergedProps = {}) {
@@ -54,7 +54,7 @@ function newDataFunc(observable, resultKey, resolve, mergedProps = {}) {
 
 // used in environments without injected `config:environment` (i.e. unit tests):
 const defaultOptions = {
-  apiURL: "http://testserver.example/v1/graph",
+  apiURL: 'http://testserver.example/v1/graph',
 };
 
 export default Service.extend({
@@ -65,13 +65,13 @@ export default Service.extend({
   // options are configured in your environment.js.
   options: computed(function() {
     // config:environment not injected into tests, so try to handle that gracefully.
-    let config = getOwner(this).resolveRegistration("config:environment");
+    let config = getOwner(this).resolveRegistration('config:environment');
     if (config && config.apollo) {
       return config.apollo;
     } else if (Ember.testing) {
       return defaultOptions;
     }
-    throw new Error("no Apollo service options defined");
+    throw new Error('no Apollo service options defined');
   }),
 
   init() {
@@ -100,8 +100,8 @@ export default Service.extend({
    */
   clientOptions: computed(function() {
     return {
-      link: this.get("link"),
-      cache: this.get("cache"),
+      link: this.get('link'),
+      cache: this.get('cache'),
     };
   }),
 
@@ -121,11 +121,16 @@ export default Service.extend({
 
     let middlewares = this.get('middlewares');
     if (isPresent(middlewares)) {
-      deprecate(`The \`middlewares\` option is deprecated, override \`link\` instead.`, false, {
-        id: 'ember-apollo-client.deprecate-middlewares-for-link',
-        until: '1.0.0',
-        url: 'https://github.com/apollographql/apollo-client/blob/master/docs/source/2.0-migration.md#network-middleware-and-afterware'
-      });
+      deprecate(
+        `The \`middlewares\` option is deprecated, override \`link\` instead.`,
+        false,
+        {
+          id: 'ember-apollo-client.deprecate-middlewares-for-link',
+          until: '1.0.0',
+          url:
+            'https://github.com/apollographql/apollo-client/blob/master/docs/source/2.0-migration.md#network-middleware-and-afterware',
+        }
+      );
     }
 
     return link;
@@ -278,8 +283,7 @@ export default Service.extend({
    */
   _waitFor(promise) {
     this._incrementOngoing();
-    return promise
-      .finally(() => this._decrementOngoing());
+    return promise.finally(() => this._decrementOngoing());
   },
 
   // unresolved / ongoing requests, used for tests:

addon/utils/copy-with-extras.js

@@ -1,10 +1,10 @@
-const extraCopyProperties = ["__typename"];
+const extraCopyProperties = ['__typename'];
 
 export default function copyWithExtras(obj, seen, copies) {
   let ret, loc, key;
 
   // primitive data types are immutable, just return them.
-  if (typeof obj !== "object" || obj === null) {
+  if (typeof obj !== 'object' || obj === null) {
     return obj;
   }
 
@@ -34,7 +34,7 @@ export default function copyWithExtras(obj, seen, copies) {
 
       // Prevents browsers that don't respect non-enumerability from
       // copying internal Ember properties
-      if (key.substring(0, 2) === "__") {
+      if (key.substring(0, 2) === '__') {
         continue;
       }
 

config/ember-try.js

@@ -6,66 +6,66 @@ module.exports = function() {
   return Promise.all([
     getChannelURL('release'),
     getChannelURL('beta'),
-    getChannelURL('canary')
-  ]).then((urls) => {
+    getChannelURL('canary'),
+  ]).then(urls => {
     return {
       useYarn: true,
       scenarios: [
         {
           name: 'ember-lts-2.12',
           npm: {
             devDependencies: {
-              'ember-source': '~2.12.0'
-            }
-          }
+              'ember-source': '~2.12.0',
+            },
+          },
         },
         {
           name: 'ember-lts-2.16',
           npm: {
             devDependencies: {
-              'ember-source': '~2.16.0'
-            }
-          }
+              'ember-source': '~2.16.0',
+            },
+          },
         },
         {
           name: 'ember-lts-2.18',
           npm: {
             devDependencies: {
-              'ember-source': '~2.18.0'
-            }
-          }
+              'ember-source': '~2.18.0',
+            },
+          },
         },
         {
           name: 'ember-release',
           npm: {
             devDependencies: {
-              'ember-source': urls[0]
-            }
-          }
+              'ember-source': urls[0],
+            },
+          },
         },
         {
           name: 'ember-beta',
           npm: {
             devDependencies: {
-              'ember-source': urls[1]
-            }
-          }
+              'ember-source': urls[1],
+            },
+          },
         },
         {
           name: 'ember-canary',
           npm: {
             devDependencies: {
-              'ember-source': urls[2]
-            }
-          }
+              'ember-source': urls[2],
+            },
+          },
         },
         {
           name: 'ember-default',
           npm: {
-            devDependencies: {}
-          }
-        }
-      ]
+            devDependencies: {},
+          },
+        },
+      ],
     };
   });
 };

config/environment.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {
-  return { };
+  return {};
 };

ember-cli-build.js

@@ -6,8 +6,8 @@ module.exports = function(defaults) {
   let app = new EmberAddon(defaults, {
     'ember-cli-babel': {
       // Necessary for Object.assign when testing in the dummy app with PhantomJS
-      includePolyfill: true
-    }
+      includePolyfill: true,
+    },
   });
 
   /*