Compare commits

...

8 Commits

Author SHA1 Message Date
Chris e89ec8315a 1.5.0 2016-02-23 21:21:34 +01:00
Chris 90e9e12fc6 Adjusted readme for new release 2016-02-23 21:21:24 +01:00
Chris 21db896237 Updated eslint react plugin 2016-02-23 21:16:21 +01:00
Chris 2c0b7cfda9 Upgraded linter to v2.0 (including needed plugins) 2016-02-18 11:20:25 +01:00
Chris 798e28c227 Updated glob dependency to new version 2016-02-12 09:04:43 +01:00
Chris d75c3b436b Merge pull request #25 from Igonato/master
PhantomJS Promise support
2016-02-08 10:12:37 +01:00
Ignat Shining de2e4bb5eb Move babel-polyfill to loadtests.js 2016-02-08 10:15:35 +03:00
Ignat Shining eceb3c6a28 PhantomJS Promise support 2016-02-06 23:39:16 +03:00
5 changed files with 22 additions and 9 deletions
+8 -4
View File
@@ -3,9 +3,12 @@
"plugins": [ "plugins": [
"react" "react"
], ],
"ecmaFeatures": { "parserOptions": {
"jsx": true, "ecmaVersion": 6,
"modules": true "sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
}, },
"env": { "env": {
"browser": true, "browser": true,
@@ -25,6 +28,7 @@
"no-trailing-spaces": [1, { "skipBlankLines": true }], "no-trailing-spaces": [1, { "skipBlankLines": true }],
"no-unreachable": 1, "no-unreachable": 1,
"no-alert": 0, "no-alert": 0,
"react/jsx-uses-react": 1 "react/jsx-uses-react": 1,
"react/jsx-uses-vars": 1
} }
} }
+6
View File
@@ -1,5 +1,11 @@
# react-webpack-template - Changelog # react-webpack-template - Changelog
## 1.5.0:
1. Added babel polyfill to tests per default (provided by [Igonato](https://github.com/Igonato))
2. Updated eslint to version 2.0
3. Updated glob package to version 7.0
## 1.4.0: ## 1.4.0:
1. Refactored webpack config to use Object.assign instead of lodash 1. Refactored webpack config to use Object.assign instead of lodash
+1
View File
@@ -109,3 +109,4 @@ react-webpack-template is available under MIT-License and can therefore be used
- Martin Jul (martin@mjul.com) - Martin Jul (martin@mjul.com)
- Stephan Herzog (sthzgvie@gmail.com) - Stephan Herzog (sthzgvie@gmail.com)
- Kashif Iqbal Khan - Kashif Iqbal Khan
- Ignat Shining (mail@igonato.com)
+6 -5
View File
@@ -1,6 +1,6 @@
{ {
"name": "react-webpack-template", "name": "react-webpack-template",
"version": "1.4.0", "version": "1.5.0",
"description": "A base skeleton template for react and webpack without task runners", "description": "A base skeleton template for react and webpack without task runners",
"main": "server.js", "main": "server.js",
"scripts": { "scripts": {
@@ -37,19 +37,20 @@
"homepage": "https://github.com/weblogixx/react-webpack-template#readme", "homepage": "https://github.com/weblogixx/react-webpack-template#readme",
"devDependencies": { "devDependencies": {
"babel-core": "^6.0.0", "babel-core": "^6.0.0",
"babel-eslint": "^5.0.0-beta4", "babel-eslint": "^5.0.0",
"babel-loader": "^6.0.0", "babel-loader": "^6.0.0",
"babel-polyfill": "^6.3.14",
"babel-preset-es2015": "^6.0.15", "babel-preset-es2015": "^6.0.15",
"babel-preset-react": "^6.0.15", "babel-preset-react": "^6.0.15",
"bower-webpack-plugin": "^0.1.9", "bower-webpack-plugin": "^0.1.9",
"chai": "^3.2.0", "chai": "^3.2.0",
"copyfiles": "^0.2.1", "copyfiles": "^0.2.1",
"css-loader": "^0.23.0", "css-loader": "^0.23.0",
"eslint": "^1.2.1", "eslint": "^2.0.0",
"eslint-loader": "^1.0.0", "eslint-loader": "^1.0.0",
"eslint-plugin-react": "^3.3.0", "eslint-plugin-react": "^4.0.0",
"file-loader": "^0.8.4", "file-loader": "^0.8.4",
"glob": "^6.0.0", "glob": "^7.0.0",
"isparta-instrumenter-loader": "^1.0.0", "isparta-instrumenter-loader": "^1.0.0",
"karma": "^0.13.9", "karma": "^0.13.9",
"karma-chai": "^0.1.0", "karma-chai": "^0.1.0",
+1
View File
@@ -1,5 +1,6 @@
'use strict'; 'use strict';
require('babel-polyfill');
require('core-js/fn/object/assign'); require('core-js/fn/object/assign');
// Add support for all files in the test directory // Add support for all files in the test directory