Merge branch 'next'

# Conflicts:
#	packages/simplebar-angular/package.json
#	packages/simplebar-angular/src/lib/simplebar-angular.component.ts

.eslintrc.json

@@ -1,20 +1,29 @@
 {
-  "parser": "babel-eslint",
+  "root": true,
+  "extends": [
+    "eslint:recommended"
+  ],
   "env": {
     "browser": true,
     "node": true,
-    "es6": true
+    "es2020": true
   },
-  "extends": ["eslint:recommended", "plugin:react/recommended"],
   "parserOptions": {
     "sourceType": "module",
     "ecmaVersion": 2018
   },
   "overrides": [
     {
-      "files": ["**/*.test?(.*).js"],
+      "files": ["**/*.ts", "**/*.tsx"],
+      "parser": "@typescript-eslint/parser",
+      "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
+      "plugins": ["@typescript-eslint"]
+    },
+    {
+      "files": ["**/*.test?(.*).ts", "**/*.test?(.*).tsx", "**/*.test?(.*).js"],
       "env": {
-        "jest": true
+        "jest": true,
+        "jest/globals": true
       },
       "globals": {
         "page": true,

.github/ISSUE_TEMPLATE.md

@@ -40,4 +40,5 @@ Please complete the following template:
 | ---------------- | ---------- |
 | SimpleBar        |
 | Browser          |
+| npm/Yarn         |
 | Operating System |

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,14 +4,14 @@ about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
+
 ---
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
-
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -21,7 +21,6 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 **Reproducible example**
-
 <!-- Use the JSFiddle template: https://jsfiddle.net/Grsmto/57obe5w2/1/ -->
 
 **Additional context**
@@ -33,4 +32,5 @@ Add any other context about the problem here.
 | ---------------- | ---------- |
 | SimpleBar        |
 | Browser          |
+| npm/Yarn         |
 | Operating System |

.nvmrc

@@ -1 +1 @@
-16.14.2
+16.17.1

.travis.yml

@@ -1,8 +1,8 @@
 language: node_js
+cache: yarn
 
 before_install:
   - npm i -g lerna
-  - npm i -g gatsby-cli
 
 install:
   - yarn
@@ -12,16 +12,14 @@ script:
   - yarn test
 
 deploy:
-  provider: pages
-  skip_cleanup: true
-  github_token: $GITHUB_TOKEN
-  keep_history: true
-  local_dir: packages/website/
+  provider: script
+  script: cd packages/website/ && yarn deploy
   on:
     branch: master
 
 addons:
+  chrome: stable
   browserstack:
     username: 'adriengrsmto'
     access_key:
-      secure: 'D75arx7W8WEGPIDHbWNrvttP3kbT5u8w+QXXYAP/DNH3012BoThNLmIB9U8YAxOccrC0ZISQq8d73/aX70A0S97IJpFQv9wwIS540JwawKSJc23OeKNsImobeNdK0k2al8JvKonIaPJzexKTNHwV7OYxzFxIotGrIQsImjC38Pw='
+      secure: 'HUmCxQG5gsOak0EFqAHTlIBlPL2lLjbKTaYQ0rAEFMu0E4WknH5z1qqZdw9ntAo201u+Pk/jC+YmPqSF3TjpxE5vOqeVCU27YSoUhZid1iI43z7uquuiXXsBlsaQZ0o2PNDSRoWTJ9G5Dfn+YgOIyEnFYEucAIii+tLo2lZVhlY='

README.md

@@ -6,24 +6,29 @@
   <a href="https://npmjs.org/package/simplebar"><img alt="NPM version" src="https://img.shields.io/npm/v/simplebar.svg?style=flat-square" /></a>
   <a href="https://npmjs.org/package/simplebar"><img alt="NPM downloads" src="https://img.shields.io/npm/dm/simplebar.svg?style=flat-square"></a>
   <a href="https://travis-ci.org/grsmto/simplebar"><img alt="Build Status" src="https://img.shields.io/travis/grsmto/simplebar/master.svg?style=flat-square" /></a>
-  <a href="https://automate.browserstack.com/public-build/amtTU2pEa1FjNmpabTBCbUh2b3FpbFZQaXhNd1Q3bEg0L1dlSzd2SGN2Zz0tLWpjK1ZwWWRNWnVGQWI4OXphWGRISEE9PQ==--39b14340be576db5bd01b020627cd17414003bfb%"><img src='https://automate.browserstack.com/badge.svg?badge_key=amtTU2pEa1FjNmpabTBCbUh2b3FpbFZQaXhNd1Q3bEg0L1dlSzd2SGN2Zz0tLWpjK1ZwWWRNWnVGQWI4OXphWGRISEE9PQ==--39b14340be576db5bd01b020627cd17414003bfb%'/></a>
+  <a href="https://automate.browserstack.com/public-build/MWQwN0Z5MWFaV2pab2ZqOWRCeHZydXhIaXFkcFJ4bGNLODZ5OUYzSVI1VT0tLXlzZU9UbnpwcUpjRTB3WWF2Y09raUE9PQ==--ff8cfcc667d79c5b9cee7012446c2bd4bf789abe%"><img src='https://automate.browserstack.com/badge.svg?badge_key=MWQwN0Z5MWFaV2pab2ZqOWRCeHZydXhIaXFkcFJ4bGNLODZ5OUYzSVI1VT0tLXlzZU9UbnpwcUpjRTB3WWF2Y09raUE9PQ==--ff8cfcc667d79c5b9cee7012446c2bd4bf789abe%'/></a>
 </p>
 <br hidden />
 SimpleBar does only one thing: replace the browser's default scrollbar with a custom CSS-styled one without losing performances.
 Unlike some popular plugins, SimpleBar doesn't mimic scroll with Javascript, causing janks and strange scrolling behaviours...
 You keep the awesomeness of native scrolling...with a custom scrollbar!
-
 SimpleBar **does NOT implement a custom scroll behaviour**. It keeps the **native** `overflow: auto` scroll and **only** replace the scrollbar visual appearance.
 
-**⚠️ This library is only partially maintained at the moment. There is a [v6 in the work](https://github.com/Grsmto/simplebar/tree/next) but has not been released yet. However, I'm still reviewing and merging contributions actively! ⚠️**
+### [🐦 Follow me on Twitter!](https://twitter.com/adriendenat)
+
+### 👨‍💻 I'm available for hire! [Reach out to me!](https://adriendenat.com/)
+
+### 🚧 Check out my new project [Scroll Snap Carousel](https://github.com/Grsmto/scroll-snap-carousel)!
+
+:warning: SimpleBar v6 is here! There are some **breaking changes!** Make sure to check out [the changelog](https://github.com/Grsmto/simplebar/blob/master/packages/simplebar-core/CHANGELOG.md) before updating.
 
 #### Design it as you want
 
 SimpleBar uses pure CSS to style the scrollbar. You can easily customize it as you want! Or even have multiple style on the same page...or just keep the default style ("Mac OS" scrollbar style).
 
 #### Lightweight and performant
 
-SimpleBar doesn't use Javascript to handle scrolling. You keep the performances/behaviours of the native scroll. There is [known issue](https://github.com/Grsmto/simplebar/issues/391) with bundle size but this should be solved in v6.
+Only 6kb minified. SimpleBar doesn't use Javascript to handle scrolling. You keep the performances/behaviours of the native scroll.
 
 #### Supported everywhere
 
@@ -33,31 +38,22 @@ SimpleBar has been tested on the following browsers: Chrome, Firefox, Safari, Ed
 
 The easiest way to use SimpleBar is with the default dependency-free version: `npm install simplebar`.
 
-- [Core documentation](https://github.com/Grsmto/simplebar/tree/master/packages/simplebar)
+- [Core documention](https://github.com/Grsmto/simplebar/tree/master/packages/simplebar)
 
 If you are using a framework, SimpleBar also supports the most popular ones: Vue, Angular and React.
 
-- [React documentation](https://github.com/Grsmto/simplebar/tree/master/packages/simplebar-react)
+- [React documention](https://github.com/Grsmto/simplebar/tree/master/packages/simplebar-react)
 - [Angular documentation](https://github.com/Grsmto/simplebar/tree/master/packages/simplebar-angular)
 - [Vue documentation](https://github.com/Grsmto/simplebar/tree/master/packages/simplebar-vue)
 
 ### Demo
 
 You can check our [demo page](https://grsmto.github.io/simplebar/examples) (which is also the one we use for automated tests).
 
-### Limitations
-
-Before using SimpleBar it's important to know its [limitations](https://github.com/Grsmto/simplebar/blob/master/packages/simplebar/README.md#5-caveats)!
-
 ### Changelog
 
 See changelog here : https://github.com/Grsmto/simplebar/releases
 
-#
-### 👨‍💻 I'm available for hire! [Reach out to me!](https://adriendenat.com/)
-### 🚧 Check out my new project [Scroll Snap Carousel](https://github.com/Grsmto/scroll-snap-carousel)!
-#
-
 ### Credits
 
 - [KingSora](https://github.com/KingSora) for multiple features and inspirations (`height: auto` detection, RTL mode cross browser support and more) with [OverlayScrollbars](https://kingsora.github.io/OverlayScrollbars/).

examples/angular/package.json

@@ -11,39 +11,38 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~8.1.1",
-    "@angular/common": "~8.1.1",
-    "@angular/compiler": "~8.1.1",
-    "@angular/core": "~8.1.1",
-    "@angular/forms": "~8.1.1",
-    "@angular/platform-browser": "~8.1.1",
-    "@angular/platform-browser-dynamic": "~8.1.1",
-    "@angular/router": "~8.1.1",
-    "rxjs": "~6.4.0",
-    "simplebar-angular": "1.0.8",
-    "tslib": "^1.9.0",
-    "zone.js": "~0.9.1"
+    "@angular/animations": "~10.0.14",
+    "@angular/common": "~10.0.14",
+    "@angular/compiler": "~10.0.14",
+    "@angular/core": "~10.0.14",
+    "@angular/forms": "~10.0.14",
+    "@angular/platform-browser": "~10.0.14",
+    "@angular/platform-browser-dynamic": "~10.0.14",
+    "@angular/router": "~10.0.14",
+    "rxjs": "~6.6.0",
+    "simplebar-angular": "3.0.0-beta.3",
+    "tslib": "^2.0.1",
+    "zone.js": "~0.11.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.801.1",
-    "@angular/cli": "~8.1.1",
-    "@angular/compiler-cli": "~8.1.1",
-    "@angular/language-service": "~8.1.1",
+    "@angular-devkit/build-angular": "~0.1000.8",
+    "@angular/cli": "~10.0.8",
+    "@angular/compiler-cli": "~10.0.14",
+    "@angular/language-service": "~10.0.14",
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
-    "@types/simplebar": "^2.4.2",
-    "codelyzer": "^5.0.0",
-    "jasmine-core": "~3.4.0",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.1.0",
-    "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~2.0.1",
-    "karma-jasmine-html-reporter": "^1.4.0",
-    "protractor": "~5.4.0",
-    "ts-node": "~7.0.0",
-    "tslint": "~5.15.0",
-    "typescript": "~3.4.3"
+    "codelyzer": "^6.0.0",
+    "jasmine-core": "~3.6.0",
+    "jasmine-spec-reporter": "~5.0.2",
+    "karma": "~5.1.1",
+    "karma-chrome-launcher": "~3.1.0",
+    "karma-coverage-istanbul-reporter": "~3.0.3",
+    "karma-jasmine": "~4.0.1",
+    "karma-jasmine-html-reporter": "^1.5.4",
+    "protractor": "~7.0.0",
+    "ts-node": "~9.0.0",
+    "tslint": "~6.1.3",
+    "typescript": "~3.9.7"
   }
 }