From b7139dbbef9ae978a5e26029bc1620b54c7652b4 Mon Sep 17 00:00:00 2001
From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Sun, 6 Jan 2019 15:56:58 +0100
Subject: [PATCH] Use `Chart.min.js` in samples (#5958)

Samples are supposed to show good practices and in most cases we don't use the time scale but require `Chart.bundle.js`, which is not correct. Instead, we should require the non-bundled version in its minified version (`Chart.min.js`). Paradoxically, time based examples don't use `Chart.bundle.js` but require moment manually side to `Chart.min.js`, which IMO is also the correct way since it allows users to configure and use moment globally (TZ, locales, etc.) and doesn't enforce a specific moment version.

Also remove the `data-labelling.html` example because we now have an [official plugin](/~https://github.com/chartjs/chartjs-plugin-datalabels) that implements this feature and don't want to deal with user custom code anymore.
---
 samples/advanced/data-labelling.html         | 131 -------------------
 samples/advanced/progress-bar.html           |   2 +-
 samples/charts/area/line-boundaries.html     |   2 +-
 samples/charts/area/line-datasets.html       |   2 +-
 samples/charts/area/line-stacked.html        |   2 +-
 samples/charts/area/radar.html               |   2 +-
 samples/charts/bar/horizontal.html           |   2 +-
 samples/charts/bar/multi-axis.html           |   2 +-
 samples/charts/bar/stacked-group.html        |   2 +-
 samples/charts/bar/stacked.html              |   2 +-
 samples/charts/bar/vertical.html             |   2 +-
 samples/charts/bubble.html                   |   2 +-
 samples/charts/combo-bar-line.html           |   2 +-
 samples/charts/doughnut.html                 |   2 +-
 samples/charts/line/basic.html               |   2 +-
 samples/charts/line/interpolation-modes.html |   2 +-
 samples/charts/line/line-styles.html         |   2 +-
 samples/charts/line/multi-axis.html          |   2 +-
 samples/charts/line/point-sizes.html         |   2 +-
 samples/charts/line/point-styles.html        |   2 +-
 samples/charts/line/skip-points.html         |   2 +-
 samples/charts/line/stepped.html             |   2 +-
 samples/charts/pie.html                      |   2 +-
 samples/charts/polar-area.html               |   2 +-
 samples/charts/radar-skip-points.html        |   2 +-
 samples/charts/radar.html                    |   2 +-
 samples/charts/scatter/basic.html            |   2 +-
 samples/charts/scatter/multi-axis.html       |   2 +-
 samples/legend/point-style.html              |   2 +-
 samples/legend/positioning.html              |   2 +-
 samples/samples.js                           |   3 -
 samples/scales/filtering-labels.html         |   2 +-
 samples/scales/gridlines-display.html        |   2 +-
 samples/scales/gridlines-style.html          |   2 +-
 samples/scales/linear/min-max-suggested.html |   2 +-
 samples/scales/linear/min-max.html           |   2 +-
 samples/scales/linear/step-size.html         |   2 +-
 samples/scales/logarithmic/line.html         |   2 +-
 samples/scales/logarithmic/scatter.html      |   2 +-
 samples/scales/multiline-labels.html         |   2 +-
 samples/scales/non-numeric-y.html            |   2 +-
 samples/scales/time/combo.html               |   2 +-
 samples/scales/time/financial.html           |   2 +-
 samples/scales/time/line-point-data.html     |   2 +-
 samples/scales/time/line.html                |   2 +-
 samples/scales/toggle-scale-type.html        |   2 +-
 samples/scriptable/bar.html                  |   2 +-
 samples/scriptable/bubble.html               |   2 +-
 samples/tooltips/border.html                 |   2 +-
 samples/tooltips/callbacks.html              |   2 +-
 samples/tooltips/custom-line.html            |   2 +-
 samples/tooltips/custom-pie.html             |   2 +-
 samples/tooltips/custom-points.html          |   4 +-
 samples/tooltips/interactions.html           |   2 +-
 samples/tooltips/positioning.html            |   2 +-
 55 files changed, 54 insertions(+), 188 deletions(-)
 delete mode 100644 samples/advanced/data-labelling.html

diff --git a/samples/advanced/data-labelling.html b/samples/advanced/data-labelling.html
deleted file mode 100644
index 52eb07b8fd3..00000000000
--- a/samples/advanced/data-labelling.html
+++ /dev/null
@@ -1,131 +0,0 @@
-
-<!doctype html>
-<html>
-
-<head>
-	<title>Labelling Data Points</title>
-	<script src="../../dist/Chart.bundle.js"></script>
-	<script src="../utils.js"></script>
-	<style>
-		canvas {
-			-moz-user-select: none;
-			-webkit-user-select: none;
-			-ms-user-select: none;
-		}
-	</style>
-</head>
-
-<body>
-	<div style="width: 75%">
-		<canvas id="canvas"></canvas>
-	</div>
-	<button id="randomizeData">Randomize Data</button>
-	<script>
-		var color = Chart.helpers.color;
-		var barChartData = {
-			labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
-			datasets: [{
-				type: 'bar',
-				label: 'Dataset 1',
-				backgroundColor: color(window.chartColors.red).alpha(0.2).rgbString(),
-				borderColor: window.chartColors.red,
-				data: [
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor()
-				]
-			}, {
-				type: 'line',
-				label: 'Dataset 2',
-				backgroundColor: color(window.chartColors.blue).alpha(0.2).rgbString(),
-				borderColor: window.chartColors.blue,
-				data: [
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor()
-				]
-			}, {
-				type: 'bar',
-				label: 'Dataset 3',
-				backgroundColor: color(window.chartColors.green).alpha(0.2).rgbString(),
-				borderColor: window.chartColors.green,
-				data: [
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor(),
-					randomScalingFactor()
-				]
-			}]
-		};
-
-		// Define a plugin to provide data labels
-		Chart.plugins.register({
-			afterDatasetsDraw: function(chart) {
-				var ctx = chart.ctx;
-
-				chart.data.datasets.forEach(function(dataset, i) {
-					var meta = chart.getDatasetMeta(i);
-					if (!meta.hidden) {
-						meta.data.forEach(function(element, index) {
-							// Draw the text in black, with the specified font
-							ctx.fillStyle = 'rgb(0, 0, 0)';
-
-							var fontSize = 16;
-							var fontStyle = 'normal';
-							var fontFamily = 'Helvetica Neue';
-							ctx.font = Chart.helpers.fontString(fontSize, fontStyle, fontFamily);
-
-							// Just naively convert to string for now
-							var dataString = dataset.data[index].toString();
-
-							// Make sure alignment settings are correct
-							ctx.textAlign = 'center';
-							ctx.textBaseline = 'middle';
-
-							var padding = 5;
-							var position = element.tooltipPosition();
-							ctx.fillText(dataString, position.x, position.y - (fontSize / 2) - padding);
-						});
-					}
-				});
-			}
-		});
-
-		window.onload = function() {
-			var ctx = document.getElementById('canvas').getContext('2d');
-			window.myBar = new Chart(ctx, {
-				type: 'bar',
-				data: barChartData,
-				options: {
-					responsive: true,
-					title: {
-						display: true,
-						text: 'Chart.js Combo Bar Line Chart'
-					},
-				}
-			});
-		};
-
-		document.getElementById('randomizeData').addEventListener('click', function() {
-			barChartData.datasets.forEach(function(dataset) {
-				dataset.data = dataset.data.map(function() {
-					return randomScalingFactor();
-				});
-			});
-			window.myBar.update();
-		});
-	</script>
-</body>
-
-</html>
diff --git a/samples/advanced/progress-bar.html b/samples/advanced/progress-bar.html
index b9c72446e59..4736546ba48 100644
--- a/samples/advanced/progress-bar.html
+++ b/samples/advanced/progress-bar.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title> Animation Callbacks </title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 		canvas {
diff --git a/samples/charts/area/line-boundaries.html b/samples/charts/area/line-boundaries.html
index 7ac6883bb12..928fd378f5a 100644
--- a/samples/charts/area/line-boundaries.html
+++ b/samples/charts/area/line-boundaries.html
@@ -6,7 +6,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>area > boundaries | Chart.js sample</title>
 	<link rel="stylesheet" type="text/css" href="../../style.css">
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<script src="analyser.js"></script>
 </head>
diff --git a/samples/charts/area/line-datasets.html b/samples/charts/area/line-datasets.html
index 127726e7fb7..3796459d2ab 100644
--- a/samples/charts/area/line-datasets.html
+++ b/samples/charts/area/line-datasets.html
@@ -6,7 +6,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>area > datasets | Chart.js sample</title>
 	<link rel="stylesheet" type="text/css" href="../../style.css">
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<script src="analyser.js"></script>
 </head>
diff --git a/samples/charts/area/line-stacked.html b/samples/charts/area/line-stacked.html
index 11a143b0b63..50ad6c98acb 100644
--- a/samples/charts/area/line-stacked.html
+++ b/samples/charts/area/line-stacked.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Line Chart</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 		canvas {
diff --git a/samples/charts/area/radar.html b/samples/charts/area/radar.html
index 692984cbfd7..0f7ab0c28d5 100644
--- a/samples/charts/area/radar.html
+++ b/samples/charts/area/radar.html
@@ -6,7 +6,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>area > radar | Chart.js sample</title>
 	<link rel="stylesheet" type="text/css" href="../../style.css">
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<script src="analyser.js"></script>
 </head>
diff --git a/samples/charts/bar/horizontal.html b/samples/charts/bar/horizontal.html
index e174ad2ca35..114a6f93d05 100644
--- a/samples/charts/bar/horizontal.html
+++ b/samples/charts/bar/horizontal.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Horizontal Bar Chart</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/charts/bar/multi-axis.html b/samples/charts/bar/multi-axis.html
index c206866a410..34cb75fbdc6 100644
--- a/samples/charts/bar/multi-axis.html
+++ b/samples/charts/bar/multi-axis.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Bar Chart Multi Axis</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/charts/bar/stacked-group.html b/samples/charts/bar/stacked-group.html
index e3b734b2d17..3981bd488b2 100644
--- a/samples/charts/bar/stacked-group.html
+++ b/samples/charts/bar/stacked-group.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Stacked Bar Chart with Groups</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/charts/bar/stacked.html b/samples/charts/bar/stacked.html
index ca9f0cafb71..b03bc915c04 100644
--- a/samples/charts/bar/stacked.html
+++ b/samples/charts/bar/stacked.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Stacked Bar Chart</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/charts/bar/vertical.html b/samples/charts/bar/vertical.html
index 5127d4937c2..ed69a436738 100644
--- a/samples/charts/bar/vertical.html
+++ b/samples/charts/bar/vertical.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Bar Chart</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/charts/bubble.html b/samples/charts/bubble.html
index 092c1fb464b..b604a5ac12e 100644
--- a/samples/charts/bubble.html
+++ b/samples/charts/bubble.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Bubble Chart</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style type="text/css">
 		canvas{
diff --git a/samples/charts/combo-bar-line.html b/samples/charts/combo-bar-line.html
index c99894e2212..a8742b8fb1c 100644
--- a/samples/charts/combo-bar-line.html
+++ b/samples/charts/combo-bar-line.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Combo Bar-Line Chart</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/charts/doughnut.html b/samples/charts/doughnut.html
index 8466970a403..0de5fb25bbd 100644
--- a/samples/charts/doughnut.html
+++ b/samples/charts/doughnut.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Doughnut Chart</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/charts/line/basic.html b/samples/charts/line/basic.html
index 8028bee9c51..b76bdaf962e 100644
--- a/samples/charts/line/basic.html
+++ b/samples/charts/line/basic.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Line Chart</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas{
diff --git a/samples/charts/line/interpolation-modes.html b/samples/charts/line/interpolation-modes.html
index b11dd681972..037b07d2ae6 100644
--- a/samples/charts/line/interpolation-modes.html
+++ b/samples/charts/line/interpolation-modes.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Line Chart - Cubic interpolation mode</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas{
diff --git a/samples/charts/line/line-styles.html b/samples/charts/line/line-styles.html
index 3ba9defcdaf..cfd6279c6e7 100644
--- a/samples/charts/line/line-styles.html
+++ b/samples/charts/line/line-styles.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Line Styles</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas{
diff --git a/samples/charts/line/multi-axis.html b/samples/charts/line/multi-axis.html
index d3569e85525..d668205b305 100644
--- a/samples/charts/line/multi-axis.html
+++ b/samples/charts/line/multi-axis.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Line Chart Multiple Axes</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/charts/line/point-sizes.html b/samples/charts/line/point-sizes.html
index 53d3db46cbb..3ba1b9dd2d0 100644
--- a/samples/charts/line/point-sizes.html
+++ b/samples/charts/line/point-sizes.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Different Point Sizes</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 		canvas {
diff --git a/samples/charts/line/point-styles.html b/samples/charts/line/point-styles.html
index 2ef46a9cf35..00bc92a6b78 100644
--- a/samples/charts/line/point-styles.html
+++ b/samples/charts/line/point-styles.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Line Chart</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas{
diff --git a/samples/charts/line/skip-points.html b/samples/charts/line/skip-points.html
index aedacce7244..07fb8b01279 100644
--- a/samples/charts/line/skip-points.html
+++ b/samples/charts/line/skip-points.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Line Chart</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/charts/line/stepped.html b/samples/charts/line/stepped.html
index a87695c9536..eec88eec3a4 100644
--- a/samples/charts/line/stepped.html
+++ b/samples/charts/line/stepped.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Stepped Line Chart</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/charts/pie.html b/samples/charts/pie.html
index ed9aeb77c1c..b994c338a85 100644
--- a/samples/charts/pie.html
+++ b/samples/charts/pie.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Pie Chart</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 </head>
 
diff --git a/samples/charts/polar-area.html b/samples/charts/polar-area.html
index 1c40a645181..a667f443bd1 100644
--- a/samples/charts/polar-area.html
+++ b/samples/charts/polar-area.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Polar Area Chart</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 		canvas {
diff --git a/samples/charts/radar-skip-points.html b/samples/charts/radar-skip-points.html
index ab042e2dcd6..d1b63040996 100644
--- a/samples/charts/radar-skip-points.html
+++ b/samples/charts/radar-skip-points.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Radar Chart</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 		canvas {
diff --git a/samples/charts/radar.html b/samples/charts/radar.html
index 7eda09a7fb4..b08c3e81ccc 100644
--- a/samples/charts/radar.html
+++ b/samples/charts/radar.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Radar Chart</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 		canvas {
diff --git a/samples/charts/scatter/basic.html b/samples/charts/scatter/basic.html
index 63b8efafbdd..bb1d697a879 100644
--- a/samples/charts/scatter/basic.html
+++ b/samples/charts/scatter/basic.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Scatter Chart</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/charts/scatter/multi-axis.html b/samples/charts/scatter/multi-axis.html
index 6c20b98f0de..934baed2d0e 100644
--- a/samples/charts/scatter/multi-axis.html
+++ b/samples/charts/scatter/multi-axis.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Scatter Chart Multi Axis</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/legend/point-style.html b/samples/legend/point-style.html
index b7acea4bd84..40c5cdbfd12 100644
--- a/samples/legend/point-style.html
+++ b/samples/legend/point-style.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Legend Point Style</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 		canvas {
diff --git a/samples/legend/positioning.html b/samples/legend/positioning.html
index 5bd2259cfb1..f2f7f37fbc3 100644
--- a/samples/legend/positioning.html
+++ b/samples/legend/positioning.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Legend Positions</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 		canvas {
diff --git a/samples/samples.js b/samples/samples.js
index 6edc6282423..c6cc71c7af9 100644
--- a/samples/samples.js
+++ b/samples/samples.js
@@ -187,9 +187,6 @@
 		items: [{
 			title: 'Progress bar',
 			path: 'advanced/progress-bar.html'
-		}, {
-			title: 'Data labelling (plugin)',
-			path: 'advanced/data-labelling.html'
 		}]
 	}];
 
diff --git a/samples/scales/filtering-labels.html b/samples/scales/filtering-labels.html
index 4b4b51724e4..1702c5ecb0f 100644
--- a/samples/scales/filtering-labels.html
+++ b/samples/scales/filtering-labels.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Chart with xAxis Filtering</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 		canvas {
diff --git a/samples/scales/gridlines-display.html b/samples/scales/gridlines-display.html
index 8e30bdcdbf4..407dbe6ee57 100644
--- a/samples/scales/gridlines-display.html
+++ b/samples/scales/gridlines-display.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Grid Lines Display Settings</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 		canvas{
diff --git a/samples/scales/gridlines-style.html b/samples/scales/gridlines-style.html
index d2c00ecdda2..ed5ea5d6820 100644
--- a/samples/scales/gridlines-style.html
+++ b/samples/scales/gridlines-style.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Grid Lines Style Settings</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 	canvas{
diff --git a/samples/scales/linear/min-max-suggested.html b/samples/scales/linear/min-max-suggested.html
index 10d546ac297..83ce7bc0796 100644
--- a/samples/scales/linear/min-max-suggested.html
+++ b/samples/scales/linear/min-max-suggested.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Suggested Min/Max Settings</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas{
diff --git a/samples/scales/linear/min-max.html b/samples/scales/linear/min-max.html
index feafbd7a62c..f0c87be8560 100644
--- a/samples/scales/linear/min-max.html
+++ b/samples/scales/linear/min-max.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Min/Max Settings</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 		canvas{
diff --git a/samples/scales/linear/step-size.html b/samples/scales/linear/step-size.html
index fc0af2ee3e0..2ee0c575698 100644
--- a/samples/scales/linear/step-size.html
+++ b/samples/scales/linear/step-size.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Line Chart</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas{
diff --git a/samples/scales/logarithmic/line.html b/samples/scales/logarithmic/line.html
index 72fd9b07dba..6a82ae47e66 100644
--- a/samples/scales/logarithmic/line.html
+++ b/samples/scales/logarithmic/line.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Logarithmic Line Chart</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/scales/logarithmic/scatter.html b/samples/scales/logarithmic/scatter.html
index 5f266a5cda1..3a496f4bd38 100644
--- a/samples/scales/logarithmic/scatter.html
+++ b/samples/scales/logarithmic/scatter.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Scatter Chart</title>
-	<script src="../../../dist/Chart.bundle.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/scales/multiline-labels.html b/samples/scales/multiline-labels.html
index 0f8af2a7df1..5d2d426f8c0 100644
--- a/samples/scales/multiline-labels.html
+++ b/samples/scales/multiline-labels.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Line Chart</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 	canvas{
diff --git a/samples/scales/non-numeric-y.html b/samples/scales/non-numeric-y.html
index b3bfc5eec92..e7eb2776a1d 100644
--- a/samples/scales/non-numeric-y.html
+++ b/samples/scales/non-numeric-y.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Line Chart</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 	canvas{
diff --git a/samples/scales/time/combo.html b/samples/scales/time/combo.html
index d435e74c69c..7df09763a96 100644
--- a/samples/scales/time/combo.html
+++ b/samples/scales/time/combo.html
@@ -4,7 +4,7 @@
 <head>
 	<title>Line Chart - Combo Time Scale</title>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js"></script>
-	<script src="../../../dist/Chart.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 		canvas {
diff --git a/samples/scales/time/financial.html b/samples/scales/time/financial.html
index b261b898661..bce7d587b93 100644
--- a/samples/scales/time/financial.html
+++ b/samples/scales/time/financial.html
@@ -4,7 +4,7 @@
 <head>
 	<title>Line Chart</title>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js"></script>
-	<script src="../../../dist/Chart.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 		canvas {
diff --git a/samples/scales/time/line-point-data.html b/samples/scales/time/line-point-data.html
index 604a49b4f1a..3352389c4e6 100644
--- a/samples/scales/time/line-point-data.html
+++ b/samples/scales/time/line-point-data.html
@@ -4,7 +4,7 @@
 <head>
 	<title>Time Scale Point Data</title>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js"></script>
-	<script src="../../../dist/Chart.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 		canvas {
diff --git a/samples/scales/time/line.html b/samples/scales/time/line.html
index 77c81b7aa1b..20651a22395 100644
--- a/samples/scales/time/line.html
+++ b/samples/scales/time/line.html
@@ -4,7 +4,7 @@
 <head>
 	<title>Line Chart</title>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js"></script>
-	<script src="../../../dist/Chart.js"></script>
+	<script src="../../../dist/Chart.min.js"></script>
 	<script src="../../utils.js"></script>
 	<style>
 		canvas {
diff --git a/samples/scales/toggle-scale-type.html b/samples/scales/toggle-scale-type.html
index 92c943288e3..a35cffd7309 100644
--- a/samples/scales/toggle-scale-type.html
+++ b/samples/scales/toggle-scale-type.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Toggle Scale Type</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/scriptable/bar.html b/samples/scriptable/bar.html
index ec7ac35c842..10e63034754 100644
--- a/samples/scriptable/bar.html
+++ b/samples/scriptable/bar.html
@@ -6,7 +6,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Scriptable > Bar | Chart.js sample</title>
 	<link rel="stylesheet" type="text/css" href="../style.css">
-	<script src="../../dist/Chart.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 </head>
 <body>
diff --git a/samples/scriptable/bubble.html b/samples/scriptable/bubble.html
index a8ce1f4743c..52d2fd8e13a 100644
--- a/samples/scriptable/bubble.html
+++ b/samples/scriptable/bubble.html
@@ -6,7 +6,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>Scriptable > Bubble | Chart.js sample</title>
 	<link rel="stylesheet" type="text/css" href="../style.css">
-	<script src="../../dist/Chart.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 </head>
 <body>
diff --git a/samples/tooltips/border.html b/samples/tooltips/border.html
index 0742be0c5f5..1a062d9499e 100644
--- a/samples/tooltips/border.html
+++ b/samples/tooltips/border.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Tooltip Border</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/tooltips/callbacks.html b/samples/tooltips/callbacks.html
index 0aa336bd5f3..2cf5956323a 100644
--- a/samples/tooltips/callbacks.html
+++ b/samples/tooltips/callbacks.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Tooltip Hooks</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/tooltips/custom-line.html b/samples/tooltips/custom-line.html
index 96cfac6fd3c..0c01179f711 100644
--- a/samples/tooltips/custom-line.html
+++ b/samples/tooltips/custom-line.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Line Chart with Custom Tooltips</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 		canvas{
diff --git a/samples/tooltips/custom-pie.html b/samples/tooltips/custom-pie.html
index 017a5f66d84..0280ab9405f 100644
--- a/samples/tooltips/custom-pie.html
+++ b/samples/tooltips/custom-pie.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Pie Chart with Custom Tooltips</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 
 	<style>
diff --git a/samples/tooltips/custom-points.html b/samples/tooltips/custom-points.html
index f779f62f9c7..403d22e4ead 100644
--- a/samples/tooltips/custom-points.html
+++ b/samples/tooltips/custom-points.html
@@ -3,9 +3,9 @@
 
 <head>
 	<title>Custom Tooltips using Data Points</title>
-	<script src="../../dist/Chart.bundle.js"></script>
-	<script src="../utils.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
+	<script src="../utils.js"></script>
 	<style>
 		canvas{
 			-moz-user-select: none;
diff --git a/samples/tooltips/interactions.html b/samples/tooltips/interactions.html
index 3b1229e2871..d2e8cfe08d1 100644
--- a/samples/tooltips/interactions.html
+++ b/samples/tooltips/interactions.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Tooltip Interaction Modes</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 	canvas {
diff --git a/samples/tooltips/positioning.html b/samples/tooltips/positioning.html
index f98cd638ced..2f626d67f44 100644
--- a/samples/tooltips/positioning.html
+++ b/samples/tooltips/positioning.html
@@ -3,7 +3,7 @@
 
 <head>
 	<title>Tooltip Interaction Modes</title>
-	<script src="../../dist/Chart.bundle.js"></script>
+	<script src="../../dist/Chart.min.js"></script>
 	<script src="../utils.js"></script>
 	<style>
 	canvas {