@alicloud/alfa-react 2.0.0 → 2.0.2

package/es/createAlfaWidget.js

@@ -12,7 +12,6 @@ import { createCWSWidget } from './widget';
 import createApplication from './createApplication';
 import beforeResolveHook from './loaders/beforeResolveHook';
 import beforeLoadHook from './loaders/beforeLoadHook';
-import { isOneConsole } from './helpers/oneConsole';
 import Loading from './components/Loading';
 import { IS_SSR } from './utils';
 var loader = BaseLoader.create();
@@ -50,7 +49,8 @@ function createAlfaWidget(option) {
     manifest = _ref2.manifest,
     loading = _ref2.loading,
     lazyLoad = _ref2.lazyLoad,
-    delay = _ref2.delay;
+    delay = _ref2.delay,
+    sandbox = _ref2.sandbox;
   if (name.match(/@ali\/widget-/)) {
     // TODO load style
     return createCWSWidget(option);
@@ -84,13 +84,11 @@ function createAlfaWidget(option) {
       };
     }();
   }
-  var passedInOption = _objectSpread({}, option);
-
-  // 非 oneConsole 环境下设置 iframe 沙箱地址为 about:blank
-  // 避免沙箱创建失败
-  if (passedInOption.sandbox && !passedInOption.sandbox.sandBoxUrl && !isOneConsole()) {
-    passedInOption.sandbox.sandBoxUrl = 'about:blank';
-  }
+  var passedInOption = _objectSpread(_objectSpread({}, option), {}, {
+    sandbox: _objectSpread(_objectSpread({}, sandbox), {}, {
+      sandBoxUrl: 'about:blank'
+    })
+  });
   var useDelay = function useDelay() {
     return useMemo(function () {
       if (typeof delay === 'number') {

package/es/createApplication.js

@@ -58,6 +58,7 @@ export default function createApplication(loader) {
       basename = props.basename,
       channel = props.channel,
       delayPromise = props.delayPromise,
+      forceLog = props.forceLog,
       preLoader = props.preLoader;
     var handleExternalLink = customProps.handleExternalLink;
     var _useState = useState(null),
@@ -279,7 +280,8 @@ export default function createApplication(loader) {
               }
               return _context.abrupt("return", (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
                 E_CODE: 'RuntimeError',
-                E_MSG: 'load app failed.'
+                E_MSG: 'load app failed.',
+                __force_log__: forceLog
               }));
             case 24:
               if (appRef.current) {
@@ -288,7 +290,8 @@ export default function createApplication(loader) {
               }
               return _context.abrupt("return", (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
                 E_CODE: 'RuntimeError',
-                E_MSG: 'cannot find container.'
+                E_MSG: 'cannot find container.',
+                __force_log__: forceLog
               }));
             case 26:
               // update body in sandbox context
@@ -327,12 +330,13 @@ export default function createApplication(loader) {
                   window.history.go(n);
                 });
               }
-              (logger === null || logger === void 0 ? void 0 : logger.record) && (logger === null || logger === void 0 ? void 0 : logger.record({
+              (logger === null || logger === void 0 ? void 0 : logger.record) && logger.record({
                 REQUEST_VERSION: memoOptions.version,
                 RESPONSE_VERSION: realVersion,
-                END_TIME: Date.now()
-              }));
-              (logger === null || logger === void 0 ? void 0 : logger.send) && (logger === null || logger === void 0 ? void 0 : logger.send());
+                END_TIME: Date.now(),
+                __force_log__: forceLog
+              });
+              (logger === null || logger === void 0 ? void 0 : logger.send) && logger.send();
 
               // just run once
               setAppInstance(app);

package/es/version.js

@@ -1 +1 @@
-export var version = '2.0.0';
+export var version = '2.0.2';

package/lib/createAlfaWidget.js

@@ -20,7 +20,6 @@ var _widget = require("./widget");
 var _createApplication = _interopRequireDefault(require("./createApplication"));
 var _beforeResolveHook = _interopRequireDefault(require("./loaders/beforeResolveHook"));
 var _beforeLoadHook = _interopRequireDefault(require("./loaders/beforeLoadHook"));
-var _oneConsole = require("./helpers/oneConsole");
 var _Loading = _interopRequireDefault(require("./components/Loading"));
 var _utils = require("./utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -62,7 +61,8 @@ function createAlfaWidget(option) {
     manifest = _ref2.manifest,
     loading = _ref2.loading,
     lazyLoad = _ref2.lazyLoad,
-    delay = _ref2.delay;
+    delay = _ref2.delay,
+    sandbox = _ref2.sandbox;
   if (name.match(/@ali\/widget-/)) {
     // TODO load style
     return (0, _widget.createCWSWidget)(option);
@@ -96,13 +96,11 @@ function createAlfaWidget(option) {
       };
     }();
   }
-  var passedInOption = _objectSpread({}, option);
-
-  // 非 oneConsole 环境下设置 iframe 沙箱地址为 about:blank
-  // 避免沙箱创建失败
-  if (passedInOption.sandbox && !passedInOption.sandbox.sandBoxUrl && !(0, _oneConsole.isOneConsole)()) {
-    passedInOption.sandbox.sandBoxUrl = 'about:blank';
-  }
+  var passedInOption = _objectSpread(_objectSpread({}, option), {}, {
+    sandbox: _objectSpread(_objectSpread({}, sandbox), {}, {
+      sandBoxUrl: 'about:blank'
+    })
+  });
   var useDelay = function useDelay() {
     return (0, _react.useMemo)(function () {
       if (typeof delay === 'number') {

package/lib/createApplication.js

@@ -68,6 +68,7 @@ function createApplication(loader) {
       basename = props.basename,
       channel = props.channel,
       delayPromise = props.delayPromise,
+      forceLog = props.forceLog,
       preLoader = props.preLoader;
     var handleExternalLink = customProps.handleExternalLink;
     var _useState = (0, _react.useState)(null),
@@ -289,7 +290,8 @@ function createApplication(loader) {
               }
               return _context.abrupt("return", (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
                 E_CODE: 'RuntimeError',
-                E_MSG: 'load app failed.'
+                E_MSG: 'load app failed.',
+                __force_log__: forceLog
               }));
             case 24:
               if (appRef.current) {
@@ -298,7 +300,8 @@ function createApplication(loader) {
               }
               return _context.abrupt("return", (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
                 E_CODE: 'RuntimeError',
-                E_MSG: 'cannot find container.'
+                E_MSG: 'cannot find container.',
+                __force_log__: forceLog
               }));
             case 26:
               // update body in sandbox context
@@ -337,12 +340,13 @@ function createApplication(loader) {
                   window.history.go(n);
                 });
               }
-              (logger === null || logger === void 0 ? void 0 : logger.record) && (logger === null || logger === void 0 ? void 0 : logger.record({
+              (logger === null || logger === void 0 ? void 0 : logger.record) && logger.record({
                 REQUEST_VERSION: memoOptions.version,
                 RESPONSE_VERSION: realVersion,
-                END_TIME: Date.now()
-              }));
-              (logger === null || logger === void 0 ? void 0 : logger.send) && (logger === null || logger === void 0 ? void 0 : logger.send());
+                END_TIME: Date.now(),
+                __force_log__: forceLog
+              });
+              (logger === null || logger === void 0 ? void 0 : logger.send) && logger.send();
 
               // just run once
               setAppInstance(app);

package/lib/version.js

@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.version = void 0;
-var version = exports.version = '2.0.0';
+var version = exports.version = '2.0.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -52,7 +52,7 @@
     "lodash-es": "^4.17.21",
     "prop-types": "^15.8.1",
     "react-lazyload": "^3.2.1",
-    "@alicloud/alfa-core": "^1.5.0",
+    "@alicloud/alfa-core": "^1.5.3",
     "@alicloud/console-os-loader": "^1.4.45-alpha.1"
   },
   "peerDependencies": {

package/types/types/index.d.ts

@@ -74,6 +74,10 @@ export interface AlfaFactoryOption extends IAppConfig {
          */
         scrollContainer?: string | Element | undefined;
     };
+    /**
+     * 强制上报日志
+     */
+    forceLog?: boolean;
 }
 type ThenArg<T> = T extends PromiseLike<infer U> ? U : T;
 export type MicroApplication = ThenArg<ReturnType<typeof createMicroApp>>;

package/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "2.0.0";
+export declare const version = "2.0.2";