Skip to content

Commit 98ee978

Browse files
mtscout6mtscout6
committed
[changed] Source to ES6 using Babel and Webpack
A lot has happened since this projects inception and newer tools are available that can facilitate a better development environment. This work gives the project structure a facelift to meet the current trends of the broader React community. - Source cleanup - Rename all js files to *.js - Use [Babel](http://babeljs.io/) for our es6 -> es5 transpilation - Update all js to es6 standards - src - test - docs - doc examples - ie8 visual test - [ESLint](http://eslint.org/) all .js files - Build - Use [Webpack](http://webpack.github.io/) - This should provide more control on how we build our pre-concatenated and minified releases. - Drop Grunt, use npm scripts and shell scripts where needed. - Promise based release process (faster) - Update README to explain how to run. - Test - Single karma config file - Not dependent on building src to disk to run, use [karma-webpack](https://github.com/webpack/karma-webpack) which will build the src in memory. - Better test watcher that re-runs tests when changing src files. Current watcher only runs if test files change. - Fail on linting errors - Pull `es5-shim` from npm - Docs - Pull `bootstrap` from npm - Pull `codemirror` from npm - Use in browser Babel transformer for doc examples - Consolidate package.json deps and scripts to repo root. Leads to less confusion on how to run the docs locally. - Update README for local setup.
1 parent 7527953 commit 98ee978

File tree

282 files changed

+4527
-27536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

282 files changed

+4527
-27536
lines changed

‎.editorconfig‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
11+
[*.js]
12+
charset = utf-8
13+
indent_style = space
14+
indent_size = 2
15+
16+
[{package.json,.travis.yml}]
17+
indent_style = space
18+
indent_size = 2

‎.eslintrc‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"env": {
3+
"browser": true,
4+
"node": true
5+
},
6+
"ecmaFeatures": {
7+
"jsx": true
8+
},
9+
"parser": "babel-eslint",
10+
"plugins": [
11+
"react"
12+
],
13+
"rules": {
14+
"comma-spacing": 1,
15+
"key-spacing": 0,
16+
"no-underscore-dangle": 0,
17+
"no-unused-vars": [1, { "vars": "all", "args": "none" }],
18+
"no-undef": 1,
19+
"no-var": 2,
20+
"quotes": [1, "single", "avoid-escape"],
21+
"react/display-name": 0,
22+
"react/jsx-uses-react": 1,
23+
"react/no-did-mount-set-state": 1,
24+
"react/no-did-update-set-state": 1,
25+
"react/no-multi-comp": 1,
26+
"react/prop-types": 1,
27+
"react/react-in-jsx-scope": 1,
28+
"react/self-closing-comp": 1,
29+
"react/wrap-multilines": 1,
30+
"strict": 0
31+
}
32+
}

‎.gitignore‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
*~
2-
node_modules
32
.DS_Store
43
npm-debug.log
5-
test_bundle.js
6-
test-built/*
7-
.idea
8-
transpiled/*
9-
docs/*.html
10-
docs/assets/bundle.js
11-
cjs/*
12-
amd/*
4+
node_modules
5+
amd/
6+
!tools/amd/
7+
lib/
8+
!tools/lib/
9+
dist/
10+
!tools/dist/
11+
docs-built/
1312
ie8/bundle.js
14-
lib/*
1513
tmp-bower-repo/
1614
tmp-docs-repo/

‎.jshintrc‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎.npmignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
node_modules/
22
docs/
3+
docs-built/
34
test-built/
45
test/
56
tools/
67
.gitignore
78
.travis.yml
8-
Gruntfile.js
9-
karma.ci.js
10-
karma.dev.js
11-
test_bundle.js
9+
karma.conf.js
10+
tmp-docs-repo/
11+
tmp-bower-repo/

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ sudo: false
22
language: node_js
33
node_js:
44
- "0.10"
5+
- "0.12"
6+
- "iojs"

‎CONTRIBUTING.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,27 @@
33
We welcome community support with both pull requests and reporting bugs. Please
44
don't hesitate to jump in.
55

6+
## Current Issues
7+
8+
Feel free to tackle any currently open
9+
[issue](https://github.com/react-bootstrap/react-bootstrap/issues). The issues
10+
tagged with "help wanted" are especially open.
11+
612
## Tests
713

814
All commits that fix bugs or add features need a test.
915

16+
## Code Style
17+
18+
Please adhere to the current code styling. We have included an `.editorconfig`
19+
at the repo's root to facilitate uniformity regardless of your editor. See the
20+
[editor config site](http://editorconfig.org/) for integration details.
21+
22+
We use [ESLint](http://eslint.org/) for all JavaScript Linting. There should be
23+
no linting errors and no new warnings for new work. You are welcome to configure
24+
your editor to use ESLint or the `npm test` command will run unit tests and the
25+
linter.
26+
1027
## Commit Subjects for Public API Changes
1128

1229
If your patch **changes the API or fixes a bug** please use one of the following

‎Gruntfile.js‎

Lines changed: 0 additions & 217 deletions
This file was deleted.

‎README.md‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
[Bootstrap 3](http://getbootstrap.com) components built with [React](http://facebook.github.io/react/)
44

5-
[![Build Status](https://travis-ci.org/react-bootstrap/react-bootstrap.svg?branch=master)](https://travis-ci.org/react-bootstrap/react-bootstrap) [![NPM version](https://badge.fury.io/js/react-bootstrap.svg)](http://badge.fury.io/js/react-bootstrap) [![Bower version](https://badge.fury.io/bo/react-bootstrap.svg)](http://badge.fury.io/bo/react-bootstrap) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/react-bootstrap/react-bootstrap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
5+
[![Build Status](https://travis-ci.org/react-bootstrap/react-bootstrap.svg)](https://travis-ci.org/react-bootstrap/react-bootstrap) [![NPM version](https://badge.fury.io/js/react-bootstrap.svg)](http://badge.fury.io/js/react-bootstrap) [![Bower version](https://badge.fury.io/bo/react-bootstrap.svg)](http://badge.fury.io/bo/react-bootstrap) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/react-bootstrap/react-bootstrap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
66

77
Under active development - APIs will change.
88

99
## Docs
1010

11-
A [docs site](http://react-bootstrap.github.io) with live editable examples is a work in progress
11+
See the [documentation](http://react-bootstrap.github.io) with live editable examples.
1212

1313
### Bootstrap Version
1414

@@ -25,10 +25,15 @@ and many [contributors](https://github.com/react-bootstrap/react-bootstrap/graph
2525

2626
- [react-router-bootstrap](https://github.com/mtscout6/react-router-bootstrap) - Integration with [react-router](https://github.com/rackt/react-router).
2727

28-
## Contributions
28+
## Local Setup
29+
30+
- Install the dependencies with `npm install`
31+
- Run tests `npm test`
32+
- Run tests in watch mode `npm run test-watch`
33+
- Run the docs site in development mode with `npm run docs`. This will watch
34+
for file changes as you work. Simply refresh the page to see the updates.
35+
- Build with `npm run build`
2936

30-
Yes please!
37+
## Contributions
3138

32-
- Run `npm install`, `npm run test-watch` to run tests while you develop (however this hides any build errors, you can see these with `grunt build`)
33-
- Review the [contributing guidelines](https://github.com/react-bootstrap/react-bootstrap/blob/master/CONTRIBUTING.md)
34-
- See [issues](https://github.com/stevoland/react-bootstrap/issues) for some ideas
39+
Yes please! See the [contributing guidelines](https://github.com/react-bootstrap/react-bootstrap/blob/master/CONTRIBUTING.md) for details.

0 commit comments

Comments
 (0)