Merge pull request #275 from CvX/fix-deprecation

Fix inflector deprecation
funkensturm · Dec 8, 2017 · 709bb27 · 709bb27
2 parents 866e592 + c10c2fe
commit 709bb27
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/addon/adapters/base.js b/addon/adapters/base.js
@@ -12,14 +12,13 @@ const {
   get,
   RSVP,
   run,
-  Inflector,
   typeOf,
   isEmpty,
   computed
 } = Ember;
 
 // Ember data ships with ember-inflector
-const inflector = Inflector.inflector;
+import { singularize, pluralize } from 'ember-inflector';
 
 export default JSONAPIAdapter.extend(ImportExportMixin, {
   _debug: false,
@@ -181,7 +180,7 @@ export default JSONAPIAdapter.extend(ImportExportMixin, {
       });
 
     if (query && query.filter) {
-      const serializer = this.store.serializerFor(inflector.singularize(type));
+      const serializer = this.store.serializerFor(singularize(type));
 
       return records.filter((record) => {
         return this._queryFilter(record, serializer, query.filter);
@@ -232,7 +231,7 @@ export default JSONAPIAdapter.extend(ImportExportMixin, {
 
         // normalize type
         if (key === 'type' && typeOf(queryValue) === 'string') {
-          queryValue = inflector.pluralize(queryValue);
+          queryValue = pluralize(queryValue);
         }
 
         // Attributes

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,5 +1,6 @@
 /* eslint-env node */
 module.exports = {
+  useYarn: true,
   scenarios: [
     {
       name: 'ember-lts-2.4',