@alicloud/alfa-react 1.3.1-alpha.1 → 1.3.1-alpha.5
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.
- package/dist/index.js +4 -4
- package/es/createAlfaApp.js +4 -10
- package/es/createAlfaWidget.js +3 -3
- package/es/createApplication.js +24 -19
- package/es/hooks/beforeLoadHook.js +69 -0
- package/es/version.js +1 -1
- package/lib/createAlfaApp.js +4 -10
- package/lib/createAlfaWidget.js +3 -3
- package/lib/createApplication.js +24 -18
- package/lib/hooks/beforeLoadHook.d.ts +3 -0
- package/lib/hooks/beforeLoadHook.js +84 -0
- package/lib/version.d.ts +1 -1
- package/lib/version.js +1 -1
- package/package.json +2 -2
package/es/createAlfaApp.js
CHANGED
|
@@ -4,10 +4,10 @@ import { BaseLoader } from '@alicloud/alfa-core';
|
|
|
4
4
|
import ErrorBoundary from './components/ErrorBoundary';
|
|
5
5
|
import createApplication from './createApplication';
|
|
6
6
|
import beforeResolveHook from './hooks/beforeResolveHook';
|
|
7
|
-
import
|
|
7
|
+
import beforeLoadHook from './hooks/beforeLoadHook';
|
|
8
8
|
var loader = BaseLoader.create();
|
|
9
9
|
loader.beforeResolve.use(beforeResolveHook);
|
|
10
|
-
loader.
|
|
10
|
+
loader.beforeLoad.use(beforeLoadHook);
|
|
11
11
|
var Application = createApplication(loader);
|
|
12
12
|
|
|
13
13
|
function createAlfaApp(option) {
|
|
@@ -21,14 +21,8 @@ function createAlfaApp(option) {
|
|
|
21
21
|
};
|
|
22
22
|
var passedInOption = option;
|
|
23
23
|
return /*#__PURE__*/React.memo(function (props) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
return /*#__PURE__*/React.createElement(ErrorBoundary, props, /*#__PURE__*/React.createElement(Application, _extends({
|
|
29
|
-
// 兼容历史逻辑,优先使用 option 中的 sandbox 参数
|
|
30
|
-
sandbox: props.sandbox
|
|
31
|
-
}, passedInOption, {
|
|
24
|
+
return /*#__PURE__*/React.createElement(ErrorBoundary, props, /*#__PURE__*/React.createElement(Application, _extends({}, passedInOption, {
|
|
25
|
+
sandbox: option.sandbox || props.sandbox,
|
|
32
26
|
deps: dependencies || {},
|
|
33
27
|
customProps: props
|
|
34
28
|
})));
|
package/es/createAlfaWidget.js
CHANGED
|
@@ -7,11 +7,11 @@ import ErrorBoundary from './components/ErrorBoundary';
|
|
|
7
7
|
import { createCWSWidget } from './widget';
|
|
8
8
|
import createApplication from './createApplication';
|
|
9
9
|
import beforeResolveHook from './hooks/beforeResolveHook';
|
|
10
|
-
import
|
|
10
|
+
import beforeLoadHook from './hooks/beforeLoadHook';
|
|
11
11
|
var loader = BaseLoader.create();
|
|
12
12
|
loader.beforeResolve.use(beforeResolveHook);
|
|
13
|
-
loader.
|
|
14
|
-
loader.
|
|
13
|
+
loader.beforeLoad.use(beforeLoadHook);
|
|
14
|
+
loader.beforeLoad.use( /*#__PURE__*/function () {
|
|
15
15
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(appConfig) {
|
|
16
16
|
var app;
|
|
17
17
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
package/es/createApplication.js
CHANGED
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
2
|
+
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
|
3
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
4
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
3
5
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
4
|
-
|
|
6
|
+
|
|
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
|
+
|
|
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
|
+
|
|
11
|
+
import React, { useRef, useEffect, useState, useMemo } from 'react';
|
|
5
12
|
import Loading from './components/Loading';
|
|
6
13
|
import { normalizeName } from './utils';
|
|
7
14
|
|
|
@@ -16,7 +23,6 @@ export default function createApplication(loader) {
|
|
|
16
23
|
version = props.version,
|
|
17
24
|
manifest = props.manifest,
|
|
18
25
|
loading = props.loading,
|
|
19
|
-
sandbox = props.sandbox,
|
|
20
26
|
customProps = props.customProps,
|
|
21
27
|
className = props.className,
|
|
22
28
|
style = props.style,
|
|
@@ -30,7 +36,8 @@ export default function createApplication(loader) {
|
|
|
30
36
|
afterMount = props.afterMount,
|
|
31
37
|
beforeUnmount = props.beforeUnmount,
|
|
32
38
|
afterUnmount = props.afterUnmount,
|
|
33
|
-
beforeUpdate = props.beforeUpdate
|
|
39
|
+
beforeUpdate = props.beforeUpdate,
|
|
40
|
+
customSandbox = props.sandbox;
|
|
34
41
|
|
|
35
42
|
var _useState = useState(null),
|
|
36
43
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -39,6 +46,12 @@ export default function createApplication(loader) {
|
|
|
39
46
|
|
|
40
47
|
var appRef = useRef(null);
|
|
41
48
|
var tagName = normalizeName(props.name);
|
|
49
|
+
var sandbox = useMemo(function () {
|
|
50
|
+
return _objectSpread(_objectSpread({}, customSandbox), {}, {
|
|
51
|
+
externalsVars: [].concat(_toConsumableArray((customSandbox === null || customSandbox === void 0 ? void 0 : customSandbox.externalsVars) || []), [// global vars used in ConsoleBase.forApp
|
|
52
|
+
'_console_base_ready_'])
|
|
53
|
+
});
|
|
54
|
+
}, [customSandbox]);
|
|
42
55
|
useEffect(function () {
|
|
43
56
|
// eslint-disable-next-line no-useless-catch
|
|
44
57
|
_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
|
|
@@ -83,12 +96,8 @@ export default function createApplication(loader) {
|
|
|
83
96
|
}));
|
|
84
97
|
|
|
85
98
|
case 7:
|
|
86
|
-
_context.next = 9;
|
|
87
|
-
return App.load();
|
|
88
|
-
|
|
89
|
-
case 9:
|
|
90
99
|
if (appRef.current) {
|
|
91
|
-
_context.next =
|
|
100
|
+
_context.next = 9;
|
|
92
101
|
break;
|
|
93
102
|
}
|
|
94
103
|
|
|
@@ -96,19 +105,19 @@ export default function createApplication(loader) {
|
|
|
96
105
|
E_MSG: 'cannot find container.'
|
|
97
106
|
}));
|
|
98
107
|
|
|
99
|
-
case
|
|
100
|
-
_context.next =
|
|
108
|
+
case 9:
|
|
109
|
+
_context.next = 11;
|
|
101
110
|
return App.mount(appRef.current, {
|
|
102
111
|
customProps: customProps
|
|
103
112
|
});
|
|
104
113
|
|
|
105
|
-
case
|
|
114
|
+
case 11:
|
|
106
115
|
setApp(App);
|
|
107
116
|
return _context.abrupt("return", function () {
|
|
108
117
|
App && App.unmount();
|
|
109
118
|
});
|
|
110
119
|
|
|
111
|
-
case
|
|
120
|
+
case 13:
|
|
112
121
|
case "end":
|
|
113
122
|
return _context.stop();
|
|
114
123
|
}
|
|
@@ -123,13 +132,9 @@ export default function createApplication(loader) {
|
|
|
123
132
|
app.update(customProps);
|
|
124
133
|
}
|
|
125
134
|
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
});
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
return /*#__PURE__*/React.createElement(React.Fragment, null, sandbox && sandbox !== true && sandbox.disableFakeBody ? /*#__PURE__*/React.createElement(tagName, {
|
|
135
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, !app ? /*#__PURE__*/React.createElement(Loading, {
|
|
136
|
+
loading: loading
|
|
137
|
+
}) : null, sandbox && sandbox.disableFakeBody ? /*#__PURE__*/React.createElement(tagName, {
|
|
133
138
|
style: style,
|
|
134
139
|
className: className,
|
|
135
140
|
ref: appRef,
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
|
+
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
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); 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 = 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; }
|
|
9
|
+
|
|
10
|
+
import { getLocale } from '@alicloud/alfa-core';
|
|
11
|
+
import { getConsoleConfig } from '../utils/getConsoleConfig'; // inject consoleConfig & locales after load
|
|
12
|
+
|
|
13
|
+
function afterLoadHook(_x) {
|
|
14
|
+
return _afterLoadHook.apply(this, arguments);
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
function _afterLoadHook() {
|
|
18
|
+
_afterLoadHook = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(appConfig) {
|
|
19
|
+
var app, logger, defaultConsoleConfig, CONFIG_START_TIME, _yield$Promise$all$ca, _yield$Promise$all$ca2, consoleConfig, messages, CONFIG_END_TIME, i18nMessages, END_TIME;
|
|
20
|
+
|
|
21
|
+
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
22
|
+
while (1) {
|
|
23
|
+
switch (_context.prev = _context.next) {
|
|
24
|
+
case 0:
|
|
25
|
+
app = appConfig.app, logger = appConfig.logger;
|
|
26
|
+
defaultConsoleConfig = window.ALIYUN_CONSOLE_CONFIG || {};
|
|
27
|
+
CONFIG_START_TIME = Date.now();
|
|
28
|
+
_context.next = 5;
|
|
29
|
+
return Promise.all([getConsoleConfig(appConfig, defaultConsoleConfig), getLocale(appConfig)]).catch(function (e) {
|
|
30
|
+
logger === null || logger === void 0 ? void 0 : logger.error({
|
|
31
|
+
E_MSG: 'fetch config & locale error.',
|
|
32
|
+
E_STACK: e
|
|
33
|
+
});
|
|
34
|
+
return [{}, {}];
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
case 5:
|
|
38
|
+
_yield$Promise$all$ca = _context.sent;
|
|
39
|
+
_yield$Promise$all$ca2 = _slicedToArray(_yield$Promise$all$ca, 2);
|
|
40
|
+
consoleConfig = _yield$Promise$all$ca2[0];
|
|
41
|
+
messages = _yield$Promise$all$ca2[1];
|
|
42
|
+
CONFIG_END_TIME = Date.now();
|
|
43
|
+
i18nMessages = _objectSpread(_objectSpread({}, window.ALIYUN_CONSOLE_I18N_MESSAGE), messages);
|
|
44
|
+
|
|
45
|
+
if (app && app.context) {
|
|
46
|
+
app.context.window.ALIYUN_CONSOLE_CONFIG = consoleConfig;
|
|
47
|
+
app.context.window.ALIYUN_CONSOLE_I18N_MESSAGE = i18nMessages; // (app.context.history as any) = {};
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
END_TIME = Date.now();
|
|
51
|
+
logger === null || logger === void 0 ? void 0 : logger.record({
|
|
52
|
+
CONFIG_START_TIME: CONFIG_START_TIME,
|
|
53
|
+
CONFIG_END_TIME: CONFIG_END_TIME,
|
|
54
|
+
END_TIME: END_TIME
|
|
55
|
+
});
|
|
56
|
+
logger === null || logger === void 0 ? void 0 : logger.send();
|
|
57
|
+
return _context.abrupt("return", appConfig);
|
|
58
|
+
|
|
59
|
+
case 16:
|
|
60
|
+
case "end":
|
|
61
|
+
return _context.stop();
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}, _callee);
|
|
65
|
+
}));
|
|
66
|
+
return _afterLoadHook.apply(this, arguments);
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
export default afterLoadHook;
|
package/es/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export var version = '1.3.1-alpha.
|
|
1
|
+
export var version = '1.3.1-alpha.5';
|
package/lib/createAlfaApp.js
CHANGED
|
@@ -19,12 +19,12 @@ var _createApplication = _interopRequireDefault(require("./createApplication"));
|
|
|
19
19
|
|
|
20
20
|
var _beforeResolveHook = _interopRequireDefault(require("./hooks/beforeResolveHook"));
|
|
21
21
|
|
|
22
|
-
var
|
|
22
|
+
var _beforeLoadHook = _interopRequireDefault(require("./hooks/beforeLoadHook"));
|
|
23
23
|
|
|
24
24
|
var loader = _alfaCore.BaseLoader.create();
|
|
25
25
|
|
|
26
26
|
loader.beforeResolve.use(_beforeResolveHook.default);
|
|
27
|
-
loader.
|
|
27
|
+
loader.beforeLoad.use(_beforeLoadHook.default);
|
|
28
28
|
var Application = (0, _createApplication.default)(loader);
|
|
29
29
|
|
|
30
30
|
function createAlfaApp(option) {
|
|
@@ -38,14 +38,8 @@ function createAlfaApp(option) {
|
|
|
38
38
|
};
|
|
39
39
|
var passedInOption = option;
|
|
40
40
|
return /*#__PURE__*/_react.default.memo(function (props) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
return /*#__PURE__*/_react.default.createElement(_ErrorBoundary.default, props, /*#__PURE__*/_react.default.createElement(Application, (0, _extends2.default)({
|
|
46
|
-
// 兼容历史逻辑,优先使用 option 中的 sandbox 参数
|
|
47
|
-
sandbox: props.sandbox
|
|
48
|
-
}, passedInOption, {
|
|
41
|
+
return /*#__PURE__*/_react.default.createElement(_ErrorBoundary.default, props, /*#__PURE__*/_react.default.createElement(Application, (0, _extends2.default)({}, passedInOption, {
|
|
42
|
+
sandbox: option.sandbox || props.sandbox,
|
|
49
43
|
deps: dependencies || {},
|
|
50
44
|
customProps: props
|
|
51
45
|
})));
|
package/lib/createAlfaWidget.js
CHANGED
|
@@ -25,13 +25,13 @@ var _createApplication = _interopRequireDefault(require("./createApplication"));
|
|
|
25
25
|
|
|
26
26
|
var _beforeResolveHook = _interopRequireDefault(require("./hooks/beforeResolveHook"));
|
|
27
27
|
|
|
28
|
-
var
|
|
28
|
+
var _beforeLoadHook = _interopRequireDefault(require("./hooks/beforeLoadHook"));
|
|
29
29
|
|
|
30
30
|
var loader = _alfaCore.BaseLoader.create();
|
|
31
31
|
|
|
32
32
|
loader.beforeResolve.use(_beforeResolveHook.default);
|
|
33
|
-
loader.
|
|
34
|
-
loader.
|
|
33
|
+
loader.beforeLoad.use(_beforeLoadHook.default);
|
|
34
|
+
loader.beforeLoad.use( /*#__PURE__*/function () {
|
|
35
35
|
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(appConfig) {
|
|
36
36
|
var app;
|
|
37
37
|
return _regenerator.default.wrap(function _callee$(_context) {
|
package/lib/createApplication.js
CHANGED
|
@@ -13,6 +13,10 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
|
|
|
13
13
|
|
|
14
14
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
15
15
|
|
|
16
|
+
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
17
|
+
|
|
18
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
19
|
+
|
|
16
20
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
17
21
|
|
|
18
22
|
var _react = _interopRequireWildcard(require("react"));
|
|
@@ -25,6 +29,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
25
29
|
|
|
26
30
|
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; }
|
|
27
31
|
|
|
32
|
+
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; }
|
|
33
|
+
|
|
34
|
+
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; }
|
|
35
|
+
|
|
28
36
|
/**
|
|
29
37
|
* container for microApp mount
|
|
30
38
|
* @param loader alfa-core loader
|
|
@@ -36,7 +44,6 @@ function createApplication(loader) {
|
|
|
36
44
|
version = props.version,
|
|
37
45
|
manifest = props.manifest,
|
|
38
46
|
loading = props.loading,
|
|
39
|
-
sandbox = props.sandbox,
|
|
40
47
|
customProps = props.customProps,
|
|
41
48
|
className = props.className,
|
|
42
49
|
style = props.style,
|
|
@@ -50,7 +57,8 @@ function createApplication(loader) {
|
|
|
50
57
|
afterMount = props.afterMount,
|
|
51
58
|
beforeUnmount = props.beforeUnmount,
|
|
52
59
|
afterUnmount = props.afterUnmount,
|
|
53
|
-
beforeUpdate = props.beforeUpdate
|
|
60
|
+
beforeUpdate = props.beforeUpdate,
|
|
61
|
+
customSandbox = props.sandbox;
|
|
54
62
|
|
|
55
63
|
var _useState = (0, _react.useState)(null),
|
|
56
64
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
@@ -59,6 +67,12 @@ function createApplication(loader) {
|
|
|
59
67
|
|
|
60
68
|
var appRef = (0, _react.useRef)(null);
|
|
61
69
|
var tagName = (0, _utils.normalizeName)(props.name);
|
|
70
|
+
var sandbox = (0, _react.useMemo)(function () {
|
|
71
|
+
return _objectSpread(_objectSpread({}, customSandbox), {}, {
|
|
72
|
+
externalsVars: [].concat((0, _toConsumableArray2.default)((customSandbox === null || customSandbox === void 0 ? void 0 : customSandbox.externalsVars) || []), [// global vars used in ConsoleBase.forApp
|
|
73
|
+
'_console_base_ready_'])
|
|
74
|
+
});
|
|
75
|
+
}, [customSandbox]);
|
|
62
76
|
(0, _react.useEffect)(function () {
|
|
63
77
|
// eslint-disable-next-line no-useless-catch
|
|
64
78
|
(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
|
|
@@ -103,12 +117,8 @@ function createApplication(loader) {
|
|
|
103
117
|
}));
|
|
104
118
|
|
|
105
119
|
case 7:
|
|
106
|
-
_context.next = 9;
|
|
107
|
-
return App.load();
|
|
108
|
-
|
|
109
|
-
case 9:
|
|
110
120
|
if (appRef.current) {
|
|
111
|
-
_context.next =
|
|
121
|
+
_context.next = 9;
|
|
112
122
|
break;
|
|
113
123
|
}
|
|
114
124
|
|
|
@@ -116,19 +126,19 @@ function createApplication(loader) {
|
|
|
116
126
|
E_MSG: 'cannot find container.'
|
|
117
127
|
}));
|
|
118
128
|
|
|
119
|
-
case
|
|
120
|
-
_context.next =
|
|
129
|
+
case 9:
|
|
130
|
+
_context.next = 11;
|
|
121
131
|
return App.mount(appRef.current, {
|
|
122
132
|
customProps: customProps
|
|
123
133
|
});
|
|
124
134
|
|
|
125
|
-
case
|
|
135
|
+
case 11:
|
|
126
136
|
setApp(App);
|
|
127
137
|
return _context.abrupt("return", function () {
|
|
128
138
|
App && App.unmount();
|
|
129
139
|
});
|
|
130
140
|
|
|
131
|
-
case
|
|
141
|
+
case 13:
|
|
132
142
|
case "end":
|
|
133
143
|
return _context.stop();
|
|
134
144
|
}
|
|
@@ -143,13 +153,9 @@ function createApplication(loader) {
|
|
|
143
153
|
app.update(customProps);
|
|
144
154
|
}
|
|
145
155
|
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
});
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, sandbox && sandbox !== true && sandbox.disableFakeBody ? /*#__PURE__*/_react.default.createElement(tagName, {
|
|
156
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !app ? /*#__PURE__*/_react.default.createElement(_Loading.default, {
|
|
157
|
+
loading: loading
|
|
158
|
+
}) : null, sandbox && sandbox.disableFakeBody ? /*#__PURE__*/_react.default.createElement(tagName, {
|
|
153
159
|
style: style,
|
|
154
160
|
className: className,
|
|
155
161
|
ref: appRef,
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports.default = void 0;
|
|
9
|
+
|
|
10
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
|
+
|
|
12
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
13
|
+
|
|
14
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
15
|
+
|
|
16
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
17
|
+
|
|
18
|
+
var _alfaCore = require("@alicloud/alfa-core");
|
|
19
|
+
|
|
20
|
+
var _getConsoleConfig = require("../utils/getConsoleConfig");
|
|
21
|
+
|
|
22
|
+
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; }
|
|
23
|
+
|
|
24
|
+
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; }
|
|
25
|
+
|
|
26
|
+
// inject consoleConfig & locales after load
|
|
27
|
+
function afterLoadHook(_x) {
|
|
28
|
+
return _afterLoadHook.apply(this, arguments);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function _afterLoadHook() {
|
|
32
|
+
_afterLoadHook = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(appConfig) {
|
|
33
|
+
var app, logger, defaultConsoleConfig, CONFIG_START_TIME, _yield$Promise$all$ca, _yield$Promise$all$ca2, consoleConfig, messages, CONFIG_END_TIME, i18nMessages, END_TIME;
|
|
34
|
+
|
|
35
|
+
return _regenerator.default.wrap(function _callee$(_context) {
|
|
36
|
+
while (1) {
|
|
37
|
+
switch (_context.prev = _context.next) {
|
|
38
|
+
case 0:
|
|
39
|
+
app = appConfig.app, logger = appConfig.logger;
|
|
40
|
+
defaultConsoleConfig = window.ALIYUN_CONSOLE_CONFIG || {};
|
|
41
|
+
CONFIG_START_TIME = Date.now();
|
|
42
|
+
_context.next = 5;
|
|
43
|
+
return Promise.all([(0, _getConsoleConfig.getConsoleConfig)(appConfig, defaultConsoleConfig), (0, _alfaCore.getLocale)(appConfig)]).catch(function (e) {
|
|
44
|
+
logger === null || logger === void 0 ? void 0 : logger.error({
|
|
45
|
+
E_MSG: 'fetch config & locale error.',
|
|
46
|
+
E_STACK: e
|
|
47
|
+
});
|
|
48
|
+
return [{}, {}];
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
case 5:
|
|
52
|
+
_yield$Promise$all$ca = _context.sent;
|
|
53
|
+
_yield$Promise$all$ca2 = (0, _slicedToArray2.default)(_yield$Promise$all$ca, 2);
|
|
54
|
+
consoleConfig = _yield$Promise$all$ca2[0];
|
|
55
|
+
messages = _yield$Promise$all$ca2[1];
|
|
56
|
+
CONFIG_END_TIME = Date.now();
|
|
57
|
+
i18nMessages = _objectSpread(_objectSpread({}, window.ALIYUN_CONSOLE_I18N_MESSAGE), messages);
|
|
58
|
+
|
|
59
|
+
if (app && app.context) {
|
|
60
|
+
app.context.window.ALIYUN_CONSOLE_CONFIG = consoleConfig;
|
|
61
|
+
app.context.window.ALIYUN_CONSOLE_I18N_MESSAGE = i18nMessages; // (app.context.history as any) = {};
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
END_TIME = Date.now();
|
|
65
|
+
logger === null || logger === void 0 ? void 0 : logger.record({
|
|
66
|
+
CONFIG_START_TIME: CONFIG_START_TIME,
|
|
67
|
+
CONFIG_END_TIME: CONFIG_END_TIME,
|
|
68
|
+
END_TIME: END_TIME
|
|
69
|
+
});
|
|
70
|
+
logger === null || logger === void 0 ? void 0 : logger.send();
|
|
71
|
+
return _context.abrupt("return", appConfig);
|
|
72
|
+
|
|
73
|
+
case 16:
|
|
74
|
+
case "end":
|
|
75
|
+
return _context.stop();
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}, _callee);
|
|
79
|
+
}));
|
|
80
|
+
return _afterLoadHook.apply(this, arguments);
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
var _default = afterLoadHook;
|
|
84
|
+
exports.default = _default;
|
package/lib/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const version = "1.3.1-alpha.
|
|
1
|
+
export declare const version = "1.3.1-alpha.5";
|
package/lib/version.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alicloud/alfa-react",
|
|
3
|
-
"version": "1.3.1-alpha.
|
|
3
|
+
"version": "1.3.1-alpha.5",
|
|
4
4
|
"description": "Alfa Framework (React Version)",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "es/index.js",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"typescript": "^3.0.3"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@alicloud/alfa-core": "^1.3.
|
|
42
|
+
"@alicloud/alfa-core": "^1.3.1-alpha.1",
|
|
43
43
|
"@alicloud/console-os-loader": "^1.2.3",
|
|
44
44
|
"@alicloud/widget-utils-console": "^0.1.6",
|
|
45
45
|
"classnames": "^2.2.6",
|