@redneckz/wildless-cms-uni-blocks 0.14.206 → 0.14.207
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/bundle/bundle.umd.js +9 -4
- package/bundle/bundle.umd.min.js +1 -1
- package/bundle/utils/isUUID.d.ts +1 -1
- package/dist/utils/adjustHref.js +7 -2
- package/dist/utils/adjustHref.js.map +1 -1
- package/dist/utils/isUUID.d.ts +1 -1
- package/dist/utils/isUUID.js +1 -1
- package/dist/utils/isUUID.js.map +1 -1
- package/lib/utils/adjustHref.js +8 -3
- package/lib/utils/adjustHref.js.map +1 -1
- package/lib/utils/isUUID.d.ts +1 -1
- package/lib/utils/isUUID.js +1 -1
- package/lib/utils/isUUID.js.map +1 -1
- package/mobile/bundle/bundle.umd.js +9 -4
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/bundle/utils/isUUID.d.ts +1 -1
- package/mobile/dist/utils/adjustHref.js +7 -2
- package/mobile/dist/utils/adjustHref.js.map +1 -1
- package/mobile/dist/utils/isUUID.d.ts +1 -1
- package/mobile/dist/utils/isUUID.js +1 -1
- package/mobile/dist/utils/isUUID.js.map +1 -1
- package/mobile/lib/utils/adjustHref.js +8 -3
- package/mobile/lib/utils/adjustHref.js.map +1 -1
- package/mobile/lib/utils/isUUID.d.ts +1 -1
- package/mobile/lib/utils/isUUID.js +1 -1
- package/mobile/lib/utils/isUUID.js.map +1 -1
- package/mobile/src/utils/adjustHref.ts +10 -3
- package/mobile/src/utils/isUUID.ts +1 -1
- package/package.json +1 -1
- package/src/utils/adjustHref.ts +10 -3
- package/src/utils/isUUID.ts +1 -1
package/bundle/utils/isUUID.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const isUUID: (src
|
|
1
|
+
export declare const isUUID: (src?: string) => boolean;
|
package/dist/utils/adjustHref.js
CHANGED
|
@@ -7,13 +7,18 @@ const url_1 = require("./url");
|
|
|
7
7
|
exports.PREFIX_API = '/api/';
|
|
8
8
|
exports.FILE_STORAGE_API = `${exports.PREFIX_API}v1/storage`;
|
|
9
9
|
const adjustHref = (router) => (href, basePath = ProjectSettings_1.projectSettings.BASE_PATH) => {
|
|
10
|
-
if (
|
|
10
|
+
if ([
|
|
11
|
+
!href,
|
|
12
|
+
(0, url_1.isURL)(href),
|
|
13
|
+
(0, url_1.isHash)(href),
|
|
14
|
+
[ProjectSettings_1.projectSettings.CDN, exports.PREFIX_API].some((_) => hasPrefix(href, _)),
|
|
15
|
+
].some(Boolean)) {
|
|
11
16
|
return href;
|
|
12
17
|
}
|
|
13
18
|
if ((0, isUUID_1.isUUID)(href)) {
|
|
14
19
|
return `${exports.FILE_STORAGE_API}/${href}/file`;
|
|
15
20
|
}
|
|
16
|
-
const isRelativeToBase = href
|
|
21
|
+
const isRelativeToBase = href?.startsWith('/');
|
|
17
22
|
return (0, url_1.joinPath)(hasPrefix(href, basePath) ? '' : basePath, isRelativeToBase ? '/' : (0, dirname_1.dirname)(router.pathname), href);
|
|
18
23
|
};
|
|
19
24
|
exports.adjustHref = adjustHref;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adjustHref.js","sourceRoot":"","sources":["../../src/utils/adjustHref.ts"],"names":[],"mappings":";;AAAA,wDAAqD;AACrD,uCAAoC;AACpC,qCAAkC;AAClC,+
|
|
1
|
+
{"version":3,"file":"adjustHref.js","sourceRoot":"","sources":["../../src/utils/adjustHref.ts"],"names":[],"mappings":";;AAAA,wDAAqD;AACrD,uCAAoC;AACpC,qCAAkC;AAClC,+BAAgD;AAEnC,QAAA,UAAU,GAAG,OAAO,CAAC;AACrB,QAAA,gBAAgB,GAAG,GAAG,kBAAU,YAAY,CAAC;AAEnD,MAAM,UAAU,GACrB,CAAC,MAA4B,EAAE,EAAE,CACjC,CAAC,IAAwB,EAAE,QAAQ,GAAG,iCAAe,CAAC,SAAS,EAAE,EAAE;IACjE,IACE;QACE,CAAC,IAAI;QACL,IAAA,WAAK,EAAC,IAAI,CAAC;QACX,IAAA,YAAM,EAAC,IAAI,CAAC;QACZ,CAAC,iCAAe,CAAC,GAAG,EAAE,kBAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;KAClE,CAAC,IAAI,CAAC,OAAO,CAAC,EACf;QACA,OAAO,IAAI,CAAC;KACb;IAED,IAAI,IAAA,eAAM,EAAC,IAAI,CAAC,EAAE;QAChB,OAAO,GAAG,wBAAgB,IAAI,IAAI,OAAO,CAAC;KAC3C;IAED,MAAM,gBAAgB,GAAG,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IAE/C,OAAO,IAAA,cAAQ,EACb,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EACzC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,iBAAO,EAAC,MAAM,CAAC,QAAQ,CAAC,EACjD,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAzBS,QAAA,UAAU,cAyBnB;AAEJ,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,MAA2B,EAAE,EAAE,CAC/D,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC"}
|
package/dist/utils/isUUID.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const isUUID: (src
|
|
1
|
+
export declare const isUUID: (src?: string) => boolean;
|
package/dist/utils/isUUID.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
2
2
|
exports.isUUID = void 0;
|
|
3
|
-
const isUUID = (src) => {
|
|
3
|
+
const isUUID = (src = '') => {
|
|
4
4
|
return /^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}(\/revs\/[0-9]{1,20})?$/.test(src);
|
|
5
5
|
};
|
|
6
6
|
exports.isUUID = isUUID;
|
package/dist/utils/isUUID.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isUUID.js","sourceRoot":"","sources":["../../src/utils/isUUID.ts"],"names":[],"mappings":";;AAAO,MAAM,MAAM,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"isUUID.js","sourceRoot":"","sources":["../../src/utils/isUUID.ts"],"names":[],"mappings":";;AAAO,MAAM,MAAM,GAAG,CAAC,GAAG,GAAG,EAAE,EAAE,EAAE;IACjC,OAAO,+FAA+F,CAAC,IAAI,CACzG,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AAJW,QAAA,MAAM,UAIjB"}
|
package/lib/utils/adjustHref.js
CHANGED
|
@@ -1,17 +1,22 @@
|
|
|
1
1
|
import { projectSettings } from '../ProjectSettings.js';
|
|
2
2
|
import { dirname } from './dirname.js';
|
|
3
3
|
import { isUUID } from './isUUID.js';
|
|
4
|
-
import { isURL, joinPath } from './url.js';
|
|
4
|
+
import { isHash, isURL, joinPath } from './url.js';
|
|
5
5
|
export const PREFIX_API = '/api/';
|
|
6
6
|
export const FILE_STORAGE_API = `${PREFIX_API}v1/storage`;
|
|
7
7
|
export const adjustHref = (router) => (href, basePath = projectSettings.BASE_PATH) => {
|
|
8
|
-
if (
|
|
8
|
+
if ([
|
|
9
|
+
!href,
|
|
10
|
+
isURL(href),
|
|
11
|
+
isHash(href),
|
|
12
|
+
[projectSettings.CDN, PREFIX_API].some((_) => hasPrefix(href, _)),
|
|
13
|
+
].some(Boolean)) {
|
|
9
14
|
return href;
|
|
10
15
|
}
|
|
11
16
|
if (isUUID(href)) {
|
|
12
17
|
return `${FILE_STORAGE_API}/${href}/file`;
|
|
13
18
|
}
|
|
14
|
-
const isRelativeToBase = href
|
|
19
|
+
const isRelativeToBase = href?.startsWith('/');
|
|
15
20
|
return joinPath(hasPrefix(href, basePath) ? '' : basePath, isRelativeToBase ? '/' : dirname(router.pathname), href);
|
|
16
21
|
};
|
|
17
22
|
const hasPrefix = (href, prefix) => prefix && href && href.startsWith(prefix);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adjustHref.js","sourceRoot":"","sources":["../../src/utils/adjustHref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"adjustHref.js","sourceRoot":"","sources":["../../src/utils/adjustHref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEhD,MAAM,CAAC,MAAM,UAAU,GAAG,OAAO,CAAC;AAClC,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,UAAU,YAAY,CAAC;AAE1D,MAAM,CAAC,MAAM,UAAU,GACrB,CAAC,MAA4B,EAAE,EAAE,CACjC,CAAC,IAAwB,EAAE,QAAQ,GAAG,eAAe,CAAC,SAAS,EAAE,EAAE;IACjE,IACE;QACE,CAAC,IAAI;QACL,KAAK,CAAC,IAAI,CAAC;QACX,MAAM,CAAC,IAAI,CAAC;QACZ,CAAC,eAAe,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;KAClE,CAAC,IAAI,CAAC,OAAO,CAAC,EACf;QACA,OAAO,IAAI,CAAC;KACb;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;QAChB,OAAO,GAAG,gBAAgB,IAAI,IAAI,OAAO,CAAC;KAC3C;IAED,MAAM,gBAAgB,GAAG,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IAE/C,OAAO,QAAQ,CACb,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EACzC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EACjD,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAEJ,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,MAA2B,EAAE,EAAE,CAC/D,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC"}
|
package/lib/utils/isUUID.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const isUUID: (src
|
|
1
|
+
export declare const isUUID: (src?: string) => boolean;
|
package/lib/utils/isUUID.js
CHANGED
package/lib/utils/isUUID.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isUUID.js","sourceRoot":"","sources":["../../src/utils/isUUID.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"isUUID.js","sourceRoot":"","sources":["../../src/utils/isUUID.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,GAAG,GAAG,EAAE,EAAE,EAAE;IACjC,OAAO,+FAA+F,CAAC,IAAI,CACzG,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -300,7 +300,7 @@
|
|
|
300
300
|
|
|
301
301
|
const dirname = (path) => path?.split('/').slice(0, -1).join('/');
|
|
302
302
|
|
|
303
|
-
const isUUID = (src) => {
|
|
303
|
+
const isUUID = (src = '') => {
|
|
304
304
|
return /^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}(\/revs\/[0-9]{1,20})?$/.test(src);
|
|
305
305
|
};
|
|
306
306
|
|
|
@@ -322,13 +322,18 @@
|
|
|
322
322
|
const PREFIX_API = '/api/';
|
|
323
323
|
const FILE_STORAGE_API = `${PREFIX_API}v1/storage`;
|
|
324
324
|
const adjustHref = (router) => (href, basePath = projectSettings.BASE_PATH) => {
|
|
325
|
-
if (
|
|
325
|
+
if ([
|
|
326
|
+
!href,
|
|
327
|
+
isURL(href),
|
|
328
|
+
isHash(href),
|
|
329
|
+
[projectSettings.CDN, PREFIX_API].some((_) => hasPrefix(href, _)),
|
|
330
|
+
].some(Boolean)) {
|
|
326
331
|
return href;
|
|
327
332
|
}
|
|
328
333
|
if (isUUID(href)) {
|
|
329
334
|
return `${FILE_STORAGE_API}/${href}/file`;
|
|
330
335
|
}
|
|
331
|
-
const isRelativeToBase = href
|
|
336
|
+
const isRelativeToBase = href?.startsWith('/');
|
|
332
337
|
return joinPath(hasPrefix(href, basePath) ? '' : basePath, isRelativeToBase ? '/' : dirname(router.pathname), href);
|
|
333
338
|
};
|
|
334
339
|
const hasPrefix = (href, prefix) => prefix && href && href.startsWith(prefix);
|
|
@@ -5670,7 +5675,7 @@
|
|
|
5670
5675
|
|
|
5671
5676
|
const joinList = (sep) => (list) => list.reduce((acc, el, i) => (acc.length ? acc.concat({ ...sep, key: `sep-${i}` }, el) : [el]), []);
|
|
5672
5677
|
|
|
5673
|
-
const packageVersion = "0.14.
|
|
5678
|
+
const packageVersion = "0.14.206";
|
|
5674
5679
|
|
|
5675
5680
|
exports.Blocks = Blocks;
|
|
5676
5681
|
exports.ContentPage = ContentPage;
|