@next-core/brick-kit 2.131.0 → 2.132.1

package/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.132.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.132.0...@next-core/brick-kit@2.132.1) (2022-08-25)
+
+
+### Bug Fixes
+
+* preview route render error ([ebd1041](https://github.com/easyops-cn/next-core/commit/ebd1041acbb69f3b323a118bfb140fc5ff0248b0))
+
+
+
+
+
+# [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)
 
 

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 */
@@ -8819,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;
@@ -8949,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) {
@@ -9230,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);
@@ -9240,7 +9233,8 @@
           brick: templateId
         }, _.pick(settings, "properties", "events", "lifeCycle", "context"))],
         menu: false,
-        exact: true
+        exact: true,
+        hybrid: app.legacy === "iframe"
       };
 
       if (previewRouteIndex === -1) {
@@ -9254,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);
@@ -9264,7 +9259,8 @@
           brick: "span"
         }],
         menu: false,
-        exact: true
+        exact: true,
+        hybrid: app.legacy === "iframe"
       };
 
       if (previewRouteIndex === -1) {
@@ -9276,15 +9272,19 @@
 
     _dev_only_updateStoryboardByRoute(appId, newRoute) {
       var storyboard = this.bootstrapData.storyboards.find(item => item.app.id === appId);
+      var match = false;
+
+      var getKey = route => "".concat(route.path, ".").concat(route.exact);
 
       var replaceRoute = (routes, key) => {
         return routes.map(route => {
-          var routeKey = route.path;
+          var routeKey = getKey(route);
 
           if (route.type === "routes") {
             route.routes = replaceRoute(route.routes, key);
             return route;
           } else if (routeKey === key) {
+            match = true;
             return newRoute;
           } else {
             return route;
@@ -9292,7 +9292,11 @@
         });
       };
 
-      storyboard.routes = replaceRoute(storyboard.routes, newRoute.path);
+      storyboard.routes = replaceRoute(storyboard.routes, getKey(newRoute));
+
+      if (!match) {
+        storyboard.routes.unshift(newRoute);
+      }
     }
 
     _dev_only_updateStoryboardByTemplate(appId, newTemplate, settings) {
@@ -14797,6 +14801,7 @@
   exports.getHistory = getHistory;
   exports.getMockInfo = getMockInfo;
   exports.getRuntime = getRuntime;
+  exports.getRuntimeMisc = getRuntimeMisc;
   exports.handleHttpError = handleHttpError;
   exports.httpErrorToString = httpErrorToString;
   exports.i18nText = i18nText;