Skip to content

/ ghostery-extension

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

Jump to bottom

v8.4.3 Bug Fixes #446

Merged
merged 8 commits into from Sep 6, 2019
+177 −162
Merged

v8.4.3 Bug Fixes #446

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bf79ee9
disable overlay search
christophertino Sep 4, 2019
9eb55ba
GH-1845 Fixes issue where Unknown category does not show if not other…
christophertino Sep 4, 2019
53b0bb1
roll back react-dom to fix issue with react-shadow and forwardRef
christophertino Sep 5, 2019
5fe6919
remove react-shadow package for Rewards in favor of vanilla implement…
christophertino Sep 6, 2019
f1ba83a
fix broken click handlers in Rewards shadowDOM
christophertino Sep 6, 2019
6c7c9d8
GH-1829 Update Unknown category tooltip
christophertino Sep 6, 2019
8821826
disable email opt-in on create account
christophertino Sep 6, 2019
b9acc43
GH-1825 enable Rewards for new installs
christophertino Sep 6, 2019
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…

remove react-shadow package for Rewards in favor of vanilla implement… 

…ation
  • Loading branch information
@christophertino
christophertino committed Sep 6, 2019
commit 5fe6919a646761fe2b33303a527fc857c2e97054
57 app/content-scripts/rewards/index.jsx
View file
Open in desktop
@@ -19,7 +19,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { Router, Route } from 'react-router-dom';
import root from 'react-shadow';
import HotDog from './HotDog';
import OfferCard from './OfferCard';
import msgModule from '../utils/msg';
@@ -90,37 +89,37 @@ class RewardsApp {
}

renderShadow() {
// use shadowDOM to encapsulate CSS - fully supported in Chrome
this.rewardsContainer.appendChild(this.rewardsApp);
// Use shadowDOM to encapsulate CSS
document.body.appendChild(this.rewardsContainer);
const shadowRoot = this.rewardsContainer.attachShadow({ mode: 'open' }); // Get the shadow root
shadowRoot.appendChild(this.rewardsApp); // Append React root to shadow root

this.mainView = props => (
<Router history={history}>
<root.div>
<link
rel="stylesheet"
type="text/css"
href={chrome.extension.getURL('dist/css/rewards_styles.css')}
/>
<Route
exact
path="/"
render={
() => <HotDog reward={props.reward} port={this.port} actions={props.actions} />
}
/>
<Route
path="/hotdog"
render={
() => <HotDog reward={props.reward} port={this.port} actions={props.actions} />
}
/>
<Route
path="/offercard"
render={
() => <OfferCard reward={props.reward} conf={props.conf} port={this.port} actions={props.actions} />
}
/>
</root.div>
<link
rel="stylesheet"
type="text/css"
href={chrome.extension.getURL('dist/css/rewards_styles.css')}
/>
<Route
exact
path="/"
render={
() => <HotDog reward={props.reward} port={this.port} actions={props.actions} />
}
/>
<Route
path="/hotdog"
render={
() => <HotDog reward={props.reward} port={this.port} actions={props.actions} />
}
/>
<Route
path="/offercard"
render={
() => <OfferCard reward={props.reward} conf={props.conf} port={this.port} actions={props.actions} />
}
/>
</Router>
);
this.initListener();
11 package.json
View file
Open in desktop
@@ -45,7 +45,7 @@
"@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",
"browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.39.3/browser-core-7.39.3.tgz",
"classnames": "^2.2.5",
"d3": "^5.11.0",
"foundation-sites": "^6.4.4-rc1",
@@ -54,12 +54,11 @@
"moment": "^2.19.1",
"prop-types": "^15.6.2",
"query-string": "^6.8.3",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-markdown": "^4.2.2",
"react-redux": "^7.1.1",
"react-router-dom": "^5.0.1",
"react-shadow": "^17.1.3",
"react-svg": "^10.0.20",
"redux": "^4.0.4",
"redux-object": "^0.5.10",
@@ -100,7 +99,7 @@
"oboe": "^2.1.3",
"path": "^0.12.7",
"react-router": "^5.0.1",
"react-test-renderer": "^16.8.6",
"react-test-renderer": "^16.9.0",
"redux-mock-store": "^1.5.1",
"sass-loader": "^8.0.0",
"seamless-immutable": "^7.1.3",
@@ -111,7 +110,7 @@
"url-loader": "^2.1.0",
"vendor-copy": "^2.0.0",
"webpack": "^4.39.3",
"webpack-cli": "^3.3.7",
"webpack-cli": "^3.3.8",
"webpack-shell-plugin": "^0.5.0"
}
}
65 yarn.lock
View file
Open in desktop
@@ -1473,9 +1473,9 @@ brorand@^1.0.1:
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=

