@alicloud/console-base-conf-parse-env 1.4.12-beta.2 → 1.4.12-beta.3

package/build/cjs/util/get-channel.js

@@ -11,13 +11,8 @@ function getFallbackChannel(site, mainDomain) {
   if (mainDomain === 'idptcloud01.com' || mainDomain === 'idptcloud01-inc.com') {
     return 'EA134';
   }
-
-  // TODO: 确认美国站和印尼站的 channel 值
-  if (mainDomain === 'uscloud.alibaba') {
-    return 'US'; // 待确认
-  }
-  if (mainDomain === 'idptcloud03.alibaba' || mainDomain === 'idptcloud03-inc.alibaba') {
-    return 'EA134_ID'; // 待确认
+  if (mainDomain === 'uscloud.alibaba' || mainDomain === 'idptcloud03.alibaba' || mainDomain === 'idptcloud03-inc.alibaba') {
+    return 'OFFICIAL';
   }
   switch (site) {
     case 'INTL':

package/build/cjs/util/get-vendor-site.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = getVendorSite;
+var _sandboxEscape = require("@alicloud/sandbox-escape");
+function getFallback(suffixDomain, mainDomain) {
+  if (suffixDomain === 'uscloud' || suffixDomain === 'idptcloud03' || suffixDomain === 'idptcloud03-inc') {
+    return 'ALIBABA_US';
+  }
+  if (mainDomain === 'alibabacloud.com') {
+    return 'ALIYUN_INTL';
+  }
+  return 'ALIYUN_CN';
+}
+function getVendorSite(suffixDomain, mainDomain) {
+  var _ALIYUN_CONSOLE_CONFI;
+  return ((_ALIYUN_CONSOLE_CONFI = (0, _sandboxEscape.getWindow)().ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.SITE) || getFallback(suffixDomain, mainDomain);
+}

package/build/cjs/util/parse-env.js

@@ -12,6 +12,7 @@ var _getEnv = _interopRequireDefault(require("./get-env"));
 var _getSite = _interopRequireDefault(require("./get-site"));
 var _getChannel = _interopRequireDefault(require("./get-channel"));
 var _getCountry = _interopRequireDefault(require("./get-country"));
+var _getVendorSite = _interopRequireDefault(require("./get-vendor-site"));
 /**
  * 从浏览器、location、cookie 中获得到的静态数据，跟环境、站点、用户有关，项目的运行期间不可能变
  */
@@ -90,7 +91,6 @@ function parseEnv() {
   if (CHANNEL === 'EA134') {
     MAIN_RESOURCE_CDN = 'idptcloud01cdn.com';
   }
-  // TODO: 待确认是否需要通过 CHANNEL 判断还是 suffixDomain 判断
   if (DOMAIN_IS_ALIBABA) {
     if (suffixDomain === 'uscloud') {
       MAIN_RESOURCE_CDN = 'uscasset.alibaba';
@@ -101,6 +101,7 @@ function parseEnv() {
 
   // 获取当前页面的国家
   var COUNTRY = (0, _getCountry.default)();
+  var VENDOR_SITE = (0, _getVendorSite.default)(suffixDomain, MAIN_DOMAIN);
   return {
     ENV: ENV,
     ENV_IS_DEV: ENV_IS_DEV,
@@ -111,6 +112,7 @@ function parseEnv() {
     DOMAIN_IS_4SERVICE: DOMAIN_IS_4SERVICE,
     DOMAIN_IS_CONSOLE: DOMAIN_IS_CONSOLE,
     SITE: SITE,
+    VENDOR_SITE: VENDOR_SITE,
     CHANNEL: CHANNEL,
     FECS_HOST: FECS_HOST,
     FECS_URL_BASE: FECS_URL_BASE,

package/build/esm/util/get-channel.js

@@ -4,13 +4,8 @@ function getFallbackChannel(site, mainDomain) {
   if (mainDomain === 'idptcloud01.com' || mainDomain === 'idptcloud01-inc.com') {
     return 'EA134';
   }
-
-  // TODO: 确认美国站和印尼站的 channel 值
-  if (mainDomain === 'uscloud.alibaba') {
-    return 'US'; // 待确认
-  }
-  if (mainDomain === 'idptcloud03.alibaba' || mainDomain === 'idptcloud03-inc.alibaba') {
-    return 'EA134_ID'; // 待确认
+  if (mainDomain === 'uscloud.alibaba' || mainDomain === 'idptcloud03.alibaba' || mainDomain === 'idptcloud03-inc.alibaba') {
+    return 'OFFICIAL';
   }
   switch (site) {
     case 'INTL':

package/build/esm/util/get-vendor-site.js

@@ -0,0 +1,14 @@
+import { getWindow } from '@alicloud/sandbox-escape';
+function getFallback(suffixDomain, mainDomain) {
+  if (suffixDomain === 'uscloud' || suffixDomain === 'idptcloud03' || suffixDomain === 'idptcloud03-inc') {
+    return 'ALIBABA_US';
+  }
+  if (mainDomain === 'alibabacloud.com') {
+    return 'ALIYUN_INTL';
+  }
+  return 'ALIYUN_CN';
+}
+export default function getVendorSite(suffixDomain, mainDomain) {
+  var _ALIYUN_CONSOLE_CONFI;
+  return ((_ALIYUN_CONSOLE_CONFI = getWindow().ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.SITE) || getFallback(suffixDomain, mainDomain);
+}

package/build/esm/util/parse-env.js

@@ -5,6 +5,7 @@ import getEnv from './get-env';
 import getSite from './get-site';
 import getChannel from './get-channel';
 import getCountry from './get-country';
+import getVendorSite from './get-vendor-site';
 
 /**
  * 从浏览器、location、cookie 中获得到的静态数据，跟环境、站点、用户有关，项目的运行期间不可能变
@@ -84,7 +85,6 @@ export default function parseEnv() {
   if (CHANNEL === 'EA134') {
     MAIN_RESOURCE_CDN = 'idptcloud01cdn.com';
   }
-  // TODO: 待确认是否需要通过 CHANNEL 判断还是 suffixDomain 判断
   if (DOMAIN_IS_ALIBABA) {
     if (suffixDomain === 'uscloud') {
       MAIN_RESOURCE_CDN = 'uscasset.alibaba';
@@ -95,6 +95,7 @@ export default function parseEnv() {
 
   // 获取当前页面的国家
   var COUNTRY = getCountry();
+  var VENDOR_SITE = getVendorSite(suffixDomain, MAIN_DOMAIN);
   return {
     ENV: ENV,
     ENV_IS_DEV: ENV_IS_DEV,
@@ -105,6 +106,7 @@ export default function parseEnv() {
     DOMAIN_IS_4SERVICE: DOMAIN_IS_4SERVICE,
     DOMAIN_IS_CONSOLE: DOMAIN_IS_CONSOLE,
     SITE: SITE,
+    VENDOR_SITE: VENDOR_SITE,
     CHANNEL: CHANNEL,
     FECS_HOST: FECS_HOST,
     FECS_URL_BASE: FECS_URL_BASE,

package/build/types/types/index.d.ts

@@ -1,5 +1,11 @@
 import { EEnv } from '../enum';
 export interface IWin extends Window {
+    /**
+     * OneConsole 全局配置
+     */
+    ALIYUN_CONSOLE_CONFIG?: {
+        SITE?: string;
+    };
     /**
      * ECS 控制台全局变量
      */
@@ -41,6 +47,7 @@ export interface IConfEnv {
     DOMAIN_IS_CONSOLE: boolean;
     APP_ID: string;
     SITE: 'CN' | 'INTL' | 'JP';
+    VENDOR_SITE: string;
     CHANNEL: string;
     FECS_HOST: string;
     FECS_URL_BASE: string;

package/build/types/util/get-vendor-site.d.ts

@@ -0,0 +1 @@
+export default function getVendorSite(suffixDomain: string, mainDomain: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/console-base-conf-parse-env",
-  "version": "1.4.12-beta.2",
+  "version": "1.4.12-beta.3",
   "description": "ConsoleBase CONF.ENV parse",
   "license": "MIT",
   "sideEffects": false,