@alicloud/console-base-conf-parse-env 1.4.5 → 1.4.6-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.
@@ -6,5 +6,5 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = getSite;
7
7
  var _cookie = require("@alicloud/cookie");
8
8
  function getSite() {
9
- return (0, _cookie.getCookie)('aliyun_site') || 'CN'; // CN INTL JP
9
+ return (0, _cookie.getCookie)('apsara_site') || (0, _cookie.getCookie)('aliyun_site') || 'CN'; // CN INTL JP
10
10
  }
@@ -20,6 +20,7 @@ function parseEnv() {
20
20
  hostname = _ref.location.hostname;
21
21
  var ENV = (0, _getEnv.default)();
22
22
  var SITE = (0, _getSite.default)();
23
+ var MAIN_RESOURCE_CDN = _consoleOneConfig.default.MAIN_RESOURCE_CDN;
23
24
  var ENV_IS_DEV = ENV === _enum.EEnv.DEV;
24
25
  var ENV_IS_DAILY = ENV === _enum.EEnv.DAILY;
25
26
  var ENV_IS_PRE = ENV === _enum.EEnv.PRE;
@@ -34,9 +35,6 @@ function parseEnv() {
34
35
  // 是否 控制台
35
36
  var DOMAIN_IS_CONSOLE = /\.console\.aliyun\.(?:com|test)$/.test(hostname);
36
37
 
37
- // 是否 国际站 【历史逻辑,暂时保留】
38
- // const DOMAIN_IS_ALIBABACLOUD = /\.alibabacloud\.(?:com|test)$/.test(hostname);
39
-
40
38
  /**
41
39
  * 需要兼容的域名:
42
40
  * {product}.console.aliyun.com 阿里云控制台(不区分国内、国际)
@@ -78,6 +76,7 @@ function parseEnv() {
78
76
  CHANNEL: (0, _getChannel.default)(SITE),
79
77
  FECS_HOST: FECS_HOST,
80
78
  FECS_URL_BASE: FECS_URL_BASE,
81
- MAIN_DOMAIN: MAIN_DOMAIN
79
+ MAIN_DOMAIN: MAIN_DOMAIN,
80
+ MAIN_RESOURCE_CDN: MAIN_RESOURCE_CDN
82
81
  };
83
82
  }
@@ -1,4 +1,4 @@
1
1
  import { getCookie } from '@alicloud/cookie';
2
2
  export default function getSite() {
3
- return getCookie('aliyun_site') || 'CN'; // CN INTL JP
3
+ return getCookie('apsara_site') || getCookie('aliyun_site') || 'CN'; // CN INTL JP
4
4
  }
@@ -14,6 +14,7 @@ export default function parseEnv() {
14
14
  hostname = _ref.location.hostname;
15
15
  var ENV = getEnv();
16
16
  var SITE = getSite();
17
+ var MAIN_RESOURCE_CDN = ONE_CONF.MAIN_RESOURCE_CDN;
17
18
  var ENV_IS_DEV = ENV === EEnv.DEV;
18
19
  var ENV_IS_DAILY = ENV === EEnv.DAILY;
19
20
  var ENV_IS_PRE = ENV === EEnv.PRE;
@@ -28,9 +29,6 @@ export default function parseEnv() {
28
29
  // 是否 控制台
29
30
  var DOMAIN_IS_CONSOLE = /\.console\.aliyun\.(?:com|test)$/.test(hostname);
30
31
 
31
- // 是否 国际站 【历史逻辑,暂时保留】
32
- // const DOMAIN_IS_ALIBABACLOUD = /\.alibabacloud\.(?:com|test)$/.test(hostname);
33
-
34
32
  /**
35
33
  * 需要兼容的域名:
36
34
  * {product}.console.aliyun.com 阿里云控制台(不区分国内、国际)
@@ -72,6 +70,7 @@ export default function parseEnv() {
72
70
  CHANNEL: getChannel(SITE),
73
71
  FECS_HOST: FECS_HOST,
74
72
  FECS_URL_BASE: FECS_URL_BASE,
75
- MAIN_DOMAIN: MAIN_DOMAIN
73
+ MAIN_DOMAIN: MAIN_DOMAIN,
74
+ MAIN_RESOURCE_CDN: MAIN_RESOURCE_CDN
76
75
  };
77
76
  }
@@ -45,4 +45,5 @@ export interface IConfEnv {
45
45
  FECS_HOST: string;
46
46
  FECS_URL_BASE: string;
47
47
  MAIN_DOMAIN: string;
48
+ MAIN_RESOURCE_CDN: string;
48
49
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alicloud/console-base-conf-parse-env",
3
- "version": "1.4.5",
3
+ "version": "1.4.6-beta.0",
4
4
  "description": "ConsoleBase CONF.ENV parse",
5
5
  "license": "MIT",
6
6
  "sideEffects": false,
@@ -29,7 +29,7 @@
29
29
  "typescript": "^5.0.4"
30
30
  },
31
31
  "dependencies": {
32
- "@alicloud/console-one-config": "^1.5.0",
32
+ "@alicloud/console-one-config": "beta",
33
33
  "@alicloud/cookie": "^1.5.3",
34
34
  "@alicloud/sandbox-escape": "^1.1.8"
35
35
  },
@@ -43,6 +43,5 @@
43
43
  "build": "yarn build:esm && yarn build:cjs && yarn build:types",
44
44
  "clean": "rm -rf build",
45
45
  "prepublishOnly": "yarn clean && yarn build"
46
- },
47
- "gitHead": "e3daf0b177915f37e8beae4ecee204d8c62f9507"
46
+ }
48
47
  }