"browser-core@https://github.com/cliqz-oss/browser-core/releases/download/v7.39.2/browser-core-7.39.2.tgz":
version "7.39.2"
resolved "https://github.com/cliqz-oss/browser-core/releases/download/v7.39.2/browser-core-7.39.2.tgz#856122386d236f16bd5ad769c00b00e823c7c749"
"browser-core@https://github.com/cliqz-oss/browser-core/releases/download/v7.39.3/browser-core-7.39.3.tgz":
version "7.39.3"
resolved "https://github.com/cliqz-oss/browser-core/releases/download/v7.39.3/browser-core-7.39.3.tgz#c6acca3914c8a549d560134117e7b5d9e0a0fb75"
dependencies:
"@cliqz-oss/dexie" "^2.0.4"
"@cliqz/adblocker-webextension" "^0.13.2"
@@ -3806,11 +3806,6 @@ https-browserify@^1.0.0:
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=

humps@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/humps/-/humps-2.0.1.tgz#dd02ea6081bd0568dc5d073184463957ba9ef9aa"
integrity sha1-3QLqYIG9BWjcXQcxhEY5V7qe+ao=

hyphenate-style-name@^1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz#097bb7fa0b8f1a9cf0bd5c734cf95899981a9b48"
@@ -6621,15 +6616,15 @@ react-dom@16.6.3:
prop-types "^15.6.2"
scheduler "^0.11.2"

react-dom@^16.8.6:
version "16.8.6"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==
react-dom@^16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
integrity sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.13.6"
scheduler "^0.15.0"

react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
version "16.8.6"
@@ -6736,13 +6731,6 @@ react-router@5.0.1, react-router@^5.0.1:
tiny-invariant "^1.0.2"
tiny-warning "^1.0.0"

react-shadow@^17.1.3:
version "17.1.3"
resolved "https://registry.yarnpkg.com/react-shadow/-/react-shadow-17.1.3.tgz#21f8ebbbeff8f867a5eb29dec52758a3fb576d42"
integrity sha512-T0TETccduTNwid9/URfWRhtAH0Fv3eA1zra7cq+2bY5u4fd4oBjtXA629h/95QN8aznlJof3ELd36qOyzaGdHQ==
dependencies:
humps "^2.0.1"

react-svg@^10.0.20:
version "10.0.20"
resolved "https://registry.yarnpkg.com/react-svg/-/react-svg-10.0.20.tgz#cbbc7394e711311a6f07a2c679563ea9364bb558"
@@ -6752,7 +6740,7 @@ react-svg@^10.0.20:
"@tanem/svg-injector" "^8.0.30"
prop-types "^15.7.2"

react-test-renderer@^16.0.0-0, react-test-renderer@^16.8.6:
react-test-renderer@^16.0.0-0:
version "16.8.6"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.6.tgz#188d8029b8c39c786f998aa3efd3ffe7642d5ba1"
integrity sha512-H2srzU5IWYT6cZXof6AhUcx/wEyJddQ8l7cLM/F7gDXYyPr4oq+vCIxJYXVGhId1J706sqziAjuOEjyNkfgoEw==
@@ -6762,6 +6750,16 @@ react-test-renderer@^16.0.0-0, react-test-renderer@^16.8.6:
react-is "^16.8.6"
scheduler "^0.13.6"

react-test-renderer@^16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.9.0.tgz#7ed657a374af47af88f66f33a3ef99c9610c8ae9"
integrity sha512-R62stB73qZyhrJo7wmCW9jgl/07ai+YzvouvCXIJLBkRlRqLx4j9RqcLEAfNfU3OxTGucqR2Whmn3/Aad6L3hQ==
dependencies:
object-assign "^4.1.1"
prop-types "^15.6.2"
react-is "^16.9.0"
scheduler "^0.15.0"

react-timer-mixin@^0.13.3:
version "0.13.4"
resolved "https://registry.yarnpkg.com/react-timer-mixin/-/react-timer-mixin-0.13.4.tgz#75a00c3c94c13abe29b43d63b4c65a88fc8264d3"
@@ -6800,15 +6798,14 @@ react@16.6.3:
prop-types "^15.6.2"
scheduler "^0.11.2"

react@^16.8.6:
version "16.8.6"
resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
react@^16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"
integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.13.6"

read-installed@~4.0.3:
version "4.0.3"
@@ -7324,6 +7321,14 @@ scheduler@^0.13.6:
loose-envify "^1.1.0"
object-assign "^4.1.1"

scheduler@^0.15.0:
version "0.15.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz#6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e"
integrity sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"

schema-utils@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -8543,10 +8548,10 @@ webidl-conversions@^4.0.2:
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==

webpack-cli@^3.3.7:
version "3.3.7"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.7.tgz#77c8580dd8e92f69d635e0238eaf9d9c15759a91"
integrity sha512-OhTUCttAsr+IZSMVwGROGRHvT+QAs8H6/mHIl4SvhAwYywjiylYjpwybGx7WQ9Hkb45FhjtsymkwiRRbGJ1SZQ==
webpack-cli@^3.3.8:
version "3.3.8"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.8.tgz#caeaebcc26f685db1736e5decd3f01aac30123ec"
integrity sha512-RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==
dependencies:
chalk "2.4.2"
cross-spawn "6.0.5"
ProTip! Use n and p to navigate between commits in a pull request.