@formio/js 5.1.0-dev.6114.02b6d9c → 5.1.0-dev.6123.055aa35

package/lib/cjs/utils/utils.js

@@ -1,57 +1,26 @@
 "use strict";
-/* global jQuery */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToMoment = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.momentDate = exports.loadZones = exports.shouldLoadZones = exports.zonesLoaded = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.removeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getScriptPlugin = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = exports.moment = exports.ConditionOperators = exports.jsonLogic = void 0;
-exports.hasEncodedTimezone = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = exports.withSwitch = void 0;
+exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = exports.withSwitch = exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToDayjs = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.dayjsDate = exports.shouldHandleTimezone = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.removeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getScriptPlugin = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = void 0;
+exports.hasEncodedTimezone = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports.getFocusableElements = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.fastCloneDeep = exports.sanitize = void 0;
+/* global jQuery */
 const lodash_1 = __importDefault(require("lodash"));
-exports._ = lodash_1.default;
-const json_logic_js_1 = __importDefault(require("json-logic-js"));
-exports.jsonLogic = json_logic_js_1.default;
 const moment_timezone_1 = __importDefault(require("moment-timezone/moment-timezone"));
-exports.moment = moment_timezone_1.default;
 const jstimezonedetect_1 = __importDefault(require("jstimezonedetect"));
-const operators_1 = require("./jsonlogic/operators");
 const dompurify_1 = __importDefault(require("dompurify"));
+const dayjs_1 = __importDefault(require("dayjs"));
+const utc_1 = __importDefault(require("dayjs/plugin/utc"));
+const timezone_1 = __importDefault(require("dayjs/plugin/timezone"));
+const advancedFormat_1 = __importDefault(require("dayjs/plugin/advancedFormat"));
+const core_1 = require("@formio/core");
 const formUtils_1 = require("./formUtils");
 const Evaluator_1 = require("./Evaluator");
-Object.defineProperty(exports, "Evaluator", { enumerable: true, get: function () { return Evaluator_1.Evaluator; } });
 const conditionOperators_1 = __importDefault(require("./conditionOperators"));
