@graphcommerce/next-ui 6.0.0-canary.27 → 6.0.0-canary.28

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 (4) hide show
  1. package/CHANGELOG.md +2 -0
  2. package/LayoutParts/MenuFabSecondaryItem.tsx +0 -1
  3. package/PageMeta/PageMeta.tsx +3 -1
  4. package/package.json +8 -8
package/CHANGELOG.md CHANGED
@@ -1,5 +1,7 @@
1
1
  # Change Log
2
2
 
3
+ ## 6.0.0-canary.28
4
+
3
5
  ## 6.0.0-canary.27
4
6
 
5
7
  ## 6.0.0-canary.26
package/LayoutParts/MenuFabSecondaryItem.tsx CHANGED
@@ -23,7 +23,6 @@ export function MenuFabSecondaryItem(props: FabMenuSecondaryItemProps) {
23
23
  href={href}
24
24
  className={classes.root}
25
25
  sx={[{}, ...(Array.isArray(sx) ? sx : [sx])]}
26
- component='a'
27
26
  dense
28
27
  selected={router.asPath.startsWith(href)}
29
28
  >
package/PageMeta/PageMeta.tsx CHANGED
@@ -7,6 +7,7 @@ import { resolveHref } from 'next/dist/shared/lib/router/utils/resolve-href'
7
7
  import Head from 'next/head'
8
8
  import { useRouter } from 'next/router'
9
9
  import type {} from '@graphcommerce/next-config'
10
+ import { i18nConfig } from '../hooks'
10
11
 
11
12
  // https://developers.google.com/search/docs/advanced/robots/robots_meta_tag#directives
12
13
  export type MetaRobots =
@@ -61,7 +62,8 @@ export function canonicalize(router: PartialNextRouter, incoming?: Canonical) {
61
62
 
62
63
  href = localeDomain || addBasePath(addLocale(as, curLocale, router.defaultLocale))
63
64
 
64
- let siteUrl = import.meta.graphCommerce.canonicalBaseUrl
65
+ let siteUrl =
66
+ i18nConfig(router.locale)?.canonicalBaseUrl || import.meta.graphCommerce.canonicalBaseUrl
65
67
  if (siteUrl.endsWith('/')) siteUrl = siteUrl.slice(0, -1)
66
68
 
67
69
  canonical = `${siteUrl}${href}`
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@graphcommerce/next-ui",
3
3
  "homepage": "https://www.graphcommerce.org/",
4
4
  "repository": "github:graphcommerce-org/graphcommerce",
5
- "version": "6.0.0-canary.27",
5
+ "version": "6.0.0-canary.28",
6
6
  "author": "",
7
7
  "license": "MIT",
8
8
  "sideEffects": false,
@@ -18,18 +18,18 @@
18
18
  "@emotion/react": "^11.10.6",
19
19
  "@emotion/server": "^11.4.0",
20
20
  "@emotion/styled": "^11.10.6",
21
- "@graphcommerce/framer-next-pages": "6.0.0-canary.27",
22
- "@graphcommerce/framer-scroller": "6.0.0-canary.27",
23
- "@graphcommerce/framer-utils": "6.0.0-canary.27",
24
- "@graphcommerce/image": "6.0.0-canary.27",
21
+ "@graphcommerce/framer-next-pages": "6.0.0-canary.28",
22
+ "@graphcommerce/framer-scroller": "6.0.0-canary.28",
23
+ "@graphcommerce/framer-utils": "6.0.0-canary.28",
24
+ "@graphcommerce/image": "6.0.0-canary.28",
25
25
  "cookie": "^0.5.0",
26
26
  "react-is": "^18.2.0",
27
27
  "schema-dts": "^1.1.0"
28
28
  },
29
29
  "devDependencies": {
30
- "@graphcommerce/eslint-config-pwa": "6.0.0-canary.27",
31
- "@graphcommerce/prettier-config-pwa": "6.0.0-canary.27",
32
- "@graphcommerce/typescript-config-pwa": "6.0.0-canary.27",
30
+ "@graphcommerce/eslint-config-pwa": "6.0.0-canary.28",
31
+ "@graphcommerce/prettier-config-pwa": "6.0.0-canary.28",
32
+ "@graphcommerce/typescript-config-pwa": "6.0.0-canary.28",
33
33
  "@types/cookie": "^0.5.1",
34
34
  "@types/react-is": "^17.0.3",
35
35
  "typescript": "4.9.5"