@alicloud/alfa-react 1.3.3 → 1.4.0-alpha.0

package/lib/hooks/beforeResolveHook.js

@@ -23,30 +23,21 @@ function beforeResolveHook(_x) {
 
 function _beforeResolveHook() {
   _beforeResolveHook = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(appConfig) {
-    var resolvedManifest, logger, START_TIME, MANIFEST_START_TIME, MANIFEST_END_TIME;
+    var logger, START_TIME, MANIFEST_START_TIME, resolvedManifest, MANIFEST_END_TIME;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            resolvedManifest = appConfig.manifest;
             logger = appConfig.logger;
             START_TIME = Date.now();
             MANIFEST_START_TIME = Date.now();
-
-            if (resolvedManifest) {
-              _context.next = 8;
-              break;
-            }
-
-            _context.next = 7;
+            _context.next = 5;
             return (0, _alfaCore.getManifest)(appConfig);
 
-          case 7:
+          case 5:
             resolvedManifest = _context.sent;
-
-          case 8:
             MANIFEST_END_TIME = Date.now();
-            logger === null || logger === void 0 ? void 0 : logger.record({
+            (logger === null || logger === void 0 ? void 0 : logger.record) && logger.record({
               LOADER_VERSION: _version.version,
               START_TIME: START_TIME,
               MANIFEST_START_TIME: MANIFEST_START_TIME,
@@ -55,7 +46,7 @@ function _beforeResolveHook() {
             appConfig.manifest = resolvedManifest;
             return _context.abrupt("return", appConfig);
 
-          case 12:
+          case 10:
           case "end":
             return _context.stop();
         }

package/lib/types/index.d.ts

@@ -20,6 +20,7 @@ export interface AlfaFactoryOption extends IAppConfig {
         js?: Record<string, string>;
     };
     runtimeVersion?: string;
+    fallbackRender?: (error: Error) => Element;
 }
 declare type OmitKeys = 'manifest';
 export interface WidgetFactoryOption extends Omit<AlfaFactoryOption, OmitKeys> {

package/lib/utils/getConsoleConfig.d.ts

@@ -1,5 +1,5 @@
-import { IAppConfig } from '@alicloud/alfa-core';
-export declare const getConsoleConfig: (config: IAppConfig, consoleConfig: any) => Promise<{
+import { AlfaConfig } from '@alicloud/alfa-core';
+export declare const getConsoleConfig: (configData: AlfaConfig, consoleConfig: any) => Promise<{
     CHANNEL_LINKS: Partial<Record<string, string>>;
     CHANNEL_FEATURE_STATUS: Partial<Record<string, {
         status: boolean;
@@ -11,7 +11,7 @@ export declare const getConsoleConfig: (config: IAppConfig, consoleConfig: any)
         };
     }>>;
     FEATURE_STATUS: Partial<Record<string, boolean>>;
-    fEnv?: "prod" | "local" | "pre" | "daily" | undefined;
+    fEnv?: "pre" | "local" | "prod" | "daily" | undefined;
     LOCALE?: string | undefined;
     CHANNEL?: string | undefined;
     SEC_TOKEN?: string | undefined;

package/lib/utils/getConsoleConfig.js

@@ -13,8 +13,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _alfaCore = require("@alicloud/alfa-core");
-
 var _md = _interopRequireDefault(require("crypto-js/md5"));
 
 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; }
@@ -26,12 +24,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * @param features
  */
 var processFeatures = function processFeatures(features) {
+  if (!features) return {};
   return Object.keys(features).reduce(function (newFeatures, key) {
     var _ALIYUN_CONSOLE_CONFI;
 
-    var feature = features[key];
+    var feature = features === null || features === void 0 ? void 0 : features[key];
     if (!feature) return newFeatures;
-    var uid = ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.CURRENT_PK) || '';
+    var uid = ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.MAIN_ACCOUNT_PK) || '';
     var md5Uid = (0, _md.default)(uid).toString();
     var enableBlockList = feature.enableBlockList,
         enableSampling = feature.enableSampling,
@@ -71,20 +70,14 @@ var mergeConfigDataWithConsoleConfig = function mergeConfigDataWithConsoleConfig
 };
 
 var getConsoleConfig = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(config, consoleConfig) {
-    var configData;
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(configData, consoleConfig) {
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
-            return (0, _alfaCore.getConfig)(config);
-
-          case 2:
-            configData = _context.sent;
             return _context.abrupt("return", mergeConfigDataWithConsoleConfig(configData, consoleConfig));
 
-          case 4:
+          case 1:
           case "end":
             return _context.stop();
         }

package/lib/utils/getConsoleGlobal.d.ts

@@ -0,0 +1,2 @@
+import { AlfaConfig, IWin } from '@alicloud/alfa-core';
+export declare const getConsoleGlobal: (configData: AlfaConfig, global: IWin['ALIYUN_CONSOLE_GLOBAL']) => Promise<{}>;

package/lib/utils/getConsoleGlobal.js

@@ -0,0 +1,41 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getConsoleGlobal = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+var getConsoleGlobal = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(configData, global) {
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            return _context.abrupt("return", _objectSpread(_objectSpread({}, global), configData === null || configData === void 0 ? void 0 : configData.GLOBAL_DATA));
+
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function getConsoleGlobal(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+exports.getConsoleGlobal = getConsoleGlobal;

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.3.3";
+export declare const version = "1.4.0-alpha.0";

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.3.3",
+  "version": "1.4.0-alpha.0",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -39,7 +39,7 @@
     "typescript": "^3.0.3"
   },
   "dependencies": {
-    "@alicloud/alfa-core": "^1.3.3",
+    "@alicloud/alfa-core": "^1.4.0-alpha.0",
     "@alicloud/console-os-loader": "^1.2.3",
     "@alicloud/widget-utils-console": "^0.1.6",
     "classnames": "^2.2.6",
@@ -48,5 +48,5 @@
   "peerDependencies": {
     "react": "^16 | ^17"
   },
-  "gitHead": "0ee54132107a373f2d13b548a747461aa3dcfc7c"
+  "gitHead": "9c6fffdb53e1b42c98b80e3f4eb896a3e2ee0c86"
 }

package/LICENSE

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