@alicloud/alfa-react 1.2.2 → 1.3.0-beta.0
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 +7 -7
- package/es/app.js +45 -40
- package/es/components/ErrorBoundary/ErrorPanel.js +2 -2
- package/es/components/ErrorBoundary/index.js +15 -15
- package/es/components/Loading/Skeleton.js +1 -1
- package/es/components/Loading/Title.js +1 -1
- package/es/createAlfaApp.js +31 -0
- package/es/createAlfaWidget.js +73 -0
- package/es/createApplication.js +116 -0
- package/es/hooks/afterLoad.js +60 -0
- package/es/hooks/afterLoadHook.js +69 -0
- package/es/hooks/beforeResolveHook.js +55 -0
- package/es/index.js +2 -2
- package/es/types/base.js +26 -0
- package/es/types/index.js +1 -0
- package/es/types.js +1 -0
- package/es/utils/checkOptions.js +13 -0
- package/es/utils/getConsoleConfig.js +88 -0
- package/es/utils/index.js +3 -0
- package/es/version.js +1 -0
- package/es/widget/emitter.js +4 -4
- package/es/widget/getWidgetConfigById.js +5 -6
- package/es/widget/getWidgetDeps.js +4 -4
- package/es/widget.js +2 -2
- package/lib/app.d.ts +2 -1
- package/lib/app.js +50 -42
- package/lib/base.d.ts +4 -1
- package/lib/components/ErrorBoundary/ErrorPanel.d.ts +1 -1
- package/lib/components/ErrorBoundary/ErrorPanel.js +2 -2
- package/lib/components/ErrorBoundary/index.d.ts +7 -9
- package/lib/components/ErrorBoundary/index.js +15 -15
- package/lib/components/Loading/Paragraph.js +6 -2
- package/lib/components/Loading/Skeleton.js +7 -3
- package/lib/components/Loading/Title.d.ts +1 -0
- package/lib/components/Loading/Title.js +7 -3
- package/lib/createAlfaApp.d.ts +4 -0
- package/lib/createAlfaApp.js +49 -0
- package/lib/createAlfaWidget.d.ts +4 -0
- package/lib/createAlfaWidget.js +94 -0
- package/lib/createApplication.d.ts +13 -0
- package/lib/createApplication.js +136 -0
- package/lib/hooks/afterLoad.d.ts +3 -0
- package/lib/hooks/afterLoad.js +75 -0
- package/lib/hooks/afterLoadHook.d.ts +3 -0
- package/lib/hooks/afterLoadHook.js +84 -0
- package/lib/hooks/beforeResolve.d.ts +1 -0
- package/lib/hooks/beforeResolve.js +73 -0
- package/lib/hooks/beforeResolveHook.d.ts +3 -0
- package/lib/hooks/beforeResolveHook.js +69 -0
- package/lib/hooks/resolveManifest.js +73 -0
- package/lib/hooks/sendRecord.d.ts +3 -0
- package/lib/hooks/sendRecord.js +40 -0
- package/lib/hooks/sls.js +1 -0
- package/lib/index.d.ts +2 -2
- package/lib/index.js +13 -11
- package/lib/types/base.d.ts +11 -0
- package/lib/types/base.js +37 -0
- package/lib/types/index.d.ts +86 -0
- package/lib/types/index.js +5 -0
- package/lib/types.d.ts +5 -7
- package/lib/types.js +5 -1
- package/lib/utils/checkOptions.d.ts +0 -0
- package/lib/utils/checkOptions.js +14 -0
- package/lib/utils/getConsoleConfig.d.ts +21 -0
- package/lib/{app → utils}/getConsoleConfig.js +48 -8
- package/lib/utils/index.d.ts +1 -0
- package/lib/utils/index.js +12 -0
- package/lib/utils/logger.d.ts +15 -0
- package/lib/utils/logger.js +92 -0
- package/lib/version.d.ts +1 -0
- package/lib/version.js +8 -0
- package/lib/widget/emitter.d.ts +0 -1
- package/lib/widget/emitter.js +4 -4
- package/lib/widget/getWidgetConfigById.js +5 -6
- package/lib/widget/getWidgetDeps.js +9 -5
- package/lib/widget.d.ts +2 -1
- package/lib/widget.js +9 -5
- package/package.json +13 -7
- package/LICENSE +0 -21
- package/es/app/getConsoleConfig.js +0 -49
- package/lib/app/getConsoleConfig.d.ts +0 -2
package/es/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export {
|
|
2
|
-
export {
|
|
1
|
+
export { default as createAlfaApp } from './createAlfaApp';
|
|
2
|
+
export { default as createAlfaWidget } from './createAlfaWidget';
|
|
3
3
|
export { eventEmitter as widgetEventEmitter } from './widget/index'; // todo
|
|
4
4
|
|
|
5
5
|
export { createEventBus, prefetch } from '@alicloud/alfa-core';
|
package/es/types/base.js
ADDED
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
2
|
+
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
3
|
+
import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
|
|
4
|
+
import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
|
|
5
|
+
|
|
6
|
+
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); }; }
|
|
7
|
+
|
|
8
|
+
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
9
|
+
|
|
10
|
+
import React from 'react';
|
|
11
|
+
|
|
12
|
+
var MicroAppBase = /*#__PURE__*/function (_React$Component) {
|
|
13
|
+
_inherits(MicroAppBase, _React$Component);
|
|
14
|
+
|
|
15
|
+
var _super = _createSuper(MicroAppBase);
|
|
16
|
+
|
|
17
|
+
function MicroAppBase() {
|
|
18
|
+
_classCallCheck(this, MicroAppBase);
|
|
19
|
+
|
|
20
|
+
return _super.apply(this, arguments);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
return MicroAppBase;
|
|
24
|
+
}(React.Component);
|
|
25
|
+
|
|
26
|
+
export { MicroAppBase as default };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
package/es/types.js
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
// import { AlfaFactoryOption } from '@alicloud/alfa-core';
|
|
2
|
+
// enum Type {
|
|
3
|
+
// app = 'app',
|
|
4
|
+
// widget = 'widget'
|
|
5
|
+
// }
|
|
6
|
+
// const getType = (name: string): Type => {
|
|
7
|
+
// return Type.app;
|
|
8
|
+
// };
|
|
9
|
+
// const checkOptions = <T extends AlfaFactoryOption>(option: T, type: Type): T => {
|
|
10
|
+
// const { name } = option;
|
|
11
|
+
// const type = get
|
|
12
|
+
// };
|
|
13
|
+
// export default checkOptions;
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
2
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
3
|
+
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
4
|
+
|
|
5
|
+
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; }
|
|
6
|
+
|
|
7
|
+
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; }
|
|
8
|
+
|
|
9
|
+
import { getConfig } from '@alicloud/alfa-core';
|
|
10
|
+
import md5 from 'crypto-js/md5';
|
|
11
|
+
/**
|
|
12
|
+
* transform
|
|
13
|
+
* @param features
|
|
14
|
+
*/
|
|
15
|
+
//@ts-ignore
|
|
16
|
+
|
|
17
|
+
var processFeatures = function processFeatures(features) {
|
|
18
|
+
return Object.keys(features).reduce(function (newFeatures, key) {
|
|
19
|
+
var _ALIYUN_CONSOLE_CONFI;
|
|
20
|
+
|
|
21
|
+
var feature = features[key];
|
|
22
|
+
if (!feature) return newFeatures;
|
|
23
|
+
var uid = ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.CURRENT_PK) || '';
|
|
24
|
+
var md5Uid = md5(uid).toString();
|
|
25
|
+
var enableBlockList = feature.enableBlockList,
|
|
26
|
+
enableSampling = feature.enableSampling,
|
|
27
|
+
enableWhiteList = feature.enableWhiteList,
|
|
28
|
+
sampling = feature.sampling,
|
|
29
|
+
blockList = feature.blockList,
|
|
30
|
+
whiteList = feature.whiteList;
|
|
31
|
+
|
|
32
|
+
if (enableBlockList && blockList.includes(md5Uid)) {
|
|
33
|
+
newFeatures[key] = false;
|
|
34
|
+
} else if (enableWhiteList && whiteList.includes(md5Uid)) {
|
|
35
|
+
newFeatures[key] = true;
|
|
36
|
+
} else if (enableSampling) {
|
|
37
|
+
var gray = uid.substring(uid.length - 2);
|
|
38
|
+
if (Number(gray) >= sampling * 100 || sampling === 0) newFeatures[key] = false;
|
|
39
|
+
newFeatures[key] = true;
|
|
40
|
+
} else {
|
|
41
|
+
newFeatures[key] = false;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
return newFeatures;
|
|
45
|
+
}, {});
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
var mergeConfigDataWithConsoleConfig = function mergeConfigDataWithConsoleConfig(configData, consoleConfig) {
|
|
49
|
+
var _window, _window$ALIYUN_CONSOL, _configData$ALL_CHANN, _configData$ALL_CHANN2;
|
|
50
|
+
|
|
51
|
+
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';
|
|
52
|
+
var channelLinks = ((_configData$ALL_CHANN = configData.ALL_CHANNEL_LINKS) === null || _configData$ALL_CHANN === void 0 ? void 0 : _configData$ALL_CHANN[channel]) || {};
|
|
53
|
+
var channelFeatures = ((_configData$ALL_CHANN2 = configData.ALL_CHANNEL_FEATURE_STATUS) === null || _configData$ALL_CHANN2 === void 0 ? void 0 : _configData$ALL_CHANN2[channel]) || {}; //@ts-ignore
|
|
54
|
+
|
|
55
|
+
var features = configData.ALL_FEATURE_STATUS || {};
|
|
56
|
+
return _objectSpread(_objectSpread({}, consoleConfig), {}, {
|
|
57
|
+
CHANNEL_LINKS: channelLinks,
|
|
58
|
+
CHANNEL_FEATURE_STATUS: channelFeatures,
|
|
59
|
+
FEATURE_STATUS: processFeatures(features)
|
|
60
|
+
});
|
|
61
|
+
};
|
|
62
|
+
|
|
63
|
+
export var getConsoleConfig = /*#__PURE__*/function () {
|
|
64
|
+
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(config, consoleConfig) {
|
|
65
|
+
var configData;
|
|
66
|
+
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
67
|
+
while (1) {
|
|
68
|
+
switch (_context.prev = _context.next) {
|
|
69
|
+
case 0:
|
|
70
|
+
_context.next = 2;
|
|
71
|
+
return getConfig(config);
|
|
72
|
+
|
|
73
|
+
case 2:
|
|
74
|
+
configData = _context.sent;
|
|
75
|
+
return _context.abrupt("return", mergeConfigDataWithConsoleConfig(configData, consoleConfig));
|
|
76
|
+
|
|
77
|
+
case 4:
|
|
78
|
+
case "end":
|
|
79
|
+
return _context.stop();
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}, _callee);
|
|
83
|
+
}));
|
|
84
|
+
|
|
85
|
+
return function getConsoleConfig(_x, _x2) {
|
|
86
|
+
return _ref.apply(this, arguments);
|
|
87
|
+
};
|
|
88
|
+
}();
|
package/es/version.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export var version = '1.3.0-beta.0';
|
package/es/widget/emitter.js
CHANGED
|
@@ -18,13 +18,13 @@ var WidgetEventEmitter = /*#__PURE__*/function (_EventEmitter) {
|
|
|
18
18
|
function WidgetEventEmitter() {
|
|
19
19
|
_classCallCheck(this, WidgetEventEmitter);
|
|
20
20
|
|
|
21
|
-
return _super.
|
|
22
|
-
}
|
|
23
|
-
|
|
21
|
+
return _super.apply(this, arguments);
|
|
22
|
+
}
|
|
24
23
|
|
|
25
24
|
_createClass(WidgetEventEmitter, [{
|
|
26
25
|
key: "refersh",
|
|
27
|
-
value:
|
|
26
|
+
value: // Compatible with the old api, this may get removed at sometime later.
|
|
27
|
+
function refersh(widgetId) {
|
|
28
28
|
return this.emit("".concat(widgetId, ":REFRESH"));
|
|
29
29
|
}
|
|
30
30
|
}, {
|
|
@@ -12,26 +12,25 @@ export var getWidgetConfigById = /*#__PURE__*/function () {
|
|
|
12
12
|
switch (_context.prev = _context.next) {
|
|
13
13
|
case 0:
|
|
14
14
|
env = ENV[option.env || getConsoleEnv()];
|
|
15
|
-
console.log(env.configUrl);
|
|
16
15
|
|
|
17
16
|
if (cachedConfig[option.name]) {
|
|
18
|
-
_context.next =
|
|
17
|
+
_context.next = 6;
|
|
19
18
|
break;
|
|
20
19
|
}
|
|
21
20
|
|
|
22
|
-
_context.next =
|
|
21
|
+
_context.next = 4;
|
|
23
22
|
return axios.get(template(env.configUrl)({
|
|
24
23
|
id: option.name
|
|
25
24
|
}));
|
|
26
25
|
|
|
27
|
-
case
|
|
26
|
+
case 4:
|
|
28
27
|
resp = _context.sent;
|
|
29
28
|
cachedConfig[option.name] = resp.data;
|
|
30
29
|
|
|
31
|
-
case
|
|
30
|
+
case 6:
|
|
32
31
|
return _context.abrupt("return", cachedConfig[option.name]);
|
|
33
32
|
|
|
34
|
-
case
|
|
33
|
+
case 7:
|
|
35
34
|
case "end":
|
|
36
35
|
return _context.stop();
|
|
37
36
|
}
|
|
@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
|
2
2
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
3
3
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
4
4
|
|
|
5
|
-
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; }
|
|
5
|
+
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; }
|
|
6
6
|
|
|
7
7
|
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; }
|
|
8
8
|
|
|
@@ -12,7 +12,7 @@ import axios from 'axios';
|
|
|
12
12
|
import kebabCase from 'lodash/kebabCase';
|
|
13
13
|
import * as propTypes from 'prop-types';
|
|
14
14
|
import { loadBundle } from '@alicloud/console-os-loader';
|
|
15
|
-
import {
|
|
15
|
+
import { createCWSWidget } from '../widget';
|
|
16
16
|
import { getWidgetVersionById } from './getWidgetVersionById'; // @ts-ignore
|
|
17
17
|
|
|
18
18
|
import * as widgetUtils from '@alicloud/widget-utils-console';
|
|
@@ -32,7 +32,7 @@ var createWidget = function createWidget(option) {
|
|
|
32
32
|
|
|
33
33
|
var id = _ref.id,
|
|
34
34
|
version = _ref.version;
|
|
35
|
-
return
|
|
35
|
+
return createCWSWidget({
|
|
36
36
|
name: id,
|
|
37
37
|
version: version,
|
|
38
38
|
dependencies: option === null || option === void 0 ? void 0 : option.dependencies,
|
|
@@ -160,7 +160,7 @@ export var getWidgetDeps = /*#__PURE__*/function () {
|
|
|
160
160
|
react: react,
|
|
161
161
|
'react-dom': reactDom,
|
|
162
162
|
'prop-types': propTypes,
|
|
163
|
-
|
|
163
|
+
axios: axios
|
|
164
164
|
}, 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)));
|
|
165
165
|
|
|
166
166
|
case 31:
|
package/es/widget.js
CHANGED
|
@@ -3,7 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
|
3
3
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
4
4
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
5
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; }
|
|
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
7
|
|
|
8
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
9
|
|
|
@@ -13,7 +13,7 @@ import { getWidgetVersionById, getWidgetDeps, getWidgetConfigById, eventEmitter
|
|
|
13
13
|
import ErrorBoundary from './components/ErrorBoundary';
|
|
14
14
|
import Loading from './components/Loading';
|
|
15
15
|
import { normalizeName } from './utils';
|
|
16
|
-
export function
|
|
16
|
+
export function createCWSWidget(option) {
|
|
17
17
|
var AlfaWidget = /*#__PURE__*/lazy( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
|
|
18
18
|
var url, config, _yield$getWidgetVersi, version, entryUrl, deps;
|
|
19
19
|
|
package/lib/app.d.ts
CHANGED
package/lib/app.js
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
|
|
4
|
-
|
|
5
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
6
4
|
|
|
5
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
6
|
+
|
|
7
7
|
Object.defineProperty(exports, "__esModule", {
|
|
8
8
|
value: true
|
|
9
9
|
});
|
|
10
|
-
exports.createAlfaApp = createAlfaApp;
|
|
11
10
|
Object.defineProperty(exports, "AlfaFactoryOption", {
|
|
12
11
|
enumerable: true,
|
|
13
12
|
get: function get() {
|
|
14
13
|
return _types.AlfaFactoryOption;
|
|
15
14
|
}
|
|
16
15
|
});
|
|
16
|
+
exports.createAlfaApp = createAlfaApp;
|
|
17
17
|
|
|
18
18
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
19
19
|
|
|
@@ -31,15 +31,19 @@ var _alfaCore = require("@alicloud/alfa-core");
|
|
|
31
31
|
|
|
32
32
|
var _Loading = _interopRequireDefault(require("./components/Loading"));
|
|
33
33
|
|
|
34
|
+
var _types = require("./types");
|
|
35
|
+
|
|
34
36
|
var _ErrorBoundary = _interopRequireDefault(require("./components/ErrorBoundary"));
|
|
35
37
|
|
|
36
|
-
var _getConsoleConfig = require("./
|
|
38
|
+
var _getConsoleConfig = require("./utils/getConsoleConfig");
|
|
37
39
|
|
|
38
40
|
var _utils = require("./utils");
|
|
39
41
|
|
|
40
|
-
|
|
42
|
+
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); }
|
|
43
|
+
|
|
44
|
+
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; }
|
|
41
45
|
|
|
42
|
-
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; }
|
|
46
|
+
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; }
|
|
43
47
|
|
|
44
48
|
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; }
|
|
45
49
|
|
|
@@ -51,10 +55,8 @@ var getProps = function getProps(props) {
|
|
|
51
55
|
delete parcelProps.loading;
|
|
52
56
|
delete parcelProps.entry;
|
|
53
57
|
delete parcelProps.container;
|
|
54
|
-
delete parcelProps.logger;
|
|
55
|
-
|
|
56
|
-
delete parcelProps.env; // @ts-ignore
|
|
57
|
-
|
|
58
|
+
delete parcelProps.logger;
|
|
59
|
+
delete parcelProps.env;
|
|
58
60
|
delete parcelProps.dependencies;
|
|
59
61
|
return parcelProps;
|
|
60
62
|
};
|
|
@@ -65,7 +67,8 @@ var Application = function Application(props) {
|
|
|
65
67
|
loading = props.loading,
|
|
66
68
|
style = props.style,
|
|
67
69
|
className = props.className,
|
|
68
|
-
consoleConfig = props.consoleConfig
|
|
70
|
+
consoleConfig = props.consoleConfig,
|
|
71
|
+
i18nMessages = props.i18nMessages;
|
|
69
72
|
|
|
70
73
|
var _useState = (0, _react.useState)(false),
|
|
71
74
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
@@ -80,7 +83,7 @@ var Application = function Application(props) {
|
|
|
80
83
|
var appRef = (0, _react.useRef)(null);
|
|
81
84
|
(0, _react.useEffect)(function () {
|
|
82
85
|
(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
|
|
83
|
-
var
|
|
86
|
+
var App;
|
|
84
87
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
85
88
|
while (1) {
|
|
86
89
|
switch (_context.prev = _context.next) {
|
|
@@ -94,27 +97,35 @@ var Application = function Application(props) {
|
|
|
94
97
|
});
|
|
95
98
|
|
|
96
99
|
case 2:
|
|
97
|
-
|
|
100
|
+
App = _context.sent;
|
|
98
101
|
|
|
99
|
-
if (
|
|
100
|
-
|
|
101
|
-
|
|
102
|
+
if (App.context && App.context) {
|
|
103
|
+
App.context.window.ALIYUN_CONSOLE_CONFIG = consoleConfig;
|
|
104
|
+
App.context.window.ALIYUN_CONSOLE_I18N_MESSAGE = i18nMessages;
|
|
102
105
|
}
|
|
103
106
|
|
|
104
107
|
_context.next = 6;
|
|
105
|
-
return
|
|
108
|
+
return App.load();
|
|
106
109
|
|
|
107
110
|
case 6:
|
|
108
|
-
|
|
109
|
-
|
|
111
|
+
if (appRef.current) {
|
|
112
|
+
_context.next = 8;
|
|
113
|
+
break;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
return _context.abrupt("return");
|
|
117
|
+
|
|
118
|
+
case 8:
|
|
119
|
+
_context.next = 10;
|
|
120
|
+
return App.mount(appRef.current, {
|
|
110
121
|
customProps: getProps(props)
|
|
111
122
|
});
|
|
112
123
|
|
|
113
|
-
case
|
|
124
|
+
case 10:
|
|
114
125
|
setMounted(true);
|
|
115
|
-
setApp(
|
|
126
|
+
setApp(App);
|
|
116
127
|
|
|
117
|
-
case
|
|
128
|
+
case 12:
|
|
118
129
|
case "end":
|
|
119
130
|
return _context.stop();
|
|
120
131
|
}
|
|
@@ -137,11 +148,9 @@ var Application = function Application(props) {
|
|
|
137
148
|
className: className,
|
|
138
149
|
ref: appRef,
|
|
139
150
|
dataId: name
|
|
140
|
-
}) : /*#__PURE__*/_react.default.createElement(name, {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
})
|
|
144
|
-
}));
|
|
151
|
+
}) : /*#__PURE__*/_react.default.createElement(name, {}, /*#__PURE__*/_react.default.createElement('div', {
|
|
152
|
+
ref: appRef
|
|
153
|
+
})));
|
|
145
154
|
};
|
|
146
155
|
|
|
147
156
|
function createAlfaApp(option) {
|
|
@@ -149,7 +158,7 @@ function createAlfaApp(option) {
|
|
|
149
158
|
loading = option.loading,
|
|
150
159
|
manifest = option.manifest;
|
|
151
160
|
var AlfaApp = /*#__PURE__*/(0, _react.lazy)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
|
|
152
|
-
var resolvedManifest, consoleConfig,
|
|
161
|
+
var resolvedManifest, consoleConfig, messages, i18nMessages, App;
|
|
153
162
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
154
163
|
while (1) {
|
|
155
164
|
switch (_context2.prev = _context2.next) {
|
|
@@ -168,35 +177,34 @@ function createAlfaApp(option) {
|
|
|
168
177
|
resolvedManifest = _context2.sent;
|
|
169
178
|
|
|
170
179
|
case 5:
|
|
171
|
-
// @ts-ignore
|
|
172
180
|
consoleConfig = window.ALIYUN_CONSOLE_CONFIG || {};
|
|
173
|
-
|
|
174
|
-
if (!option.dynamicConfig) {
|
|
175
|
-
_context2.next = 10;
|
|
176
|
-
break;
|
|
177
|
-
}
|
|
178
|
-
|
|
179
|
-
_context2.next = 9;
|
|
181
|
+
_context2.next = 8;
|
|
180
182
|
return (0, _getConsoleConfig.getConsoleConfig)(option, consoleConfig);
|
|
181
183
|
|
|
182
|
-
case
|
|
184
|
+
case 8:
|
|
183
185
|
consoleConfig = _context2.sent;
|
|
186
|
+
_context2.next = 11;
|
|
187
|
+
return (0, _alfaCore.getLocale)(option);
|
|
188
|
+
|
|
189
|
+
case 11:
|
|
190
|
+
messages = _context2.sent;
|
|
191
|
+
i18nMessages = _objectSpread(_objectSpread({}, window.ALIYUN_CONSOLE_I18N_MESSAGE), messages);
|
|
184
192
|
|
|
185
|
-
|
|
186
|
-
AlfaApp = function AlfaApp(props) {
|
|
193
|
+
App = function App(props) {
|
|
187
194
|
return /*#__PURE__*/_react.default.createElement(Application, (0, _extends2.default)({
|
|
188
195
|
manifest: resolvedManifest
|
|
189
196
|
}, props, {
|
|
190
197
|
name: (0, _utils.normalizeName)(name),
|
|
191
|
-
consoleConfig: consoleConfig
|
|
198
|
+
consoleConfig: consoleConfig,
|
|
199
|
+
i18nMessages: i18nMessages
|
|
192
200
|
}));
|
|
193
201
|
};
|
|
194
202
|
|
|
195
203
|
return _context2.abrupt("return", {
|
|
196
|
-
default:
|
|
204
|
+
default: App
|
|
197
205
|
});
|
|
198
206
|
|
|
199
|
-
case
|
|
207
|
+
case 15:
|
|
200
208
|
case "end":
|
|
201
209
|
return _context2.stop();
|
|
202
210
|
}
|
package/lib/base.d.ts
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import React, { HTMLAttributes } from 'react';
|
|
2
|
-
import { IAppConfig, IOptions } from '@alicloud/alfa-core';
|
|
2
|
+
import { IAppConfig, IOptions, AlfaEnvEnum } from '@alicloud/alfa-core';
|
|
3
3
|
export interface IProps<T = any> extends HTMLAttributes<Element>, IAppConfig, IOptions {
|
|
4
4
|
loading?: boolean | React.ReactChild;
|
|
5
5
|
consoleConfig?: any;
|
|
6
|
+
i18nMessages?: any;
|
|
7
|
+
env?: AlfaEnvEnum;
|
|
8
|
+
dependencies?: any;
|
|
6
9
|
}
|
|
7
10
|
export default class MicroAppBase<T> extends React.Component<Partial<IProps<T>>> {
|
|
8
11
|
}
|
|
@@ -31,11 +31,11 @@ var ErrorPanel = function ErrorPanel(props) {
|
|
|
31
31
|
style: containerStyle
|
|
32
32
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
33
33
|
style: commonErrorStyle
|
|
34
|
-
}, error.message), /*#__PURE__*/_react.default.createElement("pre", {
|
|
34
|
+
}, error === null || error === void 0 ? void 0 : error.message), /*#__PURE__*/_react.default.createElement("pre", {
|
|
35
35
|
style: {
|
|
36
36
|
overflow: 'scroll'
|
|
37
37
|
}
|
|
38
|
-
}, error.stack)) : /*#__PURE__*/_react.default.createElement("div", {
|
|
38
|
+
}, error === null || error === void 0 ? void 0 : error.stack)) : /*#__PURE__*/_react.default.createElement("div", {
|
|
39
39
|
style: commonErrorStyle
|
|
40
40
|
}, "Error"));
|
|
41
41
|
};
|
|
@@ -1,17 +1,15 @@
|
|
|
1
1
|
import React, { ErrorInfo } from 'react';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
logger?: Logger;
|
|
7
|
-
appDidCatch?: (error: Error) => void;
|
|
2
|
+
import { AlfaLogger } from '@alicloud/alfa-core';
|
|
3
|
+
interface IProps {
|
|
4
|
+
appDidCatch?: (error?: Error, info?: ErrorInfo) => void;
|
|
5
|
+
logger?: AlfaLogger;
|
|
8
6
|
}
|
|
9
7
|
interface State {
|
|
10
8
|
hasError: boolean;
|
|
11
|
-
error: Error;
|
|
9
|
+
error: Error | null;
|
|
12
10
|
}
|
|
13
|
-
declare class ErrorBoundary extends React.Component<
|
|
14
|
-
constructor(props:
|
|
11
|
+
declare class ErrorBoundary extends React.Component<IProps, State> {
|
|
12
|
+
constructor(props: IProps);
|
|
15
13
|
componentDidCatch(error: Error, errorInfo: ErrorInfo): void;
|
|
16
14
|
render(): {} | null | undefined;
|
|
17
15
|
}
|
|
@@ -39,7 +39,6 @@ var ErrorBoundary = /*#__PURE__*/function (_React$Component) {
|
|
|
39
39
|
_this = _super.call(this, props);
|
|
40
40
|
_this.state = {
|
|
41
41
|
hasError: false,
|
|
42
|
-
// @ts-ignore
|
|
43
42
|
error: null
|
|
44
43
|
};
|
|
45
44
|
return _this;
|
|
@@ -48,23 +47,24 @@ var ErrorBoundary = /*#__PURE__*/function (_React$Component) {
|
|
|
48
47
|
(0, _createClass2.default)(ErrorBoundary, [{
|
|
49
48
|
key: "componentDidCatch",
|
|
50
49
|
value: function componentDidCatch(error, errorInfo) {
|
|
51
|
-
|
|
50
|
+
var _window, _window$__bl, _window2, _window2$__bl;
|
|
51
|
+
|
|
52
|
+
var _this$props = this.props,
|
|
53
|
+
appDidCatch = _this$props.appDidCatch,
|
|
54
|
+
logger = _this$props.logger; // Display fallback UI
|
|
55
|
+
|
|
52
56
|
this.setState({
|
|
53
57
|
hasError: true,
|
|
54
58
|
error: error
|
|
55
|
-
});
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
console.error(error);
|
|
67
|
-
this.props.appDidCatch && this.props.appDidCatch(error);
|
|
59
|
+
});
|
|
60
|
+
(0, _isFunction.default)((_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
|
|
61
|
+
|
|
62
|
+
appDidCatch && appDidCatch(error, errorInfo);
|
|
63
|
+
logger === null || logger === void 0 ? void 0 : logger.error({
|
|
64
|
+
E_MSG: '',
|
|
65
|
+
E_STACK: error,
|
|
66
|
+
C_STACK: errorInfo
|
|
67
|
+
});
|
|
68
68
|
}
|
|
69
69
|
}, {
|
|
70
70
|
key: "render",
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
|
|
4
|
-
|
|
5
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
6
4
|
|
|
5
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
6
|
+
|
|
7
7
|
Object.defineProperty(exports, "__esModule", {
|
|
8
8
|
value: true
|
|
9
9
|
});
|
|
@@ -25,6 +25,10 @@ var React = _interopRequireWildcard(require("react"));
|
|
|
25
25
|
|
|
26
26
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
27
27
|
|
|
28
|
+
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); }
|
|
29
|
+
|
|
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; }
|
|
31
|
+
|
|
28
32
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
29
33
|
|
|
30
34
|
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
|
|
4
|
-
|
|
5
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
6
4
|
|
|
5
|
+
var _typeof3 = require("@babel/runtime/helpers/typeof");
|
|
6
|
+
|
|
7
7
|
Object.defineProperty(exports, "__esModule", {
|
|
8
8
|
value: true
|
|
9
9
|
});
|
|
@@ -33,7 +33,11 @@ var _Paragraph = _interopRequireDefault(require("./Paragraph"));
|
|
|
33
33
|
|
|
34
34
|
var _style = _interopRequireDefault(require("./style"));
|
|
35
35
|
|
|
36
|
-
function
|
|
36
|
+
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); }
|
|
37
|
+
|
|
38
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(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; }
|
|
39
|
+
|
|
40
|
+
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; }
|
|
37
41
|
|
|
38
42
|
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; }
|
|
39
43
|
|