V10 b

Author: adriaandotcom

compile.js

@@ -77,6 +77,7 @@ const DEFAULTS = {
   nonuniquehostnames: true,
   ignoremetrics: true,
   dev: false,
+  skipnonwindow: false,
 };
 
 const LIGHT = {
@@ -161,15 +162,27 @@ const templates = [
     output: `cloudflare.js`,
     variables: {
       ...DEFAULTS,
+      skipnonwindow: true,
       minify: false,
       version: VERSION,
       scriptName: `cloudflare_${VERSION}`,
       sri: false,
       baseUrl: "{{cloudFlareCustomDomain}}",
       overwriteOptions: {
-        saGlobal: "INSTALL_OPTIONS.sa_global",
-        mode: "INSTALL_OPTIONS.hash_mode ? 'hash' : null",
-        collectDnt: "INSTALL_OPTIONS.collect_dnt",
+        hostname: "INSTALL_OPTIONS.hostname",
+        collectDnt:
+          "typeof INSTALL_OPTIONS.collect_dnt === 'boolean' ? INSTALL_OPTIONS.collect_dnt : null",
+        mode: "INSTALL_OPTIONS.hash_mode ? 'hash' : 'normal'",
+        strictUtm:
+          "INSTALL_OPTIONS.advanced_settings_toggle && INSTALL_OPTIONS.strict_utm",
+        allowParams:
+          "INSTALL_OPTIONS.advanced_settings_toggle && INSTALL_OPTIONS.allow_url_parameters",
+        nonUniqueHostnames:
+          "INSTALL_OPTIONS.advanced_settings_toggle && INSTALL_OPTIONS.non_unique_hostnames",
+        ignorePages:
+          "INSTALL_OPTIONS.advanced_settings_toggle && INSTALL_OPTIONS.ignore_pages",
+        namespace:
+          "INSTALL_OPTIONS.overwrite_namespace && INSTALL_OPTIONS.namespace",
       },
     },
   },

dist/v10/v10.js

@@ -66,6 +66,11 @@
     var screen = window.screen;
     /** endif **/
 
+    /** if skipnonwindow **/
+    // Skip server side rendered pages on Cloudflare
+    if (typeof window == "" + undefinedVar) return;
+    /** endif **/
+
     // Find the script element where options can be set on
     var scriptElement =
       doc.currentScript || doc.querySelector('script[src*="' + baseUrl + '"]');
@@ -80,12 +85,11 @@
       var args = [].slice.call(arguments);
 
       // 2. Prepend log prefix
-      args.unshift("Simple Analytics: ");
+      args.unshift("Simple Analytics:");
 
       // 3. Pass along arguments to console.warn
       // Function.prototype.bind.call is needed for Internet Explorer
-      var log = Function.prototype.bind.call(con.warn, con);
-      log.apply(con, args);
+      return Function.prototype.apply.call(con.warn, con, args);
     };
 
     var warnInFunction = function (name, error) {
@@ -136,8 +140,13 @@
       return to;
     };
 
+    var settings = window.sa_settings;
+    var logSettings = settings || Object.values(overwriteOptions).length;
+
     // Merge overwriteOptions with sa_settings
-    overwriteOptions = assign(overwriteOptions, window.sa_settings);
+    overwriteOptions = assign(overwriteOptions, settings);
+
+    if (logSettings) warn("Settings", overwriteOptions);
 
     /** if ignoremetrics **/
     // Customers can skip data points