Skip to content

Commit 75c7f7d

Browse files
NaturalclarNaturalclar
authored
Merge branch 'master' into feat/allowEnteringAppName
2 parents 8d8fcc3 + 300894e commit 75c7f7d

File tree

6 files changed

+102
-71
lines changed

6 files changed

+102
-71
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"devDependencies": {
2323
"eslint": "5.16.0",
2424
"eslint-plugin-prettier": "3.1.2",
25-
"gh-pages": "2.1.1",
26-
"husky": "3.1.0",
25+
"gh-pages": "2.2.0",
26+
"husky": "4.0.0",
2727
"prettier": "1.19.1",
2828
"pretty-quick": "2.0.1"
2929
},

‎src/components/common/AppNameWarning.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import React from 'react'
2+
import styled from 'styled-components'
3+
import { Alert } from 'antd'
4+
import Markdown from './Markdown'
5+
6+
const Container = styled.div({
7+
width: '100%',
8+
marginTop: '16px'
9+
})
10+
11+
export const AppNameWarning = () => (
12+
<Container>
13+
<Alert
14+
message={
15+
<Markdown>
16+
Keep in mind that `RnDiffApp` and `rndiffapp` are placeholders. When
17+
upgrading, you should replace them with your actual project's name.
18+
</Markdown>
19+
}
20+
type="info"
21+
closable
22+
/>
23+
</Container>
24+
)

‎src/components/common/DiffViewer.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import DiffLoading from './Diff/DiffLoading'
99
import UsefulContentSection from './UsefulContentSection'
1010
import ViewStyleOptions from './Diff/DiffViewStyleOptions'
1111
import CompletedFilesCounter from './CompletedFilesCounter'
12+
import { AppNameWarning } from './AppNameWarning'
1213

