Merge branch 'dev'

Author: cheton

.gitignore

@@ -1,5 +1,6 @@
 node_modules
 npm-debug.log
-/lib
-/coverage
 /.nyc_output
+/coverage
+/lib
+/releases

.npmignore

@@ -1,3 +1,4 @@
 npm-debug.log
-/coverage
 /.nyc_output
+/coverage
+/releases

dist/react-sortable.js

@@ -1,3 +1,4 @@
+/*! react-sortablejs v0.7.0 | (c) 2016 Cheton Wu <cheton@gmail.com> | MIT | https://github.com/cheton/react-sortable */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("react"), require("react-dom"), require("sortablejs"));
@@ -119,15 +120,22 @@ return /******/ (function(modules) { // webpackBootstrap
 	        sources[_key - 1] = arguments[_key];
 	    }
 
-	    sources.forEach(function (source) {
-	        for (var key in source) {
-	            if (source.hasOwnProperty(key)) {
-	                target[key] = source[key];
+	    if (target === undefined || target === null) {
+	        throw new TypeError('Cannot convert undefined or null to object');
+	    }
+
+	    var output = Object(target);
+	    for (var index = 0; index < sources.length; index++) {
+	        var source = sources[index];
+	        if (source !== undefined && source !== null) {
+	            for (var key in source) {
+	                if (source.hasOwnProperty(key)) {
+	                    output[key] = source[key];
+	                }
 	            }
 	        }
-	    });
-
-	    return target;
+	    }
+	    return output;
 	};
 
 	var SortableMixin = function SortableMixin() {

dist/react-sortable.min.js

@@ -4,10 +4,11 @@
   "description": "A higher order React component for Sortable (https://github.com/RubaXa/Sortable).",
   "main": "lib/index.js",
   "scripts": {
-    "prepublish": "npm run lint && npm run build && npm test && npm run lint",
+    "prepublish": "npm run lint && npm run test && npm run build && npm run dist && npm run release",
     "build": "babel ./src --out-dir ./lib",
     "test": "./babel-tap --coverage test/*.js",
     "dist": "webpack; BUILD_ENV=dist webpack",
+    "release": "mkdir -p releases; cp -f dist/react-sortable.js releases/react-sortable-${npm_package_version}.js; cp -f dist/react-sortable.min.js releases/react-sortable-${npm_package_version}.min.js",
     "lint": "eslint ./src",
     "lint:fix": "eslint --fix ./src",
     "precommit-check": "npm run lint",

package.json

@@ -29,15 +29,22 @@ const getModelItems = (wrapperComponent) => {
 };
 
 const extend = (target, ...sources) => {
-    sources.forEach((source) => {
-        for (let key in source) {
-            if (source.hasOwnProperty(key)) {
-                target[key] = source[key];
+    if (target === undefined || target === null) {
+        throw new TypeError('Cannot convert undefined or null to object');
+    }
+
+    const output = Object(target);
+    for (let index = 0; index < sources.length; index++) {
+        const source = sources[index];
+        if (source !== undefined && source !== null) {
+            for (let key in source) {
+                if (source.hasOwnProperty(key)) {
+                    output[key] = source[key];
+                }
             }
         }
-    });
-
-    return target;
+    }
+    return output;
 };
 
 const SortableMixin = (options = defaultOptions) => (Component) => class extends React.Component {

src/index.jsx

@@ -1,8 +1,12 @@
 import path from 'path';
 import webpack from 'webpack';
+import pkg from './package.json';
 
+const banner = pkg.name + ' v' + pkg.version + ' | (c) ' + new Date().getFullYear() + ' ' + pkg.author + ' | ' + pkg.license + ' | ' + pkg.homepage;
 const env = process.env.BUILD_ENV;
-let plugins = [];
+let plugins = [
+    new webpack.BannerPlugin(banner)
+];
 
 if (env === 'dist') {
     plugins = plugins.concat([