update build script

Author: Cap32

.babelrc

@@ -1,10 +1,20 @@
 {
 	"plugins": [
-		["transform-es2015-modules-umd", {}],
+		["transform-es2015-modules-commonjs", { "loose": true }],
 	],
 	"env": {
-		"production": {
+		"umd": {
+			"plugins": [
+				["transform-es2015-modules-commonjs", { "loose": true }],
+				"transform-es2015-modules-umd",
+			],
+		},
+		"min": {
 			"presets": ["minify"],
+			"plugins": [
+				["transform-es2015-modules-commonjs", { "loose": true }],
+				"transform-es2015-modules-umd",
+			],
 		},
 	},
 }

package.json

@@ -2,21 +2,23 @@
   "name": "tiny-querystring",
   "description": "Tiny parsing and formatting URL query strings for Node.js and browser",
   "version": "0.0.0",
-  "main": "tiny-querystring.js",
-  "browser": "dist/tiny-querystring.umd.js",
+  "main": "dist/tiny-querystring.js",
+  "module": "tiny-querystring.js",
+  "jsnext:main": "tiny-querystring.js",
   "files": [
     "*.md",
     "dist"
   ],
   "scripts": {
-    "start": "yarn test -- --watchAll",
+    "start": "yarn test -- --watch",
     "test": "cross-env NODE_ENV=development jest",
     "gzip": "gzip -c dist/tiny-querystring.min.js | wc -c",
-    "rm": "rimraf dist",
+    "rm": "rimraf dist es lib",
     "mkdir": "mkdirp dist",
     "prebuild": "run-s rm mkdir",
-    "build:umd": "babel tiny-querystring.js -o dist/tiny-querystring.umd.js",
-    "build:min": "cross-env NODE_ENV=production babel tiny-querystring.js -o dist/tiny-querystring.min.js",
+    "build:cmd": "babel tiny-querystring.js -o dist/tiny-querystring.js",
+    "build:umd": "cross-env BABEL_ENV=umd babel tiny-querystring.js -o dist/tiny-querystring.umd.js",
+    "build:min": "cross-env BABEL_ENV=min babel tiny-querystring.js -o dist/tiny-querystring.min.js",
     "build": "run-p build:*",
     "preversion": "yarn test && yarn build"
   },
@@ -26,14 +28,14 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "babel-cli": "^6.11.4",
-    "babel-core": "^6.13.2",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.0",
     "babel-eslint": "^7.2.3",
+    "babel-jest": "^21.0.2",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
     "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
-    "babel-polyfill": "^6.13.0",
     "babel-preset-minify": "^0.2.0",
     "babel-preset-stage-0": "^6.5.0",
-    "babel-register": "^6.11.6",
     "cross-env": "^4.0.0",
     "eslint": "^3.19.0",
     "eslint-config-standard": "^10.2.1",
@@ -42,7 +44,7 @@
     "eslint-plugin-node": "^4.2.2",
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-standard": "^3.0.1",
-    "jest": "^20.0.4",
+    "jest": "^21.0.2",
     "mkdirp": "^0.5.1",
     "npm-run-all": "^4.1.1",
     "rimraf": "^2.5.4"

test/test.js

@@ -1,8 +1,5 @@
 
-const qs = require('../tiny-querystring');
-
-const parse = qs.parse;
-const stringify = qs.stringify;
+import { parse, stringify } from '../tiny-querystring';
 
 describe('parse', () => {
 	test('a=b', () => {

tiny-querystring.js

@@ -1,5 +1,5 @@
 
-exports.parse = function parse(str) {
+export function parse(str) {
 	return (str + '')
 		.replace(/\+/g, ' ')
 		.split('&')
@@ -17,7 +17,7 @@ exports.parse = function parse(str) {
 	;
 };
 
-exports.stringify = function stringify(obj) {
+export function stringify(obj) {
 	return Object.keys(obj || {})
 		.reduce(function (arr, key) {
 			var val = obj[key];