@alicloud/alfa-react 1.3.0-canary.9 → 1.3.1-alpha.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (72) hide show
  1. package/dist/index.js +6 -6
  2. package/es/app.js +47 -48
  3. package/es/components/ErrorBoundary/ErrorPanel.js +2 -2
  4. package/es/components/ErrorBoundary/index.js +15 -15
  5. package/es/components/Loading/Skeleton.js +2 -2
  6. package/es/components/Loading/Title.js +2 -2
  7. package/es/createAlfaApp.js +15 -95
  8. package/es/createAlfaWidget.js +29 -81
  9. package/es/createApplication.js +52 -28
  10. package/es/hooks/afterLoadHook.js +69 -0
  11. package/es/hooks/beforeLoadHook.js +69 -0
  12. package/es/hooks/beforeResolveHook.js +55 -0
  13. package/es/index.js +2 -2
  14. package/es/types/base.js +2 -1
  15. package/es/utils/getConsoleConfig.js +3 -5
  16. package/es/version.js +1 -0
  17. package/es/widget/emitter.js +4 -4
  18. package/es/widget/getWidgetConfigById.js +5 -6
  19. package/es/widget/getWidgetDeps.js +5 -5
  20. package/es/widget.js +3 -3
  21. package/lib/app.d.ts +1 -1
  22. package/lib/app.js +45 -48
  23. package/lib/components/ErrorBoundary/ErrorPanel.d.ts +1 -1
  24. package/lib/components/ErrorBoundary/ErrorPanel.js +2 -2
  25. package/lib/components/ErrorBoundary/index.d.ts +7 -9
  26. package/lib/components/ErrorBoundary/index.js +15 -15
  27. package/lib/components/Loading/Skeleton.js +2 -2
  28. package/lib/components/Loading/Title.js +2 -2
  29. package/lib/createAlfaApp.d.ts +4 -0
  30. package/lib/createAlfaApp.js +54 -0
  31. package/lib/createAlfaWidget.d.ts +4 -0
  32. package/lib/createAlfaWidget.js +94 -0
  33. package/lib/createApplication.d.ts +12 -0
  34. package/lib/createApplication.js +157 -0
  35. package/lib/hooks/afterLoadHook.d.ts +3 -0
  36. package/lib/hooks/afterLoadHook.js +84 -0
  37. package/lib/hooks/beforeLoadHook.d.ts +3 -0
  38. package/lib/hooks/beforeLoadHook.js +84 -0
  39. package/lib/hooks/beforeResolveHook.d.ts +3 -0
  40. package/lib/hooks/beforeResolveHook.js +69 -0
  41. package/lib/index.d.ts +2 -2
  42. package/lib/index.js +6 -4
  43. package/lib/{base.d.ts → types/base.d.ts} +4 -1
  44. package/lib/{base.js → types/base.js} +3 -1
  45. package/lib/{types.d.ts → types/index.d.ts} +9 -8
  46. package/lib/{types.js → types/index.js} +0 -0
  47. package/lib/utils/getConsoleConfig.d.ts +21 -0
  48. package/lib/utils/getConsoleConfig.js +100 -0
  49. package/lib/{utils.d.ts → utils/index.d.ts} +0 -1
  50. package/lib/{utils.js → utils/index.js} +2 -8
  51. package/lib/version.d.ts +1 -0
  52. package/lib/version.js +8 -0
  53. package/lib/widget/emitter.d.ts +0 -1
  54. package/lib/widget/emitter.js +4 -4
  55. package/lib/widget/getWidgetConfigById.js +5 -6
  56. package/lib/widget/getWidgetDeps.js +4 -4
  57. package/lib/widget.d.ts +1 -1
  58. package/lib/widget.js +4 -4
  59. package/package.json +12 -7
  60. package/LICENSE +0 -21
  61. package/es/app/createIsomorphicMicroApp.js +0 -45
  62. package/es/app/getConsoleConfig.js +0 -49
  63. package/es/base.js +0 -26
  64. package/es/context.js +0 -7
  65. package/es/types.js +0 -1
  66. package/es/utils.js +0 -6
  67. package/lib/app/createIsomorphicMicroApp.d.ts +0 -2
  68. package/lib/app/createIsomorphicMicroApp.js +0 -65
  69. package/lib/app/getConsoleConfig.d.ts +0 -2
  70. package/lib/app/getConsoleConfig.js +0 -62
  71. package/lib/context.d.ts +0 -7
  72. package/lib/context.js +0 -15
