Merge pull request #221 from elwayman02/master

Merge to get up to date

Author: jdkahn

.ember-cli

@@ -5,5 +5,11 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "disableAnalytics": false,
+
+  /**
+  Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
+  rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
+  */
+  "isTypeScriptProject": false
 }

.eslintignore

@@ -13,9 +13,13 @@
 # misc
 /coverage/
 !.*
+.*/
 .eslintcache
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

.eslintrc.js

@@ -24,21 +24,15 @@ module.exports = {
     // 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',
-      ],
-      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',
@@ -50,5 +44,10 @@ module.exports = {
       plugins: ['node'],
       extends: ['plugin:node/recommended'],
     },
+    {
+      // test files
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended'],
+    },
   ],
 };

.github/workflows/ci.yml

@@ -3,72 +3,79 @@ name: CI
 on:
   push:
     branches:
+      - main
       - master
-      - 'v*'
-  pull_request:
-  schedule:
-    - cron: '0 3 * * *' # daily, at 3am
+  pull_request: {}
+
+concurrency:
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
-    name: Tests
+    name: "Tests"
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
-      - uses: volta-cli/action@v1
+      - name: Install Node
+        uses: actions/setup-node@v2
         with:
-          node-version: 12.x
-          yarn-version: 1.22.5
-
-      - run: yarn install --frozen-lockfile
-      - run: yarn lint
-      - run: yarn test:ember
+          node-version: 14.x
+          cache: yarn
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+      - name: Lint
+        run: yarn lint
+      - name: Run Tests
+        run: yarn test:ember
 
-  floating-dependencies:
-    name: Floating Dependencies
+  floating:
+    name: "Floating Dependencies"
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
-      - uses: volta-cli/action@v1
+      - uses: actions/setup-node@v2
         with:
-          node-version: 12.x
-          yarn-version: 1.22.5
-
-      - run: yarn install --no-lockfile
-      - run: yarn test:ember
+          node-version: 14.x
+          cache: yarn
+      - name: Install Dependencies
+        run: yarn install --no-lockfile
+      - name: Run Tests
+        run: yarn test:ember
 
   try-scenarios:
-    name: "ember-try: ${{ matrix.ember-try-scenario }}"
+    name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
-    needs: test
-    continue-on-error: ${{ matrix.experimental }}
+    needs: "test"
 
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        ember-try-scenario:
-          - ember-lts-3.16
-          - ember-lts-3.20
+        try-scenario:
+          - ember-lts-3.24
+          - ember-lts-3.28
           - ember-release
-          - ember-default-with-jquery
           - ember-classic
+          - embroider-safe
         experimental: [false]
         include:
-          - ember-try-scenario: ember-beta
+          - try-scenario: ember-beta
             experimental: true
-          - ember-try-scenario: ember-canary
+          - try-scenario: ember-canary
+            experimental: true
+          - try-scenario: embroider-optimized
             experimental: true
 
     steps:
       - uses: actions/checkout@v2
-      - uses: volta-cli/action@v1
+      - name: Install Node
+        uses: actions/setup-node@v2
         with:
-          node-version: 12.x
-          yarn-version: 1.22.5
-
-      - run: yarn install --frozen-lockfile
-
-      - name: test
-        run: yarn ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
+          node-version: 14.x
+          cache: yarn
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+      - name: Run Tests
+        run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.gitignore

@@ -23,4 +23,10 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try
+
+# broccoli-debug
+/DEBUG/

.npmignore

@@ -14,6 +14,7 @@
 /.eslintignore
 /.eslintrc.js
 /.git/
+/.github/
 /.gitignore
 /.prettierignore
 /.prettierrc.js
@@ -26,11 +27,14 @@
 /ember-cli-build.js
 /testem.js
 /tests/
+/yarn-error.log
 /yarn.lock
 .gitkeep
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
-/config/addon-docs.js
+/package-lock.json.ember-try
+/yarn.lock.ember-try

.prettierignore

@@ -14,8 +14,12 @@
 /coverage/
 !.*
 .eslintcache
+.lint-todo/
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

.template-lintrc.js

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

CHANGELOG.md

@@ -2,6 +2,75 @@ Version 9 of Highlight.js has reached EOL and is no longer supported.
 Please upgrade or ask whatever dependency you are using to upgrade.
 https://github.com/highlightjs/highlight.js/issues/2877
 
