Compare commits

..

8 Commits

Author SHA1 Message Date
Chris 00414460b2 0.2.2 2015-10-19 10:46:21 +02:00
Chris f1eb6504e0 Added current version of webpack-dev-server to dependencies list 2015-10-19 10:46:10 +02:00
Chris 515969e6be 0.2.1 2015-10-16 07:58:19 +02:00
Chris 05a06a819a Added jsx-uses-react flag in eslint to prevent false positives about react included but not used in components. 2015-10-16 07:57:39 +02:00
Chris 2188e5cd0b 0.2.0 2015-10-12 07:57:52 +02:00
Chris 4e4993e5b5 Added compatibility for react 0.14 2015-10-12 07:57:40 +02:00
Chris 5d46050bbb Added travis badge 2015-10-07 08:48:47 +02:00
Chris b40367218f Added travis support 2015-10-07 08:46:27 +02:00
9 changed files with 31 additions and 10 deletions
+2 -1
View File
@@ -23,6 +23,7 @@
"no-unused-vars": 1,
"no-trailing-spaces": [1, { "skipBlankLines": true }],
"no-unreachable": 1,
"no-alert": 0
"no-alert": 0,
"react/jsx-uses-react": 1
}
}
+6
View File
@@ -0,0 +1,6 @@
language: node_js
node_js:
- '4.1.0'
before_install:
- currentfolder=${PWD##*/}
- if [ "$currentfolder" != 'react-webpack-template' ]; then cd .. && eval "mv $currentfolder react-webpack-template" && cd react-webpack-template; fi
+9
View File
@@ -0,0 +1,9 @@
# react-webpack-template - Changelog
## 0.2.0:
___Upgrades:___
1. Updated React from 0.13 to 0.14 (using ```^0.14```) as version string. This included minor code changes for components (now use the splitted "React"-Package) and the runner (Using React-DOM).
2. Updated the shallow renderer for unit tests.
___Backwards incompatible changes:___
1. Default unit tests do not need to traverse down to `Component._store.props`, but directly to `Component.props`. Please keep this in mind when using properties in your tests.
+3 -1
View File
@@ -1,7 +1,9 @@
# Welcome to react-webpack-template
This repository holds a base template for the new version of generator-react-webpack.
> This repository holds a base template for the new version of generator-react-webpack.
It can be understood as the prototype for newly generated projects.
[![Build Status](https://travis-ci.org/weblogixx/react-webpack-template.svg)](https://travis-ci.org/weblogixx/react-webpack-template)
## Features
The following features are planned to be included in the final version:
+5 -3
View File
@@ -1,6 +1,6 @@
{
"name": "react-webpack-template",
"version": "0.1.0",
"version": "0.2.2",
"description": "A base skeleton template for react and webpack without task runners",
"main": "server.js",
"scripts": {
@@ -62,11 +62,13 @@
"style-loader": "^0.12.3",
"url-loader": "^0.5.6",
"webpack": "^1.12.0",
"webpack-dev-server": "^1.10.1"
"webpack-dev-server": "^1.12.0"
},
"dependencies": {
"lodash": "^3.10.1",
"normalize.css": "^3.0.3",
"react": "^0.13.3"
"react": "^0.14.0",
"react-addons-test-utils": "^0.14.0",
"react-dom": "^0.14.0"
}
}
+1 -1
View File
@@ -1,7 +1,7 @@
require('normalize.css');
require('styles/App.css');
import React from 'react/addons';
import React from 'react';
let yeomanImage = require('../images/yeoman.png');
+2 -1
View File
@@ -1,5 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from './Main';
// Render the main component into the dom
React.render(<App />, document.getElementById('app'));
ReactDOM.render(<App />, document.getElementById('app'));
+1 -1
View File
@@ -18,6 +18,6 @@ describe('MainComponent', () => {
});
it('should have its component name as default className', () => {
expect(MainComponent._store.props.className).to.equal('index');
expect(MainComponent.props.className).to.equal('index');
});
});
+2 -2
View File
@@ -5,8 +5,8 @@
* @see http://simonsmith.io/unit-testing-react-components-without-a-dom/
* @author somonsmith
*/
import React from 'react/addons';
const TestUtils = React.addons.TestUtils;
import React from 'react';
import TestUtils from 'react-addons-test-utils';
/**
* Get the shallow rendered component