package/es/app.js CHANGED
@@ -4,17 +4,17 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
4
4
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
5
5
  import _regeneratorRuntime from "@babel/runtime/regenerator";
6
6
 
7
- 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; }
7
+ 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; }
8
8
 
9
- 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; }
9
+ 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; }
10
10
 
11
11
  import React, { Suspense, lazy, useRef, useEffect, useState } from 'react';
12
- import { getManifest, createMicroApp } from '@alicloud/alfa-core';
12
+ import { getManifest, getLocale, createMicroApp } from '@alicloud/alfa-core';
13
13
  import Loading from './components/Loading';
14
+ import { AlfaFactoryOption } from './types';
14
15
  import ErrorBoundary from './components/ErrorBoundary';
15
- import { getConsoleConfig } from './app/getConsoleConfig';
16
- import { createIsomorphicAlfaApp } from './app/createIsomorphicMicroApp';
17
- import { normalizeName, isSSR } from './utils';
16
+ import { getConsoleConfig } from './utils/getConsoleConfig';
17
+ import { normalizeName } from './utils';
18
18
 
19
19
  var getProps = function getProps(props) {
20
20
  var parcelProps = _objectSpread({}, props);
@@ -24,10 +24,8 @@ var getProps = function getProps(props) {
24
24
  delete parcelProps.loading;
25
25
  delete parcelProps.entry;
26
26
  delete parcelProps.container;
27
- delete parcelProps.logger; // @ts-ignore
28
-
29
- delete parcelProps.env; // @ts-ignore
30
-
27
+ delete parcelProps.logger;
28
+ delete parcelProps.env;
31
29
  delete parcelProps.dependencies;
32
30
  return parcelProps;
33
31
  };
@@ -38,7 +36,8 @@ var Application = function Application(props) {
38
36
  loading = props.loading,
39
37
  style = props.style,
40
38
  className = props.className,
41
- consoleConfig = props.consoleConfig;
39
+ consoleConfig = props.consoleConfig,
40
+ i18nMessages = props.i18nMessages;
42
41
 
43
42
  var _useState = useState(false),
44
43
  _useState2 = _slicedToArray(_useState, 2),
@@ -53,7 +52,7 @@ var Application = function Application(props) {
53
52
  var appRef = useRef(null);
54
53
  useEffect(function () {
55
54
  _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
56
- var app;
55
+ var App;
57
56
  return _regeneratorRuntime.wrap(function _callee$(_context) {
58
57
  while (1) {
59
58
  switch (_context.prev = _context.next) {
@@ -67,27 +66,35 @@ var Application = function Application(props) {
67
66
  });
68
67
 
69
68
  case 2:
70
- app = _context.sent;
69
+ App = _context.sent;
71
70
 
72
- if (app.context && app.context.baseFrame) {
73
- // @ts-ignore
74
- app.context.baseFrame.contentWindow.ALIYUN_CONSOLE_CONFIG = consoleConfig;
71
+ if (App.context && App.context) {
72
+ App.context.window.ALIYUN_CONSOLE_CONFIG = consoleConfig;
73
+ App.context.window.ALIYUN_CONSOLE_I18N_MESSAGE = i18nMessages;
75
74
  }
76
75
 
77
76
  _context.next = 6;
78
- return app.load();
77
+ return App.load();
79
78
 
80
79
  case 6:
81
- _context.next = 8;
82
- return app.mount(appRef.current, {
80
+ if (appRef.current) {
81
+ _context.next = 8;
82
+ break;
83
+ }
84
+
85
+ return _context.abrupt("return");
86
+
87
+ case 8:
88
+ _context.next = 10;
89
+ return App.mount(appRef.current, {
83
90
  customProps: getProps(props)
84
91
  });
85
92
 
86
- case 8:
93
+ case 10:
87
94
  setMounted(true);
88
- setApp(app);
95
+ setApp(App);
89
96
 
90
- case 10:
97
+ case 12:
91
98
  case "end":
92
99
  return _context.stop();
93
100
  }
@@ -111,24 +118,17 @@ var Application = function Application(props) {
111
118
  className: className,
112
119
  ref: appRef,
113
120
  dataId: name
114
- }) : /*#__PURE__*/React.createElement(name, {
115
- children: /*#__PURE__*/React.createElement('div', {
116
- ref: appRef
117
- })
118
- }));
121
+ }) : /*#__PURE__*/React.createElement(name, {}, /*#__PURE__*/React.createElement('div', {
122
+ ref: appRef
123
+ })));
119
124
  };
120
125
 
121
126
  export function createAlfaApp(option) {
122
127
  var name = option.name,
123
128
  loading = option.loading,
124
129
  manifest = option.manifest;
125
-
126
- if (isSSR()) {
127
- return createIsomorphicAlfaApp(option);
128
- }
129
-
130
130
  var AlfaApp = /*#__PURE__*/lazy( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
131
- var resolvedManifest, consoleConfig, AlfaApp;
131
+ var resolvedManifest, consoleConfig, messages, i18nMessages, App;
132
132
  return _regeneratorRuntime.wrap(function _callee2$(_context2) {
133
133
  while (1) {
134
134
  switch (_context2.prev = _context2.next) {
@@ -147,35 +147,34 @@ export function createAlfaApp(option) {
147
147
  resolvedManifest = _context2.sent;
148
148
 
149
149
  case 5:
150
- // @ts-ignore
151
150
  consoleConfig = window.ALIYUN_CONSOLE_CONFIG || {};
152
-
153
- if (!option.dynamicConfig) {
154
- _context2.next = 10;
155
- break;
156
- }
157
-
158
- _context2.next = 9;
151
+ _context2.next = 8;
159
152
  return getConsoleConfig(option, consoleConfig);
160
153
 
161
- case 9:
154
+ case 8:
162
155
  consoleConfig = _context2.sent;
156
+ _context2.next = 11;
157
+ return getLocale(option);
158
+
159
+ case 11:
160
+ messages = _context2.sent;
161
+ i18nMessages = _objectSpread(_objectSpread({}, window.ALIYUN_CONSOLE_I18N_MESSAGE), messages);
163
162
 
164
- case 10:
165
- AlfaApp = function AlfaApp(props) {
163
+ App = function App(props) {
166
164
  return /*#__PURE__*/React.createElement(Application, _extends({
167
165
  manifest: resolvedManifest
168
166
  }, props, {
169
167
  name: normalizeName(name),
170
- consoleConfig: consoleConfig
168
+ consoleConfig: consoleConfig,
169
+ i18nMessages: i18nMessages
171
170
  }));
172
171
  };
173
172
 
174
173
  return _context2.abrupt("return", {
175
- default: AlfaApp
174
+ default: App
176
175
  });
177
176
 
178
- case 12:
177
+ case 15:
179
178
  case "end":
180
179
  return _context2.stop();
181
180
  }
@@ -192,4 +191,4 @@ export function createAlfaApp(option) {
192
191
  }, props))));
193
192
  };
194
193
  }
195
- export { AlfaFactoryOption } from './types';
194
+ export { AlfaFactoryOption };
@@ -21,11 +21,11 @@ var ErrorPanel = function ErrorPanel(props) {
21
21
  style: containerStyle
22
22
  }, /*#__PURE__*/React.createElement("div", {
23
23
  style: commonErrorStyle
24
- }, error.message), /*#__PURE__*/React.createElement("pre", {
24
+ }, error === null || error === void 0 ? void 0 : error.message), /*#__PURE__*/React.createElement("pre", {
25
25
  style: {
26
26
  overflow: 'scroll'
27
27
  }
28
- }, error.stack)) : /*#__PURE__*/React.createElement("div", {
28
+ }, error === null || error === void 0 ? void 0 : error.stack)) : /*#__PURE__*/React.createElement("div", {
29
29
  style: commonErrorStyle
30
30
  }, "Error"));
31
31
  };
@@ -25,7 +25,6 @@ var ErrorBoundary = /*#__PURE__*/function (_React$Component) {
25
25
  _this = _super.call(this, props);
26
26
  _this.state = {
27
27
  hasError: false,
28
- // @ts-ignore
29
28
  error: null
30
29
  };
31
30
  return _this;
@@ -34,23 +33,24 @@ var ErrorBoundary = /*#__PURE__*/function (_React$Component) {
34
33
  _createClass(ErrorBoundary, [{
35
34
  key: "componentDidCatch",
36
35
  value: function componentDidCatch(error, errorInfo) {
37
- // Display fallback UI
36
+ var _window, _window$__bl, _window2, _window2$__bl;
37
+
38
+ var _this$props = this.props,
39
+ appDidCatch = _this$props.appDidCatch,
40
+ logger = _this$props.logger; // Display fallback UI
41
+
38
42
  this.setState({
39
43
  hasError: true,
40
44
  error: error
41
- }); // You can also log the error to an error reporting service
42
-
43
- if (this.props.logger) {
44
- this.props.logger.error(error, errorInfo);
45
- } else {
46
- var _window, _window$__bl;
47
-
48
- // @ts-ignore
49
- isFunction((_window = window) === null || _window === void 0 ? void 0 : (_window$__bl = _window.__bl) === null || _window$__bl === void 0 ? void 0 : _window$__bl.error) && window.__bl.error(error, errorInfo);
50
- }
51
-
52
- console.error(error);
53
- this.props.appDidCatch && this.props.appDidCatch(error);
45
+ });
46
+ isFunction((_window = window) === null || _window === void 0 ? void 0 : (_window$__bl = _window.__bl) === null || _window$__bl === void 0 ? void 0 : _window$__bl.error) && ((_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$__bl = _window2.__bl) === null || _window2$__bl === void 0 ? void 0 : _window2$__bl.error(error, errorInfo)); // You can also log the error to an error reporting service in appDidCatch
47
+
48
+ appDidCatch && appDidCatch(error, errorInfo);
49
+ logger === null || logger === void 0 ? void 0 : logger.error({
50
+ E_MSG: '',
51
+ E_STACK: error,
52
+ C_STACK: errorInfo
53
+ });
54
54
  }
55
55
  }, {
56
56
  key: "render",
@@ -6,9 +6,9 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConst
6
6
  import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
7
7
  import _typeof from "@babel/runtime/helpers/esm/typeof";
8
8
 
9
- 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; }
9
+ 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; }
10
10
 
11
- 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; }
11
+ 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; }
12
12
 
