Update 3.8 and prep for modifiers

.gitignore

@@ -9,6 +9,8 @@
 /node_modules/
 
 # misc
+/.env*
+/.pnp*
 /.sass-cache
 /connect.lock
 /coverage/

.npmignore

@@ -9,13 +9,16 @@
 /.bowerrc
 /.editorconfig
 /.ember-cli
+/.env*
 /.eslintignore
 /.eslintrc.js
 /.gitignore
-/.watchmanconfig
+/.template-lintrc.js
 /.travis.yml
+/.watchmanconfig
 /bower.json
 /config/ember-try.js
+/CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
 /tests/

.travis.yml

@@ -19,6 +19,12 @@ env:
     # See https://git.io/vdao3 for details.
     - JOBS=1
 
+branches:
+  only:
+    - master
+    # npm version tags
+    - /^v\d+\.\d+\.\d+/
+
 jobs:
   fail_fast: true
   allow_failures:
@@ -35,8 +41,8 @@ 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-2.16
     - env: EMBER_TRY_SCENARIO=ember-lts-2.18
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.4
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary

addon/mixins/in-viewport.js

@@ -155,7 +155,13 @@ export default Mixin.create({
       threshold: get(this, 'intersectionThreshold')
     });
 
-    get(this, '_observerAdmin').add(element, bind(this, this._onEnterIntersection), bind(this, this._onExitIntersection), this._observerOptions, this.scrollableArea);
+    get(this, '_observerAdmin').add(
+      element,
+      bind(this, this._onEnterIntersection),
+      bind(this, this._onExitIntersection),
+      this._observerOptions,
+      this.scrollableArea
+    );
   },
 
   /**
@@ -172,8 +178,12 @@ export default Mixin.create({
       return;
     }
 
-    const height = scrollableArea ? scrollableArea.offsetHeight + scrollableArea.getBoundingClientRect().top : window.innerHeight;
-    const width = scrollableArea ? scrollableArea.offsetWidth + scrollableArea.getBoundingClientRect().left : window.innerWidth;
+    const height = scrollableArea
+      ? scrollableArea.offsetHeight + scrollableArea.getBoundingClientRect().top
+      : window.innerHeight;
+    const width = scrollableArea
+      ? scrollableArea.offsetWidth + scrollableArea.getBoundingClientRect().left
+      : window.innerWidth;
     const boundingClientRect = element.getBoundingClientRect();
 
     if (boundingClientRect) {
@@ -355,7 +365,11 @@ export default Mixin.create({
 
     // if IntersectionObserver
     if (get(this, 'viewportUseIntersectionObserver') && get(this, 'viewportEnabled')) {
-      get(this, '_observerAdmin').unobserve(this.element, get(this, '_observerOptions'), get(this, 'scrollableArea'));
+      get(this, '_observerAdmin').unobserve(
+        this.element,
+        get(this, '_observerOptions'),
+        get(this, 'scrollableArea')
+      );
     }
 
     // if rAF

addon/services/-observer-admin.js

@@ -17,19 +17,19 @@ export default class ObserverAdmin extends Service {
   /** @private **/
   init() {
     this._super(...arguments);
-    this._observerAdmin = new IntersectionObserverAdmin();
+    this.ioAdmin = new IntersectionObserverAdmin();
   }
 
   add(...args) {
-    return this._observerAdmin.observe(...args);
+    return this.ioAdmin.observe(...args);
   }
 
   unobserve(...args) {
-    return this._observerAdmin.unobserve(...args);
+    return this.ioAdmin.unobserve(...args);
   }
 
   destroy(...args) {
-    this._observerAdmin.destroy(...args);
-    this._observerAdmin = null;
+    this.ioAdmin.destroy(...args);
+    this.ioAdmin = null;
   }
 }

config/ember-try.js

@@ -11,26 +11,22 @@ module.exports = function() {
     return {
       scenarios: [
         {
-          name: 'ember-lts-2.16',
+          name: 'ember-lts-2.18',
           env: {
             EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
           },
           npm: {
             devDependencies: {
               '@ember/jquery': '^0.5.1',
-              'ember-source': '~2.16.0'
+              'ember-source': '~2.18.0'
             }
           }
         },
         {
-          name: 'ember-lts-2.18',
-          env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
-          },
+          name: 'ember-lts-3.4',
           npm: {
             devDependencies: {
-              '@ember/jquery': '^0.5.1',
-              'ember-source': '~2.18.0'
+              'ember-source': '~3.4.0'
             }
           }
         },
@@ -58,6 +54,10 @@ module.exports = function() {
             }
           }
         },
+        // The default `.travis.yml` runs this scenario via `npm test`,
+        // not via `ember try`. It's still included here so that running
+        // `ember try:each` manually or from a customized CI config will run it
+        // along with all the other scenarios.
         {
           name: 'ember-default',
           npm: {