Throw error when minify detects ES6 and give hello.js a version

Author: adriaandotcom

dist/latest/cloudflare.js

@@ -1,4 +1,4 @@
-/* Simple Analytics - Privacy friendly analytics (docs.simpleanalytics.com/script; 2021-12-30; 26ba; v8) */
+/* Simple Analytics - Privacy friendly analytics (docs.simpleanalytics.com/script; 2021-12-30; 6aec; v8) */
 /* eslint-env browser */
 
 (function (window, overwriteOptions, baseUrl, apiUrlPrefix, version, saGlobal) {
@@ -52,6 +52,7 @@
     var platformText = "platform";
     var platformVersionText = "platformVersion";
     var docsUrl = "https://docs.simpleanalytics.com";
+    var allowParams;
     var isBotAgent =
       /(bot|spider|crawl)/i.test(userAgent) && !/(cubot)/i.test(userAgent);
     var screen = window.screen;
@@ -117,17 +118,18 @@
       return !!value === value;
     };
 
-    var getParams = function (regex) {
+    var getParams = function (regex, returnArray) {
       // From the search we grab the utm_source and ref and save only that
       var matches = loc.search.match(
         new RegExp("[?&](" + regex + ")=([^?&]+)", "gi")
       );
       var match = matches
         ? matches.map(function (m) {
-            return m.split("=")[1];
+            return m.split(/[?&=]/).slice(-2);
           })
         : [];
-      if (match && match[0]) return match[0];
+
+      if (match[0]) return returnArray ? match[0] : match[0][1];
     };
 
     // Ignore pages specified in data-ignore-pages
@@ -161,6 +163,17 @@
     var sendData = function (data, callback) {
       data = assign(payload, page, data);
 
+      if (allowParams)
+        data.params = stringify(
+          allowParams
+            .map(function (param) {
+              var params = getParams(param, true);
+              if (!params) return;
+              return { key: params[0], value: params[1] };
+            })
+            .filter(Boolean)
+        );
+
       var image = new Image();
       if (callback) {
         image.onerror = callback;
@@ -264,24 +277,32 @@
       overwriteOptions.autoCollect === false
     );
 
+    var convertCommaSeparatedToArray = function (csv) {
+      return Array.isArray(csv)
+        ? csv
+        : isString(csv) && csv.length
+        ? csv.split(/, ?/)
+        : [];
+    };
+
     // Event function name
     var functionName =
       overwriteOptions.saGlobal || attr(scriptElement, "sa-global") || saGlobal;
 
     // Customers can ignore certain pages
-    var ignorePagesRaw =
-      overwriteOptions.ignorePages || attr(scriptElement, "ignore-pages");
+    var ignorePages = convertCommaSeparatedToArray(
+      overwriteOptions.ignorePages || attr(scriptElement, "ignore-pages")
+    );
 
-    // Make sure ignore pages is an array
-    var ignorePages = Array.isArray(ignorePagesRaw)
-      ? ignorePagesRaw
-      : isString(ignorePagesRaw) && ignorePagesRaw.length
-      ? ignorePagesRaw.split(/, ?/)
-      : [];
+    // Customers can allow params
+    allowParams = convertCommaSeparatedToArray(
+      overwriteOptions.allowParams || attr(scriptElement, "allow-params")
+    );
 
-    // Customers can ignore certain pages
-    var ignorePagesRaw =
-      overwriteOptions.ignorePages || attr(scriptElement, "ignore-pages");
+    // By default we allow source, medium in the URLs. With strictUtm enabled
+    // we only allow it with the utm_ prefix: utm_source, utm_medium, ...
+    var strictUtm =
+      overwriteOptions.strictUtm || attr(scriptElement, "strict-utm");
 
     /////////////////////
     // PAYLOAD FOR BOTH PAGE VIEWS AND EVENTS
@@ -366,10 +387,10 @@
         .replace(/^https?:\/\/((m|l|w{2,3}([0-9]+)?)\.)?([^?#]+)(.*)$/, "$4")
         .replace(/^([^/]+)$/, "$1") || undefinedVar;
 
-    // The prefix utm_ is optional
-    var utmRegexPrefix = "(utm_)?";
+    // The prefix utm_ is optional with strictUtm disabled
+    var utmRegexPrefix = "(utm_)" + (strictUtm ? "" : "?");
     var source = {
-      source: getParams(utmRegexPrefix + "source|ref"),
+      source: getParams(utmRegexPrefix + "source" + (strictUtm ? "" : "|ref")),
       medium: getParams(utmRegexPrefix + "medium"),
       campaign: getParams(utmRegexPrefix + "campaign"),
       term: getParams(utmRegexPrefix + "term"),

minify.js

@@ -25,6 +25,8 @@ const MINIFY_OPTIONS = {
 };
 
 const fillTemplate = (template, { overwriteOptions = null } = {}) => {
+  if (!template)
+    throw new Error("Parsing of the JavaScript failed, please use ES5 only.");
   return template
     .replace(
       /\{\{\s?nginxHost\s?\}\}/gi,
@@ -69,6 +71,7 @@ const DEFAULTS = {
   saGlobal: "sa_event",
   url: "docs.simpleanalytics.com/script",
   scriptName: "script",
+  allowparams: true,
 };
 
 const LIGHT = {
@@ -86,6 +89,7 @@ const LIGHT = {
   errorhandling: false,
   warnings: false,
   ignorednt: false,
+  allowparams: false,
 };
 
 const templates = [
@@ -95,7 +99,7 @@ const templates = [
     output: `hello.js`,
     variables: {
       ...DEFAULTS,
-      scriptName: "cdn_hello",
+      scriptName: `cdn_hello_${VERSION}`,
       sri: false,
       baseUrl: "simpleanalyticscdn.com",
       apiUrlPrefix: "queue.",
@@ -202,7 +206,7 @@ const templates = [
   {
     type: "js",
     input: `${__dirname}/src/auto-events.js`,
-    output: `custom/auto-events.js`,
+    output: "custom/auto-events.js",
     variables: {
       version: VERSION,
       sri: true,