-exports.ConditionOperators = conditionOperators_1.default;
-const core_1 = require("@formio/core");
-const interpolate = Evaluator_1.Evaluator.interpolate;
-exports.interpolate = interpolate;
-__exportStar(require("./formUtils"), exports);
-// Configure JsonLogic
-operators_1.lodashOperators.forEach((name) => json_logic_js_1.default.add_operation(`_${name}`, lodash_1.default[name]));
-// Retrieve Any Date
-json_logic_js_1.default.add_operation('getDate', (date) => {
-    return (0, moment_timezone_1.default)(date).toISOString();
-});
-// Set Relative Minimum Date
-json_logic_js_1.default.add_operation('relativeMinDate', (relativeMinDate) => {
-    return (0, moment_timezone_1.default)().subtract(relativeMinDate, 'days').toISOString();
-});
-// Set Relative Maximum Date
-json_logic_js_1.default.add_operation('relativeMaxDate', (relativeMaxDate) => {
-    return (0, moment_timezone_1.default)().add(relativeMaxDate, 'days').toISOString();
-});
+dayjs_1.default.extend(timezone_1.default);
+dayjs_1.default.extend(advancedFormat_1.default);
+dayjs_1.default.extend(utc_1.default);
 /**
  * Evaluate a method.
  * @param {Function|string|object} func - The function to evaluate.
@@ -335,7 +304,7 @@ exports.checkCustomConditional = checkCustomConditional;
  */
 function checkJsonConditional(component, json, row, data, form, onError) {
     try {
-        return json_logic_js_1.default.apply(json, {
+        return core_1.jsonLogic.apply(json, {
             data,
             row,
             form,
@@ -553,7 +522,7 @@ exports.guid = guid;
 /**
  * Return a translated date setting.
  * @param {string|Date} date - The date to translate.
- * @returns {(null|Date)} - The translated date.
+ * @returns {(null|dayjs.Dayjs)} - The translated date.
  */
 function getDateSetting(date) {
     if (lodash_1.default.isNil(date) || lodash_1.default.isNaN(date) || date === '') {
@@ -573,13 +542,13 @@ function getDateSetting(date) {
     try {
         const value = Evaluator_1.Evaluator.evaluator(`return ${date};`, 'moment')(moment_timezone_1.default);
         if (typeof value === 'string') {
-            dateSetting = (0, moment_timezone_1.default)(value);
+            dateSetting = (0, dayjs_1.default)(value);
         }
         else if (typeof value.toDate === 'function') {
-            dateSetting = (0, moment_timezone_1.default)(value.toDate().toUTCString());
+            dateSetting = (0, dayjs_1.default)(value.toDate().toUTCString());
         }
         else if (value instanceof Date) {
-            dateSetting = (0, moment_timezone_1.default)(value);
+            dateSetting = (0, dayjs_1.default)(value);
         }
     }
     catch (e) {
@@ -609,18 +578,18 @@ exports.isValidDate = isValidDate;
  * @returns {string} - The current timezone.
  */
 function currentTimezone() {
-    if (moment_timezone_1.default.currentTimezone) {
-        return moment_timezone_1.default.currentTimezone;
+    if (dayjs_1.default.currentTimezone) {
+        return dayjs_1.default.currentTimezone;
     }
-    moment_timezone_1.default.currentTimezone = jstimezonedetect_1.default.determine().name();
-    return moment_timezone_1.default.currentTimezone;
+    dayjs_1.default.currentTimezone = jstimezonedetect_1.default.determine().name();
+    return dayjs_1.default.currentTimezone;
 }
 exports.currentTimezone = currentTimezone;
 /**
  * Get an offset date provided a date object and timezone object.
  * @param {Date} date - The date to offset.
  * @param {string} timezone - The timezone to offset the date to.
- * @returns {Date} - The offset date.
+ * @returns {{date: Date, abbr: string}} - The offset date.
  */
 function offsetDate(date, timezone) {
     if (timezone === 'UTC') {
@@ -629,7 +598,7 @@ function offsetDate(date, timezone) {
             abbr: 'UTC'
         };
     }
-    const dateMoment = (0, moment_timezone_1.default)(date).tz(timezone);
+    const dateMoment = (0, dayjs_1.default)(date).tz(timezone);
     return {
         date: new Date(date.getTime() + ((dateMoment.utcOffset() + date.getTimezoneOffset()) * 60000)),
         abbr: dateMoment.format('z')
@@ -637,132 +606,85 @@ function offsetDate(date, timezone) {
 }
 exports.offsetDate = offsetDate;
 /**
- * Returns if the zones are loaded.
- * @returns {boolean} - TRUE if the zones are loaded; FALSE otherwise.
- */
-function zonesLoaded() {
-    return moment_timezone_1.default.zonesLoaded;
-}
-exports.zonesLoaded = zonesLoaded;
-/**
- * Returns if we should load the zones.
+ * Returns if we should handle a timezone difference.
  * @param {string} timezone - The timezone to check if we should load the zones.
- * @returns {boolean} - TRUE if we should load the zones; FALSE otherwise.
+ * @returns {boolean} - TRUE if we should handle timezones; FALSE otherwise.
  */
-function shouldLoadZones(timezone) {
-    if (timezone === currentTimezone() || timezone === 'UTC') {
-        return false;
-    }
-    return true;
+function shouldHandleTimezone(timezone) {
+    return !(timezone === currentTimezone() || timezone === 'UTC');
 }
-exports.shouldLoadZones = shouldLoadZones;
-/**
- * Externally load the timezone data.
- * @param {string} url - The URL to load the timezone data from.
- * @param {string} timezone - The timezone to load.
- * @returns {Promise<any> | *} - Resolves when the zones for this timezone are loaded.
- */
-function loadZones(url, timezone) {
-    if (timezone && !shouldLoadZones(timezone)) {
-        // Return non-resolving promise.
-        return new Promise(lodash_1.default.noop);
-    }
-    if (moment_timezone_1.default.zonesPromise) {
-        return moment_timezone_1.default.zonesPromise;
-    }
-    return moment_timezone_1.default.zonesPromise = fetch(url)
-        .then(resp => resp.json().then(zones => {
-        moment_timezone_1.default.tz.load(zones);
-        moment_timezone_1.default.zonesLoaded = true;
-        // Trigger a global event that the timezones have finished loading.
-        if (document && document.createEvent && document.body && document.body.dispatchEvent) {
-            var event = document.createEvent('Event');
-            event.initEvent('zonesLoaded', true, true);
-            document.body.dispatchEvent(event);
-        }
-    }));
-}
-exports.loadZones = loadZones;
+exports.shouldHandleTimezone = shouldHandleTimezone;
 /**
- * Get the moment date object for translating dates with timezones.
- * @param {string|Date} value - The value to convert into a moment date.
+ * Get the Dayjs date object for translating dates with timezones.
+ * @param {string|Date} value - The value to convert into a dayjs date.
  * @param {string} format - The format to convert the date to.
  * @param {string} timezone - The timezone to convert the date to.
  * @param {object} options - The options object
- * @returns {Date} - The moment date object.
+ * @returns {dayjs.Dayjs} - The dayjs date object.
  */
-function momentDate(value, format, timezone, options) {
-    const momentDate = (0, moment_timezone_1.default)(value);
+function dayjsDate(value, format, timezone, options) {
+    const dayjsDate = (0, dayjs_1.default)(value);
     if (!timezone) {
-        return momentDate;
+        return dayjsDate;
     }
     if (timezone === 'UTC') {
         timezone = 'Etc/UTC';
     }
-    if ((timezone !== currentTimezone() || (format && format.match(/\s(z$|z\s)/))) && (moment_timezone_1.default.zonesLoaded || (options === null || options === void 0 ? void 0 : options.email))) {
-        return momentDate.tz(timezone);
+    if ((timezone !== currentTimezone() || (format && format.match(/\s(z$|z\s)/))) && (shouldHandleTimezone(timezone) || (options === null || options === void 0 ? void 0 : options.email))) {
+        return dayjsDate.tz(timezone);
     }
-    return momentDate;
+    return dayjsDate;
 }
-exports.momentDate = momentDate;
+exports.dayjsDate = dayjsDate;
 /**
  * Format a date provided a value, format, and timezone object.
- * @param {string} timezonesUrl - The URL to load the timezone data from.
  * @param {string|Date} value - The value to format.
  * @param {string} format - The format to format the date to.
  * @param {string} timezone - The timezone to format the date to.
  * @param {string} flatPickrInputFormat - The format to use for flatpickr input.
  * @returns {string} - The formatted date.
  */
-function formatDate(timezonesUrl, value, format, timezone, flatPickrInputFormat) {
-    const momentDate = (0, moment_timezone_1.default)(value, flatPickrInputFormat || undefined);
+function formatDate(value, format, timezone, flatPickrInputFormat) {
+    const dayjsDate = (0, dayjs_1.default)(value, flatPickrInputFormat || undefined);
     if (timezone === currentTimezone()) {
         // See if our format contains a "z" timezone character.
         if (format.match(/\s(z$|z\s)/)) {
-            loadZones(timezonesUrl);
-            if (moment_timezone_1.default.zonesLoaded) {
-                return momentDate.tz(timezone).format(convertFormatToMoment(format));
+            if (shouldHandleTimezone(timezone)) {
+                return dayjsDate.tz(timezone).format(convertFormatToDayjs(format));
             }
             else {
-                return momentDate.format(convertFormatToMoment(format.replace(/\s(z$|z\s)/, '')));
+                return dayjsDate.format(convertFormatToDayjs(format.replace(/\s(z$|z\s)/, '')));
             }
         }
         // Return the standard format.
-        return momentDate.format(convertFormatToMoment(format));
+        return dayjsDate.format(convertFormatToDayjs(format));
     }
     if (timezone === 'UTC') {
-        const offset = offsetDate(momentDate.toDate(), 'UTC');
-        return `${(0, moment_timezone_1.default)(offset.date).format(convertFormatToMoment(format))} UTC`;
-    }
-    // Load the zones since we need timezone information.
-    loadZones(timezonesUrl);
-    if (moment_timezone_1.default.zonesLoaded && timezone) {
-        return momentDate.tz(timezone).format(`${convertFormatToMoment(format)} z`);
+        const offset = offsetDate(dayjsDate.toDate(), 'UTC');
+        return `${(0, dayjs_1.default)(offset.date).format(convertFormatToDayjs(format))} UTC`;
     }
-    else {
-        return momentDate.format(convertFormatToMoment(format));
+    if (shouldHandleTimezone(timezone)) {
+        return dayjsDate.tz(timezone).format(`${convertFormatToDayjs(format)} z`);
     }
+    return dayjsDate.format(convertFormatToDayjs(format));
 }
 exports.formatDate = formatDate;
 /**
  * Pass a format function to format within a timezone.
- * @param {string} timezonesUrl - The URL to load the timezone data from.
  * @param {Function} formatFn - The format function to use.
  * @param {Date|string} date - The date to format.
  * @param {string} format - The format to format the date to.
  * @param {string} timezone - The timezone to format the date to.
  * @returns {string} - The formatted date.
  */
-function formatOffset(timezonesUrl, formatFn, date, format, timezone) {
+function formatOffset(formatFn, date, format, timezone) {
     if (timezone === currentTimezone()) {
         return formatFn(date, format);
     }
     if (timezone === 'UTC') {
         return `${formatFn(offsetDate(date, 'UTC').date, format)} UTC`;
     }
-    // Load the zones since we need timezone information.
-    loadZones(timezonesUrl);
-    if (moment_timezone_1.default.zonesLoaded) {
+    if (shouldHandleTimezone(timezone)) {
         const offset = offsetDate(date, timezone);
         return `${formatFn(offset.date, format)} ${offset.abbr}`;
     }
@@ -822,7 +744,7 @@ exports.convertFormatToFlatpickr = convertFormatToFlatpickr;
  * @param {string} format - The format to convert.
  * @returns {string} - The converted format.
  */
-function convertFormatToMoment(format) {
+function convertFormatToDayjs(format) {
     return format
         // Year conversion.
         .replace(/y/g, 'Y')
@@ -835,7 +757,7 @@ function convertFormatToMoment(format) {
         // Unix Timestamp
         .replace(/U/g, 'X');
 }
-exports.convertFormatToMoment = convertFormatToMoment;
+exports.convertFormatToDayjs = convertFormatToDayjs;
 /**
  * Convert the format from the angular-datepicker module to mask format.
  * @param {string} format - The format to convert.

package/lib/cjs/widgets/CalendarWidget.d.ts

@@ -22,13 +22,6 @@ export default class CalendarWidget extends InputWidget {
         minDate: string;
         maxDate: string;
     };
-    zoneLoading: boolean;
-    timezonesUrl: string;
-    /**
-     * Load the timezones.
-     * @returns {boolean} TRUE if the zones are loading, FALSE otherwise.
-     */
-    loadZones(): boolean;
     attach(input: any): Promise<any>;
     defaultFormat: {
         date: string;

package/lib/cjs/widgets/CalendarWidget.js

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const Formio_1 = require("../Formio");
-const InputWidget_1 = __importDefault(require("./InputWidget"));
-const utils_1 = require("../utils/utils");
 const moment_1 = __importDefault(require("moment"));
 const lodash_1 = __importDefault(require("lodash"));
+const Formio_1 = require("../Formio");
+const InputWidget_1 = __importDefault(require("./InputWidget"));
+const utils_1 = require("../utils");
 const DEFAULT_FORMAT = 'yyyy-MM-dd hh:mm a';
 const ISO_8601_FORMAT = 'yyyy-MM-ddTHH:mm:ssZ';
 const isIEBrowser = (0, utils_1.getBrowserInfo)().ie;
@@ -51,29 +51,6 @@ class CalendarWidget extends InputWidget_1.default {
         else if (this.settings.time_24hr) {
             this.settings.format = this.settings.format.replace(/hh:mm a$/g, 'HH:mm');
         }
-        this.zoneLoading = false;
-        this.timezonesUrl = `${Formio_1.Formio.cdn['moment-timezone']}/data/packed/latest.json`;
-    }
-    /**
-     * Load the timezones.
-     * @returns {boolean} TRUE if the zones are loading, FALSE otherwise.
-     */
-    loadZones() {
-        const timezone = this.timezone;
-        if (this.zoneLoading) {
-            return true;
-        }
-        if (!(0, utils_1.zonesLoaded)() && (0, utils_1.shouldLoadZones)(timezone)) {
-            this.zoneLoading = true;
-            (0, utils_1.loadZones)(this.timezonesUrl, timezone).then(() => {
-                this.zoneLoading = false;
-                this.emit('redraw');
-            });
-            // Return zones are loading.
-            return true;
-        }
-        // Zones are already loaded.
-        return false;
     }
     attach(input) {
         var _a;
@@ -85,7 +62,7 @@ class CalendarWidget extends InputWidget_1.default {
         };
         this.closedOn = 0;
         this.valueFormat = (this.settings.saveAs === 'date') ? ISO_8601_FORMAT : this.settings.dateFormat || ISO_8601_FORMAT;
-        this.valueMomentFormat = (0, utils_1.convertFormatToMoment)(this.valueFormat);
+        this.valueMomentFormat = (0, utils_1.convertFormatToDayjs)(this.valueFormat);
         const isReadOnly = this.settings.readOnly;
         this.settings.minDate = isReadOnly ? null : (0, utils_1.getDateSetting)(this.settings.minDate);
         this.settings.maxDate = isReadOnly ? null : (0, utils_1.getDateSetting)(this.settings.maxDate);
@@ -249,9 +226,9 @@ class CalendarWidget extends InputWidget_1.default {
      */
     getDateValue(date, format, useTimezone) {
         if (useTimezone) {
-            return (0, utils_1.momentDate)(date, this.valueFormat, this.timezone).format((0, utils_1.convertFormatToMoment)(format));
+            return (0, utils_1.dayjsDate)(date, this.valueFormat, this.timezone).format((0, utils_1.convertFormatToDayjs)(format));
         }
-        return (0, moment_1.default)(date).format((0, utils_1.convertFormatToMoment)(format));
+        return (0, moment_1.default)(date).format((0, utils_1.convertFormatToDayjs)(format));
     }
     /**
      * Return the value of the selected date.
@@ -283,7 +260,7 @@ class CalendarWidget extends InputWidget_1.default {
     setValue(value) {
         const saveAsText = (this.settings.saveAs === 'text');
         if (!this.calendar) {
-            value = value ? (0, utils_1.formatDate)(this.timezonesUrl, value, (0, utils_1.convertFormatToMoment)(this.settings.format), this.timezone, (0, utils_1.convertFormatToMoment)(this.valueMomentFormat)) : value;
+            value = value ? (0, utils_1.formatDate)(value, (0, utils_1.convertFormatToDayjs)(this.settings.format), this.timezone, (0, utils_1.convertFormatToDayjs)(this.valueMomentFormat)) : value;
             return super.setValue(value);
         }
         // If the component is a textfield that does not have timezone information included in the string value then skip
@@ -291,10 +268,9 @@ class CalendarWidget extends InputWidget_1.default {
         if (this.component.type === 'textfield' && !(0, utils_1.hasEncodedTimezone)(value)) {
             this.settings.skipOffset = true;
         }
-        const zonesLoading = this.loadZones();
         if (value) {
-            if (!saveAsText && this.settings.readOnly && !zonesLoading) {
-                this.calendar.setDate((0, utils_1.momentDate)(value, this.valueFormat, this.timezone).format(), false);
+            if (!saveAsText && this.settings.readOnly) {
+                this.calendar.setDate((0, utils_1.dayjsDate)(value, this.valueFormat, this.timezone).format(), false);
             }
             else if (this.isValueISO8601(value)) {
                 this.calendar.setDate(value, false);
@@ -311,9 +287,9 @@ class CalendarWidget extends InputWidget_1.default {
         const inputFormat = format || this.dateFormat;
         const valueFormat = this.calendar ? this.valueFormat : this.settings.dateFormat;
         if (this.settings.saveAs === 'text' && this.componentInstance.parent && !this.settings.readOnly) {
-            return (0, moment_1.default)(value, (0, utils_1.convertFormatToMoment)(valueFormat)).format((0, utils_1.convertFormatToMoment)(valueFormat));
+            return (0, moment_1.default)(value, (0, utils_1.convertFormatToDayjs)(valueFormat)).format((0, utils_1.convertFormatToDayjs)(valueFormat));
         }
-        return (0, utils_1.formatDate)(this.timezonesUrl, value, inputFormat, this.timezone, (0, utils_1.convertFormatToMoment)(valueFormat));
+        return (0, utils_1.formatDate)(value, inputFormat, this.timezone, (0, utils_1.convertFormatToDayjs)(valueFormat));
     }
     setErrorClasses(hasErrors) {
         if (!this.input) {
@@ -406,7 +382,7 @@ class CalendarWidget extends InputWidget_1.default {
             const relatedTarget = event.relatedTarget ? event.relatedTarget : activeElement;
             if (!(isIEBrowser && !relatedTarget) && !this.isCalendarElement(relatedTarget)) {
                 const inputValue = this.calendar.input.value;
-                const dateValue = inputValue ? (0, moment_1.default)(this.calendar.input.value, (0, utils_1.convertFormatToMoment)(this.valueFormat)).toDate() : inputValue;
+                const dateValue = inputValue ? (0, moment_1.default)(this.calendar.input.value, (0, utils_1.convertFormatToDayjs)(this.valueFormat)).toDate() : inputValue;
                 this.calendar.setDate(dateValue, true, this.settings.altFormat);
             }
             else if (!this.calendar.input.value && this.calendar.config.noCalendar) {
@@ -458,14 +434,14 @@ class CalendarWidget extends InputWidget_1.default {
         return (date, format) => {
             // Only format this if this is the altFormat and the form is readOnly.
             if (this.settings.readOnly && (format === this.settings.altFormat)) {
-                if (!this.settings.enableTime || this.loadZones() || this.settings.skipOffset) {
+                if (!this.settings.enableTime || this.settings.skipOffset) {
                     return Flatpickr.formatDate(date, format);
                 }
                 const currentValue = new Date(this.getValue());
                 if (currentValue.toString() === date.toString()) {
-                    return (0, utils_1.formatOffset)(this.timezonesUrl, Flatpickr.formatDate.bind(Flatpickr), new Date(this.componentValue), format, this.timezone);
+                    return (0, utils_1.formatOffset)(Flatpickr.formatDate.bind(Flatpickr), new Date(this.componentValue), format, this.timezone);
                 }
-                return (0, utils_1.formatOffset)(this.timezonesUrl, Flatpickr.formatDate.bind(Flatpickr), date, format, this.timezone);
+                return (0, utils_1.formatOffset)(Flatpickr.formatDate.bind(Flatpickr), date, format, this.timezone);
             }
             return Flatpickr.formatDate(date, format);
         };

package/lib/mjs/Element.js

@@ -1,10 +1,10 @@
-import EventEmitter from './EventEmitter';
-import { Formio } from './Formio';
-import * as FormioUtils from './utils/utils';
-import { I18n } from './utils/i18n';
 import _ from 'lodash';
 import moment from 'moment';
 import maskInput from '@formio/vanilla-text-mask';
+import EventEmitter from './EventEmitter';
+import { Formio } from './Formio';
+import { I18n } from './utils/i18n';
+import FormioUtils from './utils';
 /**
  * The root component for all elements within the Form.io renderer.
  */
@@ -523,9 +523,9 @@ export default class Element {
         if (this.component.filter === string && !this.options.building) {
             const evalContext = this.evalContext(data);
             evalContext.data = _.mapValues(evalContext.data, (val) => _.isString(val) ? encodeURIComponent(val) : val);
-            return FormioUtils.interpolate(string, evalContext, options);
+            return FormioUtils.Evaluator.interpolate(string, evalContext, options);
         }
-        return FormioUtils.interpolate(string, this.evalContext(data), options);
+        return FormioUtils.Evaluator.interpolate(string, this.evalContext(data), options);
     }
     /**
      * Performs an evaluation using the evaluation context of this component.

package/lib/mjs/EventEmitter.js

@@ -1,5 +1,5 @@
 import { EventEmitter as EventEmitter3 } from 'eventemitter3';
-import * as utils from './utils/utils';
+import { observeOverload } from './utils';
 export default class EventEmitter extends EventEmitter3 {
     constructor(conf = {}) {
         const { loadLimit = 1000, eventsSafeInterval = 300 } = conf;
@@ -7,7 +7,7 @@ export default class EventEmitter extends EventEmitter3 {
         const overloadHandler = () => {
             console.warn(`There were more than ${loadLimit} events emitted in ${eventsSafeInterval} ms. It might be caused by events' infinite loop`, this.id);
         };
-        const dispatch = utils.observeOverload(overloadHandler, {
+        const dispatch = observeOverload(overloadHandler, {
             limit: loadLimit,
             delay: eventsSafeInterval
         });

package/lib/mjs/Form.js

@@ -2,7 +2,7 @@ import Element from './Element';
 import { Formio } from './Formio';
 import Displays from './displays';
 import templates from './templates';
-import * as FormioUtils from './utils/utils';
+import FormioUtils from './utils';
 export default class Form extends Element {
     /**
      * Represents a JSON value.

package/lib/mjs/PDF.js

@@ -1,6 +1,6 @@
 import { Formio } from './Formio';
 import Webform from './Webform';
-import { fastCloneDeep, eachComponent } from './utils/utils';
+import { fastCloneDeep, eachComponent } from './utils';
 export default class PDF extends Webform {
     constructor(element, options) {
         options.display = 'pdf';

package/lib/mjs/PDFBuilder.js

@@ -1,8 +1,7 @@
 import _ from 'lodash';
 import { Formio } from './Formio';
 import WebformBuilder from './WebformBuilder';
-import { fastCloneDeep, getElementRect, getBrowserInfo } from './utils/utils';
-import { eachComponent } from './utils/formUtils';
+import { fastCloneDeep, getElementRect, getBrowserInfo, eachComponent } from './utils';
 import BuilderUtils from './utils/builder';
 import PDF from './PDF';
 export default class PDFBuilder extends WebformBuilder {

package/lib/mjs/Webform.js

@@ -1,13 +1,12 @@
 import _ from 'lodash';
-import moment from 'moment';
 import { compareVersions } from 'compare-versions';
 import EventEmitter from './EventEmitter';
 import i18nDefaults from './i18n';
 import { Formio } from './Formio';
 import Components from './components/Components';
 import NestedDataComponent from './components/_classes/nesteddata/NestedDataComponent';
-import { fastCloneDeep, currentTimezone, unescapeHTML, getStringFromComponentPath, convertStringToHTMLElement, getArrayFromComponentPath, } from './utils/utils';
-import { eachComponent } from './utils/formUtils';
+import { fastCloneDeep, currentTimezone, unescapeHTML, getStringFromComponentPath, convertStringToHTMLElement, getArrayFromComponentPath, eachComponent } from './utils';
+import dayjs from "dayjs";
 // We need this here because dragula pulls in CustomEvent class that requires global to exist.
 if (typeof window !== 'undefined' && typeof window.global === 'undefined') {
     window.global = window;
@@ -1317,7 +1316,7 @@ export default class Webform extends NestedDataComponent {
         submission.metadata = submission.metadata || {};
         _.defaults(submission.metadata, {
             timezone: _.get(this, '_submission.metadata.timezone', currentTimezone()),
-            offset: parseInt(_.get(this, '_submission.metadata.offset', moment().utcOffset()), 10),
+            offset: parseInt(_.get(this, '_submission.metadata.offset', dayjs().utcOffset()), 10),
             origin: document.location.origin,
             referrer: document.referrer,
             browserName: navigator.appName,

package/lib/mjs/WebformBuilder.js

@@ -3,8 +3,7 @@ import Component from './components/_classes/component/Component';
 import tippy from 'tippy.js';
 import Components from './components/Components';
 import { Formio } from './Formio';
-import { fastCloneDeep, bootstrapVersion, getArrayFromComponentPath, getStringFromComponentPath } from './utils/utils';
-import { eachComponent, getComponent } from './utils/formUtils';
+import { fastCloneDeep, bootstrapVersion, getArrayFromComponentPath, getStringFromComponentPath, eachComponent, getComponent, } from './utils';
 import BuilderUtils from './utils/builder';
 import _ from 'lodash';
 import autoScroll from 'dom-autoscroller';

package/lib/mjs/Wizard.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import Webform from './Webform';
 import { Formio } from './Formio';
-import { fastCloneDeep, checkCondition, firstNonNil, uniqueKey, eachComponent, } from './utils/utils';
+import { fastCloneDeep, checkCondition, firstNonNil, uniqueKey, eachComponent, } from './utils';
 export default class Wizard extends Webform {
     /**
      * Constructor for wizard-based forms.

package/lib/mjs/WizardBuilder.js

@@ -2,7 +2,7 @@ import WebformBuilder from './WebformBuilder';
 import Webform from './Webform';
 import BuilderUtils from './utils/builder';
 import _ from 'lodash';
-import { fastCloneDeep } from './utils/utils';
+import { fastCloneDeep } from './utils';
 export default class WizardBuilder extends WebformBuilder {
     constructor() {
         let element, options;

package/lib/mjs/components/_classes/component/Component.js

@@ -5,8 +5,8 @@ import _ from 'lodash';
 import isMobile from 'ismobilejs';
 import { processOne, processOneSync, validateProcessInfo } from '@formio/core/process';
 import { Formio } from '../../../Formio';
-import * as FormioUtils from '../../../utils/utils';
-import { fastCloneDeep, boolValue, currentTimezone, getScriptPlugin, getContextualRowData } from '../../../utils/utils';
+import FormioUtils from '../../../utils';
+import { fastCloneDeep, boolValue, currentTimezone, getScriptPlugin, getContextualRowData } from '../../../utils';
 import Element from '../../../Element';
 import ComponentModal from '../componentModal/ComponentModal';
 import Widgets from '../../../widgets';

package/lib/mjs/components/_classes/component/editForm/Component.edit.conditional.js

@@ -1,5 +1,5 @@
 import EditFormUtils from './utils';
-import { getContextComponents } from '../../../../utils/utils';
+import { getContextComponents } from '../../../../utils';
 /* eslint-disable quotes, max-len */
 export default [
     {

package/lib/mjs/components/_classes/component/editForm/Component.edit.logic.js

@@ -1,5 +1,5 @@
 import EditFormUtils from './utils';
-import { getContextComponents } from '../../../../utils/utils';
+import { getContextComponents } from '../../../../utils';
 /* eslint-disable quotes, max-len */
 export default [
     {

package/lib/mjs/components/_classes/componentModal/ComponentModal.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { fastCloneDeep } from '../../../utils/utils';
+import { fastCloneDeep } from '../../../utils';
 export default class ComponentModal {
     static render(component, data, topLevel) {
         const children = component.renderTemplate('component', data, topLevel);

package/lib/mjs/components/_classes/input/Input.js

@@ -1,5 +1,5 @@
 import Multivalue from '../multivalue/Multivalue';
-import { convertStringToHTMLElement } from '../../../utils/utils';
+import { convertStringToHTMLElement } from '../../../utils';
 import Widgets from '../../../widgets';
 import _ from 'lodash';
 export default class Input extends Multivalue {