Skip to content

Commit 40f3110

Browse files
prepare 3.2.5 release (#19)
1 parent a798891 commit 40f3110

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

.eslintrc.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ rules:
7676
- error
7777
- props: true
7878

79-
no-prototype-builtins: warn
80-
8179
# https://eslint.org/docs/rules/no-return-assign
8280
no-return-assign: error
8381

src/Stream.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as messages from './messages';
2-
import { base64URLEncode, getLDHeaders } from './utils';
2+
import { base64URLEncode, getLDHeaders, objectHasOwnProperty } from './utils';
33

44
// The underlying event source implementation is abstracted via the platform object, which should
55
// have these three properties:
@@ -109,7 +109,7 @@ export default function Stream(platform, config, environment, diagnosticsAccumul
109109

110110
es = platform.eventSourceFactory(url, options);
111111
for (const key in handlers) {
112-
if (handlers.hasOwnProperty(key)) {
112+
if (objectHasOwnProperty(handlers, key)) {
113113
es.addEventListener(key, handlers[key]);
114114
}
115115
}

src/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ export function initialize(env, user, specifiedOptions, platform, extraOptionDef
258258
function variationDetailInternal(key, defaultValue, sendEvent, includeReasonInEvent) {
259259
let detail;
260260

261-
if (flags && flags.hasOwnProperty(key) && flags[key] && !flags[key].deleted) {
261+
if (flags && utils.objectHasOwnProperty(flags, key) && flags[key] && !flags[key].deleted) {
262262
const flag = flags[key];
263263
detail = getFlagDetail(flag);
264264
if (flag.value === null || flag.value === undefined) {
@@ -294,7 +294,7 @@ export function initialize(env, user, specifiedOptions, platform, extraOptionDef
294294
}
295295

296296
for (const key in flags) {
297-
if (flags.hasOwnProperty(key)) {
297+
if (utils.objectHasOwnProperty(flags, key)) {
298298
results[key] = variationDetailInternal(key, null, !options.sendEventsOnlyForVariation).value;
299299
}
300300
}
@@ -407,7 +407,7 @@ export function initialize(env, user, specifiedOptions, platform, extraOptionDef
407407
}
408408

409409
for (const key in flags) {
410-
if (flags.hasOwnProperty(key) && flags[key]) {
410+
if (utils.objectHasOwnProperty(flags, key) && flags[key]) {
411411
if (newFlags[key] && !utils.deepEquals(newFlags[key].value, flags[key].value)) {
412412
changes[key] = { previous: flags[key].value, current: getFlagDetail(newFlags[key]) };
413413
} else if (!newFlags[key] || newFlags[key].deleted) {
@@ -416,7 +416,7 @@ export function initialize(env, user, specifiedOptions, platform, extraOptionDef
416416
}
417417
}
418418
for (const key in newFlags) {
419-
if (newFlags.hasOwnProperty(key) && newFlags[key] && (!flags[key] || flags[key].deleted)) {
419+
if (utils.objectHasOwnProperty(newFlags, key) && newFlags[key] && (!flags[key] || flags[key].deleted)) {
420420
changes[key] = { current: getFlagDetail(newFlags[key]) };
421421
}
422422
}

src/utils.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export function wrapPromiseCallback(promise, callback) {
8585
export function transformValuesToVersionedValues(flags) {
8686
const ret = {};
8787
for (const key in flags) {
88-
if (flags.hasOwnProperty(key)) {
88+
if (objectHasOwnProperty(flags, key)) {
8989
ret[key] = { value: flags[key], version: 0 };
9090
}
9191
}
@@ -98,7 +98,7 @@ export function transformValuesToVersionedValues(flags) {
9898
export function transformVersionedValuesToValues(flagsState) {
9999
const ret = {};
100100
for (const key in flagsState) {
101-
if (flagsState.hasOwnProperty(key)) {
101+
if (objectHasOwnProperty(flagsState, key)) {
102102
ret[key] = flagsState[key].value;
103103
}
104104
}
@@ -169,6 +169,10 @@ export function extend(...objects) {
169169
return objects.reduce((acc, obj) => ({ ...acc, ...obj }), {});
170170
}
171171

172+
export function objectHasOwnProperty(object, name) {
173+
return Object.prototype.hasOwnProperty.call(object, name);
174+
}
175+
172176
export function sanitizeUser(user) {
173177
if (!user) {
174178
return user;

0 commit comments

Comments
 (0)