Skip to content

Commit d2238ee

Browse files
brc-ddbrc-dd
authoredNov 16, 2023
feat: switch to vite 5 and bump deps (#3200)
BREAKING CHANGE: VitePress now runs on Vite 5. Please refer https://vitejs.dev/guide/migration for breaking changes and migration guide if you're relying on some Vite-specific things.
·
v2.0.0-alpha.4v1.0.0-rc.26
1 parent 2d96200 commit d2238ee

File tree

18 files changed

+634
-926
lines changed

18 files changed

+634
-926
lines changed
 

‎.npmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
shell-emulator=true
2-
resolution-mode=highest
2+
auto-install-peers=false

‎__tests__/e2e/__snapshots__/home.test.ts.snap

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ exports[`render correct content > main content 1`] = `
44
[
55
"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
66
"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
7-
"Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of \\"de Finibus Bonorum et Malorum\\" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, \\"Lorem ipsum dolor sit amet..\\", comes from a line in section 1.10.32.",
8-
"The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from \\"de Finibus Bonorum et Malorum\\" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.",
7+
"Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.",
8+
"The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.",
99
"It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like).",
1010
"There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc.",
1111
]

‎__tests__/e2e/data-loading/data.test.ts

+16-16
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,34 @@ describe('static data file support in vite 3', () => {
77
expect(await page.textContent('pre#basic')).toMatchInlineSnapshot(`
88
"[
99
{
10-
\\"foo\\": true
10+
"foo": true
1111
},
1212
{
13-
\\"bar\\": true
13+
"bar": true
1414
}
1515
]"
1616
`)
1717
expect(await page.textContent('pre#content')).toMatchInlineSnapshot(`
1818
"[
1919
{
20-
\\"src\\": \\"---\\\\ntitle: bar\\\\n---\\\\n\\\\nHello\\\\n\\\\n---\\\\n\\\\nworld\\\\n\\",
21-
\\"html\\": \\"<p>Hello</p>\\\\n<hr>\\\\n<p>world</p>\\\\n\\",
22-
\\"frontmatter\\": {
23-
\\"title\\": \\"bar\\"
20+
"src": "---\\ntitle: bar\\n---\\n\\nHello\\n\\n---\\n\\nworld\\n",
21+
"html": "<p>Hello</p>\\n<hr>\\n<p>world</p>\\n",
22+
"frontmatter": {
23+
"title": "bar"
2424
},
25-
\\"excerpt\\": \\"<p>Hello</p>\\\\n\\",
26-
\\"url\\": \\"/data-loading/content/bar.html\\",
27-
\\"transformed\\": true
25+
"excerpt": "<p>Hello</p>\\n",
26+
"url": "/data-loading/content/bar.html",
27+
"transformed": true
2828
},
2929
{
30-
\\"src\\": \\"---\\\\ntitle: foo\\\\n---\\\\n\\\\nHello\\\\n\\\\n---\\\\n\\\\nworld\\\\n\\",
31-
\\"html\\": \\"<p>Hello</p>\\\\n<hr>\\\\n<p>world</p>\\\\n\\",
32-
\\"frontmatter\\": {
33-
\\"title\\": \\"foo\\"
30+
"src": "---\\ntitle: foo\\n---\\n\\nHello\\n\\n---\\n\\nworld\\n",
31+
"html": "<p>Hello</p>\\n<hr>\\n<p>world</p>\\n",
32+
"frontmatter": {
33+
"title": "foo"
3434
},
35-
\\"excerpt\\": \\"<p>Hello</p>\\\\n\\",
36-
\\"url\\": \\"/data-loading/content/foo.html\\",
37-
\\"transformed\\": true
35+
"excerpt": "<p>Hello</p>\\n",
36+
"url": "/data-loading/content/foo.html",
37+
"transformed": true
3838
}
3939
]"
4040
`)

‎__tests__/init/init.test.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import fs from 'fs-extra'
22
import getPort from 'get-port'
3+
import { nanoid } from 'nanoid'
4+
import path from 'path'
35
import { chromium } from 'playwright-chromium'
46
import { fileURLToPath, URL } from 'url'
57
import { createServer, scaffold, ScaffoldThemeType } from 'vitepress'
68

7-
const root = fileURLToPath(new URL('./.temp', import.meta.url))
9+
const tempDir = fileURLToPath(new URL('./.temp', import.meta.url))
10+
const getTempRoot = () => path.join(tempDir, nanoid())
811

912
const browser = await chromium.launch({
1013
headless: !process.env.DEBUG,
@@ -30,9 +33,11 @@ const variations = themes.flatMap((theme) =>
3033
afterAll(async () => {
3134
await page.close()
3235
await browser.close()
36+
await fs.remove(tempDir)
3337
})
3438

3539
test.each(variations)('init %s', async (_, { theme, useTs }) => {
40+
const root = getTempRoot()
3641
await fs.remove(root)
3742
scaffold({ root, theme, useTs, injectNpmScripts: false })
3843

@@ -62,7 +67,6 @@ test.each(variations)('init %s', async (_, { theme, useTs }) => {
6267

6368
// teardown
6469
} finally {
65-
await fs.remove(root)
6670
await server.close()
6771
}
6872
})

‎__tests__/unit/node/markdown/plugins/snippet.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe('node/markdown/plugins/snippet', () => {
5050
)
5151
).toMatchInlineSnapshot(`
5252
"fn main() {
53-
println!(\\"Hello\\");
53+
println!("Hello");
5454
}"
5555
`)
5656
})

‎package.json

+44-37
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.0.0-rc.25",
44
"description": "Vite & Vue powered static site generator",
55
"type": "module",
6-
"packageManager": "pnpm@8.9.2",
6+
"packageManager": "pnpm@8.10.5",
77
"main": "dist/node/index.js",
88
"types": "types/index.d.ts",
99
"exports": {
@@ -92,17 +92,17 @@
9292
"dependencies": {
9393
"@docsearch/css": "^3.5.2",
9494
"@docsearch/js": "^3.5.2",
95-
"@types/markdown-it": "^13.0.4",
96-
"@vitejs/plugin-vue": "4.3.1",
95+
"@types/markdown-it": "^13.0.6",
96+
"@vitejs/plugin-vue": "^4.5.0",
9797
"@vue/devtools-api": "^6.5.1",
98-
"@vueuse/core": "^10.5.0",
99-
"@vueuse/integrations": "^10.5.0",
98+
"@vueuse/core": "^10.6.1",
99+
"@vueuse/integrations": "^10.6.1",
100100
"focus-trap": "^7.5.4",
101101
"mark.js": "8.11.1",
102-
"minisearch": "^6.1.0",
102+
"minisearch": "^6.2.0",
103103
"shiki": "^0.14.5",
104-
"vite": "^4.5.0",
105-
"vue": "^3.3.6"
104+
"vite": "^5.0.0",
105+
"vue": "^3.3.8"
106106
},
107107
"peerDependencies": {
108108
"markdown-it-mathjax3": "^4.3.2",
@@ -129,23 +129,23 @@
129129
"@rollup/plugin-commonjs": "^25.0.7",
130130
"@rollup/plugin-json": "^6.0.1",
131131
"@rollup/plugin-node-resolve": "^15.2.3",
132-
"@rollup/plugin-replace": "^5.0.4",
133-
"@types/compression": "^1.7.4",
134-
"@types/cross-spawn": "^6.0.4",
135-
"@types/debug": "^4.1.10",
136-
"@types/escape-html": "^1.0.3",
137-
"@types/fs-extra": "^11.0.3",
138-
"@types/lodash.template": "^4.5.2",
139-
"@types/mark.js": "^8.11.10",
140-
"@types/markdown-it-attrs": "^4.1.2",
141-
"@types/markdown-it-container": "^2.0.8",
142-
"@types/markdown-it-emoji": "^2.0.3",
143-
"@types/micromatch": "^4.0.4",
144-
"@types/minimist": "^1.2.4",
145-
"@types/node": "^20.8.7",
146-
"@types/postcss-prefix-selector": "^1.16.2",
147-
"@types/prompts": "^2.4.7",
148-
"@vue/shared": "^3.3.6",
132+
"@rollup/plugin-replace": "^5.0.5",
133+
"@types/compression": "^1.7.5",
134+
"@types/cross-spawn": "^6.0.5",
135+
"@types/debug": "^4.1.12",
136+
"@types/escape-html": "^1.0.4",
137+
"@types/fs-extra": "^11.0.4",
138+
"@types/lodash.template": "^4.5.3",
139+
"@types/mark.js": "^8.11.11",
140+
"@types/markdown-it-attrs": "^4.1.3",
141+
"@types/markdown-it-container": "^2.0.9",
142+
"@types/markdown-it-emoji": "^2.0.4",
143+
"@types/micromatch": "^4.0.5",
144+
"@types/minimist": "^1.2.5",
145+
"@types/node": "^20.9.0",
146+
"@types/postcss-prefix-selector": "^1.16.3",
147+
"@types/prompts": "^2.4.8",
148+
"@vue/shared": "^3.3.8",
149149
"chokidar": "^3.5.3",
150150
"compression": "^1.7.4",
151151
"conventional-changelog-cli": "^4.1.0",
@@ -154,13 +154,13 @@
154154
"esbuild": "^0.19.5",
155155
"escape-html": "^1.0.3",
156156
"execa": "^8.0.1",
157-
"fast-glob": "^3.3.1",
157+
"fast-glob": "^3.3.2",
158158
"fs-extra": "^11.1.1",
159159
"get-port": "^7.0.0",
160160
"gray-matter": "^4.0.3",
161-
"lint-staged": "^15.0.2",
161+
"lint-staged": "^15.1.0",
162162
"lodash.template": "^4.5.0",
163-
"lru-cache": "^10.0.1",
163+
"lru-cache": "^10.0.2",
164164
"markdown-it": "^13.0.2",
165165
"markdown-it-anchor": "^8.6.7",
166166
"markdown-it-attrs": "^4.1.6",
@@ -169,20 +169,20 @@
169169
"markdown-it-mathjax3": "^4.3.2",
170170
"micromatch": "^4.0.5",
171171
"minimist": "^1.2.8",
172-
"nanoid": "^5.0.2",
172+
"nanoid": "^5.0.3",
173173
"npm-run-all": "^4.1.5",
174174
"ora": "^7.0.1",
175175
"path-to-regexp": "^6.2.1",
176176
"picocolors": "^1.0.0",
177-
"pkg-dir": "^7.0.0",
177+
"pkg-dir": "^8.0.0",
178178
"playwright-chromium": "^1.39.0",
179-
"polka": "1.0.0-next.22",
179+
"polka": "1.0.0-next.23",
180180
"postcss-prefix-selector": "^1.16.0",
181-
"prettier": "^3.0.3",
181+
"prettier": "^3.1.0",
182182
"prompts": "^2.4.2",
183-
"punycode": "^2.3.0",
183+
"punycode": "^2.3.1",
184184
"rimraf": "^5.0.5",
185-
"rollup": "^4.1.4",
185+
"rollup": "^4.4.1",
186186
"rollup-plugin-dts": "^6.1.0",
187187
"rollup-plugin-esbuild": "^6.1.0",
188188
"semver": "^7.5.4",
@@ -192,9 +192,9 @@
192192
"sitemap": "^7.1.1",
193193
"supports-color": "^9.4.0",
194194
"typescript": "^5.2.2",
195-
"vitest": "^0.34.6",
196-
"vue-tsc": "^1.8.19",
197-
"wait-on": "^7.0.1"
195+
"vitest": "^1.0.0-beta.4",
196+
"vue-tsc": "^1.8.22",
197+
"wait-on": "^7.2.0"
198198
},
199199
"simple-git-hooks": {
200200
"pre-commit": "pnpm lint-staged"
@@ -207,6 +207,13 @@
207207
"pnpm": {
208208
"overrides": {
209209
"ora>string-width": "^5"
210+
},
211+
"peerDependencyRules": {
212+
"ignoreMissing": [
213+
"@algolia/client-search",
214+
"search-insights",
215+
"postcss"
216+
]
210217
}
211218
}
212219
}

‎pnpm-lock.yaml

+526-780
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/client/app/data.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ export function initData(route: Route): VitePressData {
7474
appearance === 'force-dark'
7575
? ref(true)
7676
: appearance
77-
? useDark({
78-
storageKey: APPEARANCE_KEY,
79-
initialValue: () =>
80-
typeof appearance === 'string' ? appearance : 'auto',
81-
...(typeof appearance === 'object' ? appearance : {})
82-
})
83-
: ref(false)
77+
? useDark({
78+
storageKey: APPEARANCE_KEY,
79+
initialValue: () =>
80+
typeof appearance === 'string' ? appearance : 'auto',
81+
...(typeof appearance === 'object' ? appearance : {})
82+
})
83+
: ref(false)
8484

8585
return {
8686
site,

‎src/client/theme-default/components/VPLocalNav.vue

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ defineEmits<{
1818
1919
const { theme, frontmatter } = useData()
2020
const { hasSidebar } = useSidebar()
21-
// @ts-ignore
2221
const { y } = useWindowScroll()
2322
2423
const headers = shallowRef<MenuItem[]>([])

‎src/client/theme-default/components/VPNavBar.vue

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ defineEmits<{
2020
(e: 'toggle-screen'): void
2121
}>()
2222
23-
// @ts-ignore
2423
const { y } = useWindowScroll()
2524
const { hasSidebar } = useSidebar()
2625
const { frontmatter } = useData()

‎src/client/theme-default/composables/outline.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ export function resolveHeaders(
7373
typeof levelsRange === 'number'
7474
? [levelsRange, levelsRange]
7575
: levelsRange === 'deep'
76-
? [2, 6]
77-
: levelsRange
76+
? [2, 6]
77+
: levelsRange
7878

7979
headers = headers.filter((h) => h.level >= high && h.level <= low)
8080

‎src/client/theme-default/composables/prev-next.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ export function usePrevNext() {
3030
(typeof frontmatter.value.prev === 'string'
3131
? frontmatter.value.prev
3232
: typeof frontmatter.value.prev === 'object'
33-
? frontmatter.value.prev.text
34-
: undefined) ??
33+
? frontmatter.value.prev.text
34+
: undefined) ??
3535
candidates[index - 1]?.docFooterText ??
3636
candidates[index - 1]?.text,
3737
link:
@@ -46,8 +46,8 @@ export function usePrevNext() {
4646
(typeof frontmatter.value.next === 'string'
4747
? frontmatter.value.next
4848
: typeof frontmatter.value.next === 'object'
49-
? frontmatter.value.next.text
50-
: undefined) ??
49+
? frontmatter.value.next.text
50+
: undefined) ??
5151
candidates[index + 1]?.docFooterText ??
5252
candidates[index + 1]?.text,
5353
link:

‎src/client/theme-default/support/sidebar.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ export function hasActiveLink(
104104
return isActive(path, items.link)
105105
? true
106106
: items.items
107-
? hasActiveLink(path, items.items)
108-
: false
107+
? hasActiveLink(path, items.items)
108+
: false
109109
}
110110

111111
function addBase(items: SidebarItem[], _base?: string): SidebarItem[] {

‎src/node/build/bundle.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ export async function bundle(
7777
? 'esbuild'
7878
: false
7979
: typeof options.minify === 'boolean'
80-
? options.minify
81-
: !process.env.DEBUG,
80+
? options.minify
81+
: !process.env.DEBUG,
8282
outDir: ssr ? config.tempDir : config.outDir,
8383
cssCodeSplit: false,
8484
rollupOptions: {

‎src/node/build/render.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,16 @@ export async function renderPage(
7373
config.mpa || (!hasCustom404 && page === '404.md')
7474
? []
7575
: result && appChunk
76-
? [
77-
...new Set([
78-
// resolve imports for index.js + page.md.js and inject script tags
79-
// for them as well so we fetch everything as early as possible
80-
// without having to wait for entry chunks to parse
81-
...resolvePageImports(config, page, result, appChunk),
82-
pageClientJsFileName
83-
])
84-
]
85-
: []
76+
? [
77+
...new Set([
78+
// resolve imports for index.js + page.md.js and inject script tags
79+
// for them as well so we fetch everything as early as possible
80+
// without having to wait for entry chunks to parse
81+
...resolvePageImports(config, page, result, appChunk),
82+
pageClientJsFileName
83+
])
84+
]
85+
: []
8686

8787
let prefetchLinks: string[] = []
8888

‎src/node/config.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ function resolveSiteDataHead(userConfig?: UserConfig): HeadConfig[] {
252252
typeof userConfig?.appearance === 'string'
253253
? userConfig?.appearance
254254
: typeof userConfig?.appearance === 'object'
255-
? userConfig.appearance.initialValue ?? 'auto'
256-
: 'auto'
255+
? userConfig.appearance.initialValue ?? 'auto'
256+
: 'auto'
257257

258258
head.push([
259259
'script',

‎src/node/markdownToVue.ts

+4-47
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ export async function createMarkdownToVueRenderFn(
4343
srcDir: string,
4444
options: MarkdownOptions = {},
4545
pages: string[],
46-
userDefines: Record<string, any> | undefined,
4746
isBuild = false,
4847
base = '/',
4948
includeLastUpdatedData = false,
@@ -57,7 +56,6 @@ export async function createMarkdownToVueRenderFn(
5756
siteConfig?.logger
5857
)
5958
pages = pages.map((p) => slash(p.replace(/\.md$/, '')))
60-
const replaceRegex = genReplaceRegexp(userDefines, isBuild)
6159

6260
return async (
6361
src: string,
@@ -200,14 +198,9 @@ export async function createMarkdownToVueRenderFn(
200198
const vueSrc = [
201199
...injectPageDataCode(
202200
sfcBlocks?.scripts.map((item) => item.content) ?? [],
203-
pageData,
204-
replaceRegex
201+
pageData
205202
),
206-
`<template><div>${replaceConstants(
207-
html,
208-
replaceRegex,
209-
vueTemplateBreaker
210-
)}</div></template>`,
203+
`<template><div>${html}</div></template>`,
211204
...(sfcBlocks?.styles.map((item) => item.content) ?? []),
212205
...(sfcBlocks?.customBlocks.map((item) => item.content) ?? [])
213206
].join('\n')
@@ -233,46 +226,10 @@ const scriptSetupRE = /<\s*script[^>]*\bsetup\b[^>]*/
233226
const scriptClientRE = /<\s*script[^>]*\bclient\b[^>]*/
234227
const defaultExportRE = /((?:^|\n|;)\s*)export(\s*)default/
235228
const namedDefaultExportRE = /((?:^|\n|;)\s*)export(.+)as(\s*)default/
236-
const jsStringBreaker = '\u200b'
237-
const vueTemplateBreaker = '<wbr>'
238-
239-
function genReplaceRegexp(
240-
userDefines: Record<string, any> = {},
241-
isBuild: boolean
242-
): RegExp {
243-
// `process.env` need to be handled in both dev and build
244-
// @see https://github.com/vitejs/vite/blob/cad27ee8c00bbd5aeeb2be9bfb3eb164c1b77885/packages/vite/src/node/plugins/clientInjections.ts#L57-L64
245-
const replacements = ['process.env']
246-
if (isBuild) {
247-
replacements.push('import.meta', ...Object.keys(userDefines))
248-
}
249-
return new RegExp(
250-
`\\b(${replacements
251-
.map((key) => key.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&'))
252-
.join('|')})`,
253-
'g'
254-
)
255-
}
256229

257-
/**
258-
* To avoid env variables being replaced by vite:
259-
* - insert `'\u200b'` char into those strings inside js string (page data)
260-
* - insert `<wbr>` tag into those strings inside html string (vue template)
261-
*
262-
* @see https://vitejs.dev/guide/env-and-mode.html#production-replacement
263-
*/
264-
function replaceConstants(str: string, replaceRegex: RegExp, breaker: string) {
265-
return str.replace(replaceRegex, (_) => `${_[0]}${breaker}${_.slice(1)}`)
266-
}
267-
268-
function injectPageDataCode(
269-
tags: string[],
270-
data: PageData,
271-
replaceRegex: RegExp
272-
) {
273-
const dataJson = JSON.stringify(data)
230+
function injectPageDataCode(tags: string[], data: PageData) {
274231
const code = `\nexport const __pageData = JSON.parse(${JSON.stringify(
275-
replaceConstants(dataJson, replaceRegex, jsStringBreaker)
232+
JSON.stringify(data)
276233
)})`
277234

278235
const existingScriptIndex = tags.findIndex((tag) => {

‎src/node/plugin.ts

+5-9
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ export async function createVitePressPlugin(
133133
srcDir,
134134
markdown,
135135
pages,
136-
config.define,
137136
config.command === 'build',
138137
config.base,
139138
lastUpdated,
@@ -328,14 +327,11 @@ export async function createVitePressPlugin(
328327

329328
generateBundle(_options, bundle) {
330329
if (ssr) {
331-
// @ts-ignore will be removed in vite 5
332-
if (config.ssr?.format !== 'cjs') {
333-
this.emitFile({
334-
type: 'asset',
335-
fileName: 'package.json',
336-
source: '{ "private": true, "type": "module" }'
337-
})
338-
}
330+
this.emitFile({
331+
type: 'asset',
332+
fileName: 'package.json',
333+
source: '{ "private": true, "type": "module" }'
334+
})
339335
} else {
340336
// client build:
341337
// for each .md entry chunk, adjust its name to its correct path.

0 commit comments

Comments
 (0)
Please sign in to comment.