@alicloud/alfa-react 1.5.13-alpha.3 → 1.5.14

package/es/createAlfaWidget.js

@@ -11,6 +11,7 @@ import { createCWSWidget } from './widget';
 import createApplication from './createApplication';
 import beforeResolveHook from './hooks/beforeResolveHook';
 import beforeLoadHook from './hooks/beforeLoadHook';
+import { isOneConsole } from './helpers/oneConsole';
 var loader = BaseLoader.create();
 loader.beforeResolve.use(beforeResolveHook);
 loader.beforeLoad.use(beforeLoadHook);
@@ -51,6 +52,12 @@ function createAlfaWidget(option) {
     return null;
   };
   var passedInOption = option;
+
+  // 非 oneConsole 环境下设置 iframe 沙箱地址为 about:blank
+  // 避免沙箱创建失败
+  if (passedInOption.sandbox && !passedInOption.sandbox.sandBoxUrl && !isOneConsole()) {
+    passedInOption.sandbox.sandBoxUrl = 'about:blank';
+  }
   return function (props) {
     return (
       /*#__PURE__*/

package/es/createApplication.js

@@ -125,7 +125,9 @@ export default function createApplication(loader) {
     // 更新标记，保证每次更新都会更新
     customProps.__innerStamp = (+new Date()).toString(36);
     customProps.__historyState = getHistoryState();
-    if (customProps.path) customProps.path = addLeftSlash(customProps.path);
+    if (customProps.path) {
+      customProps.path = addLeftSlash(customProps.path);
+    }
 
     // 受控模式锁定一些参数
     if ($syncHistory.current) {
@@ -347,6 +349,10 @@ export default function createApplication(loader) {
                 customProps: customProps
               });
             case 22:
+              (logger === null || logger === void 0 ? void 0 : logger.record) && (logger === null || logger === void 0 ? void 0 : logger.record({
+                END_TIME: Date.now()
+              }));
+              (logger === null || logger === void 0 ? void 0 : logger.send) && (logger === null || logger === void 0 ? void 0 : logger.send());
               if (frameWindow) {
                 // 每次挂载后主动触发子应用内的 popstate 事件，借此触发 react-router history 的检查逻辑
                 dispatchFramePopstate();
@@ -354,7 +360,7 @@ export default function createApplication(loader) {
 
               // just run once
               setAppInstance(app);
-            case 24:
+            case 26:
             case "end":
               return _context.stop();
           }

package/es/helpers/oneConsole.js

@@ -0,0 +1,8 @@
+/**
+ * 是否是 oneConsole 环境
+ * @returns
+ */
+export function isOneConsole() {
+  var _ALIYUN_CONSOLE_CONFI;
+  return ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.portalType) === 'one';
+}

package/es/hooks/beforeLoadHook.js

@@ -13,7 +13,7 @@ function afterLoadHook(_x) {
 }
 function _afterLoadHook() {
   _afterLoadHook = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(appConfig) {
-    var app, logger, sandbox, dynamicConfig, defaultConsoleConfig, defaultConsoleGlobal, CONFIG_START_TIME, CONFIG_END_TIME, configData, _yield$Promise$all, _yield$Promise$all2, consoleConfig, consoleGlobal, messages, i18nMessages, overrides, END_TIME;
+    var app, logger, sandbox, dynamicConfig, defaultConsoleConfig, defaultConsoleGlobal, CONFIG_START_TIME, CONFIG_END_TIME, configData, _yield$Promise$all, _yield$Promise$all2, consoleConfig, consoleGlobal, messages, i18nMessages, overrides;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -65,16 +65,13 @@ function _afterLoadHook() {
               app.context.window[key] = value;
             });
           }
-          END_TIME = Date.now();
           (logger === null || logger === void 0 ? void 0 : logger.record) && logger.record({
             CONFIG_START_TIME: CONFIG_START_TIME,
             CONFIG_END_TIME: CONFIG_END_TIME,
-            END_TIME: END_TIME,
             COST: CONFIG_END_TIME - CONFIG_START_TIME
           });
-          (logger === null || logger === void 0 ? void 0 : logger.send) && logger.send();
           return _context.abrupt("return", appConfig);
-        case 28:
+        case 26:
         case "end":
           return _context.stop();
       }

package/es/version.js

@@ -1 +1 @@
-export var version = '1.5.13-alpha.3';
+export var version = '1.5.14';

package/lib/createAlfaWidget.js

@@ -18,6 +18,7 @@ var _widget = require("./widget");
 var _createApplication = _interopRequireDefault(require("./createApplication"));
 var _beforeResolveHook = _interopRequireDefault(require("./hooks/beforeResolveHook"));
 var _beforeLoadHook = _interopRequireDefault(require("./hooks/beforeLoadHook"));
+var _oneConsole = require("./helpers/oneConsole");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -62,6 +63,12 @@ function createAlfaWidget(option) {
     return null;
   };
   var passedInOption = option;
+
+  // 非 oneConsole 环境下设置 iframe 沙箱地址为 about:blank
+  // 避免沙箱创建失败
+  if (passedInOption.sandbox && !passedInOption.sandbox.sandBoxUrl && !(0, _oneConsole.isOneConsole)()) {
+    passedInOption.sandbox.sandBoxUrl = 'about:blank';
+  }
   return function (props) {
     return (
       /*#__PURE__*/

package/lib/createApplication.js

@@ -135,7 +135,9 @@ function createApplication(loader) {
     // 更新标记，保证每次更新都会更新
     customProps.__innerStamp = (+new Date()).toString(36);
     customProps.__historyState = getHistoryState();
-    if (customProps.path) customProps.path = addLeftSlash(customProps.path);
+    if (customProps.path) {
+      customProps.path = addLeftSlash(customProps.path);
+    }
 
     // 受控模式锁定一些参数
     if ($syncHistory.current) {
@@ -357,6 +359,10 @@ function createApplication(loader) {
                 customProps: customProps
               });
             case 22:
+              (logger === null || logger === void 0 ? void 0 : logger.record) && (logger === null || logger === void 0 ? void 0 : logger.record({
+                END_TIME: Date.now()
+              }));
+              (logger === null || logger === void 0 ? void 0 : logger.send) && (logger === null || logger === void 0 ? void 0 : logger.send());
               if (frameWindow) {
                 // 每次挂载后主动触发子应用内的 popstate 事件，借此触发 react-router history 的检查逻辑
                 dispatchFramePopstate();
@@ -364,7 +370,7 @@ function createApplication(loader) {
 
               // just run once
               setAppInstance(app);
-            case 24:
+            case 26:
             case "end":
               return _context.stop();
           }

package/lib/helpers/oneConsole.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isOneConsole = isOneConsole;
+/**
+ * 是否是 oneConsole 环境
+ * @returns
+ */
+function isOneConsole() {
+  var _ALIYUN_CONSOLE_CONFI;
+  return ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.portalType) === 'one';
+}

package/lib/hooks/beforeLoadHook.js

@@ -20,7 +20,7 @@ function afterLoadHook(_x) {
 }
 function _afterLoadHook() {
   _afterLoadHook = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(appConfig) {
-    var app, logger, sandbox, dynamicConfig, defaultConsoleConfig, defaultConsoleGlobal, CONFIG_START_TIME, CONFIG_END_TIME, configData, _yield$Promise$all, _yield$Promise$all2, consoleConfig, consoleGlobal, messages, i18nMessages, overrides, END_TIME;
+    var app, logger, sandbox, dynamicConfig, defaultConsoleConfig, defaultConsoleGlobal, CONFIG_START_TIME, CONFIG_END_TIME, configData, _yield$Promise$all, _yield$Promise$all2, consoleConfig, consoleGlobal, messages, i18nMessages, overrides;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -72,16 +72,13 @@ function _afterLoadHook() {
               app.context.window[key] = value;
             });
           }
-          END_TIME = Date.now();
           (logger === null || logger === void 0 ? void 0 : logger.record) && logger.record({
             CONFIG_START_TIME: CONFIG_START_TIME,
             CONFIG_END_TIME: CONFIG_END_TIME,
-            END_TIME: END_TIME,
             COST: CONFIG_END_TIME - CONFIG_START_TIME
           });
-          (logger === null || logger === void 0 ? void 0 : logger.send) && logger.send();
           return _context.abrupt("return", appConfig);
-        case 28:
+        case 26:
         case "end":
           return _context.stop();
       }

package/lib/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.version = void 0;
-var version = '1.5.13-alpha.3';
+var version = '1.5.14';
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.5.13-alpha.3",
+  "version": "1.5.14",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",

package/types/helpers/oneConsole.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 是否是 oneConsole 环境
+ * @returns
+ */
+export declare function isOneConsole(): boolean;

package/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.5.13-alpha.3";
+export declare const version = "1.5.14";