@alicloud/alfa-react 1.4.0-alpha.5 → 1.4.0

package/lib/widget/getWidgetDeps.js

@@ -70,7 +70,7 @@ var getWidgetDeps = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(config, option) {
     var _objectSpread2;
 
-    var _yield$getWidgetVersi, entryUrl, version, _yield$getWidgetVersi2, messageVersion, resp, _yield$getWidgetVersi3, oldVersion, components, injectedWidgetUtils;
+    var _yield$getWidgetVersi, _yield$getWidgetVersi2, entryUrl, version, _yield$getWidgetVersi3, _yield$getWidgetVersi4, messageVersion, resp, _yield$getWidgetVersi5, oldVersion, components, injectedWidgetUtils;
 
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
@@ -84,54 +84,56 @@ var getWidgetDeps = /*#__PURE__*/function () {
 
           case 2:
             _yield$getWidgetVersi = _context.sent;
-            entryUrl = _yield$getWidgetVersi.entryUrl;
+            _yield$getWidgetVersi2 = _yield$getWidgetVersi.entryUrl;
+            entryUrl = _yield$getWidgetVersi2 === void 0 ? '' : _yield$getWidgetVersi2;
             version = _yield$getWidgetVersi.version;
-            _context.next = 7;
+            _context.next = 8;
             return (0, _getWidgetVersionById.getWidgetVersionById)({
               name: WIDGET_WIND_MESSAGE_ID,
               version: '0.x'
             });
 
-          case 7:
-            _yield$getWidgetVersi2 = _context.sent;
-            messageVersion = _yield$getWidgetVersi2.version;
+          case 8:
+            _yield$getWidgetVersi3 = _context.sent;
+            _yield$getWidgetVersi4 = _yield$getWidgetVersi3.version;
+            messageVersion = _yield$getWidgetVersi4 === void 0 ? '0.0.8' : _yield$getWidgetVersi4;
 
             if (cachedMessage) {
-              _context.next = 19;
+              _context.next = 21;
               break;
             }
 
-            _context.prev = 10;
-            _context.next = 13;
+            _context.prev = 12;
+            _context.next = 15;
             return _axios.default.get("https://g.alicdn.com/one-mcms/wind-v2/".concat(messageVersion, "/wind-v2_").concat((widgetUtils.getLocale() || 'en-US').toLowerCase(), ".json"));
 
-          case 13:
+          case 15:
             resp = _context.sent;
             cachedMessage = resp.data;
-            _context.next = 19;
+            _context.next = 21;
             break;
 
-          case 17:
-            _context.prev = 17;
-            _context.t0 = _context["catch"](10);
-
           case 19:
-            _context.next = 21;
+            _context.prev = 19;
+            _context.t0 = _context["catch"](12);
+
+          case 21:
+            _context.next = 23;
             return (0, _getWidgetVersionById.getWidgetVersionById)({
               name: WIDGET_RUNTIME_ID,
               version: '1.x'
             });
 
-          case 21:
-            _yield$getWidgetVersi3 = _context.sent;
-            oldVersion = _yield$getWidgetVersi3.version;
+          case 23:
+            _yield$getWidgetVersi5 = _context.sent;
+            oldVersion = _yield$getWidgetVersi5.version;
 
             if (cachedRuntime[version]) {
-              _context.next = 29;
+              _context.next = 31;
               break;
             }
 
-            _context.next = 26;
+            _context.next = 28;
             return (0, _consoleOsLoader.loadBundle)({
               id: WIDGET_RUNTIME_ID,
               url: entryUrl,
@@ -156,14 +158,14 @@ var getWidgetDeps = /*#__PURE__*/function () {
               }
             });
 
-          case 26:
+          case 28:
             cachedRuntime[version] = _context.sent;
             components = cachedRuntime[version].default['@ali/wind'];
             Object.keys(components).forEach(function (key) {
               cachedRuntime[version].default["@ali/wind/lib/".concat((0, _kebabCase.default)(key).toLowerCase())] = components[key];
             });
 
-          case 29:
+          case 31:
             injectedWidgetUtils = _objectSpread(_objectSpread({}, widgetUtils), {}, {
               getChannelLink: widgetUtils.channelLinkFactory(function () {
                 return config.links[widgetUtils.getChannel() || 'OFFICIAL'];
@@ -188,12 +190,12 @@ var getWidgetDeps = /*#__PURE__*/function () {
               axios: _axios.default
             }, cachedRuntime[version].default), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, WIDGET_UTILS_PKG_NAME, injectedWidgetUtils), (0, _defineProperty2.default)(_objectSpread2, '@ali/widget-utils-config', injectedWidgetUtils), (0, _defineProperty2.default)(_objectSpread2, '@ali/widget-loader', createWidget), _objectSpread2)));
 
-          case 31:
+          case 33:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[10, 17]]);
+    }, _callee, null, [[12, 19]]);
   }));
 
   return function getWidgetDeps(_x, _x2) {

package/lib/widget/getWidgetVersionById.js

@@ -11,17 +11,21 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _axios = _interopRequireDefault(require("axios"));
-
 var _template = _interopRequireDefault(require("lodash/template"));
 
+var _alfaCore = require("@alicloud/alfa-core");
+
 var _env = require("./env");
 
+var _ALIYUN_CONSOLE_CONFI;
+
 var cachedRelease = null;
 exports.cachedRelease = cachedRelease;
 var WIDGET_ENTRY_URL = 'https://g.alicdn.com/${id}/${version}/index.js';
+var uid = (_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.MAIN_ACCOUNT_PK;
 
 var normalizeEntryUrl = function normalizeEntryUrl(id, version, resourceUrl) {
+  if (!version) throw new Error('No Version for Widget');
   var gitRepoId = id.replace('@ali/', '').replace('widget-', 'widget/');
   return (0, _template.default)(resourceUrl)({
     id: gitRepoId,
@@ -31,52 +35,108 @@ var normalizeEntryUrl = function normalizeEntryUrl(id, version, resourceUrl) {
 
 var getWidgetVersionById = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(option) {
-    var env, resp, version;
+    var _release$distTags, _release$distTags2, _release$nextVersion;
+
+    var name, _option$central, central, env, Release, version, entryUrl, _resp, _cachedRelease$option, _cachedRelease$option2, latestVersion, _nextVersion, gray, resp, release, nextVersion, sampling;
+
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            env = _env.ENV[option.env || (0, _env.getConsoleEnv)()];
+            name = option.name, _option$central = option.central, central = _option$central === void 0 ? true : _option$central, env = option.env;
+            Release = central ? _env.ENV[env || (0, _env.getConsoleEnv)()] : _env.DIS_ENV[env || (0, _env.getConsoleEnv)()];
 
             if (option.version) {
-              _context.next = 3;
+              _context.next = 4;
               break;
             }
 
             throw new Error('No Version for Widget');
 
-          case 3:
+          case 4:
             if (option.version.endsWith('.x')) {
-              _context.next = 5;
+              _context.next = 6;
               break;
             }
 
             return _context.abrupt("return", {
               version: option.version,
-              entryUrl: normalizeEntryUrl(option.name, option.version, env.resourceUrl || WIDGET_ENTRY_URL)
+              entryUrl: normalizeEntryUrl(option.name, option.version, Release.resourceUrl || WIDGET_ENTRY_URL)
             });
 
-          case 5:
+          case 6:
+            if (!central) {
+              _context.next = 12;
+              break;
+            }
+
             if (cachedRelease) {
-              _context.next = 10;
+              _context.next = 12;
               break;
             }
 
-            _context.next = 8;
-            return _axios.default.get(env.releaseUrl);
+            _context.next = 10;
+            return _alfaCore.request.get(Release.releaseUrl);
+
+          case 10:
+            _resp = _context.sent;
+
+            if (_resp && _resp.data) {
+              exports.cachedRelease = cachedRelease = _resp.data;
+            }
+
+          case 12:
+            if (!cachedRelease) {
+              _context.next = 19;
+              break;
+            }
 
-          case 8:
+            latestVersion = cachedRelease[option.name][option.version].latest;
+            _nextVersion = (_cachedRelease$option = cachedRelease[option.name][option.version].next) === null || _cachedRelease$option === void 0 ? void 0 : _cachedRelease$option.version;
+            gray = (_cachedRelease$option2 = cachedRelease[option.name][option.version].next) === null || _cachedRelease$option2 === void 0 ? void 0 : _cachedRelease$option2.gray;
+            version = uid && Number(uid.substring(uid.length - 2)) < gray ? _nextVersion : latestVersion;
+            entryUrl = normalizeEntryUrl(option.name, version, Release.resourceUrl || WIDGET_ENTRY_URL);
+            return _context.abrupt("return", {
+              version: version,
+              entryUrl: entryUrl
+            });
+
+          case 19:
+            _context.next = 21;
+            return _alfaCore.request.get((0, _template.default)(Release.releaseUrl)({
+              id: name
+            }));
+
+          case 21:
             resp = _context.sent;
-            exports.cachedRelease = cachedRelease = resp.data;
 
-          case 10:
-            version = cachedRelease[option.name][option.version].latest;
+            if (!(!resp || !resp.data)) {
+              _context.next = 24;
+              break;
+            }
+
+            throw new Error('Cannot get Release');
+
+          case 24:
+            release = resp.data;
+            nextVersion = (_release$distTags = release['dist-tags']) === null || _release$distTags === void 0 ? void 0 : _release$distTags["".concat(option.version, "-next")];
+            version = (_release$distTags2 = release['dist-tags']) === null || _release$distTags2 === void 0 ? void 0 : _release$distTags2[option.version]; // has gray version
+
+            if (nextVersion && release !== null && release !== void 0 && (_release$nextVersion = release['next-versions']) !== null && _release$nextVersion !== void 0 && _release$nextVersion[nextVersion] && uid) {
+              sampling = release['next-versions'][nextVersion].featureStatus.sampling || 0;
+
+              if (sampling * 100 > Number(uid.substring(uid.length - 2))) {
+                version = nextVersion;
+              }
+            }
+
+            entryUrl = normalizeEntryUrl(option.name, version, Release.resourceUrl || WIDGET_ENTRY_URL);
             return _context.abrupt("return", {
               version: version,
-              entryUrl: normalizeEntryUrl(option.name, version, env.resourceUrl || WIDGET_ENTRY_URL)
+              entryUrl: entryUrl
             });
 
-          case 12:
+          case 30:
           case "end":
             return _context.stop();
         }

package/lib/widget.js

@@ -82,7 +82,7 @@ function createCWSWidget(option) {
             deps = _context.sent;
             return _context.abrupt("return", (0, _consoleOsLoader.loadBundle)({
               id: (0, _utils.normalizeName)(option.name),
-              url: (option.url || url).replace('index.js', option !== null && option !== void 0 && option.alfaLoader ? 'index.alfa.js' : 'index.js'),
+              url: (option.url || url || '').replace('index.js', option !== null && option !== void 0 && option.alfaLoader ? 'index.alfa.js' : 'index.js'),
               deps: _objectSpread(_objectSpread({}, deps), option.dependencies),
               xmlrequest: !option.alfaLoader,
               context: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.4.0-alpha.5",
+  "version": "1.4.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.4.0-alpha.5",
+    "@alicloud/alfa-core": "^1.4.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": "159eecca7062c5210cf9f976cf13db9991a735b1"
+  "gitHead": "1c7eb1a7355af5d72966152a3f52f71fe97bde8b"
 }