@alicloud/alfa-core 1.4.0-alpha.0 → 1.4.0-alpha.3

package/lib/base.js

@@ -31,7 +31,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 var mergeConfig = function mergeConfig(appConfig, logger) {
   return _objectSpread(_objectSpread({}, appConfig), {}, {
-    env: appConfig.env || (0, _utils.getAlfaEnv)(),
+    env: (0, _utils.getEnv)(appConfig.env),
     logger: appConfig.logger || logger
   });
 };
@@ -63,6 +63,7 @@ var BaseLoader = /*#__PURE__*/function () {
                 }
 
                 logger.error({
+                  E_CODE: 'RuntimeError',
                   E_MSG: 'cannot find config before start.'
                 });
                 return _context.abrupt("return", Promise.reject(new Error('[alfa-core] cannot find config before start.')));

package/lib/index.d.ts

@@ -1,8 +1,9 @@
 export { createMicroApp } from './createMicroApp';
-export { getRelease } from './utils/getAlfaRelease';
-export { getManifest } from './utils/getAlfaManifest';
-export { getConfig } from './utils/getAlfaConfig';
-export { getLocale } from './utils/getAlfaLocale';
+export { getRelease } from './utils/getRelease';
+export { getManifest } from './utils/getManifest';
+export { getConfig } from './utils/getConfig';
+export { getI18nMessages } from './utils/getI18nMessages';
+export { getLocale, getEnv } from './utils';
 export { default as BaseLoader } from './base';
 export { default as Logger } from './utils/logger';
 export * from './utils/index';

package/lib/index.js

