Merge branch 'main' into new-router

.eslintrc.cjs

@@ -15,7 +15,7 @@ module.exports = {
       },
     },
     {
-      files: ['**/e2e/**/*.cy.ts'],
+      files: ['**/e2e/**/*.cy.ts', '**/e2e/cypress/**/*.ts'],
       extends: 'plugin:cypress/recommended',
     },
     {

.github/workflows/e2e.yml

@@ -16,6 +16,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         node: ['18', '20']
+        base: ['/', '/e2e/']
         bundler: ['vite', 'webpack']
 
     runs-on: ${{ matrix.os }}
@@ -61,12 +62,14 @@ jobs:
         working-directory: ./e2e
         run: pnpm e2e:ci:dev
         env:
+          E2E_BASE: ${{ matrix.base }}
           E2E_BUNDLER: ${{ matrix.bundler }}
 
       - name: E2E build
         working-directory: ./e2e
         run: pnpm e2e:ci:build
         env:
+          E2E_BASE: ${{ matrix.base }}
           E2E_BUNDLER: ${{ matrix.bundler }}
 
   e2e-result:

.gitignore

@@ -12,6 +12,9 @@ dist/
 # Test coverage files
 coverage/
 
+# E2E temp files
+e2e/cypress/screenshots/
+
 # Node modules
 node_modules/
 

e2e/cypress.config.ts

@@ -4,6 +4,8 @@ export default defineConfig({
   e2e: {
     baseUrl: 'http://localhost:8080',
     specPattern: 'tests/**/*.cy.ts',
-    supportFile: false,
+  },
+  env: {
+    E2E_BASE: process.env.E2E_BASE ?? '/',
   },
 })

e2e/cypress/support/commands.ts

@@ -0,0 +1,8 @@
+const URL_PREFIX = Cypress.env('E2E_BASE').replace(/\/$/, '')
+
+// override the default cy.visit command to prepend base
+// @ts-expect-error: could not type this method correctly
+Cypress.Commands.overwrite('visit', (originalFn, url, options) =>
+  // @ts-expect-error: could not type this method correctly
+  originalFn(`${URL_PREFIX}${url}`, options),
+)

e2e/cypress/support/e2e.ts

@@ -0,0 +1 @@
+import './commands'

e2e/docs/.vuepress/config.ts

@@ -2,10 +2,15 @@ import process from 'node:process'
 import { viteBundler } from '@vuepress/bundler-vite'
 import { webpackBundler } from '@vuepress/bundler-webpack'
 import { defineUserConfig } from '@vuepress/cli'
+import { path } from '@vuepress/utils'
 import { e2eTheme } from './theme/node/e2eTheme.js'
 
+const E2E_BASE = (process.env.E2E_BASE ?? '/') as '/' | `/${string}/`
+
 export default defineUserConfig({
-  base: '/',
+  base: E2E_BASE,
+
+  dest: path.join(__dirname, 'dist', E2E_BASE),
 
   head: [
     ['meta', { name: 'foo', content: 'foo' }],

e2e/package.json

@@ -25,11 +25,12 @@
     "@vuepress/utils": "workspace:*",
     "sass": "^1.69.5",
     "sass-loader": "^13.3.2",
-    "vue": "^3.3.11"
+    "vue": "^3.3.13"
   },
   "devDependencies": {
     "anywhere": "^1.6.0",
     "cypress": "^13.6.1",
+    "process": "^0.11.10",
     "start-server-and-test": "^2.0.3"
   }
 }

e2e/tests/markdown/links.cy.ts

@@ -1,3 +1,5 @@
+const E2E_BASE = Cypress.env('E2E_BASE')
+
 describe('markdown > links', () => {
   it('should render links and navigate between pages correctly', () => {
     cy.visit('/markdown/links/foo.html')
@@ -9,7 +11,7 @@ describe('markdown > links', () => {
       .click()
 
     cy.location().should((location) => {
-      expect(location.pathname).to.eq('/markdown/links/bar.html')
+      expect(location.pathname).to.eq(`${E2E_BASE}markdown/links/bar.html`)
     })
 
     cy.get('.e2e-theme-content ul li a')
@@ -19,7 +21,7 @@ describe('markdown > links', () => {
       .click()
 
     cy.location().should((location) => {
-      expect(location.pathname).to.eq('/markdown/links/baz.html')
+      expect(location.pathname).to.eq(`${E2E_BASE}markdown/links/baz.html`)
     })
 
     cy.get('.e2e-theme-content ul li a')
@@ -29,7 +31,7 @@ describe('markdown > links', () => {
       .click()
 
     cy.location().should((location) => {
-      expect(location.pathname).to.eq('/markdown/links/foo.html')
+      expect(location.pathname).to.eq(`${E2E_BASE}markdown/links/foo.html`)
     })
   })
 })

package.json

@@ -27,12 +27,12 @@
   "devDependencies": {
     "@commitlint/cli": "^18.4.3",
     "@commitlint/config-conventional": "^18.4.3",
-    "@types/node": "^20.10.4",
+    "@types/node": "^20.10.5",
     "@types/webpack-env": "^1.18.4",
-    "@vitest/coverage-istanbul": "^1.0.4",
+    "@vitest/coverage-istanbul": "^1.1.0",
     "bumpp": "^9.2.1",
     "conventional-changelog-cli": "^4.1.0",
-    "eslint": "^8.55.0",
+    "eslint": "^8.56.0",
     "eslint-config-vuepress": "^4.8.0",
     "eslint-config-vuepress-typescript": "^4.8.0",
     "eslint-plugin-cypress": "^2.15.1",
@@ -45,10 +45,10 @@
     "tsconfig-vuepress": "^4.5.0",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vite": "~5.0.7",
-    "vitest": "^1.0.4"
+    "vite": "~5.0.10",
+    "vitest": "^1.1.0"
   },
-  "packageManager": "[email protected].0",
+  "packageManager": "[email protected].1",
   "engines": {
     "node": ">=18.16.0"
   }

packages/bundler-vite/package.json

@@ -42,9 +42,9 @@
     "connect-history-api-fallback": "^2.0.0",
     "postcss": "^8.4.32",
     "postcss-load-config": "^5.0.2",
-    "rollup": "^4.7.0",
-    "vite": "~5.0.7",
-    "vue": "^3.3.11",
+    "rollup": "^4.9.1",
+    "vite": "~5.0.10",
+    "vue": "^3.3.13",
     "vue-router": "^4.2.5"
   },
   "publishConfig": {

packages/bundler-webpack/package.json

@@ -48,13 +48,13 @@
     "css-loader": "^6.8.1",
     "esbuild-loader": "~4.0.2",
     "express": "^4.18.2",
-    "html-webpack-plugin": "^5.5.4",
+    "html-webpack-plugin": "^5.6.0",
     "mini-css-extract-plugin": "^2.7.6",
     "postcss": "^8.4.32",
     "postcss-csso": "^6.0.1",
     "postcss-loader": "^7.3.3",
     "style-loader": "^3.3.3",
-    "vue": "^3.3.11",
+    "vue": "^3.3.13",
     "vue-loader": "^17.3.1",
     "vue-router": "^4.2.5",
     "webpack": "^5.89.0",

packages/cli/package.json

@@ -42,7 +42,7 @@
     "cac": "^6.7.14",
     "chokidar": "^3.5.3",
     "envinfo": "^7.11.0",
-    "esbuild": "~0.19.9"
+    "esbuild": "~0.19.10"
   },
   "devDependencies": {
     "@types/envinfo": "^7.8.3"

packages/client/package.json

@@ -40,7 +40,7 @@
     "@vue/devtools-api": "^6.5.1",
     "@vuepress/shared": "workspace:*",
     "@vueuse/core": "^10.7.0",
-    "vue": "^3.3.11",
+    "vue": "^3.3.13",
     "vue-router": "^4.2.5"
   },
   "publishConfig": {

packages/core/package.json

@@ -35,7 +35,7 @@
     "@vuepress/markdown": "workspace:*",
     "@vuepress/shared": "workspace:*",
     "@vuepress/utils": "workspace:*",
-    "vue": "^3.3.11"
+    "vue": "^3.3.13"
   },
   "publishConfig": {
     "access": "public"

packages/shared/package.json

@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@mdit-vue/types": "^2.0.0",
-    "@vue/shared": "^3.3.11"
+    "@vue/shared": "^3.3.13"
   },
   "publishConfig": {
     "access": "public"

packages/vuepress-vite/package.json

@@ -42,7 +42,7 @@
     "@vuepress/bundler-vite": "workspace:*",
     "@vuepress/cli": "workspace:*",
     "@vuepress/core": "workspace:*",
-    "vue": "^3.3.11"
+    "vue": "^3.3.13"
   },
   "devDependencies": {
     "@vuepress/client": "workspace:*"

packages/vuepress-webpack/package.json

@@ -43,7 +43,7 @@
     "@vuepress/cli": "workspace:*",
     "@vuepress/core": "workspace:*",
     "sass-loader": "^13.3.2",
-    "vue": "^3.3.11"
+    "vue": "^3.3.13"
   },
   "peerDependencies": {
     "vue": "^3.3.4"