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

fix for react-shadow update #421

Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

swap styles tag with link tag
  • Loading branch information
Aleksandr Panin
Aleksandr Panin committed Jul 25, 2019
commit 97677c65523b20984175ccb15b4beb51fa9d0d75
@@ -25,7 +25,6 @@ import OfferCard from './OfferCard';
import msgModule from '../utils/msg';
import history from '../../panel/utils/history';
import globals from '../../../src/classes/Globals';
import styles from '../../../dist/css/rewards_styles.css';

const msg = msgModule('rewards');
const { sendMessage } = msg;
@@ -101,7 +100,11 @@ class RewardsApp {
<Router history={history}>
<div id="ghostery-shadow-root">
<ShadowDOM.span>
<style type="text/css">{styles}</style>
<link
rel="stylesheet"
type="text/css"
href={chrome.extension.getURL('dist/css/rewards_styles.css')}
/>
<Route
exact
path="/"
@@ -102,7 +102,6 @@
"react-test-renderer": "^16.8.6",
"redux-mock-store": "^1.5.1",
"sass-loader": "^7.1.0",
"to-string-loader": "^1.1.5",
"seamless-immutable": "^7.1.3",
"sinon": "^7.3.2",
"sinon-chrome": "^3.0.1",
@@ -119,9 +119,6 @@ module.exports = {
use: {
loader: 'underscore-template-loader'
}
}, {
test: /\.css$/,
loader: ['to-string-loader', 'css-loader'],
}, {
test: /\.(js|jsx)$/,
include: [SHARED_COMP_DIR, PANEL_ANDROID_DIR, PANEL_DIR, HUB_DIR, LICENSES_DIR, CONTENT_SCRIPTS_DIR, REWARDS_DIR],
@@ -4232,7 +4232,7 @@ loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.
emojis-list "^2.0.0"
json5 "^1.0.1"

loader-utils@^0.2.11, loader-utils@^0.2.16:
loader-utils@^0.2.11:
version "0.2.17"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
dependencies:
@@ -6796,12 +6796,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
regex-not "^1.0.2"
safe-regex "^1.1.0"

to-string-loader@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/to-string-loader/-/to-string-loader-1.1.5.tgz#7b7aa17891b7bb4947a7a11bfb03b5fde9c6e695"
dependencies:
loader-utils "^0.2.16"

tooltipster@^4.2.6:
version "4.2.6"
resolved "https://registry.yarnpkg.com/tooltipster/-/tooltipster-4.2.6.tgz#fbf7a3f5b40bd83e81574e28d9667cf82667bc79"
ProTip! Use n and p to navigate between commits in a pull request.