Merge pull request #123 from chengpeiquan/develop

chore: update pages dep and fix the page route without optional param

package.json

@@ -59,7 +59,7 @@
     "vite-plugin-components": "^0.8.2",
     "vite-plugin-icons": "^0.5.0",
     "vite-plugin-md": "^0.6.1",
-    "vite-plugin-pages": "^0.7.0",
+    "vite-plugin-pages": "^0.11.1",
     "vite-plugin-purge-icons": "^0.7.0",
     "vite-plugin-pwa": "^0.5.6",
     "vite-plugin-windicss": "^0.15.10",

src/router/categories.ts

@@ -37,9 +37,7 @@ const getCategories = (lang: string): void => {
       props: true,
       component: () => import('/src/views/article/[page].vue'),
       meta: {
-        frontmatter: {
-
-        }
+        frontmatter: {}
       }
     }
   });

src/router/index.ts

@@ -9,6 +9,10 @@ export const routes = [
     ...autoRoutes,
     ...categoryRoutes
   ].map( (route) => {
+    if (route.name.endsWith('article-page') && !route.path.endsWith('?')) {
+      route.path += '?';
+    }
+
     return {
       ...route,
       alias: route.path.endsWith('/')

yarn.lock

@@ -1309,7 +1309,7 @@
     "@vue/compiler-core" "3.0.11"
     "@vue/shared" "3.0.11"
 
-"@vue/compiler-sfc@^3.0.11", "@vue/compiler-sfc@^3.0.7":
+"@vue/compiler-sfc@^3.0.11":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.11.tgz#cd8ca2154b88967b521f5ad3b10f5f8b6b665679"
   integrity sha512-7fNiZuCecRleiyVGUWNa6pn8fB2fnuJU+3AGjbjl7r1P5wBivfl02H4pG+2aJP5gh2u+0wXov1W38tfWOphsXw==
@@ -2117,11 +2117,6 @@ diacritics@^1.3.0:
   resolved "https://registry.yarnpkg.com/diacritics/-/diacritics-1.3.0.tgz#3efa87323ebb863e6696cebb0082d48ff3d6f7a1"
   integrity sha1-PvqHMj67hj5mls67AILUj/PW96E=
 
-directory-tree@^2.2.7:
-  version "2.2.9"
-  resolved "https://registry.yarnpkg.com/directory-tree/-/directory-tree-2.2.9.tgz#702c193f8b19f1076b585bcf8a2db3b49b11a11c"
-  integrity sha512-BOHxPNvP+XWijPkzoSBvr164IiNxRzvyAiWelbJsU/wG5OYXByer0+Aqo74G1qU+nRKC4yU/czmkmunkWdPPvQ==
-
 domexception@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
@@ -2461,11 +2456,6 @@ glob-parent@^5.1.0, glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
-glob-to-regexp@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
-  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
-
 [email protected], glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
@@ -4142,21 +4132,18 @@ vite-plugin-md@^0.6.1:
     gray-matter "^4.0.2"
     markdown-it "^12.0.4"
 
-vite-plugin-pages@^0.7.0:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/vite-plugin-pages/-/vite-plugin-pages-0.7.2.tgz#81021d3b3ee9d7ee7338504cba508062fe14d16d"
-  integrity sha512-I3e3o+j2edGuUVocnizBxsKTBmCIKiK3sgqo8gfNJ5BHN7JjoRcfTk9wP3pavGJ/zczUbP5ULnXkWfgsJfw/aQ==
+vite-plugin-pages@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/vite-plugin-pages/-/vite-plugin-pages-0.11.1.tgz#ea35ece8150289a3c09f949c5b332b48c1f17c7c"
+  integrity sha512-onskoOYXq7vSHmKteuwBekSXFcw8WM5jZeK7Hmt7xfRyU6ZEF7+BkQ0HXmMpl4jynVfeRzi2K9l57CcFV60tyw==
   dependencies:
-    "@vue/compiler-sfc" "^3.0.7"
-    chalk "^4.1.0"
+    "@vue/compiler-sfc" "^3.0.11"
+    chalk "^4.1.1"
     debug "^4.3.2"
     deep-equal "^2.0.5"
-    directory-tree "^2.2.7"
     fast-glob "^3.2.5"
-    glob-to-regexp "^0.4.1"
     json5 "^2.2.0"
-    vue-router "^4.0.5"
-    yaml "^2.0.0-4"
+    yaml "^2.0.0-5"
 
 vite-plugin-purge-icons@^0.7.0:
   version "0.7.0"
@@ -4585,7 +4572,7 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^2.0.0-4:
+yaml@^2.0.0-5:
   version "2.0.0-5"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.0.0-5.tgz#00906046dc119427b2b4f7cf9041d34682d1480b"
   integrity sha512-qH5L5eqW8cyv/N1U6rkK/O0M7kOK3BSo48d05Ptm03ITNsVFwg6TQ47wR72Db/ULWH5RfNJv+CqnG17Pyn8eqQ==