13
13
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
14
14
 
@@ -1,8 +1,8 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
2
 
3
- 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; }
3
+ 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; }
4
4
 
5
- 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; }
5
+ 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; }
6
6
 
7
7
  import * as React from 'react';
8
8
  import classNames from 'classnames';
@@ -1,104 +1,19 @@
1
1
  import _extends from "@babel/runtime/helpers/esm/extends";
2
- import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
- import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
4
- import _regeneratorRuntime from "@babel/runtime/regenerator";
5
-
6
- 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; }
7
-
8
- 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; }
9
-
10
2
  import React from 'react';
11
- import { BaseLoader, getManifest, getLocale } from '@alicloud/alfa-core';
3
+ import { BaseLoader } from '@alicloud/alfa-core';
12
4
  import ErrorBoundary from './components/ErrorBoundary';
13
- import { getConsoleConfig } from './utils/getConsoleConfig';
14
5
  import createApplication from './createApplication';
15
- var loader = BaseLoader.create(); // get manifest before resolve
16
- // normalize name
17
-
18
- loader.beforeResolve.use( /*#__PURE__*/function () {
19
- var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(appConfig) {
20
- var resolvedManifest;
21
- return _regeneratorRuntime.wrap(function _callee$(_context) {
22
- while (1) {
23
- switch (_context.prev = _context.next) {
24
- case 0:
25
- resolvedManifest = appConfig.manifest;
26
-
27
- if (resolvedManifest) {
28
- _context.next = 5;
29
- break;
30
- }
31
-
32
- _context.next = 4;
33
- return getManifest(appConfig);
34
-
35
- case 4:
36
- resolvedManifest = _context.sent;
37
-
38
- case 5:
39
- return _context.abrupt("return", _objectSpread(_objectSpread({}, appConfig), {}, {
40
- manifest: resolvedManifest
41
- }));
42
-
43
- case 6:
44
- case "end":
45
- return _context.stop();
46
- }
47
- }
48
- }, _callee);
49
- }));
50
-
51
- return function (_x) {
52
- return _ref.apply(this, arguments);
53
- };
54
- }(), undefined); // inject consoleConfig & locales after load
55
-
56
- loader.afterLoad.use( /*#__PURE__*/function () {
57
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(appConfig) {
58
- var app, defaultConsoleConfig, consoleConfig, messages, i18nMessages;
59
- return _regeneratorRuntime.wrap(function _callee2$(_context2) {
60
- while (1) {
61
- switch (_context2.prev = _context2.next) {
62
- case 0:
63
- app = appConfig.app;
64
- defaultConsoleConfig = window.ALIYUN_CONSOLE_CONFIG || {};
65
- _context2.next = 4;
66
- return getConsoleConfig(appConfig, defaultConsoleConfig);
67
-
68
- case 4:
69
- consoleConfig = _context2.sent;
70
- _context2.next = 7;
71
- return getLocale(appConfig);
72
-
73
- case 7:
74
- messages = _context2.sent;
75
- i18nMessages = _objectSpread(_objectSpread({}, window.ALIYUN_CONSOLE_I18N_MESSAGE), messages);
76
-
77
- if (app && app.context) {
78
- app.context.window.ALIYUN_CONSOLE_CONFIG = consoleConfig;
79
- app.context.window.ALIYUN_CONSOLE_I18N_MESSAGE = i18nMessages;
80
- }
81
-
82
- return _context2.abrupt("return", appConfig);
83
-
84
- case 11:
85
- case "end":
86
- return _context2.stop();
87
- }
88
- }
89
- }, _callee2);
90
- }));
91
-
92
- return function (_x2) {
93
- return _ref2.apply(this, arguments);
94
- };
95
- }(), undefined);
6
+ import beforeResolveHook from './hooks/beforeResolveHook';
7
+ import beforeLoadHook from './hooks/beforeLoadHook';
8
+ var loader = BaseLoader.create();
9
+ loader.beforeResolve.use(beforeResolveHook);
10
+ loader.beforeLoad.use(beforeLoadHook);
96
11
  var Application = createApplication(loader);
