From 9bd43642b0515812deab82502a8cc79df4e1d0e9 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 27 Nov 2017 13:57:33 +0100 Subject: [PATCH 1/2] Fix inflector import deprecation. --- addon/adapters/base.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/addon/adapters/base.js b/addon/adapters/base.js index 93a4f978..2010db67 100644 --- 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 From c10c2feb4def3d7e6daa2b403a78a4c4808dddb0 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Sat, 2 Dec 2017 00:45:41 +0100 Subject: [PATCH 2/2] Make ember-try use yarn. --- config/ember-try.js | 1 + 1 file changed, 1 insertion(+) diff --git a/config/ember-try.js b/config/ember-try.js index a8241e21..ab8ed8b0 100644 --- 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',