Merge pull request #84 from yappbox/ember-3.28

Update to ember 3.28 and address deprecations

Author: lukemelia

.eslintignore

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

.eslintrc.js

@@ -7,47 +7,47 @@ 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',
-        'ember-cli-build.js',
-        'index.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.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',
+        './tests/dummy/config/**/*.js',
       ],
       parserOptions: {
-        sourceType: 'script'
+        sourceType: 'script',
       },
       env: {
         browser: false,
-        node: true
+        node: true,
       },
       plugins: ['node'],
-      extends: ['plugin:node/recommended']
-    }
-  ]
+      extends: ['plugin:node/recommended'],
+    },
+    {
+      // Test files:
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended'],
+    },
+  ],
 };

.gitignore

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

.npmignore

@@ -10,10 +10,14 @@
 /.editorconfig
 /.ember-cli
 /.env*
+/.eslintcache
 /.eslintignore
 /.eslintrc.js
 /.git/
 /.gitignore
+/.prettierignore
+/.prettierrc.js
+/.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
 /bower.json
@@ -22,6 +26,7 @@
 /ember-cli-build.js
 /testem.js
 /tests/
+/yarn-error.log
 /yarn.lock
 .gitkeep
 

.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

@@ -0,0 +1,10 @@
+'use strict';
+
+module.exports = {
+  extends: 'recommended',
+  rules: {
+    'no-curly-component-invocation': {
+      allow: ['emitter-action'],
+    },
+  },
+};

.travis.yml

@@ -3,7 +3,7 @@ language: node_js
 node_js:
   # we recommend testing addons with the same minimum supported node version as Ember CLI
   # so that your addon works for all apps
-  - "10"
+  - "12"
 
 dist: xenial
 
@@ -47,13 +47,15 @@ jobs:
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.16
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.20
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.24
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.28
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
     - env: EMBER_TRY_SCENARIO=ember-classic
+    - env: EMBER_TRY_SCENARIO=embroider-safe
+    - env: EMBER_TRY_SCENARIO=embroider-optimized
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash

CONTRIBUTING.md

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

README.md

@@ -7,9 +7,9 @@
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v3.16 or above
-* Ember CLI v2.13 or above
-* Node.js v10 or above
+* Ember.js v3.24 or above
+* Ember CLI v3.24 or above
+* Node.js v12 or above
 
 
 Installation

addon/components/collection-scroll-view/collection-items/index.js

@@ -43,13 +43,17 @@ export default class CollectionScrollViewCollectionItems extends Component {
     return clientSize ? clientSize.height : estimatedSize.height;
   }
 
-  safeRerender(){
-    if (this.isDestroyed || this.isDestroying) {return;}
+  safeRerender() {
+    if (this.isDestroyed || this.isDestroying) {
+      return;
+    }
     this.rerender();
   }
 
   get contentSize() {
-    this._contentSize = this._contentSize || this.cellLayout.contentSize(this.clientWidth, this.clientHeight);
+    this._contentSize =
+      this._contentSize ||
+      this.cellLayout.contentSize(this.clientWidth, this.clientHeight);
     return this._contentSize;
   }
 
@@ -64,7 +68,15 @@ export default class CollectionScrollViewCollectionItems extends Component {
   }
 
   get renderCells() {
-    let { cellLayout, cells, items, scrollLeft, scrollTop, clientWidth, clientHeight } = this;
+    let {
+      cellLayout,
+      cells,
+      items,
+      scrollLeft,
+      scrollTop,
+      clientWidth,
+      clientHeight,
+    } = this;
     const numItems = items.length;
     if (cellLayout.length !== numItems) {
       cellLayout.length = numItems;
@@ -73,8 +85,18 @@ export default class CollectionScrollViewCollectionItems extends Component {
     let priorMap = this.cellMap;
     let cellMap = Object.create(null);
 
-    let index = cellLayout.indexAt(scrollLeft, scrollTop, clientWidth, clientHeight);
-    let count = cellLayout.count(scrollLeft, scrollTop, clientWidth, clientHeight);
+    let index = cellLayout.indexAt(
+      scrollLeft,
+      scrollTop,
+      clientWidth,
+      clientHeight
+    );
+    let count = cellLayout.count(
+      scrollLeft,
+      scrollTop,
+      clientWidth,
+      clientHeight
+    );
     let bufferBefore = Math.min(index, this.buffer);
     index -= bufferBefore;
     count += bufferBefore;
@@ -83,14 +105,18 @@ export default class CollectionScrollViewCollectionItems extends Component {
 
     let newItems = [];
 
-    for (i=0; i<count; i++) {
-      itemIndex = index+i;
+    for (i = 0; i < count; i++) {
+      itemIndex = index + i;
       itemKey = identity(items[itemIndex]);
       if (priorMap) {
         cell = priorMap[itemKey];
       }
       if (cell) {
-        style = cellLayout.formatItemStyle(itemIndex, clientWidth, clientHeight);
+        style = cellLayout.formatItemStyle(
+          itemIndex,
+          clientWidth,
+          clientHeight
+        );
         cell.style = style;
         cell.hidden = false;
         cell.key = itemKey;
@@ -101,14 +127,18 @@ export default class CollectionScrollViewCollectionItems extends Component {
       }
     }
 
-    for (i=0; i < cells.length; i++) {
+    for (i = 0; i < cells.length; i++) {
       cell = cells[i];
       if (!cellMap[cell.key]) {
         if (newItems.length) {
           itemIndex = newItems.pop();
           let item = items[itemIndex];
           itemKey = identity(item);
-          style = cellLayout.formatItemStyle(itemIndex, clientWidth, clientHeight);
+          style = cellLayout.formatItemStyle(
+            itemIndex,
+            clientWidth,
+            clientHeight
+          );
           cell.style = style;
           cell.key = itemKey;
           cell.index = itemIndex;

addon/components/collection-scroll-view/index.hbs

@@ -27,7 +27,7 @@
     </div>
   {{/if}}
 
-  {{#unless (and (has-block 'header') (is-empty this.headerDimensions))}}
+  {{#if (not (and (has-block 'header') (is-empty this.headerDimensions)))}}
     <div data-test-collection-items-container style={{html-safe (concat "position:relative;height:" this.contentSize.height "px;width:" this.contentSize.width "px")}}>
       <CollectionScrollView::CollectionItems
         @clientSize={{this.collectionClientSize}}
@@ -44,7 +44,7 @@
         {{~/each~}}
       </CollectionScrollView::CollectionItems>
     </div>
-  {{/unless}}
+  {{/if}}
 
   {{#if @revealService}}
     {{emitter-action