97
12
 
98
13
  function createAlfaApp(option) {
99
- var _ref3 = option || {},
100
- name = _ref3.name,
101
- dependencies = _ref3.dependencies; // check app option
14
+ var _ref = option || {},
15
+ name = _ref.name,
16
+ dependencies = _ref.dependencies; // check app option
102
17
 
103
18
 
104
19
  if (!name) return function () {
@@ -106,7 +21,12 @@ function createAlfaApp(option) {
106
21
  };
107
22
  var passedInOption = option;
108
23
  return /*#__PURE__*/React.memo(function (props) {
109
- return /*#__PURE__*/React.createElement(ErrorBoundary, null, /*#__PURE__*/React.createElement(Application, _extends({}, passedInOption, {
24
+ if ('sandbox' in props) {
25
+ console.warn('');
26
+ }
27
+
28
+ return /*#__PURE__*/React.createElement(ErrorBoundary, props, /*#__PURE__*/React.createElement(Application, _extends({}, passedInOption, {
29
+ sandbox: option.sandbox || props.sandbox,
110
30
  deps: dependencies || {},
111
31
  customProps: props
112
32
  })));
@@ -1,47 +1,33 @@
1
1
  import _extends from "@babel/runtime/helpers/esm/extends";
2
- import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
2
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
4
3
  import _regeneratorRuntime from "@babel/runtime/regenerator";
5
-
6
- 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; }
7
-
8
- 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; }
9
-
10
4
  import React from 'react';
11
- import { BaseLoader, getManifest, getLocale } from '@alicloud/alfa-core';
5
+ import { BaseLoader } from '@alicloud/alfa-core';
12
6
  import ErrorBoundary from './components/ErrorBoundary';
13
- import { getConsoleConfig } from './utils/getConsoleConfig';
14
7
  import { createCWSWidget } from './widget';
15
8
  import createApplication from './createApplication';
16
- var loader = BaseLoader.create(); // get manifest before resolve
17
- // normalize name
18
-
19
- loader.beforeResolve.use( /*#__PURE__*/function () {
9
+ import beforeResolveHook from './hooks/beforeResolveHook';
10
+ import beforeLoadHook from './hooks/beforeLoadHook';
11
+ var loader = BaseLoader.create();
12
+ loader.beforeResolve.use(beforeResolveHook);
13
+ loader.beforeLoad.use(beforeLoadHook);
14
+ loader.beforeLoad.use( /*#__PURE__*/function () {
20
15
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(appConfig) {
21
- var resolvedManifest;
16
+ var app;
22
17
  return _regeneratorRuntime.wrap(function _callee$(_context) {
23
18
  while (1) {
24
19
  switch (_context.prev = _context.next) {
25
20
  case 0:
26
- resolvedManifest = appConfig.manifest;
21
+ app = appConfig.app;
27
22
 
28
- if (resolvedManifest) {
29
- _context.next = 5;
30
- break;
23
+ if (app && app.context) {
24
+ // disable history
25
+ app.context.history = {};
31
26
  }
32
27
 
33
- _context.next = 4;
34
- return getManifest(appConfig);
28
+ return _context.abrupt("return", appConfig);
35
29
 
36
- case 4:
37
- resolvedManifest = _context.sent;
38
-
39
- case 5:
40
- return _context.abrupt("return", _objectSpread(_objectSpread({}, appConfig), {}, {
41
- manifest: resolvedManifest
42
- }));
43
-
44
- case 6:
30
+ case 3:
45
31
  case "end":
46
32
  return _context.stop();
47
33
  }
@@ -52,58 +38,15 @@ loader.beforeResolve.use( /*#__PURE__*/function () {
52
38
  return function (_x) {
53
39
  return _ref.apply(this, arguments);
54
40
  };
55
- }(), undefined); // inject consoleConfig & locales after load
56
- // remove history in vm context
57
-
58
- loader.afterLoad.use( /*#__PURE__*/function () {
59
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(appConfig) {
60
- var app, defaultConsoleConfig, consoleConfig, messages, i18nMessages;
61
- return _regeneratorRuntime.wrap(function _callee2$(_context2) {
62
- while (1) {
63
- switch (_context2.prev = _context2.next) {
64
- case 0:
65
- app = appConfig.app;
66
- defaultConsoleConfig = window.ALIYUN_CONSOLE_CONFIG || {};
67
- _context2.next = 4;
68
- return getConsoleConfig(appConfig, defaultConsoleConfig);
69
-
70
- case 4:
71
- consoleConfig = _context2.sent;
72
- _context2.next = 7;
73
- return getLocale(appConfig);
74
-
75
- case 7:
76
- messages = _context2.sent;
77
- i18nMessages = _objectSpread(_objectSpread({}, window.ALIYUN_CONSOLE_I18N_MESSAGE), messages);
78
-
79
- if (app && app.context) {
80
- app.context.window.ALIYUN_CONSOLE_CONFIG = consoleConfig;
81
- app.context.window.ALIYUN_CONSOLE_I18N_MESSAGE = i18nMessages;
82
- app.context.history = {};
83
- }
84
-
85
- return _context2.abrupt("return", appConfig);
86
-
87
- case 11:
88
- case "end":
89
- return _context2.stop();
90
- }
91
- }
92
- }, _callee2);
93
- }));
94
-
95
- return function (_x2) {
96
- return _ref2.apply(this, arguments);
97
- };
98
- }(), undefined);
41
+ }());
99
42
  var Application = createApplication(loader);
100
43
 
101
44
  function createAlfaApp(option) {
102
- var _ref3 = option || {},
103
- name = _ref3.name,
104
- dependencies = _ref3.dependencies;
45
+ var _ref2 = option || {},
46
+ name = _ref2.name,
47
+ dependencies = _ref2.dependencies;
105
48
 
106
- if (!name.match(/@ali\/widget-/)) {
49
+ if (name.match(/@ali\/widget-/)) {
107
50
  // TODO load style
108
51
  return createCWSWidget(option);
109
52
  } // check app option
@@ -114,11 +57,16 @@ function createAlfaApp(option) {
114
57
  };
115
58
  var passedInOption = option;
116
59
  return /*#__PURE__*/React.memo(function (props) {
117
- return /*#__PURE__*/React.createElement(ErrorBoundary, null, /*#__PURE__*/React.createElement(Application, _extends({}, passedInOption, {
118
- // name={name}
119
- deps: dependencies || {},
120
- customProps: props
121
- })));
60
+ return (
61
+ /*#__PURE__*/
62
+ // Compatible with old logic
63
+ // props should not passed in errorBoundary
64
+ React.createElement(ErrorBoundary, props, /*#__PURE__*/React.createElement(Application, _extends({}, passedInOption, {
65
+ // name={name}
66
+ deps: dependencies || {},
67
+ customProps: props
68
+ })))
69
+ );
122
70
  });
123
71
  }
124
72