@html-next/vertical-collection 1.0.0 → 2.1.0

package/.github/workflows/ci.yml

@@ -0,0 +1,79 @@
+name: Vertical Collection CI
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+jobs:
+  test:
+    name: Run Tests
+    runs-on: ubuntu-latest
+    timeout-minutes: 6
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node 12
+        uses: actions/setup-node@v2-beta
+        with:
+          node-version: 12.x
+
+      - name: Node Modules Cache
+        uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-yarn-${{ hashFiles('**/yarn.lock') }}
+
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Lint
+        run: yarn lint
+
+      - name: Run Tests
+        run: yarn test:ember
+        env:
+          CI: true
+
+  test-ember-try:
+    name: Run Tests
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ember-version:
+          [
+            ember-lts-2.8,
+            ember-lts-2.12,
+            ember-lts-2.18,
+            ember-lts-3.4,
+            ember-lts-3.8,
+            ember-lts-3.12,
+            ember-lts-3.16,
+            ember-lts-3.20,
+            ember-lts-3.24,
+            ember-lts-3.26,
+          ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node 12
+        uses: actions/setup-node@v2-beta
+        with:
+          node-version: 12.x
+
+      - name: Node Modules Cache
+        uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-yarn-${{ matrix.ember-version }}-${{ hashFiles('**/yarn.lock') }}
+
+      - name: Install
+        run: yarn install --frozen-lockfile --ignore-engines
+
+      - name: Run Tests
+        run: node_modules/.bin/ember try:one ${{ matrix.ember-version }} --skip-cleanup --- bin/run-tests-with-retry.sh

package/CHANGELOG.md

@@ -1,6 +1,31 @@
 Changelog
 =========
 
+## v2.1.0 (2021-12-09)
+
+Changelog:
+
+* Upgrade ember-cli and dev deps (#348) (e8924e9)
+* Drop Ember global use in favor of native API (#347) (d101d8a)
+* Proper runloop imports (#346) (a765241)
+* Remove property fallback lookup (no implicit this) (#345) (506d798)
+* Modernize `htmlSafe` module imports / More cleanup (#344) (32e9460)
+* Update CI for vertical-collection v2 (#342) (5613faa)
+
+
+## v2.0.1 (2021-12-07)
+
+#### :bug: Bug Fix
+* [#322](https://github.com/html-next/vertical-collection/pull/322) Remove comma in selector list in css ([@CubeSquared](https://github.com/CubeSquared))
+
+#### :house: Internal
+* [#336](https://github.com/html-next/vertical-collection/pull/336) Add rwjblue release-it setup ([@rwwagner90](https://github.com/rwwagner90))
+
+#### Committers: 2
+- Matthew Jacobs ([@CubeSquared](https://github.com/CubeSquared))
+- Robert Wagner ([@rwwagner90](https://github.com/rwwagner90))
+
+
 ## 0.5.5
 
 ### Pull Requests

package/README.md

@@ -62,10 +62,10 @@ ember install @html-next/vertical-collection
 
 ## Support Matrix
 
-| `vertical-collection` version | Supported Ember versions |
-| ----------------------------- | ------------------------ |
-| `^v1.0.0`                     | `v1.12.0 - v3.8.0`       |
-| `^v2.0.0`                     | `v3.8.0+`                |
+| `vertical-collection` version | Supported Ember versions | Supported Node versions |
+| ----------------------------- | ------------------------ | ----------------------- |
+| `^v1.x.x`                     | `v1.12.0 - v3.8.x`       | `?`                     |
+| `^v2.x.x`                     | `v2.8.0 - v3.26.x`       | `v12 - ?`               |
 
 ## Support, Questions, Collaboration
 
@@ -113,3 +113,8 @@ For updated documentation and demos see [http://html-next.github.io/vertical-col
 Make sure you register the test waiter from [ember-raf-scheduler](https://github.com/html-next/ember-raf-scheduler). So `ember-test-helpers`'s `wait` is aware of the scheduled updates.
 
 An example can be found [here](https://github.com/html-next/vertical-collection/blob/master/tests/test-helper.js#L2)
+
+License
+------------------------------------------------------------------------------
+
+This project is licensed under the [MIT License](LICENSE.md).

package/RELEASE.md

@@ -0,0 +1,60 @@
+# Release Process
+
+Releases are mostly automated using
+[release-it](https://github.com/release-it/release-it/) and
+[lerna-changelog](https://github.com/lerna/lerna-changelog/).
+
+## Preparation
+
+Since the majority of the actual release process is automated, the primary
+remaining task prior to releasing is confirming that all pull requests that
+have been merged since the last release have been labeled with the appropriate
+`lerna-changelog` labels and the titles have been updated to ensure they
+represent something that would make sense to our users. Some great information
+on why this is important can be found at
+[keepachangelog.com](https://keepachangelog.com/en/1.0.0/), but the overall
+guiding principle here is that changelogs are for humans, not machines.
+
+When reviewing merged PR's the labels to be used are:
+
+* breaking - Used when the PR is considered a breaking change.
+* enhancement - Used when the PR adds a new feature or enhancement.
+* bug - Used when the PR fixes a bug included in a previous release.
+* documentation - Used when the PR adds or updates documentation.
+* internal - Used for internal changes that still require a mention in the
+  changelog/release notes.
+
+## Release
+
+Once the prep work is completed, the actual release is straight forward:
+
+* First, ensure that you have installed your projects dependencies:
+
+```sh
+yarn install
+```
+
+* Second, ensure that you have obtained a
+  [GitHub personal access token][generate-token] with the `repo` scope (no
+  other permissions are needed). Make sure the token is available as the
+  `GITHUB_AUTH` environment variable.
+
+  For instance:
+
+  ```bash
+  export GITHUB_AUTH=abc123def456
+  ```
+
+[generate-token]: https://github.com/settings/tokens/new?scopes=repo&description=GITHUB_AUTH+env+variable
+
+* And last (but not least 😁) do your release.
+
+```sh
+npx release-it
+```
+
+[release-it](https://github.com/release-it/release-it/) manages the actual
+release process. It will prompt you to to choose the version number after which
+you will have the chance to hand tweak the changelog to be used (for the
+`CHANGELOG.md` and GitHub release), then `release-it` continues on to tagging,
+pushing the tag and commits, etc.

package/addon/-debug/edge-visualization/visualization.js

@@ -1,4 +1,3 @@
-/* global document */
 import { ViewportContainer } from '../../-private';
 
 function applyVerticalStyles(element, geography) {

package/addon/-private/data-view/elements/occluded-content.js

@@ -1,7 +1,7 @@
 import { set } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
-
 import { IS_GLIMMER_2, gte as emberVersionGTE } from 'ember-compatibility-helpers';
+
 import document from '../../utils/document-shim';
 
 let OC_IDENTITY = 0;
@@ -27,11 +27,13 @@ export default class OccludedContent {
     this.isOccludedContent = true;
     this.rendered = false;
 
-    // In older versions of Ember/IE, binding anything on an object in the template
-    // adds observers which creates __ember_meta__
-    this.__ember_meta__ = null; // eslint-disable-line camelcase
+    if (!emberVersionGTE('3.0.0')) {
+      // In older versions of Ember, binding anything on an object in the template
+      // adds observers which creates __ember_meta__
+      this.__ember_meta__ = null; // eslint-disable-line camelcase
+    }
 
-    if (DEBUG && emberVersionGTE('1.13.0')) {
+    if (DEBUG) {
       Object.preventExtensions(this);
     }
   }

package/addon/-private/data-view/elements/viewport-container.js

@@ -22,7 +22,7 @@ export function ViewportContainer() {
         || document.documentElement.scrollTop;
     },
     set(v) {
-      return document.body.scrollTop = document.documentElement.scrollTop = v;
+      document.body.scrollTop = document.documentElement.scrollTop = v;
     }
   });
 
@@ -34,7 +34,7 @@ export function ViewportContainer() {
         || document.documentElement.scrollLeft;
     },
     set(v) {
-      return window.scrollX
+      window.scrollX
         = window.pageXOffset
         = document.body.scrollLeft
         = document.documentElement.scrollLeft = v;

package/addon/-private/data-view/elements/virtual-component.js

@@ -1,8 +1,8 @@
 import { set } from '@ember/object';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-
 import { IS_GLIMMER_2, gte as emberVersionGTE } from 'ember-compatibility-helpers';
+
 import document from '../../utils/document-shim';
 
 let VC_IDENTITY = 0;
@@ -22,11 +22,13 @@ export default class VirtualComponent {
 
     this.rendered = false;
 
-    // In older versions of Ember/IE, binding anything on an object in the template
-    // adds observers which creates __ember_meta__
-    this.__ember_meta__ = null; // eslint-disable-line camelcase
+    if (!emberVersionGTE('3.0.0')) {
+      // In older versions of Ember, binding anything on an object in the template
+      // adds observers which creates __ember_meta__
+      this.__ember_meta__ = null; // eslint-disable-line camelcase
+    }
 
-    if (DEBUG && emberVersionGTE('1.13.0')) {
+    if (DEBUG) {
       Object.preventExtensions(this);
     }
   }

package/addon/-private/data-view/utils/scroll-handler.js

@@ -1,4 +1,4 @@
-import { run } from '@ember/runloop';
+import { begin, end } from '@ember/runloop';
 import { scheduler } from 'ember-raf-scheduler';
 import SUPPORTS_PASSIVE from './supports-passive';
 const DEFAULT_ARRAY_SIZE = 10;
@@ -110,11 +110,11 @@ export class ScrollHandler {
 
     // TODO add explicit test
     if (topChanged || leftChanged) {
-      run.begin();
+      begin();
       for (let j = 0; j < meta.handlers.length; j++) {
         meta.handlers[j](event);
       }
-      run.end();
+      end();
     }
   }
 

package/addon/-private/data-view/viewport-container.js

@@ -22,7 +22,7 @@ export function ViewportContainer() {
         || document.documentElement.scrollTop;
     },
     set(v) {
-      return document.body.scrollTop = document.documentElement.scrollTop = v;
+      document.body.scrollTop = document.documentElement.scrollTop = v;
     }
   });
 
@@ -34,7 +34,7 @@ export function ViewportContainer() {
         || document.documentElement.scrollLeft;
     },
     set(v) {
-      return window.scrollX
+      window.scrollX
         = window.pageXOffset
         = document.body.scrollLeft
         = document.documentElement.scrollLeft = v;

package/addon/components/vertical-collection/component.js

@@ -7,8 +7,6 @@ import layout from './template';
 
 import { scheduler, Token } from 'ember-raf-scheduler';
 
-import { SUPPORTS_INVERSE_BLOCK, SUPPORTS_CLOSURE_ACTIONS } from 'ember-compatibility-helpers';
-
 import {
   keyForItem,
   DynamicRadar,
@@ -189,14 +187,10 @@ const VerticalCollection = Component.extend({
             const key = keyForItem(item, keyPath, index);
 
             // this.sendAction will be deprecated in ember 4.0
-            if (SUPPORTS_CLOSURE_ACTIONS) {
-              const _action = get(this, action);
-              if (typeof _action == 'function') {
-                _action(item, index, key);
-              } else if (typeof _action === 'string') {
-                this.sendAction(action, item, index, key);
-              }
-            } else {
+            const _action = get(this, action);
+            if (typeof _action == 'function') {
+              _action(item, index, key);
+            } else if (typeof _action === 'string') {
               this.sendAction(action, item, index, key);
             }
           });
@@ -293,12 +287,6 @@ VerticalCollection.reopenClass({
   positionalParams: ['items']
 });
 
-if (!SUPPORTS_INVERSE_BLOCK) {
-  VerticalCollection.reopen({
-    shouldYieldToInverse: false
-  });
-}
-
 function calculateStartingIndex(items, idForFirstItem, key, renderFromLast) {
   const totalItems = get(items, 'length');
 

package/addon/components/vertical-collection/template.hbs

@@ -1,4 +1,4 @@
-{{#each virtualComponents key="id" as |virtualComponent| ~}}
+{{#each this.virtualComponents key="id" as |virtualComponent| ~}}
   {{~unbound virtualComponent.upperBound~}}
   {{~#if virtualComponent.isOccludedContent ~}}
     {{{unbound virtualComponent.element}}}
@@ -8,6 +8,6 @@
   {{~unbound virtualComponent.lowerBound~}}
 {{~/each}}
 
-{{#if shouldYieldToInverse}}
+{{#if this.shouldYieldToInverse}}
   {{yield to="inverse"}}
 {{/if}}

package/addon/styles/app.css

@@ -13,7 +13,7 @@
 table .occluded-content,
 tbody .occluded-content,
 thead .occluded-content,
-tfoot .occluded-content, {
+tfoot .occluded-content {
   display: table-row;
   position: relative;
   width: 100%;

package/bin/run-tests-with-retry.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+function retry {
+    command="$*"
+    retval=1
+    attempt=1
+    until [[ $retval -eq 0 ]] || [[ $attempt -gt 5 ]]; do
+        # Execute inside of a subshell in case parent
+        # script is running with "set -e"
+        (
+            set +e
+            $command
+        )
+        retval=$?
+        attempt=$(( $attempt + 1 ))
+        if [[ $retval -ne 0 ]]; then
+            # If there was an error wait 10 seconds
+            sleep 10
+        fi
+    done
+    if [[ $retval -ne 0 ]] && [[ $attempt -gt 2 ]]; then
+        # Something is fubar, go ahead and exit
+        exit $retval
+    fi
+}
+
+retry ember test

package/config/ember-cli-toolbelts.json

@@ -1,5 +1 @@
-{
-  "babel": {
-    "includePolyfill": true
-  }
-}
+{}

package/index.js

@@ -139,10 +139,6 @@ module.exports = {
       exclude.push('initializers/debug.js');
     }
 
-    if (this.checker.forEmber().isAbove('1.13.0')) {
-      exclude.push('initializers/vertical-collection-legacy-compat.js');
-    }
-
     return new Funnel(tree, { exclude });
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@html-next/vertical-collection",
-  "version": "1.0.0",
+  "version": "2.1.0",
   "description": "infinite-scroll, done right. done.",
   "keywords": [
     "occlusion",
@@ -15,6 +15,9 @@
     "lists",
     "ember-addon"
   ],
+  "homepage": "https://github.com/html-next/vertical-collection",
+  "bugs": "https://github.com/html-next/vertical-collection/issues",
+  "repository": "https://github.com/html-next/vertical-collection.git",
   "license": "MIT",
   "author": {
     "name": "Chris Thoburn (@runspired)",
@@ -36,65 +39,92 @@
     "doc": "doc",
     "test": "tests"
   },
-  "repository": "https://github.com/html-next/vertical-collection.git",
-  "homepage": "https://github.com/html-next/vertical-collection",
-  "bugs": "https://github.com/html-next/vertical-collection/issues",
   "scripts": {
-    "build": "ember build",
+    "build": "ember build --environment=production",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
+    "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
     "lint:hbs": "ember-template-lint .",
-    "lint:js": "eslint .",
+    "lint:hbs:fix": "ember-template-lint . --fix",
+    "lint:js": "eslint . --cache",
+    "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "test": "ember test",
-    "test:all": "ember try:each"
+    "test": "npm-run-all lint test:*",
+    "test:ember": "ember test",
+    "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
     "babel6-plugin-strip-class-callcheck": "^6.0.0",
     "broccoli-funnel": "^2.0.2",
     "broccoli-merge-trees": "^3.0.1",
     "broccoli-rollup": "^4.1.1",
-    "ember-cli-babel": "^7.7.3",
+    "ember-cli-babel": "^7.12.0",
     "ember-cli-htmlbars": "^3.0.0",
     "ember-cli-version-checker": "^3.1.3",
-    "ember-compatibility-helpers": "^1.2.0",
-    "ember-raf-scheduler": "0.1.0"
+    "ember-compatibility-helpers": "^1.2.1",
+    "ember-raf-scheduler": "0.2.0"
   },
   "devDependencies": {
-    "@ember/optional-features": "^0.7.0",
+    "@ember/optional-features": "^2.0.0",
+    "babel-eslint": "^10.1.0",
     "bootstrap": "~3.3.5",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.11.0",
-    "ember-cli-app-version": "^3.2.0",
-    "ember-cli-dependency-checker": "^3.1.0",
+    "ember-cli": "~3.28.0",
+    "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-eslint": "^5.1.0",
     "ember-cli-fastboot": "^2.1.3",
     "ember-cli-github-pages": "^0.2.2",
-    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
-    "ember-cli-inject-live-reload": "^2.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^3.0.0",
+    "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-template-lint": "^1.0.0-beta.1",
-    "ember-cli-uglify": "^3.0.0",
+    "ember-cli-terser": "^4.0.2",
+    "ember-cli-template-lint": "^1.0.0",
     "ember-code-snippet": "^2.4.1",
-    "ember-data": "^3.11.4",
+    "ember-data": "~3.12.0",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^2.0.0",
-    "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-native-dom-helpers": "^0.6.3",
+    "ember-export-application-global": "^2.0.1",
+    "ember-load-initializers": "^2.1.2",
+    "ember-native-dom-helpers": "^0.7.0",
     "ember-perf-timeline": "^1.2.1",
     "ember-qunit": "^4.5.1",
-    "ember-resolver": "^5.0.1",
-    "ember-source": "~3.11.1",
-    "ember-source-channel-url": "^2.0.1",
-    "ember-try": "^1.2.1",
+    "ember-resolver": "^8.0.2",
+    "ember-source": "~3.12.0",
+    "ember-source-channel-url": "^3.0.0",
+    "ember-try": "^1.4.0",
+    "eslint": "^7.32.0",
     "eslint-plugin-ember": "^6.7.1",
     "eslint-plugin-node": "^9.1.0",
     "loader.js": "^4.7.0",
-    "qunit-dom": "^0.9.0"
+    "npm-run-all": "^4.1.5",
+    "qunit-dom": "^0.9.0",
+    "release-it": "^14.2.1",
+    "release-it-lerna-changelog": "^3.1.0"
   },
   "engines": {
-    "node": "8.* || >= 10.*"
+    "node": ">= 10.*"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
+  },
+  "release-it": {
+    "plugins": {
+      "release-it-lerna-changelog": {
+        "infile": "CHANGELOG.md",
+        "launchEditor": true
+      }
+    },
+    "git": {
+      "tagName": "v${version}"
+    },
+    "github": {
+      "release": true,
+      "tokenRef": "GITHUB_AUTH"
+    }
+  },
+  "volta": {
+    "node": "12.22.7",
+    "yarn": "1.22.17"
   }
 }

package/app/initializers/vertical-collection-legacy-compat.js

@@ -1,16 +0,0 @@
-import Ember from 'ember';
-import VerticalCollection from '@html-next/vertical-collection/components/vertical-collection/component';
-
-const { HTMLBars } = Ember;
-
-HTMLBars._registerHelper('vertical-collection', (params, hash, options, env) => {
-  hash.items = params.pop();
-
-  return env.helpers.view.helperFunction.call(this, [VerticalCollection], hash, options, env);
-});
-
-export default {
-  name: 'vertical-collection-legacy-compat',
-
-  initialize() {}
-};