@formio/js 5.0.0-dev.5683.61b6c22 → 5.0.0-dev.5686.783670c

package/lib/cjs/providers/address/GoogleAddressProvider.d.ts

@@ -82,11 +82,6 @@ export class GoogleAddressProvider extends AddressProvider {
     search(): Promise<void>;
     makeRequest(): Promise<void>;
     getDisplayValue(address: any): any;
-    /**
-     * Tries to remove the library if api key for loaded script is different.
-     * @param {ProviderOptions} options - The options for the provider.
-     */
-    tryRemoveLibrary(options?: ProviderOptions): void;
 }
 export type AutocompleteOptions = {
     /**

package/lib/cjs/providers/address/GoogleAddressProvider.js

@@ -8,9 +8,6 @@ exports.GoogleAddressProvider = void 0;
 const Formio_1 = require("../../Formio");
 const lodash_1 = __importDefault(require("lodash"));
 const AddressProvider_1 = require("./AddressProvider");
-const GOOGLE_MAPS_BASE_URL = 'https://maps.googleapis.com';
-const GOOGLE_MAPS_JS_URL = `${GOOGLE_MAPS_BASE_URL}/maps/api/js`;
-const GOOGLE_MAPS_JS_WITH_PARAMS_URL = `${GOOGLE_MAPS_JS_URL}?v=quarterly&libraries=places&loading=async&callback=googleMapsCallback`;
 /**
  * @typedef {object} AutocompleteOptions
  * @property {string[]} fields - The fields to include in the autocomplete response.
@@ -58,11 +55,10 @@ class GoogleAddressProvider extends AddressProvider_1.AddressProvider {
         var _a;
         super(options);
         this.setAutocompleteOptions();
-        let src = GOOGLE_MAPS_JS_WITH_PARAMS_URL;
+        let src = 'https://maps.googleapis.com/maps/api/js?v=quarterly&libraries=places&loading=async&callback=googleMapsCallback';
         if ((_a = options.params) === null || _a === void 0 ? void 0 : _a.key) {
             src += `&key=${options.params.key}`;
         }
-        this.tryRemoveLibrary(options);
         Formio_1.Formio.requireLibrary(this.getLibraryName(), 'google.maps.places', src);
     }
     /**
@@ -189,23 +185,5 @@ class GoogleAddressProvider extends AddressProvider_1.AddressProvider {
             : this.alternativeDisplayValueProperty;
         return lodash_1.default.get(address, displayedProperty, '');
     }
-    /**
-     * Tries to remove the library if api key for loaded script is different.
-     * @param {ProviderOptions} options - The options for the provider.
-     */
-    tryRemoveLibrary(options = {}) {
-        var _a, _b, _c;
-        if (!Formio_1.Formio.libraries[this.getLibraryName()]) {
-            return;
-        }
-        const existingScript = document.querySelector(`script[src^="${GOOGLE_MAPS_JS_URL}"]`);
-        if (existingScript && ((_a = options.params) === null || _a === void 0 ? void 0 : _a.key) && !existingScript.attributes.src.value.endsWith(options.params.key)) {
-            const googleMapsScripts = (_b = document.querySelectorAll(`script[src^="${GOOGLE_MAPS_BASE_URL}"]`)) !== null && _b !== void 0 ? _b : [];
-            googleMapsScripts.forEach(script => script.parentNode.removeChild(script));
-            delete Formio_1.Formio.libraries[this.getLibraryName()];
-            (_c = global === null || global === void 0 ? void 0 : global.google) === null || _c === void 0 ? true : delete _c.maps;
-            delete global[`${this.getLibraryName()}Callback`];
-        }
-    }
 }
 exports.GoogleAddressProvider = GoogleAddressProvider;

package/lib/cjs/utils/utils.js

@@ -34,7 +34,6 @@ exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.unique
 exports.isSelectResourceWithObjectValue = exports.getItemTemplateKeys = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isInsideScopingComponent = 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;
 const lodash_1 = __importDefault(require("lodash"));
 exports._ = lodash_1.default;
-const fetch_ponyfill_1 = __importDefault(require("fetch-ponyfill"));
 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"));
@@ -48,9 +47,6 @@ const conditionOperators_1 = __importDefault(require("./conditionOperators"));
 exports.ConditionOperators = conditionOperators_1.default;
 const interpolate = Evaluator_1.Evaluator.interpolate;
 exports.interpolate = interpolate;
