Skip to content

Commit bbca706

Browse files
authored
Merge branch 'main' into meteorlxy-markdown-to-vue
2 parents a3032c5 + a09e92d commit bbca706

File tree

17 files changed

+62
-32
lines changed

17 files changed

+62
-32
lines changed

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
# [2.0.0-rc.21](https://github.com/vuepress/core/compare/v2.0.0-rc.20...v2.0.0-rc.21) (2025-04-12)
2+
3+
4+
### Bug Fixes
5+
6+
* **bundler-webpack:** allow UPPERCASE file extension ([#1642](https://github.com/vuepress/core/issues/1642)) ([f674742](https://github.com/vuepress/core/commit/f6747421cb36cc668f54101332a9a03b49f7c6b2))
7+
8+
9+
### Code Refactoring
10+
11+
* **core:** remove headers field from page data ([#1613](https://github.com/vuepress/core/issues/1613)) ([0a9d26d](https://github.com/vuepress/core/commit/0a9d26d0db042253f1bb67287afe911f89182737))
12+
13+
14+
### BREAKING CHANGES
15+
16+
* **core:** the `headers` field has been removed from page data, but it's still available on page object
17+
18+
19+
120
# [2.0.0-rc.20](https://github.com/vuepress/core/compare/v2.0.0-rc.19...v2.0.0-rc.20) (2025-02-23)
221

322

e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vuepress/e2e",
3-
"version": "2.0.0-rc.20",
3+
"version": "2.0.0-rc.21",
44
"private": true,
55
"type": "module",
66
"scripts": {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vuepress/monorepo",
3-
"version": "2.0.0-rc.20",
3+
"version": "2.0.0-rc.21",
44
"private": true,
55
"type": "module",
66
"scripts": {

packages/bundler-vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vuepress/bundler-vite",
3-
"version": "2.0.0-rc.20",
3+
"version": "2.0.0-rc.21",
44
"description": "Bundler vite package of VuePress",
55
"keywords": [
66
"vuepress-bundler",

packages/bundler-webpack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vuepress/bundler-webpack",
3-
"version": "2.0.0-rc.20",
3+
"version": "2.0.0-rc.21",
44
"description": "Bundler webpack package of VuePress",
55
"keywords": [
66
"vuepress-bundler",

packages/bundler-webpack/src/config/handleModuleJs.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createRequire } from 'node:module'
22
import type Config from 'webpack-5-chain'
33
import type { WebpackBundlerOptions } from '../types.js'
4-
import { resolveEsbuildJsxOptions } from './resolveEsbuildJsxOptions.js'
4+
import { resolveEsbuildLoaderOptions } from './resolveEsbuildLoaderOptions.js'
55

66
const require = createRequire(import.meta.url)
77

@@ -51,9 +51,6 @@ export const handleModuleJs = ({
5151
// use esbuild-loader
5252
.use('esbuild-loader')
5353
.loader(require.resolve('esbuild-loader'))
54-
.options({
55-
target: 'es2015',
56-
...resolveEsbuildJsxOptions(),
57-
})
54+
.options(resolveEsbuildLoaderOptions())
5855
.end()
5956
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { createRequire } from 'node:module'
22
import type Config from 'webpack-5-chain'
3-
import { resolveEsbuildJsxOptions } from './resolveEsbuildJsxOptions.js'
3+
import { resolveEsbuildLoaderOptions } from './resolveEsbuildLoaderOptions.js'
44

55
const require = createRequire(import.meta.url)
66

@@ -14,10 +14,10 @@ export const handleModuleTs = ({ config }: { config: Config }): void => {
1414
// use esbuild-loader
1515
.use('esbuild-loader')
1616
.loader(require.resolve('esbuild-loader'))
17-
.options({
18-
target: 'es2018',
19-
loader: 'tsx',
20-
...resolveEsbuildJsxOptions(),
21-
})
17+
.options(
18+
resolveEsbuildLoaderOptions({
19+
loader: 'tsx',
20+
}),
21+
)
2222
.end()
2323
}

packages/bundler-webpack/src/config/resolveEsbuildJsxOptions.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import type { EsbuildPluginOptions } from 'esbuild-loader'
2+
3+
export const resolveEsbuildLoaderOptions = (
4+
options: EsbuildPluginOptions = {},
5+
): EsbuildPluginOptions => ({
6+
/**
7+
* keep consistent with vite
8+
*
9+
* @see https://vite.dev/config/build-options.html#build-target
10+
*/
11+
target: ['es2020', 'edge88', 'firefox78', 'chrome87', 'safari14'],
12+
13+
/**
14+
* jsx options
15+
*/
16+
jsxFactory: 'jsx',
17+
jsxFragment: 'Fragment',
18+
19+
/**
20+
* overrides
21+
*/
22+
...options,
23+
})

packages/bundlerutils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vuepress/bundlerutils",
3-
"version": "2.0.0-rc.20",
3+
"version": "2.0.0-rc.21",
44
"description": "Utils package of VuePress bundler",
55
"keywords": [
66
"bundler",

packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vuepress/cli",
3-
"version": "2.0.0-rc.20",
3+
"version": "2.0.0-rc.21",
44
"description": "CLI package of VuePress",
55
"keywords": [
66
"vuepress",

packages/client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vuepress/client",
3-
"version": "2.0.0-rc.20",
3+
"version": "2.0.0-rc.21",
44
"description": "Client package of VuePress",
55
"keywords": [
66
"vuepress",

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vuepress/core",
3-
"version": "2.0.0-rc.20",
3+
"version": "2.0.0-rc.21",
44
"description": "Core package of VuePress",
55
"keywords": [
66
"vuepress",

packages/markdown/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vuepress/markdown",
3-
"version": "2.0.0-rc.20",
3+
"version": "2.0.0-rc.21",
44
"description": "Markdown package of VuePress",
55
"keywords": [
66
"vuepress",

packages/shared/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vuepress/shared",
3-
"version": "2.0.0-rc.20",
3+
"version": "2.0.0-rc.21",
44
"description": "Utils that shared between VuePress node and client",
55
"keywords": [
66
"vuepress",

packages/utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vuepress/utils",
3-
"version": "2.0.0-rc.20",
3+
"version": "2.0.0-rc.21",
44
"description": "Utils package of VuePress",
55
"keywords": [
66
"vuepress",

packages/vuepress/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vuepress",
3-
"version": "2.0.0-rc.20",
3+
"version": "2.0.0-rc.21",
44
"description": "Vue-powered Static Site Generator",
55
"keywords": [
66
"documentation",

0 commit comments

Comments
 (0)