Pull request #681: enhance/AG-4483 refactor folders structure

Merge in EXTENSIONS/browser-extension from enhance/AG-4483 to feature/AG-2737

* commit '10448bb91e05d3ed3bbe146036a26e30992b8bf9':
  AG-4483 fix tests
  AG-4483 refactor directories structure

.eslintignore

@@ -1,6 +1,6 @@
 node_modules/*
 build/*
 private/*
-Extension/lib/libs/*
-Extension/lib/content-script/assistant/assistant.js
-Extension/lib/utils/public-suffixes.js
+Extension/src/libs/*
+Extension/src/content-script/assistant/assistant.js
+Extension/src/background/utils/public-suffixes.js

Extension/api/sample-extension/entries/adguard-assistant.js

@@ -1,3 +1,3 @@
-import { startAssistant } from '../../../lib/content-script/assistant/start-assistant';
+import { startAssistant } from '../../../src/content-script/assistant/start-assistant';
 
 startAssistant();

Extension/api/sample-extension/entries/adguard-content.js

@@ -1,3 +1,3 @@
-import { preload } from '../../../lib/content-script/preload';
+import { preload } from '../../../src/content-script/preload';
 
 preload.init();

Extension/api/sample-extension/entries/background/index.js

@@ -1,3 +1,3 @@
-import '../../../lib/api';
+import '../../../src/api';
 
 import '../../sample';

Extension/api/lib/api.js → Extension/api/src/api.js

@@ -15,20 +15,20 @@
  * along with Adguard Browser Extension.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { backend } from '../../lib/filter/filters/service-client';
-import { tabsApi } from '../../lib/tabs/tabs-api';
-import { webRequestService } from '../../lib/filter/request-blocking';
-import { whitelist } from '../../lib/filter/whitelist';
-import { subscriptions } from '../../lib/filter/filters/subscription';
-import { log } from '../../lib/utils/log';
-import { application } from '../../lib/application';
-import { rulesStorage, localStorage } from '../../lib/storage';
-import { listeners } from '../../lib/notifier';
-import { userrules } from '../../lib/filter/userrules';
-import { webrequest } from '../../lib/webrequest';
-import { requestSanitizer } from '../../lib/filter/request-sanitizer';
-import { localeDetect } from '../../lib/filter/services/locale-detect';
-import { contentMessageHandler } from '../../lib/content-message-handler';
+import { backend } from '../../src/background/filter/filters/service-client';
+import { tabsApi } from '../../src/background/tabs/tabs-api';
+import { webRequestService } from '../../src/background/filter/request-blocking';
+import { whitelist } from '../../src/background/filter/whitelist';
+import { subscriptions } from '../../src/background/filter/filters/subscription';
+import { log } from '../../src/background/utils/log';
+import { application } from '../../src/background/application';
+import { rulesStorage, localStorage } from '../../src/background/storage';
+import { listeners } from '../../src/background/notifier';
+import { userrules } from '../../src/background/filter/userrules';
+import { webrequest } from '../../src/background/webrequest';
+import { requestSanitizer } from '../../src/background/filter/request-sanitizer';
+import { localeDetect } from '../../src/background/filter/services/locale-detect';
+import { contentMessageHandler } from '../../src/background/content-message-handler';
 
 /**
  * Adguard simple api

Extension/pages/background/index.js

@@ -1,12 +1,12 @@
-import { start } from '../../lib/start';
-import { webrequest } from '../../lib/webrequest';
-import { requestSanitizer } from '../../lib/filter/request-sanitizer';
-import { localeDetect } from '../../lib/filter/services/locale-detect';
-import { contentMessageHandler } from '../../lib/content-message-handler';
-import { localStorage } from '../../lib/storage';
-import { documentFilterService } from '../../lib/filter/services/document-filter';
-import { safebrowsing } from '../../lib/filter/services/safebrowsing';
-import { tabsApi } from '../../lib/tabs/tabs-api';
+import { start } from '../../src/background/start';
+import { webrequest } from '../../src/background/webrequest';
+import { requestSanitizer } from '../../src/background/filter/request-sanitizer';
+import { localeDetect } from '../../src/background/filter/services/locale-detect';
+import { contentMessageHandler } from '../../src/background/content-message-handler';
+import { localStorage } from '../../src/background/storage';
+import { documentFilterService } from '../../src/background/filter/services/document-filter';
+import { safebrowsing } from '../../src/background/filter/services/safebrowsing';
+import { tabsApi } from '../../src/background/tabs/tabs-api';
 
 start();
 webrequest.init();

Extension/pages/content-script-end/index.js

@@ -2,10 +2,10 @@
  * !IMPORTANT Only chrome based browsers support devtools, we cut off devtools for other browsers
  */
 /* @if devtools == true */
