@uploadcare/file-uploader 1.19.4 → 1.19.5
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/env.d.ts +1 -1
- package/env.js +1 -1
- package/index.ssr.d.ts +1 -1
- package/index.ssr.js +1 -1
- package/package.json +1 -1
- package/utils/parseCdnUrl.d.ts.map +1 -1
- package/utils/parseCdnUrl.js +4 -1
- package/utils/parseCdnUrl.test.js +13 -0
- package/web/file-uploader.iife.min.js +4 -4
- package/web/file-uploader.min.js +4 -4
- package/web/uc-cloud-image-editor.min.js +1 -1
- package/web/uc-file-uploader-inline.min.js +4 -4
- package/web/uc-file-uploader-minimal.min.js +4 -4
- package/web/uc-file-uploader-regular.min.js +4 -4
- package/web/uc-img.min.js +1 -1
package/env.d.ts
CHANGED
package/env.js
CHANGED
package/index.ssr.d.ts
CHANGED
|
@@ -550,7 +550,7 @@ export namespace ModalEvents {
|
|
|
550
550
|
let DESTROY: string;
|
|
551
551
|
}
|
|
552
552
|
export const PACKAGE_NAME: "blocks";
|
|
553
|
-
export const PACKAGE_VERSION: "1.19.
|
|
553
|
+
export const PACKAGE_VERSION: "1.19.5";
|
|
554
554
|
export const PresenceToggle: {
|
|
555
555
|
new (): {};
|
|
556
556
|
template: string;
|
package/index.ssr.js
CHANGED
|
@@ -1070,7 +1070,7 @@ export const ModalEvents = {
|
|
|
1070
1070
|
DESTROY: "modal:destroy",
|
|
1071
1071
|
};
|
|
1072
1072
|
export const PACKAGE_NAME = `blocks`;
|
|
1073
|
-
export const PACKAGE_VERSION = `1.19.
|
|
1073
|
+
export const PACKAGE_VERSION = `1.19.5`;
|
|
1074
1074
|
export const PresenceToggle = class {
|
|
1075
1075
|
static template = `<slot></slot> `;
|
|
1076
1076
|
static reg = () => {};
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseCdnUrl.d.ts","sourceRoot":"","sources":["parseCdnUrl.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parseCdnUrl.d.ts","sourceRoot":"","sources":["parseCdnUrl.js"],"names":[],"mappings":"AAMO,8CADK;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE;;;;SAiB3C"}
|
package/utils/parseCdnUrl.js
CHANGED
|
@@ -1,12 +1,15 @@
|
|
|
1
|
+
import { DEFAULT_CDN_CNAME } from '../blocks/Config/initialConfig.js';
|
|
2
|
+
|
|
1
3
|
const uuidRegex = /[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/i;
|
|
2
4
|
const cdnUrlRegex = new RegExp(`^/?(${uuidRegex.source})(?:/(-/(?:[^/]+/)+)?([^/]*))?$`, 'i');
|
|
3
5
|
|
|
4
6
|
/** @param {{ url: string; cdnBase: string }} options */
|
|
5
7
|
export const parseCdnUrl = ({ url, cdnBase }) => {
|
|
6
8
|
const cdnBaseUrlObj = new URL(cdnBase);
|
|
9
|
+
const fallbackCdnBaseUrlObj = new URL(DEFAULT_CDN_CNAME);
|
|
7
10
|
const urlObj = new URL(url);
|
|
8
11
|
|
|
9
|
-
if (cdnBaseUrlObj.host !== urlObj.host) {
|
|
12
|
+
if (cdnBaseUrlObj.host !== urlObj.host && fallbackCdnBaseUrlObj.host !== urlObj.host) {
|
|
10
13
|
return null;
|
|
11
14
|
}
|
|
12
15
|
|
|
@@ -75,4 +75,17 @@ describe('parseCdnUrl', () => {
|
|
|
75
75
|
filename: null,
|
|
76
76
|
});
|
|
77
77
|
});
|
|
78
|
+
|
|
79
|
+
it('should fallback to ucarecdn.com if cdnBase is not matched', () => {
|
|
80
|
+
expect(
|
|
81
|
+
parseCdnUrl({
|
|
82
|
+
url: 'https://ucarecdn.com/12345678-1234-5678-1234-567812345678/',
|
|
83
|
+
cdnBase: 'https://cdn.example.com',
|
|
84
|
+
}),
|
|
85
|
+
).to.deep.equal({
|
|
86
|
+
uuid: '12345678-1234-5678-1234-567812345678',
|
|
87
|
+
cdnUrlModifiers: '',
|
|
88
|
+
filename: null,
|
|
89
|
+
});
|
|
90
|
+
});
|
|
78
91
|
});
|