Skip to content

Commit

Permalink
Merge branch 'development' into include-default-treatment-in-split-view
Browse files Browse the repository at this point in the history
  • Loading branch information
NicoZelaya authored Sep 13, 2023
2 parents 98654fe + 418d062 commit f13bf46
Show file tree
Hide file tree
Showing 8 changed files with 1,061 additions and 1,092 deletions.
4 changes: 2 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@
},
{
"selector": "ForInStatement",
"message": "Don't use for-in syntax in libraries, because it iterates over members inherited from the prototype chain"
"message": "Don't use for-in syntax in libraries, because it iterates over properties in the prototype chain that can be polluted by other libraries"
},
{
"selector": "TSEnumDeclaration[const=true]",
"message": "Don't declare const enum, because it is not supported by Babel used for building RN SDK"
}
],
"compat/compat": ["error", "defaults, not ie < 10, not node < 6"],
"compat/compat": ["error", "defaults, ie 10, node 6"],
"no-throw-literal": "error",
"import/no-default-export": "error",
"import/no-self-import": "error"
Expand Down
2,132 changes: 1,050 additions & 1,082 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@
"@types/ioredis": "^4.28.0",
"@types/jest": "^27.0.0",
"@types/lodash": "^4.14.162",
"@typescript-eslint/eslint-plugin": "^4.2.0",
"@typescript-eslint/parser": "^4.2.0",
"@typescript-eslint/eslint-plugin": "^6.6.0",
"@typescript-eslint/parser": "^6.6.0",
"cross-env": "^7.0.2",
"csv-streamify": "^4.0.0",
"eslint": "^7.32.0",
"eslint-plugin-compat": "3.7.0",
"eslint": "^8.48.0",
"eslint-plugin-compat": "^4.2.0",
"eslint-plugin-import": "^2.25.3",
"fetch-mock": "^9.11.0",
"ioredis": "^4.28.0",
Expand Down
2 changes: 1 addition & 1 deletion src/integrations/ga/GaToSplit.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable no-undef */
import { objectAssign } from '../../utils/lang/objectAssign';
import { isString, isFiniteNumber, uniqAsStrings } from '../../utils/lang';
import {
Expand Down Expand Up @@ -295,5 +294,6 @@ export function GaToSplit(sdkOptions: GoogleAnalyticsToSplitOptions, params: IIn
}

// Register the plugin, even if config is invalid, since, if not provided, it will block `ga` command queue.
// eslint-disable-next-line no-undef
providePlugin(window, 'splitTracker', SplitTracker, log, sdkOptions.autoRequire === true, telemetryTracker);
}
2 changes: 1 addition & 1 deletion src/storages/inMemory/TelemetryCacheInMemory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ export class TelemetryCacheInMemory implements ITelemetryCacheSync {
this.e = false;
}

private streamingEvents: StreamingEvent[] = []
private streamingEvents: StreamingEvent[] = [];

popStreamingEvents() {
return this.streamingEvents.splice(0);
Expand Down
2 changes: 1 addition & 1 deletion src/storages/inRedis/RedisAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ interface IRedisCommand {
* Redis adapter on top of the library of choice (written with ioredis) for some extra control.
*/
export class RedisAdapter extends ioredis {
private readonly log: ILogger
private readonly log: ILogger;
private _options: object;
private _notReadyCommandsQueue?: IRedisCommand[];
private _runningCommands: ISet<Promise<any>>;
Expand Down
1 change: 1 addition & 0 deletions src/sync/streaming/parseUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ function Uint8ArrayToString(myUint8Arr: Uint8Array) { // @ts-ignore

function StringToUint8Array(myString: string) {
const charCodes = myString.split('').map((e) => e.charCodeAt(0));
// eslint-disable-next-line compat/compat
return new Uint8Array(charCodes);
}

Expand Down
2 changes: 1 addition & 1 deletion src/utils/redis/RedisMock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const PIPELINE_METHODS = ['rpush', 'hincrby'];

export class RedisMock {

private pipelineMethods: any = { exec: jest.fn(asyncFunction) }
private pipelineMethods: any = { exec: jest.fn(asyncFunction) };

constructor() {
IDENTITY_METHODS.forEach(method => {
Expand Down

0 comments on commit f13bf46

Please sign in to comment.