Skip to content
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
merged 58 commits into from
Sep 3, 2017
Merged
Show file tree
Hide file tree
Changes from 57 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 Mar 16, 2017
24d5343
completed index.src refactor.
TobiahRex Mar 16, 2017
441faac
re-implemented App.js
TobiahRex Mar 16, 2017
5c3c6c2
added notes to import changes & App.js
TobiahRex Mar 16, 2017
d3e51e2
modified middleware array @ store/configureStore.js
TobiahRex Mar 22, 2017
c75ff80
updated yarn.lock file with fresh `yarn` command.
TobiahRex Apr 1, 2017
ce00c61
updated master branch.
TobiahRex Apr 2, 2017
b761625
1) updated PR from re-based master. 2) Updated yarn.lock
TobiahRex Apr 2, 2017
8fa5ca5
upgraded react-hot-reloader to @3.0.0-beta.6
TobiahRex Apr 2, 2017
558727d
removed extra "document.getElementById(app) from Root.js
TobiahRex Apr 3, 2017
164b862
moved react-router-redux to regular "dependencies" from "dev-dependen…
TobiahRex Apr 3, 2017
694ddac
cleaned Root.propTypes.
TobiahRex Apr 3, 2017
3e2cfc5
cleaned Root.js & App.js per @oshalygin feedback.
TobiahRex Apr 3, 2017
5667b09
replaced .gitignore comment.
TobiahRex Apr 3, 2017
180e669
removed react-router form package.json & installed react-router-dom.
TobiahRex Mar 16, 2017
2e5ce1d
completed index.src refactor.
TobiahRex Mar 16, 2017
33e87de
re-implemented App.js
TobiahRex Mar 16, 2017
a194252
added notes to import changes & App.js
TobiahRex Mar 16, 2017
a1b920e
Update FAQ.md
kwelch Mar 21, 2017
c91dea4
Update README.md
kwelch Mar 21, 2017
b8fa9ad
modified middleware array @ store/configureStore.js
TobiahRex Mar 22, 2017
82f1ee4
Add react hot loader 3 (#392)
oshalygin Mar 30, 2017
70c1d9c
Updated react-hot-loader to correct package version. (#401)
danielcampo Mar 30, 2017
578176d
Add item to check if issues
coryhouse Mar 30, 2017
aa1fb15
updated yarn.lock file with fresh `yarn` command.
TobiahRex Apr 1, 2017
707e12a
Fix formatting (#403)
kfrn Apr 1, 2017
a2b6bca
updated master branch.
TobiahRex Apr 2, 2017
2e2d60d
upgraded react-hot-reloader to @3.0.0-beta.6
TobiahRex Apr 2, 2017
407144e
removed extra "document.getElementById(app) from Root.js
TobiahRex Apr 3, 2017
3f56197
moved react-router-redux to regular "dependencies" from "dev-dependen…
TobiahRex Apr 3, 2017
a5ef8d2
cleaned Root.js & App.js per @oshalygin feedback.
TobiahRex Apr 3, 2017
c6609c0
replaced .gitignore comment.
TobiahRex Apr 3, 2017
1e72aaa
rebased master. Remove "PropTypes" import from "react" to "prop-types…
TobiahRex Jun 8, 2017
3fc6175
clean index.js
TobiahRex Jun 8, 2017
ab0e2a3
rebasing from upstream master.
TobiahRex Jun 8, 2017
408632f
Merge branch 'master' into [email protected]/tobiahrex
TobiahRex Jun 8, 2017
46b7d26
Add CONTRIBUTE.md (#431)
coryhouse Jul 2, 2017
27169b3
Upgrade to webpack 3
egdelwonk Jul 10, 2017
c35174f
Update yarn lock
coryhouse Jul 12, 2017
f651fc5
Update snapshot
coryhouse Jul 12, 2017
057033a
Merge branch 'egdelwonk-webpack3'
coryhouse Jul 12, 2017
bd13289
Set prod env when analyzing bundle
coryhouse Jul 17, 2017
a5cf0e0
Add jest-cli as dependency
coryhouse Jul 18, 2017
26387b8
Revert PR #450 (#451)
Jul 18, 2017
8ad2d6e
Issue #449 fix (#450)
Aug 7, 2017
57a54e7
Enhance babel env config to transpile for IE9+ (#452)
coryhouse Aug 7, 2017
e0a8524
Fix for jest handling of static assets when running tests. See: (#457)
raythree Aug 15, 2017
8d68161
Added tips for npm run lint and build errors (#151) (#460)
romarioraffington Aug 21, 2017
e7c9c3f
pushing changes from upstream fetch.
TobiahRex Aug 31, 2017
95e6c48
Merge branch 'master' into [email protected]/tobiahrex
TobiahRex Aug 31, 2017
e665193
updated from rebase.
TobiahRex Aug 31, 2017
c155977
Merge branch 'master' into [email protected]/tobiahrex
TobiahRex Aug 31, 2017
d94c0ee
modified package versions in package.json & created new build.
TobiahRex Aug 31, 2017
fb0902d
update package.json
TobiahRex Aug 31, 2017
d116756
fixed conflicts with upstream master.
TobiahRex Aug 31, 2017
251fba8
updated conflicts.
TobiahRex Aug 31, 2017
3efc625
cleaned up PropTypes validations - react-router-redux throwing PropTy…
TobiahRex Aug 31, 2017
975fe9e
comment spell check & de-console on Root.js
TobiahRex Sep 1, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added .watchmanconfig
Empty file.
38 changes: 38 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Contributing

## Quick Start
Fork this project, then:
```
npm install
npm start
```
Submit a pull request to the master branch to request merging your change.

## Branch Organization
All features should be worked out of a well named feature branch. Branch off the master branch. Submit a pull request to merge your work into the master branch when your work is ready for review.

## npm Scripts
This project uses npm scripts for automation

|Script|Description|
|------|-----------|
|start|Start local webserver to host the docs at localhost:3000|
|test|Run tests|

There are many other scripts in package.json, but these are the two you're most likely to run.

## Semantic Versioning
This project follows [semantic versioning](http://semver.org). We release patch versions for bugfixes, minor versions for new features, and major versions for any breaking changes.

## Proposing a Change
If you intend to change the public API, or make any non-trivial changes to the implementation, we recommend filing an issue. This lets us reach an agreement on your proposal before you put significant effort into it.

## Style Guide
ESLint will catch most styling issues that may exist in your code. You can check the status of your code styling by running npm start.

However, there are still some styles that the linter cannot pick up. If you are unsure about something, looking at [Airbnb's Style Guide](https://github.com/airbnb/javascript) will guide you in the right direction.

## Code Conventions
- Use semicolons ;
- 2 spaces for indentation (no tabs). Install the [Editorconfig](http://editorconfig.org) plugin for your editor to enforce this automatically.
- Prefer ' over "
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,17 @@ This will run the automated build process, start up a webserver, and open the ap
4. Make sure files with names that begin with a dot (.babelrc, .editorconfig, .eslintrc) are copied to the project directory root. This is easy to overlook if you copy this repository manually.
5. Don't run the project from a symbolic link. It may cause issues with file watches.
6. Delete any .eslintrc that you're storing in your user directory. Also, disable any ESLint plugin / custom rules that you've enabled within your editor. These will conflict with the ESLint rules defined in this project.
7. Make sure you don't have NODE_ENV set to production on your machine. If you do then the [development dependencies won't be installed](https://github.com/coryhouse/react-slingshot/issues/400#issuecomment-290497767). Here's [how to check](http://stackoverflow.com/a/27939821/26180).
7. Make sure you don't have NODE_ENV set to production on your machine. If you do then the [development dependencies won't be installed](https://github.com/coryhouse/react-slingshot/issues/400#issuecomment-290497767). Here's [how to check](http://stackoverflow.com/a/27939821/26180).
8. Tip: Things to check if you get an `npm run lint` error or build error:

* If ESW found an error or warning in your project (e.g. console statement or a missing semi-colon), the lint thread will exit with `Exit status 1`. To fix:

1. Change the `npm run lint` script to `"esw webpack.config.* src tools; exit 0"`
1. Change the `npm run lint:watch` script to `"esw webpack.config.* src tools --watch; exit 0"`

> Note: Adding `exit 0` will allow the npm scripts to ignore the status 1 and allow ESW to print all warnings and errors.

* Ensure the `eslint`/`esw` globally installed version matches the version used in the project. This will ensure the `esw` keyword is resolved.

## Technologies
Slingshot offers a rich development experience using the following technologies:
Expand Down
Loading