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

package/es/createAlfaApp.js

@@ -4,10 +4,10 @@ import { BaseLoader } from '@alicloud/alfa-core';
 import ErrorBoundary from './components/ErrorBoundary';
 import createApplication from './createApplication';
 import beforeResolveHook from './hooks/beforeResolveHook';
-import afterLoadHook from './hooks/afterLoadHook';
+import beforeLoadHook from './hooks/beforeLoadHook';
 var loader = BaseLoader.create();
 loader.beforeResolve.use(beforeResolveHook);
-loader.afterLoad.use(afterLoadHook);
+loader.beforeLoad.use(beforeLoadHook);
 var Application = createApplication(loader);
 
 function createAlfaApp(option) {
@@ -21,7 +21,12 @@ 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 || {},
       customProps: props
     })));

package/es/createAlfaWidget.js

@@ -7,11 +7,11 @@ import ErrorBoundary from './components/ErrorBoundary';
 import { createCWSWidget } from './widget';
 import createApplication from './createApplication';
 import beforeResolveHook from './hooks/beforeResolveHook';
-import afterLoadHook from './hooks/afterLoadHook';
+import beforeLoadHook from './hooks/beforeLoadHook';
 var loader = BaseLoader.create();
 loader.beforeResolve.use(beforeResolveHook);
-loader.afterLoad.use(afterLoadHook);
-loader.afterLoad.use( /*#__PURE__*/function () {
+loader.beforeLoad.use(beforeLoadHook);
+loader.beforeLoad.use( /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(appConfig) {
     var app;
     return _regeneratorRuntime.wrap(function _callee$(_context) {

package/es/createApplication.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { Suspense, useRef, useEffect, useState } from 'react';
+import React, { useRef, useEffect, useState } from 'react';
 import Loading from './components/Loading';
 import { normalizeName } from './utils';
 
@@ -72,9 +72,10 @@ export default function createApplication(loader) {
                 _yield$loader$registe = _context.sent;
                 App = _yield$loader$registe.app;
                 logger = _yield$loader$registe.logger;
+                console.log(App, '===');
 
                 if (App) {
-                  _context.next = 7;
+                  _context.next = 8;
                   break;
                 }
 
@@ -82,13 +83,9 @@ export default function createApplication(loader) {
                   E_MSG: 'load app failed.'
                 }));
 
-              case 7:
-                _context.next = 9;
-                return App.load();
-
-              case 9:
+              case 8:
                 if (appRef.current) {
-                  _context.next = 11;
+                  _context.next = 10;
                   break;
                 }
 
@@ -96,19 +93,19 @@ export default function createApplication(loader) {
                   E_MSG: 'cannot find container.'
                 }));
 
-              case 11:
-                _context.next = 13;
+              case 10:
+                _context.next = 12;
                 return App.mount(appRef.current, {
                   customProps: customProps
                 });
 
-              case 13:
+              case 12:
                 setApp(App);
                 return _context.abrupt("return", function () {
                   App && App.unmount();
                 });
 
-              case 15:
+              case 14:
               case "end":
                 return _context.stop();
             }
@@ -123,17 +120,15 @@ export default function createApplication(loader) {
       app.update(customProps);
     }
 
-    return /*#__PURE__*/React.createElement(Suspense, {
-      fallback: /*#__PURE__*/React.createElement(Loading, {
-        loading: loading
-      })
-    }, /*#__PURE__*/React.createElement(React.Fragment, null, sandbox && sandbox !== true && sandbox.disableFakeBody ? /*#__PURE__*/React.createElement(tagName, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, !app ? /*#__PURE__*/React.createElement(Loading, {
+      loading: loading
+    }) : null, sandbox && sandbox !== true && sandbox.disableFakeBody ? /*#__PURE__*/React.createElement(tagName, {
       style: style,
       className: className,
       ref: appRef,
       dataId: name
     }) : /*#__PURE__*/React.createElement(tagName, {}, /*#__PURE__*/React.createElement('div', {
       ref: appRef
-    }))));
+    })));
   };
 }

package/es/hooks/beforeLoadHook.js

