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

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.
@@ -5,8 +5,14 @@ import { getRelease } from './getRelease';
5
5
  import cache from './cacheManager';
6
6
  var devHostname = '//dev.g.alicdn.com/';
7
7
 
8
- var replaceHost = function replaceHost(origin) {
9
- return origin.replace('//g.alicdn.com/', devHostname);
8
+ var formatURL = function formatURL(origin, base) {
9
+ var url = origin;
10
+
11
+ if (base.indexOf(devHostname) !== -1) {
12
+ url = url.replace('//g.alicdn.com/', devHostname);
13
+ }
14
+
15
+ return new URL(url, base).toString();
10
16
  };
11
17
  /**
12
18
  * format url in manifest json
@@ -17,7 +23,6 @@ var replaceHost = function replaceHost(origin) {
17
23
  var formatManifest = function formatManifest(manifestContent, manifestUrl) {
18
24
  var _entrypoints$entrypoi;
19
25
 
20
- if (manifestUrl.indexOf(devHostname) === -1) return manifestContent;
21
26
  var name = manifestContent.name,
22
27
  resources = manifestContent.resources,
23
28
  runtime = manifestContent.runtime,
@@ -27,14 +32,18 @@ var formatManifest = function formatManifest(manifestContent, manifestUrl) {
27
32
  return {
28
33
  name: name,
29
34
  resources: Object.keys(resources).reduce(function (map, key) {
30
- map[key] = replaceHost(resources[key]);
35
+ map[key] = formatURL(resources[key], manifestUrl);
31
36
  return map;
32
37
  }, {}),
33
38
  runtime: runtime,
34
39
  externals: externals,
35
40
  entrypoints: _defineProperty({}, entrypoint, {
36
- css: (_entrypoints$entrypoi = entrypoints[entrypoint].css) === null || _entrypoints$entrypoi === void 0 ? void 0 : _entrypoints$entrypoi.map(replaceHost),
37
- js: entrypoints[entrypoint].js.map(replaceHost)
41
+ css: (_entrypoints$entrypoi = entrypoints[entrypoint].css) === null || _entrypoints$entrypoi === void 0 ? void 0 : _entrypoints$entrypoi.map(function (url) {
42
+ return formatURL(url, manifestUrl);
43
+ }),
44
+ js: entrypoints[entrypoint].js.map(function (url) {
45
+ return formatURL(url, manifestUrl);
46
+ })
38
47
  })
39
48
  };
40
49
  };
@@ -47,28 +47,37 @@ export var getRelease = /*#__PURE__*/function () {
47
47
 
48
48
  case 5:
49
49
  releaseConfig = _context.sent;
50
+
51
+ if (releaseConfig) {
52
+ _context.next = 8;
53
+ break;
54
+ }
55
+
56
+ throw new Error('releaseConfig is null');
57
+
58
+ case 8:
50
59
  (logger === null || logger === void 0 ? void 0 : logger.setContext) && logger.setContext({
51
60
  release: JSON.stringify(releaseConfig)
52
61
  });
53
62
  return _context.abrupt("return", releaseConfig);
54
63
 
55
- case 10:
56
- _context.prev = 10;
64
+ case 12:
65
+ _context.prev = 12;
57
66
  _context.t0 = _context["catch"](2);
58
67
  (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
59
68
  E_CODE: 'GetReleaseError',
60
69
  E_MSG: _context.t0.message
61
70
  });
62
71
 
63
- case 13:
72
+ case 15:
64
73
  return _context.abrupt("return", {});
65
74
 
66
- case 14:
75
+ case 16:
67
76
  case "end":
68
77
  return _context.stop();
69
78
  }
70
79
  }
71
- }, _callee, null, [[2, 10]]);
80
+ }, _callee, null, [[2, 12]]);
72
81
  }));
73
82
 