-import { devtools } from '../../lib/content-script/devtools/devtools';
+import { devtools } from '../../src/content-script/devtools/devtools';
 /* @endif */
 
-import { startAssistant } from '../../lib/content-script/assistant/start-assistant';
+import { startAssistant } from '../../src/content-script/assistant/start-assistant';
 
 startAssistant();
 

Extension/pages/content-script-start/index.js

@@ -1,6 +1,6 @@
-import { preload } from '../../lib/content-script/preload';
-import { contentUtils } from '../../lib/content-script/content-utils';
-import { contentPage } from '../../lib/content-script/content-script';
+import { preload } from '../../src/content-script/preload';
+import { contentUtils } from '../../src/content-script/content-utils';
+import { contentPage } from '../../src/content-script/content-script';
 
 // expose content page for subscribe.js
 global.contentPage = contentPage;

Extension/pages/devtools/devtools-elements-sidebar.js

@@ -1,3 +1,3 @@
-import { devtoolsElementsSidebar } from '../../lib/pages/devtools-elements-sidebar';
+import { devtoolsElementsSidebar } from '../../src/pages/devtools-elements-sidebar';
 
 devtoolsElementsSidebar.init();

Extension/pages/export/index.js

@@ -1,3 +1,3 @@
-import { exportPage } from '../../lib/pages/export';
+import { exportPage } from '../../src/pages/export';
 
 exportPage.init();

Extension/pages/filter-download/index.js

@@ -1,3 +1,3 @@
-import { filterDownload } from '../../lib/pages/filter-download';
+import { filterDownload } from '../../src/pages/filter-download';
 
 filterDownload.init();

Extension/pages/filtering-log/index.js

@@ -1,3 +1,3 @@
-import { logController } from '../../lib/pages/log-controller';
+import { logController } from '../../src/pages/log-controller';
 
 logController.init();

Extension/pages/options/index.js

@@ -1,5 +1,5 @@
-import { options } from '../../lib/pages/options';
-import { contentUtils } from '../../lib/content-script/content-utils';
+import { options } from '../../src/pages/options/options';
+import { contentUtils } from '../../src/content-script/content-utils';
 
 options.init();
 contentUtils.init();

Extension/pages/popup/index.js

@@ -1,3 +1,3 @@
-import { popupController } from '../../lib/pages/popup-controller';
+import { popupController } from '../../src/pages/popup/popup-controller';
 
 popupController.init();

Extension/pages/thankyou/index.js

@@ -1,3 +1,3 @@
-import { thankyou } from '../../lib/pages/thankyou';
+import { thankyou } from '../../src/pages/thankyou';
 
 thankyou.init();

Extension/lib/content-message-handler.js → Extension/src/background/content-message-handler.js

@@ -17,7 +17,7 @@
 
 import * as TSUrlFilter from '@adguard/tsurlfilter';
 import { settingsProvider } from './settings/settings-provider';
-import { backgroundPage } from './api/background-page';
+import { backgroundPage } from './extension-api/background-page';
 import { settings } from './settings/user-settings';
 import { listeners } from './notifier';
 import { userrules } from './filter/userrules';

Extension/lib/api/background-page.js → Extension/src/background/extension-api/background-page.js

