mirror of
https://github.com/wassname/react-webpack-template.git
synced 2026-06-28 02:30:46 +08:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 515969e6be | |||
| 05a06a819a | |||
| 2188e5cd0b | |||
| 4e4993e5b5 | |||
| 5d46050bbb | |||
| b40367218f |
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
@@ -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.
|
||||
@@ -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.
|
||||
|
||||
[](https://travis-ci.org/weblogixx/react-webpack-template)
|
||||
|
||||
## Features
|
||||
The following features are planned to be included in the final version:
|
||||
|
||||
|
||||
+4
-2
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "react-webpack-template",
|
||||
"version": "0.1.0",
|
||||
"version": "0.2.1",
|
||||
"description": "A base skeleton template for react and webpack without task runners",
|
||||
"main": "server.js",
|
||||
"scripts": {
|
||||
@@ -67,6 +67,8 @@
|
||||
"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,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');
|
||||
|
||||
|
||||
@@ -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'));
|
||||
|
||||
@@ -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');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user