74
83
  return function getRelease(_x) {
@@ -19,8 +19,14 @@ var _cacheManager = _interopRequireDefault(require("./cacheManager"));
19
19
 
20
20
  var devHostname = '//dev.g.alicdn.com/';
21
21
 
22
- var replaceHost = function replaceHost(origin) {
23
- return origin.replace('//g.alicdn.com/', devHostname);
22
+ var formatURL = function formatURL(origin, base) {
23
+ var url = origin;
24
+
25
+ if (base.indexOf(devHostname) !== -1) {
26
+ url = url.replace('//g.alicdn.com/', devHostname);
27
+ }
28
+
29
+ return new URL(url, base).toString();
24
30
  };
25
31
  /**
26
32
  * format url in manifest json
@@ -31,7 +37,6 @@ var replaceHost = function replaceHost(origin) {
31
37
  var formatManifest = function formatManifest(manifestContent, manifestUrl) {
32
38
  var _entrypoints$entrypoi;
33
39
 
34
- if (manifestUrl.indexOf(devHostname) === -1) return manifestContent;
35
40
  var name = manifestContent.name,
36
41
  resources = manifestContent.resources,
37
42
  runtime = manifestContent.runtime,
@@ -41,14 +46,18 @@ var formatManifest = function formatManifest(manifestContent, manifestUrl) {
41
46
  return {
42
47
  name: name,
43
48
  resources: Object.keys(resources).reduce(function (map, key) {
44
- map[key] = replaceHost(resources[key]);
49
+ map[key] = formatURL(resources[key], manifestUrl);
45
50
  return map;
46
51
  }, {}),
47
52
  runtime: runtime,
48
53
  externals: externals,
49
54
  entrypoints: (0, _defineProperty2.default)({}, entrypoint, {
50
- css: (_entrypoints$entrypoi = entrypoints[entrypoint].css) === null || _entrypoints$entrypoi === void 0 ? void 0 : _entrypoints$entrypoi.map(replaceHost),
51
- js: entrypoints[entrypoint].js.map(replaceHost)
55
+ css: (_entrypoints$entrypoi = entrypoints[entrypoint].css) === null || _entrypoints$entrypoi === void 0 ? void 0 : _entrypoints$entrypoi.map(function (url) {
56
+ return formatURL(url, manifestUrl);
57
+ }),
58
+ js: entrypoints[entrypoint].js.map(function (url) {
59
+ return formatURL(url, manifestUrl);
60
+ })
52
61
  })
53
62
  };
54
63
  };
@@ -62,28 +62,37 @@ var getRelease = /*#__PURE__*/function () {
62
62
 
63
63
  case 5:
64
64
  releaseConfig = _context.sent;
65
+
66
+ if (releaseConfig) {
67
+ _context.next = 8;
68
+ break;
69
+ }
70
+
71
+ throw new Error('releaseConfig is null');
72
+
73
+ case 8:
65
74
  (logger === null || logger === void 0 ? void 0 : logger.setContext) && logger.setContext({
66
75
  release: JSON.stringify(releaseConfig)
67
76
  });
68
77
  return _context.abrupt("return", releaseConfig);
69
78
 
70
- case 10:
71
- _context.prev = 10;
79
+ case 12:
80
+ _context.prev = 12;
72
81
  _context.t0 = _context["catch"](2);
73
82
  (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
74
83
  E_CODE: 'GetReleaseError',
75
84
  E_MSG: _context.t0.message
76
85
  });
77
86
 
78
- case 13:
87
+ case 15:
79
88
  return _context.abrupt("return", {});
80
89
 
81
- case 14:
90
+ case 16:
82
91
  case "end":
83
92
  return _context.stop();
84
93
  }
85
94
  }
86
- }, _callee, null, [[2, 10]]);
95
+ }, _callee, null, [[2, 12]]);
87
96
  }));
88
97
 
89
98
  return function getRelease(_x) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alicloud/alfa-core",
3
- "version": "1.4.0-alpha.3",
3
+ "version": "1.4.0-alpha.7",
4
4
  "description": "MicroFront End SDK for alicloud",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
@@ -32,5 +32,5 @@
32
32
  "@alicloud/console-logger-sls": "^1.2.31",
33
33
  "@alicloud/console-os-kernal": "^1.4.0-alpha.1"
34
34
  },
35
- "gitHead": "e81232b14356296973770cd05e403a95209d150c"
35
+ "gitHead": "cbff825e1580a9f4aa47b0d55a79777891deb93b"
36
36
  }