Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*~
node_modules
browser-bundle.js
browser-bundle.js
.divshot-cache
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# how to use

* `npm install`
* `npm run build`
* `npm start`
File renamed without changes.
5 changes: 5 additions & 0 deletions divshot.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "react-webpack-template",
"root": "./dist",
"clean_urls": true
}
4 changes: 0 additions & 4 deletions index.js

This file was deleted.

34 changes: 29 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,41 @@
"description": "",
"main": "index.js",
"scripts": {
"start": "webpack --progress --colors --watch",
"test": "echo \"Error: no test specified\" && exit 1"
"start": "http-server dist/",
"build": "webpack --progress --colors --watch",
"test": "jest"
},
"jest": {
"scriptPreprocessor": "<rootDir>/tests/preprocessor.js",
"unmockedModulePathPatterns": [
"<rootDir>/node_modules/react"
],
"moduleFileExtensions": [
"js",
"json",
"jsx"
],
"testFileExtensions": [
"js"
],
"testDirectoryName": "tests",
"testPathDirs": [
"<rootDir>/tests/unit",
"<rootDir>/tests/components"
]
},
"author": "",
"license": "BSD-2-Clause",
"dependencies": {
"envify": "^1.2.0",
"react": "^0.12.1"
"react": "^0.13.0-beta.1"
},
"devDependencies": {
"webpack": "^1.4.13",
"jsx-loader": "^0.12.2"
"html-webpack-plugin": "^1.1.0",
"http-server": "^0.7.4",
"jest-cli": "^0.2.2",
"jsx-loader": "^0.12.2",
"react-tools": "^0.12.2",
"webpack": "^1.4.13"
}
}
9 changes: 9 additions & 0 deletions src/HelloMessage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
var React = require('react');

class HelloMessage extends React.Component {
render() {
return <div>Hello React</div>;
}
}

module.exports = HelloMessage;
5 changes: 5 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/** @jsx React.DOM */
var React = require('react');
var HelloMessage = require('./HelloMessage');

React.render(<HelloMessage />, document.body);
4 changes: 4 additions & 0 deletions src/sum.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
function sum(value1, value2) {
return value1 + value2;
}
module.exports = sum;
18 changes: 18 additions & 0 deletions tests/components/HelloMessage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
var componentPath = '../../src/HelloMessage';
jest.dontMock(componentPath);

describe('HelloMessage', function() {
it('greets react', function() {
var React = require('react/addons');
var HelloMessage = require(componentPath);
var TestUtils = React.addons.TestUtils;

var message = TestUtils.renderIntoDocument(
<HelloMessage />
);

var div = TestUtils.findRenderedDOMComponentWithTag(
message, 'div');
expect(div.getDOMNode().textContent).toEqual('Hello React');
});
});
6 changes: 6 additions & 0 deletions tests/preprocessor.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
var ReactTools = require('react-tools');
module.exports = {
process: function(src) {
return ReactTools.transform(src, {harmony: true});
}
};
9 changes: 9 additions & 0 deletions tests/unit/sum.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
var sumPath = '../../src/sum';
jest.dontMock(sumPath);

describe('sum', function() {
it('adds 1 + 2 to equal 3', function() {
var sum = require(sumPath);
expect(sum(1, 2)).toBe(3);
});
});
8 changes: 5 additions & 3 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
var HtmlWebpackPlugin = require('html-webpack-plugin');

module.exports = {
cache: true,
entry: './index',
entry: './src/index',
output: {
filename: 'browser-bundle.js'
filename: './dist/browser-bundle.js'
},
module: {
loaders: [
{test: /\.js$/, loader: 'jsx-loader'}
{test: /\.js$/, loader: 'jsx-loader?harmony'}
]
}
};