Skip to content

Commit 85094f1

Browse files
aulneauaulneau
committed
update tests for css, fixed prettier test locally
1 parent 507c13e commit 85094f1

File tree

6 files changed

+16
-41
lines changed

6 files changed

+16
-41
lines changed

‎config/CSSStub.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = {};

‎examples/redux/public/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
work correctly both with client-side routing and a non-root public URL.
2020
Learn how to configure a non-root public URL by running `npm run build`.
2121
-->
22-
<title>React App</title>
22+
<title>Redux App</title>
2323
</head>
2424
<body>
2525
<noscript>

‎package.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"make:dist:css": "mkdirp dist && node-sass --output-style compressed src/styles/main.scss > dist/react-plotly.js-editor.css",
2222
"prepublishOnly": "npm run make:lib && npm run make:combined-translation-keys",
2323
"prepublishOnly:scss": "npm run make:lib:css && npm run make:combined-translation-keys",
24-
"lint": "prettier --write \"src/**/*.js\"",
25-
"test:lint": "eslint src && echo -e '\\033[0;32m'PASS'\\033[0m'",
24+
"lint": "prettier --write \"src/**/*.js\"",
25+
"test:lint": "eslint \"src/**/*.js\" && echo -e '\\033[0;32m'PASS'\\033[0m'",
2626
"test:pretty": "prettier -l \"src/**/*.js\" && echo -e '\\033[0;32m'PASS'\\033[0m'",
2727
"test:js": "jest --setupTestFrameworkScriptFile=raf/polyfill",
2828
"test": "npm run test:lint && npm run test:pretty && npm run test:js",
@@ -63,7 +63,7 @@
6363
"jest": "^21.2.1",
6464
"mkdirp": "^0.5.1",
6565
"node-sass": "^4.7.1",
66-
"prettier": "1.8.2",
66+
"prettier": "^1.9.2",
6767
"react-test-renderer": "^16.2.0",
6868
"uglify-js": "^3.0.26"
6969
},
@@ -94,6 +94,9 @@
9494
"jest": {
9595
"roots": [
9696
"<rootDir>/src/"
97-
]
97+
],
98+
"moduleNameMapper": {
99+
"^.+\\.css$": "<rootDir>/config/CSSStub.js"
100+
}
98101
}
99102
}

‎src/components/containers/AnnotationAccordion.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ export default class AnnotationAccordion extends Component {
4040
</button>
4141
);
4242

43-
const PanelHeader = canAdd && (
44-
<Panel.Header action={AddButton} />
45-
);
43+
const PanelHeader = canAdd && <Panel.Header action={AddButton} />;
4644

