@jetshop/core 6.2.14 → 6.2.15
Sign up to get free protection for your applications and to get access to all the features.
- package/components/Head.js +3 -1
- package/components/Head.js.map +1 -1
- package/package.json +1 -1
package/components/Head.js
CHANGED
|
@@ -26,6 +26,7 @@ function renderAlternateRoutes(alternateRoute, channelsById, selectedChannelGrou
|
|
|
26
26
|
return (React.createElement("link", Object.assign({ key: href + alternateRoute.culture, rel: "alternate", href: href, hrefLang: alternateRoute.alias || alternateRoute.culture }, (channel.groupName && { 'data-group': channel.groupName }))));
|
|
27
27
|
}
|
|
28
28
|
const queryParamsWhitelist = ['page'];
|
|
29
|
+
const regex = new RegExp(/\/$/);
|
|
29
30
|
const Head = ({ data, route }) => {
|
|
30
31
|
var _a, _b;
|
|
31
32
|
const { search, pathname } = useLocation();
|
|
@@ -49,7 +50,8 @@ const Head = ({ data, route }) => {
|
|
|
49
50
|
const fullPath = `${languageBasename}${(route === null || route === void 0 ? void 0 : route.canonicalPath) || ''}`;
|
|
50
51
|
const href = (route === null || route === void 0 ? void 0 : route.canonicalPath) &&
|
|
51
52
|
`${selectedChannel.url}${fullPath}${whiteListedSearch}`;
|
|
52
|
-
const
|
|
53
|
+
const pathnameWithoutTrailingSlash = pathname === null || pathname === void 0 ? void 0 : pathname.replace(regex, '');
|
|
54
|
+
const isCurrentRouteCanonical = (pathnameWithoutTrailingSlash || '/') === (route === null || route === void 0 ? void 0 : route.canonicalPath);
|
|
53
55
|
useWarningInDev(route && !route.alternateRoutes, `You must include the RouteMetaFragment in your RouteQuery.gql
|
|
54
56
|
Please see https://gitlab.jetshop.se/jetshop/flight/blob/master/packages/template-trend/src/components/RouteQuery.gql for an example
|
|
55
57
|
`);
|
package/components/Head.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Head.js","sourceRoot":"","sources":["Head.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAWlE,OAAO,KAAK,EAAE,EAAM,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,eAAe,MAAM,0BAA0B,CAAC;AACvD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"Head.js","sourceRoot":"","sources":["Head.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAWlE,OAAO,KAAK,EAAE,EAAM,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,eAAe,MAAM,0BAA0B,CAAC;AACvD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AAYjE,SAAS,qBAAqB,CAC5B,cAA8B,EAC9B,YAEC,EACD,uBAAiC,SAAS;IAE1C,MAAM,OAAO,GAAG,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IAEvD,uEAAuE;IACvE,IAAI,oBAAoB,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QACtE,OAAO,IAAI,CAAC;KACb;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IACxB,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;IACnC,IAAI,gBAAgB,GAAG,EAAE,CAAC;IAC1B,IAAI,OAAO,CAAC,eAAe,CAAC,OAAO,KAAK,cAAc,CAAC,OAAO,EAAE;QAC9D,gBAAgB,GAAG,IAAI,sBAAsB,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;KACzE;IAED,MAAM,IAAI,GAAG,GAAG,GAAG,GAAG,gBAAgB,GAAG,KAAK,EAAE,CAAC;IACjD,OAAO,CACL,4CACE,GAAG,EAAE,IAAI,GAAG,cAAc,CAAC,OAAO,EAClC,GAAG,EAAC,WAAW,EACf,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,cAAc,CAAC,KAAK,IAAI,cAAc,CAAC,OAAO,IACpD,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,EAC9D,CACH,CAAC;AACJ,CAAC;AAED,MAAM,oBAAoB,GAAG,CAAC,MAAM,CAAC,CAAC;AACtC,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;AAEhC,MAAM,IAAI,GAAkB,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;;IAC9C,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,EAAE,CAAC;IAC3C,MAAM,iBAAiB,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IACxE,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC7C,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,EAAE,CAAC,SAAS,CAAC,iBAAiB,EAAE;QACxD,cAAc,EAAE,IAAI;KACrB,CAAC,CAAC;IACH,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAC3D,UAAU,CAAC,cAAc,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,0CAAE,QAAQ,KAAI,EAAE,CAAC;IAC5C,IAAI,gBAAgB,GAAG,EAAE,CAAC;IAC1B,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,EAAE;QACvC,gBAAgB,GAAG,IAAI,sBAAsB,CAC3C,eAAe,CAAC,QAAQ,CAAC,OAAO,CACjC,EAAE,CAAC;KACL;IAED,MAAM,kBAAkB,GACtB,CAAC,IAAI,CAAC,UAAU,KAAK,UAAU,IAAI,IAAI,CAAC,UAAU,KAAK,MAAM,CAAC;QAC9D,IAAI,CAAC,gBAAgB,KAAK,SAAS,CAAC;IAEtC,MAAM,mBAAmB,GACvB,MAAA,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,mCAAI,KAAK,CAAC;IAE1D,MAAM,QAAQ,GAAG,GAAG,gBAAgB,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,KAAI,EAAE,EAAE,CAAC;IACpE,MAAM,IAAI,GACR,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa;QACpB,GAAG,eAAe,CAAC,GAAG,GAAG,QAAQ,GAAG,iBAAiB,EAAE,CAAC;IAE1D,MAAM,4BAA4B,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAClE,MAAM,uBAAuB,GAC3B,CAAC,4BAA4B,IAAI,GAAG,CAAC,MAAK,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,CAAA,CAAC;IACjE,eAAe,CACb,KAAK,IAAI,CAAC,KAAK,CAAC,eAAe,EAC/B;;KAEC,CACF,CAAC;IACF,MAAM,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,CAAC;IAEtC,MAAM,2BAA2B,GAAG,SAAS;QAC3C,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,yBAAyB;QACvC,CAAC,CAAC,KAAK,CAAC;IAEV,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,SAAS,CAAC,GAAG,EAAE;;QACb,KAAK,CACH,cAAc,CAAC;YACb,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ;YAClC,KAAK,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,0CAAE,KAAK;SACzB,CAAC,CACH,CAAC;IACJ,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAElB,OAAO,CACL;QACE,oBAAC,MAAM;YACL,8BAAM,IAAI,EAAE,IAAI,GAAI;YACnB,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,KAAI,mCAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAS;YAE9C,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CACrB,8BAAM,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,GAAI,CAC9D,CAAC;YACD,KAAK;gBACJ,uBAAuB;gBACvB,KAAK,CAAC,eAAe;gBACrB,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,CAC3C,qBAAqB,CACnB,cAAc,EACd,YAAY,EACZ,oBAAoB;oBAClB,oBAAoB,CAAC,GAAG,CAAC,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAC7D,CACF;YACF,IAAI,IAAI,8BAAM,GAAG,EAAC,WAAW,EAAC,IAAI,EAAE,IAAI,GAAI;YAC5C,mBAAmB,IAAI,8BAAM,IAAI,EAAC,QAAQ,EAAC,OAAO,EAAC,SAAS,GAAG,CACzD;QACR,CAAC,2BAA2B,IAAI,CAC/B,oBAAC,wBAAwB,IAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,GAAI,CACvD;QACA,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,MAAK,GAAG,IAAI,oBAAC,6BAA6B,OAAG,CACjE,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,IAAI,CAAC"}
|