@@ -0,0 +1,69 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+
+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 { getLocale } from '@alicloud/alfa-core';
+import { getConsoleConfig } from '../utils/getConsoleConfig'; // inject consoleConfig & locales after load
+
+function afterLoadHook(_x) {
+  return _afterLoadHook.apply(this, arguments);
+}
+
+function _afterLoadHook() {
+  _afterLoadHook = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(appConfig) {
+    var app, logger, defaultConsoleConfig, CONFIG_START_TIME, _yield$Promise$all$ca, _yield$Promise$all$ca2, consoleConfig, messages, CONFIG_END_TIME, i18nMessages, END_TIME;
+
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            app = appConfig.app, logger = appConfig.logger;
+            defaultConsoleConfig = window.ALIYUN_CONSOLE_CONFIG || {};
+            CONFIG_START_TIME = Date.now();
+            _context.next = 5;
+            return Promise.all([getConsoleConfig(appConfig, defaultConsoleConfig), getLocale(appConfig)]).catch(function (e) {
+              logger === null || logger === void 0 ? void 0 : logger.error({
+                E_MSG: 'fetch config & locale error.',
+                E_STACK: e
+              });
+              return [{}, {}];
+            });
+
+          case 5:
+            _yield$Promise$all$ca = _context.sent;
+            _yield$Promise$all$ca2 = _slicedToArray(_yield$Promise$all$ca, 2);
+            consoleConfig = _yield$Promise$all$ca2[0];
+            messages = _yield$Promise$all$ca2[1];
+            CONFIG_END_TIME = Date.now();
+            i18nMessages = _objectSpread(_objectSpread({}, window.ALIYUN_CONSOLE_I18N_MESSAGE), messages);
+
+            if (app && app.context) {
+              app.context.window.ALIYUN_CONSOLE_CONFIG = consoleConfig;
+              app.context.window.ALIYUN_CONSOLE_I18N_MESSAGE = i18nMessages; // (app.context.history as any) = {};
+            }
+
+            END_TIME = Date.now();
+            logger === null || logger === void 0 ? void 0 : logger.record({
+              CONFIG_START_TIME: CONFIG_START_TIME,
+              CONFIG_END_TIME: CONFIG_END_TIME,
+              END_TIME: END_TIME
+            });
+            logger === null || logger === void 0 ? void 0 : logger.send();
+            return _context.abrupt("return", appConfig);
+
+          case 16:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _afterLoadHook.apply(this, arguments);
+}
+
+export default afterLoadHook;

package/es/version.js

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

package/lib/createAlfaApp.js

@@ -19,12 +19,12 @@ var _createApplication = _interopRequireDefault(require("./createApplication"));
 
 var _beforeResolveHook = _interopRequireDefault(require("./hooks/beforeResolveHook"));
 
-var _afterLoadHook = _interopRequireDefault(require("./hooks/afterLoadHook"));
+var _beforeLoadHook = _interopRequireDefault(require("./hooks/beforeLoadHook"));
 
 var loader = _alfaCore.BaseLoader.create();
 
 loader.beforeResolve.use(_beforeResolveHook.default);
-loader.afterLoad.use(_afterLoadHook.default);
+loader.beforeLoad.use(_beforeLoadHook.default);
 var Application = (0, _createApplication.default)(loader);
 
 function createAlfaApp(option) {
@@ -38,7 +38,12 @@ 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 || {},
       customProps: props
     })));

package/lib/createAlfaWidget.js

@@ -25,13 +25,13 @@ var _createApplication = _interopRequireDefault(require("./createApplication"));
 
 var _beforeResolveHook = _interopRequireDefault(require("./hooks/beforeResolveHook"));
 
-var _afterLoadHook = _interopRequireDefault(require("./hooks/afterLoadHook"));
+var _beforeLoadHook = _interopRequireDefault(require("./hooks/beforeLoadHook"));
 
 var loader = _alfaCore.BaseLoader.create();
 
 loader.beforeResolve.use(_beforeResolveHook.default);
