@tgwf/co2 0.14.0 → 0.14.2

package/dist/esm/co2.js

@@ -17,73 +17,65 @@ class CO2 {
       throw new Error(`"${options.model}" is not a valid model. Please use "1byte" for the OneByte model, and "swd" for the Sustainable Web Design model.
 See https://developers.thegreenwebfoundation.org/co2js/models/ to learn more about the models available in CO2.js.`);
     }
-    if ((options == null ? void 0 : options.results) === "segment") {
-      this.model.results = {
-        segment: true
-      };
-    } else {
-      this.model.results = {
-        segment: false
-      };
-    }
+    this._segment = (options == null ? void 0 : options.results) === "segment";
   }
   perByte(bytes, green = false) {
-    return this.model.perByte(bytes, green, this.model.results.segment);
+    return this.model.perByte(bytes, green, this._segment);
   }
   perVisit(bytes, green = false) {
     var _a;
     if ((_a = this.model) == null ? void 0 : _a.perVisit) {
-      return this.model.perVisit(bytes, green, this.model.results.segment);
+      return this.model.perVisit(bytes, green, this._segment);
     } else {
       throw new Error(`The perVisit() method is not supported in the model you are using. Try using perByte() instead.
 See https://developers.thegreenwebfoundation.org/co2js/methods/ to learn more about the methods available in CO2.js.`);
     }
   }
   perByteTrace(bytes, green = false, options = {}) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     let adjustments = {};
     if (options) {
       adjustments = parseOptions(options);
     }
     return {
-      co2: this.model.perByte(bytes, green, this.model.results.segment, adjustments),
+      co2: this.model.perByte(bytes, green, this._segment, adjustments),
       green,
       variables: {
         description: "Below are the variables used to calculate this CO2 estimate.",
         bytes,
         gridIntensity: {
           description: "The grid intensity (grams per kilowatt-hour) used to calculate this CO2 estimate.",
-          network: ((_b = (_a = adjustments == null ? void 0 : adjustments.gridIntensity) == null ? void 0 : _a.network) == null ? void 0 : _b.value) || GLOBAL_GRID_INTENSITY,
-          dataCenter: green ? RENEWABLES_GRID_INTENSITY : ((_d = (_c = adjustments == null ? void 0 : adjustments.gridIntensity) == null ? void 0 : _c.dataCenter) == null ? void 0 : _d.value) || GLOBAL_GRID_INTENSITY,
+          network: (_c = (_b = (_a = adjustments == null ? void 0 : adjustments.gridIntensity) == null ? void 0 : _a.network) == null ? void 0 : _b.value) != null ? _c : GLOBAL_GRID_INTENSITY,
+          dataCenter: green ? RENEWABLES_GRID_INTENSITY : (_f = (_e = (_d = adjustments == null ? void 0 : adjustments.gridIntensity) == null ? void 0 : _d.dataCenter) == null ? void 0 : _e.value) != null ? _f : GLOBAL_GRID_INTENSITY,
           production: GLOBAL_GRID_INTENSITY,
-          device: ((_f = (_e = adjustments == null ? void 0 : adjustments.gridIntensity) == null ? void 0 : _e.device) == null ? void 0 : _f.value) || GLOBAL_GRID_INTENSITY
+          device: (_i = (_h = (_g = adjustments == null ? void 0 : adjustments.gridIntensity) == null ? void 0 : _g.device) == null ? void 0 : _h.value) != null ? _i : GLOBAL_GRID_INTENSITY
         }
       }
     };
   }
   perVisitTrace(bytes, green = false, options = {}) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
     if ((_a = this.model) == null ? void 0 : _a.perVisit) {
       let adjustments = {};
       if (options) {
         adjustments = parseOptions(options);
       }
       return {
-        co2: this.model.perVisit(bytes, green, this.model.results.segment, adjustments),
+        co2: this.model.perVisit(bytes, green, this._segment, adjustments),
         green,
         variables: {
           description: "Below are the variables used to calculate this CO2 estimate.",
           bytes,
           gridIntensity: {
             description: "The grid intensity (grams per kilowatt-hour) used to calculate this CO2 estimate.",
-            network: ((_c = (_b = adjustments == null ? void 0 : adjustments.gridIntensity) == null ? void 0 : _b.network) == null ? void 0 : _c.value) || GLOBAL_GRID_INTENSITY,
-            dataCenter: green ? RENEWABLES_GRID_INTENSITY : ((_e = (_d = adjustments == null ? void 0 : adjustments.gridIntensity) == null ? void 0 : _d.dataCenter) == null ? void 0 : _e.value) || GLOBAL_GRID_INTENSITY,
+            network: (_d = (_c = (_b = adjustments == null ? void 0 : adjustments.gridIntensity) == null ? void 0 : _b.network) == null ? void 0 : _c.value) != null ? _d : GLOBAL_GRID_INTENSITY,
+            dataCenter: green ? RENEWABLES_GRID_INTENSITY : (_g = (_f = (_e = adjustments == null ? void 0 : adjustments.gridIntensity) == null ? void 0 : _e.dataCenter) == null ? void 0 : _f.value) != null ? _g : GLOBAL_GRID_INTENSITY,
             production: GLOBAL_GRID_INTENSITY,
-            device: ((_g = (_f = adjustments == null ? void 0 : adjustments.gridIntensity) == null ? void 0 : _f.device) == null ? void 0 : _g.value) || GLOBAL_GRID_INTENSITY
+            device: (_j = (_i = (_h = adjustments == null ? void 0 : adjustments.gridIntensity) == null ? void 0 : _h.device) == null ? void 0 : _i.value) != null ? _j : GLOBAL_GRID_INTENSITY
           },
-          dataReloadRatio: (adjustments == null ? void 0 : adjustments.dataReloadRatio) || 0.02,
-          firstVisitPercentage: (adjustments == null ? void 0 : adjustments.firstVisitPercentage) || 0.75,
-          returnVisitPercentage: (adjustments == null ? void 0 : adjustments.returnVisitPercentage) || 0.25
+          dataReloadRatio: (_k = adjustments == null ? void 0 : adjustments.dataReloadRatio) != null ? _k : 0.02,
+          firstVisitPercentage: (_l = adjustments == null ? void 0 : adjustments.firstVisitPercentage) != null ? _l : 0.75,
+          returnVisitPercentage: (_m = adjustments == null ? void 0 : adjustments.returnVisitPercentage) != null ? _m : 0.25
         }
       };
     } else {

package/dist/esm/data/average-intensities.min.js

@@ -1,4 +1,4 @@
-const data = { "AFG": 120.482, "AFRICA": 491.69, "ALB": 23.438, "DZA": 498.904, "ASM": 687.5, "AGO": 195.983, "ATG": 657.143, "ARG": 338.275, "ARM": 222.678, "ABW": 591.398, "ASIA": 532.12, "AUS": 503.179, "AUT": 157.52, "AZE": 532.902, "BHS": 698.113, "BHR": 489.77, "BGD": 577.027, "BRB": 644.86, "BLR": 415.641, "BEL": 165.363, "BLZ": 484.375, "BEN": 666.667, "BTN": 24.444, "BOL": 323.869, "BIH": 517.241, "BWA": 794.521, "BRA": 101.986, "BRN": 658.849, "BGR": 399.565, "BFA": 611.429, "BDI": 250, "CPV": 600, "KHM": 400.46, "CMR": 278.261, "CAN": 127.816, "CYM": 684.932, "CAF": 0, "TCD": 677.419, "CHL": 332.612, "CHN": 531.151, "COL": 168.954, "COM": 714.286, "COG": 395.522, "COD": 25.362, "COK": 400, "CRI": 37.213, "CIV": 410.747, "HRV": 246.459, "CUB": 602.025, "CYP": 589.354, "CZE": 415.345, "DNK": 180.709, "DJI": 666.667, "DMA": 529.412, "DOM": 550.881, "ECU": 188.708, "EGY": 485.367, "SLV": 194.226, "GNQ": 492.958, "ERI": 688.889, "EST": 464.029, "SWZ": 189.189, "ETH": 25.187, "EU": 277.37, "EUROPE": 298.02, "FLK": 500, "FRO": 428.571, "FJI": 289.474, "FIN": 130.977, "FRA": 84.817, "GUF": 254.717, "PYF": 471.429, "G20": 440.49, "G7": 341.12, "GAB": 397.38, "GMB": 700, "GEO": 134.831, "DEU": 385.467, "GHA": 361.204, "GRC": 343.822, "GRL": 133.333, "GRD": 714.286, "GLP": 611.765, "GUM": 670.33, "GTM": 320.637, "GIN": 208.633, "GNB": 750, "GUY": 642.276, "HTI": 606.061, "HND": 375.104, "HKG": 683.972, "HUN": 222.973, "ISL": 28.557, "IND": 632.406, "IDN": 618.996, "IRN": 493.595, "IRQ": 498.869, "IRL": 345.347, "ISR": 548.03, "ITA": 371.692, "JAM": 519.54, "JPN": 482.87, "JOR": 399.909, "KAZ": 635.574, "KEN": 100.568, "KIR": 666.667, "XKX": 768.733, "KWT": 489.61, "KGZ": 104.426, "LAO": 242.182, "LATIN AMERICA AND CARIBBEAN": 240.38, "LVA": 181.818, "LBN": 594.752, "LSO": 20, "LBR": 304.348, "LBY": 550.421, "LTU": 194.245, "LUX": 168.142, "MAC": 491.525, "MDG": 483.254, "MWI": 133.803, "MYS": 543.737, "MDV": 651.515, "MLI": 466.077, "MLT": 495, "MTQ": 698.63, "MRT": 526.596, "MUS": 611.111, "MEX": 421.402, "MIDDLE EAST": 515.47, "MDA": 678.439, "MNG": 749.656, "MNE": 399.381, "MSR": 1e3, "MAR": 610.412, "MOZ": 126.633, "MMR": 344.365, "NAM": 63.694, "NRU": 750, "NPL": 24.51, "NLD": 354.988, "NCL": 610.119, "NZL": 97.732, "NIC": 354.212, "NER": 622.222, "NGA": 368.224, "NORTH AMERICA": 336.26, "PRK": 157.785, "MKD": 529.328, "NOR": 28.818, "OCEANIA": 446.55, "OECD": 338.65, "OMN": 488.272, "PAK": 344.155, "PSE": 465.116, "PAN": 192.136, "PNG": 526.749, "PRY": 25.487, "PER": 256.512, "POL": 634.579, "PRT": 234.029, "PRI": 681.469, "QAT": 489.76, "REU": 519.031, "ROU": 264.121, "RUS": 367.189, "RWA": 294.118, "KNA": 681.818, "LCA": 685.714, "SPM": 800, "VCT": 500, "WSM": 470.588, "STP": 600, "SAU": 571.336, "SEN": 523.132, "SRB": 569.375, "SYC": 615.385, "SLE": 47.619, "SGP": 488.775, "SVK": 140.666, "SVN": 237.378, "SLB": 727.273, "SOM": 634.146, "ZAF": 708.989, "KOR": 435.689, "SSD": 684.211, "ESP": 217.373, "LKA": 462.997, "SDN": 264.014, "SUR": 356.436, "SWE": 45.084, "CHE": 45.622, "SYR": 541.169, "TWN": 561, "TJK": 83.629, "TZA": 366.748, "THA": 502.305, "PHL": 582.047, "TGO": 460.317, "TON": 625, "TTO": 491.409, "TUN": 469.428, "TUR": 413.628, "TKM": 490.187, "TCA": 703.704, "UGA": 52.273, "UKR": 206.539, "ARE": 461.845, "GBR": 257.379, "USA": 367.259, "URY": 114.81, "UZB": 505.405, "VUT": 571.429, "VEN": 212.476, "VNM": 376.828, "VGB": 714.286, "VIR": 685.714, "WORLD": 436.33, "YEM": 543.909, "ZMB": 84.698, "ZWE": 392.279 };
+const data = { "AFG": 120.48, "AFRICA": 484.7, "ALB": 23.44, "DZA": 485.49, "ASM": 687.5, "AGO": 195.98, "ATG": 657.14, "ARG": 344.31, "ARM": 222.68, "ABW": 591.4, "ASEAN": 508.2, "ASIA": 534.89, "AUS": 501.7, "AUT": 158.22, "AZE": 469.58, "BHS": 698.11, "BHR": 494.02, "BGD": 574.28, "BRB": 644.86, "BLR": 425.9, "BEL": 167.11, "BLZ": 484.38, "BEN": 666.67, "BTN": 24.44, "BOL": 335.4, "BIH": 553.47, "BWA": 794.52, "BRA": 102.04, "BRN": 493.59, "BGR": 399.72, "BFA": 611.43, "BDI": 250, "CPV": 600, "KHM": 400.46, "CMR": 278.26, "CAN": 125.84, "CYM": 684.93, "CAF": 0, "TCD": 677.42, "CHL": 332.61, "CHN": 533.98, "COL": 163.99, "COM": 714.29, "COG": 395.52, "COD": 25.36, "COK": 400, "CRI": 37.21, "CIV": 410.75, "HRV": 246.29, "CUB": 654.68, "CYP": 589.35, "CZE": 414.8, "DNK": 180.42, "DJI": 666.67, "DMA": 529.41, "DOM": 549.8, "ECU": 183.63, "EGY": 469.63, "SLV": 194.23, "GNQ": 492.96, "ERI": 688.89, "EST": 460.26, "SWZ": 189.19, "ETH": 25.19, "EU": 276.63, "EUROPE": 297.05, "FLK": 500, "FRO": 428.57, "FJI": 289.47, "FIN": 131.71, "FRA": 84.88, "GUF": 254.72, "PYF": 471.43, "G20": 442.57, "G7": 344.31, "GAB": 397.38, "GMB": 700, "GEO": 134.83, "DEU": 385.39, "GHA": 361.2, "GRC": 344.41, "GRL": 133.33, "GRD": 714.29, "GLP": 623.53, "GUM": 670.33, "GTM": 304.71, "GIN": 208.63, "GNB": 750, "GUY": 642.28, "HTI": 606.06, "HND": 373.96, "HKG": 609.93, "HUN": 222.1, "ISL": 28.56, "IND": 633.4, "IDN": 619.03, "IRN": 487.86, "IRQ": 531.36, "IRL": 346.43, "ISR": 537.57, "ITA": 372.63, "JAM": 537.93, "JPN": 494.86, "JOR": 391.13, "KAZ": 635.57, "KEN": 101.13, "KIR": 666.67, "XKX": 767, "KWT": 574.56, "KGZ": 104.43, "LAO": 242.18, "LATIN AMERICA AND CARIBBEAN": 237.91, "LVA": 183.43, "LBN": 663.1, "LSO": 20, "LBR": 304.35, "LBY": 558.85, "LTU": 195.7, "LUX": 162.6, "MAC": 491.53, "MDG": 483.25, "MWI": 133.8, "MYS": 543.87, "MDV": 651.52, "MLI": 463.13, "MLT": 433.48, "MTQ": 698.63, "MRT": 526.6, "MUS": 611.11, "MEX": 423.81, "MIDDLE EAST": 519.92, "MDA": 666.67, "MNG": 749.66, "MNE": 392.75, "MSR": 1e3, "MAR": 630.75, "MOZ": 126.63, "MMR": 330.8, "NAM": 63.69, "NRU": 750, "NPL": 24.51, "NLD": 354.31, "NCL": 610.12, "NZL": 105.22, "NIC": 354.21, "NER": 622.22, "NGA": 368.11, "NORTH AMERICA": 336.68, "PRK": 102.42, "MKD": 543.71, "NOR": 28.93, "OCEANIA": 450.73, "OECD": 341.08, "OMN": 488.27, "PAK": 344.16, "PSE": 465.12, "PAN": 152.68, "PNG": 526.75, "PRY": 25.49, "PER": 256.51, "POL": 633.23, "PRT": 234.61, "PRI": 612.39, "QAT": 490.28, "REU": 519.03, "ROU": 264.24, "RUS": 363.68, "RWA": 294.12, "KNA": 681.82, "LCA": 685.71, "SPM": 800, "VCT": 500, "WSM": 470.59, "STP": 600, "SAU": 557.78, "SEN": 523.13, "SRB": 582.13, "SYC": 615.39, "SLE": 47.62, "SGP": 488.78, "SVK": 140.14, "SVN": 237.38, "SLB": 727.27, "SOM": 634.15, "ZAF": 708.21, "KOR": 437.6, "SSD": 684.21, "ESP": 217.42, "LKA": 501.53, "SDN": 288.13, "SUR": 356.44, "SWE": 45.12, "CHE": 41.28, "SYR": 541.17, "TWN": 560.98, "TJK": 83.63, "TZA": 366.75, "THA": 501.57, "PHL": 594.45, "TGO": 460.32, "TON": 625, "TTO": 491.41, "TUN": 469.43, "TUR": 413.6, "TKM": 490.19, "TCA": 703.7, "UGA": 52.27, "UKR": 232.74, "ARE": 407.98, "GBR": 261.16, "USA": 368.1, "URY": 150.13, "UZB": 505.41, "VUT": 571.43, "VEN": 212.48, "VNM": 386.49, "VGB": 714.29, "VIR": 685.71, "WORLD": 437.66, "YEM": 559.66, "ZMB": 84.7, "ZWE": 392.28 };
 const type = "average";
 var average_intensities_min_default = { data, type };
 export {

package/dist/esm/helpers/index.js

@@ -15,7 +15,7 @@ function parseOptions(options) {
   if (options == null ? void 0 : options.gridIntensity) {
     adjustments.gridIntensity = {};
     const { device, dataCenter, network } = options.gridIntensity;
-    if (device) {
+    if (device || device === 0) {
       if (typeof device === "object") {
         if (!averageIntensity.data[(_a = device.country) == null ? void 0 : _a.toUpperCase()]) {
           console.warn(`"${device.country}" is not a valid country. Please use a valid 3 digit ISO 3166 country code. 
@@ -41,7 +41,7 @@ Falling back to global average grid intensity.`);
 Falling back to global average grid intensity.`);
       }
     }
-    if (dataCenter) {
+    if (dataCenter || dataCenter === 0) {
       if (typeof dataCenter === "object") {
         if (!averageIntensity.data[(_c = dataCenter.country) == null ? void 0 : _c.toUpperCase()]) {
           console.warn(`"${dataCenter.country}" is not a valid country. Please use a valid 3 digit ISO 3166 country code. 
@@ -67,7 +67,7 @@ Falling back to global average grid intensity.`);
 Falling back to global average grid intensity.`);
       }
     }
-    if (network) {
+    if (network || network === 0) {
       if (typeof network === "object") {
         if (!averageIntensity.data[(_e = network.country) == null ? void 0 : _e.toUpperCase()]) {
           console.warn(`"${network.country}" is not a valid country. Please use a valid 3 digit ISO 3166 country code. 
@@ -94,7 +94,7 @@ Falling back to global average grid intensity.`);
       }
     }
   }
-  if (options == null ? void 0 : options.dataReloadRatio) {
+  if ((options == null ? void 0 : options.dataReloadRatio) || options.dataReloadRatio === 0) {
     if (typeof options.dataReloadRatio === "number") {
       if (options.dataReloadRatio >= 0 && options.dataReloadRatio <= 1) {
         adjustments.dataReloadRatio = options.dataReloadRatio;
@@ -109,7 +109,7 @@ Falling back to default value.`);
 Falling back to default value.`);
     }
   }
-  if (options == null ? void 0 : options.firstVisitPercentage) {
+  if ((options == null ? void 0 : options.firstVisitPercentage) || options.firstVisitPercentage === 0) {
     if (typeof options.firstVisitPercentage === "number") {
       if (options.firstVisitPercentage >= 0 && options.firstVisitPercentage <= 1) {
         adjustments.firstVisitPercentage = options.firstVisitPercentage;
@@ -124,7 +124,7 @@ Falling back to default value.`);
 Falling back to default value.`);
     }
   }
-  if (options == null ? void 0 : options.returnVisitPercentage) {
+  if ((options == null ? void 0 : options.returnVisitPercentage) || options.returnVisitPercentage === 0) {
     if (typeof options.returnVisitPercentage === "number") {
       if (options.returnVisitPercentage >= 0 && options.returnVisitPercentage <= 1) {
         adjustments.returnVisitPercentage = options.returnVisitPercentage;
@@ -141,7 +141,11 @@ Falling back to default value.`);
   }
   return adjustments;
 }
+function getApiRequestHeaders(comment = "") {
+  return { "User-Agent": `co2js/${"0.14.2"} ${comment}` };
+}
 export {
   formatNumber,
+  getApiRequestHeaders,
   parseOptions
 };

package/dist/esm/hosting-api.js

@@ -1,21 +1,26 @@
 "use strict";
-function check(domain) {
+import { getApiRequestHeaders } from "./helpers/index.js";
+function check(domain, userAgentIdentifier) {
   if (typeof domain === "string") {
-    return checkAgainstAPI(domain);
+    return checkAgainstAPI(domain, userAgentIdentifier);
   } else {
-    return checkDomainsAgainstAPI(domain);
+    return checkDomainsAgainstAPI(domain, userAgentIdentifier);
   }
 }
-async function checkAgainstAPI(domain) {
-  const req = await fetch(`https://api.thegreenwebfoundation.org/greencheck/${domain}`);
+async function checkAgainstAPI(domain, userAgentIdentifier) {
+  const req = await fetch(`https://api.thegreenwebfoundation.org/greencheck/${domain}`, {
+    headers: getApiRequestHeaders(userAgentIdentifier)
+  });
   const res = await req.json();
   return res.green;
 }
-async function checkDomainsAgainstAPI(domains) {
+async function checkDomainsAgainstAPI(domains, userAgentIdentifier) {
   try {
     const apiPath = "https://api.thegreenwebfoundation.org/v2/greencheckmulti";
     const domainsString = JSON.stringify(domains);
-    const req = await fetch(`${apiPath}/${domainsString}`);
+    const req = await fetch(`${apiPath}/${domainsString}`, {
+      headers: getApiRequestHeaders(userAgentIdentifier)
+    });
     const allGreenCheckResults = await req.json();
     return greenDomainsFromResults(allGreenCheckResults);
   } catch (e) {

package/dist/esm/hosting.js

@@ -1,7 +1,7 @@
 "use strict";
 import hostingAPI from "./hosting-api.js";
-function check(domain) {
-  return hostingAPI.check(domain);
+function check(domain, userAgentIdentifier) {
+  return hostingAPI.check(domain, userAgentIdentifier);
 }
 var hosting_default = {
   check

package/dist/esm/sustainable-web-design.js

@@ -53,13 +53,13 @@ class SustainableWebDesign {
     let globalEmissions = GLOBAL_GRID_INTENSITY;
     if (options == null ? void 0 : options.gridIntensity) {
       const { device, network, dataCenter } = options.gridIntensity;
-      if (device == null ? void 0 : device.value) {
+      if ((device == null ? void 0 : device.value) || (device == null ? void 0 : device.value) === 0) {
         deviceCarbonIntensity = device.value;
       }
-      if (network == null ? void 0 : network.value) {
+      if ((network == null ? void 0 : network.value) || (network == null ? void 0 : network.value) === 0) {
         networkCarbonIntensity = network.value;
       }
-      if (dataCenter == null ? void 0 : dataCenter.value) {
+      if ((dataCenter == null ? void 0 : dataCenter.value) || (dataCenter == null ? void 0 : dataCenter.value) === 0) {
         dataCenterCarbonIntensity = dataCenter.value;
       }
     }
@@ -81,6 +81,9 @@ class SustainableWebDesign {
     return returnCO2ByComponent;
   }
   perByte(bytes, carbonIntensity = false, segmentResults = false, options = {}) {
+    if (bytes < 1) {
+      bytes = 0;
+    }
     const energyBycomponent = this.energyPerByteByComponent(bytes, options);
     if (typeof carbonIntensity !== "boolean") {
       throw new Error(`perByte expects a boolean for the carbon intensity value. Received: ${carbonIntensity}`);
@@ -112,13 +115,13 @@ class SustainableWebDesign {
     return energyValues.reduce((prevValue, currentValue) => prevValue + currentValue);
   }
   energyPerVisitByComponent(bytes, options = {}, firstView = FIRST_TIME_VIEWING_PERCENTAGE, returnView = RETURNING_VISITOR_PERCENTAGE, dataReloadRatio = PERCENTAGE_OF_DATA_LOADED_ON_SUBSEQUENT_LOAD) {
-    if (options.dataReloadRatio) {
+    if (options.dataReloadRatio || options.dataReloadRatio === 0) {
       dataReloadRatio = options.dataReloadRatio;
     }
-    if (options.firstVisitPercentage) {
+    if (options.firstVisitPercentage || options.firstVisitPercentage === 0) {
       firstView = options.firstVisitPercentage;
     }
-    if (options.returnVisitPercentage) {
+    if (options.returnVisitPercentage || options.returnVisitPercentage === 0) {
       returnView = options.returnVisitPercentage;
     }
     const energyBycomponent = this.energyPerByteByComponent(bytes);

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@tgwf/co2",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "description": "Work out the co2 of your digital services",
   "main": "dist/cjs/index-node.js",
   "module": "dist/esm/index.js",
+  "engines": {
+    "node": ">=14.0.0"
+  },
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
@@ -26,7 +29,8 @@
     "intensity-data:average": "node data/functions/generate_average_co2.js",
     "intensity-data:marginal": "node data/functions/generate_marginal_co2.js",
     "intensity-data": "npm run intensity-data:average && npm run intensity-data:marginal && npm run format-data",
-    "format-data": "cd data && prettier --write '**/*.{js,json}'"
+    "format-data": "cd data && prettier --write '**/*.{js,json}'",
+    "version": "npm run build"
   },
   "keywords": [
     "sustainability",
@@ -41,16 +45,17 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@tgwf/url2green": "^0.4.0",
+    "all-contributors-cli": "^6.26.1",
+    "esbuild": "^0.14.47",
+    "esbuild-jest": "^0.5.0",
+    "esbuild-plugin-glob": "^1.1.2",
     "eslint": "^8.15.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-jest": "^26.1.5",
     "eslint-plugin-prettier": "^4.0.0",
-    "esbuild": "^0.14.47",
-    "esbuild-jest": "^0.5.0",
-    "esbuild-plugin-glob": "^1.1.2",
     "jest": "^28.1.0",
     "nock": "^13.2.4",
-    "np": "^7.7.0",
+    "np": "^8.0.4",
     "pagexray": "^4.4.2",
     "prettier": "^2.6.2"
   },
@@ -67,7 +72,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "dependencies": {},
   "repository": {
     "type": "git",
     "url": "https://github.com/thegreenwebfoundation/co2.js.git"

package/.all-contributorsrc

@@ -1,39 +0,0 @@
-{
-  "files": [
-    "README.md"
-  ],
-  "imageSize": 100,
-  "commit": false,
-  "contributors": [
-    {
-      "login": "JamieBeevor",
-      "name": "JamieB",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/26165947?v=4",
-      "profile": "https://greengumption.co.uk",
-      "contributions": [
-        "ideas",
-        "question",
-        "review"
-      ]
-    },
-    {
-    "login": "soulgalore",
-      "name": "Peter Hedenskog",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/540757?v=4",
-      "profile": "https://www.peterhedenskog.com",
-      "contributions": [
-        "code",
-        "ideas",
-        "review",
-        "infra",
-        "docs"
-      ]
-    }
-  ],
-  "contributorsPerLine": 7,
-  "projectName": "co2.js",
-  "projectOwner": "thegreenwebfoundation",
-  "repoType": "github",
-  "repoHost": "https://github.com",
-  "skipCi": true
-}

package/.esbuild.browser.js

@@ -1,11 +0,0 @@
-require('esbuild').buildSync({
-  entryPoints: ['src/index.js'],
-  outdir: 'dist/iife',
-  globalName: 'co2',
-  format: 'iife',
-  platform: 'browser',
-  bundle: true,
-  sourcemap: true,
-  minify: true,
-  // target: ['es5'],
-})

package/.esbuild.esm.js

@@ -1,25 +0,0 @@
-const esbuild = require('esbuild')
-// tiny glob is a dependency of `esbuild-plugin-glob`.
-// For this build however we need to filter out some extra files
-// that are used for nodejs, but not in browsers, so we use the
-// library directly instead of using `esbuild-plugin-glob` as a plugin
-const glob = require('tiny-glob');
-
-async function main() {
-  const results = await glob('src/**/!(*.test.js|test-constants.js|!(*.js))')
-  // we remove node specific files here, with the assumption that
-  // the common use case is bundling into browser based web apps
-  const justBrowserCompatibleFiles = results.filter(filepath => !filepath.endsWith('node.js'))
-
-  esbuild.build({
-    entryPoints: justBrowserCompatibleFiles,
-    bundle: false,
-    minify: false,
-    sourcemap: false,
-    target: ['chrome58', 'firefox57', 'safari11', 'edge18', 'esnext'],
-    outdir: 'dist/esm',
-    outExtension: { '.js': '.js' },
-    format: 'esm'
-  })
-}
-main()

package/.esbuild.node.js

@@ -1,16 +0,0 @@
-const { globPlugin } = require('esbuild-plugin-glob');
-
-function main() {
-  require('esbuild').build({
-    entryPoints: ['src/**/!(*.test.js|test-constants.js|!(*.js))'],
-    bundle: false,
-    minify: false,
-    sourcemap: true,
-    target: ['node14'],
-    outdir: 'dist/cjs/',
-    outExtension: { '.js': '.js' },
-    format: 'cjs',
-    plugins: [globPlugin()]
-  })
-}
-main()

package/.eslintignore

@@ -1 +0,0 @@
-*.min.js

package/.gitpod.yml

@@ -1,8 +0,0 @@
-# Commands to start on workspace startup
-tasks:
-  - init: npm install
-    command: npm run gitpod
-# Ports to expose on workspace startup
-ports:
-  - port: 8000
-    onOpen: open-preview