1314
const Container = styled.div`
1415
width: 90%;
@@ -132,6 +133,9 @@ const DiffViewer = ({
132133
fromVersion={fromVersion}
133134
toVersion={toVersion}
134135
/>
136+
137+
<AppNameWarning />
138+
135139
<ViewStyleOptions
136140
handleViewStyleChange={handleViewStyleChange}
137141
diffViewStyle={diffViewStyle}

‎src/components/common/Markdown.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const InlineCode = styled.em`
1919
padding: 0.2em 0.4em;
2020
`
2121

22-
export default ({ forceBlock, options = {}, ...props }) => (
22+
export default ({ forceBlock = false, options = {}, ...props }) => (
2323
<Markdown
2424
{...props}
2525
options={{

‎src/components/pages/Home.js

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState, useEffect } from 'react'
22
import styled from 'styled-components'
3-
import { Alert, Card } from 'antd'
3+
import { Card } from 'antd'
44
import GitHubButton from 'react-github-btn'
55
import ReactGA from 'react-ga'
66
import VersionSelector from '../common/VersionSelector'
@@ -28,13 +28,6 @@ const TitleContainer = styled.div`
2828
align-items: center;
2929
`
3030

31-
const Subtitle = styled.div({
32-
display: 'flex',
33-
alignItems: 'center',
34-
justifyContent: 'center',
35-
marginTop: 50
36-
})
37-
3831
const LogoImg = styled.img`
3932
width: 100px;
4033
margin-bottom: 15px;
@@ -59,7 +52,6 @@ const Home = () => {
5952
const [fromVersion, setFromVersion] = useState('')
6053
const [toVersion, setToVersion] = useState('')
6154
const [showDiff, setShowDiff] = useState(false)
62-
const [showAppNameWarning, setAppNameWarning] = useState(false)
6355
const [settings, setSettings] = useState({
6456
[`${SHOW_LATEST_RCS}`]: false
6557
})
@@ -79,7 +71,6 @@ const Home = () => {
7971

8072
setFromVersion(fromVersion)
8173
setToVersion(toVersion)
82-
setAppNameWarning(true)
8374
setShowDiff(true)
8475
}
8576

@@ -126,19 +117,6 @@ const Home = () => {
126117
showDiff={handleShowDiff}
127118
showReleaseCandidates={settings[SHOW_LATEST_RCS]}
128119
/>
129-
130-
{showAppNameWarning ? (
131-
<Subtitle>
132-
<Alert
133-
message="Don't forget: `RnDiffApp` is a placeholder. When upgrading, all
134-
instances of `RnDiffApp` should be `YourProjectName`, all `rndiffapp`
135-
should be `yourprojectname` etc."
136-
type="warning"
137-
closable
138-
onClose={() => setAppNameWarning(false)}
139-
/>
140-
</Subtitle>
141-
) : null}
142120
</Container>
143121

144122
<DiffViewer

‎yarn.lock

Lines changed: 70 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,6 +1391,11 @@
13911391
dependencies:
13921392
"@babel/types" "^7.3.0"
13931393

1394+
"@types/color-name@^1.1.1":
1395+
version "1.1.1"
1396+
resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
1397+
integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
1398+
13941399
"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
13951400
version "2.0.1"
13961401
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -1416,11 +1421,6 @@
14161421
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
14171422
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
14181423

1419-
"@types/normalize-package-data@^2.4.0":
1420-
version "2.4.0"
1421-
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
1422-
integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
1423-
14241424
"@types/parse-json@^4.0.0":
14251425
version "4.0.0"
14261426
resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -1798,6 +1798,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
17981798
dependencies:
17991799
color-convert "^1.9.0"
18001800

1801+
ansi-styles@^4.1.0:
1802+
version "4.2.1"
1803+
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
1804+
integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
1805+
dependencies:
1806+
"@types/color-name" "^1.1.1"
1807+
color-convert "^2.0.1"
1808+
18011809
[email protected]:
18021810
version "3.26.6"
18031811
resolved "https://registry.yarnpkg.com/antd/-/antd-3.26.6.tgz#7e583e11e757679ca6d2fda0bc418a177f5d3653"
@@ -2666,6 +2674,14 @@ chalk@^1.1.3:
26662674
strip-ansi "^3.0.0"
26672675
supports-color "^2.0.0"
26682676

2677+
chalk@^3.0.0:
2678+
version "3.0.0"
2679+
resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
2680+
integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
2681+
dependencies:
2682+
ansi-styles "^4.1.0"
2683+
supports-color "^7.1.0"
2684+
26692685
change-emitter@^0.1.2:
26702686
version "0.1.6"
26712687
resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515"
@@ -2827,12 +2843,19 @@ color-convert@^1.9.0, color-convert@^1.9.1:
28272843
dependencies:
28282844
color-name "1.1.3"
28292845

2846+
color-convert@^2.0.1:
2847+
version "2.0.1"
2848+
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
2849+
integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
2850+
dependencies:
2851+
color-name "~1.1.4"
2852+
28302853
[email protected]:
28312854
version "1.1.3"
28322855
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
28332856
integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
28342857

2835-
color-name@^1.0.0:
2858+
color-name@^1.0.0, color-name@~1.1.4:
28362859
version "1.1.4"
28372860
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
28382861
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -4615,6 +4638,15 @@ fs-extra@^4.0.2:
46154638
jsonfile "^4.0.0"
46164639
universalify "^0.1.0"
46174640

4641+
fs-extra@^8.1.0:
4642+
version "8.1.0"
4643+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
4644+
integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
4645+
dependencies:
4646+
graceful-fs "^4.2.0"
4647+
jsonfile "^4.0.0"
4648+
universalify "^0.1.0"
4649+
46184650
fs-write-stream-atomic@^1.0.8:
46194651
version "1.0.10"
46204652
resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -4699,19 +4731,17 @@ getpass@^0.1.1:
46994731
dependencies:
47004732
assert-plus "^1.0.0"
47014733

4702-
gh-pages@2.1.1:
4703-
version "2.1.1"
4704-
resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-2.1.1.tgz#5be70a92f9cb70404bafabd8bb149c0e9a8c264b"
4705-
integrity sha512-yNW2SFp9xGRP/8Sk2WXuLI/Gn92oOL4HBgudn6PsqAnuWT90Y1tozJoTfX1WdrDSW5Rb90kLVOf5mm9KJ/2fDw==
4734+
gh-pages@2.2.0:
4735+
version "2.2.0"
4736+
resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-2.2.0.tgz#74ebeaca8d2b9a11279dcbd4a39ddfff3e6caa24"
4737+
integrity sha512-c+yPkNOPMFGNisYg9r4qvsMIjVYikJv7ImFOhPIVPt0+AcRUamZ7zkGRLHz7FKB0xrlZ+ddSOJsZv9XAFVXLmA==
47064738
dependencies:
47074739
async "^2.6.1"
47084740
commander "^2.18.0"
47094741
email-addresses "^3.0.1"
47104742
filenamify-url "^1.0.0"
4711-
fs-extra "^7.0.0"
4743+
fs-extra "^8.1.0"
47124744
globby "^6.1.0"
4713-
graceful-fs "^4.1.11"
4714-
rimraf "^2.6.2"
47154745

47164746
github-buttons@^2.3.0:
47174747
version "2.6.0"
@@ -4788,7 +4818,7 @@ globby@^6.1.0:
47884818
pify "^2.0.0"
47894819
pinkie-promise "^2.0.0"
47904820

4791-
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
4821+
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
47924822
version "4.2.3"
47934823
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
47944824
integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
@@ -4862,6 +4892,11 @@ has-flag@^3.0.0:
48624892
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
48634893
integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
48644894

4895+
has-flag@^4.0.0:
4896+
version "4.0.0"
4897+
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
4898+
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
4899+
48654900
has-symbols@^1.0.0, has-symbols@^1.0.1:
48664901
version "1.0.1"
48674902
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
@@ -5114,22 +5149,20 @@ humanize-url@^1.0.0:
51145149
normalize-url "^1.0.0"
51155150
strip-url-auth "^1.0.0"
51165151

5117-
husky@3.1.0:
5118-
version "3.1.0"
5119-
resolved "https://registry.yarnpkg.com/husky/-/husky-3.1.0.tgz#5faad520ab860582ed94f0c1a77f0f04c90b57c0"
5120-
integrity sha512-FJkPoHHB+6s4a+jwPqBudBDvYZsoQW5/HBuMSehC8qDiCe50kpcxeqFoDSlow+9I6wg47YxBoT3WxaURlrDIIQ==
5152+
husky@4.0.0:
5153+
version "4.0.0"
5154+
resolved "https://registry.yarnpkg.com/husky/-/husky-4.0.0.tgz#654a72ecd7d59565de5360365a7d78a7bbb05286"
5155+
integrity sha512-h9kcWWpZgpGLrhlaBBtbMtA9Tsqu0yrfKSCU9ax6vulTvMSvVWEmFOsBehiLD38vJZVeFyrif5AcpcoiM0LJmw==
51215156
dependencies:
5122-
chalk "^2.4.2"
5157+
chalk "^3.0.0"
51235158
ci-info "^2.0.0"
5124-
cosmiconfig "^5.2.1"
5125-
execa "^1.0.0"
5159+
cosmiconfig "^6.0.0"
51265160
get-stdin "^7.0.0"
51275161
opencollective-postinstall "^2.0.2"
51285162
pkg-dir "^4.2.0"
51295163
please-upgrade-node "^3.2.0"
5130-
read-pkg "^5.2.0"
5131-
run-node "^1.0.0"
51325164
slash "^3.0.0"
5165+
which-pm-runs "^1.0.0"
51335166

51345167
[email protected], iconv-lite@^0.4.24, iconv-lite@~0.4.13:
51355168
version "0.4.24"
@@ -7010,7 +7043,7 @@ node-releases@^1.1.29, node-releases@^1.1.42:
70107043
dependencies:
70117044
semver "^6.3.0"
70127045

7013-
normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
7046+
normalize-package-data@^2.3.2:
70147047
version "2.5.0"
70157048
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
70167049
integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -9235,16 +9268,6 @@ read-pkg@^3.0.0:
92359268
normalize-package-data "^2.3.2"
92369269
path-type "^3.0.0"
92379270

9238-
read-pkg@^5.2.0:
9239-
version "5.2.0"
9240-
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
9241-
integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
9242-
dependencies:
9243-
"@types/normalize-package-data" "^2.4.0"
9244-
normalize-package-data "^2.5.0"
9245-
parse-json "^5.0.0"
9246-
type-fest "^0.6.0"
9247-
92489271
"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
92499272
version "2.3.6"
92509273
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
@@ -9550,7 +9573,7 @@ [email protected]:
95509573
dependencies:
95519574
glob "^7.1.3"
95529575

9553-
rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
9576+
rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
95549577
version "2.7.1"
95559578
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
95569579
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -9585,11 +9608,6 @@ run-async@^2.2.0:
95859608
dependencies:
95869609
is-promise "^2.1.0"
95879610

9588-
run-node@^1.0.0:
9589-
version "1.0.0"
9590-
resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
9591-
integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==
9592-
95939611
run-queue@^1.0.0, run-queue@^1.0.3:
95949612
version "1.0.3"
95959613
resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -10388,6 +10406,13 @@ supports-color@^6.1.0:
1038810406
dependencies:
1038910407
has-flag "^3.0.0"
1039010408

10409+
supports-color@^7.1.0:
10410+
version "7.1.0"
10411+
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
10412+
integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
10413+
dependencies:
10414+
has-flag "^4.0.0"
10415+
1039110416
svg-parser@^2.0.0:
1039210417
version "2.0.2"
1039310418
resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.2.tgz#d134cc396fa2681dc64f518330784e98bd801ec8"
@@ -10672,11 +10697,6 @@ type-check@~0.3.2:
1067210697
dependencies:
1067310698
prelude-ls "~1.1.2"
1067410699

10675-
type-fest@^0.6.0:
10676-
version "0.6.0"
10677-
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
10678-
integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
10679-
1068010700
type-is@~1.6.17, type-is@~1.6.18:
1068110701
version "1.6.18"
1068210702
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -11129,6 +11149,11 @@ which-module@^2.0.0:
1112911149
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
1113011150
integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
1113111151

11152+
which-pm-runs@^1.0.0:
11153+
version "1.0.0"
11154+
resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
11155+
integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
11156+
1113211157
which@^1.2.9, which@^1.3.0, which@^1.3.1:
1113311158
version "1.3.1"
1113411159
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"

0 commit comments

Comments
 (0)