Merge pull request #4143 from fivetanley/ember-inflector-update-1-13

[bugfix release-1-13] update ember-inflector and correct import usage
emberjs · Feb 9, 2016 · 9aef1cb · 9aef1cb
2 parents 0f0a9b0 + 375ba00
commit 9aef1cb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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",

diff --git 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
@@ -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
@@ -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) {