Skip to content

Commit

Permalink
demo upgrade to react 16 (#21)
Browse files Browse the repository at this point in the history
* inital commit

* upgrade to react 16
  • Loading branch information
bluebill1049 authored Oct 29, 2017
1 parent 92dacb7 commit 77dbc01
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 32 deletions.
8 changes: 4 additions & 4 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"dependencies": {
"material-ui": "^1.0.0-beta.4",
"material-ui-icons": "^1.0.0-beta.15",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-highlight": "^0.10.0",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-scripts": "^1.0.11",
"react-simple-animate": "1.7.0"
"react-simple-animate": "^1.7.1",
"react-syntax-highlight": "^15.3.1"
},
"scripts": {
"start": "react-scripts start",
Expand Down
4 changes: 2 additions & 2 deletions example/src/DemoCode.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Animate from 'react-simple-animate';
import Highlight from 'react-highlight';
import Highlight from 'react-syntax-highlight';
import React from 'react';
import './DemoCode.css';

Expand Down Expand Up @@ -47,7 +47,7 @@ export default function DemoCode({
easeType="cubic-bezier(0, 0, 0.24, 0.93)"
forceUpdate
>
<Highlight>{code.replace(/(^[ \t]*\n)/gm, '')}</Highlight>
<Highlight lang="html" value={code.replace(/(^[ \t]*\n)/gm, '')} />
</Animate>
</section>
);
Expand Down
57 changes: 31 additions & 26 deletions example/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2475,7 +2475,7 @@ fb-watchman@^2.0.0:
dependencies:
bser "^2.0.0"

fbjs@^0.8.1, fbjs@^0.8.16:
fbjs@^0.8.1, fbjs@^0.8.16, fbjs@^0.8.9:
version "0.8.16"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
dependencies:
Expand All @@ -2487,18 +2487,6 @@ fbjs@^0.8.1, fbjs@^0.8.16:
setimmediate "^1.0.5"
ua-parser-js "^0.7.9"

fbjs@^0.8.9:
version "0.8.14"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.14.tgz#d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c"
dependencies:
core-js "^1.0.0"
isomorphic-fetch "^2.1.1"
loose-envify "^1.0.0"
object-assign "^4.1.0"
promise "^7.1.1"
setimmediate "^1.0.5"
ua-parser-js "^0.7.9"

figures@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
Expand Down Expand Up @@ -2903,7 +2891,7 @@ [email protected]:
version "1.1.1"
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"

highlight.js@^9.11.0:
highlight.js@^9.12.0:
version "9.12.0"
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"

Expand Down Expand Up @@ -5200,7 +5188,7 @@ react-dev-utils@^3.1.0:
strip-ansi "3.0.1"
text-table "0.2.0"

react-dom@^15.5.4, react-dom@^15.6.1:
react-dom@^15.6.1:
version "15.6.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.1.tgz#2cb0ed4191038e53c209eb3a79a23e2a4cf99470"
dependencies:
Expand All @@ -5209,6 +5197,15 @@ react-dom@^15.5.4, react-dom@^15.6.1:
object-assign "^4.1.0"
prop-types "^15.5.10"

react-dom@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0.tgz#9cc3079c3dcd70d4c6e01b84aab2a7e34c303f58"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"

react-error-overlay@^1.0.10:
version "1.0.10"
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-1.0.10.tgz#da8cd1eafac41afdca2a33792b23694ef6c528f1"
Expand All @@ -5233,14 +5230,6 @@ react-flow-types@^0.2.0-beta.2:
version "0.2.0-beta.2"
resolved "https://registry.yarnpkg.com/react-flow-types/-/react-flow-types-0.2.0-beta.2.tgz#4f9e07fa60230708d067612750f60c7a9ea42d81"

react-highlight@^0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/react-highlight/-/react-highlight-0.10.0.tgz#d386f9dceab867dc0dcc2364153fb1cc7645d046"
dependencies:
highlight.js "^9.11.0"
react "^15.5.4"
react-dom "^15.5.4"

react-jss@^7.2.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/react-jss/-/react-jss-7.2.0.tgz#30a5ed51d8388a33767c6d19790b222c1f33f48f"
Expand Down Expand Up @@ -5309,13 +5298,20 @@ react-scrollbar-size@^2.0.2:
prop-types "^15.5.10"
react-event-listener "^0.5.0"

[email protected].0-beta.12:
version "1.7.0-beta.12"
resolved "https://registry.yarnpkg.com/react-simple-animate/-/react-simple-animate-1.7.0-beta.12.tgz#aa0d8b0560c6a49591179d28d143d05a20cf8d42"
react-simple-animate@^1.7.1:
version "1.7.1"
resolved "https://registry.yarnpkg.com/react-simple-animate/-/react-simple-animate-1.7.1.tgz#3168972242f430b01d3b6febacf0c802f5d47661"
dependencies:
react "^15.6.1"
react-dom "^15.6.1"

react-syntax-highlight@^15.3.1:
version "15.3.1"
resolved "https://registry.yarnpkg.com/react-syntax-highlight/-/react-syntax-highlight-15.3.1.tgz#b44f6f77e2783e8f74c4b30b50d5a886cc35fc1f"
dependencies:
highlight.js "^9.12.0"
prop-types "^15.5.10"

react-transition-group@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.2.1.tgz#e9fb677b79e6455fd391b03823afe84849df4a10"
Expand All @@ -5337,6 +5333,15 @@ react@^15.5.4, react@^15.6.1:
object-assign "^4.1.0"
prop-types "^15.5.10"

react@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.0.0.tgz#ce7df8f1941b036f02b2cca9dbd0cb1f0e855e2d"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"

read-all-stream@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa"
Expand Down

0 comments on commit 77dbc01

Please sign in to comment.