Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace browser-core with ghostery-common #644

Merged
merged 3 commits into from Dec 14, 2020
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Next

Replace browser-core with ghostery-common

  • Loading branch information
sammacbeth committed Dec 11, 2020
commit 078dfdba0db14cfafa69335451c7c68e7eecccc2
@@ -18,4 +18,4 @@
* @namespace CliqzContentScript
*/

import 'browser-core/build/core/content-script';
import 'ghostery-common/build/gbe/core/content-script';
@@ -29,7 +29,7 @@
},
"vendorCopy": [
{
"from": "node_modules/browser-core/build/assets",
"from": "node_modules/ghostery-common/build/gbe/assets",
"to": "cliqz"
}
],
@@ -44,11 +44,12 @@
"homepage": "https://github.com/ghostery/ghostery-extension#readme",
"dependencies": {
"@cliqz/url-parser": "^1.1.3",
"browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.47.5/browser-core-7.47.5.tgz",
"classnames": "^2.2.5",
"d3": "^5.16.0",
"foundation-sites": "^6.6.2",
"ghostery-common": "^1.0.1",
"history": "^4.10.1",
"jquery": "3.5.0",
"json-api-normalizer": "^1.0.0",
"moment": "^2.26.0",
"prop-types": "^15.6.2",
@@ -12,7 +12,7 @@
*/

/* @memberOf BackgroundClasses */
import CLIQZ from 'browser-core';
import CLIQZ from 'ghostery-common';
import globals from './Globals';

const IS_ANDROID = globals.BROWSER_INFO.os === 'android';
@@ -11,8 +11,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0
*/

import Module from 'browser-core/build/core/app/module';
import baseBackground from 'browser-core/build/core/base/background';
import Module from 'ghostery-common/build/gbe/core/app/module';
import baseBackground from 'ghostery-common/build/gbe/core/base/background';
import globals from './Globals';
import conf from './Conf';

ProTip! Use n and p to navigate between commits in a pull request.