Merge pull request #146 from styxlab/site-url

fix #127

components/meta/seo.tsx

@@ -28,7 +28,7 @@ export const SEO = (props: SEOProps) => {
 
   const router = useRouter()
   const siteUrl = settings.processEnv.siteUrl
-  const canonical = url.resolve(siteUrl, router.asPath)
+  const canonical = url.resolve(siteUrl, `${router.basePath}${router.asPath}`)
 
   const { twitter, title: settingsTitle, description: settingsDescription, meta_title, meta_description } = settings
   const title = t || meta_title || settingsTitle || siteTitleMeta

package.json

@@ -65,17 +65,17 @@
     "@next/bundle-analyzer": "^12.0.7",
     "@types/cheerio": "^0.22.30",
     "@types/lodash": "^4.14.178",
-    "@types/node": "^16.11.12",
+    "@types/node": "^17.0.2",
     "@types/nodemailer": "^6.4.4",
     "@types/react": "^17.0.37",
     "@types/refractor": "^3.0.2",
     "@types/rss": "^0.0.29",
     "@types/sanitize-html": "^2.6.0",
-    "@types/styled-components": "^5.1.17",
+    "@types/styled-components": "^5.1.18",
     "@types/testing-library__react": "^10.2.0",
     "@types/tryghost__content-api": "^1.3.8",
-    "@typescript-eslint/eslint-plugin": "^5.6.0",
-    "@typescript-eslint/parser": "^5.6.0",
+    "@typescript-eslint/eslint-plugin": "^5.8.0",
+    "@typescript-eslint/parser": "^5.8.0",
     "autoprefixer": "^10.4.0",
     "critters": "^0.0.15",
     "eslint": "<8.0.0",
@@ -87,8 +87,8 @@
     "postcss": "^8.4.5",
     "postcss-color-mod-function": "^3.0.3",
     "postcss-easy-import": "^3.0.0",
-    "postcss-preset-env": "^7.0.1",
+    "postcss-preset-env": "^7.0.2",
     "prettier": "^2.5.1",
-    "typescript": "^4.5.3"
+    "typescript": "^4.5.4"
   }
 }