@wix/cli-app 1.1.68 → 1.1.70

package/build/{chunk-SOL3VBMN.js → chunk-DHGAE3R5.js}

@@ -4,13 +4,13 @@ import {
   componentGenerator,
   require_lodash,
   useBackendComponents
-} from "./chunk-HNVEYZGS.js";
+} from "./chunk-MX6MY676.js";
 import {
   useTunnel
-} from "./chunk-5I2WY4IL.js";
+} from "./chunk-TFBVDCPM.js";
 import {
   useDebugLog
-} from "./chunk-MZAGFEZR.js";
+} from "./chunk-BCLAONW5.js";
 import {
   createAppManifest,
   getComponentSourceBuilder,
@@ -19,7 +19,7 @@ import {
   getViteServerUrl,
   updateAppManifestWithBaseUrl,
   updateBlocksComponents
-} from "./chunk-3W7G4CY6.js";
+} from "./chunk-GZNYJNVI.js";
 import {
   BLOCKS_WIDGET_PANELS_DIR,
   ComponentType2 as ComponentType,
@@ -41,13 +41,12 @@ import {
   saveWixConfig,
   serializer,
   toJsonString,
-  toURLSearchParams,
   useDevCenterClient,
   useErrorReporter,
   useExtensions,
   useHttpClient,
   useProjectModel
-} from "./chunk-TM67N2ME.js";
+} from "./chunk-H27IPZI4.js";
 import {
   Alert,
   CliError,
@@ -65,7 +64,7 @@ import {
   useExit,
   useTranslation,
   z
-} from "./chunk-4JMXQDKZ.js";
+} from "./chunk-OHC3CHII.js";
 import {
   __commonJS,
   __dirname,
@@ -77,6 +76,818 @@ import {
   init_esm_shims
 } from "./chunk-PYIAC2GK.js";
 
+// ../../node_modules/@wix/metro-runtime/dist/cjs/serialization/utils.js
+var require_utils = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/serialization/utils.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.parseLeanSchemaRef = parseLeanSchemaRef;
+    function parseLeanSchemaRef(renderedSchemaName = "") {
+      const [typeOrName, schemaName] = getSchemaNameAndType(renderedSchemaName);
+      if (schemaName) {
+        return {
+          schemaName,
+          schemaType: typeOrName
+        };
+      }
+      return {
+        schemaName: typeOrName
+      };
+    }
+    var getSchemaNameAndType = (leanSchema) => leanSchema.split("#");
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/serialization/index.js
+var require_serialization = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/serialization/index.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    var _utils = require_utils();
+    Object.keys(_utils).forEach(function(key) {
+      if (key === "default" || key === "__esModule") return;
+      if (key in exports && exports[key] === _utils[key]) return;
+      exports[key] = _utils[key];
+    });
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/utils.js
+var require_utils2 = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/utils.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.findByPath = findByPath;
+    function findByPath(obj, path2, defaultValue, suffix) {
+      let result = obj;
+      for (const field of path2.split(".")) {
+        if (!result) {
+          return defaultValue;
+        }
+        result = result[field];
+      }
+      return `${result}${suffix}`;
+    }
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/url-resolver.js
+var require_url_resolver = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/url-resolver.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.resolveUrl = resolveUrl2;
+    var _utils = require_utils2();
+    var USER_DOMAIN = "_";
+    var DOMAINS = ["wix.com", "editorx.com"];
+    var WIX_API_DOMAINS = ["42.wixprod.net", "uw2-edt-1.wixprod.net"];
+    var DEV_WIX_CODE_DOMAIN = "dev.wix-code.com";
+    var REGEX_CAPTURE_PROTO_FIELD = /{(.*)}/;
+    var REGEX_CAPTURE_DOMAINS = new RegExp(`\\.(${DOMAINS.join("|")})$`);
+    var REGEX_CAPTURE_API_DOMAINS = new RegExp(`\\.(${WIX_API_DOMAINS.join("|")})$`);
+    var REGEX_CAPTURE_DEV_WIX_CODE_DOMAIN = new RegExp(`.*\\.${DEV_WIX_CODE_DOMAIN}$`);
+    function resolveUrl2(opts) {
+      const domain = resolveDomain(opts.host);
+      const mappings = resolveMappingsByDomain(domain, opts.domainToMappings);
+      const path2 = injectDataIntoProtoPath(opts.protoPath, opts.data || {});
+      return resolvePath(path2, mappings);
+    }
+    function injectDataIntoProtoPath(protoPath, data) {
+      return protoPath.split("/").map((path2) => maybeProtoPathToData(path2, data)).join("/");
+    }
+    function maybeProtoPathToData(protoPath, data) {
+      const protoRegExpMatch = protoPath.match(REGEX_CAPTURE_PROTO_FIELD) || [];
+      const field = protoRegExpMatch[1];
+      if (field) {
+        const suffix = protoPath.replace(protoRegExpMatch[0], "");
+        return (0, _utils.findByPath)(data, field, protoPath, suffix);
+      }
+      return protoPath;
+    }
+    function resolveDomain(host) {
+      const resolvedHost = fixHostExceptions(host);
+      return resolvedHost.replace(REGEX_CAPTURE_DOMAINS, "._base_domain_").replace(REGEX_CAPTURE_API_DOMAINS, "._api_base_domain_").replace(REGEX_CAPTURE_DEV_WIX_CODE_DOMAIN, "*.dev.wix-code.com");
+    }
+    function fixHostExceptions(host) {
+      return host.replace("create.editorx.com", "editor.editorx.com");
+    }
+    function resolveMappingsByDomain(domain, domainToMappings) {
+      const mappings = domainToMappings[domain] || domainToMappings[USER_DOMAIN];
+      if (!mappings) {
+        if (isBaseDomain(domain)) {
+          return domainToMappings[wwwBaseDomain];
+        }
+      }
+      return mappings;
+    }
+    function resolvePath(protoPath, mappings) {
+      const mapping = mappings == null ? void 0 : mappings.find((m) => protoPath.startsWith(m.destPath));
+      if (!mapping) {
+        return protoPath;
+      }
+      return mapping.srcPath + protoPath.slice(mapping.destPath.length);
+    }
+    function isBaseDomain(domain) {
+      return !!domain.match(/\._base_domain_$/);
+    }
+    var wwwBaseDomain = "www._base_domain_";
+  }
+});
+
+// ../../node_modules/js-base64/base64.js
+var require_base64 = __commonJS({
+  "../../node_modules/js-base64/base64.js"(exports, module) {
+    "use strict";
+    init_esm_shims();
+    (function(global2, factory) {
+      typeof exports === "object" && typeof module !== "undefined" ? module.exports = factory() : typeof define === "function" && define.amd ? define(factory) : (
+        // cf. https://github.com/dankogai/js-base64/issues/119
+        function() {
+          var _Base64 = global2.Base64;
+          var gBase64 = factory();
+          gBase64.noConflict = function() {
+            global2.Base64 = _Base64;
+            return gBase64;
+          };
+          if (global2.Meteor) {
+            Base64 = gBase64;
+          }
+          global2.Base64 = gBase64;
+        }()
+      );
+    })(typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : exports, function() {
+      "use strict";
+      var version = "3.7.7";
+      var VERSION = version;
+      var _hasBuffer = typeof Buffer === "function";
+      var _TD = typeof TextDecoder === "function" ? new TextDecoder() : void 0;
+      var _TE = typeof TextEncoder === "function" ? new TextEncoder() : void 0;
+      var b64ch = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+      var b64chs = Array.prototype.slice.call(b64ch);
+      var b64tab = function(a) {
+        var tab = {};
+        a.forEach(function(c, i2) {
+          return tab[c] = i2;
+        });
+        return tab;
+      }(b64chs);
+      var b64re = /^(?:[A-Za-z\d+\/]{4})*?(?:[A-Za-z\d+\/]{2}(?:==)?|[A-Za-z\d+\/]{3}=?)?$/;
+      var _fromCC = String.fromCharCode.bind(String);
+      var _U8Afrom = typeof Uint8Array.from === "function" ? Uint8Array.from.bind(Uint8Array) : function(it) {
+        return new Uint8Array(Array.prototype.slice.call(it, 0));
+      };
+      var _mkUriSafe = function(src) {
+        return src.replace(/=/g, "").replace(/[+\/]/g, function(m0) {
+          return m0 == "+" ? "-" : "_";
+        });
+      };
+      var _tidyB64 = function(s) {
+        return s.replace(/[^A-Za-z0-9\+\/]/g, "");
+      };
+      var btoaPolyfill = function(bin) {
+        var u32, c0, c1, c2, asc = "";
+        var pad = bin.length % 3;
+        for (var i2 = 0; i2 < bin.length; ) {
+          if ((c0 = bin.charCodeAt(i2++)) > 255 || (c1 = bin.charCodeAt(i2++)) > 255 || (c2 = bin.charCodeAt(i2++)) > 255)
+            throw new TypeError("invalid character found");
+          u32 = c0 << 16 | c1 << 8 | c2;
+          asc += b64chs[u32 >> 18 & 63] + b64chs[u32 >> 12 & 63] + b64chs[u32 >> 6 & 63] + b64chs[u32 & 63];
+        }
+        return pad ? asc.slice(0, pad - 3) + "===".substring(pad) : asc;
+      };
+      var _btoa = typeof btoa === "function" ? function(bin) {
+        return btoa(bin);
+      } : _hasBuffer ? function(bin) {
+        return Buffer.from(bin, "binary").toString("base64");
+      } : btoaPolyfill;
+      var _fromUint8Array = _hasBuffer ? function(u8a) {
+        return Buffer.from(u8a).toString("base64");
+      } : function(u8a) {
+        var maxargs = 4096;
+        var strs = [];
+        for (var i2 = 0, l = u8a.length; i2 < l; i2 += maxargs) {
+          strs.push(_fromCC.apply(null, u8a.subarray(i2, i2 + maxargs)));
+        }
+        return _btoa(strs.join(""));
+      };
+      var fromUint8Array = function(u8a, urlsafe) {
+        if (urlsafe === void 0) {
+          urlsafe = false;
+        }
+        return urlsafe ? _mkUriSafe(_fromUint8Array(u8a)) : _fromUint8Array(u8a);
+      };
+      var cb_utob = function(c) {
+        if (c.length < 2) {
+          var cc = c.charCodeAt(0);
+          return cc < 128 ? c : cc < 2048 ? _fromCC(192 | cc >>> 6) + _fromCC(128 | cc & 63) : _fromCC(224 | cc >>> 12 & 15) + _fromCC(128 | cc >>> 6 & 63) + _fromCC(128 | cc & 63);
+        } else {
+          var cc = 65536 + (c.charCodeAt(0) - 55296) * 1024 + (c.charCodeAt(1) - 56320);
+          return _fromCC(240 | cc >>> 18 & 7) + _fromCC(128 | cc >>> 12 & 63) + _fromCC(128 | cc >>> 6 & 63) + _fromCC(128 | cc & 63);
+        }
+      };
+      var re_utob = /[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g;
+      var utob = function(u) {
+        return u.replace(re_utob, cb_utob);
+      };
+      var _encode = _hasBuffer ? function(s) {
+        return Buffer.from(s, "utf8").toString("base64");
+      } : _TE ? function(s) {
+        return _fromUint8Array(_TE.encode(s));
+      } : function(s) {
+        return _btoa(utob(s));
+      };
+      var encode3 = function(src, urlsafe) {
+        if (urlsafe === void 0) {
+          urlsafe = false;
+        }
+        return urlsafe ? _mkUriSafe(_encode(src)) : _encode(src);
+      };
+      var encodeURI = function(src) {
+        return encode3(src, true);
+      };
+      var re_btou = /[\xC0-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF7][\x80-\xBF]{3}/g;
+      var cb_btou = function(cccc) {
+        switch (cccc.length) {
+          case 4:
+            var cp = (7 & cccc.charCodeAt(0)) << 18 | (63 & cccc.charCodeAt(1)) << 12 | (63 & cccc.charCodeAt(2)) << 6 | 63 & cccc.charCodeAt(3), offset = cp - 65536;
+            return _fromCC((offset >>> 10) + 55296) + _fromCC((offset & 1023) + 56320);
+          case 3:
+            return _fromCC((15 & cccc.charCodeAt(0)) << 12 | (63 & cccc.charCodeAt(1)) << 6 | 63 & cccc.charCodeAt(2));
+          default:
+            return _fromCC((31 & cccc.charCodeAt(0)) << 6 | 63 & cccc.charCodeAt(1));
+        }
+      };
+      var btou = function(b) {
+        return b.replace(re_btou, cb_btou);
+      };
+      var atobPolyfill = function(asc) {
+        asc = asc.replace(/\s+/g, "");
+        if (!b64re.test(asc))
+          throw new TypeError("malformed base64.");
+        asc += "==".slice(2 - (asc.length & 3));
+        var u24, bin = "", r1, r2;
+        for (var i2 = 0; i2 < asc.length; ) {
+          u24 = b64tab[asc.charAt(i2++)] << 18 | b64tab[asc.charAt(i2++)] << 12 | (r1 = b64tab[asc.charAt(i2++)]) << 6 | (r2 = b64tab[asc.charAt(i2++)]);
+          bin += r1 === 64 ? _fromCC(u24 >> 16 & 255) : r2 === 64 ? _fromCC(u24 >> 16 & 255, u24 >> 8 & 255) : _fromCC(u24 >> 16 & 255, u24 >> 8 & 255, u24 & 255);
+        }
+        return bin;
+      };
+      var _atob = typeof atob === "function" ? function(asc) {
+        return atob(_tidyB64(asc));
+      } : _hasBuffer ? function(asc) {
+        return Buffer.from(asc, "base64").toString("binary");
+      } : atobPolyfill;
+      var _toUint8Array = _hasBuffer ? function(a) {
+        return _U8Afrom(Buffer.from(a, "base64"));
+      } : function(a) {
+        return _U8Afrom(_atob(a).split("").map(function(c) {
+          return c.charCodeAt(0);
+        }));
+      };
+      var toUint8Array = function(a) {
+        return _toUint8Array(_unURI(a));
+      };
+      var _decode = _hasBuffer ? function(a) {
+        return Buffer.from(a, "base64").toString("utf8");
+      } : _TD ? function(a) {
+        return _TD.decode(_toUint8Array(a));
+      } : function(a) {
+        return btou(_atob(a));
+      };
+      var _unURI = function(a) {
+        return _tidyB64(a.replace(/[-_]/g, function(m0) {
+          return m0 == "-" ? "+" : "/";
+        }));
+      };
+      var decode2 = function(src) {
+        return _decode(_unURI(src));
+      };
+      var isValid = function(src) {
+        if (typeof src !== "string")
+          return false;
+        var s = src.replace(/\s+/g, "").replace(/={0,2}$/, "");
+        return !/[^\s0-9a-zA-Z\+/]/.test(s) || !/[^\s0-9a-zA-Z\-_]/.test(s);
+      };
+      var _noEnum = function(v) {
+        return {
+          value: v,
+          enumerable: false,
+          writable: true,
+          configurable: true
+        };
+      };
+      var extendString = function() {
+        var _add = function(name, body) {
+          return Object.defineProperty(String.prototype, name, _noEnum(body));
+        };
+        _add("fromBase64", function() {
+          return decode2(this);
+        });
+        _add("toBase64", function(urlsafe) {
+          return encode3(this, urlsafe);
+        });
+        _add("toBase64URI", function() {
+          return encode3(this, true);
+        });
+        _add("toBase64URL", function() {
+          return encode3(this, true);
+        });
+        _add("toUint8Array", function() {
+          return toUint8Array(this);
+        });
+      };
+      var extendUint8Array = function() {
+        var _add = function(name, body) {
+          return Object.defineProperty(Uint8Array.prototype, name, _noEnum(body));
+        };
+        _add("toBase64", function(urlsafe) {
+          return fromUint8Array(this, urlsafe);
+        });
+        _add("toBase64URI", function() {
+          return fromUint8Array(this, true);
+        });
+        _add("toBase64URL", function() {
+          return fromUint8Array(this, true);
+        });
+      };
+      var extendBuiltins = function() {
+        extendString();
+        extendUint8Array();
+      };
+      var gBase64 = {
+        version,
+        VERSION,
+        atob: _atob,
+        atobPolyfill,
+        btoa: _btoa,
+        btoaPolyfill,
+        fromBase64: decode2,
+        toBase64: encode3,
+        encode: encode3,
+        encodeURI,
+        encodeURL: encodeURI,
+        utob,
+        btou,
+        decode: decode2,
+        isValid,
+        fromUint8Array,
+        toUint8Array,
+        extendString,
+        extendUint8Array,
+        extendBuiltins
+      };
+      gBase64.Base64 = {};
+      Object.keys(gBase64).forEach(function(k) {
+        return gBase64.Base64[k] = gBase64[k];
+      });
+      return gBase64;
+    });
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/flatten-params.js
+var require_flatten_params = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/flatten-params.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.toURLSearchParams = toURLSearchParams2;
+    var _jsBase = require_base64();
+    function flattenParams(data, path2 = "") {
+      const params = {};
+      Object.entries(data).forEach(([key, value]) => {
+        const isObject2 = value !== null && typeof value === "object" && !Array.isArray(value);
+        const fieldPath = resolvePath(path2, key);
+        if (isObject2) {
+          const serializedObject = flattenParams(value, fieldPath);
+          Object.assign(params, serializedObject);
+        } else {
+          params[fieldPath] = value;
+        }
+      });
+      return params;
+    }
+    function resolvePath(path2, key) {
+      return `${path2}${path2 ? "." : ""}${key}`;
+    }
+    function toURLSearchParams2(params, isComplexRequest) {
+      const flatten = flattenParams(params);
+      const searchParams = Object.entries(flatten).reduce((urlSearchParams, [key, value]) => {
+        const keyParams = Array.isArray(value) ? value : [value];
+        keyParams.forEach((param) => {
+          if (param === void 0 || param === null || Array.isArray(value) && typeof param === "object") {
+            return;
+          }
+          urlSearchParams.append(key, param);
+        });
+        return urlSearchParams;
+      }, new URLSearchParams());
+      if (isComplexRequest) {
+        searchParams.append(".r", (0, _jsBase.encode)(JSON.stringify(params), true));
+      }
+      return searchParams;
+    }
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/index.js
+var require_cjs = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/index.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    var _serialization = require_serialization();
+    Object.keys(_serialization).forEach(function(key) {
+      if (key === "default" || key === "__esModule") return;
+      if (key in exports && exports[key] === _serialization[key]) return;
+      exports[key] = _serialization[key];
+    });
+    var _urlResolver = require_url_resolver();
+    Object.keys(_urlResolver).forEach(function(key) {
+      if (key === "default" || key === "__esModule") return;
+      if (key in exports && exports[key] === _urlResolver[key]) return;
+      exports[key] = _urlResolver[key];
+    });
+    var _flattenParams = require_flatten_params();
+    Object.keys(_flattenParams).forEach(function(key) {
+      if (key === "default" || key === "__esModule") return;
+      if (key in exports && exports[key] === _flattenParams[key]) return;
+      exports[key] = _flattenParams[key];
+    });
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/serializer/domain.js
+var require_domain = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/serializer/domain.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.ConverterType = void 0;
+    var ConverterType = exports.ConverterType = /* @__PURE__ */ function(ConverterType2) {
+      ConverterType2[ConverterType2["TO_JSON"] = 0] = "TO_JSON";
+      ConverterType2[ConverterType2["FROM_JSON"] = 1] = "FROM_JSON";
+      return ConverterType2;
+    }({});
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/serializer/serializer.js
+var require_serializer = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/serializer/serializer.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.schemaSerializer = schemaSerializer;
+    var _ = require_cjs();
+    function schemaSerializer(rootSchema, depSchemas = {}, converterSets) {
+      return function serialize(json = {}, converterType) {
+        return typeof json === "string" ? json : transformSchema(rootSchema, json);
+        function transformSchema(schema, payload) {
+          const result = {};
+          if ([null, void 0].includes(payload)) {
+            return payload;
+          }
+          Object.entries(payload).forEach(([key, val]) => {
+            var _getConverter;
+            const renderedSchemaName = schema[key];
+            const {
+              schemaName,
+              schemaType
+            } = (0, _.parseLeanSchemaRef)(renderedSchemaName);
+            const isMap = schemaType === "Map";
+            const isRepeatable = ((_getConverter = getConverter(schemaName)) == null || _getConverter.checkRepetable == null ? void 0 : _getConverter.checkRepetable(val)) ?? Array.isArray(val);
+            let parsedValue;
+            if (isRepeatable) {
+              parsedValue = val.map((v) => applyField(v, schemaName));
+            } else if (isMap) {
+              parsedValue = applyFieldOnMap(val, schemaName);
+            } else {
+              parsedValue = applyField(val, schemaName);
+            }
+            result[key] = parsedValue;
+          });
+          return result;
+        }
+        function applyField(val, schemaOrSerializer) {
+          if (!schemaOrSerializer) {
+            return val;
+          }
+          const maybeSchema = depSchemas[schemaOrSerializer];
+          const maybeConverter = getConverter(schemaOrSerializer);
+          if (maybeConverter) {
+            return getConverter(schemaOrSerializer).transform(val);
+          } else if (maybeSchema) {
+            return transformSchema(maybeSchema, val);
+          }
+          throw new Error(`${schemaOrSerializer} is neither schema nor serializable type`);
+        }
+        function getConverter(name) {
+          var _converterSets$name;
+          return (_converterSets$name = converterSets[name]) == null ? void 0 : _converterSets$name[converterType];
+        }
+        function applyFieldOnMap(val, sanitizedSchemaOrSerializer) {
+          return Object.entries(val).reduce((acc, [propertyName, value]) => {
+            acc[propertyName] = applyField(value, sanitizedSchemaOrSerializer);
+            return acc;
+          }, {});
+        }
+      };
+    }
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/serializer/protobuf-converters/timestamp.js
+var require_timestamp = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/serializer/protobuf-converters/timestamp.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.timestamp = void 0;
+    var _domain = require_domain();
+    var timestamp = exports.timestamp = {
+      types: ["google.protobuf.Timestamp"],
+      [_domain.ConverterType.TO_JSON]: {
+        transform: (val) => !val ? val : val.toISOString()
+      },
+      [_domain.ConverterType.FROM_JSON]: {
+        transform: (val) => val ? new Date(val) : val
+      }
+    };
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/serializer/protobuf-converters/field-mask.js
+var require_field_mask = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/serializer/protobuf-converters/field-mask.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.fieldMask = void 0;
+    var _domain = require_domain();
+    var fieldMask = exports.fieldMask = {
+      types: ["google.protobuf.FieldMask"],
+      [_domain.ConverterType.TO_JSON]: {
+        transform: (val) => val.join(","),
+        /**
+         * This one handles cases where we have a repeated google.protobuf.FieldMask type,
+         * so it will look like: [['foo', 'bar'], ['qux']].
+         *
+         * The problem is that the serializer detects it as an array with actual fields (strings),
+         * while in practice it is an array of multiple google.protobuf.FieldMask.
+         *
+         * We should determine if the items are actual fields (so each item is a string),
+         * or arrays of google.protobuf.FieldMask (so each item is array that has items with fields).
+         *
+         * Another approach could be marking on the schama itseld each field if it's a repeatable or not,
+         * it's not a good appraoch, but as long as google.protobuf.FieldMask is our only issue, it's
+         * not _that_ bad solution.
+         */
+        checkRepetable: (val) => {
+          return val.some((v) => Array.isArray(v));
+        }
+      },
+      [_domain.ConverterType.FROM_JSON]: {
+        transform: (val) => {
+          if (typeof val === "object") {
+            return val.paths;
+          }
+          return val.split(",");
+        }
+      }
+    };
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/serializer/protobuf-converters/bytes.js
+var require_bytes = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/serializer/protobuf-converters/bytes.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.bytes = void 0;
+    var _domain = require_domain();
+    var bytes = exports.bytes = {
+      types: ["google.protobuf.BytesValue", "BYTES"],
+      [_domain.ConverterType.TO_JSON]: {
+        transform: (val) => {
+          const chars = val.reduce((res, c) => res + String.fromCharCode(c), "");
+          return btoa(chars);
+        }
+      },
+      [_domain.ConverterType.FROM_JSON]: {
+        transform: (val) => {
+          return Uint8Array.from(atob(val), (c) => c.charCodeAt(0));
+        }
+      }
+    };
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/serializer/protobuf-converters/duration.js
+var require_duration = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/serializer/protobuf-converters/duration.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.duration = void 0;
+    var _domain = require_domain();
+    var duration = exports.duration = {
+      types: ["google.protobuf.Duration"],
+      [_domain.ConverterType.TO_JSON]: {
+        transform: ({
+          seconds = "0",
+          nanos = 0
+        }) => {
+          let nanosPortion = "";
+          if (nanos !== 0) {
+            nanosPortion = `.${nanos.toString().padStart(9, "0")}`;
+          }
+          return `${seconds}${nanosPortion}s`;
+        }
+      },
+      [_domain.ConverterType.FROM_JSON]: {
+        transform: (val) => {
+          const [seconds, nanos] = val.substring(0, val.length - 1).split(".");
+          return {
+            seconds,
+            nanos: nanosForString(nanos)
+          };
+        }
+      }
+    };
+    function nanosForString(nanos) {
+      let res = 0;
+      if (nanos !== void 0) {
+        const precision = 3 - nanos.length / 3;
+        res = parseInt(nanos, 10) * Math.pow(1e3, precision);
+      }
+      return res;
+    }
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/serializer/protobuf-converters/float.js
+var require_float = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/serializer/protobuf-converters/float.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.float = void 0;
+    var _domain = require_domain();
+    var float = exports.float = {
+      types: ["FLOAT", "DOUBLE", "google.protobuf.FloatValue", "google.protobuf.DoubleValue"],
+      [_domain.ConverterType.TO_JSON]: {
+        transform: (val) => {
+          return isFinite(val) ? val : val.toString();
+        }
+      },
+      [_domain.ConverterType.FROM_JSON]: {
+        transform: (val) => {
+          if (val === "NaN") {
+            return NaN;
+          }
+          if (val === "Infinity") {
+            return Infinity;
+          }
+          if (val === "-Infinity") {
+            return -Infinity;
+          }
+          return val;
+        }
+      }
+    };
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/serializer/protobuf-converters/converters.js
+var require_converters = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/serializer/protobuf-converters/converters.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.protobufConverters = void 0;
+    var _timestamp = require_timestamp();
+    var _fieldMask = require_field_mask();
+    var _bytes = require_bytes();
+    var _duration = require_duration();
+    var _float = require_float();
+    var protobufConverters = exports.protobufConverters = [_timestamp.timestamp, _fieldMask.fieldMask, _bytes.bytes, _duration.duration, _float.float];
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/serializer/utils.js
+var require_utils3 = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/serializer/utils.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.typeToConverterSet = typeToConverterSet;
+    function typeToConverterSet(converterSets) {
+      return converterSets.reduce((result, converterSet) => {
+        const types = converterSet.types.reduce((typeResult, type) => {
+          return {
+            ...typeResult,
+            [type]: converterSet
+          };
+        }, {});
+        return {
+          ...result,
+          ...types
+        };
+      }, {});
+    }
+  }
+});
+
+// ../../node_modules/@wix/metro-runtime/dist/cjs/ambassador-index.js
+var require_ambassador_index = __commonJS({
+  "../../node_modules/@wix/metro-runtime/dist/cjs/ambassador-index.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    exports.__esModule = true;
+    exports.serializer = serializer2;
+    var _domain = require_domain();
+    var _serializer = require_serializer();
+    var _converters = require_converters();
+    var _utils = require_utils3();
+    var ambassadorConverters = (0, _utils.typeToConverterSet)([..._converters.protobufConverters]);
+    function serializer2(rootSchema, depSchemas = {}) {
+      const transform = (0, _serializer.schemaSerializer)(rootSchema, depSchemas, ambassadorConverters);
+      return {
+        fromJSON(jsonOrString) {
+          const jsonOrText = safeJsonParse(jsonOrString) || jsonOrString;
+          return transform(jsonOrText, _domain.ConverterType.FROM_JSON);
+        },
+        toJSON(json) {
+          return transform(json, _domain.ConverterType.TO_JSON);
+        }
+      };
+    }
+    function safeJsonParse(someString) {
+      try {
+        return JSON.parse(someString);
+      } catch (error) {
+      }
+    }
+  }
+});
+
+// ../../node_modules/@wix/ambassador-blocks-v1-application-structure/build/cjs/http.impl.js
+var require_http_impl = __commonJS({
+  "../../node_modules/@wix/ambassador-blocks-v1-application-structure/build/cjs/http.impl.js"(exports) {
+    "use strict";
+    init_esm_shims();
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.getApplicationStructure = void 0;
+    var metro_runtime_1 = require_cjs();
+    var ambassador_1 = require_ambassador_index();
+    var metro_runtime_2 = require_cjs();
+    var _getApplicationStructureRequest = {};
+    var _getApplicationStructureResponse = {};
+    function resolveWixBlocksApplicationStructureV1ApplicationServiceUrl(opts) {
+      var domainToMappings = {
+        "www.wixapis.com": [
+          {
+            srcPath: "/blocks/blocks-application-structure",
+            destPath: ""
+          }
+        ]
+      };
+      return (0, metro_runtime_2.resolveUrl)(Object.assign(opts, { domainToMappings }));
+    }
+    function getApplicationStructure2(payload) {
+      var _a = (0, ambassador_1.serializer)(_getApplicationStructureRequest, {}), toReq = _a.toJSON, fromReq = _a.fromJSON;
+      var fromRes = (0, ambassador_1.serializer)(_getApplicationStructureResponse, {}).fromJSON;
+      function __getApplicationStructure(_a2) {
+        var host = _a2.host;
+        var serializedData = toReq(payload);
+        var metadata = {
+          entityFqdn: "wix.blocks.v1.application_structure",
+          method: "GET",
+          methodFqn: "wix.blocks_application_structure.v1.ApplicationService.GetApplicationStructure",
+          url: resolveWixBlocksApplicationStructureV1ApplicationServiceUrl({
+            protoPath: "/v1/app/{appDefId}/{revision}",
+            data: serializedData,
+            host
+          }),
+          params: (0, metro_runtime_1.toURLSearchParams)(serializedData),
+          transformResponse: fromRes
+        };
+        return metadata;
+      }
+      __getApplicationStructure.fromReq = fromReq;
+      __getApplicationStructure.__isAmbassador = true;
+      return __getApplicationStructure;
+    }
+    exports.getApplicationStructure = getApplicationStructure2;
+  }
+});
+
 // ../../node_modules/negotiator/lib/charset.js
 var require_charset = __commonJS({
   "../../node_modules/negotiator/lib/charset.js"(exports, module) {
@@ -671,7 +1482,7 @@ var require_base64id = __commonJS({
     };
     Base64Id.prototype.getRandomBytes = function(bytes) {
       var BUFFER_SIZE = 4096;
-      var self = this;
+      var self2 = this;
       bytes = bytes || 12;
       if (bytes > BUFFER_SIZE) {
         return crypto.randomBytes(bytes);
@@ -692,9 +1503,9 @@ var require_base64id = __commonJS({
         if (!this.isGeneratingBytes) {
           this.isGeneratingBytes = true;
           crypto.randomBytes(BUFFER_SIZE, function(err, bytes2) {
-            self.bytesBuffer = bytes2;
-            self.bytesBufferIndex = 0;
-            self.isGeneratingBytes = false;
+            self2.bytesBuffer = bytes2;
+            self2.bytesBufferIndex = 0;
+            self2.isGeneratingBytes = false;
           });
         }
         if (this.bytesBufferIndex == -1) {
@@ -848,7 +1659,7 @@ var require_decodePacket = __commonJS({
 });
 
 // ../../node_modules/engine.io-parser/build/cjs/index.js
-var require_cjs = __commonJS({
+var require_cjs2 = __commonJS({
   "../../node_modules/engine.io-parser/build/cjs/index.js"(exports) {
     "use strict";
     init_esm_shims();
@@ -1511,12 +2322,12 @@ var require_common = __commonJS({
           if (!debug11.enabled) {
             return;
           }
-          const self = debug11;
+          const self2 = debug11;
           const curr = Number(/* @__PURE__ */ new Date());
           const ms = curr - (prevTime || curr);
-          self.diff = ms;
-          self.prev = prevTime;
-          self.curr = curr;
+          self2.diff = ms;
+          self2.prev = prevTime;
+          self2.curr = curr;
           prevTime = curr;
           args[0] = createDebug.coerce(args[0]);
           if (typeof args[0] !== "string") {
@@ -1531,15 +2342,15 @@ var require_common = __commonJS({
             const formatter = createDebug.formatters[format];
             if (typeof formatter === "function") {
               const val = args[index];
-              match4 = formatter.call(self, val);
+              match4 = formatter.call(self2, val);
               args.splice(index, 1);
               index--;
             }
             return match4;
           });
-          createDebug.formatArgs.call(self, args);
-          const logFn = self.log || createDebug.log;
-          logFn.apply(self, args);
+          createDebug.formatArgs.call(self2, args);
+          const logFn = self2.log || createDebug.log;
+          logFn.apply(self2, args);
         }
         debug11.namespace = namespace;
         debug11.useColors = createDebug.useColors();
@@ -2007,7 +2818,7 @@ var require_transport = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Transport = void 0;
     var events_1 = __require("events");
-    var parser_v4 = require_cjs();
+    var parser_v4 = require_cjs2();
     var parser_v3 = require_parser_v3();
     var debug_1 = require_src();
     var debug11 = (0, debug_1.default)("engine:transport");
@@ -2621,7 +3432,7 @@ var require_webtransport = __commonJS({
     exports.WebTransport = void 0;
     var transport_1 = require_transport();
     var debug_1 = require_src();
-    var engine_io_parser_1 = require_cjs();
+    var engine_io_parser_1 = require_cjs2();
     var debug11 = (0, debug_1.default)("engine:webtransport");
     var WebTransport2 = class extends transport_1.Transport {
       constructor(session, stream, reader) {
@@ -7049,7 +7860,7 @@ var require_server = __commonJS({
     var cookie_1 = require_cookie();
     var ws_1 = require_ws();
     var webtransport_1 = require_webtransport();
-    var engine_io_parser_1 = require_cjs();
+    var engine_io_parser_1 = require_cjs2();
     var debug11 = (0, debug_1.default)("engine");
     var kResponseHeaders = Symbol("responseHeaders");
     function parseSessionId(data) {
@@ -7112,11 +7923,11 @@ var require_server = __commonJS({
        * @protected
        */
       _computePath(options) {
-        let path3 = (options.path || "/engine.io").replace(/\/$/, "");
+        let path2 = (options.path || "/engine.io").replace(/\/$/, "");
         if (options.addTrailingSlash !== false) {
-          path3 += "/";
+          path2 += "/";
         }
-        return path3;
+        return path2;
       }
       /**
        * Returns a list of available transports for upgrade given a certain transport.
@@ -7631,10 +8442,10 @@ var require_server = __commonJS({
        * @api public
        */
       attach(server, options = {}) {
-        const path3 = this._computePath(options);
+        const path2 = this._computePath(options);
         const destroyUpgradeTimeout = options.destroyUpgradeTimeout || 1e3;
         function check(req) {
-          return path3 === req.url.slice(0, path3.length);
+          return path2 === req.url.slice(0, path2.length);
         }
         const listeners = server.listeners("request").slice(0);
         server.removeAllListeners("request");
@@ -7642,7 +8453,7 @@ var require_server = __commonJS({
         server.on("listening", this.init.bind(this));
         server.on("request", (req, res) => {
           if (check(req)) {
-            debug11('intercepting request for path "%s"', path3);
+            debug11('intercepting request for path "%s"', path2);
             this.handleRequest(req, res);
           } else {
             let i2 = 0;
@@ -8492,8 +9303,8 @@ var require_userver = __commonJS({
        * @param options
        */
       attach(app, options = {}) {
-        const path3 = this._computePath(options);
-        app.any(path3, this.handleRequest.bind(this)).ws(path3, {
+        const path2 = this._computePath(options);
+        app.any(path2, this.handleRequest.bind(this)).ws(path2, {
           compression: options.compression,
           idleTimeout: options.idleTimeout,
           maxBackpressure: options.maxBackpressure,
@@ -8719,7 +9530,7 @@ var require_engine_io = __commonJS({
     } });
     var index_1 = require_transports();
     exports.transports = index_1.default;
-    var parser = require_cjs();
+    var parser = require_cjs2();
     exports.parser = parser;
     var userver_1 = require_userver();
     Object.defineProperty(exports, "uServer", { enumerable: true, get: function() {
@@ -8998,12 +9809,12 @@ var require_common2 = __commonJS({
           if (!debug11.enabled) {
             return;
           }
-          const self = debug11;
+          const self2 = debug11;
           const curr = Number(/* @__PURE__ */ new Date());
           const ms = curr - (prevTime || curr);
-          self.diff = ms;
-          self.prev = prevTime;
-          self.curr = curr;
+          self2.diff = ms;
+          self2.prev = prevTime;
+          self2.curr = curr;
           prevTime = curr;
           args[0] = createDebug.coerce(args[0]);
           if (typeof args[0] !== "string") {
@@ -9018,15 +9829,15 @@ var require_common2 = __commonJS({
             const formatter = createDebug.formatters[format];
             if (typeof formatter === "function") {
               const val = args[index];
-              match4 = formatter.call(self, val);
+              match4 = formatter.call(self2, val);
               args.splice(index, 1);
               index--;
             }
             return match4;
           });
-          createDebug.formatArgs.call(self, args);
-          const logFn = self.log || createDebug.log;
-          logFn.apply(self, args);
+          createDebug.formatArgs.call(self2, args);
+          const logFn = self2.log || createDebug.log;
+          logFn.apply(self2, args);
         }
         debug11.namespace = namespace;
         debug11.useColors = createDebug.useColors();
@@ -9487,7 +10298,7 @@ var require_src2 = __commonJS({
 });
 
 // ../../node_modules/socket.io-parser/build/cjs/index.js
-var require_cjs2 = __commonJS({
+var require_cjs3 = __commonJS({
   "../../node_modules/socket.io-parser/build/cjs/index.js"(exports) {
     "use strict";
     init_esm_shims();
@@ -9798,12 +10609,12 @@ var require_common3 = __commonJS({
           if (!debug11.enabled) {
             return;
           }
-          const self = debug11;
+          const self2 = debug11;
           const curr = Number(/* @__PURE__ */ new Date());
           const ms = curr - (prevTime || curr);
-          self.diff = ms;
-          self.prev = prevTime;
-          self.curr = curr;
+          self2.diff = ms;
+          self2.prev = prevTime;
+          self2.curr = curr;
           prevTime = curr;
           args[0] = createDebug.coerce(args[0]);
           if (typeof args[0] !== "string") {
@@ -9818,15 +10629,15 @@ var require_common3 = __commonJS({
             const formatter = createDebug.formatters[format];
             if (typeof formatter === "function") {
               const val = args[index];
-              match4 = formatter.call(self, val);
+              match4 = formatter.call(self2, val);
               args.splice(index, 1);
               index--;
             }
             return match4;
           });
-          createDebug.formatArgs.call(self, args);
-          const logFn = self.log || createDebug.log;
-          logFn.apply(self, args);
+          createDebug.formatArgs.call(self2, args);
+          const logFn = self2.log || createDebug.log;
+          logFn.apply(self2, args);
         }
         debug11.namespace = namespace;
         debug11.useColors = createDebug.useColors();
@@ -10293,7 +11104,7 @@ var require_client = __commonJS({
     init_esm_shims();
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Client = void 0;
-    var socket_io_parser_1 = require_cjs2();
+    var socket_io_parser_1 = require_cjs3();
     var debugModule11 = require_src3();
     var url2 = __require("url");
     var debug11 = debugModule11("socket.io:client");
@@ -10626,7 +11437,7 @@ var require_broadcast_operator = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.RemoteSocket = exports.BroadcastOperator = void 0;
     var socket_1 = require_socket2();
-    var socket_io_parser_1 = require_cjs2();
+    var socket_io_parser_1 = require_cjs3();
     var BroadcastOperator = class _BroadcastOperator {
       constructor(adapter, rooms = /* @__PURE__ */ new Set(), exceptRooms = /* @__PURE__ */ new Set(), flags = {}) {
         this.adapter = adapter;
@@ -11058,7 +11869,7 @@ var require_socket2 = __commonJS({
     };
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Socket = exports.RESERVED_EVENTS = void 0;
-    var socket_io_parser_1 = require_cjs2();
+    var socket_io_parser_1 = require_cjs3();
     var debug_1 = __importDefault(require_src3());
     var typed_events_1 = require_typed_events();
     var base64id_1 = __importDefault(require_base64id());
@@ -11470,14 +12281,14 @@ var require_socket2 = __commonJS({
        * @private
        */
       ack(id) {
-        const self = this;
+        const self2 = this;
         let sent = false;
         return function() {
           if (sent)
             return;
           const args = Array.prototype.slice.call(arguments);
           debug11("sending ack %j", args);
-          self.packet({
+          self2.packet({
             id,
             type: socket_io_parser_1.PacketType.ACK,
             data: args
@@ -16656,7 +17467,7 @@ var require_dist2 = __commonJS({
     var zlib_1 = __require("zlib");
     var accepts = require_accepts();
     var stream_1 = __require("stream");
-    var path3 = __require("path");
+    var path2 = __require("path");
     var engine_io_1 = require_engine_io();
     var client_1 = require_client();
     var events_1 = __require("events");
@@ -16666,7 +17477,7 @@ var require_dist2 = __commonJS({
     } });
     var parent_namespace_1 = require_parent_namespace();
     var socket_io_adapter_1 = require_dist();
-    var parser = __importStar(require_cjs2());
+    var parser = __importStar(require_cjs3());
     var debug_1 = __importDefault(require_src3());
     var socket_1 = require_socket2();
     Object.defineProperty(exports, "Socket", { enumerable: true, get: function() {
@@ -16846,7 +17657,7 @@ var require_dist2 = __commonJS({
             res.writeHeader("cache-control", "public, max-age=0");
             res.writeHeader("content-type", "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8");
             res.writeHeader("etag", expectedEtag);
-            const filepath = path3.join(__dirname, "../client-dist/", filename);
+            const filepath = path2.join(__dirname, "../client-dist/", filename);
             (0, uws_1.serveFile)(res, filepath);
           });
         }
@@ -16928,7 +17739,7 @@ var require_dist2 = __commonJS({
        * @private
        */
       static sendFile(filename, req, res) {
-        const readStream = (0, fs_1.createReadStream)(path3.join(__dirname, "../client-dist/", filename));
+        const readStream = (0, fs_1.createReadStream)(path2.join(__dirname, "../client-dist/", filename));
         const encoding = accepts(req).encodings(["br", "gzip", "deflate"]);
         const onError = (err) => {
           if (err) {
@@ -17393,12 +18204,12 @@ var require_common4 = __commonJS({
           if (!debug11.enabled) {
             return;
           }
-          const self = debug11;
+          const self2 = debug11;
           const curr = Number(/* @__PURE__ */ new Date());
           const ms = curr - (prevTime || curr);
-          self.diff = ms;
-          self.prev = prevTime;
-          self.curr = curr;
+          self2.diff = ms;
+          self2.prev = prevTime;
+          self2.curr = curr;
           prevTime = curr;
           args[0] = createDebug.coerce(args[0]);
           if (typeof args[0] !== "string") {
@@ -17413,15 +18224,15 @@ var require_common4 = __commonJS({
             const formatter = createDebug.formatters[format];
             if (typeof formatter === "function") {
               const val = args[index];
-              match4 = formatter.call(self, val);
+              match4 = formatter.call(self2, val);
               args.splice(index, 1);
               index--;
             }
             return match4;
           });
-          createDebug.formatArgs.call(self, args);
-          const logFn = self.log || createDebug.log;
-          logFn.apply(self, args);
+          createDebug.formatArgs.call(self2, args);
+          const logFn = self2.log || createDebug.log;
+          logFn.apply(self2, args);
         }
         debug11.namespace = namespace;
         debug11.useColors = createDebug.useColors();
@@ -17894,7 +18705,7 @@ var require_XMLHttpRequest = __commonJS({
     function XMLHttpRequest(opts) {
       "use strict";
       opts = opts || {};
-      var self = this;
+      var self2 = this;
       var http = __require("http");
       var https = __require("https");
       var request;
@@ -18044,18 +18855,18 @@ var require_XMLHttpRequest = __commonJS({
           if (settings.async) {
             fs.readFile(unescape(url2.pathname), "utf8", function(error, data2) {
               if (error) {
-                self.handleError(error, error.errno || -1);
+                self2.handleError(error, error.errno || -1);
               } else {
-                self.status = 200;
-                self.responseText = data2;
-                setState(self.DONE);
+                self2.status = 200;
+                self2.responseText = data2;
+                setState(self2.DONE);
               }
             });
           } else {
             try {
               this.responseText = fs.readFileSync(unescape(url2.pathname), "utf8");
               this.status = 200;
-              setState(self.DONE);
+              setState(self2.DONE);
             } catch (e) {
               this.handleError(e, e.errno || -1);
             }
@@ -18107,7 +18918,7 @@ var require_XMLHttpRequest = __commonJS({
         if (settings.async) {
           var doRequest = ssl ? https.request : http.request;
           sendFlag = true;
-          self.dispatchEvent("readystatechange");
+          self2.dispatchEvent("readystatechange");
           var responseHandler = function(resp) {
             response = resp;
             if (response.statusCode === 302 || response.statusCode === 303 || response.statusCode === 307) {
@@ -18137,28 +18948,28 @@ var require_XMLHttpRequest = __commonJS({
             if (response && response.setEncoding) {
               response.setEncoding("utf8");
             }
-            setState(self.HEADERS_RECEIVED);
-            self.status = response.statusCode;
+            setState(self2.HEADERS_RECEIVED);
+            self2.status = response.statusCode;
             response.on("data", function(chunk) {
               if (chunk) {
-                self.responseText += chunk;
+                self2.responseText += chunk;
               }
               if (sendFlag) {
-                setState(self.LOADING);
+                setState(self2.LOADING);
               }
             });
             response.on("end", function() {
               if (sendFlag) {
                 sendFlag = false;
-                setState(self.DONE);
+                setState(self2.DONE);
               }
             });
             response.on("error", function(error) {
-              self.handleError(error);
+              self2.handleError(error);
             });
           };
           var errorHandler = function(error) {
-            self.handleError(error);
+            self2.handleError(error);
           };
           request = doRequest(options, responseHandler).on("error", errorHandler);
           if (opts.autoUnref) {
@@ -18170,7 +18981,7 @@ var require_XMLHttpRequest = __commonJS({
             request.write(data);
           }
           request.end();
-          self.dispatchEvent("loadstart");
+          self2.dispatchEvent("loadstart");
         } else {
           var contentFile = ".node-xmlhttprequest-content-" + process.pid;
           var syncFile = ".node-xmlhttprequest-sync-" + process.pid;
@@ -18180,16 +18991,16 @@ var require_XMLHttpRequest = __commonJS({
           var statusText;
           while (fs.existsSync(syncFile)) {
           }
-          self.responseText = fs.readFileSync(contentFile, "utf8");
+          self2.responseText = fs.readFileSync(contentFile, "utf8");
           syncProc.stdin.end();
           fs.unlinkSync(contentFile);
-          if (self.responseText.match(/^NODE-XMLHTTPREQUEST-ERROR:/)) {
-            var errorObj = self.responseText.replace(/^NODE-XMLHTTPREQUEST-ERROR:/, "");
-            self.handleError(errorObj, 503);
+          if (self2.responseText.match(/^NODE-XMLHTTPREQUEST-ERROR:/)) {
+            var errorObj = self2.responseText.replace(/^NODE-XMLHTTPREQUEST-ERROR:/, "");
+            self2.handleError(errorObj, 503);
           } else {
-            self.status = self.responseText.replace(/^NODE-XMLHTTPREQUEST-STATUS:([0-9]*),.*/, "$1");
-            self.responseText = self.responseText.replace(/^NODE-XMLHTTPREQUEST-STATUS:[0-9]*,(.*)/, "$1");
-            setState(self.DONE);
+            self2.status = self2.responseText.replace(/^NODE-XMLHTTPREQUEST-STATUS:([0-9]*),.*/, "$1");
+            self2.responseText = self2.responseText.replace(/^NODE-XMLHTTPREQUEST-STATUS:[0-9]*,(.*)/, "$1");
+            setState(self2.DONE);
           }
         }
       };
@@ -18229,33 +19040,33 @@ var require_XMLHttpRequest = __commonJS({
         }
       };
       this.dispatchEvent = function(event) {
-        if (typeof self["on" + event] === "function") {
+        if (typeof self2["on" + event] === "function") {
           if (this.readyState === this.DONE)
             setImmediate(function() {
-              self["on" + event]();
+              self2["on" + event]();
             });
           else
-            self["on" + event]();
+            self2["on" + event]();
         }
         if (event in listeners) {
           for (let i2 = 0, len = listeners[event].length; i2 < len; i2++) {
             if (this.readyState === this.DONE)
               setImmediate(function() {
-                listeners[event][i2].call(self);
+                listeners[event][i2].call(self2);
               });
             else
-              listeners[event][i2].call(self);
+              listeners[event][i2].call(self2);
           }
         }
       };
       var setState = function(state) {
-        if (self.readyState === state || self.readyState === self.UNSENT && abortedFlag)
+        if (self2.readyState === state || self2.readyState === self2.UNSENT && abortedFlag)
           return;
-        self.readyState = state;
-        if (settings.async || self.readyState < self.OPENED || self.readyState === self.DONE) {
-          self.dispatchEvent("readystatechange");
+        self2.readyState = state;
+        if (settings.async || self2.readyState < self2.OPENED || self2.readyState === self2.DONE) {
+          self2.dispatchEvent("readystatechange");
         }
-        if (self.readyState === self.DONE) {
+        if (self2.readyState === self2.DONE) {
           let fire;
           if (abortedFlag)
             fire = "abort";
@@ -18263,8 +19074,8 @@ var require_XMLHttpRequest = __commonJS({
             fire = "error";
           else
             fire = "load";
-          self.dispatchEvent(fire);
-          self.dispatchEvent("loadend");
+          self2.dispatchEvent(fire);
+          self2.dispatchEvent("loadend");
         }
       };
     }
@@ -21698,12 +22509,12 @@ var require_common5 = __commonJS({
           if (!debug11.enabled) {
             return;
           }
-          const self = debug11;
+          const self2 = debug11;
           const curr = Number(/* @__PURE__ */ new Date());
           const ms = curr - (prevTime || curr);
-          self.diff = ms;
-          self.prev = prevTime;
-          self.curr = curr;
+          self2.diff = ms;
+          self2.prev = prevTime;
+          self2.curr = curr;
           prevTime = curr;
           args[0] = createDebug.coerce(args[0]);
           if (typeof args[0] !== "string") {
@@ -21718,15 +22529,15 @@ var require_common5 = __commonJS({
             const formatter = createDebug.formatters[format];
             if (typeof formatter === "function") {
               const val = args[index];
-              match4 = formatter.call(self, val);
+              match4 = formatter.call(self2, val);
               args.splice(index, 1);
               index--;
             }
             return match4;
           });
-          createDebug.formatArgs.call(self, args);
-          const logFn = self.log || createDebug.log;
-          logFn.apply(self, args);
+          createDebug.formatArgs.call(self2, args);
+          const logFn = self2.log || createDebug.log;
+          logFn.apply(self2, args);
         }
         debug11.namespace = namespace;
         debug11.useColors = createDebug.useColors();
@@ -22655,17 +23466,19 @@ function useARMClient() {
   return (0, import_react.useMemo)(() => new ARMClient(httpClient), [httpClient]);
 }
 
-// src/blocks/useBlocksClient.ts
+// src/blocks/useBlocksServicesClient.ts
 init_esm_shims();
 var import_react2 = __toESM(require_react(), 1);
 
-// src/blocks/blocks-client.ts
+// src/blocks/blocks-services-client.ts
 init_esm_shims();
 
 // ../../node_modules/@wix/ambassador-blocks-v1-blocks-app/build/es/http.impl.js
 init_esm_shims();
 var _prepareExtensionsForRevisionRequest = {};
 var _prepareExtensionsForRevisionResponse = {};
+var _publishUpdateAppEventRequest = {};
+var _publishUpdateAppEventResponse = {};
 function resolveWixBlocksV1WixBlocksServiceUrl(opts) {
   var domainToMappings = {
     "editor._base_domain_": [
@@ -22721,6 +23534,12 @@ function resolveWixBlocksV1WixBlocksServiceUrl(opts) {
         srcPath: "/wix-blocks-service",
         destPath: ""
       }
+    ],
+    "www.wixapis.com": [
+      {
+        srcPath: "/blocks/wix-blocks-service",
+        destPath: ""
+      }
     ]
   };
   return resolveUrl(Object.assign(opts, { domainToMappings }));
@@ -22749,9 +23568,67 @@ function prepareExtensionsForRevision(payload) {
   __prepareExtensionsForRevision.__isAmbassador = true;
   return __prepareExtensionsForRevision;
 }
+function publishUpdateAppEvent(payload) {
+  var _a = serializer(_publishUpdateAppEventRequest, {}), toReq = _a.toJSON, fromReq = _a.fromJSON;
+  var fromRes = serializer(_publishUpdateAppEventResponse, {}).fromJSON;
+  function __publishUpdateAppEvent(_a2) {
+    var host = _a2.host;
+    var serializedData = toReq(payload);
+    var metadata = {
+      entityFqdn: "wix.blocks.v1.blocks_app",
+      method: "POST",
+      methodFqn: "wix.blocks.v1.WixBlocksService.PublishUpdateAppEvent",
+      url: resolveWixBlocksV1WixBlocksServiceUrl({
+        protoPath: "/api/v1/apps/{appDefId}/publish-update-app-event",
+        data: serializedData,
+        host
+      }),
+      data: serializedData,
+      transformResponse: fromRes
+    };
+    return metadata;
+  }
+  __publishUpdateAppEvent.fromReq = fromReq;
+  __publishUpdateAppEvent.__isAmbassador = true;
+  return __publishUpdateAppEvent;
+}
 
-// src/blocks/blocks-client.ts
-var BlocksClient = class {
+// src/blocks/blocks-services-client.ts
+var import_http_impl = __toESM(require_http_impl(), 1);
+var blocksStructureSchema = z.object({
+  applicationStructure: z.object({
+    widgets: z.record(
+      z.string(),
+      z.object({
+        elements: z.record(z.string()),
+        widgets: z.record(
+          z.string(),
+          z.object({
+            appDefId: z.string(),
+            widgetId: z.string()
+          })
+        )
+      })
+    ),
+    panels: z.record(
+      z.string(),
+      z.object({
+        elements: z.record(z.string())
+      })
+    )
+  })
+});
+var saveBlocksMainComponentId = async (projectFolder, blocksComponentsData) => {
+  const mainComponent = blocksComponentsData.find(
+    (blocksComponent) => blocksComponent.type === ComponentType.STUDIO
+  );
+  if (mainComponent?.id) {
+    await saveAppConfig(projectFolder, {
+      mainBlocksComponentId: mainComponent.id
+    });
+  }
+};
+var BlocksServicesClient = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
     const { minRetryTimeout } = getTestOverrides();
@@ -22762,10 +23639,15 @@ var BlocksClient = class {
     };
   }
   retryOptions;
-  getBlocksComponentsData = async (payload) => {
+  getBlocksComponentsData = async (appId, revision) => {
     try {
       const { data } = await pRetry(
-        () => this.httpClient.request(prepareExtensionsForRevision(payload)),
+        () => this.httpClient.request(
+          prepareExtensionsForRevision({
+            appDefId: appId,
+            documentRevision: revision
+          })
+        ),
         this.retryOptions
       );
       return data.extensionsForRevision ?? [];
@@ -22776,27 +23658,60 @@ var BlocksClient = class {
       });
     }
   };
+  prepareBlocksComponentsData = async ({
+    config,
+    projectFolder
+  }) => {
+    if (!config.blocks?.uiRevision) {
+      return [];
+    }
+    const blocksComponentsData = await this.getBlocksComponentsData(
+      config.appId,
+      config.blocks.uiRevision
+    );
+    await saveBlocksMainComponentId(projectFolder, blocksComponentsData);
+    return blocksComponentsData;
+  };
+  refreshBlocksInEditor = async (payload) => {
+    try {
+      await pRetry(
+        () => this.httpClient.request(publishUpdateAppEvent(payload)),
+        this.retryOptions
+      );
+    } catch (e) {
+      throw new CliError({
+        code: CliErrorCode.FailedToUpdateBlocksAfterSync(),
+        cause: e
+      });
+    }
+  };
+  getBlocksStructure = async (appId, revision) => {
+    try {
+      const { data } = await pRetry(
+        () => this.httpClient.request(
+          (0, import_http_impl.getApplicationStructure)({
+            appDefId: appId,
+            revision: Number(revision)
+          })
+        ),
+        this.retryOptions
+      );
+      return blocksStructureSchema.parse(data);
+    } catch (e) {
+      throw new CliError({
+        cause: e,
+        code: CliErrorCode.FailedToGetBlocksStructure()
+      });
+    }
+  };
 };
 
-// src/blocks/useBlocksClient.ts
-function useBlocksClient() {
-  const httpClient = useHttpClient({ type: "editor" });
-  return (0, import_react2.useMemo)(() => new BlocksClient(httpClient), [httpClient]);
+// src/blocks/useBlocksServicesClient.ts
+function useBlocksServicesClient() {
+  const httpClient = useHttpClient({ type: "api" });
+  return (0, import_react2.useMemo)(() => new BlocksServicesClient(httpClient), [httpClient]);
 }
 
-// src/blocks/saveBlocksMainComponentId.ts
-init_esm_shims();
-var saveBlocksMainComponentId = async (projectFolder, blocksComponentsData) => {
-  const mainComponent = blocksComponentsData?.find(
-    (blocksComponent) => blocksComponent.type === ComponentType.STUDIO
-  );
-  if (mainComponent?.id) {
-    await saveAppConfig(projectFolder, {
-      mainBlocksComponentId: mainComponent.id
-    });
-  }
-};
-
 // src/components/DevCommand/useArmUpdater.ts
 var createAppManifestWithBaseUrl = async (model, clientDevServerUrl, backendServerUrl, blocksComponents) => {
   const manifest = await createAppManifest({
@@ -22816,7 +23731,7 @@ var createAppManifestWithBaseUrl = async (model, clientDevServerUrl, backendServ
 };
 function useArmUpdater() {
   const { model } = useProjectModel();
-  const blocksClient = useBlocksClient();
+  const blocksServicesClient = useBlocksServicesClient();
   const writeDebugLog = useDebugLog();
   const { createAppRelease: createAppRelease2, updateAppRelease: updateAppRelease2 } = useARMClient();
   return (0, import_react3.useCallback)(
@@ -22828,14 +23743,7 @@ function useArmUpdater() {
       onError
     }) => {
       const { projectId } = model.config;
-      const blocksComponentsData = model.config.blocks?.uiRevision ? await blocksClient.getBlocksComponentsData({
-        appDefId: model.config.appId,
-        documentRevision: model.config.blocks.uiRevision
-      }) : void 0;
-      await saveBlocksMainComponentId(
-        model.projectFolder,
-        blocksComponentsData
-      );
+      const blocksComponentsData = await blocksServicesClient.prepareBlocksComponentsData(model);
       const appManifest = await createAppManifestWithBaseUrl(
         model,
         devServerUrl,
@@ -22868,13 +23776,8 @@ function useArmUpdater() {
             if (newModel.components.length === 0) {
               return;
             }
-            const blocksComponentsData2 = newModel.config.blocks?.uiRevision ? await blocksClient.getBlocksComponentsData({
-              appDefId: newModel.config.appId,
-              documentRevision: newModel.config.blocks.uiRevision
-            }) : void 0;
-            await saveBlocksMainComponentId(
-              model.projectFolder,
-              blocksComponentsData2
+            const blocksComponentsData2 = await blocksServicesClient.prepareBlocksComponentsData(
+              newModel
             );
             const updatedAppManifest = await createAppManifestWithBaseUrl(
               newModel,
@@ -22886,6 +23789,12 @@ function useArmUpdater() {
               await updateAppRelease2(updatedAppManifest, armTag);
             }
           }
+          if (changeType === "blocks-revision-changed") {
+            await blocksServicesClient.refreshBlocksInEditor({
+              armTag,
+              appDefId: newModel.config.appId
+            });
+          }
           onChange(changeType);
         } catch (e) {
           onError(e);
@@ -22893,7 +23802,13 @@ function useArmUpdater() {
       }).onError(onError);
       return armTag;
     },
-    [createAppRelease2, model, updateAppRelease2, writeDebugLog, blocksClient]
+    [
+      createAppRelease2,
+      model,
+      updateAppRelease2,
+      writeDebugLog,
+      blocksServicesClient
+    ]
   );
 }
 
@@ -24495,12 +25410,12 @@ function parse2(str) {
   uri.queryKey = queryKey(uri, uri["query"]);
   return uri;
 }
-function pathNames(obj, path3) {
-  const regx = /\/{2,9}/g, names = path3.replace(regx, "/").split("/");
-  if (path3.slice(0, 1) == "/" || path3.length === 0) {
+function pathNames(obj, path2) {
+  const regx = /\/{2,9}/g, names = path2.replace(regx, "/").split("/");
+  if (path2.slice(0, 1) == "/" || path2.length === 0) {
     names.splice(0, 1);
   }
-  if (path3.slice(-1) == "/") {
+  if (path2.slice(-1) == "/") {
     names.splice(names.length - 1, 1);
   }
   return names;
@@ -25054,7 +25969,7 @@ var protocol2 = Socket2.protocol;
 // ../../node_modules/socket.io-client/build/esm-debug/url.js
 var import_debug6 = __toESM(require_src5(), 1);
 var debug6 = (0, import_debug6.default)("socket.io-client:url");
-function url(uri, path3 = "", loc) {
+function url(uri, path2 = "", loc) {
   let obj = uri;
   loc = loc || typeof location !== "undefined" && location;
   if (null == uri)
@@ -25088,7 +26003,7 @@ function url(uri, path3 = "", loc) {
   obj.path = obj.path || "/";
   const ipv6 = obj.host.indexOf(":") !== -1;
   const host = ipv6 ? "[" + obj.host + "]" : obj.host;
-  obj.id = obj.protocol + "://" + host + ":" + obj.port + path3;
+  obj.id = obj.protocol + "://" + host + ":" + obj.port + path2;
   obj.href = obj.protocol + "://" + host + (loc && loc.port === obj.port ? "" : ":" + obj.port);
   return obj;
 }
@@ -25944,14 +26859,14 @@ var Socket3 = class extends Emitter {
    * @private
    */
   ack(id) {
-    const self = this;
+    const self2 = this;
     let sent = false;
     return function(...args) {
       if (sent)
         return;
       sent = true;
       debug8("sending ack %j", args);
-      self.packet({
+      self2.packet({
         type: PacketType.ACK,
         id,
         data: args
@@ -26414,11 +27329,11 @@ var Manager = class extends Emitter {
     debug9("opening %s", this.uri);
     this.engine = new Socket2(this.uri, this.opts);
     const socket = this.engine;
-    const self = this;
+    const self2 = this;
     this._readyState = "opening";
     this.skipReconnect = false;
     const openSubDestroy = on(socket, "open", function() {
-      self.onopen();
+      self2.onopen();
       fn && fn();
     });
     const onError = (err) => {
@@ -26615,7 +27530,7 @@ var Manager = class extends Emitter {
   reconnect() {
     if (this._reconnecting || this.skipReconnect)
       return this;
-    const self = this;
+    const self2 = this;
     if (this.backoff.attempts >= this._reconnectionAttempts) {
       debug9("reconnect failed");
       this.backoff.reset();
@@ -26626,21 +27541,21 @@ var Manager = class extends Emitter {
       debug9("will wait %dms before reconnect attempt", delay);
       this._reconnecting = true;
       const timer = this.setTimeoutFn(() => {
-        if (self.skipReconnect)
+        if (self2.skipReconnect)
           return;
         debug9("attempting reconnect");
-        this.emitReserved("reconnect_attempt", self.backoff.attempts);
-        if (self.skipReconnect)
+        this.emitReserved("reconnect_attempt", self2.backoff.attempts);
+        if (self2.skipReconnect)
           return;
-        self.open((err) => {
+        self2.open((err) => {
           if (err) {
             debug9("reconnect attempt error");
-            self._reconnecting = false;
-            self.reconnect();
+            self2._reconnecting = false;
+            self2.reconnect();
             this.emitReserved("reconnect_error", err);
           } else {
             debug9("reconnect success");
-            self.onreconnect();
+            self2.onreconnect();
           }
         });
       }, delay);
@@ -26678,8 +27593,8 @@ function lookup(uri, opts) {
   const parsed = url(uri, opts.path || "/socket.io");
   const source = parsed.source;
   const id = parsed.id;
-  const path3 = parsed.path;
-  const sameNamespace = cache[id] && path3 in cache[id]["nsps"];
+  const path2 = parsed.path;
+  const sameNamespace = cache[id] && path2 in cache[id]["nsps"];
   const newConnection = opts.forceNew || opts["force new connection"] || false === opts.multiplex || sameNamespace;
   let io2;
   if (newConnection) {
@@ -27169,73 +28084,11 @@ function useBlocksCLIDevServerProvider() {
   return context;
 }
 
-// src/blocks/useBlocksTypesUpdater.ts
+// src/blocks/BlocksTypesUpdater.tsx
 init_esm_shims();
 var import_react13 = __toESM(require_react(), 1);
 var import_variant4 = __toESM(require_lib(), 1);
-
-// src/blocks/blocks-type-updater.ts
-init_esm_shims();
-import path2, { parse as parse3 } from "node:path";
-
-// ../../node_modules/@wix/ambassador-blocks-v1-application-structure/build/es/http.impl.js
-init_esm_shims();
-var _getApplicationStructureRequest = {};
-var _getApplicationStructureResponse = {};
-function resolveWixBlocksApplicationStructureV1ApplicationServiceUrl(opts) {
-  var domainToMappings = {
-    "www.wixapis.com": [
-      {
-        srcPath: "/blocks/blocks-application-structure",
-        destPath: ""
-      }
-    ]
-  };
-  return resolveUrl(Object.assign(opts, { domainToMappings }));
-}
-function getApplicationStructure(payload) {
-  var _a = serializer(_getApplicationStructureRequest, {}), toReq = _a.toJSON, fromReq = _a.fromJSON;
-  var fromRes = serializer(_getApplicationStructureResponse, {}).fromJSON;
-  function __getApplicationStructure(_a2) {
-    var host = _a2.host;
-    var serializedData = toReq(payload);
-    var metadata = {
-      entityFqdn: "wix.blocks.v1.application_structure",
-      method: "GET",
-      methodFqn: "wix.blocks_application_structure.v1.ApplicationService.GetApplicationStructure",
-      url: resolveWixBlocksApplicationStructureV1ApplicationServiceUrl({
-        protoPath: "/v1/app/{appDefId}/{revision}",
-        data: serializedData,
-        host
-      }),
-      params: toURLSearchParams(serializedData),
-      transformResponse: fromRes
-    };
-    return metadata;
-  }
-  __getApplicationStructure.fromReq = fromReq;
-  __getApplicationStructure.__isAmbassador = true;
-  return __getApplicationStructure;
-}
-
-// src/blocks/blocks-type-updater.ts
-var blocksStructureSchema = z.object({
-  applicationStructure: z.object({
-    widgets: z.record(
-      z.string(),
-      z.object({
-        elements: z.record(z.string()),
-        widgets: z.record(
-          z.string(),
-          z.object({
-            appDefId: z.string(),
-            widgetId: z.string()
-          })
-        )
-      })
-    )
-  })
-});
+import { parse as parse3, relative } from "node:path";
 var getBlocksTypesContent = (structure) => `type ComponentsStructureMap = {
    ${Object.entries(structure.applicationStructure.widgets).map(([widgetId, { elements, widgets }]) => {
   const innerElements = [];
@@ -27248,13 +28101,22 @@ var getBlocksTypesContent = (structure) => `type ComponentsStructureMap = {
   return `"${widgetId}": {
           ${innerElements.join("\n")}
         };`;
+}).join("\n")}
+    ${Object.entries(structure.applicationStructure.panels).map(([widgetId, { elements }]) => {
+  const innerElements = [];
+  for (const [id, type] of Object.entries(elements)) {
+    innerElements.push(`"#${id}": ${type};`);
+  }
+  return `"${widgetId}": {
+          ${innerElements.join("\n")}
+        };`;
 }).join("\n")}
   };`;
 var getWidgetAPIContent = (blocksTypesFile, widgets) => {
   const { dir } = parse3(blocksTypesFile);
   return `type WidgetsAPIMap = {
     ${widgets.map(
-    (widget) => `"${widget.id}": typeof import('${path2.relative(
+    (widget) => `"${widget.id}": typeof import('${relative(
       dir,
       widget.apiPath
     )}').default._types;`
@@ -27268,93 +28130,44 @@ var getTypesFileContent = (widgetAPIContent, blocksTypeContent) => `/// <referen
     ${blocksTypeContent}
   }
 `;
-var BlocksTypesUpdater = class {
-  constructor(httpClient) {
-    this.httpClient = httpClient;
-    const { minRetryTimeout } = getTestOverrides();
-    this.retryOptions = {
-      retries: 3,
-      minTimeout: minRetryTimeout,
-      maxTimeout: 3 * 1e3
-    };
-  }
-  retryOptions;
-  getStructure = async (appId, revision) => {
-    try {
-      const { data } = await pRetry(
-        () => this.httpClient.request(
-          getApplicationStructure({ appDefId: appId, revision })
-        ),
-        this.retryOptions
-      );
-      return blocksStructureSchema.parse(data);
-    } catch (e) {
-      throw new CliError({
-        cause: e,
-        code: CliErrorCode.FailedToGetBlocksStructure()
-      });
-    }
-  };
-  updateTypes = async (appDefId, revision, projectFolder, widgets) => {
-    const appStructure = await this.getStructure(appDefId, Number(revision));
-    const blocksTypesFile = getBlocksTypesPath(projectFolder);
-    const widgetAPIContent = getWidgetAPIContent(blocksTypesFile, widgets);
-    const blocksTypeContent = getBlocksTypesContent(appStructure);
-    const typesContent = getTypesFileContent(
-      widgetAPIContent,
-      blocksTypeContent
-    );
-    await outputFile(blocksTypesFile, typesContent);
-  };
-};
-
-// src/blocks/useBlocksTypesUpdater.ts
-function useBlocksTypesUpdater() {
+var BlocksTypesUpdater = ({ logger, children }) => {
+  const { t } = useTranslation();
   const { model } = useProjectModel();
-  const httpClient = useHttpClient({ type: "api" });
-  const [blocksTypesUpdater] = (0, import_react13.useState)(
-    () => new BlocksTypesUpdater(httpClient)
-  );
-  return (0, import_react13.useCallback)(
-    async ({ projectModelWatcher, onError }) => {
-      const {
-        components,
-        config: { appId, blocks },
-        projectFolder
-      } = model;
+  const { reportError } = useErrorReporter();
+  const blocksServicesClient = useBlocksServicesClient();
+  (0, import_react13.useEffect)(() => {
+    const {
+      components,
+      config: { appId, blocks },
+      projectFolder
+    } = model;
+    const generateContent = async () => {
       if (blocks?.uiRevision) {
-        await blocksTypesUpdater.updateTypes(
+        const blocksStructure = await blocksServicesClient.getBlocksStructure(
           appId,
-          blocks.uiRevision,
-          projectFolder,
+          blocks.uiRevision
+        );
+        const blocksTypesFile = getBlocksTypesPath(projectFolder);
+        const widgetAPIContent = getWidgetAPIContent(
+          blocksTypesFile,
           components.filter((0, import_variant4.isType)(DevCenterComponent.BlocksWidget))
         );
+        const blocksTypeContent = getBlocksTypesContent(blocksStructure);
+        const typesContent = getTypesFileContent(
+          widgetAPIContent,
+          blocksTypeContent
+        );
+        await outputFile(blocksTypesFile, typesContent);
+        logger.info(t("dev_command.blocks_types_updated"));
       }
-      projectModelWatcher.onChange(async (newModel, changeType) => {
-        try {
-          if (changeType === "blocks-revision-changed") {
-            const {
-              components: components2,
-              config: { appId: appId2, blocks: blocks2 },
-              projectFolder: projectFolder2
-            } = newModel;
-            if (blocks2?.uiRevision) {
-              await blocksTypesUpdater.updateTypes(
-                appId2,
-                blocks2.uiRevision,
-                projectFolder2,
-                components2.filter((0, import_variant4.isType)(DevCenterComponent.BlocksWidget))
-              );
-            }
-          }
-        } catch (e) {
-          onError(e);
-        }
-      });
-    },
-    [model, blocksTypesUpdater]
-  );
-}
+    };
+    generateContent().catch((error) => {
+      reportError(error);
+      logger.info(/* @__PURE__ */ import_react13.default.createElement(ErrorViewer, { error }));
+    });
+  }, [model.config.blocks?.uiRevision]);
+  return /* @__PURE__ */ import_react13.default.createElement(import_react13.default.Fragment, null, children);
+};
 
 // src/components/DevCommand/DevEnvironment.tsx
 var DevEnvironmentContext = (0, import_react14.createContext)(null);
@@ -27366,9 +28179,8 @@ var DevEnvironmentProvider = ({ https, logger, children }) => {
   const createBackendDevServer = useBackendDevServer({ https });
   const startTunnel = useTunnel();
   const createArmUpdater = useArmUpdater();
-  const createBlocksTypesUpdater = useBlocksTypesUpdater();
   const createSiteOverrideUpdater = useSiteOverrideUpdater();
-  const { watcher: projectModelWatcher, model } = useProjectModel();
+  const { watcher: projectModelWatcher } = useProjectModel();
   const { status } = useAsync(async () => {
     let backendDevServerUrl;
     if (backendComponents.length > 0) {
@@ -27389,18 +28201,6 @@ var DevEnvironmentProvider = ({ https, logger, children }) => {
       projectModelWatcher,
       customLogger: logger
     });
-    const hasBlocksWidgets = model.components.some(
-      (0, import_variant5.isType)(DevCenterComponent.BlocksWidget)
-    );
-    if (hasBlocksWidgets) {
-      await createBlocksTypesUpdater({
-        projectModelWatcher,
-        onError(error) {
-          reportError(error);
-          logger.error(/* @__PURE__ */ import_react14.default.createElement(ErrorViewer, { error }));
-        }
-      });
-    }
     const armTag = await createArmUpdater({
       backendServerUrl: backendDevServerUrl,
       devServerUrl: clientDevServerUrl,
@@ -27458,7 +28258,7 @@ var DevEnvironmentProvider = ({ https, logger, children }) => {
       {
         value: { clientDevServerUrl, https: https2, logger }
       },
-      /* @__PURE__ */ import_react14.default.createElement(BlocksCLIDevServerProvider, { httpServer: clientDevServer.httpServer }, /* @__PURE__ */ import_react14.default.createElement(SiteOverrideProvider, { siteOverrideId }, /* @__PURE__ */ import_react14.default.createElement(ArmTagProvider, { armTag }, children)))
+      /* @__PURE__ */ import_react14.default.createElement(BlocksTypesUpdater, { logger }, /* @__PURE__ */ import_react14.default.createElement(BlocksCLIDevServerProvider, { httpServer: clientDevServer.httpServer }, /* @__PURE__ */ import_react14.default.createElement(SiteOverrideProvider, { siteOverrideId }, /* @__PURE__ */ import_react14.default.createElement(ArmTagProvider, { armTag }, children))))
     )
   });
 };
@@ -27882,8 +28682,7 @@ export {
   resolveConfiguredSite,
   ARMClient,
   useARMClient,
-  useBlocksClient,
-  saveBlocksMainComponentId,
+  useBlocksServicesClient,
   ArmTagProvider,
   useArmTag,
   useSiteOverrideClient,
@@ -27966,4 +28765,4 @@ xmlhttprequest-ssl/lib/XMLHttpRequest.js:
    * @license MIT
    *)
 */
-//# sourceMappingURL=chunk-SOL3VBMN.js.map
+//# sourceMappingURL=chunk-DHGAE3R5.js.map