4745
const Content = annotations.map((ann, i) => (
4846
<AnnotationFold key={i} annotationIndex={i} name={ann.text}>

‎src/components/containers/Panel.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class PanelHeader extends Component {
88

99
return (
1010
<div className={bem('panel', 'header')}>
11-
<div className={bem('panel', 'header__content')}>{children}</div>
11+
<div className={bem('panel', 'header__content')}>{children}</div>
1212
{action && (
1313
<div className={bem('panel', 'header__actions')}>{action}</div>
1414
)}
@@ -22,7 +22,7 @@ class Panel extends Component {
2222
const {visible, children} = this.props;
2323

2424
if (visible) {
25-
return <div className={bem('panel')}>{children}</div>;
25+
return <div className={bem('panel')}>{children}</div>;
2626
}
2727
return null;
2828
}
@@ -37,7 +37,7 @@ Panel.propTypes = {
3737

3838
PanelHeader.propTypes = {
3939
children: PropTypes.node,
40-
action: PropTypes.any
40+
action: PropTypes.any,
4141
};
4242

4343
Panel.defaultProps = {

‎yarn.lock

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,6 @@ babel-plugin-jest-hoist@^21.2.0:
631631
version "21.2.0"
632632
resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-21.2.0.tgz#2cef637259bd4b628a6cace039de5fcd14dbb006"
633633

634-
<<<<<<< HEAD
635634
babel-plugin-module-resolver@^3.0.0:
636635
version "3.0.0"
637636
resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.0.0.tgz#a2fe5b97f7b809a8bbac18beada0a94d45987c63"
@@ -642,8 +641,6 @@ babel-plugin-module-resolver@^3.0.0:
642641
reselect "^3.0.1"
643642
resolve "^1.4.0"
644643

645-
=======
646-
>>>>>>> 97772b728b3e2154f9a2ecb66cc485d04fcaad2c
647644
babel-plugin-syntax-async-functions@^6.8.0:
648645
version "6.13.0"
649646
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
@@ -2690,16 +2687,13 @@ filtered-vector@^1.2.1:
26902687
binary-search-bounds "^1.0.0"
26912688
cubic-hermite "^1.0.0"
26922689

2693-
<<<<<<< HEAD
26942690
find-babel-config@^1.1.0:
26952691
version "1.1.0"
26962692
resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.1.0.tgz#acc01043a6749fec34429be6b64f542ebb5d6355"
26972693
dependencies:
26982694
json5 "^0.5.1"
26992695
path-exists "^3.0.0"
27002696

2701-
=======
2702-
>>>>>>> 97772b728b3e2154f9a2ecb66cc485d04fcaad2c
27032697
find-up@^1.0.0:
27042698
version "1.1.2"
27052699
resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -4643,21 +4637,13 @@ mapbox-gl-function@^1.2.1:
46434637
version "1.3.0"
46444638
resolved "https://registry.yarnpkg.com/mapbox-gl-function/-/mapbox-gl-function-1.3.0.tgz#cee3d95750c189d45e83ab41a0a57fc2a8a509bc"
46454639

4646-
<<<<<<< HEAD
46474640
mapbox-gl-shaders@mapbox/mapbox-gl-shaders#de2ab007455aa2587c552694c68583f94c9f2747:
4648-
=======
4649-
"mapbox-gl-shaders@github:mapbox/mapbox-gl-shaders#de2ab007455aa2587c552694c68583f94c9f2747":
4650-
>>>>>>> 97772b728b3e2154f9a2ecb66cc485d04fcaad2c
46514641
version "1.0.0"
46524642
resolved "https://codeload.github.com/mapbox/mapbox-gl-shaders/tar.gz/de2ab007455aa2587c552694c68583f94c9f2747"
46534643
dependencies:
46544644
brfs "^1.4.0"
46554645

4656-
<<<<<<< HEAD
46574646
mapbox-gl-style-spec@mapbox/mapbox-gl-style-spec#83b1a3e5837d785af582efd5ed1a212f2df6a4ae:
4658-
=======
4659-
"mapbox-gl-style-spec@github:mapbox/mapbox-gl-style-spec#83b1a3e5837d785af582efd5ed1a212f2df6a4ae":
4660-
>>>>>>> 97772b728b3e2154f9a2ecb66cc485d04fcaad2c
46614647
version "8.8.0"
46624648
resolved "https://codeload.github.com/mapbox/mapbox-gl-style-spec/tar.gz/83b1a3e5837d785af582efd5ed1a212f2df6a4ae"
46634649
dependencies:
@@ -4751,13 +4737,10 @@ md5.js@^1.3.4:
47514737
hash-base "^3.0.0"
47524738
inherits "^2.0.1"
47534739

4754-
<<<<<<< HEAD
47554740
mdi-react@^2.1.19:
47564741
version "2.1.19"
47574742
resolved "https://registry.yarnpkg.com/mdi-react/-/mdi-react-2.1.19.tgz#aa05f3ebe4b073578c60ddfa30a8ec7eb36873b7"
47584743

4759-
=======
4760-
>>>>>>> 97772b728b3e2154f9a2ecb66cc485d04fcaad2c
47614744
mem@^1.1.0:
47624745
version "1.1.0"
47634746
resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
@@ -5523,15 +5506,12 @@ pkg-dir@^1.0.0:
55235506
dependencies:
55245507
find-up "^1.0.0"
55255508

5526-
<<<<<<< HEAD
55275509
pkg-up@^2.0.0:
55285510
version "2.0.0"
55295511
resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
55305512
dependencies:
55315513
find-up "^2.1.0"
55325514

5533-
=======
5534-
>>>>>>> 97772b728b3e2154f9a2ecb66cc485d04fcaad2c
55355515
planar-dual@^1.0.0:
55365516
version "1.0.2"
55375517
resolved "https://registry.yarnpkg.com/planar-dual/-/planar-dual-1.0.2.tgz#b6a4235523b1b0cb79e5f926f8ea335dd982d563"
@@ -5660,9 +5640,9 @@ preserve@^0.2.0:
56605640
version "0.2.0"
56615641
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
56625642

5663-
prettier@1.8.2:
5664-
version "1.8.2"
5665-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.8.2.tgz#bff83e7fd573933c607875e5ba3abbdffb96aeb8"
5643+
prettier@^1.9.2:
5644+
version "1.9.2"
5645+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.9.2.tgz#96bc2132f7a32338e6078aeb29727178c6335827"
56665646

56675647
pretty-format@^21.2.1:
56685648
version "21.2.1"
@@ -6161,13 +6141,10 @@ require-uncached@^1.0.3:
61616141
caller-path "^0.1.0"
61626142
resolve-from "^1.0.0"
61636143

6164-
<<<<<<< HEAD
61656144
reselect@^3.0.1:
61666145
version "3.0.1"
61676146
resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
61686147

6169-
=======
6170-
>>>>>>> 97772b728b3e2154f9a2ecb66cc485d04fcaad2c
61716148
resolve-from@^1.0.0:
61726149
version "1.0.1"
61736150
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
@@ -6190,11 +6167,7 @@ resolve@^0.6.1:
61906167
version "0.6.3"
61916168
resolved "https://registry.yarnpkg.com/resolve/-/resolve-0.6.3.tgz#dd957982e7e736debdf53b58a4dd91754575dd46"
61926169

6193-
<<<<<<< HEAD
61946170
resolve@^1.0.0, resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.5, resolve@^1.2.0, resolve@^1.4.0:
6195-
=======
6196-
resolve@^1.0.0, resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.5, resolve@^1.2.0:
6197-
>>>>>>> 97772b728b3e2154f9a2ecb66cc485d04fcaad2c
61986171
version "1.5.0"
61996172
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
62006173
dependencies:

0 commit comments

Comments
 (0)