Skip to content

Commit

Permalink
Merge pull request #68 from devexperts/support-rx6
Browse files Browse the repository at this point in the history
enhancement: support rx v6
  • Loading branch information
Keelaro1 authored Nov 1, 2023
2 parents e526f7b + 4dea38f commit a2d3743
Show file tree
Hide file tree
Showing 4 changed files with 147 additions and 1 deletion.
140 changes: 140 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,144 @@ module.exports = {
],
// --->
},
overrides: [
{
files: ['*.ts'],
rules: {
'no-restricted-imports': [
'error',
{
paths: [
{
name: 'rxjs',
importNames: [
'audit',
'auditTime',
'buffer',
'bufferCount',
'bufferTime',
'bufferToggle',
'bufferWhen',
'catchError',
'combineAll',
'combineLatestAll',
'combineLatestWith',
'concat',
'concatAll',
'concatMap',
'concatMapTo',
'concatWith',
'connect',
'ConnectConfig',
'count',
'debounce',
'debounceTime',
'defaultIfEmpty',
'delay',
'delayWhen',
'dematerialize',
'distinct',
'distinctUntilChanged',
'distinctUntilKeyChanged',
'elementAt',
'endWith',
'every',
'exhaust',
'exhaustAll',
'exhaustMap',
'expand',
'filter',
'finalize',
'find',
'findIndex',
'first',
'groupBy',
'BasicGroupByOptions',
'GroupByOptionsWithElement',
'ignoreElements',
'isEmpty',
'last',
'map',
'mapTo',
'materialize',
'max',
'mergeAll',
'flatMap',
'mergeMap',
'mergeMapTo',
'mergeScan',
'mergeWith',
'min',
'multicast',
'observeOn',
'onErrorResumeNext',
'pairwise',
'partition',
'pluck',
'publish',
'publishBehavior',
'publishLast',
'publishReplay',
'race',
'raceWith',
'reduce',
'repeat',
'RepeatConfig',
'repeatWhen',
'retry',
'RetryConfig',
'retryWhen',
'refCount',
'sample',
'sampleTime',
'scan',
'sequenceEqual',
'share',
'ShareConfig',
'shareReplay',
'ShareReplayConfig',
'single',
'skip',
'skipLast',
'skipUntil',
'skipWhile',
'startWith',
'subscribeOn',
'switchAll',
'switchMap',
'switchMapTo',
'switchScan',
'take',
'takeLast',
'takeUntil',
'takeWhile',
'tap',
'throttle',
'ThrottleConfig',
'throttleTime',
'throwIfEmpty',
'timeInterval',
'timeout',
'TimeoutConfig',
'TimeoutInfo',
'timeoutWith',
'timestamp',
'toArray',
'window',
'windowCount',
'windowTime',
'windowToggle',
'windowWhen',
'withLatestFrom',
'zipAll',
'zipWith',
],
message: "Import RxJS operators from 'rxjs/operators'.",
},
],
},
],
},
},
],
};
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@
"date-fns-tz": "^1.3.8",
"rxjs": "^7.5.7"
},
"peerDependencies": {
"rxjs": ">=6.5.2"
},
"main": "dist/index.js",
"types": "dist/index.d.ts",
"repository": {
Expand Down
3 changes: 2 additions & 1 deletion src/chart/inputhandlers/cross-event-producer.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
* If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
import { BehaviorSubject, Subscription, combineLatest, filter } from 'rxjs';
import { BehaviorSubject, Subscription, combineLatest } from 'rxjs';
import { filter } from 'rxjs/operators';
import { CanvasBoundsContainer, HitBoundsTest, HitBoundsTestOptionsPartial } from '../canvas/canvas-bounds-container';
import { CanvasInputListenerComponent } from '../inputlisteners/canvas-input-listener.component';
import { ChartBaseElement } from '../model/chart-base-element';
Expand Down
2 changes: 2 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,8 @@ __metadata:
webpack: ^5.89.0
webpack-cli: ^5.1.4
webpack-dev-server: ^4.15.1
peerDependencies:
rxjs: ">=6.5.2"
languageName: unknown
linkType: soft

Expand Down

0 comments on commit a2d3743

Please sign in to comment.