@@ -19,7 +19,7 @@
 
 import { RequestTypes, parseContentTypeFromUrlPath } from '../utils/request-types';
 import { BACKGROUND_TAB_ID, toTabFromChromeTab } from '../utils/common';
-import { runtimeImpl } from '../common-script';
+import { runtimeImpl } from '../../common/common-script';
 import { browser } from './browser';
 import { prefs } from '../prefs';
 import { log } from '../utils/log';

Extension/lib/filter/engine.js → Extension/src/background/filter/engine.js

@@ -17,7 +17,7 @@
 
 import * as TSUrlFilter from '@adguard/tsurlfilter';
 import { log } from '../utils/log';
-import { backgroundPage } from '../api/background-page';
+import { backgroundPage } from '../extension-api/background-page';
 import { RequestTypes } from '../utils/request-types';
 
 /**

Extension/lib/filter/filtering-log/filtering-log.browsers.js → Extension/src/background/filter/filtering-log/filtering-log.browsers.js

@@ -18,7 +18,7 @@
 import * as TSUrlFilter from '@adguard/tsurlfilter';
 import { tabsApi } from '../../tabs/tabs-api';
 import { BACKGROUND_TAB_ID, utils } from '../../utils/common';
-import { backgroundPage } from '../../api/background-page';
+import { backgroundPage } from '../../extension-api/background-page';
 import { prefs } from '../../prefs';
 import { listeners } from '../../notifier';
 

Extension/lib/filter/filters/service-client.js → Extension/src/background/filter/filters/service-client.js

@@ -17,7 +17,7 @@
 
 import FiltersDownloader from 'filters-downloader';
 import { utils } from '../../utils/common';
-import { backgroundPage } from '../../api/background-page';
+import { backgroundPage } from '../../extension-api/background-page';
 import { prefs } from '../../prefs';
 import { log } from '../../utils/log';
 import { subscriptions } from './subscription';

Extension/lib/filter/filters/subscription.js → Extension/src/background/filter/filters/subscription.js

@@ -19,7 +19,7 @@ import MD5 from 'crypto-js/md5';
 import { listeners } from '../../notifier';
 import { log } from '../../utils/log';
 import { backend } from './service-client';
-import { backgroundPage } from '../../api/background-page';
+import { backgroundPage } from '../../extension-api/background-page';
 import { localStorage } from '../../storage';
 import { utils } from '../../utils/common';
 import { localScriptRulesService } from '../rules/local-script-rules';

Extension/lib/filter/page-stats.js → Extension/src/background/filter/page-stats.js

@@ -17,7 +17,7 @@
 
 /* eslint-disable max-len */
 
-import { backgroundPage } from '../api/background-page';
+import { backgroundPage } from '../extension-api/background-page';
 import { localStorage } from '../storage';
 import { utils } from '../utils/common';
 import { subscriptions } from './filters/subscription';

Extension/lib/filter/request-sanitizer.js → Extension/src/background/filter/request-sanitizer.js

@@ -16,9 +16,9 @@
  */
 
 import { BACKGROUND_TAB_ID } from '../utils/common';
-import { backgroundPage } from '../api/background-page';
+import { backgroundPage } from '../extension-api/background-page';
 import { browserUtils } from '../utils/browser-utils';
-import { browser } from '../api/browser';
+import { browser } from '../extension-api/browser';
 
 /**
  * Request sanitizer helper

Extension/lib/filter/services/cookie-filtering.js → Extension/src/background/filter/services/cookie-filtering.js

@@ -25,7 +25,7 @@ import { log } from '../../utils/log';
 import { webRequestService } from '../request-blocking';
 import { stealthService } from './stealth-service';
 import { browserUtils } from '../../utils/browser-utils';
-import { browser } from '../../api/browser';
+import { browser } from '../../extension-api/browser';
 
 /**
  * Cookie filtering module

Extension/lib/filter/services/document-filter.js → Extension/src/background/filter/services/document-filter.js

@@ -16,7 +16,7 @@
  */
 
 import { utils } from '../../utils/common';
