Skip to content

Commit a625171

Browse files
Merge pull request #833 from splitio/remove_pluggable_localhost_mode
Refactor: updated internal modules
2 parents a3230a2 + 93d807e commit a625171

File tree

8 files changed

+15
-22
lines changed

8 files changed

+15
-22
lines changed

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
],
4747
"rules": {
4848
"no-restricted-syntax": ["error", "ForOfStatement", "ForInStatement", "ArrayPattern"],
49-
"compat/compat": ["error", "defaults, ie 10, node 6"],
49+
"compat/compat": ["error", "defaults, node >=14"],
5050
"no-throw-literal": "error",
5151
"import/no-default-export": "error",
5252
"import/no-self-import": "error"

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"node": ">=14.0.0"
3939
},
4040
"dependencies": {
41-
"@splitsoftware/splitio-commons": "2.0.0-rc.1",
41+
"@splitsoftware/splitio-commons": "2.0.0-rc.3",
4242
"@types/ioredis": "^4.28.0",
4343
"bloom-filters": "^3.0.0",
4444
"ioredis": "^4.28.0",

src/factory/browser.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { __InLocalStorageMockFactory } from '@splitsoftware/splitio-commons/src/
1111
import { sdkFactory } from '@splitsoftware/splitio-commons/src/sdkFactory';
1212
import { LOCALHOST_MODE, STORAGE_LOCALSTORAGE } from '@splitsoftware/splitio-commons/src/utils/constants';
1313
import { createUserConsentAPI } from '@splitsoftware/splitio-commons/src/consent/sdkUserConsent';
14+
import { localhostFromObjectFactory } from '@splitsoftware/splitio-commons/src/sync/offline/LocalhostFromObject';
1415

1516
import { settingsFactory } from '../settings/browser';
1617
import { platform, SignalListener } from '../platform';
@@ -60,7 +61,7 @@ function getModules(settings) {
6061
switch (settings.mode) {
6162
case LOCALHOST_MODE:
6263
modules.splitApiFactory = undefined;
63-
modules.syncManagerFactory = settings.sync.localhostMode;
64+
modules.syncManagerFactory = localhostFromObjectFactory;
6465
modules.SignalListener = undefined;
6566
break;
6667
}

src/factory/node.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { impressionObserverSSFactory } from '@splitsoftware/splitio-commons/src/
1010
import { sdkFactory } from '@splitsoftware/splitio-commons/src/sdkFactory';
1111
import { CONSUMER_MODE, LOCALHOST_MODE } from '@splitsoftware/splitio-commons/src/utils/constants';
1212

13+
import { localhostFromFileFactory } from '../sync/offline/LocalhostFromFile';
1314
import { settingsFactory } from '../settings/node';
1415
import { platform, SignalListener } from '../platform';
1516
import { bloomFilterFactory } from '../platform/filter/bloomFilter';
@@ -53,7 +54,7 @@ function getModules(settings) {
5354
switch (settings.mode) {
5455
case LOCALHOST_MODE:
5556
modules.splitApiFactory = undefined;
56-
modules.syncManagerFactory = settings.sync.localhostMode;
57+
modules.syncManagerFactory = localhostFromFileFactory;
5758
modules.SignalListener = undefined;
5859
break;
5960
case CONSUMER_MODE:

src/settings/browser.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { settingsValidation } from '@splitsoftware/splitio-commons/src/utils/settingsValidation';
22
import { validateRuntime } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/runtime';
33
import { validateLogger } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/logger/builtinLogger';
4-
import { LocalhostFromObject } from '@splitsoftware/splitio-commons/src/sync/offline/LocalhostFromObject';
54
import { validateConsent } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/consent';
65

76
import { defaults } from './defaults/browser';
@@ -13,7 +12,6 @@ const params = {
1312
runtime: validateRuntime,
1413
storage: validateStorage,
1514
logger: validateLogger,
16-
localhost: () => LocalhostFromObject(),
1715
consent: validateConsent,
1816
};
1917

src/settings/node.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { settingsValidation } from '@splitsoftware/splitio-commons/src/utils/settingsValidation';
22
import { validateLogger } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/logger/builtinLogger';
3-
import { LocalhostFromFile } from '../sync/offline/LocalhostFromFile';
43

54
import { defaults } from './defaults/node';
65
import { validateStorage } from './storage/node';
@@ -13,7 +12,6 @@ const params = {
1312
runtime: validateRuntime,
1413
storage: validateStorage,
1514
logger: validateLogger,
16-
localhost: () => LocalhostFromFile(),
1715
flagSpec: () => FLAG_SPEC_VERSION
1816
// In Node.js the SDK ignores `config.integrations`, so a validator for integrations is not required
1917
};
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
import { splitsParserFromFileFactory } from './splitsParserFromFile';
22
import { syncManagerOfflineFactory } from '@splitsoftware/splitio-commons/src/sync/offline/syncManagerOffline';
33

4-
// Singleton instance of the factory function for offline SyncManager from YAML file (a.k.a. localhostFromFile)
4+
// Singleton instance of the factory function for offline SyncManager from YAML file
55
// It uses NodeJS APIs.
6-
const localhostFromFile = syncManagerOfflineFactory(splitsParserFromFileFactory);
7-
localhostFromFile.type = 'LocalhostFromFile';
8-
9-
export function LocalhostFromFile() {
10-
return localhostFromFile;
11-
}
6+
export const localhostFromFileFactory = syncManagerOfflineFactory(splitsParserFromFileFactory);

0 commit comments

Comments
 (0)