@next-core/brick-kit 2.130.0 → 2.132.0

package/CHANGELOG.md

@@ -3,6 +3,45 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.132.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.131.1...@next-core/brick-kit@2.132.0) (2022-08-25)
+
+
+### Features
+
+* the next site in iframe and loading bar is triggered by outerside ([8bfc755](https://github.com/easyops-cn/next-core/commit/8bfc755ec0c73c8b2290a2b1d588e462c3c9d551))
+
+
+### Reverts
+
+* Revert "feat(): support MISC variable" ([a03e603](https://github.com/easyops-cn/next-core/commit/a03e60340c77b68e2cb11d2d4963b20110d1a845))
+
+
+
+
+
+## [2.131.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.131.0...@next-core/brick-kit@2.131.1) (2022-08-25)
+
+
+### Bug Fixes
+
+* preview error when legacy was iframe ([f79e45f](https://github.com/easyops-cn/next-core/commit/f79e45f5e09afa70a02912e6086f02947563312a))
+
+
+
+
+
+# [2.131.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.130.0...@next-core/brick-kit@2.131.0) (2022-08-25)
+
+
+### Features
+
+* context can track its deps now ([4993308](https://github.com/easyops-cn/next-core/commit/49933089e1ff6ec1ec5f01eeac5609dde07c1e2e))
+* support lazy context ([39fdffb](https://github.com/easyops-cn/next-core/commit/39fdffb0500df36d5bb9447d63a448bd2b78df14))
+
+
+
+
+
 # [2.130.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.129.3...@next-core/brick-kit@2.130.0) (2022-08-23)
 
 

package/dist/index.bundle.js

@@ -1564,44 +1564,6 @@
     });
   }
 
-  var misc;
-  function getRuntimeMisc() {
-    if (!misc) {
-      misc = {
-        isInIframe: false,
-        isInIframeOfSameSite: false,
-        isInIframeOfNext: false,
-        isInIframeOfVisualBuilder: false,
-        isInIframeOfLegacyConsole: false
-      };
-
-      if (window !== window.parent) {
-        misc.isInIframe = true;
-
-        try {
-          // Handle:
-          // - Previewing in visual builder by iframe.
-          // - Nesting next in next.
-          // - Nesting console in next.
-          if (window.origin === window.parent.origin) {
-            misc.isInIframeOfSameSite = true;
-            var selfIsNext = getBasePath() === "/next/";
-            var parentPathname = window.parent.location.pathname;
-            var parentIsNext = parentPathname.startsWith("/next/");
-            misc.isInIframeOfNext = (Number(selfIsNext) ^ Number(parentIsNext)) === 0;
-            misc.isInIframeOfVisualBuilder = parentPathname.startsWith("".concat(parentIsNext ? "/next" : "", "/visual-builder/"));
-            misc.isInIframeOfLegacyConsole = selfIsNext && !parentIsNext;
-          }
-        } catch (e) {// do nothing
-        }
-      }
-
-      Object.freeze(misc);
-    }
-
-    return misc;
-  }
-
   // `GeneralGlobals` are globals which are page-state-agnostic,
   // thus they can be used both in storyboard expressions and functions.
   function getGeneralGlobals(attemptToVisitGlobals, options) {
@@ -1654,9 +1616,6 @@
           getCssPropertyValue: collectCoverage ? () => "" : getCssPropertyValue
         };
 
-      case "RUNTIME_MISC":
-        return collectCoverage ? fakeRuntimeMisc() : getRuntimeMisc();
-
       case "console":
         return isStoryboardFunction ? getReadOnlyProxy(console) : undefined;
 
@@ -1692,16 +1651,6 @@
     return true;
   }
 
-  function fakeRuntimeMisc() {
-    return {
-      isInIframe: false,
-      isInIframeOfSameSite: false,
-      isInIframeOfNext: false,
-      isInIframeOfVisualBuilder: false,
-      isInIframeOfLegacyConsole: false
-    };
-  }
-
   /** @internal */
 
   /** @internal */
@@ -2040,7 +1989,7 @@
     }
 
     updateValue(name, value, method) {
-      var _item$eventTarget;
+      var _item$eventTarget2;
 
       if (!this.data.has(name)) {
         if (this.tplContextId) {
@@ -2064,6 +2013,22 @@
         return;
       }
 
+      if (method === "refresh") {
+        if (!item.refresh) {
+          throw new Error("You can not refresh the storyboard context \"".concat(name, "\" which has no resolve."));
+        }
+
+        item.refresh().then(val => {
+          var _item$eventTarget;
+
+          item.value = val;
+          (_item$eventTarget = item.eventTarget) === null || _item$eventTarget === void 0 ? void 0 : _item$eventTarget.dispatchEvent(new CustomEvent(this.tplContextId ? "state.change" : "context.change", {
+            detail: item.value
+          }));
+        }, handleHttpError);
+        return;
+      }
+
       if (method === "replace") {
         item.value = value;
       } else {
@@ -2076,7 +2041,7 @@
         }
       }
 
-      (_item$eventTarget = item.eventTarget) === null || _item$eventTarget === void 0 ? void 0 : _item$eventTarget.dispatchEvent(new CustomEvent(this.tplContextId ? "state.change" : "context.change", {
+      (_item$eventTarget2 = item.eventTarget) === null || _item$eventTarget2 === void 0 ? void 0 : _item$eventTarget2.dispatchEvent(new CustomEvent(this.tplContextId ? "state.change" : "context.change", {
         detail: item.value
       }));
     }
@@ -2157,30 +2122,65 @@
         return false;
       }
 
-      var isResolve = false;
-      var value = getDefinedTemplateState(!!storyboardContextWrapper.tplContextId, contextConf, brick);
+      var isTemplateState = !!storyboardContextWrapper.tplContextId;
+      var value = getDefinedTemplateState(isTemplateState, contextConf, brick);
+      var refresh = null;
+      var isLazyResolve = false;
 
       if (value === undefined) {
         if (contextConf.resolve) {
           if (looseCheckIf(contextConf.resolve, mergedContext)) {
-            isResolve = true;
-            var valueConf = {};
-            yield _internalApiGetResolver().resolveOne("reference", _objectSpread__default["default"]({
-              transform: "value",
-              transformMapArray: false
-            }, contextConf.resolve), valueConf, null, mergedContext);
-            value = valueConf.value;
+            refresh = /*#__PURE__*/function () {
+              var _ref = _asyncToGenerator__default["default"](function* () {
+                var valueConf = {};
+                yield _internalApiGetResolver().resolveOne("reference", _objectSpread__default["default"]({
+                  transform: "value",
+                  transformMapArray: false
+                }, contextConf.resolve), valueConf, null, mergedContext);
+                return valueConf.value;
+              });
+
+              return function refresh() {
+                return _ref.apply(this, arguments);
+              };
+            }();
+
+            isLazyResolve = contextConf.resolve.lazy;
+
+            if (!isLazyResolve) {
+              value = yield refresh();
+            }
           } else if (!brickUtils.hasOwnProperty(contextConf, "value")) {
             return false;
           }
         }
 
-        if (!isResolve && contextConf.value !== undefined) {
+        if ((!refresh || isLazyResolve) && contextConf.value !== undefined) {
+          // If the context has no resolve, just use its `value`.
+          // Or if the resolve is ignored or lazy, use its `value` as a fallback.
           value = computeRealValue(contextConf.value, mergedContext, true);
         }
+
+        if (contextConf.track) {
+          // Track its dependencies and auto update when each of them changed.
+          var deps = (isTemplateState ? brickUtils.trackUsedState : brickUtils.trackUsedContext)(refresh ? contextConf.resolve : contextConf.value);
+
+          for (var dep of deps) {
+            var _eventTarget;
+
+            var ctx = storyboardContextWrapper.get().get(dep);
+            ctx === null || ctx === void 0 ? void 0 : (_eventTarget = ctx.eventTarget) === null || _eventTarget === void 0 ? void 0 : _eventTarget.addEventListener(isTemplateState ? "state.change" : "context.change", () => {
+              if (refresh) {
+                storyboardContextWrapper.updateValue(contextConf.name, undefined, "refresh");
+              } else {
+                storyboardContextWrapper.updateValue(contextConf.name, computeRealValue(contextConf.value, mergedContext, true), "replace");
+              }
+            });
+          }
+        }
       }
 
-      resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick);
+      resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, refresh);
       return true;
     });
     return _resolveNormalStoryboardContext.apply(this, arguments);
@@ -2211,12 +2211,13 @@
     }
   }
 
-  function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick) {
+  function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, refresh) {
     var newContext = {
       type: "free-variable",
       value,
       // This is required for tracking context, even if no `onChange` is specified.
-      eventTarget: new EventTarget$1()
+      eventTarget: new EventTarget$1(),
+      refresh
     };
 
     if (contextConf.onChange) {
@@ -6287,10 +6288,12 @@
 
         case "context.assign":
         case "context.replace":
+        case "context.refresh":
           return builtinContextListenerFactory(method, handler.args, handler, context);
 
         case "state.update":
-          return builtinStateListenerFactory(handler.args, handler, context);
+        case "state.refresh":
+          return builtinStateListenerFactory(method, handler.args, handler, context);
 
         case "tpl.dispatchEvent":
           return builtinTplDispatchEventFactory(handler.args, handler, context);
@@ -6434,7 +6437,7 @@
     };
   }
 
-  function builtinStateListenerFactory(args, ifContainer, context) {
+  function builtinStateListenerFactory(method, args, ifContainer, context) {
     return function (event) {
       if (!looseCheckIf(ifContainer, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
         event
@@ -6444,7 +6447,7 @@
 
       var tplContext = getTplContext(context.tplContextId);
       var [name, value] = argsFactory(args, context, event);
-      tplContext.state.updateValue(name, value, "replace");
+      tplContext.state.updateValue(name, value, method === "refresh" ? method : "replace");
     };
   }
 
@@ -8765,6 +8768,44 @@
     return ((_state$map = state === null || state === void 0 ? void 0 : state.map(item => item.name)) !== null && _state$map !== void 0 ? _state$map : []).concat(Object.keys((_proxy$properties = proxy === null || proxy === void 0 ? void 0 : proxy.properties) !== null && _proxy$properties !== void 0 ? _proxy$properties : {}));
   }
 
+  var misc;
+  function getRuntimeMisc() {
+    if (!misc) {
+      misc = {
+        isInIframe: false,
+        isInIframeOfSameSite: false,
+        isInIframeOfNext: false,
+        isInIframeOfVisualBuilder: false,
+        isInIframeOfLegacyConsole: false
+      };
+
+      if (window !== window.parent) {
+        misc.isInIframe = true;
+
+        try {
+          // Handle:
+          // - Previewing in visual builder by iframe.
+          // - Nesting next in next.
+          // - Nesting console in next.
+          if (window.origin === window.parent.origin) {
+            misc.isInIframeOfSameSite = true;
+            var selfIsNext = getBasePath() === "/next/";
+            var parentPathname = window.parent.location.pathname;
+            var parentIsNext = parentPathname.startsWith("/next/");
+            misc.isInIframeOfNext = (Number(selfIsNext) ^ Number(parentIsNext)) === 0;
+            misc.isInIframeOfVisualBuilder = parentPathname.startsWith("".concat(parentIsNext ? "/next" : "", "/visual-builder/"));
+            misc.isInIframeOfLegacyConsole = selfIsNext && !parentIsNext;
+          }
+        } catch (e) {// do nothing
+        }
+      }
+
+      Object.freeze(misc);
+    }
+
+    return misc;
+  }
+
   class Kernel {
     constructor() {
       var _this = this;
@@ -8895,6 +8936,11 @@
 
         listenDevtoolsEagerly();
         _this2.mountPoints = mountPoints;
+
+        if (getRuntimeMisc().isInIframeOfSameSite && !getRuntimeMisc().isInIframeOfVisualBuilder) {
+          document.body.classList.add("bars-hidden-in-iframe");
+        }
+
         yield Promise.all([_this2.loadCheckLogin(), _this2.loadMicroApps()]);
 
         if (_this2.bootstrapData.storyboards.length === 0) {
@@ -9176,7 +9222,8 @@
 
     _dev_only_updateTemplatePreviewSettings(appId, templateId, settings) {
       var {
-        routes
+        routes,
+        app
       } = this.bootstrapData.storyboards.find(item => item.app.id === appId);
       var previewPath = "${APP.homepage}/_dev_only_/template-preview/".concat(templateId);
       var previewRouteIndex = routes.findIndex(route => route.path === previewPath);
@@ -9186,7 +9233,8 @@
           brick: templateId
         }, _.pick(settings, "properties", "events", "lifeCycle", "context"))],
         menu: false,
-        exact: true
+        exact: true,
+        hybrid: app.legacy === "iframe"
       };
 
       if (previewRouteIndex === -1) {
@@ -9200,7 +9248,8 @@
       var _snippetData$bricks;
 
       var {
-        routes
+        routes,
+        app
       } = this.bootstrapData.storyboards.find(item => item.app.id === appId);
       var previewPath = "${APP.homepage}/_dev_only_/snippet-preview/".concat(snippetData.snippetId);
       var previewRouteIndex = routes.findIndex(route => route.path === previewPath);
@@ -9210,7 +9259,8 @@
           brick: "span"
         }],
         menu: false,
-        exact: true
+        exact: true,
+        hybrid: app.legacy === "iframe"
       };
 
       if (previewRouteIndex === -1) {
@@ -10801,7 +10851,7 @@
         if (expandedBrickConf.exports) {
           for (var [prop, ctxName] of Object.entries(expandedBrickConf.exports)) {
             if (typeof ctxName === "string" && ctxName.startsWith("CTX.")) {
-              _this6.storyboardContextWrapper.set(ctxName.substr(4), {
+              _this6.storyboardContextWrapper.set(ctxName.substring(4), {
                 type: "brick-property",
                 brick,
                 prop
@@ -11380,19 +11430,33 @@
           }
         }
 
-        var cacheKey = JSON.stringify({
-          provider,
-          useProvider,
-          method,
-          args
-        });
+        var actualArgs = args ? ref ? args // `args` are already computed for `defineResolves`
+        : context ? computeRealValue(args, context, true) : args : providerBrick.args || [];
+        var cacheKey;
+
+        try {
+          // `actualArgs` may contain circular references, which makes
+          // JSON stringify failed, thus we fallback to original args.
+          cacheKey = JSON.stringify({
+            provider,
+            useProvider,
+            method,
+            actualArgs
+          });
+        } catch (e) {
+          cacheKey = JSON.stringify({
+            provider,
+            useProvider,
+            method,
+            args
+          });
+        }
+
         var promise;
 
         if (_this2.cache.has(cacheKey)) {
           promise = _this2.cache.get(cacheKey);
         } else {
-          var actualArgs = args ? ref ? args // `args` are already computed for `defineResolves`
-          : context ? computeRealValue(args, context, true) : args : providerBrick.args || [];
           promise = _asyncToGenerator__default["default"](function* () {
             if (useProvider) {
               actualArgs = yield getArgsOfCustomApi(useProvider, actualArgs);
@@ -14729,6 +14793,7 @@
   exports.getHistory = getHistory;
   exports.getMockInfo = getMockInfo;
   exports.getRuntime = getRuntime;
+  exports.getRuntimeMisc = getRuntimeMisc;
   exports.handleHttpError = handleHttpError;
   exports.httpErrorToString = httpErrorToString;
   exports.i18nText = i18nText;