-import { backgroundPage } from '../../api/background-page';
+import { backgroundPage } from '../../extension-api/background-page';
 import { tabsApi } from '../../tabs/tabs-api';
 import { uiService } from '../../ui-service';
 import { frames } from '../../tabs/frames';

Extension/lib/filter/services/locale-detect.js → Extension/src/background/filter/services/locale-detect.js

@@ -22,7 +22,7 @@ import { subscriptions } from '../filters/subscription';
 import { settings } from '../../settings/user-settings';
 import { utils } from '../../utils/common';
 import { browserUtils } from '../../utils/browser-utils';
-import { browser } from '../../api/browser';
+import { browser } from '../../extension-api/browser';
 
 /**
  * Initialize LocaleDetectService.

Extension/lib/filter/services/safebrowsing/safebrowsing.browsers.js → Extension/src/background/filter/services/safebrowsing/safebrowsing.browsers.js

@@ -21,7 +21,7 @@ import SHA256 from 'crypto-js/sha256';
 import { log } from '../../../utils/log';
 import { utils } from '../../../utils/common';
 import { localStorage } from '../../../storage';
-import { backgroundPage } from '../../../api/background-page';
+import { backgroundPage } from '../../../extension-api/background-page';
 import { backend } from '../../filters/service-client';
 import { settings } from '../../../settings/user-settings';
 import { LruCache } from '../../../utils/lru-cache';

Extension/lib/filter/services/stealth-service.js → Extension/src/background/filter/services/stealth-service.js

@@ -26,7 +26,7 @@ import { filteringLog } from '../filtering-log';
 import { listeners } from '../../notifier';
 import { frames } from '../../tabs/frames';
 import { browserUtils } from '../../utils/browser-utils';
-import { browser } from '../../api/browser';
+import { browser } from '../../extension-api/browser';
 
 // TODO: [TSUrlFilter] Use TSURLFilter stealthService
 

Extension/lib/prefs.js → Extension/src/background/prefs.js

@@ -15,7 +15,7 @@
  * along with Adguard Browser Extension.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { browser } from './api/browser';
+import { browser } from './extension-api/browser';
 import { lazyGet } from './utils/lazy';
 
 /**

Extension/lib/rules-storage/rules-storage.chrome.js → Extension/src/background/rules-storage/rules-storage.chrome.js

@@ -15,7 +15,7 @@
  * along with Adguard Browser Extension.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { browser } from '../api/browser';
+import { browser } from '../extension-api/browser';
 
 /**
  * Filter rules storage implementation

Extension/lib/settings/settings-provider.js → Extension/src/background/settings/settings-provider.js

@@ -23,7 +23,7 @@ import { userrules } from '../filter/userrules';
 import { listeners } from '../notifier';
 import { utils } from '../utils/common';
 import { settings } from './user-settings';
-import { backgroundPage } from '../api/background-page';
+import { backgroundPage } from '../extension-api/background-page';
 
 /**
  * Application settings provider.

Extension/lib/startup.js → Extension/src/background/startup.js

@@ -16,13 +16,13 @@
  */
 
 import { log } from './utils/log';
-import { backgroundPage } from './api/background-page';
+import { backgroundPage } from './extension-api/background-page';
 import { rulesStorage, localStorage } from './storage';
 import { whitelist } from './filter/whitelist';
 import { filteringLog } from './filter/filtering-log';
 import { uiService } from './ui-service';
 import { application } from './application';
-import { browser } from './api/browser';
+import { browser } from './extension-api/browser';
 
 /**
  * Extension initialize logic. Called from start.js

Extension/lib/tabs/tabs-api.js → Extension/src/background/tabs/tabs-api.js

@@ -16,7 +16,7 @@
  */
 
 import { utils } from '../utils/common';
