Merge pull request #156 from rollup/sync-5d91210d

docs(en): merge rollup/master into rollup-docs-cn/master @ 5d91210

Author: waynzh

CHANGELOG.md

@@ -1,5 +1,17 @@
 # rollup changelog
 
+## 4.24.0
+
+_2024-10-02_
+
+### Features
+
+- Support preserving and transpiling JSX syntax (#5668)
+
+### Pull Requests
+
+- [#5668](https://github.com/rollup/rollup/pull/5668): Introduce JSX support (@lukastaegert, @Martin-Idel, @felixhuttmann, @AlexDroll, @tiptr)
+
 ## 4.23.0
 
 _2024-10-01_

browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/browser",
-  "version": "4.23.0",
+  "version": "4.24.0",
   "description": "Next-generation ES module bundler browser build",
   "main": "dist/rollup.browser.js",
   "module": "dist/es/rollup.browser.js",

browser/src/path.ts

@@ -85,3 +85,7 @@ export function resolve(...paths: string[]): string {
 
 	return resolvedParts.join('/');
 }
+
+// Used for running the browser build locally in Vite
+export const win32 = {};
+export const posix = {};

browser/src/wasm.ts

@@ -5,7 +5,8 @@ import { parse } from '../../wasm/bindings_wasm.js';
 export async function parseAsync(
 	code: string,
 	allowReturnOutsideFunction: boolean,
+	jsx: boolean,
 	_signal?: AbortSignal | undefined | null
 ) {
-	return parse(code, allowReturnOutsideFunction);
+	return parse(code, allowReturnOutsideFunction, jsx);
 }

docs/.vitepress/config.ts

@@ -7,6 +7,7 @@ import replaceBrowserModules from '../../build-plugins/replace-browser-modules';
 import '../declarations.d';
 import { examplesPlugin } from './create-examples';
 import { renderMermaidGraphsPlugin } from './mermaid';
+import { replacePathPicomatch } from './replace-path-picomatch';
 import { transposeTables } from './transpose-tables';
 import { buildEnd, callback, transformPageData } from './verify-anchors';
 
@@ -157,7 +158,10 @@ export default defineConfig({
 	title: 'Rollup 中文文档',
 	transformPageData,
 	vite: {
+		optimizeDeps: { exclude: ['@rollup/pluginutils'] },
 		plugins: [
+			replacePathPicomatch(),
+			replaceBrowserModules(),
 			renderMermaidGraphsPlugin(),
 			replaceBrowserModules(),
 			{

docs/.vitepress/replace-path-picomatch.ts

@@ -0,0 +1,22 @@
+import path from 'path';
+import type { Plugin } from 'vite';
+
+export function replacePathPicomatch(): Plugin {
+	return {
+		enforce: 'pre',
+		load(id) {
+			if (id === 'picomatch') {
+				return 'export default {}';
+			}
+		},
+		name: 'replace-picomatch',
+		resolveId(source) {
+			if (source === 'picomatch') {
+				return { id: 'picomatch' };
+			}
+			if (source === 'path') {
+				return path.resolve(__dirname, '../../browser/src/path.ts');
+			}
+		}
+	};
+}