-
Notifications
You must be signed in to change notification settings - Fork 2.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement React [email protected] #393
Merged
coryhouse
merged 58 commits into
coryhouse:master
from
TobiahRex:[email protected]/tobiahrex
Sep 3, 2017
Merged
Changes from 5 commits
Commits
Show all changes
58 commits
Select commit
Hold shift + click to select a range
19046a0
removed react-router form package.json & installed react-router-dom.
TobiahRex 24d5343
completed index.src refactor.
TobiahRex 441faac
re-implemented App.js
TobiahRex 5c3c6c2
added notes to import changes & App.js
TobiahRex d3e51e2
modified middleware array @ store/configureStore.js
TobiahRex c75ff80
updated yarn.lock file with fresh `yarn` command.
TobiahRex ce00c61
updated master branch.
TobiahRex b761625
1) updated PR from re-based master. 2) Updated yarn.lock
TobiahRex 8fa5ca5
upgraded react-hot-reloader to @3.0.0-beta.6
TobiahRex 558727d
removed extra "document.getElementById(app) from Root.js
TobiahRex 164b862
moved react-router-redux to regular "dependencies" from "dev-dependen…
TobiahRex 694ddac
cleaned Root.propTypes.
TobiahRex 3e2cfc5
cleaned Root.js & App.js per @oshalygin feedback.
TobiahRex 5667b09
replaced .gitignore comment.
TobiahRex 180e669
removed react-router form package.json & installed react-router-dom.
TobiahRex 2e5ce1d
completed index.src refactor.
TobiahRex 33e87de
re-implemented App.js
TobiahRex a194252
added notes to import changes & App.js
TobiahRex a1b920e
Update FAQ.md
kwelch c91dea4
Update README.md
kwelch b8fa9ad
modified middleware array @ store/configureStore.js
TobiahRex 82f1ee4
Add react hot loader 3 (#392)
oshalygin 70c1d9c
Updated react-hot-loader to correct package version. (#401)
danielcampo 578176d
Add item to check if issues
coryhouse aa1fb15
updated yarn.lock file with fresh `yarn` command.
TobiahRex 707e12a
Fix formatting (#403)
kfrn a2b6bca
updated master branch.
TobiahRex 2e2d60d
upgraded react-hot-reloader to @3.0.0-beta.6
TobiahRex 407144e
removed extra "document.getElementById(app) from Root.js
TobiahRex 3f56197
moved react-router-redux to regular "dependencies" from "dev-dependen…
TobiahRex a5ef8d2
cleaned Root.js & App.js per @oshalygin feedback.
TobiahRex c6609c0
replaced .gitignore comment.
TobiahRex 1e72aaa
rebased master. Remove "PropTypes" import from "react" to "prop-types…
TobiahRex 3fc6175
clean index.js
TobiahRex ab0e2a3
rebasing from upstream master.
TobiahRex 408632f
Merge branch 'master' into [email protected]/tobiahrex
TobiahRex 46b7d26
Add CONTRIBUTE.md (#431)
coryhouse 27169b3
Upgrade to webpack 3
egdelwonk c35174f
Update yarn lock
coryhouse f651fc5
Update snapshot
coryhouse 057033a
Merge branch 'egdelwonk-webpack3'
coryhouse bd13289
Set prod env when analyzing bundle
coryhouse a5cf0e0
Add jest-cli as dependency
coryhouse 26387b8
Revert PR #450 (#451)
8ad2d6e
Issue #449 fix (#450)
57a54e7
Enhance babel env config to transpile for IE9+ (#452)
coryhouse e0a8524
Fix for jest handling of static assets when running tests. See: (#457)
raythree 8d68161
Added tips for npm run lint and build errors (#151) (#460)
romarioraffington e7c9c3f
pushing changes from upstream fetch.
TobiahRex 95e6c48
Merge branch 'master' into [email protected]/tobiahrex
TobiahRex e665193
updated from rebase.
TobiahRex c155977
Merge branch 'master' into [email protected]/tobiahrex
TobiahRex d94c0ee
modified package versions in package.json & created new build.
TobiahRex fb0902d
update package.json
TobiahRex d116756
fixed conflicts with upstream master.
TobiahRex 251fba8
updated conflicts.
TobiahRex 3efc625
cleaned up PropTypes validations - react-router-redux throwing PropTy…
TobiahRex 975fe9e
comment spell check & de-console on Root.js
TobiahRex File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
import React, { Component } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import { ConnectedRouter } from 'react-router-redux'; | ||
console.log('%cConnectedRouter', 'background:red;', ConnectedRouter); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like a console.log slipped in |
||
import { Provider } from 'react-redux'; | ||
import App from './App'; | ||
|
||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just want to ask this again before we move forward...
Are we sure we want to keep this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cc: @coryhouse
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I vote for dropping it. Easy to add if desired, and avoids an alpha dep