-import { tabsImpl } from '../api/tabs';
+import { tabsImpl } from '../extension-api/tabs';
 
 const tabsApi = ((tabsImpl) => {
 

Extension/lib/ui-service.js → Extension/src/background/ui-service.js

@@ -18,7 +18,7 @@
 /* eslint-disable max-len */
 
 import { application } from './application';
-import { backgroundPage } from './api/background-page';
+import { backgroundPage } from './extension-api/background-page';
 import { utils, unload, BACKGROUND_TAB_ID } from './utils/common';
 import { listeners } from './notifier';
 import { settings } from './settings/user-settings';
@@ -31,7 +31,7 @@ import { whitelist } from './filter/whitelist';
 import { userrules } from './filter/userrules';
 import { browserUtils } from './utils/browser-utils';
 import { log } from './utils/log';
-import { runtimeImpl } from './common-script';
+import { runtimeImpl } from '../common/common-script';
 
 export const uiService = (function () {
     const browserActionTitle = backgroundPage.i18n.getMessage('name');
@@ -829,7 +829,7 @@ export const uiService = (function () {
     const openAssistant = async (selectElement) => {
         if (tabsApi.executeScriptFile) {
             // Load Assistant code to the activate tab immediately
-            await tabsApi.executeScriptFile(null, { file: '/lib/content-script/assistant/assistant.js' });
+            await tabsApi.executeScriptFile(null, { file: '/src/content-script/assistant/assistant.js' });
             initAssistant(selectElement);
         } else {
             // Manually start assistant

Extension/lib/update-service.js → Extension/src/background/update-service.js

@@ -16,7 +16,7 @@
  */
 
 import * as TSUrlFilter from '@adguard/tsurlfilter';
-import { backgroundPage } from './api/background-page';
+import { backgroundPage } from './extension-api/background-page';
 import { log } from './utils/log';
 import { browserUtils } from './utils/browser-utils';
 import { filtersState } from './filter/filters/filters-state';

Extension/lib/utils/browser-utils.js → Extension/src/background/utils/browser-utils.js

@@ -19,8 +19,8 @@ import { prefs } from '../prefs';
 import { localStorage } from '../storage';
 import { collections } from './collections';
 import { tabsApi } from '../tabs/tabs-api';
-import { backgroundPage } from '../api/background-page';
-import { browser } from '../api/browser';
+import { backgroundPage } from '../extension-api/background-page';
+import { browser } from '../extension-api/browser';
 
 export const browserUtils = (function () {
     /**

Extension/lib/utils/local-storage.js → Extension/src/background/utils/local-storage.js

@@ -15,7 +15,7 @@
  * along with Adguard Browser Extension.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { browser } from '../api/browser';
+import { browser } from '../extension-api/browser';
 import { log } from './log';
 
 /**

Extension/lib/utils/notifications.js → Extension/src/background/utils/notifications.js

@@ -15,7 +15,7 @@
  * along with Adguard Browser Extension.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { backgroundPage } from '../api/background-page';
+import { backgroundPage } from '../extension-api/background-page';
 import { tabsApi } from '../tabs/tabs-api';
 import { uiService } from '../ui-service';
 import { lazyGet } from './lazy';

Extension/lib/utils/resources.js → Extension/src/background/utils/resources.js

@@ -15,7 +15,7 @@
  * along with Adguard Browser Extension.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { browser } from '../api/browser';
+import { browser } from '../extension-api/browser';
 
 /**
  * Web accessible resources helper

Extension/lib/webrequest.js → Extension/src/background/webrequest.js

@@ -23,7 +23,7 @@ import { tabsApi } from './tabs/tabs-api';
 import { BACKGROUND_TAB_ID, MAIN_FRAME_ID, utils } from './utils/common';
 import { RequestTypes } from './utils/request-types';
 import { cookieFiltering } from './filter/services/cookie-filtering';
-import { backgroundPage } from './api/background-page';
+import { backgroundPage } from './extension-api/background-page';
 import { prefs } from './prefs';
 import { frames } from './tabs/frames';
 import { listeners } from './notifier';