bump

_test-versions.js

@@ -10,8 +10,10 @@ webpackConfig.externals = {
   'react/addons':  'window.React'
 }
 
+
 var SUPPORTED_VERSIONS = ["0.12.2", "0.13.0"];
 
+
 series(SUPPORTED_VERSIONS, function(version, idx, next){
   console.log('-------------------------------------------');
   console.log('------- Testing React version: ' + version );

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "react-widgets",
-  "version": "2.2.7",
+  "version": "2.3.0",
   "main": "dist/react-widgets.js",
   "description": "A set of input widgets for React",
   "main": "dist/react-widgets.js",
@@ -44,7 +44,8 @@
       "node_modules",
       "bower_components",
       "index.js",
-      "test.js",
+      "_test-versions.js",
+      "_test-bootstrap.js",
       "karma.conf.js",
       "karma.conf-ci.js",
       "webpack.configs.js",

gulpfile.js

@@ -13,6 +13,10 @@ var gulp    = require('gulp')
   , configs = require('./webpack.configs');
 
 
+gulp.task('dist-clean', function(cb){
+  del('./dist', cb);
+})
+
 gulp.task('lib-clean', function(cb){
   del('./lib', cb);
 })
@@ -46,10 +50,11 @@ gulp.task('lib-compile', [ 'lib-clean' ], function(){
 
 gulp.task('lib', [ 'lib-clean', 'lib-assets', 'lib-compile'])
 
-gulp.task('dist-assets', function(){
+gulp.task('dist-assets', ['dist-clean'], function(){
 
   return merge(
-    gulp.src('./src/less/*.css')
+    gulp.src('./src/less/react-widgets.less')
+      .pipe(less({ compress: true }))
       .pipe(gulp.dest('./dist/css')),
 
     gulp.src('./src/img/*')
@@ -60,7 +65,7 @@ gulp.task('dist-assets', function(){
   );
 })
 
-gulp.task('dist-build', [ 'lib' ], function(cb) {
+gulp.task('dist-build', function(cb) {
   del('./dist/*.js', function(){
      webpack(configs.browser, cb);
   });
@@ -73,7 +78,6 @@ gulp.task('test-build', function(cb) {
 })
 
 gulp.task('docs', function(cb) {
-  console.log(configs.docBuild.module.loaders[0])
   webpack(configs.docBuild, cb);
 })
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-widgets",
-  "version": "2.2.6",
+  "version": "2.3.0",
   "description": "A set of input widgets for React",
   "main": "lib/index.js",
   "author": {
@@ -24,7 +24,8 @@
     "react-component"
   ],
   "scripts": {
-    "test": "mocha -R spec ./test/server.js && karma start karma.conf.js --single-run"
+    "test": "mocha -R spec ./test/server.js && node _test-versions.js",
+    "test-dev": "mocha -R spec ./test/server.js && karma start karma.conf.js --single-run=true"
   },
   "homepage": "http://jquense.github.io/react-widgets/docs/",
   "repository": {
@@ -51,12 +52,14 @@
       "react"
     ]
   },
+
   "dependencies": {
     "classnames": "^1.1.4",
     "date-arithmetic": "^2.0.0",
     "globalize": "~0.1.1",
     "uncontrollable": "^1.1.1"
   },
+
   "devDependencies": {
     "babel": "^4.7.2",
     "babel-loader": "^4.0.0",

src/SelectList.jsx

@@ -2,12 +2,9 @@
 var React = require('react')
   , _  = require('./util/_')
   , cx = require('classnames')
-<<<<<<< HEAD
   , createUncontrolledWidget = require('uncontrollable')
-=======
   , compat = require('./util/compat')
-  , controlledInput  = require('./util/controlledInput')
->>>>>>> react-0.13
+
   , CustomPropTypes  = require('./util/propTypes')
   , PlainList        = require('./List')
   , GroupableList = require('./ListGroupable')

webpack.configs.js

@@ -146,10 +146,7 @@ module.exports = {
 
     styleName: 'docs.css',
 
-    entry: {
-      app: './docs/components/docs.jsx',
-      vendor: ["babel/browser"],
-    },
+    entry: './docs/components/docs.jsx',
 
     output: {
       path: path.join(__dirname, './docs/public'),
@@ -161,11 +158,10 @@ module.exports = {
       'babel/browser': 'window.babel'
     },
 
-    loaders: [{ test: /\.json$/, loader: "json" }],
-
-    plugins: [
-      new webpack.optimize.CommonsChunkPlugin("babel", "babel-browser.js")
+    loaders: [
+      { test: /\.json$/, loader: "json" }
     ]
+
   }),
 
   docServer: makeConfig({