Move to Makefile for building, add dist/ to .gitignore (diff noise)

Bower is still workable through the make script, which will force-add dist/.

Author: STRML

.gitignore

@@ -1,3 +1,4 @@
 .idea
 *.iml
 node_modules/
+dist/

.npmignore

@@ -2,6 +2,6 @@
 example
 script
 specs
-bower.json
 karma.conf.js
 webpack.config.js
+dist/

Makefile

@@ -0,0 +1,64 @@
+# Mostly lifted from https://andreypopp.com/posts/2013-05-16-makefile-recipes-for-node-js.html
+# Thanks @andreypopp
+
+BIN = ./node_modules/.bin
+SRC = $(wildcard lib/*.js)
+LIB = $(SRC:lib/%.js=dist/%.js)
+MIN = $(SRC:lib/%.js=dist/%.min.js)
+
+.PHONY: test dev
+
+build: $(LIB) $(MIN)
+
+# Allows usage of `make install`, `make link`
+install link:
+	@npm $@
+
+# FIXME
+dist/%.min.js: $(BIN)
+	@$(BIN)/uglifyjs dist/react-draggable.js \
+	  --output dist/react-draggable.min.js \
+	  --source-map dist/react-draggable.min.map \
+	  --source-map-url react-draggable.min.map \
+	  --in-source-map dist/react-draggable.map \
+	  --compress warnings=false
+
+dist/%.js: $(BIN)
+	@$(BIN)/webpack --devtool source-map
+
+test: $(BIN)
+	@$(BIN)/karma start --browsers Firefox --single-run
+
+dev: $(BIN)
+	script/build-watch
+
+node_modules/.bin: install
+
+define release
+	VERSION=`node -pe "require('./package.json').version"` && \
+	NEXT_VERSION=`node -pe "require('semver').inc(\"$$VERSION\", '$(1)')"` && \
+	node -e "\
+		['./package.json', './bower.json'].forEach(function(fileName) {\
+			var j = require(fileName);\
+			j.version = \"$$NEXT_VERSION\";\
+			var s = JSON.stringify(j, null, 2);\
+			require('fs').writeFileSync(fileName, s);\
+		});" && \
+	git add package.json bower.json CHANGELOG.md && \
+	git add -f dist/ && \
+	git commit -m "release v$$NEXT_VERSION" && \
+	git tag "v$$NEXT_VERSION" -m "release v$$NEXT_VERSION"
+endef
+
+release-patch: test build
+	@$(call release,patch)
+
+release-minor: test build
+	@$(call release,minor)
+
+release-major: test build
+	@$(call release,major)
+
+publish:
+	git push --tags origin HEAD:master
+	npm publish

README.md

@@ -6,17 +6,20 @@ A simple component for making elements draggable.
 
 ## Demo
 
-http://mzabriskie.github.io/react-draggable/example/
+[View Demo](http://mzabriskie.github.io/react-draggable/example/)
 
 
 ## Installing
 
 ```bash
 $ npm install react-draggable
-# or
-$ bower install react-draggable
 ```
 
+If you aren't using browserify/webpack, a
+[UMD version of react-draggable](http://mzabriskie.github.io/react-draggable/example/react-draggable.js)
+is updated in the `gh-pages` branch and used for the demo. You can generate it yourself from master by cloning this
+repository and running `$ make`. This will create umd dist files in the `dist/` folder.
+
 ## Details
 
 A `<Draggable>` element wraps an existing element and extends it with new event handlers and styles.
@@ -101,28 +104,19 @@ React.renderComponent(<App/>, document.body);
 ## Contributing
 
 - Fork the project
-- `$ npm install`
+- Run the project in development mode: `$ make dev`
 - Make changes.
-- Run a static server in this folder to see your changes.
-  For example: `$ npm install -g static-server; static-server .` and open
-  http://localhost:9080/example.index.html
-- Run webpack in development mode to recompile changes as you make them:
-  `$ npm run dev`
 - Add appropriate tests
-- `$ npm test`
+- `$ make test`
 - If tests don't pass, make them pass.
 - Update README with appropriate docs.
-- Don't include `/dist` changes. These files are updated per-release.
 - Commit and PR
 
 ## Release checklist
 
 - Update CHANGELOG
-- Update version in `bower.json`
-- Update version in `package.json`
-- Run build: `$ npm run build`
-- Commit, tag, push
-- `npm publish`
+- `make release-patch`, `make release-minor`, or `make-release-major`
+- `make publish`
 
 ## License
 

karma.conf.js

@@ -52,4 +52,4 @@ module.exports = function(config) {
 			require('karma-webpack')
 		]
 	});
-};
+};

package.json

@@ -4,9 +4,9 @@
   "description": "React draggable component",
   "main": "index.js",
   "scripts": {
-    "test": "script/test --browsers Firefox --single-run",
-    "dev": "script/build-watch",
-    "build": "script/build"
+    "test": "make test",
+    "dev": "make dev",
+    "build": "make build"
   },
   "repository": {
     "type": "git",
@@ -31,7 +31,10 @@
     "karma-firefox-launcher": "^0.1.3",
     "karma-jasmine": "^0.1.5",
     "karma-webpack": "^1.2.1",
+    "open": "0.0.5",
     "react": "^0.13.2",
+    "semver": "^4.3.3",
+    "static-server": "^2.0.0",
     "uglify-js": "^2.4.15",
     "webpack": "^1.3.2-beta8",
     "webpack-dev-server": "^1.4.7"

script/build

@@ -1,2 +1,24 @@
-#!/bin/sh
-webpack --watch --devtool inline-source-map
+#!/bin/bash -e
+
+function finish {
+  echo -e "\nExiting..."
+  kill $WEBPACK_PID
+  kill $SERVER_PID
+}
+
+webpack --watch --devtool inline-source-map &
+WEBPACK_PID=$!
+
+# # Run a static server and run the example in it.
+static-server . &
+SERVER_PID=$!
+
+# Open browser
+node -e "\
+  var open = require('open'); open('http://localhost:9080/example'); \
+"
+
+# Kill webpack on exit.
+trap finish EXIT
+
+wait