+
+
+
+## v4.0.0 (2022-05-14)
+
+#### :boom: Breaking Change
+* [#619](https://github.com/elwayman02/ember-scroll-modifiers/pull/619) Ember 4 Upgrade ([@elwayman02](https://github.com/elwayman02))
+
+#### :memo: Documentation
+* [#612](https://github.com/elwayman02/ember-scroll-modifiers/pull/612) Field Guide migration ([@elwayman02](https://github.com/elwayman02))
+
+#### :house: Internal
+* [#619](https://github.com/elwayman02/ember-scroll-modifiers/pull/619) Ember 4 Upgrade ([@elwayman02](https://github.com/elwayman02))
+
+#### Committers: 1
+- Jordan Hawker ([@elwayman02](https://github.com/elwayman02))
+
+## v3.1.1 (2021-10-12)
+
+#### :house: Internal
+* [#473](https://github.com/elwayman02/ember-scroll-modifiers/pull/473) Ember 3.28 Upgrade ([@elwayman02](https://github.com/elwayman02))
+
+#### Committers: 1
+- Jordan Hawker ([@elwayman02](https://github.com/elwayman02))
+
+## v3.1.0 (2021-08-05)
+
+#### :rocket: Enhancement
+* [#406](https://github.com/elwayman02/ember-scroll-modifiers/pull/406) creating test helper for scroll into view ([@abeadam](https://github.com/abeadam))
+
+#### :memo: Documentation
+* [#421](https://github.com/elwayman02/ember-scroll-modifiers/pull/421) Change author url to https ([@elwayman02](https://github.com/elwayman02))
+
+#### Committers: 2
+- Abe Adam ([@abeadam](https://github.com/abeadam))
+- Jordan Hawker ([@elwayman02](https://github.com/elwayman02))
+
+## v3.0.0 (2021-06-28)
+
+#### :boom: Breaking Change
+* [#403](https://github.com/elwayman02/ember-scroll-modifiers/pull/403) Ember 3.27 Blueprint Updates (Drop Ember 3.16 Support) ([@elwayman02](https://github.com/elwayman02))
+
+#### :rocket: Enhancement
+* [#397](https://github.com/elwayman02/ember-scroll-modifiers/pull/397) Allow programmatic control of observation ([@chriskrycho](https://github.com/chriskrycho))
+
+#### :memo: Documentation
+* [#404](https://github.com/elwayman02/ember-scroll-modifiers/pull/404) Document the rest of the did-intersect API ([@chriskrycho](https://github.com/chriskrycho))
+
+#### :house: Internal
+* [#403](https://github.com/elwayman02/ember-scroll-modifiers/pull/403) Ember 3.27 Blueprint Updates (Drop Ember 3.16 Support) ([@elwayman02](https://github.com/elwayman02))
+
+#### Committers: 2
+- Chris Krycho ([@chriskrycho](https://github.com/chriskrycho))
+- Jordan Hawker ([@elwayman02](https://github.com/elwayman02))
+
+## v2.0.0 (2021-06-18)
+
+#### :bug: Bug Fix
+* [#335](https://github.com/elwayman02/ember-scroll-modifiers/pull/335) Add ember-data to fix documentation site ([@elwayman02](https://github.com/elwayman02))
+
+#### :memo: Documentation
+* [#335](https://github.com/elwayman02/ember-scroll-modifiers/pull/335) Add ember-data to fix documentation site ([@elwayman02](https://github.com/elwayman02))
+
+#### Committers: 4
+- Abe Adam ([@abeadam](https://github.com/abeadam))
+- Jordan Hawker ([@elwayman02](https://github.com/elwayman02))
+- [@dependabot-preview[bot]](https://github.com/apps/dependabot-preview)
+- [@jdkahn](https://github.com/jdkahn)
+
 ## v1.4.0 (2021-03-26)
 
 ## v1.3.0 (2021-01-25)

CONTRIBUTING.md

@@ -22,4 +22,4 @@
 * `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

README.md

@@ -13,10 +13,10 @@ We adhere to the [Ember Community Guidelines](https://emberjs.com/guidelines/) f
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v3.8 or above
-* Ember CLI v2.13 or above
-* Node.js v10 or above
-* [All N-1 Browsers except IE](https://caniuse.com/#feat=intersectionobserver)
+* Ember.js v3.24 or above
+* Ember CLI v3.24 or above
+* Node.js v14 or above
+* [All N-1 Browsers](https://caniuse.com/#feat=intersectionobserver)
 
 
 Installation
@@ -27,6 +27,12 @@ ember install ember-scroll-modifiers
 ```
 
 
+Usage
+------------------------------------------------------------------------------
+
+[Longer description of how to use the addon in apps.]
+
+
 Contributing
 ------------------------------------------------------------------------------
 

addon-test-support/scroll-into-view-mock.js

@@ -0,0 +1,32 @@
+import { find } from '@ember/test-helpers';
+
+export default function mockScrollIntoView() {
+  let elementsInvokedOn = [];
+  let mockScrollIntoViewFunction = function () {
+    elementsInvokedOn.push(this);
+  };
+  // manually mocking native function
+  let preExistingScrollFunction = window.Element.prototype.scrollIntoView;
+  window.Element.prototype.scrollIntoView = mockScrollIntoViewFunction;
+  // helper fuctions that will be returned
+  let scrollIntoViewCalledWith = (selector) => {
+    let element;
+    // check if it's a string and get the object
+    if (typeof selector === 'string') {
+      element = find(selector);
+    } else {
+      // element was passed in
+      element = selector;
+    }
+    return elementsInvokedOn.includes(element);
+  };
+
+  let resetMock = () => {
+    window.Element.prototype.scrollIntoView = preExistingScrollFunction;
+  };
+
+  return {
+    scrollIntoViewCalledWith,
+    resetMock,
+  };
+}