Use rollup to build UMD dist files (#2)

simonbrunel · simonbrunel · commit d22f5a0a6b85 · 2017-04-27T19:59:58.000+02:00
diff --git a/.eslintrc b/.eslintrc
@@ -2,11 +2,12 @@ ecmaFeatures:
   modules: true
   jsx: true
 
+parserOptions:
+  sourceType: module
+
 env:
-  amd: true
   browser: true
   es6: true
-  jquery: true
   node: true
 
 # http://eslint.org/docs/rules/
diff --git a/gulpfile.js b/gulpfile.js
@@ -3,7 +3,6 @@
 var argv = require('yargs').argv;
 var gulp = require('gulp');
 var eslint = require('gulp-eslint');
-var insert = require('gulp-insert');
 var file = require('gulp-file');
 var rename = require('gulp-rename');
 var replace = require('gulp-replace');
@@ -13,22 +12,14 @@ var gutil = require('gulp-util');
 var zip = require('gulp-zip');
 var merge = require('merge2');
 var path = require('path');
+var rollup = require('rollup-stream');
+var source = require('vinyl-source-stream');
 var pkg = require('./package.json');
 
 var srcDir = './src/';
 var outDir = './dist/';
 var samplesDir = './samples/';
 
-var header = `/*!
- * ` + pkg.name + `
- * http://chartjs.org/
- * Version: {{ version }}
- *
- * Copyright 2017 Simon Brunel
- * Released under the MIT license
- * https://github.com/chartjs/chartjs-plugin-deferred/blob/master/LICENSE.md
- */`;
-
 function watch(glob, task) {
 	gutil.log('Waiting for changes...');
 	return gulp.watch(glob, function(e) {
@@ -43,10 +34,8 @@ gulp.task('default', ['build']);
 
 gulp.task('build', function() {
 	var task = function() {
-		return gulp.src(srcDir + 'plugin.js')
-			.pipe(rename(pkg.name + '.js'))
-			.pipe(insert.prepend(header))
-			.pipe(streamify(replace('{{ version }}', pkg.version)))
+		return rollup('rollup.config.js')
+			.pipe(source(pkg.name + '.js'))
 			.pipe(gulp.dest(outDir))
 			.pipe(rename(pkg.name + '.min.js'))
 			.pipe(streamify(uglify({preserveComments: 'license'})))
diff --git a/package.json b/package.json
@@ -4,24 +4,29 @@
   "description": "Chart.js plugin to defer initial chart updates",
   "version": "0.2.0",
   "license": "MIT",
-  "main": "src/plugin.js",
+  "main": "dist/chartjs-plugin-deferred.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/chartjs/chartjs-plugin-deferred.git"
   },
   "devDependencies": {
     "gulp": "^3.9.1",
     "gulp-eslint": "^3.0.0",
-    "gulp-insert": "^0.5.0",
     "gulp-file": "^0.3.0",
-    "gulp-replace": "^0.5.4",
     "gulp-rename": "^1.2.2",
+    "gulp-replace": "^0.5.4",
     "gulp-streamify": "^1.0.2",
     "gulp-uglify": "^1.5.3",
     "gulp-util": "^3.0.7",
     "gulp-zip": "^3.2.0",
     "merge2": "^1.0.2",
     "path": "^0.12.7",
+    "rollup": "^0.41.6",
+    "rollup-stream": "^1.19.0",
+    "vinyl-source-stream": "^1.1.0",
     "yargs": "^4.7.1"
+  },
+  "peerDependencies": {
+    "chart.js": ">= 2.5.0 < 3"
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -0,0 +1,24 @@
+const pkg = require('./package.json');
+
+const banner = `/*!
+ * ` + pkg.name + `
+ * http://chartjs.org/
+ * Version: `+ pkg.version + `
+ *
+ * Copyright ` + (new Date().getFullYear()) + ` Simon Brunel
+ * Released under the MIT license
+ * https://github.com/chartjs/` + pkg.name + `/blob/master/LICENSE.md
+ */`;
+
+export default {
+	entry: 'src/plugin.js',
+	dest: 'dist/' + pkg.name + '.js',
+	banner: banner,
+	format: 'umd',
+	external: [
+		'chart.js'
+	],
+	globals: {
+		'chart.js': 'Chart'
+	}
+};
diff --git a/src/plugin.js b/src/plugin.js
@@ -1,9 +1,8 @@
-/* global window: false */
 'use strict';
 
-(function() {
+import Chart from 'chart.js';
 
-	var Chart = window.Chart;
+(function() {
 	var helpers = Chart.helpers;
 	var STUB_KEY = '_chartjs_deferred';
 	var MODEL_KEY = '_deferred_model';
