@cloudpss/env 0.5.20 → 0.5.21
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.
- package/dist/index.js +4 -14
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +3 -15
package/dist/index.js
CHANGED
|
@@ -68,20 +68,10 @@ export function normalizeUrl(url, base) {
|
|
|
68
68
|
throw new Error('Invalid url, must be a string or a URL');
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
|
-
const
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
uo.host === 'cloudpss.cn' ||
|
|
76
|
-
uo.host === 'www.cloudpss.cn' ||
|
|
77
|
-
uo.host === 'cloudpss.com.cn' ||
|
|
78
|
-
uo.host === 'www.cloudpss.com.cn') {
|
|
79
|
-
uo.host = 'cloudpss.cn';
|
|
80
|
-
}
|
|
81
|
-
const us = uo.href;
|
|
82
|
-
if (us.endsWith('/'))
|
|
83
|
-
return us.slice(0, -1);
|
|
84
|
-
return us;
|
|
71
|
+
const u = new URL(url, base ?? baseUrl()).href;
|
|
72
|
+
if (u.endsWith('/'))
|
|
73
|
+
return u.slice(0, -1);
|
|
74
|
+
return u;
|
|
85
75
|
}
|
|
86
76
|
const cloudpssEnv = {};
|
|
87
77
|
const def = [
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAkC,SAAS,CAAC;AAEvD,aAAa;AACb,SAAS,GAAG;IACR,IAAI,OAAO,OAAO,IAAI,QAAQ,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,OAAO,CAAC,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC9E,IAAI,OAAO,EAAE,CAAC;YACV,yCAAyC;YACzC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;gBACxB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YACpC,CAAC;YACD,OAAO,GAAG,SAAS,CAAC;QACxB,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC;IACvB,CAAC;SAAM,CAAC;QACJ,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,GAAG,EAAE,CAAC;QACjB,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;AACL,CAAC;AAED,SAAS;AACT,SAAS,OAAO;IACZ,wBAAwB;IACxB,IAAI,OAAO,GAAG,sBAAsB,CAAC;IACrC,IAAI,OAAO,QAAQ,IAAI,QAAQ,IAAI,OAAO,QAAQ,CAAC,OAAO,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5G,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IAC/B,CAAC;SAAM,IACH,OAAO,QAAQ,IAAI,QAAQ;QAC3B,OAAO,QAAQ,CAAC,IAAI,IAAI,QAAQ;QAChC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EACtC,CAAC;QACC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;IAED,mBAAmB;IACnB,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,mBAAmB,CAAC,CAAC;IAC3C,IAAI,OAAO,EAAE,CAAC;QACV,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACvC,OAAO,IAAI,CAAC,IAAI,CAAC;QACrB,CAAC;QAAC,MAAM,CAAC;YACL,SAAS;QACb,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,aAAa;AACb,SAAS,MAAM,CAAC,OAAe,EAAE,QAAgB;IAC7C,IAAI,GAAG,CAAC;IACR,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC;IAChB,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;QACb,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC;SAAM,CAAC;QACJ,GAAG,GAAG,QAAQ,CAAC;IACnB,CAAC;IAED,IAAI,OAAO,GAAG,IAAI,QAAQ,EAAE,CAAC;QACzB,MAAM,IAAI,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED,uCAAuC;AACvC,MAAM,UAAU,YAAY,CAAC,GAAiB,EAAE,IAAmB;IAC/D,IAAI,OAAO,GAAG,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC;YACrC,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC;QACnB,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC9D,CAAC;IACL,CAAC;IACD,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -71,21 +71,9 @@ export function normalizeUrl(url: string | URL, base?: string | URL): string {
|
|
|
71
71
|
throw new Error('Invalid url, must be a string or a URL');
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
|
-
const
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
uo.host === 'cloudpss.net' ||
|
|
78
|
-
uo.host === 'www.cloudpss.net' ||
|
|
79
|
-
uo.host === 'cloudpss.cn' ||
|
|
80
|
-
uo.host === 'www.cloudpss.cn' ||
|
|
81
|
-
uo.host === 'cloudpss.com.cn' ||
|
|
82
|
-
uo.host === 'www.cloudpss.com.cn'
|
|
83
|
-
) {
|
|
84
|
-
uo.host = 'cloudpss.cn';
|
|
85
|
-
}
|
|
86
|
-
const us = uo.href;
|
|
87
|
-
if (us.endsWith('/')) return us.slice(0, -1);
|
|
88
|
-
return us;
|
|
74
|
+
const u = new URL(url, base ?? baseUrl()).href;
|
|
75
|
+
if (u.endsWith('/')) return u.slice(0, -1);
|
|
76
|
+
return u;
|
|
89
77
|
}
|
|
90
78
|
|
|
91
79
|
const cloudpssEnv = {} as {
|