Update to Ember 3.26.1 blueprint; fix deprecations

.eslintignore

@@ -13,6 +13,7 @@
 # misc
 /coverage/
 !.*
+.eslintcache
 
 # ember-try
 /.node_modules.ember-try/

.eslintrc.js

@@ -7,48 +7,48 @@ module.exports = {
     ecmaVersion: 2018,
     sourceType: 'module',
     ecmaFeatures: {
-      legacyDecorators: true
-    }
+      legacyDecorators: true,
+    },
   },
-  plugins: [
-    'ember'
-  ],
+  plugins: ['ember'],
   extends: [
     'eslint:recommended',
-    'plugin:ember/recommended'
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended',
   ],
   env: {
-    browser: true
+    browser: true,
   },
   rules: {},
   overrides: [
     // node files
     {
       files: [
         '.eslintrc.js',
+        '.prettierrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',
         'testem.js',
         'blueprints/*/index.js',
         'config/**/*.js',
-        'tests/dummy/config/**/*.js'
+        'tests/dummy/config/**/*.js',
       ],
       excludedFiles: [
         'addon/**',
         'addon-test-support/**',
         'app/**',
-        'tests/dummy/app/**'
+        'tests/dummy/app/**',
       ],
       parserOptions: {
-        sourceType: 'script'
+        sourceType: 'script',
       },
       env: {
         browser: false,
-        node: true
+        node: true,
       },
       plugins: ['node'],
-      extends: ['plugin:node/recommended']
-    }
-  ]
+      extends: ['plugin:node/recommended'],
+    },
+  ],
 };

.gitignore

@@ -12,6 +12,7 @@
 /.env*
 /.pnp*
 /.sass-cache
+/.eslintcache
 /connect.lock
 /coverage/
 /libpeerconnection.log

.npmignore

@@ -10,10 +10,13 @@
 /.editorconfig
 /.ember-cli
 /.env*
+/.eslintcache
 /.eslintignore
 /.eslintrc.js
 /.git/
 /.gitignore
+/.prettierignore
+/.prettierrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig

.prettierignore

@@ -0,0 +1,21 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.eslintcache
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.prettierrc.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  singleQuote: true,
+};

.template-lintrc.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane'
+  extends: 'octane',
 };

CONTRIBUTING.md

@@ -8,9 +8,8 @@
 
 ## Linting
 
-* `yarn lint:hbs`
-* `yarn lint:js`
-* `yarn lint:js -- --fix`
+* `yarn lint`
+* `yarn lint:fix`
 
 ## Running tests
 

addon/index.js

@@ -1,14 +1,5 @@
-import {
-  Inflector,
-  defaultRules,
-  pluralize,
-  singularize
-} from "./lib/system";
+import { Inflector, defaultRules, pluralize, singularize } from './lib/system';
 
 export default Inflector;
 
-export {
-  pluralize,
-  singularize,
-  defaultRules
-};
+export { pluralize, singularize, defaultRules };

addon/lib/helpers/pluralize.js

@@ -22,7 +22,7 @@ export default makeHelper(function (params, hash) {
   let fullParams = new Array(...params);
 
   if (fullParams.length === 2) {
-    fullParams.push({ withoutCount: hash["without-count"] })
+    fullParams.push({ withoutCount: hash['without-count'] });
   }
 
   return pluralize(...fullParams);

addon/lib/helpers/singularize.js

@@ -14,7 +14,7 @@ import makeHelper from '../utils/make-helper';
  * @for Ember.HTMLBars.helpers
  * @method singularize
  * @param {String|Property} word word to singularize
-*/
+ */
 export default makeHelper(function (params) {
   return singularize(params[0]);
 });

addon/lib/system.js

@@ -1,11 +1,4 @@
-import Inflector from "./system/inflector";
-import {
-  pluralize,
-  singularize
-} from "./system/string";
-
-export {
-  Inflector,
-  singularize,
-  pluralize
-};
+import Inflector from './system/inflector';
+import { pluralize, singularize } from './system/string';
+
+export { Inflector, singularize, pluralize };

addon/lib/system/inflections.js

@@ -20,15 +20,18 @@ export default {
     [/^(m|l)ice$/i, '$1ice'],
     [/^(ox)$/i, '$1en'],
     [/^(oxen)$/i, '$1'],
-    [/(quiz)$/i, '$1zes']
+    [/(quiz)$/i, '$1zes'],
   ],
 
   singular: [
     [/s$/i, ''],
     [/(ss)$/i, '$1'],
     [/(n)ews$/i, '$1ews'],
     [/([ti])a$/i, '$1um'],
-    [/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)(sis|ses)$/i, '$1sis'],
+    [
+      /((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)(sis|ses)$/i,
+      '$1sis',
+    ],
     [/(^analy)(sis|ses)$/i, '$1sis'],
     [/([^f])ves$/i, '$1fe'],
     [/(hive)s$/i, '$1'],
@@ -50,7 +53,7 @@ export default {
     [/(vert|ind)ices$/i, '$1ex'],
     [/(matr)ices$/i, '$1ix'],
     [/(quiz)zes$/i, '$1'],
-    [/(database)s$/i, '$1']
+    [/(database)s$/i, '$1'],
   ],
 
   irregularPairs: [
@@ -60,7 +63,7 @@ export default {
     ['sex', 'sexes'],
     ['move', 'moves'],
     ['cow', 'kine'],
-    ['zombie', 'zombies']
+    ['zombie', 'zombies'],
   ],
 
   uncountable: [
@@ -73,6 +76,6 @@ export default {
     'fish',
     'sheep',
     'jeans',
-    'police'
-  ]
+    'police',
+  ],
 };