From de67c732f9a8a5fece2963cdbb8f669d342a2e0c Mon Sep 17 00:00:00 2001 From: Manuel Wiedenmann Date: Mon, 26 Oct 2015 16:16:46 +0100 Subject: [PATCH 1/2] [BUGFIX release-1-13] 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 3064c51b994..b9d5df1a952 100644 --- a/packages/ember-data/lib/serializers/json-api-serializer.js +++ b/packages/ember-data/lib/serializers/json-api-serializer.js @@ -4,9 +4,9 @@ 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 ArrayPolyfills from 'ember-data/ext/ember/array'; import Ember from 'ember'; +import { pluralize, singularize } from 'ember-inflector'; const map = ArrayPolyfills.map; const 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 27b830ddc2d..e5bcb67943a 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 { pushPayload } from "ember-data/system/store/serializer-response"; import ArrayPolyfills from 'ember-data/ext/ember/array'; 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) { From 375ba0099f7cf206d79ae25ae13049549e56c801 Mon Sep 17 00:00:00 2001 From: Stanley Stuart Date: Tue, 9 Feb 2016 14:29:46 -0600 Subject: [PATCH 2/2] [BUGFIX release-1-13] update ember-inflector & import usage fixes https://github.com/emberjs/data/issues/4142 Correcting the import usage fixes which resolver is used so users can override with their own inflections. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index abc167e6bdb..2fa33432f28 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "ejs": "^1.0.0", "ember-cli": "^0.2.2", "ember-new-computed": "1.0.2", - "ember-inflector": "^1.9.2", + "ember-inflector": "^1.9.4", "ember-publisher": "0.0.7", "es6-module-transpiler": "^0.9.5", "es6-module-transpiler-amd-formatter": "^0.2.4",