@alicloud/alfa-react 1.3.1-alpha.4 → 1.3.3

package/es/createAlfaApp.js

@@ -21,10 +21,6 @@ function createAlfaApp(option) {
   };
   var passedInOption = option;
   return /*#__PURE__*/React.memo(function (props) {
-    if ('sandbox' in props) {
-      console.warn('');
-    }
-
     return /*#__PURE__*/React.createElement(ErrorBoundary, props, /*#__PURE__*/React.createElement(Application, _extends({}, passedInOption, {
       sandbox: option.sandbox || props.sandbox,
       deps: dependencies || {},

package/es/createApplication.js

@@ -1,7 +1,14 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useRef, useEffect, useState } from 'react';
+
+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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+import React, { useRef, useEffect, useState, useMemo } from 'react';
 import Loading from './components/Loading';
 import { normalizeName } from './utils';
 
@@ -16,7 +23,6 @@ export default function createApplication(loader) {
         version = props.version,
         manifest = props.manifest,
         loading = props.loading,
-        sandbox = props.sandbox,
         customProps = props.customProps,
         className = props.className,
         style = props.style,
@@ -30,7 +36,8 @@ export default function createApplication(loader) {
         afterMount = props.afterMount,
         beforeUnmount = props.beforeUnmount,
         afterUnmount = props.afterUnmount,
-        beforeUpdate = props.beforeUpdate;
+        beforeUpdate = props.beforeUpdate,
+        customSandbox = props.sandbox;
 
     var _useState = useState(null),
         _useState2 = _slicedToArray(_useState, 2),
@@ -39,6 +46,12 @@ export default function createApplication(loader) {
 
     var appRef = useRef(null);
     var tagName = normalizeName(props.name);
+    var sandbox = useMemo(function () {
+      return _objectSpread(_objectSpread({}, customSandbox), {}, {
+        externalsVars: [].concat(_toConsumableArray((customSandbox === null || customSandbox === void 0 ? void 0 : customSandbox.externalsVars) || []), [// global vars used in ConsoleBase.forApp
+        '_console_base_ready_'])
+      });
+    }, [customSandbox]);
     useEffect(function () {
       // eslint-disable-next-line no-useless-catch
       _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
@@ -48,7 +61,15 @@ export default function createApplication(loader) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
+                if (!app) {
+                  _context.next = 2;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 2:
+                _context.next = 4;
                 return loader.register({
                   entry: entry,
                   url: url,
@@ -68,14 +89,13 @@ export default function createApplication(loader) {
                   beforeUpdate: beforeUpdate
                 });
 
-              case 2:
+              case 4:
                 _yield$loader$registe = _context.sent;
                 App = _yield$loader$registe.app;
                 logger = _yield$loader$registe.logger;
-                console.log(App, '===');
 
                 if (App) {
-                  _context.next = 8;
+                  _context.next = 9;
                   break;
                 }
 
@@ -83,9 +103,9 @@ export default function createApplication(loader) {
                   E_MSG: 'load app failed.'
                 }));
 
-              case 8:
+              case 9:
                 if (appRef.current) {
-                  _context.next = 10;
+                  _context.next = 11;
                   break;
                 }
 
@@ -93,17 +113,14 @@ export default function createApplication(loader) {
                   E_MSG: 'cannot find container.'
                 }));
 
-              case 10:
-                _context.next = 12;
+              case 11:
+                _context.next = 13;
                 return App.mount(appRef.current, {
                   customProps: customProps
                 });
 
-              case 12:
+              case 13:
                 setApp(App);
-                return _context.abrupt("return", function () {
-                  App && App.unmount();
-                });
 
               case 14:
               case "end":
@@ -114,7 +131,11 @@ export default function createApplication(loader) {
       }))().catch(function (e) {
         throw e;
       });
-    }, [name, manifest, customProps, sandbox, entry, url, version, container, customLogger, deps, env, beforeMount, afterMount, beforeUnmount, afterUnmount, beforeUpdate]);
+
+      return function () {
+        app && app.unmount();
+      };
+    }, [app, name, manifest, customProps, sandbox, entry, url, version, container, customLogger, deps, env, beforeMount, afterMount, beforeUnmount, afterUnmount, beforeUpdate]);
 
     if (app) {
       app.update(customProps);
@@ -122,7 +143,7 @@ export default function createApplication(loader) {
 
     return /*#__PURE__*/React.createElement(React.Fragment, null, !app ? /*#__PURE__*/React.createElement(Loading, {
       loading: loading
-    }) : null, sandbox && sandbox !== true && sandbox.disableFakeBody ? /*#__PURE__*/React.createElement(tagName, {
+    }) : null, sandbox && sandbox.disableFakeBody ? /*#__PURE__*/React.createElement(tagName, {
       style: style,
       className: className,
       ref: appRef,

package/es/version.js

@@ -1 +1 @@
-export var version = '1.3.1-alpha.4';
+export var version = '1.3.3';

package/lib/createAlfaApp.js

@@ -38,10 +38,6 @@ function createAlfaApp(option) {
   };
   var passedInOption = option;
   return /*#__PURE__*/_react.default.memo(function (props) {
-    if ('sandbox' in props) {
-      console.warn('');
-    }
-
     return /*#__PURE__*/_react.default.createElement(_ErrorBoundary.default, props, /*#__PURE__*/_react.default.createElement(Application, (0, _extends2.default)({}, passedInOption, {
       sandbox: option.sandbox || props.sandbox,
       deps: dependencies || {},

package/lib/createApplication.js

@@ -13,6 +13,10 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -25,6 +29,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 /**
  * container for microApp mount
  * @param loader alfa-core loader
@@ -36,7 +44,6 @@ function createApplication(loader) {
         version = props.version,
         manifest = props.manifest,
         loading = props.loading,
-        sandbox = props.sandbox,
         customProps = props.customProps,
         className = props.className,
         style = props.style,
@@ -50,7 +57,8 @@ function createApplication(loader) {
         afterMount = props.afterMount,
         beforeUnmount = props.beforeUnmount,
         afterUnmount = props.afterUnmount,
-        beforeUpdate = props.beforeUpdate;
+        beforeUpdate = props.beforeUpdate,
+        customSandbox = props.sandbox;
 
     var _useState = (0, _react.useState)(null),
         _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -59,6 +67,12 @@ function createApplication(loader) {
 
     var appRef = (0, _react.useRef)(null);
     var tagName = (0, _utils.normalizeName)(props.name);
+    var sandbox = (0, _react.useMemo)(function () {
+      return _objectSpread(_objectSpread({}, customSandbox), {}, {
+        externalsVars: [].concat((0, _toConsumableArray2.default)((customSandbox === null || customSandbox === void 0 ? void 0 : customSandbox.externalsVars) || []), [// global vars used in ConsoleBase.forApp
+        '_console_base_ready_'])
+      });
+    }, [customSandbox]);
     (0, _react.useEffect)(function () {
       // eslint-disable-next-line no-useless-catch
       (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
@@ -68,7 +82,15 @@ function createApplication(loader) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
+                if (!app) {
+                  _context.next = 2;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 2:
+                _context.next = 4;
                 return loader.register({
                   entry: entry,
                   url: url,
@@ -88,14 +110,13 @@ function createApplication(loader) {
                   beforeUpdate: beforeUpdate
                 });
 
-              case 2:
+              case 4:
                 _yield$loader$registe = _context.sent;
                 App = _yield$loader$registe.app;
                 logger = _yield$loader$registe.logger;
-                console.log(App, '===');
 
                 if (App) {
-                  _context.next = 8;
+                  _context.next = 9;
                   break;
                 }
 
@@ -103,9 +124,9 @@ function createApplication(loader) {
                   E_MSG: 'load app failed.'
                 }));
 
-              case 8:
+              case 9:
                 if (appRef.current) {
-                  _context.next = 10;
+                  _context.next = 11;
                   break;
                 }
 
@@ -113,17 +134,14 @@ function createApplication(loader) {
                   E_MSG: 'cannot find container.'
                 }));
 
-              case 10:
-                _context.next = 12;
+              case 11:
+                _context.next = 13;
                 return App.mount(appRef.current, {
                   customProps: customProps
                 });
 
-              case 12:
+              case 13:
                 setApp(App);
-                return _context.abrupt("return", function () {
-                  App && App.unmount();
-                });
 
               case 14:
               case "end":
@@ -134,7 +152,10 @@ function createApplication(loader) {
       }))().catch(function (e) {
         throw e;
       });
-    }, [name, manifest, customProps, sandbox, entry, url, version, container, customLogger, deps, env, beforeMount, afterMount, beforeUnmount, afterUnmount, beforeUpdate]);
+      return function () {
+        app && app.unmount();
+      };
+    }, [app, name, manifest, customProps, sandbox, entry, url, version, container, customLogger, deps, env, beforeMount, afterMount, beforeUnmount, afterUnmount, beforeUpdate]);
 
     if (app) {
       app.update(customProps);
@@ -142,7 +163,7 @@ function createApplication(loader) {
 
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !app ? /*#__PURE__*/_react.default.createElement(_Loading.default, {
       loading: loading
-    }) : null, sandbox && sandbox !== true && sandbox.disableFakeBody ? /*#__PURE__*/_react.default.createElement(tagName, {
+    }) : null, sandbox && sandbox.disableFakeBody ? /*#__PURE__*/_react.default.createElement(tagName, {
       style: style,
       className: className,
       ref: appRef,

package/lib/types/index.d.ts

@@ -19,6 +19,7 @@ export interface AlfaFactoryOption extends IAppConfig {
         css?: Record<string, string>;
         js?: Record<string, string>;
     };
+    runtimeVersion?: string;
 }
 declare type OmitKeys = 'manifest';
 export interface WidgetFactoryOption extends Omit<AlfaFactoryOption, OmitKeys> {

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.3.1-alpha.4";
+export declare const version = "1.3.3";

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.3.1-alpha.4",
+  "version": "1.3.3",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -39,7 +39,7 @@
     "typescript": "^3.0.3"
   },
   "dependencies": {
-    "@alicloud/alfa-core": "^1.3.1-alpha.1",
+    "@alicloud/alfa-core": "^1.3.3",
     "@alicloud/console-os-loader": "^1.2.3",
     "@alicloud/widget-utils-console": "^0.1.6",
     "classnames": "^2.2.6",
@@ -48,5 +48,5 @@
   "peerDependencies": {
     "react": "^16 | ^17"
   },
-  "gitHead": "43925181e0a3e489559b7ab1bb6c68e59e00d58e"
+  "gitHead": "0ee54132107a373f2d13b548a747461aa3dcfc7c"
 }