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

v8.4.3 Bug Fixes #446

Merged
merged 8 commits into from Sep 6, 2019

roll back react-dom to fix issue with react-shadow and forwardRef

  • Loading branch information
christophertino committed Sep 5, 2019
commit 53b0bb15559cbab0f2d64fc89dff94aeff687a18
@@ -36,14 +36,20 @@ const initialState = Immutable({
},
tab_id: 0,
antiTracking: {
totalUnsafeCount: 0,
totalUnknownCount: 0,
totalUnsafeCount: 0,
trackerCount: 0,
unknownTrackerCount: 0,
unknownTrackers: [],
whitelistedUrls: {},
},
adBlock: {
totalCount: 0,
totalUnknownCount: 0,
totalUnsafeCount: 0,
trackerCount: 0,
unknownTrackerCount: 0,
unknownTrackers: [],
whitelistedUrls: {},
},
});

@@ -63,7 +69,7 @@ describe('app/panel/reducers/summary.js', () => {
test('reducer correctly handles UPDATE_CLIQZ_MODULE_DATA', () => {
const data = {
adBlock: {
totalCount: 3,
totalUnsafeCount: 3,
trackerCount: 2,
},
antiTracking: {
@@ -76,7 +82,7 @@ describe('app/panel/reducers/summary.js', () => {
const initState = Immutable({
tab_id: 0,
adBlock: {
totalCount: 1,
totalUnsafeCount: 1,
trackerCount: 1,
},
antiTracking: {
@@ -42,7 +42,7 @@
},
"homepage": "https://github.com/ghostery/ghostery-extension#readme",
"dependencies": {
"@cliqz/adblocker-circumvention": "^1.0.1",
"@cliqz/adblocker-circumvention": "^1.0.2",
"@cliqz/url-parser": "^1.0.3",
"base64-js": "^1.3.1",
"browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.39.2/browser-core-7.39.2.tgz",
@@ -53,10 +53,10 @@
"json-api-normalizer": "^0.4.16",
"moment": "^2.19.1",
"prop-types": "^15.6.2",
"query-string": "^6.8.2",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-markdown": "^4.0.8",
"query-string": "^6.8.3",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-markdown": "^4.2.2",
"react-redux": "^7.1.1",
"react-router-dom": "^5.0.1",
"react-shadow": "^17.1.3",
@@ -80,11 +80,11 @@
"babel-eslint": "^10.0.3",
"babel-loader": "^8.0.6",
"clean-webpack-plugin": "^3.0.0",
"cross-env": "^5.1.3",
"cross-env": "^5.2.1",
"css-loader": "^3.2.0",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
"eslint": "6.2.2",
"eslint": "^6.3.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-loader": "^3.0.0",
"eslint-plugin-import": "^2.18.2",
@@ -100,13 +100,13 @@
"oboe": "^2.1.3",
"path": "^0.12.7",
"react-router": "^5.0.1",
"react-test-renderer": "^16.9.0",
"react-test-renderer": "^16.8.6",
"redux-mock-store": "^1.5.1",
"sass-loader": "^8.0.0",
"seamless-immutable": "^7.1.3",
"sinon": "^7.4.1",
"sinon": "^7.4.2",
"sinon-chrome": "^3.0.1",
"svg-url-loader": "^3.0.0",
"svg-url-loader": "^3.0.2",
"underscore-template-loader": "^1.0.0",
"url-loader": "^2.1.0",
"vendor-copy": "^2.0.0",
ProTip! Use n and p to navigate between commits in a pull request.