From 38cbdeb784f8c661de6b850a6500a8c6dbc2f840 Mon Sep 17 00:00:00 2001 From: Manuel Wiedenmann Date: Mon, 26 Oct 2015 16:16:46 +0100 Subject: [PATCH] [BUGFIX release] import from ember-inflector to use the default instance --- packages/ember-data/lib/serializers/json-api-serializer.js | 2 +- packages/ember-data/lib/serializers/rest-serializer.js | 2 +- packages/ember-data/lib/system/relationship-meta.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/ember-data/lib/serializers/json-api-serializer.js b/packages/ember-data/lib/serializers/json-api-serializer.js index 4cefb252cdc..f90bcd0d353 100644 --- a/packages/ember-data/lib/serializers/json-api-serializer.js +++ b/packages/ember-data/lib/serializers/json-api-serializer.js @@ -4,7 +4,7 @@ import JSONSerializer from 'ember-data/serializers/json-serializer'; import normalizeModelName from 'ember-data/system/normalize-model-name'; -import { pluralize, singularize } from 'ember-inflector/lib/system/string'; +import { pluralize, singularize } from 'ember-inflector'; var dasherize = Ember.String.dasherize; diff --git a/packages/ember-data/lib/serializers/rest-serializer.js b/packages/ember-data/lib/serializers/rest-serializer.js index 96f7e4bf31e..256f0a1ce54 100644 --- a/packages/ember-data/lib/serializers/rest-serializer.js +++ b/packages/ember-data/lib/serializers/rest-serializer.js @@ -4,7 +4,7 @@ import JSONSerializer from "ember-data/serializers/json-serializer"; import normalizeModelName from "ember-data/system/normalize-model-name"; -import {singularize} from "ember-inflector/lib/system/string"; +import {singularize} from "ember-inflector"; import coerceId from "ember-data/system/coerce-id"; import { modelHasAttributeOrRelationshipNamedType } from "ember-data/utils"; diff --git a/packages/ember-data/lib/system/relationship-meta.js b/packages/ember-data/lib/system/relationship-meta.js index e2265acc260..1451d380699 100644 --- a/packages/ember-data/lib/system/relationship-meta.js +++ b/packages/ember-data/lib/system/relationship-meta.js @@ -1,4 +1,4 @@ -import {singularize} from 'ember-inflector/lib/system/string'; +import {singularize} from 'ember-inflector'; import normalizeModelName from 'ember-data/system/normalize-model-name'; export function typeForRelationshipMeta(meta) {