Merge branch 'develop' of github.com:Nolanus/ngx-page-scroll into develop

Author: Nolanus

.github/workflows/main.yml

@@ -0,0 +1,75 @@
+name: CI
+
+# Controls when the action will run.
+on:
+  # Trigger the workflow on push or pull request,
+  # but only for the main branch
+  push:
+
+  pull_request:
+    branches:
+      - main
+
+# Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - uses: wagoid/commitlint-github-action@v3
+
+      # Install Chrome Browser
+      - name: Setup Chrome
+        # You may pin to the exact commit or the version.
+        # uses: browser-actions/setup-chrome@4fa655aad48f56911cad16db9252399a9e592848
+        uses: browser-actions/setup-chrome@latest
+        with:
+          # The Chromium version to install and use.
+          chrome-version: stable
+
+      - name: Print chrome version
+        run: chrome --version
+
+      # Install NodeJS
+      - name: Setup Node.js environment
+        uses: actions/[email protected]
+
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      # Runs npm install
+      - name: Install dependencies
+        run: npm install
+
+      - name: Lint files
+        run: npm run lint
+
+      - name: Build lib
+        run: npm run build:lib
+
+      - name: Run tests
+        run: npm run test -- --watch false --browsers ChromeHeadless
+
+      - name: Run e2e tests
+        run: npm run e2e -- --protractor-config='e2e/protractor.ci.conf.js'

CHANGELOG.md

