Skip to content

Commit

Permalink
Migrate to React 16 (#655)
Browse files Browse the repository at this point in the history
* migrating to react 16

* Add WarriorJS to Docusaurus users (#656)

* Separate users data from code

* Add WarriorJS to Docusaurus users

* [Feature] Introducing image compression using imagemin (#654)

* Introduce imagemin for compressing images

* Replace original images with the optimized ones

* Add imagemin-svgo to dependencies

* Remove console statement, replace let with const

* Replace let with const

* Add --skip-image-compression

* Run Prettier

* Fix header

* Prettier
  • Loading branch information
gedeagas authored and yangshun committed May 10, 2018
1 parent ab6bab9 commit 25cf8bb
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 35 deletions.
5 changes: 1 addition & 4 deletions lib/core/Head.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,7 @@ class Head extends React.Component {
)}
{this.props.config.noIndex && <meta name="robots" content="noindex" />}
{this.props.redirect && (
<meta
http-equiv="refresh"
content={'0; URL=' + this.props.redirect}
/>
<meta httpEquiv="refresh" content={'0; URL=' + this.props.redirect} />
)}
<link
rel="shortcut icon"
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@
"imagemin-svgo": "^6.0.0",
"markdown-toc": "^1.2.0",
"mkdirp": "^0.5.1",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"react-dom-factories": "^1.0.1",
"react": "^16.3.2",
"react-dom": "^16.3.2",
"remarkable": "^1.7.1",
"request": "^2.81.0",
"shelljs": "^0.7.8",
Expand Down
3 changes: 2 additions & 1 deletion website/core/Footer.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const PropTypes = require('prop-types');
/**
* Copyright (c) 2017-present, Facebook, Inc.
*
Expand All @@ -22,7 +23,7 @@ const GitHubButton = props => (
);

GitHubButton.propTypes = {
config: React.PropTypes.object
config: PropTypes.object
};

class Footer extends React.Component {
Expand Down
41 changes: 14 additions & 27 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1412,14 +1412,6 @@ create-error-class@^3.0.1:
dependencies:
capture-stack-trace "^1.0.0"

create-react-class@^15.6.0:
version "15.6.3"
resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
dependencies:
fbjs "^0.8.9"
loose-envify "^1.3.1"
object-assign "^4.1.1"

cross-spawn@^5.0.1:
version "5.1.0"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
Expand Down Expand Up @@ -2085,7 +2077,7 @@ fb-watchman@^2.0.0:
dependencies:
bser "^2.0.0"

fbjs@^0.8.16, fbjs@^0.8.9:
fbjs@^0.8.16:
version "0.8.16"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
dependencies:
Expand Down Expand Up @@ -4612,7 +4604,7 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"

prop-types@^15.5.10:
prop-types@^15.6.0:
version "15.6.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
dependencies:
Expand Down Expand Up @@ -4691,28 +4683,23 @@ rc@^1.1.2, rc@^1.1.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

react-dom-factories@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/react-dom-factories/-/react-dom-factories-1.0.2.tgz#eb7705c4db36fb501b3aa38ff759616aa0ff96e0"

react-dom@^15.5.4:
version "15.6.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
react-dom@^16.3.2:
version "16.3.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df"
dependencies:
fbjs "^0.8.9"
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "^15.5.10"
object-assign "^4.1.1"
prop-types "^15.6.0"

react@^15.5.4:
version "15.6.2"
resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
react@^16.3.2:
version "16.3.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9"
dependencies:
create-react-class "^15.6.0"
fbjs "^0.8.9"
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "^15.5.10"
object-assign "^4.1.1"
prop-types "^15.6.0"

read-all-stream@^3.0.0:
version "3.1.0"
Expand Down

0 comments on commit 25cf8bb

Please sign in to comment.