Skip to content

Commit e879925

Browse files
committed
Revert "[FSSDK-9611] fix relative import paths that goes out of lib (#856)"
This reverts commit b317068.
1 parent 37a363d commit e879925

File tree

12 files changed

+23
-53
lines changed

12 files changed

+23
-53
lines changed

Diff for: lib/core/odp/odp_config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { checkArrayEquality } from '../../utils/fns';
17+
import { checkArrayEquality } from '../../../lib/utils/fns';
1818

1919
export class OdpConfig {
2020
/**

Diff for: lib/modules/datafile-manager/httpPollingDatafileManager.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import { getLogger } from '../logging';
18-
import { sprintf } from '../../utils/fns';
18+
import { sprintf } from '../../../lib/utils/fns';
1919
import { DatafileManager, DatafileManagerConfig, DatafileUpdate } from './datafileManager';
2020
import EventEmitter, { Disposer } from './eventEmitter';
2121
import { AbortableRequest, Response, Headers } from './http';
@@ -24,7 +24,7 @@ import BackoffController from './backoffController';
2424
import PersistentKeyValueCache from './persistentKeyValueCache';
2525

2626
import { NotificationRegistry } from './../../core/notification_center/notification_registry';
27-
import { NOTIFICATION_TYPES } from '../../utils/enums';
27+
import { NOTIFICATION_TYPES } from '../../../lib/utils/enums';
2828

2929
const logger = getLogger('DatafileManager');
3030

Diff for: lib/optimizely/index.ts

+2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ import {
6969
ODP_USER_KEY,
7070
} from '../utils/enums';
7171

72+
import { BrowserOdpManager } from '../../lib/plugins/odp_manager/index.browser';
73+
7274
const MODULE_NAME = 'OPTIMIZELY';
7375

7476
const DEFAULT_ONREADY_TIMEOUT = 30000;

Diff for: lib/optimizely_user_context/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
* See the License for the specific language governing permissions and *
1414
* limitations under the License. *
1515
***************************************************************************/
16-
import Optimizely from '../optimizely';
16+
import Optimizely from '../../lib/optimizely';
1717
import {
1818
EventTags,
1919
OptimizelyDecideOption,
2020
OptimizelyDecision,
2121
OptimizelyDecisionContext,
2222
OptimizelyForcedDecision,
2323
UserAttributes,
24-
} from '../shared_types';
24+
} from '../../lib/shared_types';
2525
import { CONTROL_ATTRIBUTES } from '../utils/enums';
2626
import { OptimizelySegmentOption } from '../core/odp/optimizely_segment_option';
2727

Diff for: lib/plugins/event_processor/forwarding_event_processor.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2021-2023, Optimizely
2+
* Copyright 2021-2022, Optimizely
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
1717
import {
1818
EventProcessor,
1919
ProcessableEvent,
20-
} from '../../modules/event_processor';
20+
} from '../../../lib/modules/event_processor';
2121
import { NotificationSender } from '../../core/notification_center';
2222

2323
import { EventDispatcher } from '../../shared_types';

Diff for: lib/plugins/event_processor/index.react_native.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2022-2023, Optimizely
2+
* Copyright 2022, Optimizely
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { LogTierV1EventProcessor, LocalStoragePendingEventsDispatcher } from '../../modules/event_processor/index.react_native';
17+
import { LogTierV1EventProcessor, LocalStoragePendingEventsDispatcher } from '../../../lib/modules/event_processor/index.react_native';
1818

1919
export function createEventProcessor(
2020
...args: ConstructorParameters<typeof LogTierV1EventProcessor>

Diff for: lib/plugins/event_processor/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2020, 2022-2023 Optimizely
2+
* Copyright 2020, 2022, Optimizely
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { LogTierV1EventProcessor, LocalStoragePendingEventsDispatcher } from '../../modules/event_processor';
17+
import { LogTierV1EventProcessor, LocalStoragePendingEventsDispatcher } from '../../../lib/modules/event_processor';
1818

1919
export function createEventProcessor(
2020
...args: ConstructorParameters<typeof LogTierV1EventProcessor>

Diff for: lib/plugins/odp/event_manager/index.browser.ts

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
1-
/**
2-
* Copyright 2023, Optimizely
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
17-
import { IOdpEventManager, OdpEventManager } from '../../../core/odp/odp_event_manager';
1+
import { IOdpEventManager, OdpEventManager } from '../../../../lib/core/odp/odp_event_manager';
182
import { LogLevel } from '../../../modules/logging';
193
import { OdpEvent } from "../../../core/odp/odp_event";
204

Diff for: lib/plugins/odp/event_manager/index.node.ts

+3-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
1-
/**
2-
* Copyright 2023, Optimizely
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
17-
import { OdpEvent } from '../../../core/odp/odp_event';
18-
import { IOdpEventManager, OdpEventManager } from '../../../core/odp/odp_event_manager';
19-
import { LogLevel } from '../../../modules/logging';
1+
import { OdpEvent } from '../../../../lib/core/odp/odp_event';
2+
import { IOdpEventManager, OdpEventManager } from '../../../../lib/core/odp/odp_event_manager';
3+
import { LogLevel } from '../../../../lib/modules/logging';
204

215
const DEFAULT_BATCH_SIZE = 10;
226
const DEFAULT_FLUSH_INTERVAL_MSECS = 1000;

Diff for: lib/plugins/odp_manager/index.node.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
} from '../../utils/enums';
2929

3030
import { OdpManager } from '../../core/odp/odp_manager';
31-
import { OdpOptions } from '../../shared_types';
31+
import { OdpOptions } from '../../../lib/shared_types';
3232
import { NodeOdpEventApiManager } from '../odp/event_api_manager/index.node';
3333
import { NodeOdpEventManager } from '../odp/event_manager/index.node';
3434
import { OdpSegmentManager } from '../../core/odp/odp_segment_manager';

Diff for: lib/shared_types.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
* These shared type definitions include ones that will be referenced by external consumers via export_types.ts.
2020
*/
2121

22-
import { ErrorHandler, LogHandler, LogLevel, LoggerFacade } from './modules/logging';
23-
import { EventProcessor } from './modules/event_processor';
22+
import { ErrorHandler, LogHandler, LogLevel, LoggerFacade } from '../lib/modules/logging';
23+
import { EventProcessor } from '../lib/modules/event_processor';
2424

2525
import { NotificationCenter as NotificationCenterImpl } from './core/notification_center';
2626
import { NOTIFICATION_TYPES } from './utils/enums';
2727

2828
import { IOptimizelyUserContext as OptimizelyUserContext } from './optimizely_user_context';
2929

3030
import { ICache } from './utils/lru_cache';
31-
import { RequestHandler } from './utils/http_request_handler/http';
31+
import { RequestHandler } from '../lib/utils/http_request_handler/http';
3232
import { OptimizelySegmentOption } from './core/odp/optimizely_segment_option';
3333
import { IOdpSegmentApiManager } from './core/odp/odp_segment_api_manager';
3434
import { IOdpSegmentManager } from './core/odp/odp_segment_manager';

Diff for: lib/utils/event_tag_utils/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2017, 2019-2020, 2022-2023, Optimizely
2+
* Copyright 2017, 2019-2020, 2022, Optimizely
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
import { EventTags } from '../../modules/event_processor';
16+
import { EventTags } from '../../../lib/modules/event_processor';
1717
import { LoggerFacade } from '../../modules/logging';
1818

1919
import {

0 commit comments

Comments
 (0)