-const { fetch } = (0, fetch_ponyfill_1.default)({
-    Promise: Promise
-});
 __exportStar(require("./formUtils"), exports);
 // Configure JsonLogic
 operators_1.lodashOperators.forEach((name) => json_logic_js_1.default.add_operation(`_${name}`, lodash_1.default[name]));

package/lib/mjs/providers/address/GoogleAddressProvider.d.ts

@@ -82,11 +82,6 @@ export class GoogleAddressProvider extends AddressProvider {
     search(): Promise<void>;
     makeRequest(): Promise<void>;
     getDisplayValue(address: any): any;
-    /**
-     * Tries to remove the library if api key for loaded script is different.
-     * @param {ProviderOptions} options - The options for the provider.
-     */
-    tryRemoveLibrary(options?: ProviderOptions): void;
 }
 export type AutocompleteOptions = {
     /**

package/lib/mjs/providers/address/GoogleAddressProvider.js

@@ -2,9 +2,6 @@
 import { Formio } from '../../Formio';
 import _ from 'lodash';
 import { AddressProvider } from './AddressProvider';
-const GOOGLE_MAPS_BASE_URL = 'https://maps.googleapis.com';
-const GOOGLE_MAPS_JS_URL = `${GOOGLE_MAPS_BASE_URL}/maps/api/js`;
-const GOOGLE_MAPS_JS_WITH_PARAMS_URL = `${GOOGLE_MAPS_JS_URL}?v=quarterly&libraries=places&loading=async&callback=googleMapsCallback`;
 /**
  * @typedef {object} AutocompleteOptions
  * @property {string[]} fields - The fields to include in the autocomplete response.
@@ -51,11 +48,10 @@ export class GoogleAddressProvider extends AddressProvider {
     constructor(options = {}) {
         super(options);
         this.setAutocompleteOptions();
-        let src = GOOGLE_MAPS_JS_WITH_PARAMS_URL;
+        let src = 'https://maps.googleapis.com/maps/api/js?v=quarterly&libraries=places&loading=async&callback=googleMapsCallback';
         if (options.params?.key) {
             src += `&key=${options.params.key}`;
         }
-        this.tryRemoveLibrary(options);
         Formio.requireLibrary(this.getLibraryName(), 'google.maps.places', src);
     }
     /**
@@ -182,21 +178,4 @@ export class GoogleAddressProvider extends AddressProvider {
             : this.alternativeDisplayValueProperty;
         return _.get(address, displayedProperty, '');
     }
-    /**
-     * Tries to remove the library if api key for loaded script is different.
-     * @param {ProviderOptions} options - The options for the provider.
-     */
-    tryRemoveLibrary(options = {}) {
-        if (!Formio.libraries[this.getLibraryName()]) {
-            return;
-        }
-        const existingScript = document.querySelector(`script[src^="${GOOGLE_MAPS_JS_URL}"]`);
-        if (existingScript && options.params?.key && !existingScript.attributes.src.value.endsWith(options.params.key)) {
-            const googleMapsScripts = document.querySelectorAll(`script[src^="${GOOGLE_MAPS_BASE_URL}"]`) ?? [];
-            googleMapsScripts.forEach(script => script.parentNode.removeChild(script));
-            delete Formio.libraries[this.getLibraryName()];
-            delete global?.google?.maps;
-            delete global[`${this.getLibraryName()}Callback`];
-        }
-    }
 }

package/lib/mjs/utils/utils.js

@@ -1,6 +1,5 @@
 /* global jQuery */
 import _ from 'lodash';
-import fetchPonyfill from 'fetch-ponyfill';
 import jsonLogic from 'json-logic-js';
 import moment from 'moment-timezone/moment-timezone';
 import jtz from 'jstimezonedetect';
@@ -10,9 +9,6 @@ import { getValue } from './formUtils';
 import { Evaluator } from './Evaluator';
 import ConditionOperators from './conditionOperators';
 const interpolate = Evaluator.interpolate;
-const { fetch } = fetchPonyfill({
-    Promise: Promise
-});
 export * from './formUtils';
 // Configure JsonLogic
 lodashOperators.forEach((name) => jsonLogic.add_operation(`_${name}`, _[name]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5683.61b6c22",
+  "version": "5.0.0-dev.5686.783670c",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -99,7 +99,6 @@
     "eventemitter3": "^5.0.1",
     "fast-deep-equal": "^3.1.3",
     "fast-json-patch": "^3.1.1",
-    "fetch-ponyfill": "^7.1.0",
     "idb": "^7.1.1",
     "inputmask": "^5.0.8",
     "ismobilejs": "^1.1.1",