@@ -1,3 +1,13 @@
+### 7.0.5 (2021-06-03)
+
+### Fix
+
+- Peer dependency version mismatch ([#429](https://github.com/Nolanus/ngx-page-scroll/issues/429))
+
+### Other
+
+- Remove existing instance warning
+
 ### 7.0.4 (2021-02-07)
 
 ### Other

README.md

@@ -2,14 +2,12 @@
 
 Animated scrolling functionality for angular written in pure typescript with no additional dependencies
 
-[![Build Status](https://travis-ci.org/Nolanus/ngx-page-scroll.svg?branch=master)](https://travis-ci.org/Nolanus/ngx-page-scroll)
+[![Build Status](https://github.com/Nolanus/ngx-page-scroll/actions/workflows/main.yml/badge.svg)](https://github.com/Nolanus/ngx-page-scroll/actions/workflows/main.yml)
 [![Dependencies Status](https://david-dm.org/Nolanus/ngx-page-scroll.svg?path=projects/ngx-page-scroll)](https://david-dm.org/Nolanus/ngx-page-scroll?path=projects/ngx-page-scroll)
 [![devDependencies Status](https://david-dm.org/Nolanus/ngx-page-scroll/dev-status.svg?path=projects/ngx-page-scroll)](https://david-dm.org/Nolanus/ngx-page-scroll?path=projects/ngx-page-scroll&type=dev)
 [![peerDependencies Status](https://david-dm.org/Nolanus/ngx-page-scroll/peer-status.svg?path=projects/ngx-page-scroll)](https://david-dm.org/Nolanus/ngx-page-scroll?path=projects/ngx-page-scroll&type=peer)
-[![Greenkeeper badge](https://badges.greenkeeper.io/Nolanus/ngx-page-scroll.svg)](https://greenkeeper.io/)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/2b93ea8939824803b0807b72a8c2f5a0)](https://www.codacy.com/app/sebastian-fuss/ngx-page-scroll?utm_source=github.com&utm_medium=referral&utm_content=Nolanus/ngx-page-scroll&utm_campaign=Badge_Grade)
-
-**Breaking Change**: Starting with v6 this library consists of two modules: `ngx-page-scroll-core` (the service) and `ngx-page-scroll` (the directive). [➡ How to upgrade](https://github.com/Nolanus/ngx-page-scroll/issues/88#issuecomment-456824209)
+[![Known Vulnerabilities](https://snyk.io/test/github/Nolanus/ngx-page-scroll/badge.svg)](https://snyk.io/test/github/Nolanus/ngx-page-scroll)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/aa10be6ea5654211bb451c6ade2f1ff6)](https://www.codacy.com/gh/Nolanus/ngx-page-scroll/dashboard?utm_source=github.com&utm_medium=referral&utm_content=Nolanus/ngx-page-scroll&utm_campaign=Badge_Grade)
 
 ## Features
 
@@ -32,15 +30,16 @@ routing has finished) and in both directions (horizontal/vertical)
   - [Setup](#setup-1)
   - [Usage](#usage-1)
   - [Directive API](#directive-api)
-  
-  
+- [FAQ and common problems](#faq-and-common-problems)
+
+
 ### Version compatibility
 
 Install later versions in case your app is not running the very latest angular version.
 
 | ngx-page-scroll/ngx-page-scroll-core version | compatible angular version | Documentation                                                              |
 | -------------------------------------------- | -------------------------- | -------------------------------------------------------------------------- |
-| v7.x                                         | v11, v10, v9, v8           | [README](README.md)                                                        |
+| v7.x                                         | v12, v11, v10, v9, v8      | [README](README.md)                                                        |
 | v6.x                                         | v8, v7                     | [README](https://github.com/Nolanus/ngx-page-scroll/blob/v6.0.2/README.md) |
 | v5.x                                         | v6                         | [README](https://github.com/Nolanus/ngx-page-scroll/blob/v5.0.1/README.md) |
 | v4.x                                         | v5, v4                     | [README](https://github.com/Nolanus/ngx-page-scroll/blob/v4.0.2/README.md) |
@@ -95,7 +94,6 @@ Note: The `scroll()` method is a shorthand from creating a `PageScrollInstance`
 relevant for performing a scroll animation) using `PageScrollService#create` and starting it using 
 the `PageScrollService#start` method.
 
-
 ### Configuration
 
 When importing the `PageScrollCoreModule` one can provide option overrides:
@@ -233,6 +231,10 @@ defined in the component
     }
 ```
 
+## FAQ and common problems
+
+Please have a look at the wiki section of the GitHub repo at [https://github.com/Nolanus/ngx-page-scroll/wiki/FAQ](https://github.com/Nolanus/ngx-page-scroll/wiki/FAQ) for frequent questions and problems.
+
 ## License
 
 [MIT](LICENSE)

SECURITY.md

@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 7.0.x   | :white_check_mark: |
+| < 7.0   | :x:                |
+
+## Reporting a Vulnerability
+
+Please open an issue on this GitHub repo.

angular.json

@@ -22,7 +22,6 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -32,7 +31,13 @@
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
               "src/styles.scss"
             ],
-            "scripts": []
+            "scripts": [],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -62,7 +67,8 @@
                 }
               ]
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",

e2e/src/app.po.ts

@@ -9,7 +9,7 @@ export abstract class AppPage {
     return browser.get(this.getPath()) as promise.Promise<any>;
   }
 
-  scrollToElement(elm: ElementFinder): promise.Promise<{}> {
+  scrollToElement(elm: ElementFinder): promise.Promise<unknown> {
     return elm.getLocation().then((loc) => {
       return browser.driver.executeScript('window.scrollTo(0,arguments[0]);', loc.y);
     });
@@ -20,15 +20,15 @@ export abstract class AppPage {
   }
 
   protected getOffsetTop(selector: By): promise.Promise<number> {
-    return element(selector).getAttribute('offsetTop').then((offsetTopString) => {
-      return +offsetTopString;
-    });
+    return browser.driver.executeScript('return (arguments[0].offsetTop);', element(selector).getWebElement());
   }
 
   protected getScrollTop(selector: By): promise.Promise<number> {
-    return element(selector).getAttribute('scrollTop').then((scrollTop) => {
-      return +scrollTop;
-    });
+    return browser.driver.executeScript('return (arguments[0].scrollTop);', element(selector).getWebElement());
+  }
+
+  protected getScrollHeight(selector: By): promise.Promise<number> {
+    return browser.driver.executeScript('return (arguments[0].scrollHeight);', element(selector).getWebElement());
   }
 
   protected getVerticalPosition(selector: By): promise.Promise<number> {
@@ -46,11 +46,7 @@ export abstract class AppPage {
   }
 
   getBodyScrollHeight(): promise.Promise<number> {
-    const body: ElementFinder = element(by.css('body'));
-
-    return body.getAttribute('scrollHeight').then((bodyScrollHeightString: string) => {
-      return +bodyScrollHeightString;
-    });
+    return this.getScrollHeight(by.css('body'));
   }
 
   getWindowInnerHeight(): promise.Promise<number> {

e2e/src/namespaces.e2e-spec.ts

@@ -12,8 +12,6 @@ describe('Namespace Feature', () => {
   });
 
   it('should have only one scroll animation running in one namespace', () => {
-    const trigger: ElementFinder = element(by.css('#startDefaultNamespaceScrollsButton'));
-
     // Check that both containers start at the top
     protractor.promise.all([page.getContainer1ScrollTop(), page.getContainer2ScrollTop()]).then(
       ([container1ScrollTop, container2ScrollTop]) => {