@@ -10,7 +10,9 @@ var _exportNames = {
   getRelease: true,
   getManifest: true,
   getConfig: true,
+  getI18nMessages: true,
   getLocale: true,
+  getEnv: true,
   BaseLoader: true,
   Logger: true,
   createEventBus: true,
@@ -92,25 +94,37 @@ Object.defineProperty(exports, "createMicroApp", {
 Object.defineProperty(exports, "getConfig", {
   enumerable: true,
   get: function get() {
-    return _getAlfaConfig.getConfig;
+    return _getConfig.getConfig;
+  }
+});
+Object.defineProperty(exports, "getEnv", {
+  enumerable: true,
+  get: function get() {
+    return _utils.getEnv;
+  }
+});
+Object.defineProperty(exports, "getI18nMessages", {
+  enumerable: true,
+  get: function get() {
+    return _getI18nMessages.getI18nMessages;
   }
 });
 Object.defineProperty(exports, "getLocale", {
   enumerable: true,
   get: function get() {
-    return _getAlfaLocale.getLocale;
+    return _utils.getLocale;
   }
 });
 Object.defineProperty(exports, "getManifest", {
   enumerable: true,
   get: function get() {
-    return _getAlfaManifest.getManifest;
+    return _getManifest.getManifest;
   }
 });
 Object.defineProperty(exports, "getRelease", {
   enumerable: true,
   get: function get() {
-    return _getAlfaRelease.getRelease;
+    return _getRelease.getRelease;
   }
 });
 Object.defineProperty(exports, "prefetch", {
@@ -122,13 +136,15 @@ Object.defineProperty(exports, "prefetch", {
 
 var _createMicroApp = require("./createMicroApp");
 
-var _getAlfaRelease = require("./utils/getAlfaRelease");
+var _getRelease = require("./utils/getRelease");
+
+var _getManifest = require("./utils/getManifest");
 
-var _getAlfaManifest = require("./utils/getAlfaManifest");
+var _getConfig = require("./utils/getConfig");
 
-var _getAlfaConfig = require("./utils/getAlfaConfig");
+var _getI18nMessages = require("./utils/getI18nMessages");
 
-var _getAlfaLocale = require("./utils/getAlfaLocale");
+var _utils = require("./utils");
 
 var _base = _interopRequireDefault(require("./base"));
 

package/lib/types/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import { OSApplication, SandBoxOption, AppInfo } from '@alicloud/console-os-kernal';
 export declare class AlfaLogger<P = any> {
+    setContext?: (params: P) => void;
     record?: (params: P) => void;
     send?: () => void;
     info?: (params: P) => void;
@@ -14,7 +15,7 @@ declare type ChannelFeatures = Partial<Record<string, {
     status: boolean;
     attribute: {
         customAttrs: Record<string, unknown>;
-        regions: {
+        regions: string[] | {
             region: string[];
         };
     };
@@ -54,6 +55,7 @@ export interface IAppConfig<P = any> extends IOptions {
     };
     app?: OSApplication;
     env?: EnvEnum;
+    locale?: string;
 }
 export interface IOptions {
     sandbox?: SandBoxOption;
@@ -68,9 +70,7 @@ export interface AlfaVersion {
     entry: string;
 }
 export declare type LOCALE = 'en_US' | 'zh_CN' | 'zh_TW' | 'zh_HK' | 'ja_JP';
-export declare type AlfaLocaleVersion = {
-    [key in LOCALE | 'entry']: string;
-};
+export declare type AlfaLocaleVersion = Partial<Record<string, string>>;
 export declare type Version = string;
 export interface AlfaConfigVersion {
     [key: string]: string;

package/lib/utils/cacheManager.js

@@ -37,7 +37,7 @@ var Cache = /*#__PURE__*/function () {
     key: "getRemote",
     value: function () {
       var _getRemote = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url) {
-        var value, _yield$value, _data, _yield$request$get, data, result;
+        var value, _yield$value, _data, _yield$this$store$url, data, result;
 
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
@@ -77,11 +77,11 @@ var Cache = /*#__PURE__*/function () {
               case 11:
                 this.store[url] = _request.default.get(url);
                 _context.next = 14;
-                return _request.default.get(url);
+                return this.store[url];
 
               case 14:
-                _yield$request$get = _context.sent;
-                data = _yield$request$get.data;
+                _yield$this$store$url = _context.sent;
+                data = _yield$this$store$url.data;
                 result = data;
                 if (result) this.store[url] = result;
                 return _context.abrupt("return", result);

package/lib/utils/env.d.ts

@@ -0,0 +1,6 @@
+import { EnvEnum } from '../types';
+/**
+ * get alfa env
+ * @returns
+ */
+export declare const getEnv: (value?: "prod" | "local" | "pre" | "daily" | undefined) => EnvEnum;

package/lib/utils/env.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getEnv = void 0;
+
+/**
+ * get alfa env
+ * @returns
+ */
+var getEnv = function getEnv(value) {
+  var _window, _window$ALIYUN_CONSOL;
+
+  if (value) return value;
+
+  if (process.env.NODE_ENV === 'development') {
+    return 'local';
+  } // default return prod
+
+
+  return ((_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.fEnv) || 'prod';
+};
+
+exports.getEnv = getEnv;

package/lib/utils/{getAlfaConfig.js → getConfig.js}

@@ -11,7 +11,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _getAlfaRelease = require("./getAlfaRelease");
+var _getRelease = require("./getRelease");
 
 var _cacheManager = _interopRequireDefault(require("./cacheManager"));
 
@@ -37,7 +37,7 @@ var getConfig = /*#__PURE__*/function () {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return (0, _getAlfaRelease.getRelease)(config);
+            return (0, _getRelease.getRelease)(config);
 
           case 2:
             releaseConfig = _context.sent;

package/lib/utils/{getAlfaLocale.d.ts → getI18nMessages.d.ts}

@@ -4,4 +4,4 @@ import { IAppConfig } from '../types';
  * @param config
  * @returns
  */
-export declare const getLocale: (config: IAppConfig) => Promise<Record<string, string>>;
+export declare const getI18nMessages: (config: IAppConfig) => Promise<Record<string, string>>;

package/lib/utils/{getAlfaLocale.js → getI18nMessages.js}

@@ -5,15 +5,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLocale = void 0;
+exports.getI18nMessages = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _index = require("./index");
+var _locale = require("./locale");
 
-var _getAlfaRelease = require("./getAlfaRelease");
+var _getRelease = require("./getRelease");
 
 var _cacheManager = _interopRequireDefault(require("./cacheManager"));
 
@@ -22,7 +22,7 @@ var _cacheManager = _interopRequireDefault(require("./cacheManager"));
  * @param config
  * @returns
  */
-var getLocale = /*#__PURE__*/function () {
+var getI18nMessages = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(config) {
     var _releaseConfig$distT, _releaseConfig$locale, _releaseConfig$locale2;
 
@@ -32,46 +32,55 @@ var getLocale = /*#__PURE__*/function () {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return (0, _getAlfaRelease.getRelease)(config);
+            return (0, _getRelease.getRelease)(config);
 
           case 2:
             releaseConfig = _context.sent;
             logger = config.logger;
-            locale = (0, _index.getAlfaLocale)();
+            locale = (0, _locale.getLocale)(config.locale);
             localeVersion = ((_releaseConfig$distT = releaseConfig['dist-tags']) === null || _releaseConfig$distT === void 0 ? void 0 : _releaseConfig$distT['locales-latest']) || '';
             localeEntry = (_releaseConfig$locale = releaseConfig['locales-versions']) === null || _releaseConfig$locale === void 0 ? void 0 : (_releaseConfig$locale2 = _releaseConfig$locale[localeVersion]) === null || _releaseConfig$locale2 === void 0 ? void 0 : _releaseConfig$locale2[locale];
             messages = {};
-            _context.prev = 8;
-            _context.next = 11;
+
+            if (localeVersion) {
+              _context.next = 10;
+              break;
+            }
+
+            return _context.abrupt("return", messages);
+
+          case 10:
+            _context.prev = 10;
+            _context.next = 13;
             return _cacheManager.default.getRemote(localeEntry);
 
-          case 11:
+          case 13:
             messages = _context.sent;
-            _context.next = 17;
+            _context.next = 19;
             break;
 
-          case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](8);
+          case 16:
+            _context.prev = 16;
+            _context.t0 = _context["catch"](10);
             (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
               E_CODE: 'GetLocaleError',
               E_MSG: _context.t0.message
             });
 
-          case 17:
+          case 19:
             return _context.abrupt("return", messages);
 
-          case 18:
+          case 20:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[8, 14]]);
+    }, _callee, null, [[10, 16]]);
   }));
 
-  return function getLocale(_x) {
+  return function getI18nMessages(_x) {
     return _ref.apply(this, arguments);
   };
 }();
 
-exports.getLocale = getLocale;
+exports.getI18nMessages = getI18nMessages;

package/lib/utils/{getAlfaManifest.d.ts → getManifest.d.ts}

@@ -1,2 +1,2 @@
 import { IAppConfig } from '../types';
-export declare const getManifest: (config: IAppConfig) => Promise<any>;
+export declare const getManifest: (config: IAppConfig) => Promise<import("@alicloud/console-os-kernal/lib/type").AppManifest | "">;

package/lib/utils/{getAlfaManifest.js → getManifest.js}

@@ -11,10 +11,48 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _getAlfaRelease = require("./getAlfaRelease");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _getRelease = require("./getRelease");
 
 var _cacheManager = _interopRequireDefault(require("./cacheManager"));
 
+var devHostname = '//dev.g.alicdn.com/';
+
+var replaceHost = function replaceHost(origin) {
+  return origin.replace('//g.alicdn.com/', devHostname);
+};
+/**
+ * format url in manifest json
+ * @param manifest
+ */
+
+
+var formatManifest = function formatManifest(manifestContent, manifestUrl) {
+  var _entrypoints$entrypoi;
+
+  if (manifestUrl.indexOf(devHostname) === -1) return manifestContent;
+  var name = manifestContent.name,
+      resources = manifestContent.resources,
+      runtime = manifestContent.runtime,
+      externals = manifestContent.externals,
+      entrypoints = manifestContent.entrypoints;
+  var entrypoint = Object.keys(entrypoints)[0];
+  return {
+    name: name,
+    resources: Object.keys(resources).reduce(function (map, key) {
+      map[key] = replaceHost(resources[key]);
+      return map;
+    }, {}),
+    runtime: runtime,
+    externals: externals,
+    entrypoints: (0, _defineProperty2.default)({}, entrypoint, {
+      css: (_entrypoints$entrypoi = entrypoints[entrypoint].css) === null || _entrypoints$entrypoi === void 0 ? void 0 : _entrypoints$entrypoi.map(replaceHost),
+      js: entrypoints[entrypoint].js.map(replaceHost)
+    })
+  };
+};
+
 var getManifest = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(config) {
     var _releaseConfig$distT;
@@ -26,7 +64,7 @@ var getManifest = /*#__PURE__*/function () {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return (0, _getAlfaRelease.getRelease)(config);
+            return (0, _getRelease.getRelease)(config);
 
           case 2:
             releaseConfig = _context.sent;
@@ -70,25 +108,29 @@ var getManifest = /*#__PURE__*/function () {
 
           case 17:
             result = _context.sent;
-            return _context.abrupt("return", result);
+            (logger === null || logger === void 0 ? void 0 : logger.setContext) && logger.setContext({
+              manifest: JSON.stringify(result)
+            });
+            return _context.abrupt("return", formatManifest(result, entry));
 
-          case 21:
-            _context.prev = 21;
+          case 22:
+            _context.prev = 22;
             _context.t0 = _context["catch"](14);
             (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
               E_CODE: 'GetManifestError',
-              E_MSG: _context.t0.message
+              E_MSG: _context.t0.message,
+              data: JSON.stringify(releaseConfig)
             });
 
-          case 24:
-            return _context.abrupt("return", {});
-
           case 25:
+            return _context.abrupt("return", '');
+
+          case 26:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[14, 21]]);
+    }, _callee, null, [[14, 22]]);
   }));
 
   return function getManifest(_x) {

package/lib/utils/getRelease.d.ts

@@ -0,0 +1,9 @@
+import { IAppConfig, AlfaReleaseConfig } from '../types';
+/**
+ * get alfa release url
+ * @param appId
+ * @param env
+ * @returns
+ */
+export declare const getReleaseUrl: (name?: string | undefined, env?: string | undefined) => string | undefined;
+export declare const getRelease: (config: IAppConfig) => Promise<AlfaReleaseConfig>;

package/lib/utils/getRelease.js

@@ -0,0 +1,94 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getReleaseUrl = exports.getRelease = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _cacheManager = _interopRequireDefault(require("./cacheManager"));
+
+var _env = require("./env");
+
+/**
+ * get alfa release url
+ * @param appId
+ * @param env
+ * @returns
+ */
+var getReleaseUrl = function getReleaseUrl(name, env) {
+  var cdnUrl = "https://cws.alicdn.com/Release/alfa/".concat(name, "/release.json");
+  var cdnPreUrl = "https://cws2.alicdn.com/Prepub/alfa/".concat(name, "/release.json");
+
+  switch (env) {
+    case 'local':
+      return process.env.ALFA_RELEASE_URL || cdnPreUrl;
+
+    case 'daily':
+      return cdnPreUrl;
+
+    case 'pre':
+      return cdnPreUrl;
+
+    case 'prod':
+      return cdnUrl;
+
+    default:
+      break;
+  }
+
+  return undefined;
+};
+
+exports.getReleaseUrl = getReleaseUrl;
+
+var getRelease = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(config) {
+    var logger, name, env, releaseConfig;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            logger = config.logger, name = config.name;
+            env = (0, _env.getEnv)(config.env);
+            _context.prev = 2;
+            _context.next = 5;
+            return _cacheManager.default.getRemote(getReleaseUrl(name, env));
+
+          case 5:
+            releaseConfig = _context.sent;
+            (logger === null || logger === void 0 ? void 0 : logger.setContext) && logger.setContext({
+              release: JSON.stringify(releaseConfig)
+            });
+            return _context.abrupt("return", releaseConfig);
+
+          case 10:
+            _context.prev = 10;
+            _context.t0 = _context["catch"](2);
+            (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
+              E_CODE: 'GetReleaseError',
+              E_MSG: _context.t0.message
+            });
+
+          case 13:
+            return _context.abrupt("return", {});
+
+          case 14:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[2, 10]]);
+  }));
+
+  return function getRelease(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+exports.getRelease = getRelease;

package/lib/utils/index.d.ts

@@ -1,30 +1,5 @@
-import { EnvEnum, IAppConfig, LOCALE } from '../types';
-/**
- * get alfa env
- * @returns
- */
-export declare const getAlfaEnv: () => EnvEnum;
-/**
- * get alfa Locale and replace '-' to '_'
- * example: en-US => en_US
- * @returns
- */
-export declare const getAlfaLocale: () => LOCALE;
-/**
- * get alfa release url
- * @param appId
- * @param env
- * @returns
- */
-export declare const getReleaseUrl: (name?: string | undefined, env?: string | undefined) => string | undefined;
-/**
- * get alfa config url
- * @param appId
- * @param env
- * @returns
- */
-export declare const getConfigUrl: (name?: string | undefined, env?: string | undefined) => string | undefined;
-export declare const resolveReleaseUrl: (config: IAppConfig) => string | undefined;
-export declare const resolveConfigUrl: (config: IAppConfig) => string | undefined;
+import { IAppConfig } from '../types';
+export { getEnv } from './env';
+export { getLocale } from './locale';
 export declare const getURL: (appConfig: IAppConfig) => string;
 export declare const getManifestFromConfig: (appConfig: IAppConfig) => string | import("@alicloud/console-os-kernal/lib/type").AppManifest | undefined;