Switch build to rollup + babel 6 instead of raw babel 5.

Author: developit

.babelrc

@@ -1,9 +1,10 @@
 {
-  "loose": "all",
-  "modules": "umd",
-  "sourceMaps": true,
-  "nonStandard": true,
-  "compact": true,
-  "comments": false,
-  "jsxPragma": "h"
+  "presets": [
+    "es2015-minimal",
+    "stage-0"
+  ],
+  "plugins": [
+    "transform-class-properties",
+    ["transform-react-jsx", {"pragma":"h"}]
+  ]
 }

.eslintignore

@@ -1,4 +1,55 @@
 {
   "parser": "babel-eslint",
-  "ignore": ["*.md"]
+  "extends": "eslint:recommended",
+  "env": {
+    "browser": true,
+    "mocha": true,
+    "es6": true
+  },
+  "parserOptions": {
+    "ecmaFeatures": {
+      "modules": true,
+      "jsx": true
+    }
+  },
+  "rules": {
+    "no-empty": 0,
+    "no-console": 0,
+    "no-unused-vars": [0, { "varsIgnorePattern": "^h$" }],
+    "no-cond-assign": 1,
+    "semi": 2,
+    "camelcase": 0,
+    "comma-style": 2,
+    "comma-dangle": [2, "never"],
+    "indent": [2, "tab", {"SwitchCase": 1}],
+    "no-mixed-spaces-and-tabs": [2, "smart-tabs"],
+    "no-trailing-spaces": [2, { "skipBlankLines": true }],
+    "max-nested-callbacks": [2, 3],
+    "no-eval": 2,
+    "no-implied-eval": 2,
+    "no-new-func": 2,
+    "guard-for-in": 0,
+    "eqeqeq": [2, "smart"],
+    "no-else-return": 2,
+    "no-redeclare": 2,
+    "no-dupe-keys": 2,
+    "radix": 2,
+    "strict": [2, "never"],
+    "no-shadow": 0,
+    "no-delete-var": 2,
+    "no-undef-init": 2,
+    "no-shadow-restricted-names": 2,
+    "handle-callback-err": 0,
+    "no-lonely-if": 2,
+    "keyword-spacing": 2,
+    "constructor-super": 2,
+    "no-this-before-super": 2,
+    "no-dupe-class-members": 2,
+    "no-const-assign": 2,
+    "prefer-spread": 2,
+    "no-useless-concat": 2,
+    "no-var": 2,
+    "object-shorthand": 2,
+    "prefer-arrow-callback": 2
+  }
 }

.eslintrc

@@ -4,9 +4,10 @@
   "version": "2.6.1",
   "description": "Render JSX to an HTML string, with support for Preact components.",
   "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
   "scripts": {
-    "build": "babel src -s -d dist --module-id $npm_package_amdName",
-    "test": "eslint {src,test} && mocha --compilers js:babel/register test/**/*.js",
+    "build": "rollup -c rollup.config.js -m ${npm_package_main}.map -f umd -n $npm_package_amdName $npm_package_jsnext_main -o $npm_package_main",
+    "test": "eslint {src,test} && mocha --compilers js:babel-register test/**/*.js",
     "prepublish": "npm run build",
     "release": "npm run build && git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags && npm publish"
   },
@@ -30,12 +31,23 @@
     "preact": "*"
   },
   "devDependencies": {
-    "babel": "^5.8.23",
-    "babel-eslint": "^4.1.3",
+    "babel-cli": "^6.11.4",
+    "babel-core": "^6.11.4",
+    "babel-eslint": "^6.1.2",
+    "babel-plugin-transform-class-properties": "^6.10.2",
+    "babel-plugin-transform-react-jsx": "^6.8.0",
+    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-es2015-minimal": "^2.0.0",
+    "babel-preset-es2015-minimal-rollup": "^2.0.0",
+    "babel-preset-stage-0": "^6.5.0",
+    "babel-register": "^6.9.0",
     "chai": "^3.3.0",
-    "eslint": "^1.7.1",
+    "eslint": "^3.1.1",
     "mocha": "^2.3.3",
-    "preact": "^4.1.3",
+    "preact": "^5.5.0",
+    "rollup": "^0.34.1",
+    "rollup-plugin-babel": "^2.6.1",
+    "rollup-plugin-memory": "^1.0.0",
     "sinon": "^1.17.1",
     "sinon-chai": "^2.8.0"
   }

package.json

@@ -0,0 +1,25 @@
+import fs from 'fs';
+import memory from 'rollup-plugin-memory';
+import babel from 'rollup-plugin-babel';
+
+let babelRc = JSON.parse(fs.readFileSync('./.babelrc'));
+
+export default {
+	entry: 'src/index.js',
+	exports: 'default',
+	useStrict: false,
+	external: ['preact'],
+	plugins: [
+		memory({
+			path: 'src/index.js',
+			contents: "export { default } from './index';"
+		}),
+		babel({
+			babelrc: false,
+			comments: false,
+			exclude: 'node_modules/**',
+			presets: ['es2015-minimal-rollup'].concat(babelRc.presets.slice(1)),
+			plugins: babelRc.plugins
+		})
+	]
+};

rollup.config.js

@@ -66,7 +66,7 @@ renderToString.render = renderToString;
  *	@param {VNode} vnode	JSX VNode to render.
  *	@param {Object} [context={}]	Optionally pass an initial context object through the render path.
  */
-renderToString.shallowRender = (vnode, context) => renderToString(vnode, context, SHALLOW);
+let shallowRender = (vnode, context) => renderToString(vnode, context, SHALLOW);
 
 
 /** You can actually skip preact entirely and import this empty Component base class (or not use a base class at all).
@@ -224,3 +224,11 @@ function getFallbackComponentName(component) {
 	}
 	return name;
 }
+renderToString.shallowRender = shallowRender;
+
+
+export {
+	renderToString as render,
+	renderToString,
+	shallowRender
+};

src/index.js

@@ -1,9 +1,9 @@
 import { render, shallowRender } from '../src';
 import { h, Component } from 'preact';
-import { expect, use } from 'chai';
+import chai, { expect } from 'chai';
 import { spy, match } from 'sinon';
 import sinonChai from 'sinon-chai';
-use(sinonChai);
+chai.use(sinonChai);
 
 describe('pretty', () => {
 	let prettyRender = jsx => render(jsx, {}, { pretty:true });

test/pretty.js

@@ -1,9 +1,9 @@
 import { render, shallowRender } from '../src';
 import { h, Component } from 'preact';
-import { expect, use } from 'chai';
+import chai, { expect } from 'chai';
 import { spy, match } from 'sinon';
 import sinonChai from 'sinon-chai';
-use(sinonChai);
+chai.use(sinonChai);
 
 describe('render', () => {
 	describe('Basic JSX', () => {

test/render.js

@@ -1,9 +1,9 @@
 import { shallowRender } from '../src';
 import { h, Component } from 'preact';
-import { expect, use } from 'chai';
+import chai, { expect } from 'chai';
 import { spy, match } from 'sinon';
 import sinonChai from 'sinon-chai';
-use(sinonChai);
+chai.use(sinonChai);
 
 describe('shallowRender()', () => {
 	it('should not render nested components', () => {