Octanify, begin mixin deprecation

.eslintignore

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

.eslintrc.js

@@ -10,55 +10,59 @@ 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: {
     'ember/no-jquery': 'off',
+    'ember/no-mixins': 'off',
     'ember/no-new-mixins': 'off',
-    'no-useless-escape': 'off'
+    'no-useless-escape': 'off',
   },
   overrides: [
     // node files
     {
       files: [
-        '.eslintrc.js',
-        '.template-lintrc.js',
-        'ember-cli-build.js',
-        'index.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'server/**/*.js',
-        'tests/dummy/config/**/*.js'
-      ],
-      excludedFiles: [
-        'addon/**',
-        'addon-test-support/**',
-        'app/**',
-        'tests/dummy/app/**'
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.template-lintrc.js',
+        './ember-cli-build.js',
+        './index.js',
+        './testem.js',
+        './blueprints/*/index.js',
+        './config/**/*.js',
+        './server/**/*.js',
+        './tests/dummy/config/**/*.js',
       ],
       parserOptions: {
-        sourceType: 'script'
+        sourceType: 'script',
       },
       env: {
         browser: false,
-        node: true
+        node: true,
       },
       plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        'node/no-unpublished-require': 'off'
-      })
-    }
-  ]
+      extends: ['plugin:node/recommended'],
+      rules: {
+        'node/no-unpublished-require': 'off',
+      },
+    },
+    {
+      // Test files:
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended'],
+      rules: {
+        'qunit/require-expect': 'off',
+      },
+    },
+  ],
 };

.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
@@ -23,10 +26,12 @@
 /ember-cli-build.js
 /testem.js
 /tests/
+/yarn-error.log
 /yarn.lock
 .gitkeep
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
 /package.json.ember-try
+/config/addon-docs.js

.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,8 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane'
+  extends: 'recommended',
+  rules: {
+    'no-inline-styles': false,
+  },
 };

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/-private/cache.js

@@ -1,10 +1,9 @@
-import { queryCacheKey, cacheKey } from  './utils/get-key';
+import { queryCacheKey, cacheKey } from './utils/get-key';
 
 /*
   A cache for queries.
 */
 export default class Cache {
-
   constructor() {
     this.store = {};
   }
@@ -21,7 +20,6 @@ export default class Cache {
   }
 
   all() {
-    return Object.keys(this.store).map(key => this.store[key]);
+    return Object.keys(this.store).map((key) => this.store[key]);
   }
-
 }

addon/-private/coordinator.js

@@ -5,19 +5,18 @@ import { get } from '@ember/object';
 
 // cleans options so that the resulting object only contains
 // data we want to send to the server as query params.
-let _cleanParams = function(options) {
+let _cleanParams = function (options) {
   let clean = { ...{}, ...options };
   delete clean.reload;
   delete clean.backgroundReload;
   return clean;
-}
+};
 
 /*
   I know how to retrieve queries from the cache, and also assemble queries that
   are not in the cache but can be derived from them.
 */
 export default class Coordinator {
-
   constructor(store) {
     this.store = store;
     this.recordCache = new Cache();
@@ -52,9 +51,9 @@ export default class Coordinator {
   }
 
   queryFor(...args) {
-    return args.length === 3 ?
-      this.recordQueryFor(...args) :
-      this.recordArrayQueryFor(...args);
+    return args.length === 3
+      ? this.recordQueryFor(...args)
+      : this.recordArrayQueryFor(...args);
   }
 
   dump() {
@@ -65,7 +64,9 @@ export default class Coordinator {
   }
 
   recordHasIncludes(type, id, includesString) {
-    let query = this._assembleRecordQuery(type, id, { include: includesString });
+    let query = this._assembleRecordQuery(type, id, {
+      include: includesString,
+    });
     let nonLoadedIncludes = this._nonLoadedIncludesForQuery(query);
 
     return nonLoadedIncludes.length === 0;
@@ -99,16 +100,17 @@ export default class Coordinator {
   }
 
   _nonLoadedIncludesForQuery(query) {
-    let loadedIncludes = get(this, `loadedIncludes.${query.type}.${query.id}`) || [];
+    let loadedIncludes =
+      get(this, `loadedIncludes.${query.type}.${query.id}`) || [];
     let includesString = query.params.include || '';
 
     return includesString
       .split(',')
-      .filter(include => !!include)
-      .filter(include => {
-        return !loadedIncludes.find(loadedInclude => {
+      .filter((include) => !!include)
+      .filter((include) => {
+        return !loadedIncludes.find((loadedInclude) => {
           return loadedInclude.indexOf(include) === 0;
-        })
+        });
       });
   }
 
@@ -123,13 +125,13 @@ export default class Coordinator {
 
   _updateLoadedIncludesWithQuery(query) {
     this.loadedIncludes[query.type] = this.loadedIncludes[query.type] || {};
-    this.loadedIncludes[query.type][query.id] = this.loadedIncludes[query.type][query.id] || [];
+    this.loadedIncludes[query.type][query.id] =
+      this.loadedIncludes[query.type][query.id] || [];
 
     let currentIncludes = this.loadedIncludes[query.type][query.id];
     let nonLoadedIncludes = this._nonLoadedIncludesForQuery(query);
     let newLoadedIncludes = [...currentIncludes, ...nonLoadedIncludes];
 
     this.loadedIncludes[query.type][query.id] = newLoadedIncludes;
   }
-
 }

addon/-private/record-array-query.js

@@ -1,5 +1,4 @@
 export default class RecordArrayQuery {
-
   constructor(store, type, params = {}) {
     this.store = store;
     this.type = type;
@@ -13,14 +12,12 @@ export default class RecordArrayQuery {
 
     if (this.value) {
       promise = this.value.update();
-
     } else {
-      promise = this.store.query(this.type, this.params)
-        .then(records => {
-          this.value = records;
+      promise = this.store.query(this.type, this.params).then((records) => {
+        this.value = records;
 
-          return records;
-        });
+        return records;
+      });
     }
 
     return promise;
@@ -30,13 +27,12 @@ export default class RecordArrayQuery {
     let includes = this.params && this.params.include;
     let models = this.value;
 
-    if (includes && models)  {
+    if (includes && models) {
       models
-        .filter(model => model.trackLoadedIncludes)
+        .filter((model) => model.trackLoadedIncludes)
         .forEach((model) => {
           model.trackLoadedIncludes(includes);
         });
     }
   }
-
 }

addon/-private/record-query.js

@@ -1,5 +1,4 @@
 export default class RecordQuery {
-
   constructor(store, type, id, params = {}) {
     this.store = store;
     this.type = type;
@@ -8,22 +7,21 @@ export default class RecordQuery {
 
     // if we have no params, we can use the model from
     // the store if it exists, nice lil shortcut here.
-    this.value = Object.keys(this.params).length === 0 ?
-      this.store.peekRecord(type, id) :
-      null;
+    this.value =
+      Object.keys(this.params).length === 0
+        ? this.store.peekRecord(type, id)
+        : null;
   }
 
   run() {
     // if we're running a query in storefront we always want
     // a blocking promise, so we force reload true.
     let options = { ...{ reload: true }, ...this.params };
 
-    return this.store.findRecord(this.type, this.id, options)
-      .then(record => {
-        this.value = record;
+    return this.store.findRecord(this.type, this.id, options).then((record) => {
+      this.value = record;
 
-        return record;
-      });
+      return record;
+    });
   }
-
 }