-loader.afterLoad.use(_afterLoadHook.default);
-loader.afterLoad.use( /*#__PURE__*/function () {
+loader.beforeLoad.use(_beforeLoadHook.default);
+loader.beforeLoad.use( /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(appConfig) {
     var app;
     return _regenerator.default.wrap(function _callee$(_context) {

package/lib/createApplication.js

@@ -92,9 +92,10 @@ function createApplication(loader) {
                 _yield$loader$registe = _context.sent;
                 App = _yield$loader$registe.app;
                 logger = _yield$loader$registe.logger;
+                console.log(App, '===');
 
                 if (App) {
-                  _context.next = 7;
+                  _context.next = 8;
                   break;
                 }
 
@@ -102,13 +103,9 @@ function createApplication(loader) {
                   E_MSG: 'load app failed.'
                 }));
 
-              case 7:
-                _context.next = 9;
-                return App.load();
-
-              case 9:
+              case 8:
                 if (appRef.current) {
-                  _context.next = 11;
+                  _context.next = 10;
                   break;
                 }
 
@@ -116,19 +113,19 @@ function createApplication(loader) {
                   E_MSG: 'cannot find container.'
                 }));
 
-              case 11:
-                _context.next = 13;
+              case 10:
+                _context.next = 12;
                 return App.mount(appRef.current, {
                   customProps: customProps
                 });
 
-              case 13:
+              case 12:
                 setApp(App);
                 return _context.abrupt("return", function () {
                   App && App.unmount();
                 });
 
-              case 15:
+              case 14:
               case "end":
                 return _context.stop();
             }
@@ -143,17 +140,15 @@ function createApplication(loader) {
       app.update(customProps);
     }
 
-    return /*#__PURE__*/_react.default.createElement(_react.Suspense, {
-      fallback: /*#__PURE__*/_react.default.createElement(_Loading.default, {
-        loading: loading
-      })
-    }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, sandbox && sandbox !== true && sandbox.disableFakeBody ? /*#__PURE__*/_react.default.createElement(tagName, {
+    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, {
       style: style,
       className: className,
       ref: appRef,
       dataId: name
     }) : /*#__PURE__*/_react.default.createElement(tagName, {}, /*#__PURE__*/_react.default.createElement('div', {
       ref: appRef
-    }))));
+    })));
   };
 }

package/lib/hooks/beforeLoadHook.d.ts

@@ -0,0 +1,3 @@
+import { IAppConfig } from '@alicloud/alfa-core';
+declare function afterLoadHook(appConfig: IAppConfig): Promise<IAppConfig<any>>;
+export default afterLoadHook;

package/lib/hooks/beforeLoadHook.js

@@ -0,0 +1,84 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _alfaCore = require("@alicloud/alfa-core");
+
+var _getConsoleConfig = require("../utils/getConsoleConfig");
+
+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; }
+
+// inject consoleConfig & locales after load
+function afterLoadHook(_x) {
+  return _afterLoadHook.apply(this, arguments);
+}
+
+function _afterLoadHook() {
+  _afterLoadHook = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(appConfig) {
+    var app, logger, defaultConsoleConfig, CONFIG_START_TIME, _yield$Promise$all$ca, _yield$Promise$all$ca2, consoleConfig, messages, CONFIG_END_TIME, i18nMessages, END_TIME;
+
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            app = appConfig.app, logger = appConfig.logger;
+            defaultConsoleConfig = window.ALIYUN_CONSOLE_CONFIG || {};
+            CONFIG_START_TIME = Date.now();
+            _context.next = 5;
+            return Promise.all([(0, _getConsoleConfig.getConsoleConfig)(appConfig, defaultConsoleConfig), (0, _alfaCore.getLocale)(appConfig)]).catch(function (e) {
+              logger === null || logger === void 0 ? void 0 : logger.error({
+                E_MSG: 'fetch config & locale error.',
+                E_STACK: e
+              });
+              return [{}, {}];
+            });
+
+          case 5:
+            _yield$Promise$all$ca = _context.sent;
+            _yield$Promise$all$ca2 = (0, _slicedToArray2.default)(_yield$Promise$all$ca, 2);
+            consoleConfig = _yield$Promise$all$ca2[0];
+            messages = _yield$Promise$all$ca2[1];
+            CONFIG_END_TIME = Date.now();
+            i18nMessages = _objectSpread(_objectSpread({}, window.ALIYUN_CONSOLE_I18N_MESSAGE), messages);
+
+            if (app && app.context) {
+              app.context.window.ALIYUN_CONSOLE_CONFIG = consoleConfig;
+              app.context.window.ALIYUN_CONSOLE_I18N_MESSAGE = i18nMessages; // (app.context.history as any) = {};
+            }
+
+            END_TIME = Date.now();
+            logger === null || logger === void 0 ? void 0 : logger.record({
+              CONFIG_START_TIME: CONFIG_START_TIME,
+              CONFIG_END_TIME: CONFIG_END_TIME,
+              END_TIME: END_TIME
+            });
+            logger === null || logger === void 0 ? void 0 : logger.send();
+            return _context.abrupt("return", appConfig);
+
+          case 16:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _afterLoadHook.apply(this, arguments);
+}
+
+var _default = afterLoadHook;
+exports.default = _default;

package/lib/version.d.ts

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

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.3.0",
+  "version": "1.3.1-alpha.4",
   "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.0",
+    "@alicloud/alfa-core": "^1.3.1-alpha.1",
     "@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": "fd4e97a8b7802616641e61a6572492c90a480c30"
+  "gitHead": "43925181e0a3e489559b7ab1bb6c68e59e00d58e"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Alibaba Cloud
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.