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

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.
Files changed (6) hide show
  1. package/README.md +0 -0
  2. package/build/cjs/util/get-channel.js +8 -0
  3. package/build/cjs/util/parse-env.js +13 -2
  4. package/build/esm/util/get-channel.js +8 -0
  5. package/build/esm/util/parse-env.js +13 -2
  6. package/package.json +3 -4
package/README.md CHANGED
File without changes
package/build/cjs/util/get-channel.js CHANGED
@@ -11,6 +11,14 @@ function getFallbackChannel(site, mainDomain) {
11
11
  if (mainDomain === 'idptcloud01.com' || mainDomain === 'idptcloud01-inc.com') {
12
12
  return 'EA134';
13
13
  }
14
+
15
+ // TODO: 确认美国站和印尼站的 channel 值
16
+ if (mainDomain === 'uscloud.alibaba') {
17
+ return 'US'; // 待确认
18
+ }
19
+ if (mainDomain === 'idptcloud03.alibaba' || mainDomain === 'idptcloud03-inc.alibaba') {
20
+ return 'EA134_ID'; // 待确认
21
+ }
14
22
  switch (site) {
15
23
  case 'INTL':
16
24
  return 'SIN';
package/build/cjs/util/parse-env.js CHANGED
@@ -47,8 +47,11 @@ function parseEnv() {
47
47
  // 是否 为 cn 域名
48
48
  var DOMAIN_IS_CN = /\.cn$/.test(hostname);
49
49
 
50
+ // 是否为 .alibaba 域名（一国一云）
51
+ var DOMAIN_IS_ALIBABA = /\.alibaba$/.test(hostname);
52
+
50
53
  // 是否 控制台
51
- var DOMAIN_IS_CONSOLE = /console\.aliyun\.(?:com|cn|test)$/.test(hostname);
54
+ var DOMAIN_IS_CONSOLE = /console\.(?:aliyun\.(?:com|cn|test)|(?:uscloud|idptcloud03(?:-inc)?)\.alibaba)$/.test(hostname);
52
55
 
53
56
  /**
54
57
  * 需要兼容的域名：
@@ -70,7 +73,7 @@ function parseEnv() {
70
73
  if (suffixDomain === 'aliyun-inc' || suffixDomain === 'alibaba-inc') {
71
74
  suffixDomain = 'aliyun';
72
75
  }
73
- var topDomain = "".concat(DOMAIN_IS_TEST ? 'test' : DOMAIN_IS_CN ? 'cn' : 'com');
76
+ var topDomain = DOMAIN_IS_TEST ? 'test' : DOMAIN_IS_CN ? 'cn' : DOMAIN_IS_ALIBABA ? 'alibaba' : 'com';
74
77
  var FECS_HOST = "".concat(prefixDomain, ".console.").concat(suffixDomain, ".").concat(topDomain);
75
78
 
76
79
  // 这个不推荐用 protocol-relative，Firefox 调用 CORS 时，有可能 request.header.Origin 是 null 而导致接口失败...
@@ -87,6 +90,14 @@ function parseEnv() {
87
90
  if (CHANNEL === 'EA134') {
88
91
  MAIN_RESOURCE_CDN = 'idptcloud01cdn.com';
89
92
  }
93
+ // TODO: 待确认是否需要通过 CHANNEL 判断还是 suffixDomain 判断
94
+ if (DOMAIN_IS_ALIBABA) {
95
+ if (suffixDomain === 'uscloud') {
96
+ MAIN_RESOURCE_CDN = 'uscasset.alibaba';
97
+ } else if (suffixDomain === 'idptcloud03' || suffixDomain === 'idptcloud03-inc') {
98
+ MAIN_RESOURCE_CDN = 'idptcloud03cdn.alibaba';
99
+ }
100
+ }
90
101
 
91
102
  // 获取当前页面的国家
92
103
  var COUNTRY = (0, _getCountry.default)();
package/build/esm/util/get-channel.js CHANGED
@@ -4,6 +4,14 @@ function getFallbackChannel(site, mainDomain) {
4
4
  if (mainDomain === 'idptcloud01.com' || mainDomain === 'idptcloud01-inc.com') {
5
5
  return 'EA134';
6
6
  }
7
+
8
+ // TODO: 确认美国站和印尼站的 channel 值
9
+ if (mainDomain === 'uscloud.alibaba') {
10
+ return 'US'; // 待确认
11
+ }
12
+ if (mainDomain === 'idptcloud03.alibaba' || mainDomain === 'idptcloud03-inc.alibaba') {
13
+ return 'EA134_ID'; // 待确认
14
+ }
7
15
  switch (site) {
8
16
  case 'INTL':
9
17
  return 'SIN';
package/build/esm/util/parse-env.js CHANGED
@@ -41,8 +41,11 @@ export default function parseEnv() {
41
41
  // 是否 为 cn 域名
42
42
  var DOMAIN_IS_CN = /\.cn$/.test(hostname);
43
43
 
44
+ // 是否为 .alibaba 域名（一国一云）
45
+ var DOMAIN_IS_ALIBABA = /\.alibaba$/.test(hostname);
46
+
44
47
  // 是否 控制台
45
- var DOMAIN_IS_CONSOLE = /console\.aliyun\.(?:com|cn|test)$/.test(hostname);
48
+ var DOMAIN_IS_CONSOLE = /console\.(?:aliyun\.(?:com|cn|test)|(?:uscloud|idptcloud03(?:-inc)?)\.alibaba)$/.test(hostname);
46
49
 
47
50
  /**
48
51
  * 需要兼容的域名：
@@ -64,7 +67,7 @@ export default function parseEnv() {
64
67
  if (suffixDomain === 'aliyun-inc' || suffixDomain === 'alibaba-inc') {
65
68
  suffixDomain = 'aliyun';
66
69
  }
67
- var topDomain = "".concat(DOMAIN_IS_TEST ? 'test' : DOMAIN_IS_CN ? 'cn' : 'com');
70
+ var topDomain = DOMAIN_IS_TEST ? 'test' : DOMAIN_IS_CN ? 'cn' : DOMAIN_IS_ALIBABA ? 'alibaba' : 'com';
68
71
  var FECS_HOST = "".concat(prefixDomain, ".console.").concat(suffixDomain, ".").concat(topDomain);
69
72
 
70
73
  // 这个不推荐用 protocol-relative，Firefox 调用 CORS 时，有可能 request.header.Origin 是 null 而导致接口失败...
@@ -81,6 +84,14 @@ export default function parseEnv() {
81
84
  if (CHANNEL === 'EA134') {
82
85
  MAIN_RESOURCE_CDN = 'idptcloud01cdn.com';
83
86
  }
87
+ // TODO: 待确认是否需要通过 CHANNEL 判断还是 suffixDomain 判断
88
+ if (DOMAIN_IS_ALIBABA) {
89
+ if (suffixDomain === 'uscloud') {
90
+ MAIN_RESOURCE_CDN = 'uscasset.alibaba';
91
+ } else if (suffixDomain === 'idptcloud03' || suffixDomain === 'idptcloud03-inc') {
92
+ MAIN_RESOURCE_CDN = 'idptcloud03cdn.alibaba';
93
+ }
94
+ }
84
95
 
85
96
  // 获取当前页面的国家
86
97
  var COUNTRY = getCountry();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alicloud/console-base-conf-parse-env",
3
- "version": "1.4.11-beta.2",
3
+ "version": "1.4.12-beta.1",
4
4
  "description": "ConsoleBase CONF.ENV parse",
5
5
  "license": "MIT",
6
6
  "sideEffects": false,
@@ -41,7 +41,6 @@
41
41
  "build:bundle": "breezr build --engine webpack",
42
42
  "build:types": "tsc -p tsconfig-declaration.json --outDir build/types --declaration --emitDeclarationOnly",
43
43
  "build": "pnpm build:esm && pnpm build:cjs && pnpm build:types",
44
- "clean": "rm -rf build",
45
- "prepublishOnly": "pnpm clean && pnpm build"
44
+ "clean": "rm -rf build"
46
45
  }
47
- }
46
+ }