vite-plugin-rnw 0.0.8-0 → 0.0.8

package/dist/index.js

@@ -3,13 +3,11 @@ import { createFilter } from "vite";
 import { esbuildFlowPlugin, flowPlugin } from "@bunchtogether/vite-plugin-flow";
 import commonjs from "vite-plugin-commonjs";
 import { makeIdFiltersToMatchWithQuery } from "@rolldown/pluginutils";
+import MagicString from "magic-string";
 import react from "@vitejs/plugin-react";
 
 //#region src/transforms.ts
 /**
-* Code transformation utilities for fixing React Native package compatibility issues
-*/
-/**
 * Analyzes require statements in code and maps them to module imports.
 * Handles patterns like: varName = require('path').prop or require('path').default
 */
@@ -30,11 +28,6 @@ function analyzeRequireStatements(originalCode, exportedVars) {
 * Removes try/catch blocks that contain require statements and export let declarations.
 * This cleans up the problematic CommonJS patterns.
 */
-function removeTryCatchRequireBlocks(code) {
-	let transformed = code.replace(/try\s*\{[^{}]*?require\([^)]+\)[^{}]*?\}\s*catch[^{}]*?\{[^{}]*?\}/gs, "");
-	transformed = transformed.replace(/export let \w+;/g, "");
-	return transformed;
-}
 /**
 * Generates direct export statements from the import map.
 * Creates modern ESM exports like: export { default as varName } from 'module';
@@ -51,19 +44,56 @@ function generateDirectExports(importMap) {
 /**
 * Transforms React Native Reanimated webUtils files to fix problematic
 * export let + try/catch + require patterns by converting them to proper ESM.
-* 
+*
 * This transformation handles the incompatible module patterns in React Native Reanimated
 * that cause build errors in Vite due to mixing CommonJS require() with ESM exports.
 */
-function transformReanimatedWebUtils(toTransform, originalCode, id, isProduction) {
-	if (!isProduction || !id.includes("node_modules/react-native-reanimated") || !id.includes("ReanimatedModule/js-reanimated/webUtils") || !originalCode.includes("export let") || !originalCode.includes("try") || !originalCode.includes("require")) return toTransform;
-	const exportedVars = Array.from(originalCode.matchAll(/export let (\w+);/g)).map((match) => match[1]);
-	if (exportedVars.length === 0) return toTransform;
-	const importMap = analyzeRequireStatements(originalCode, exportedVars);
-	toTransform = removeTryCatchRequireBlocks(toTransform);
+function transformReanimatedWebUtilsWithMap(code, id, isProduction, opts) {
+	if (!isProduction || !id.includes("node_modules/react-native-reanimated") || !id.includes("ReanimatedModule/js-reanimated/webUtils") || !code.includes("export let") || !code.includes("try") || !code.includes("require")) return {
+		code,
+		map: null,
+		changed: false
+	};
+	const exportedVars = Array.from(code.matchAll(/export let (\w+);/g)).map((match) => match[1]);
+	if (exportedVars.length === 0) return {
+		code,
+		map: null,
+		changed: false
+	};
+	const importMap = analyzeRequireStatements(code, exportedVars);
+	const ms = new MagicString(code);
+	let changed = false;
+	for (const m of code.matchAll(/try\s*\{[^{}]*?require\([^)]+\)[^{}]*?\}\s*catch[^{}]*?\{[^{}]*?\}/gs)) {
+		const start = m.index;
+		const end = start + m[0].length;
+		ms.remove(start, end);
+		changed = true;
+	}
+	for (const m of code.matchAll(/export let \w+;/g)) {
+		const start = m.index;
+		const end = start + m[0].length;
+		ms.remove(start, end);
+		changed = true;
+	}
 	const exports = generateDirectExports(importMap);
-	if (exports) toTransform = `${toTransform}\n${exports}`;
-	return toTransform;
+	if (exports) {
+		ms.append(`\n${exports}`);
+		changed = true;
+	}
+	if (!changed) return {
+		code,
+		map: null,
+		changed: false
+	};
+	return {
+		code: ms.toString(),
+		map: ms.generateMap({
+			source: (opts === null || opts === void 0 ? void 0 : opts.source) ?? id.split("?")[0],
+			includeContent: true,
+			hires: true
+		}),
+		changed: true
+	};
 }
 
 //#endregion
@@ -141,9 +171,12 @@ function rnw(opts = {}) {
 			async handler(code, id, options) {
 				const [filepath] = id.split("?");
 				if (!filter(filepath)) return;
-				let toTransform = code;
-				toTransform = transformReanimatedWebUtils(toTransform, code, id, isProduction);
-				return { code: toTransform };
+				const transformResult = transformReanimatedWebUtilsWithMap(code, id, isProduction, { source: filepath });
+				if (!transformResult.changed) return null;
+				return {
+					code: transformResult.code,
+					map: transformResult.map
+				};
 			}
 		}
 	};

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.8-0",
+  "version": "0.0.8",
   "name": "vite-plugin-rnw",
   "type": "module",
   "author": "Daniel Williams",
@@ -48,6 +48,7 @@
     "@bunchtogether/vite-plugin-flow": "^1.0.2",
     "@rolldown/pluginutils": "1.0.0-beta.46",
     "@vitejs/plugin-react": "^5.1.0",
+    "magic-string": "^0.30.11",
     "vite-plugin-commonjs": "^0.10.4"
   }
 }