@redneckz/wildless-cms-uni-blocks 0.14.630 → 0.14.631

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 (63) hide show
  1. package/bundle/Env.d.ts +2 -0
  2. package/bundle/bundle.umd.js +26 -17
  3. package/bundle/bundle.umd.min.js +1 -1
  4. package/bundle/utils/adjustBase.d.ts +1 -1
  5. package/dist/Env.d.ts +2 -0
  6. package/dist/Env.js.map +1 -1
  7. package/dist/hooks/useLink.js +13 -4
  8. package/dist/hooks/useLink.js.map +1 -1
  9. package/dist/utils/adjustBase.d.ts +1 -1
  10. package/dist/utils/adjustBase.js +1 -1
  11. package/dist/utils/adjustBase.js.map +1 -1
  12. package/dist/utils/getBasePath.js +1 -2
  13. package/dist/utils/getBasePath.js.map +1 -1
  14. package/dist/utils/url.js +10 -9
  15. package/dist/utils/url.js.map +1 -1
  16. package/lib/Env.d.ts +2 -0
  17. package/lib/Env.js.map +1 -1
  18. package/lib/hooks/useLink.js +13 -4
  19. package/lib/hooks/useLink.js.map +1 -1
  20. package/lib/utils/adjustBase.d.ts +1 -1
  21. package/lib/utils/adjustBase.js +1 -1
  22. package/lib/utils/adjustBase.js.map +1 -1
  23. package/lib/utils/getBasePath.js +1 -2
  24. package/lib/utils/getBasePath.js.map +1 -1
  25. package/lib/utils/url.js +10 -9
  26. package/lib/utils/url.js.map +1 -1
  27. package/mobile/bundle/Env.d.ts +2 -0
  28. package/mobile/bundle/bundle.umd.js +26 -17
  29. package/mobile/bundle/bundle.umd.min.js +1 -1
  30. package/mobile/bundle/utils/adjustBase.d.ts +1 -1
  31. package/mobile/dist/Env.d.ts +2 -0
  32. package/mobile/dist/Env.js.map +1 -1
  33. package/mobile/dist/hooks/useLink.js +13 -4
  34. package/mobile/dist/hooks/useLink.js.map +1 -1
  35. package/mobile/dist/utils/adjustBase.d.ts +1 -1
  36. package/mobile/dist/utils/adjustBase.js +1 -1
  37. package/mobile/dist/utils/adjustBase.js.map +1 -1
  38. package/mobile/dist/utils/getBasePath.js +1 -2
  39. package/mobile/dist/utils/getBasePath.js.map +1 -1
  40. package/mobile/dist/utils/url.js +10 -9
  41. package/mobile/dist/utils/url.js.map +1 -1
  42. package/mobile/lib/Env.d.ts +2 -0
  43. package/mobile/lib/Env.js.map +1 -1
  44. package/mobile/lib/hooks/useLink.js +13 -4
  45. package/mobile/lib/hooks/useLink.js.map +1 -1
  46. package/mobile/lib/utils/adjustBase.d.ts +1 -1
  47. package/mobile/lib/utils/adjustBase.js +1 -1
  48. package/mobile/lib/utils/adjustBase.js.map +1 -1
  49. package/mobile/lib/utils/getBasePath.js +1 -2
  50. package/mobile/lib/utils/getBasePath.js.map +1 -1
  51. package/mobile/lib/utils/url.js +10 -9
  52. package/mobile/lib/utils/url.js.map +1 -1
  53. package/mobile/src/Env.ts +3 -1
  54. package/mobile/src/hooks/useLink.ts +18 -6
  55. package/mobile/src/utils/adjustBase.ts +1 -1
  56. package/mobile/src/utils/getBasePath.ts +1 -3
  57. package/mobile/src/utils/url.ts +13 -13
  58. package/package.json +1 -1
  59. package/src/Env.ts +3 -1
  60. package/src/hooks/useLink.ts +18 -6
  61. package/src/utils/adjustBase.ts +1 -1
  62. package/src/utils/getBasePath.ts +1 -3
  63. package/src/utils/url.ts +13 -13
@@ -1 +1 @@
1
- export declare const adjustBase: (href: string, basePath?: string) => string;
1
+ export declare const adjustBase: (href?: string, basePath?: string) => string;
package/dist/Env.d.ts CHANGED
@@ -1,5 +1,7 @@
1
1
  export interface Env {
2
2
  SITE_URL?: string;
3
+ SUB_PORTALS?: string;
4
+ MOBILE?: string;
3
5
  }
