Merge branch 'resolve-route' into route-option

Author: Mister-Hope

e2e/docs/.vuepress/config.ts

@@ -3,6 +3,7 @@ import { viteBundler } from '@vuepress/bundler-vite'
 import { webpackBundler } from '@vuepress/bundler-webpack'
 import { defineUserConfig } from 'vuepress'
 import { path } from 'vuepress/utils'
+import { fooPlugin } from './plugins/foo/fooPlugin.js'
 import { e2eTheme } from './theme/node/e2eTheme.js'
 
 const E2E_BASE = (process.env.E2E_BASE ?? '/') as '/' | `/${string}/`
@@ -80,4 +81,6 @@ export default defineUserConfig({
       }
     }
   },
+
+  plugins: [fooPlugin],
 })

e2e/docs/.vuepress/plugins/foo/fooPlugin.ts

@@ -0,0 +1,11 @@
+import { getDirname, path } from 'vuepress/utils'
+
+const __dirname = getDirname(import.meta.url)
+
+export const fooPlugin = {
+  name: 'test-plugin',
+  clientConfigFile: path.resolve(
+    __dirname,
+    './nonDefaultExportClientConfig.js',
+  ),
+}

e2e/docs/.vuepress/plugins/foo/nonDefaultExportClientConfig.js

@@ -0,0 +1,2 @@
+// test non-default-export clientConfig
+import './test.css'

e2e/docs/.vuepress/plugins/foo/test.css

@@ -0,0 +1,3 @@
+#non-default-export {
+  font-size: 123px;
+}

e2e/docs/.vuepress/theme/client/layouts/NotFound.vue

@@ -1,3 +1,4 @@
 <template>
   <div class="e2e-theme-not-found">404 Not Found</div>
+  <div class="e2e-theme-not-found-content"><Content /></div>
 </template>

e2e/docs/404.md

@@ -2,3 +2,5 @@
 routeMeta:
   foo: bar
 ---
+
+## NotFound H2

e2e/docs/README.md

@@ -1 +1,3 @@
 foo
+
+## Home H2

e2e/docs/client-config/non-default-export.md

@@ -0,0 +1 @@
+# non-default-export

e2e/docs/router/navigate-by-link.md

@@ -0,0 +1,20 @@
+## Markdown Links with html
+
+- [Home with query](/?home=true)
+- [Home with query and hash](/?home=true#home)
+- [404 with hash](/404.html#404)
+- [404 with hash and query](/404.html#404?notFound=true)
+
+## Markdown Links with md
+
+- [Home with query](/README.md?home=true)
+- [Home with query and hash](/README.md?home=true#home)
+- [404 with hash](/404.md#404)
+- [404 with hash and query](/404.md#404?notFound=true)
+
+## HTML Links
+
+<a href="/?home=true" class="home-with-query">Home</a>
+<a href="/?home=true#home" class="home-with-query-and-hash">Home</a>
+<a href="/404.html#404" class="not-found-with-hash">404</a>
+<a href="/404.html#404?notFound=true" class="not-found-with-hash-and-query">404</a>

e2e/docs/router/navigate-by-router.md

@@ -0,0 +1,26 @@
+<button id="home-with-query" @click="goHomeWithQuery">Home</button>
+<button id="home-with-query-and-hash" @click="goHomeWithQueryAndHash">Home</button>
+<button id="not-found-with-hash" @click="go404WithHash">404</button>
+<button id="not-found-with-hash-and-query" @click="go404WithHashAndQuery">404</button>
+
+<script setup lang="ts">
+import { useRouter } from 'vuepress/client';
+
+const router = useRouter();
+
+const goHomeWithQuery = () => {
+  router.push('/?home=true');
+}
+
+const goHomeWithQueryAndHash = () => {
+  router.push('/?home=true#home');
+}
+
+const go404WithHash = () => {
+  router.push('/404.html#404');
+}
+
+const go404WithHashAndQuery = () => {
+  router.push('/404.html#404?notFound=true');
+}
+</script>