@gravity-ui/page-constructor 8.14.0 → 8.14.1

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 (11) hide show
  1. package/build/cjs/utils/url.js +1 -1
  2. package/build/cjs/utils/url.js.map +1 -1
  3. package/build/cjs/utils/url.test.js +2 -0
  4. package/build/cjs/utils/url.test.js.map +1 -1
  5. package/build/esm/utils/url.js +1 -1
  6. package/build/esm/utils/url.js.map +1 -1
  7. package/build/esm/utils/url.test.js +2 -0
  8. package/build/esm/utils/url.test.js.map +1 -1
  9. package/package.json +1 -1
  10. package/server/utils/url.js +1 -1
  11. package/widget/index.js +1 -1
package/build/cjs/utils/url.js CHANGED
@@ -12,7 +12,7 @@ const EXAMPLE_URL = 'https://example.org';
12
12
  exports.EXTERNAL_LINK_PROPS = { target: '_blank', rel: 'noopener noreferrer' };
13
13
  function getLinkProps(url, hostname, target) {
14
14
  let linkProps = { target };
15
- if (isLinkExternal(url, hostname)) {
15
+ if (isLinkExternal(url, hostname) && (!target || target === '_blank')) {
16
16
  linkProps = { ...linkProps, ...exports.EXTERNAL_LINK_PROPS };
17
17
  }
18
18
  return linkProps;
package/build/cjs/utils/url.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"url.js","sourceRoot":"../../../src","sources":["utils/url.ts"],"names":[],"mappings":";;;AAOA,oCAQC;AAED,sCAQC;AAED,wCAKC;AAED,oDAEC;AAED,8BAEC;AAYD,0CAaC;AAjED,6BAAkC;AAIlC,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAC7B,QAAA,mBAAmB,GAAG,EAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,qBAAqB,EAAC,CAAC;AAElF,SAAgB,YAAY,CAAC,GAAW,EAAE,QAAiB,EAAE,MAAe;IACxE,IAAI,SAAS,GAAG,EAAC,MAAM,EAAC,CAAC;IAEzB,IAAI,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;QAChC,SAAS,GAAG,EAAC,GAAG,SAAS,EAAE,GAAG,2BAAmB,EAAC,CAAC;IACvD,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAgB,aAAa,CAAC,GAAiB;IAC3C,+CAA+C;IAC/C,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAEzC,OAAO;IACH,kFAAkF;IAClF,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAC5F,CAAC;AACN,CAAC;AAED,SAAgB,cAAc,CAAC,GAAW,EAAE,cAAuB;IAC/D,OAAO,CACH,aAAa,CAAC,GAAG,CAAC;QAClB,oBAAoB,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,oBAAoB,CAAC,cAAc,IAAI,EAAE,CAAC,CAC7F,CAAC;AACN,CAAC;AAED,SAAgB,oBAAoB,CAAC,QAAgB;IACjD,OAAO,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;AAC/C,CAAC;AAED,SAAgB,SAAS,CAAC,GAAW,EAAE,GAAG,GAAG,IAAI;IAC7C,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACzE,CAAC;AAEM,MAAM,mBAAmB,GAAG,CAAC,QAAe,EAAE,EAAE,EAAE;IACrD,MAAM,YAAY,GAAG,IAAI,eAAe,EAAE,CAAC;IAE3C,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC3C,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACxB,CAAC,CAAC;AARW,QAAA,mBAAmB,uBAQ9B;AAEF,SAAgB,eAAe,CAAC,QAAiB,EAAE,QAAiB,EAAE,GAAY;IAC9E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,OAAO,GAAG,IAAI,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,WAAK,EAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IAEhC,OAAO,IAAA,YAAM,EAAC;QACV,GAAG,MAAM;QACT,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,OAAO;QACpC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,QAAQ;QACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,QAAQ;KACxC,CAAC,CAAC;AACP,CAAC","sourcesContent":["import {format, parse} from 'url';\n\nexport type Query = Record<string, number | string | null>;\n\nconst EXAMPLE_URL = 'https://example.org';\nexport const EXTERNAL_LINK_PROPS = {target: '_blank', rel: 'noopener noreferrer'};\n\nexport function getLinkProps(url: string, hostname?: string, target?: string) {\n let linkProps = {target};\n\n if (isLinkExternal(url, hostname)) {\n linkProps = {...linkProps, ...EXTERNAL_LINK_PROPS};\n }\n\n return linkProps;\n}\n\nexport function isAbsoluteUrl(url: string | URL) {\n // Using example URL as base for relative links\n const urlObj = new URL(url, EXAMPLE_URL);\n\n return (\n // Compare url origin with example and check that original url was not example one\n urlObj.origin !== EXAMPLE_URL || (typeof url === 'string' && url.startsWith(EXAMPLE_URL))\n );\n}\n\nexport function isLinkExternal(url: string, routerHostname?: string) {\n return (\n isAbsoluteUrl(url) &&\n getNonLocaleHostName(new URL(url).hostname) !== getNonLocaleHostName(routerHostname ?? '')\n );\n}\n\nexport function getNonLocaleHostName(hostname: string) {\n return hostname.replace(/\\.(ru|com)$/, '');\n}\n\nexport function setUrlTld(url: string, tld = 'ru') {\n return typeof url === 'string' ? url?.replace(/\\${tld}/g, tld) : url;\n}\n\nexport const getPageSearchParams = (query: Query = {}) => {\n const searchParams = new URLSearchParams();\n\n Object.entries(query).forEach(([key, value]) => {\n searchParams.set(key, String(value));\n });\n\n return searchParams;\n};\n\nexport function getAbsolutePath(hostname?: string, pathname?: string, url?: string) {\n if (!pathname) {\n return url ?? '';\n }\n\n const parsed = parse(url || '');\n\n return format({\n ...parsed,\n protocol: parsed.protocol || 'https',\n hostname: parsed.hostname || hostname,\n pathname: parsed.pathname || pathname,\n });\n}\n"]}
1
+ {"version":3,"file":"url.js","sourceRoot":"../../../src","sources":["utils/url.ts"],"names":[],"mappings":";;;AAOA,oCAQC;AAED,sCAQC;AAED,wCAKC;AAED,oDAEC;AAED,8BAEC;AAYD,0CAaC;AAjED,6BAAkC;AAIlC,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAC7B,QAAA,mBAAmB,GAAG,EAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,qBAAqB,EAAC,CAAC;AAElF,SAAgB,YAAY,CAAC,GAAW,EAAE,QAAiB,EAAE,MAAe;IACxE,IAAI,SAAS,GAAG,EAAC,MAAM,EAAC,CAAC;IAEzB,IAAI,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,QAAQ,CAAC,EAAE,CAAC;QACpE,SAAS,GAAG,EAAC,GAAG,SAAS,EAAE,GAAG,2BAAmB,EAAC,CAAC;IACvD,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAgB,aAAa,CAAC,GAAiB;IAC3C,+CAA+C;IAC/C,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAEzC,OAAO;IACH,kFAAkF;IAClF,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAC5F,CAAC;AACN,CAAC;AAED,SAAgB,cAAc,CAAC,GAAW,EAAE,cAAuB;IAC/D,OAAO,CACH,aAAa,CAAC,GAAG,CAAC;QAClB,oBAAoB,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,oBAAoB,CAAC,cAAc,IAAI,EAAE,CAAC,CAC7F,CAAC;AACN,CAAC;AAED,SAAgB,oBAAoB,CAAC,QAAgB;IACjD,OAAO,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;AAC/C,CAAC;AAED,SAAgB,SAAS,CAAC,GAAW,EAAE,GAAG,GAAG,IAAI;IAC7C,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACzE,CAAC;AAEM,MAAM,mBAAmB,GAAG,CAAC,QAAe,EAAE,EAAE,EAAE;IACrD,MAAM,YAAY,GAAG,IAAI,eAAe,EAAE,CAAC;IAE3C,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC3C,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACxB,CAAC,CAAC;AARW,QAAA,mBAAmB,uBAQ9B;AAEF,SAAgB,eAAe,CAAC,QAAiB,EAAE,QAAiB,EAAE,GAAY;IAC9E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,OAAO,GAAG,IAAI,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,WAAK,EAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IAEhC,OAAO,IAAA,YAAM,EAAC;QACV,GAAG,MAAM;QACT,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,OAAO;QACpC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,QAAQ;QACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,QAAQ;KACxC,CAAC,CAAC;AACP,CAAC","sourcesContent":["import {format, parse} from 'url';\n\nexport type Query = Record<string, number | string | null>;\n\nconst EXAMPLE_URL = 'https://example.org';\nexport const EXTERNAL_LINK_PROPS = {target: '_blank', rel: 'noopener noreferrer'};\n\nexport function getLinkProps(url: string, hostname?: string, target?: string) {\n let linkProps = {target};\n\n if (isLinkExternal(url, hostname) && (!target || target === '_blank')) {\n linkProps = {...linkProps, ...EXTERNAL_LINK_PROPS};\n }\n\n return linkProps;\n}\n\nexport function isAbsoluteUrl(url: string | URL) {\n // Using example URL as base for relative links\n const urlObj = new URL(url, EXAMPLE_URL);\n\n return (\n // Compare url origin with example and check that original url was not example one\n urlObj.origin !== EXAMPLE_URL || (typeof url === 'string' && url.startsWith(EXAMPLE_URL))\n );\n}\n\nexport function isLinkExternal(url: string, routerHostname?: string) {\n return (\n isAbsoluteUrl(url) &&\n getNonLocaleHostName(new URL(url).hostname) !== getNonLocaleHostName(routerHostname ?? '')\n );\n}\n\nexport function getNonLocaleHostName(hostname: string) {\n return hostname.replace(/\\.(ru|com)$/, '');\n}\n\nexport function setUrlTld(url: string, tld = 'ru') {\n return typeof url === 'string' ? url?.replace(/\\${tld}/g, tld) : url;\n}\n\nexport const getPageSearchParams = (query: Query = {}) => {\n const searchParams = new URLSearchParams();\n\n Object.entries(query).forEach(([key, value]) => {\n searchParams.set(key, String(value));\n });\n\n return searchParams;\n};\n\nexport function getAbsolutePath(hostname?: string, pathname?: string, url?: string) {\n if (!pathname) {\n return url ?? '';\n }\n\n const parsed = parse(url || '');\n\n return format({\n ...parsed,\n protocol: parsed.protocol || 'https',\n hostname: parsed.hostname || hostname,\n pathname: parsed.pathname || pathname,\n });\n}\n"]}
package/build/cjs/utils/url.test.js CHANGED
@@ -48,6 +48,7 @@ describe('URL utils check', () => {
48
48
  '_blank',
49
49
  { target: '_blank', rel: 'noopener noreferrer' },
50
50
  ],
51
+ ['http://example.net/path', 'example.com', '_self', { target: '_self' }],
51
52
  [
52
53
  'http://example.net/path',
53
54
  'example.com',
@@ -60,6 +61,7 @@ describe('URL utils check', () => {
60
61
  '_blank',
61
62
  { target: '_blank', rel: 'noopener noreferrer' },
62
63
  ],
64
+ ['http://example.net/path', undefined, '_self', { target: '_self' }],
63
65
  [
64
66
  'http://example.net/path',
65
67
  undefined,
package/build/cjs/utils/url.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"url.test.js","sourceRoot":"../../../src","sources":["utils/url.test.ts"],"names":[],"mappings":"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","sourcesContent":["import {getLinkProps, isAbsoluteUrl, isLinkExternal} from './url';\n\ndescribe('URL utils check', () => {\n test.each([\n ['https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash', true],\n ['http://example.net/path', true],\n ['/p/a/t/h?query=string&query2=1#hash', false],\n ['/path', false],\n ['path', false],\n ])(\"isAbsoluteUrl('%s') should return '%s'\", (url, result) => {\n expect(isAbsoluteUrl(url)).toEqual(result);\n });\n\n test.each([\n [\n 'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',\n 'example.net',\n true,\n ],\n [\n 'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',\n 'sub.example.com',\n false,\n ],\n [\n 'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',\n undefined,\n true,\n ],\n ['http://example.net/path', 'example.net', false],\n ['http://example.net/path', 'sub.example.com', true],\n ['http://example.net/path', undefined, true],\n ['/p/a/t/h?query=string&query2=1#hash', 'example.net', false],\n ['/p/a/t/h?query=string&query2=1#hash', undefined, false],\n ['/path', 'example.net', false],\n ['/path', undefined, false],\n ['path', 'example.net', false],\n ['path', undefined, false],\n ])(\"isLinkExternal('%s', '%s') should return '%s'\", (url, hostname, result) => {\n expect(isLinkExternal(url, hostname)).toEqual(result);\n });\n\n test.each([\n ['http://example.net/path', 'example.net', '_blank', {target: '_blank'}],\n ['http://example.net/path', 'example.net', undefined, {}],\n [\n 'http://example.net/path',\n 'example.com',\n '_blank',\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n [\n 'http://example.net/path',\n 'example.com',\n undefined,\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n [\n 'http://example.net/path',\n undefined,\n '_blank',\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n [\n 'http://example.net/path',\n undefined,\n undefined,\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n\n ['/path', 'example.net', '_blank', {target: '_blank'}],\n ['/path', 'example.net', undefined, {}],\n ['/path', undefined, '_blank', {target: '_blank'}],\n ['/path', undefined, undefined, {}],\n ])(\"getLinkProps('%s', '%s', '%s') should return '%s'\", (url, hostname, target, result) => {\n expect(getLinkProps(url, hostname, target)).toEqual(result);\n });\n});\n"]}
1
+ {"version":3,"file":"url.test.js","sourceRoot":"../../../src","sources":["utils/url.test.ts"],"names":[],"mappings":"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","sourcesContent":["import {getLinkProps, isAbsoluteUrl, isLinkExternal} from './url';\n\ndescribe('URL utils check', () => {\n test.each([\n ['https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash', true],\n ['http://example.net/path', true],\n ['/p/a/t/h?query=string&query2=1#hash', false],\n ['/path', false],\n ['path', false],\n ])(\"isAbsoluteUrl('%s') should return '%s'\", (url, result) => {\n expect(isAbsoluteUrl(url)).toEqual(result);\n });\n\n test.each([\n [\n 'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',\n 'example.net',\n true,\n ],\n [\n 'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',\n 'sub.example.com',\n false,\n ],\n [\n 'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',\n undefined,\n true,\n ],\n ['http://example.net/path', 'example.net', false],\n ['http://example.net/path', 'sub.example.com', true],\n ['http://example.net/path', undefined, true],\n ['/p/a/t/h?query=string&query2=1#hash', 'example.net', false],\n ['/p/a/t/h?query=string&query2=1#hash', undefined, false],\n ['/path', 'example.net', false],\n ['/path', undefined, false],\n ['path', 'example.net', false],\n ['path', undefined, false],\n ])(\"isLinkExternal('%s', '%s') should return '%s'\", (url, hostname, result) => {\n expect(isLinkExternal(url, hostname)).toEqual(result);\n });\n\n test.each([\n ['http://example.net/path', 'example.net', '_blank', {target: '_blank'}],\n ['http://example.net/path', 'example.net', undefined, {}],\n [\n 'http://example.net/path',\n 'example.com',\n '_blank',\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n ['http://example.net/path', 'example.com', '_self', {target: '_self'}],\n [\n 'http://example.net/path',\n 'example.com',\n undefined,\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n [\n 'http://example.net/path',\n undefined,\n '_blank',\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n ['http://example.net/path', undefined, '_self', {target: '_self'}],\n [\n 'http://example.net/path',\n undefined,\n undefined,\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n\n ['/path', 'example.net', '_blank', {target: '_blank'}],\n ['/path', 'example.net', undefined, {}],\n ['/path', undefined, '_blank', {target: '_blank'}],\n ['/path', undefined, undefined, {}],\n ])(\"getLinkProps('%s', '%s', '%s') should return '%s'\", (url, hostname, target, result) => {\n expect(getLinkProps(url, hostname, target)).toEqual(result);\n });\n});\n"]}
package/build/esm/utils/url.js CHANGED
@@ -3,7 +3,7 @@ const EXAMPLE_URL = 'https://example.org';
3
3
  export const EXTERNAL_LINK_PROPS = { target: '_blank', rel: 'noopener noreferrer' };
4
4
  export function getLinkProps(url, hostname, target) {
5
5
  let linkProps = { target };
6
- if (isLinkExternal(url, hostname)) {
6
+ if (isLinkExternal(url, hostname) && (!target || target === '_blank')) {
7
7
  linkProps = { ...linkProps, ...EXTERNAL_LINK_PROPS };
8
8
  }
9
9
  return linkProps;
package/build/esm/utils/url.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"url.js","sourceRoot":"../../../src","sources":["utils/url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,KAAK,CAAC;AAIlC,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAC1C,MAAM,CAAC,MAAM,mBAAmB,GAAG,EAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,qBAAqB,EAAC,CAAC;AAElF,MAAM,UAAU,YAAY,CAAC,GAAW,EAAE,QAAiB,EAAE,MAAe;IACxE,IAAI,SAAS,GAAG,EAAC,MAAM,EAAC,CAAC;IAEzB,IAAI,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;QAChC,SAAS,GAAG,EAAC,GAAG,SAAS,EAAE,GAAG,mBAAmB,EAAC,CAAC;IACvD,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAiB;IAC3C,+CAA+C;IAC/C,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAEzC,OAAO;IACH,kFAAkF;IAClF,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAC5F,CAAC;AACN,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAW,EAAE,cAAuB;IAC/D,OAAO,CACH,aAAa,CAAC,GAAG,CAAC;QAClB,oBAAoB,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,oBAAoB,CAAC,cAAc,IAAI,EAAE,CAAC,CAC7F,CAAC;AACN,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAgB;IACjD,OAAO,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAW,EAAE,GAAG,GAAG,IAAI;IAC7C,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACzE,CAAC;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,QAAe,EAAE,EAAE,EAAE;IACrD,MAAM,YAAY,GAAG,IAAI,eAAe,EAAE,CAAC;IAE3C,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC3C,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,UAAU,eAAe,CAAC,QAAiB,EAAE,QAAiB,EAAE,GAAY;IAC9E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,OAAO,GAAG,IAAI,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IAEhC,OAAO,MAAM,CAAC;QACV,GAAG,MAAM;QACT,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,OAAO;QACpC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,QAAQ;QACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,QAAQ;KACxC,CAAC,CAAC;AACP,CAAC","sourcesContent":["import {format, parse} from 'url';\n\nexport type Query = Record<string, number | string | null>;\n\nconst EXAMPLE_URL = 'https://example.org';\nexport const EXTERNAL_LINK_PROPS = {target: '_blank', rel: 'noopener noreferrer'};\n\nexport function getLinkProps(url: string, hostname?: string, target?: string) {\n let linkProps = {target};\n\n if (isLinkExternal(url, hostname)) {\n linkProps = {...linkProps, ...EXTERNAL_LINK_PROPS};\n }\n\n return linkProps;\n}\n\nexport function isAbsoluteUrl(url: string | URL) {\n // Using example URL as base for relative links\n const urlObj = new URL(url, EXAMPLE_URL);\n\n return (\n // Compare url origin with example and check that original url was not example one\n urlObj.origin !== EXAMPLE_URL || (typeof url === 'string' && url.startsWith(EXAMPLE_URL))\n );\n}\n\nexport function isLinkExternal(url: string, routerHostname?: string) {\n return (\n isAbsoluteUrl(url) &&\n getNonLocaleHostName(new URL(url).hostname) !== getNonLocaleHostName(routerHostname ?? '')\n );\n}\n\nexport function getNonLocaleHostName(hostname: string) {\n return hostname.replace(/\\.(ru|com)$/, '');\n}\n\nexport function setUrlTld(url: string, tld = 'ru') {\n return typeof url === 'string' ? url?.replace(/\\${tld}/g, tld) : url;\n}\n\nexport const getPageSearchParams = (query: Query = {}) => {\n const searchParams = new URLSearchParams();\n\n Object.entries(query).forEach(([key, value]) => {\n searchParams.set(key, String(value));\n });\n\n return searchParams;\n};\n\nexport function getAbsolutePath(hostname?: string, pathname?: string, url?: string) {\n if (!pathname) {\n return url ?? '';\n }\n\n const parsed = parse(url || '');\n\n return format({\n ...parsed,\n protocol: parsed.protocol || 'https',\n hostname: parsed.hostname || hostname,\n pathname: parsed.pathname || pathname,\n });\n}\n"]}
1
+ {"version":3,"file":"url.js","sourceRoot":"../../../src","sources":["utils/url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,KAAK,CAAC;AAIlC,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAC1C,MAAM,CAAC,MAAM,mBAAmB,GAAG,EAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,qBAAqB,EAAC,CAAC;AAElF,MAAM,UAAU,YAAY,CAAC,GAAW,EAAE,QAAiB,EAAE,MAAe;IACxE,IAAI,SAAS,GAAG,EAAC,MAAM,EAAC,CAAC;IAEzB,IAAI,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,QAAQ,CAAC,EAAE,CAAC;QACpE,SAAS,GAAG,EAAC,GAAG,SAAS,EAAE,GAAG,mBAAmB,EAAC,CAAC;IACvD,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAiB;IAC3C,+CAA+C;IAC/C,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAEzC,OAAO;IACH,kFAAkF;IAClF,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAC5F,CAAC;AACN,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAW,EAAE,cAAuB;IAC/D,OAAO,CACH,aAAa,CAAC,GAAG,CAAC;QAClB,oBAAoB,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,oBAAoB,CAAC,cAAc,IAAI,EAAE,CAAC,CAC7F,CAAC;AACN,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAgB;IACjD,OAAO,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAW,EAAE,GAAG,GAAG,IAAI;IAC7C,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACzE,CAAC;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,QAAe,EAAE,EAAE,EAAE;IACrD,MAAM,YAAY,GAAG,IAAI,eAAe,EAAE,CAAC;IAE3C,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC3C,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,UAAU,eAAe,CAAC,QAAiB,EAAE,QAAiB,EAAE,GAAY;IAC9E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,OAAO,GAAG,IAAI,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IAEhC,OAAO,MAAM,CAAC;QACV,GAAG,MAAM;QACT,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,OAAO;QACpC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,QAAQ;QACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,QAAQ;KACxC,CAAC,CAAC;AACP,CAAC","sourcesContent":["import {format, parse} from 'url';\n\nexport type Query = Record<string, number | string | null>;\n\nconst EXAMPLE_URL = 'https://example.org';\nexport const EXTERNAL_LINK_PROPS = {target: '_blank', rel: 'noopener noreferrer'};\n\nexport function getLinkProps(url: string, hostname?: string, target?: string) {\n let linkProps = {target};\n\n if (isLinkExternal(url, hostname) && (!target || target === '_blank')) {\n linkProps = {...linkProps, ...EXTERNAL_LINK_PROPS};\n }\n\n return linkProps;\n}\n\nexport function isAbsoluteUrl(url: string | URL) {\n // Using example URL as base for relative links\n const urlObj = new URL(url, EXAMPLE_URL);\n\n return (\n // Compare url origin with example and check that original url was not example one\n urlObj.origin !== EXAMPLE_URL || (typeof url === 'string' && url.startsWith(EXAMPLE_URL))\n );\n}\n\nexport function isLinkExternal(url: string, routerHostname?: string) {\n return (\n isAbsoluteUrl(url) &&\n getNonLocaleHostName(new URL(url).hostname) !== getNonLocaleHostName(routerHostname ?? '')\n );\n}\n\nexport function getNonLocaleHostName(hostname: string) {\n return hostname.replace(/\\.(ru|com)$/, '');\n}\n\nexport function setUrlTld(url: string, tld = 'ru') {\n return typeof url === 'string' ? url?.replace(/\\${tld}/g, tld) : url;\n}\n\nexport const getPageSearchParams = (query: Query = {}) => {\n const searchParams = new URLSearchParams();\n\n Object.entries(query).forEach(([key, value]) => {\n searchParams.set(key, String(value));\n });\n\n return searchParams;\n};\n\nexport function getAbsolutePath(hostname?: string, pathname?: string, url?: string) {\n if (!pathname) {\n return url ?? '';\n }\n\n const parsed = parse(url || '');\n\n return format({\n ...parsed,\n protocol: parsed.protocol || 'https',\n hostname: parsed.hostname || hostname,\n pathname: parsed.pathname || pathname,\n });\n}\n"]}
package/build/esm/utils/url.test.js CHANGED
@@ -46,6 +46,7 @@ describe('URL utils check', () => {
46
46
  '_blank',
47
47
  { target: '_blank', rel: 'noopener noreferrer' },
48
48
  ],
49
+ ['http://example.net/path', 'example.com', '_self', { target: '_self' }],
49
50
  [
50
51
  'http://example.net/path',
51
52
  'example.com',
@@ -58,6 +59,7 @@ describe('URL utils check', () => {
58
59
  '_blank',
59
60
  { target: '_blank', rel: 'noopener noreferrer' },
60
61
  ],
62
+ ['http://example.net/path', undefined, '_self', { target: '_self' }],
61
63
  [
62
64
  'http://example.net/path',
63
65
  undefined,
package/build/esm/utils/url.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"url.test.js","sourceRoot":"../../../src","sources":["utils/url.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAE,aAAa,EAAE,cAAc,EAAC,iBAAc;AAElE,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,IAAI,CAAC,IAAI,CAAC;QACN,CAAC,2EAA2E,EAAE,IAAI,CAAC;QACnF,CAAC,yBAAyB,EAAE,IAAI,CAAC;QACjC,CAAC,qCAAqC,EAAE,KAAK,CAAC;QAC9C,CAAC,OAAO,EAAE,KAAK,CAAC;QAChB,CAAC,MAAM,EAAE,KAAK,CAAC;KAClB,CAAC,CAAC,wCAAwC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;QACzD,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CAAC;QACN;YACI,2EAA2E;YAC3E,aAAa;YACb,IAAI;SACP;QACD;YACI,2EAA2E;YAC3E,iBAAiB;YACjB,KAAK;SACR;QACD;YACI,2EAA2E;YAC3E,SAAS;YACT,IAAI;SACP;QACD,CAAC,yBAAyB,EAAE,aAAa,EAAE,KAAK,CAAC;QACjD,CAAC,yBAAyB,EAAE,iBAAiB,EAAE,IAAI,CAAC;QACpD,CAAC,yBAAyB,EAAE,SAAS,EAAE,IAAI,CAAC;QAC5C,CAAC,qCAAqC,EAAE,aAAa,EAAE,KAAK,CAAC;QAC7D,CAAC,qCAAqC,EAAE,SAAS,EAAE,KAAK,CAAC;QACzD,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,CAAC;QAC/B,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC;QAC3B,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,CAAC;QAC9B,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC;KAC7B,CAAC,CAAC,+CAA+C,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE;QAC1E,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CAAC;QACN,CAAC,yBAAyB,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,CAAC;QACxE,CAAC,yBAAyB,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,CAAC;QACzD;YACI,yBAAyB;YACzB,aAAa;YACb,QAAQ;YACR,EAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,qBAAqB,EAAC;SACjD;QACD;YACI,yBAAyB;YACzB,aAAa;YACb,SAAS;YACT,EAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,qBAAqB,EAAC;SACjD;QACD;YACI,yBAAyB;YACzB,SAAS;YACT,QAAQ;YACR,EAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,qBAAqB,EAAC;SACjD;QACD;YACI,yBAAyB;YACzB,SAAS;YACT,SAAS;YACT,EAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,qBAAqB,EAAC;SACjD;QAED,CAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,CAAC;QACtD,CAAC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,CAAC;QACvC,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,CAAC;QAClD,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,CAAC;KACtC,CAAC,CAAC,mDAAmD,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;QACtF,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC","sourcesContent":["import {getLinkProps, isAbsoluteUrl, isLinkExternal} from './url';\n\ndescribe('URL utils check', () => {\n test.each([\n ['https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash', true],\n ['http://example.net/path', true],\n ['/p/a/t/h?query=string&query2=1#hash', false],\n ['/path', false],\n ['path', false],\n ])(\"isAbsoluteUrl('%s') should return '%s'\", (url, result) => {\n expect(isAbsoluteUrl(url)).toEqual(result);\n });\n\n test.each([\n [\n 'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',\n 'example.net',\n true,\n ],\n [\n 'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',\n 'sub.example.com',\n false,\n ],\n [\n 'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',\n undefined,\n true,\n ],\n ['http://example.net/path', 'example.net', false],\n ['http://example.net/path', 'sub.example.com', true],\n ['http://example.net/path', undefined, true],\n ['/p/a/t/h?query=string&query2=1#hash', 'example.net', false],\n ['/p/a/t/h?query=string&query2=1#hash', undefined, false],\n ['/path', 'example.net', false],\n ['/path', undefined, false],\n ['path', 'example.net', false],\n ['path', undefined, false],\n ])(\"isLinkExternal('%s', '%s') should return '%s'\", (url, hostname, result) => {\n expect(isLinkExternal(url, hostname)).toEqual(result);\n });\n\n test.each([\n ['http://example.net/path', 'example.net', '_blank', {target: '_blank'}],\n ['http://example.net/path', 'example.net', undefined, {}],\n [\n 'http://example.net/path',\n 'example.com',\n '_blank',\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n [\n 'http://example.net/path',\n 'example.com',\n undefined,\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n [\n 'http://example.net/path',\n undefined,\n '_blank',\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n [\n 'http://example.net/path',\n undefined,\n undefined,\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n\n ['/path', 'example.net', '_blank', {target: '_blank'}],\n ['/path', 'example.net', undefined, {}],\n ['/path', undefined, '_blank', {target: '_blank'}],\n ['/path', undefined, undefined, {}],\n ])(\"getLinkProps('%s', '%s', '%s') should return '%s'\", (url, hostname, target, result) => {\n expect(getLinkProps(url, hostname, target)).toEqual(result);\n });\n});\n"]}
1
+ {"version":3,"file":"url.test.js","sourceRoot":"../../../src","sources":["utils/url.test.ts"],"names":[],"mappings":"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","sourcesContent":["import {getLinkProps, isAbsoluteUrl, isLinkExternal} from './url';\n\ndescribe('URL utils check', () => {\n test.each([\n ['https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash', true],\n ['http://example.net/path', true],\n ['/p/a/t/h?query=string&query2=1#hash', false],\n ['/path', false],\n ['path', false],\n ])(\"isAbsoluteUrl('%s') should return '%s'\", (url, result) => {\n expect(isAbsoluteUrl(url)).toEqual(result);\n });\n\n test.each([\n [\n 'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',\n 'example.net',\n true,\n ],\n [\n 'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',\n 'sub.example.com',\n false,\n ],\n [\n 'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',\n undefined,\n true,\n ],\n ['http://example.net/path', 'example.net', false],\n ['http://example.net/path', 'sub.example.com', true],\n ['http://example.net/path', undefined, true],\n ['/p/a/t/h?query=string&query2=1#hash', 'example.net', false],\n ['/p/a/t/h?query=string&query2=1#hash', undefined, false],\n ['/path', 'example.net', false],\n ['/path', undefined, false],\n ['path', 'example.net', false],\n ['path', undefined, false],\n ])(\"isLinkExternal('%s', '%s') should return '%s'\", (url, hostname, result) => {\n expect(isLinkExternal(url, hostname)).toEqual(result);\n });\n\n test.each([\n ['http://example.net/path', 'example.net', '_blank', {target: '_blank'}],\n ['http://example.net/path', 'example.net', undefined, {}],\n [\n 'http://example.net/path',\n 'example.com',\n '_blank',\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n ['http://example.net/path', 'example.com', '_self', {target: '_self'}],\n [\n 'http://example.net/path',\n 'example.com',\n undefined,\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n [\n 'http://example.net/path',\n undefined,\n '_blank',\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n ['http://example.net/path', undefined, '_self', {target: '_self'}],\n [\n 'http://example.net/path',\n undefined,\n undefined,\n {target: '_blank', rel: 'noopener noreferrer'},\n ],\n\n ['/path', 'example.net', '_blank', {target: '_blank'}],\n ['/path', 'example.net', undefined, {}],\n ['/path', undefined, '_blank', {target: '_blank'}],\n ['/path', undefined, undefined, {}],\n ])(\"getLinkProps('%s', '%s', '%s') should return '%s'\", (url, hostname, target, result) => {\n expect(getLinkProps(url, hostname, target)).toEqual(result);\n });\n});\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gravity-ui/page-constructor",
3
- "version": "8.14.0",
3
+ "version": "8.14.1",
4
4
  "description": "Gravity UI Page Constructor",
5
5
  "license": "MIT",
6
6
  "type": "commonjs",
package/server/utils/url.js CHANGED
@@ -12,7 +12,7 @@ const EXAMPLE_URL = 'https://example.org';
12
12
  exports.EXTERNAL_LINK_PROPS = { target: '_blank', rel: 'noopener noreferrer' };
13
13
  function getLinkProps(url, hostname, target) {
14
14
  let linkProps = { target };
15
- if (isLinkExternal(url, hostname)) {
15
+ if (isLinkExternal(url, hostname) && (!target || target === '_blank')) {
16
16
  linkProps = Object.assign(Object.assign({}, linkProps), exports.EXTERNAL_LINK_PROPS);
17
17
  }
18
18
  return linkProps;
package/widget/index.js CHANGED
@@ -1 +1 @@
1
- export default "(self.webpackChunk_gravity_ui_page_constructor=self.webpackChunk_gravity_ui_page_constructor||[]).push([[6007],{56007:function(_,t,e){_.exports=function(_){\"use strict\";function t(_){return _&&\"object\"==typeof _&&\"default\"in _?_:{default:_}}var e=t(_),Y={name:\"zh\",weekdays:\"星期日_星期一_星期二_星期三_星期四_星期五_星期六\".split(\"_\"),weekdaysShort:\"周日_周一_周二_周三_周四_周五_周六\".split(\"_\"),weekdaysMin:\"日_一_二_三_四_五_六\".split(\"_\"),months:\"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月\".split(\"_\"),monthsShort:\"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月\".split(\"_\"),ordinal:function(_,t){return\"W\"===t?_+\"周\":_+\"日\"},weekStart:1,yearStart:4,formats:{LT:\"HH:mm\",LTS:\"HH:mm:ss\",L:\"YYYY/MM/DD\",LL:\"YYYY年M月D日\",LLL:\"YYYY年M月D日Ah点mm分\",LLLL:\"YYYY年M月D日ddddAh点mm分\",l:\"YYYY/M/D\",ll:\"YYYY年M月D日\",lll:\"YYYY年M月D日 HH:mm\",llll:\"YYYY年M月D日dddd HH:mm\"},relativeTime:{future:\"%s后\",past:\"%s前\",s:\"几秒\",m:\"1 分钟\",mm:\"%d 分钟\",h:\"1 小时\",hh:\"%d 小时\",d:\"1 天\",dd:\"%d 天\",M:\"1 个月\",MM:\"%d 个月\",y:\"1 年\",yy:\"%d 年\"},meridiem:function(_,t){var e=100*_+t;return e<600?\"凌晨\":e<900?\"早上\":e<1100?\"上午\":e<1300?\"中午\":e<1800?\"下午\":\"晚上\"}};return e.default.locale(Y,null,!0),Y}(e(74353))}}]);";
1
+ export default "(self.webpackChunk_gravity_ui_page_constructor=self.webpackChunk_gravity_ui_page_constructor||[]).push([[1349],{31349:function(_,t,Y){_.exports=function(_){\"use strict\";function t(_){return _&&\"object\"==typeof _&&\"default\"in _?_:{default:_}}var Y=t(_),e={name:\"zh-tw\",weekdays:\"星期日_星期一_星期二_星期三_星期四_星期五_星期六\".split(\"_\"),weekdaysShort:\"週日_週一_週二_週三_週四_週五_週六\".split(\"_\"),weekdaysMin:\"日_一_二_三_四_五_六\".split(\"_\"),months:\"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月\".split(\"_\"),monthsShort:\"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月\".split(\"_\"),ordinal:function(_,t){return\"W\"===t?_+\"週\":_+\"日\"},formats:{LT:\"HH:mm\",LTS:\"HH:mm:ss\",L:\"YYYY/MM/DD\",LL:\"YYYY年M月D日\",LLL:\"YYYY年M月D日 HH:mm\",LLLL:\"YYYY年M月D日dddd HH:mm\",l:\"YYYY/M/D\",ll:\"YYYY年M月D日\",lll:\"YYYY年M月D日 HH:mm\",llll:\"YYYY年M月D日dddd HH:mm\"},relativeTime:{future:\"%s內\",past:\"%s前\",s:\"幾秒\",m:\"1 分鐘\",mm:\"%d 分鐘\",h:\"1 小時\",hh:\"%d 小時\",d:\"1 天\",dd:\"%d 天\",M:\"1 個月\",MM:\"%d 個月\",y:\"1 年\",yy:\"%d 年\"},meridiem:function(_,t){var Y=100*_+t;return Y<600?\"凌晨\":Y<900?\"早上\":Y<1100?\"上午\":Y<1300?\"中午\":Y<1800?\"下午\":\"晚上\"}};return Y.default.locale(e,null,!0),e}(Y(74353))}}]);";