4
6
  export declare const env: Env & {
5
7
  _: Env;
package/dist/Env.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Env.js","sourceRoot":"","sources":["../src/Env.ts"],"names":[],"mappings":";;AAIa,QAAA,GAAG,GAGZ,IAAI,KAAK,CACX;IACE,CAAC,EAAE,EAAS;IAEZ,KAAK,CAAC,CAAM;QACV,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,EACD;IACE,GAAG,CAAC,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;CACF,CACF,CAAC"}
1
+ {"version":3,"file":"Env.js","sourceRoot":"","sources":["../src/Env.ts"],"names":[],"mappings":";;AAMa,QAAA,GAAG,GAGZ,IAAI,KAAK,CACX;IACE,CAAC,EAAE,EAAS;IAEZ,KAAK,CAAC,CAAM;QACV,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,EACD;IACE,GAAG,CAAC,MAAM,EAAE,CAAY;QACtB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;CACF,CACF,CAAC"}
@@ -23,10 +23,9 @@ function useLink() {
23
23
  };
24
24
  function handleHref({ href, target, onClick }) {
25
25
  return (ev) => {
26
- onClick && onClick(ev);
27
- const isRemote = !(0, url_1.hasPrefix)(href, basePath || '/');
28
- if (!href || isRemote || !(0, url_1.isLocalURL)(href, target)) {
29
- //? Default routing
26
+ onClick?.(ev);
27
+ if (checkIsRemote(href, target, basePath)) {
28
+ //? Native routing
30
29
  return;
31
30
  }
32
31
  closeAll();
@@ -37,4 +36,14 @@ function useLink() {
37
36
  }
38
37
  }
39
38
  exports.useLink = useLink;
39
+ const checkIsRemote = (href, target, basePath) => {
40
+ if (!(0, url_1.isLocalURL)(href, target)) {
41
+ return true;
42
+ }
43
+ const subPortals = Env_1.env.SUB_PORTALS?.split(',');
44
+ if (subPortals?.some((_) => (0, url_1.hasPrefix)(href, _))) {
45
+ return true;
46
+ }
47
+ return !(0, url_1.hasPrefix)(href, basePath || '/');
48
+ };
40
49
  //# sourceMappingURL=useLink.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":";;AAAA,gCAA6B;AAE7B,+EAA4E;AAE5E,oDAAiD;AACjD,oDAAiD;AACjD,sDAAmD;AACnD,sCAAqD;AACrD,yDAAsD;AACtD,2CAAwC;AAMxC,SAAgB,OAAO;IACrB,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,SAAG,CAAC,QAAQ,CAAC,CAAC;IAE3C,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAC3B,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,mCAAgB,GAAE,CAAC;IAExC,OAAO,CAA2C,KAAQ,EAAiB,EAAE;QAC3E,MAAM,IAAI,GAAG,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,IAAA,mCAAgB,EAAC,UAAU,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1D,CAAC;IACJ,CAAC,CAAC;IAEF,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,MAAM,QAAQ,GAAG,CAAC,IAAA,eAAS,EAAC,IAAI,EAAE,QAAQ,IAAI,GAAG,CAAC,CAAC;YAEnD,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,IAAA,gBAAU,EAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBAClD,mBAAmB;gBACnB,OAAO;aACR;YAED,QAAQ,EAAE,CAAC;YAEX,kBAAkB;YAClB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,IAAA,uBAAU,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AAnCD,0BAmCC"}
1
+ {"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":";;AAAA,gCAA6B;AAE7B,+EAA4E;AAE5E,oDAAiD;AACjD,oDAAiD;AACjD,sDAAmD;AACnD,sCAAqD;AACrD,yDAAsD;AACtD,2CAAwC;AAMxC,SAAgB,OAAO;IACrB,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,SAAG,CAAC,QAAQ,CAAC,CAAC;IAE3C,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAC3B,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,mCAAgB,GAAE,CAAC;IAExC,OAAO,CAA2C,KAAQ,EAAiB,EAAE;QAC3E,MAAM,IAAI,GAAG,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,IAAA,mCAAgB,EAAC,UAAU,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1D,CAAC;IACJ,CAAC,CAAC;IAEF,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;YAEd,IAAI,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE;gBACzC,kBAAkB;gBAClB,OAAO;aACR;YAED,QAAQ,EAAE,CAAC;YAEX,kBAAkB;YAClB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,IAAA,uBAAU,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AAjCD,0BAiCC;AAED,MAAM,aAAa,GAAG,CAAC,IAAa,EAAE,MAAe,EAAE,QAAiB,EAAE,EAAE;IAC1E,IAAI,CAAC,IAAA,gBAAU,EAAC,IAAI,EAAE,MAAM,CAAC,EAAE;QAC7B,OAAO,IAAI,CAAC;KACb;IAED,MAAM,UAAU,GAAG,SAAG,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAE/C,IAAI,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,eAAS,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;QAC/C,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CAAC,IAAA,eAAS,EAAC,IAAI,EAAE,QAAQ,IAAI,GAAG,CAAC,CAAC;AAC3C,CAAC,CAAC"}
@@ -1 +1 @@
1
- export declare const adjustBase: (href: string, basePath?: string) => string;
1
+ export declare const adjustBase: (href?: string, basePath?: string) => string;
@@ -1,5 +1,5 @@
1
1
  Object.defineProperty(exports, "__esModule", { value: true });
2
2
  exports.adjustBase = void 0;
3
- const adjustBase = (href, basePath = '') => href.replace(basePath, '') || '/';
3
+ const adjustBase = (href, basePath = '') => href?.replace(basePath, '') || '/';
4
4
  exports.adjustBase = adjustBase;
5
5
  //# sourceMappingURL=adjustBase.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":";;AAAO,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC;AAAhF,QAAA,UAAU,cAAsE"}
1
+ {"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":";;AAAO,MAAM,UAAU,GAAG,CAAC,IAAa,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC;AAAlF,QAAA,UAAU,cAAwE"}
@@ -2,8 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
2
2
  exports.getBasePath = void 0;
3
3
  function getBasePath(siteUrl = '') {
4
4
  try {
5
- const [, ...tail] = new URL(siteUrl).pathname.split('/');
6
- return `/${tail.filter(Boolean).join('/')}`;
5
+ return new URL(siteUrl).pathname;
7
6
  }
8
7
  catch (_) {
9
8
  return '';
@@ -1 +1 @@
1
- {"version":3,"file":"getBasePath.js","sourceRoot":"","sources":["../../src/utils/getBasePath.ts"],"names":[],"mappings":";;AAAA,SAAgB,WAAW,CAAC,OAAO,GAAG,EAAE;IACtC,IAAI;QACF,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEzD,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,kCAQC"}
1
+ {"version":3,"file":"getBasePath.js","sourceRoot":"","sources":["../../src/utils/getBasePath.ts"],"names":[],"mappings":";;AAAA,SAAgB,WAAW,CAAC,OAAO,GAAG,EAAE;IACtC,IAAI;QACF,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;KAClC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAND,kCAMC"}
package/dist/utils/url.js CHANGED
@@ -12,15 +12,16 @@ const joinPath = (...path) => path
12
12
  .filter(Boolean)
13
13
  .join('/')
14
14
  .replace(/\/+/g, '/')
15
- .replace(/^(.+):\//, '$1://')
16
- .replace(/^file:/, 'file:/')
17
- .replace(/\/(\?|&|#[^!])/g, '$1')
18
- .replace(/\?/g, '&')
19
- .replace('&', '?');
15
+ .replace(/^(.+):\//, '$1://');
20
16
  exports.joinPath = joinPath;
21
- const hasPrefix = (href, prefix) => Boolean(prefix &&
22
- href &&
23
- href.startsWith(prefix) &&
24
- [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean));
17
+ const hasPrefix = (href, prefix) => {
18
+ if (!href || !prefix) {
19
+ return false;
20
+ }
21
+ if (href.startsWith(prefix)) {
22
+ return [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean);
23
+ }
24
+ return false;
25
+ };
25
26
  exports.hasPrefix = hasPrefix;
26
27
  //# sourceMappingURL=url.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAEO,MAAM,KAAK,GAAG,CAAC,IAAa,EAAiC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAAvF,QAAA,KAAK,SAAkF;AAE7F,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AADtD,QAAA,UAAU,cAC4C;AAE5D,MAAM,MAAM,GAAG,CAAC,IAAa,EAAwB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAAjF,QAAA,MAAM,UAA2E;AAEvF,MAAM,YAAY,GAAG,CAAC,IAAa,EAAU,EAAE,CACpD,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AADzC,QAAA,YAAY,gBAC6B;AAE/C,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE,CACzE,IAAI;KACD,MAAM,CAAC,OAAO,CAAC;KACf,IAAI,CAAC,GAAG,CAAC;KACT,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;KACpB,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC;KAC5B,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAC3B,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC;KAChC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;KACnB,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AATV,QAAA,QAAQ,YASE;AAEhB,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,MAA2B,EAAE,EAAE,CACtE,OAAO,CACL,MAAM;IACJ,IAAI;IACJ,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACvB,CAAC,MAAM,KAAK,GAAG,EAAE,IAAI,KAAK,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAC/E,CAAC;AANS,QAAA,SAAS,aAMlB"}
1
+ {"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAEO,MAAM,KAAK,GAAG,CAAC,IAAa,EAAiC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAAvF,QAAA,KAAK,SAAkF;AAE7F,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AADtD,QAAA,UAAU,cAC4C;AAE5D,MAAM,MAAM,GAAG,CAAC,IAAa,EAAwB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAAjF,QAAA,MAAM,UAA2E;AAEvF,MAAM,YAAY,GAAG,CAAC,IAAa,EAAU,EAAE,CACpD,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AADzC,QAAA,YAAY,gBAC6B;AAE/C,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE,CACzE,IAAI;KACD,MAAM,CAAC,OAAO,CAAC;KACf,IAAI,CAAC,GAAG,CAAC;KACT,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;KACpB,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AALrB,QAAA,QAAQ,YAKa;AAE3B,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,MAA2B,EAAE,EAAE;IACtE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;QACpB,OAAO,KAAK,CAAC;KACd;IAED,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAC3B,OAAO,CAAC,MAAM,KAAK,GAAG,EAAE,IAAI,KAAK,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACrF;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAVW,QAAA,SAAS,aAUpB"}
package/lib/Env.d.ts CHANGED
@@ -1,5 +1,7 @@
1
1
  export interface Env {
2
2
  SITE_URL?: string;
3
+ SUB_PORTALS?: string;
4
+ MOBILE?: string;
3
5
  }
4
6
  export declare const env: Env & {
5
7
  _: Env;
package/lib/Env.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Env.js","sourceRoot":"","sources":["../src/Env.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,GAAG,GAGZ,IAAI,KAAK,CACX;IACE,CAAC,EAAE,EAAS;IAEZ,KAAK,CAAC,CAAM;QACV,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,EACD;IACE,GAAG,CAAC,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;CACF,CACF,CAAC"}
1
+ {"version":3,"file":"Env.js","sourceRoot":"","sources":["../src/Env.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,GAAG,GAGZ,IAAI,KAAK,CACX;IACE,CAAC,EAAE,EAAS;IAEZ,KAAK,CAAC,CAAM;QACV,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,EACD;IACE,GAAG,CAAC,MAAM,EAAE,CAAY;QACtB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;CACF,CACF,CAAC"}
@@ -21,10 +21,9 @@ export function useLink() {
21
21
  };
22
22
  function handleHref({ href, target, onClick }) {
23
23
  return (ev) => {
24
- onClick && onClick(ev);
25
- const isRemote = !hasPrefix(href, basePath || '/');
26
- if (!href || isRemote || !isLocalURL(href, target)) {
27
- //? Default routing
24
+ onClick?.(ev);
25
+ if (checkIsRemote(href, target, basePath)) {
26
+ //? Native routing
28
27
  return;
29
28
  }
30
29
  closeAll();
@@ -34,4 +33,14 @@ export function useLink() {
34
33
  };
35
34
  }
36
35
  }
36
+ const checkIsRemote = (href, target, basePath) => {
37
+ if (!isLocalURL(href, target)) {
38
+ return true;
39
+ }
40
+ const subPortals = env.SUB_PORTALS?.split(',');
41
+ if (subPortals?.some((_) => hasPrefix(href, _))) {
42
+ return true;
43
+ }
44
+ return !hasPrefix(href, basePath || '/');
45
+ };
37
46
  //# sourceMappingURL=useLink.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,MAAM,UAAU,OAAO;IACrB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE3C,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAExC,OAAO,CAA2C,KAAQ,EAAiB,EAAE;QAC3E,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1D,CAAC;IACJ,CAAC,CAAC;IAEF,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,MAAM,QAAQ,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,IAAI,GAAG,CAAC,CAAC;YAEnD,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBAClD,mBAAmB;gBACnB,OAAO;aACR;YAED,QAAQ,EAAE,CAAC;YAEX,kBAAkB;YAClB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,MAAM,UAAU,OAAO;IACrB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE3C,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAExC,OAAO,CAA2C,KAAQ,EAAiB,EAAE;QAC3E,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1D,CAAC;IACJ,CAAC,CAAC;IAEF,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;YAEd,IAAI,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE;gBACzC,kBAAkB;gBAClB,OAAO;aACR;YAED,QAAQ,EAAE,CAAC;YAEX,kBAAkB;YAClB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,aAAa,GAAG,CAAC,IAAa,EAAE,MAAe,EAAE,QAAiB,EAAE,EAAE;IAC1E,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;QAC7B,OAAO,IAAI,CAAC;KACb;IAED,MAAM,UAAU,GAAG,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAE/C,IAAI,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;QAC/C,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,IAAI,GAAG,CAAC,CAAC;AAC3C,CAAC,CAAC"}
@@ -1 +1 @@
1
- export declare const adjustBase: (href: string, basePath?: string) => string;
1
+ export declare const adjustBase: (href?: string, basePath?: string) => string;
@@ -1,2 +1,2 @@
1
- export const adjustBase = (href, basePath = '') => href.replace(basePath, '') || '/';
1
+ export const adjustBase = (href, basePath = '') => href?.replace(basePath, '') || '/';
2
2
  //# sourceMappingURL=adjustBase.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC"}
1
+ {"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAa,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC"}
@@ -1,7 +1,6 @@
1
1
  export function getBasePath(siteUrl = '') {
2
2
  try {
3
- const [, ...tail] = new URL(siteUrl).pathname.split('/');
4
- return `/${tail.filter(Boolean).join('/')}`;
3
+ return new URL(siteUrl).pathname;
5
4
  }
6
5
  catch (_) {
7
6
  return '';
@@ -1 +1 @@
1
- {"version":3,"file":"getBasePath.js","sourceRoot":"","sources":["../../src/utils/getBasePath.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,OAAO,GAAG,EAAE;IACtC,IAAI;QACF,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEzD,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC"}
1
+ {"version":3,"file":"getBasePath.js","sourceRoot":"","sources":["../../src/utils/getBasePath.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,OAAO,GAAG,EAAE;IACtC,IAAI;QACF,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;KAClC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC"}
package/lib/utils/url.js CHANGED
@@ -6,13 +6,14 @@ export const joinPath = (...path) => path
6
6
  .filter(Boolean)
7
7
  .join('/')
8
8
  .replace(/\/+/g, '/')
9
- .replace(/^(.+):\//, '$1://')
10
- .replace(/^file:/, 'file:/')
11
- .replace(/\/(\?|&|#[^!])/g, '$1')
12
- .replace(/\?/g, '&')
13
- .replace('&', '?');
14
- export const hasPrefix = (href, prefix) => Boolean(prefix &&
15
- href &&
16
- href.startsWith(prefix) &&
17
- [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean));
9
+ .replace(/^(.+):\//, '$1://');
10
+ export const hasPrefix = (href, prefix) => {
11
+ if (!href || !prefix) {
12
+ return false;
13
+ }
14
+ if (href.startsWith(prefix)) {
15
+ return [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean);
16
+ }
17
+ return false;
18
+ };
18
19
  //# sourceMappingURL=url.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAiC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAEpG,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAa,EAAwB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAU,EAAE,CACpD,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAEtD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE,CACzE,IAAI;KACD,MAAM,CAAC,OAAO,CAAC;KACf,IAAI,CAAC,GAAG,CAAC;KACT,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;KACpB,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC;KAC5B,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAC3B,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC;KAChC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;KACnB,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAEvB,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,MAA2B,EAAE,EAAE,CACtE,OAAO,CACL,MAAM;IACJ,IAAI;IACJ,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACvB,CAAC,MAAM,KAAK,GAAG,EAAE,IAAI,KAAK,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAC/E,CAAC"}
1
+ {"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAiC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAEpG,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAa,EAAwB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAU,EAAE,CACpD,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAEtD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE,CACzE,IAAI;KACD,MAAM,CAAC,OAAO,CAAC;KACf,IAAI,CAAC,GAAG,CAAC;KACT,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;KACpB,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAElC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,MAA2B,EAAE,EAAE;IACtE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;QACpB,OAAO,KAAK,CAAC;KACd;IAED,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAC3B,OAAO,CAAC,MAAM,KAAK,GAAG,EAAE,IAAI,KAAK,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACrF;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
@@ -1,5 +1,7 @@
1
1
  export interface Env {
2
2
  SITE_URL?: string;
3
+ SUB_PORTALS?: string;
4
+ MOBILE?: string;
3
5
  }
4
6
  export declare const env: Env & {
5
7
  _: Env;
@@ -247,15 +247,16 @@
247
247
  .filter(Boolean)
248
248
  .join('/')
249
249
  .replace(/\/+/g, '/')
250
- .replace(/^(.+):\//, '$1://')
251
- .replace(/^file:/, 'file:/')
252
- .replace(/\/(\?|&|#[^!])/g, '$1')
253
- .replace(/\?/g, '&')
254
- .replace('&', '?');
255
- const hasPrefix = (href, prefix) => Boolean(prefix &&
256
- href &&
257
- href.startsWith(prefix) &&
258
- [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean));
250
+ .replace(/^(.+):\//, '$1://');
251
+ const hasPrefix = (href, prefix) => {
252
+ if (!href || !prefix) {
253
+ return false;
254
+ }
255
+ if (href.startsWith(prefix)) {
256
+ return [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean);
257
+ }
258
+ return false;
259
+ };
259
260
 
260
261
  var url = /*#__PURE__*/Object.freeze({
261
262
  __proto__: null,
@@ -329,8 +330,7 @@
329
330
 
330
331
  function getBasePath(siteUrl = '') {
331
332
  try {
332
- const [, ...tail] = new URL(siteUrl).pathname.split('/');
333
- return `/${tail.filter(Boolean).join('/')}`;
333
+ return new URL(siteUrl).pathname;
334
334
  }
335
335
  catch (_) {
336
336
  return '';
@@ -446,7 +446,7 @@
446
446
  closeAll: () => defaultEventBus.fire('dialog', { type: 'close', all: true }),
447
447
  });
448
448
 
449
- const adjustBase = (href, basePath = '') => href.replace(basePath, '') || '/';
449
+ const adjustBase = (href, basePath = '') => href?.replace(basePath, '') || '/';
450
450
 
451
451
  /* eslint-disable @typescript-eslint/ban-types */
452
452
  const handlerDecorator = (handler) => {
@@ -472,10 +472,9 @@
472
472
  };
473
473
  function handleHref({ href, target, onClick }) {
474
474
  return (ev) => {
475
- onClick && onClick(ev);
476
- const isRemote = !hasPrefix(href, basePath || '/');
477
- if (!href || isRemote || !isLocalURL(href, target)) {
478
- //? Default routing
475
+ onClick?.(ev);
476
+ if (checkIsRemote(href, target, basePath)) {
477
+ //? Native routing
479
478
  return;
480
479
  }
481
480
  closeAll();
@@ -485,6 +484,16 @@
485
484
  };
486
485
  }
487
486
  }
487
+ const checkIsRemote = (href, target, basePath) => {
488
+ if (!isLocalURL(href, target)) {
489
+ return true;
490
+ }
491
+ const subPortals = env.SUB_PORTALS?.split(',');
492
+ if (subPortals?.some((_) => hasPrefix(href, _))) {
493
+ return true;
494
+ }
495
+ return !hasPrefix(href, basePath || '/');
496
+ };
488
497
 
489
498
  const getAspectsAttributes = (data) => {
490
499
  if (!Array.isArray(data) || !data.length) {
@@ -7922,7 +7931,7 @@
7922
7931
  slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
7923
7932
  });
7924
7933
 
7925
- const packageVersion = "0.14.629";
7934
+ const packageVersion = "0.14.630";
7926
7935
 
7927
7936
  exports.Blocks = Blocks;
7928
7937
  exports.ContentPage = ContentPage;