fix(admin): handle irregular plural deprecation

1024pix · Jul 15, 2024 · 15ed6fb · 15ed6fb
1 parent 8fa9d5a
commit 15ed6fb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/admin/app/app.js b/admin/app/app.js
@@ -2,8 +2,8 @@ import 'flatpickr';
 import 'flatpickr/dist/l10n';
 
 import Application from '@ember/application';
+import { irregular } from '@ember-data/request-utils/string';
 import { dom, library } from '@fortawesome/fontawesome-svg-core';
-import Inflector from 'ember-inflector';
 import loadInitializers from 'ember-load-initializers';
 import config from 'pix-admin/config/environment';
 
@@ -16,7 +16,7 @@ class App extends Application {
   Resolver = Resolver;
 }
 
-Inflector.inflector.irregular('badge-criterion', 'badge-criteria');
+irregular('badge-criterion', 'badge-criteria');
 
 library.add(fapixTachometer, fapixPersonExport);
 dom.watch();

diff --git a/admin/ember-cli-build.js b/admin/ember-cli-build.js
@@ -42,7 +42,7 @@ module.exports = function (defaults) {
     staticModifiers: true,
     packagerOptions: {
       webpackConfig: {
-        devtool: sourceMapConfig[process.env.CI ? 'test' : process.env.NODE_ENV ?? 'default'],
+        devtool: sourceMapConfig[process.env.CI ? 'test' : (process.env.NODE_ENV ?? 'default')],
       },
     },
   });

diff --git a/admin/mirage/serializers/application.js b/admin/mirage/serializers/application.js
@@ -1,8 +1,9 @@
-import Inflector from 'ember-inflector';
+import { irregular, pluralize } from '@ember-data/request-utils/string';
 import { JSONAPISerializer } from 'miragejs';
 
 export default JSONAPISerializer.extend({
   typeKeyForModel(model) {
-    return Inflector.inflector.pluralize(model.modelName);
+    irregular('badge-criterion', 'badge-criteria');
+    return pluralize(model.modelName);
   },
 });