@alicloud/alfa-react 1.3.0-canary.8 → 1.3.1-alpha.2

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';
 
@@ -11,14 +11,26 @@ import { normalizeName } from './utils';
  * @returns
  */
 export default function createApplication(loader) {
-  function Application(props) {
+  return function Application(props) {
     var name = props.name,
+        version = props.version,
         manifest = props.manifest,
         loading = props.loading,
         sandbox = props.sandbox,
         customProps = props.customProps,
         className = props.className,
-        style = props.style;
+        style = props.style,
+        container = props.container,
+        entry = props.entry,
+        url = props.url,
+        customLogger = props.logger,
+        deps = props.deps,
+        env = props.env,
+        beforeMount = props.beforeMount,
+        afterMount = props.afterMount,
+        beforeUnmount = props.beforeUnmount,
+        afterUnmount = props.afterUnmount,
+        beforeUpdate = props.beforeUpdate;
 
     var _useState = useState(null),
         _useState2 = _slicedToArray(_useState, 2),
@@ -30,7 +42,7 @@ export default function createApplication(loader) {
     useEffect(function () {
       // eslint-disable-next-line no-useless-catch
       _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _yield$loader$registe, App;
+        var _yield$loader$registe, App, logger;
 
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
@@ -38,49 +50,65 @@ export default function createApplication(loader) {
               case 0:
                 _context.next = 2;
                 return loader.register({
+                  entry: entry,
+                  url: url,
                   name: name,
+                  version: version,
                   manifest: manifest,
-                  container: appRef.current,
+                  container: container || appRef.current,
                   props: customProps,
-                  sandbox: sandbox
+                  sandbox: sandbox,
+                  logger: customLogger,
+                  deps: deps,
+                  env: env,
+                  beforeMount: beforeMount,
+                  afterMount: afterMount,
+                  beforeUnmount: beforeUnmount,
+                  afterUnmount: afterUnmount,
+                  beforeUpdate: beforeUpdate
                 });
 
               case 2:
                 _yield$loader$registe = _context.sent;
                 App = _yield$loader$registe.app;
+                logger = _yield$loader$registe.logger;
 
                 if (App) {
-                  _context.next = 6;
+                  _context.next = 7;
                   break;
                 }
 
-                throw new Error('[alfa-react] load app failed.');
+                return _context.abrupt("return", logger === null || logger === void 0 ? void 0 : logger.error({
+                  E_MSG: 'load app failed.'
+                }));
 
-              case 6:
-                _context.next = 8;
+              case 7:
+                _context.next = 9;
                 return App.load();
 
-              case 8:
+              case 9:
                 if (appRef.current) {
-                  _context.next = 10;
+                  _context.next = 11;
                   break;
                 }
 
-                throw new Error('[alfa-react] container not found');
+                return _context.abrupt("return", logger === null || logger === void 0 ? void 0 : logger.error({
+                  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 15:
               case "end":
                 return _context.stop();
             }
@@ -89,25 +117,25 @@ export default function createApplication(loader) {
       }))().catch(function (e) {
         throw e;
       });
-    }, [name, manifest, customProps, sandbox]);
+    }, [name, manifest, customProps, sandbox, entry, url, version, container, customLogger, deps, env, beforeMount, afterMount, beforeUnmount, afterUnmount, beforeUpdate]);
 
     if (app) {
       app.update(customProps);
     }
 
-    return /*#__PURE__*/React.createElement(Suspense, {
-      fallback: /*#__PURE__*/React.createElement(Loading, {
+    if (!app) {
+      return /*#__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, 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
-    }))));
-  }
-
-  return Application;
+    })));
+  };
 }

package/es/hooks/afterLoadHook.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/hooks/beforeResolveHook.js

@@ -0,0 +1,55 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { getManifest } from '@alicloud/alfa-core';
+import { version as LOADER_VERSION } from '../version'; // get manifest before resolve
+// normalize name
+
+function beforeResolveHook(_x) {
+  return _beforeResolveHook.apply(this, arguments);
+}
+
+function _beforeResolveHook() {
+  _beforeResolveHook = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(appConfig) {
+    var resolvedManifest, logger, START_TIME, MANIFEST_START_TIME, MANIFEST_END_TIME;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            resolvedManifest = appConfig.manifest;
+            logger = appConfig.logger;
+            START_TIME = Date.now();
+            MANIFEST_START_TIME = Date.now();
+
+            if (resolvedManifest) {
+              _context.next = 8;
+              break;
+            }
+
+            _context.next = 7;
+            return getManifest(appConfig);
+
+          case 7:
+            resolvedManifest = _context.sent;
+
+          case 8:
+            MANIFEST_END_TIME = Date.now();
+            logger === null || logger === void 0 ? void 0 : logger.record({
+              LOADER_VERSION: LOADER_VERSION,
+              START_TIME: START_TIME,
+              MANIFEST_START_TIME: MANIFEST_START_TIME,
+              MANIFEST_END_TIME: MANIFEST_END_TIME
+            });
+            appConfig.manifest = resolvedManifest;
+            return _context.abrupt("return", appConfig);
+
+          case 12:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _beforeResolveHook.apply(this, arguments);
+}
+
+export default beforeResolveHook;

package/es/index.js

@@ -1,5 +1,5 @@
-export { createAlfaWidget } from './widget';
-export { createAlfaApp } from './app';
+export { default as createAlfaApp } from './createAlfaApp';
+export { default as createAlfaWidget } from './createAlfaWidget';
 export { eventEmitter as widgetEventEmitter } from './widget/index'; // todo
 
 export { createEventBus, prefetch } from '@alicloud/alfa-core';

package/es/types/base.js

@@ -1,3 +1,4 @@
+import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
@@ -20,7 +21,7 @@ var MicroAppBase = /*#__PURE__*/function (_React$Component) {
     return _super.apply(this, arguments);
   }
 
-  return MicroAppBase;
+  return _createClass(MicroAppBase);
 }(React.Component);
 
 export { MicroAppBase as default };

package/es/utils/getConsoleConfig.js

@@ -2,9 +2,9 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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 { getConfig } from '@alicloud/alfa-core';
 import md5 from 'crypto-js/md5';
@@ -12,7 +12,6 @@ import md5 from 'crypto-js/md5';
  * transform
  * @param features
  */
-//@ts-ignore
 
 var processFeatures = function processFeatures(features) {
   return Object.keys(features).reduce(function (newFeatures, key) {
@@ -50,8 +49,7 @@ var mergeConfigDataWithConsoleConfig = function mergeConfigDataWithConsoleConfig
 
   var channel = ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.CHANNEL) || 'OFFICIAL';
   var channelLinks = ((_configData$ALL_CHANN = configData.ALL_CHANNEL_LINKS) === null || _configData$ALL_CHANN === void 0 ? void 0 : _configData$ALL_CHANN[channel]) || {};
-  var channelFeatures = ((_configData$ALL_CHANN2 = configData.ALL_CHANNEL_FEATURE_STATUS) === null || _configData$ALL_CHANN2 === void 0 ? void 0 : _configData$ALL_CHANN2[channel]) || {}; //@ts-ignore
-
+  var channelFeatures = ((_configData$ALL_CHANN2 = configData.ALL_CHANNEL_FEATURE_STATUS) === null || _configData$ALL_CHANN2 === void 0 ? void 0 : _configData$ALL_CHANN2[channel]) || {};
   var features = configData.ALL_FEATURE_STATUS || {};
   return _objectSpread(_objectSpread({}, consoleConfig), {}, {
     CHANNEL_LINKS: channelLinks,

package/es/version.js

@@ -0,0 +1 @@
+export var version = '1.3.1-alpha.2';

package/es/widget/emitter.js

@@ -18,13 +18,13 @@ var WidgetEventEmitter = /*#__PURE__*/function (_EventEmitter) {
   function WidgetEventEmitter() {
     _classCallCheck(this, WidgetEventEmitter);
 
-    return _super.call(this);
-  } // Compatible with the old api, this may get removed at sometime later.
-
+    return _super.apply(this, arguments);
+  }
 
   _createClass(WidgetEventEmitter, [{
     key: "refersh",
-    value: function refersh(widgetId) {
+    value: // Compatible with the old api, this may get removed at sometime later.
+    function refersh(widgetId) {
       return this.emit("".concat(widgetId, ":REFRESH"));
     }
   }, {

package/es/widget/getWidgetConfigById.js

@@ -12,26 +12,25 @@ export var getWidgetConfigById = /*#__PURE__*/function () {
         switch (_context.prev = _context.next) {
           case 0:
             env = ENV[option.env || getConsoleEnv()];
-            console.log(env.configUrl);
 
             if (cachedConfig[option.name]) {
-              _context.next = 7;
+              _context.next = 6;
               break;
             }
 
-            _context.next = 5;
+            _context.next = 4;
             return axios.get(template(env.configUrl)({
               id: option.name
             }));
 
-          case 5:
+          case 4:
             resp = _context.sent;
             cachedConfig[option.name] = resp.data;
 
-          case 7:
+          case 6:
             return _context.abrupt("return", cachedConfig[option.name]);
 
-          case 8:
+          case 7:
           case "end":
             return _context.stop();
         }

package/es/widget/getWidgetDeps.js

@@ -2,9 +2,9 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 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); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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 from 'react';
 import reactDom from 'react-dom';
@@ -12,7 +12,7 @@ import axios from 'axios';
 import kebabCase from 'lodash/kebabCase';
 import * as propTypes from 'prop-types';
 import { loadBundle } from '@alicloud/console-os-loader';
-import { createAlfaWidget } from '../widget';
+import { createCWSWidget } from '../widget';
 import { getWidgetVersionById } from './getWidgetVersionById'; // @ts-ignore
 
 import * as widgetUtils from '@alicloud/widget-utils-console';
@@ -32,7 +32,7 @@ var createWidget = function createWidget(option) {
 
     var id = _ref.id,
         version = _ref.version;
-    return createAlfaWidget({
+    return createCWSWidget({
       name: id,
       version: version,
       dependencies: option === null || option === void 0 ? void 0 : option.dependencies,
@@ -160,7 +160,7 @@ export var getWidgetDeps = /*#__PURE__*/function () {
               react: react,
               'react-dom': reactDom,
               'prop-types': propTypes,
-              'axios': axios
+              axios: axios
             }, cachedRuntime[version].default), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, WIDGET_UTILS_PKG_NAME, injectedWidgetUtils), _defineProperty(_objectSpread2, '@ali/widget-utils-config', injectedWidgetUtils), _defineProperty(_objectSpread2, '@ali/widget-loader', createWidget), _objectSpread2)));
 
           case 31:

package/es/widget.js

@@ -3,9 +3,9 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 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); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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, { lazy, Suspense } from 'react';
 import { loadBundle } from '@alicloud/console-os-loader';
@@ -13,7 +13,7 @@ import { getWidgetVersionById, getWidgetDeps, getWidgetConfigById, eventEmitter
 import ErrorBoundary from './components/ErrorBoundary';
 import Loading from './components/Loading';
 import { normalizeName } from './utils';
-export function createAlfaWidget(option) {
+export function createCWSWidget(option) {
   var AlfaWidget = /*#__PURE__*/lazy( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     var url, config, _yield$getWidgetVersi, version, entryUrl, deps;
 

package/lib/app.d.ts

@@ -1,3 +1,3 @@
 import { AlfaFactoryOption } from './types';
 export declare function createAlfaApp<T = any>(option: AlfaFactoryOption): (props: T) => JSX.Element;
-export { AlfaFactoryOption } from './types';
+export { AlfaFactoryOption };

package/lib/app.js

@@ -31,23 +31,21 @@ var _alfaCore = require("@alicloud/alfa-core");
 
 var _Loading = _interopRequireDefault(require("./components/Loading"));
 
-var _ErrorBoundary = _interopRequireDefault(require("./components/ErrorBoundary"));
+var _types = require("./types");
 
-var _getConsoleConfig = require("./app/getConsoleConfig");
+var _ErrorBoundary = _interopRequireDefault(require("./components/ErrorBoundary"));
 
-var _createIsomorphicMicroApp = require("./app/createIsomorphicMicroApp");
+var _getConsoleConfig = require("./utils/getConsoleConfig");
 
 var _utils = require("./utils");
 
-var _types = require("./types");
-
 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); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var getProps = function getProps(props) {
   var parcelProps = _objectSpread({}, props);
@@ -57,10 +55,8 @@ var getProps = function getProps(props) {
   delete parcelProps.loading;
   delete parcelProps.entry;
   delete parcelProps.container;
-  delete parcelProps.logger; // @ts-ignore
-
-  delete parcelProps.env; // @ts-ignore
-
+  delete parcelProps.logger;
+  delete parcelProps.env;
   delete parcelProps.dependencies;
   return parcelProps;
 };
@@ -71,7 +67,8 @@ var Application = function Application(props) {
       loading = props.loading,
       style = props.style,
       className = props.className,
-      consoleConfig = props.consoleConfig;
+      consoleConfig = props.consoleConfig,
+      i18nMessages = props.i18nMessages;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -86,7 +83,7 @@ var Application = function Application(props) {
   var appRef = (0, _react.useRef)(null);
   (0, _react.useEffect)(function () {
     (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var app;
+      var App;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -100,27 +97,35 @@ var Application = function Application(props) {
               });
 
             case 2:
-              app = _context.sent;
+              App = _context.sent;
 
-              if (app.context && app.context.baseFrame) {
-                // @ts-ignore
-                app.context.baseFrame.contentWindow.ALIYUN_CONSOLE_CONFIG = consoleConfig;
+              if (App.context && App.context) {
+                App.context.window.ALIYUN_CONSOLE_CONFIG = consoleConfig;
+                App.context.window.ALIYUN_CONSOLE_I18N_MESSAGE = i18nMessages;
               }
 
               _context.next = 6;
-              return app.load();
+              return App.load();
 
             case 6:
-              _context.next = 8;
-              return app.mount(appRef.current, {
+              if (appRef.current) {
+                _context.next = 8;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 8:
+              _context.next = 10;
+              return App.mount(appRef.current, {
                 customProps: getProps(props)
               });
 
-            case 8:
+            case 10:
               setMounted(true);
-              setApp(app);
+              setApp(App);
 
-            case 10:
+            case 12:
             case "end":
               return _context.stop();
           }
@@ -143,24 +148,17 @@ var Application = function Application(props) {
     className: className,
     ref: appRef,
     dataId: name
-  }) : /*#__PURE__*/_react.default.createElement(name, {
-    children: /*#__PURE__*/_react.default.createElement('div', {
-      ref: appRef
-    })
-  }));
+  }) : /*#__PURE__*/_react.default.createElement(name, {}, /*#__PURE__*/_react.default.createElement('div', {
+    ref: appRef
+  })));
 };
 
 function createAlfaApp(option) {
   var name = option.name,
       loading = option.loading,
       manifest = option.manifest;
-
-  if ((0, _utils.isSSR)()) {
-    return (0, _createIsomorphicMicroApp.createIsomorphicAlfaApp)(option);
-  }
-
   var AlfaApp = /*#__PURE__*/(0, _react.lazy)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-    var resolvedManifest, consoleConfig, AlfaApp;
+    var resolvedManifest, consoleConfig, messages, i18nMessages, App;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -179,35 +177,34 @@ function createAlfaApp(option) {
             resolvedManifest = _context2.sent;
 
           case 5:
-            // @ts-ignore
             consoleConfig = window.ALIYUN_CONSOLE_CONFIG || {};
-
-            if (!option.dynamicConfig) {
-              _context2.next = 10;
-              break;
-            }
-
-            _context2.next = 9;
+            _context2.next = 8;
             return (0, _getConsoleConfig.getConsoleConfig)(option, consoleConfig);
 
-          case 9:
+          case 8:
             consoleConfig = _context2.sent;
+            _context2.next = 11;
+            return (0, _alfaCore.getLocale)(option);
+
+          case 11:
+            messages = _context2.sent;
+            i18nMessages = _objectSpread(_objectSpread({}, window.ALIYUN_CONSOLE_I18N_MESSAGE), messages);
 
-          case 10:
-            AlfaApp = function AlfaApp(props) {
+            App = function App(props) {
               return /*#__PURE__*/_react.default.createElement(Application, (0, _extends2.default)({
                 manifest: resolvedManifest
               }, props, {
                 name: (0, _utils.normalizeName)(name),
-                consoleConfig: consoleConfig
+                consoleConfig: consoleConfig,
+                i18nMessages: i18nMessages
               }));
             };
 
             return _context2.abrupt("return", {
-              default: AlfaApp
+              default: App
             });
 
-          case 12:
+          case 15:
           case "end":
             return _context2.stop();
         }