Merge pull request #7 from synacor/rollup-babel

Rollup babel
synacor · Aug 4, 2017 · 0e48b68 · 0e48b68
2 parents a744255 + 64c65a0
commit 0e48b68
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 39 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,7 @@
+{
+  "presets": ["es2015"],
+  "plugins": [
+    "transform-object-assign",
+    ["transform-react-jsx", { "pragma": "h", "useBuiltIns": true }]
+  ]
+}
diff --git a/karma.conf.js b/karma.conf.js
@@ -22,13 +22,7 @@ module.exports = function(config) {
 				rules: [{
 					test: /\.jsx?$/,
 					exclude: /node_modules/,
-					loader: 'babel-loader',
-					options: {
-						presets: ['es2015', 'stage-0'],
-						plugins: [
-							['transform-react-jsx', { pragma: 'h' }]
-						]
-					}
+					loader: 'babel-loader'
 				}]
 			},
 			devtool: 'inline-source-map'

diff --git a/package.json b/package.json
@@ -47,15 +47,15 @@
     "babel-core": "^6.25.0",
     "babel-eslint": "^7.2.3",
     "babel-loader": "^7.0.0",
+    "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-plugin-transform-react-jsx": "^6.8.0",
     "babel-polyfill": "^6.9.1",
     "babel-preset-es2015": "^6.9.0",
     "babel-preset-es2015-minimal-rollup": "^2.0.0",
     "babel-preset-stage-0": "^6.5.0",
-    "chai": "^4.0.2",
-    "chai-as-promised": "^6.0.0",
-    "chai-subset": "^1.2.2",
-    "diff": "^3.2.0",
+    "babelrc-rollup": "^3.0.0",
+    "chai": "^4.1.0",
+    "chai-as-promised": "^7.1.1",
     "documentation": "^4.0.0-rc.1",
     "documentation-theme-default": "^3.0.0-beta1",
     "eslint": "^3.19.0",
@@ -77,16 +77,14 @@
     "mkdirp": "^0.5.1",
     "mocha": "^3.4.2",
     "npm-run-all": "^4.0.2",
-    "phantomjs-prebuilt": "^2.1.7",
     "preact": "^7.2.1",
     "preact-jsx-chai": "^2.2.1",
     "rimraf": "^2.5.4",
-    "rollup": "^0.42.0",
-    "rollup-plugin-babel": "^2.4.0",
-    "rollup-plugin-buble": "^0.15.0",
+    "rollup": "^0.45.2",
+    "rollup-plugin-babel": "^2.7.1",
     "rollup-plugin-memory": "^2.0.0",
-    "sinon": "^2.3.2",
-    "sinon-chai": "^2.8.0",
+    "sinon": "^2.4.1",
+    "sinon-chai": "^2.12.0",
     "strip-json-comments-cli": "^1.0.1",
     "uglify-js": "^2.8.28",
     "webpack": "^2.6.1"

diff --git a/rollup.config.js b/rollup.config.js
@@ -1,5 +1,6 @@
-import buble from 'rollup-plugin-buble';
+import babel from 'rollup-plugin-babel';
 import memory from 'rollup-plugin-memory';
+import babelrc from 'babelrc-rollup'
 
 export default {
 	useStrict: false,
@@ -17,9 +18,6 @@ export default {
 			path: 'src/entry.js',
 			contents: "export { default } from './index';"
 		}),
-		buble({
-			jsx: 'h',
-			objectAssign: 'assign'
-		})
+		babel(babelrc())
 	]
 };
diff --git a/src/components/intl-provider.js b/src/components/intl-provider.js
@@ -1,5 +1,5 @@
 import { h, Component } from 'preact';
-import { assign, deepAssign } from '../lib/util';
+import { deepAssign } from '../lib/util';
 
 
 const URL_FLAG = /[?&#]intl=show/;
@@ -35,7 +35,7 @@ const URL_FLAG = /[?&#]intl=show/;
 export class IntlProvider extends Component {
 	getChildContext() {
 		let { scope, definition, mark } = this.props,
-			intl = assign({}, this.context.intl || {});
+			intl = Object.assign({}, this.context.intl || {});
 
 		// set active scope for the tree if given
 		if (scope) intl.scope = scope;

diff --git a/src/lib/translate-mapping.js b/src/lib/translate-mapping.js
@@ -1,4 +1,4 @@
-import { assign, select } from './util';
+import { select } from './util';
 import translate from './translate';
 import { Text } from '../components/text';
 
@@ -27,7 +27,7 @@ export default function translateMapping(props, intl, onlyTextNodes) {
 			}
 			else if (def.nodeName===Text) {
 				// it's a <Text />, just grab its props:
-				def = assign({
+				def = Object.assign({
 					fallback: def.children && def.children[0]
 				}, def.attributes);
 				out[name] = translate(def.id, intl.scope, intl.dictionary, def.fields, def.plural, def.fallback);

diff --git a/src/lib/util.js b/src/lib/util.js
@@ -10,7 +10,7 @@ export function defined(obj) {
  *	@private
  */
 export function deepAssign(target, source) {
-	let out = assign({}, target);
+	let out = Object.assign({}, target);
 	for (let i in source) {
 		if (source.hasOwnProperty(i)) {
 			if (target[i] && source[i] && typeof target[i]==='object' && typeof source[i]==='object') {
@@ -24,18 +24,6 @@ export function deepAssign(target, source) {
 	return out;
 }
 
-
-/** Object.assign() ponyfill
- *	@private
- */
-export function assign(obj, props) {
-	for (let i in props) if (props.hasOwnProperty(i)) {
-		obj[i] = props[i];
-	}
-	return obj;
-}
-
-
 /** select('foo,bar') creates a mapping: `{ foo, bar }`
  *	@private
  */