Skip to content

React 0.13 / Babel #7

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
May 12, 2015
Merged

React 0.13 / Babel #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8aca38
[add] *.map and node_modules to .gitignore
solomonhawk Mar 11, 2015
abaf8fd
[update] package.json dependencies
solomonhawk Mar 11, 2015
6139627
[update] dist
solomonhawk Mar 11, 2015
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
*.map

example/example.build.js
example/example.build.js.map

node_modules
2 changes: 1 addition & 1 deletion dist/ink.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 11 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"material design"
],
"jest": {
"scriptPreprocessor": "<rootDir>/node_modules/6to5-jest",
"scriptPreprocessor": "<rootDir>/node_modules/babel-jest",
"unmockedModulePathPatterns": [
"<rootDir>/node_modules/react"
],
Expand All @@ -28,19 +28,18 @@
"author": "Nate Hunzaker",
"license": "MIT",
"devDependencies": {
"6to5": "^3.1.1",
"6to5-jest": "^3.0.0",
"6to5-loader": "^3.0.0",
"6to5-runtime": "^3.1.1",
"envify": "^3.2.0",
"jest-cli": "^0.1.18",
"react": "^0.12.2",
"react-tools": "^0.12.2",
"babel-core": "^4.7.8",
"babel-jest": "^4.0.0",
"babel-loader": "^4.1.0",
"envify": "^3.3.0",
"jest-cli": "^0.4.0",
"react": "^0.13.0",
"react-tools": "^0.13.0",
"transform-loader": "^0.2.1",
"webpack": "^1.4.13",
"webpack-dev-server": "^1.6.6"
"webpack": "^1.7.2",
"webpack-dev-server": "^1.7.0"
},
"peerDependencies": {
"react": ">= 0.12.x"
"react": ">= 0.13.x"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should still be 0.12.x. We don't specifically rely on any 0.13 feature

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@solomonhawk I will merge if you lower this back down to 0.12.0

}
}
7 changes: 4 additions & 3 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@ module.exports = {
module: {
preLoaders: [
{
test : /\.jsx*$/,
loader : 'transform?envify'
test : /\.jsx*$/,
loader : 'transform?envify'
}
],

loaders: [
{
test : /\.jsx*$/,
exclude : /node_modules/,
loader : '6to5?experimental'
loader : 'babel-loader?experimental'
},
{
test : /\.json$/,
Expand Down
2 changes: 1 addition & 1 deletion webpack.example.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = {
{
test : /\.jsx*$/,
exclude : /node_modules/,
loader : '6to5?experimental'
loader : 'babel-loader?experimental'
},
{
test : /\.json$/,
Expand Down