Skip to content
This repository has been archived by the owner on Sep 7, 2020. It is now read-only.

Commit

Permalink
Add support for react hooks
Browse files Browse the repository at this point in the history 
Closes #1275
  • Loading branch information
@MoOx
MoOx committed Mar 15, 2019
1 parent e9f9b26 commit cccee0e
Show file tree
Hide file tree
Showing 21 changed files with 64 additions and 50 deletions.
4 changes: 2 additions & 2 deletions examples/react-app-blog/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@phenomic/cli": "^1.0.0-beta.9",
"@phenomic/core": "^1.0.0-beta.9",
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-helmet": "^5.0.0",
"react-router": "^3.2.0",
"react-topbar-progress-indicator": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/react-app-getting-started/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@phenomic/cli": "^1.0.0-beta.9",
"@phenomic/core": "^1.0.0-beta.9",
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-helmet": "^5.0.0",
"react-router": "^3.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/react-app-markdown-with-custom-components/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@phenomic/cli": "^1.0.0-beta.9",
"@phenomic/core": "^1.0.0-beta.9",
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions examples/react-app-minimal-hello-world/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@phenomic/cli": "^1.0.0-beta.9",
"@phenomic/core": "^1.0.0-beta.9",
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions examples/react-app-styles-with-aphrodite/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"@phenomic/core": "^1.0.0-beta.9",
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"aphrodite": "^1.0.0",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions examples/react-app-styles-with-css-inlined-in-head/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@phenomic/cli": "^1.0.0-beta.9",
"@phenomic/core": "^1.0.0-beta.9",
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions examples/react-app-styles-with-css/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@phenomic/cli": "^1.0.0-beta.9",
"@phenomic/core": "^1.0.0-beta.9",
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions examples/react-app-styles-with-emotion/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"emotion": "^8.0.0",
"emotion-server": "^8.0.0",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-emotion": "^8.0.0",
"react-router": "^3.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/react-app-styles-with-glamor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"@phenomic/core": "^1.0.0-beta.9",
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"glamor": "^2.0.0",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions examples/react-app-styles-with-glamorous/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"glamor": "^2.0.0",
"glamorous": "^4.0.0",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions examples/react-app-styles-with-radium/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"@phenomic/core": "^1.0.0-beta.9",
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"radium": "^0.19.0",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions examples/react-app-styles-with-styled-components/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@phenomic/cli": "^1.0.0-beta.9",
"@phenomic/core": "^1.0.0-beta.9",
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0",
"styled-components": "^2.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/react-app-with-basename/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@phenomic/cli": "^1.0.0-beta.9",
"@phenomic/core": "^1.0.0-beta.9",
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions examples/react-native-web-app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"@phenomic/cli": "^1.0.0-beta.9",
"@phenomic/core": "^1.0.0-beta.9",
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"react": "^16.3.0",
"react": "^16.8.0",
"react-art": "^16.5.2",
"react-dom": "^16.3.0",
"react-dom": "^16.8.0",
"react-native-web": "^0.9.0",
"react-router": "^3.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/reason-react-app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"bs-platform": "^4.0.18",
"npm-run-all": "^4.0.2",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-helmet": "^5.2.0",
"react-router": "^3.2.0",
"reason-react": "^0.5.3"
Expand Down
6 changes: 6 additions & 0 deletions packages/plugin-bundler-webpack/src/WebpackServerConfigModifier.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ const defaultExternals = [
//
// @todo find a better way than a whitelist

// to support react hooks, we need to be sure that static rendering
// use only one react
// https://github.com/facebook/react/issues/13991
"react",
"react-dom",

/^apollo(\/.*)?/,
/^aphrodite(\/.*)?/,
/^emotion(\/.*)?/,
Expand Down
4 changes: 2 additions & 2 deletions packages/plugin-renderer-react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"devDependencies": {
"@phenomic/core": "^1.0.0-beta.9",
"jsx-test-helpers": "^3.0.0",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0"
}
}
8 changes: 4 additions & 4 deletions packages/preset-react-app/docs/getting-started/01.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ resources to generate your website/app.
"@phenomic/core": "^1.0.0-alpha.1",
"@phenomic/cli": "^1.0.0-alpha.1",
"@phenomic/preset-react-app": "^1.0.0-alpha.1",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0"
}
}
Expand Down Expand Up @@ -66,8 +66,8 @@ so, we are going to add a `phenomic` section in our `package.json`
"@phenomic/core": "^1.0.0-alpha.1",
"@phenomic/cli": "^1.0.0-alpha.1",
"@phenomic/preset-react-app": "^1.0.0-alpha.1",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0"
},
"phenomic": {
Expand Down
4 changes: 2 additions & 2 deletions packages/preset-react-app/docs/getting-started/02.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ Let's add this commands into some scripts of the `package.json`
"@phenomic/core": "^1.0.0-alpha.1",
"@phenomic/cli": "^1.0.0-alpha.1",
"@phenomic/preset-react-app": "^1.0.0-alpha.1",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-router": "^3.2.0"
},
"phenomic": {
Expand Down
4 changes: 2 additions & 2 deletions website/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"@phenomic/cli": "^1.0.0-beta.9",
"@phenomic/core": "^1.0.0-beta.9",
"@phenomic/preset-react-app": "^1.0.0-beta.9",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-ga": "^2.0.0",
"react-helmet": "^5.0.0",
"react-native-web": "^0.9.0",
Expand Down
28 changes: 18 additions & 10 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10288,15 +10288,15 @@ react-dev-utils@^4.2.1:
strip-ansi "3.0.1"
text-table "0.2.0"

"react-dom@>=15.0.0 || >=16.0.0", react-dom@^16.3.0:
version "16.5.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7"
integrity sha512-RC8LDw8feuZOHVgzEf7f+cxBr/DnKdqp56VU0lAs1f4UfKc4cU8wU4fTq/mgnvynLQo8OtlPC19NUFh/zjZPuA==
"react-dom@>=15.0.0 || >=16.0.0", react-dom@^16.8.0:
version "16.8.4"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.4.tgz#1061a8e01a2b3b0c8160037441c3bf00a0e3bc48"
integrity sha512-Ob2wK7XG2tUDt7ps7LtLzGYYB6DXMCLj0G5fO6WeEICtT4/HdpOi7W/xLzZnR6RCG1tYza60nMdqtxzA8FaPJQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
schedule "^0.5.0"
scheduler "^0.13.4"

react-element-to-jsx-string@^12.0.0:
version "12.0.0"
Expand Down Expand Up @@ -10411,15 +10411,15 @@ react-topbar-progress-indicator@^2.0.0:
dependencies:
topbar "^0.1.3"

"react@>=15.0.0 || >=16.0.0", "react@^15.6.2 || ^16.0", react@^16.3.0:
version "16.5.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42"
integrity sha512-FDCSVd3DjVTmbEAjUNX6FgfAmQ+ypJfHUsqUJOYNCBUp1h8lqmtC+0mXJ+JjsWx4KAVTkk1vKd1hLQPvEviSuw==
"react@>=15.0.0 || >=16.0.0", "react@^15.6.2 || ^16.0", react@^16.8.0:
version "16.8.4"
resolved "https://registry.yarnpkg.com/react/-/react-16.8.4.tgz#fdf7bd9ae53f03a9c4cd1a371432c206be1c4768"
integrity sha512-0GQ6gFXfUH7aZcjGVymlPOASTuSjlQL4ZtVC5YKH+3JL6bBLCVO21DknzmaPlI90LN253ojj02nsapy+j7wIjg==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
schedule "^0.5.0"
scheduler "^0.13.4"

read-all-stream@^3.0.0:
version "3.1.0"
Expand Down Expand Up @@ -11162,6 +11162,14 @@ schedule@^0.5.0:
dependencies:
object-assign "^4.1.1"

scheduler@^0.13.4:
version "0.13.4"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.4.tgz#8fef05e7a3580c76c0364d2df5e550e4c9140298"
integrity sha512-cvSOlRPxOHs5dAhP9yiS/6IDmVAVxmk33f0CtTJRkmUWcb1Us+t7b1wqdzoC0REw2muC9V5f1L/w5R5uKGaepA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"

schema-utils@^0.4.4:
version "0.4.7"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
Expand Down

0 comments on commit cccee0e

Please sign in to comment.