@weapp-tailwindcss/react-native 0.2.11 → 0.2.13

package/dist/metro-transformer.cjs

@@ -4,9 +4,9 @@ const require_babel = require("./babel.cjs");
 const require_metro = require("./metro.cjs");
 let node_fs = require("node:fs");
 node_fs = require_rolldown_runtime.__toESM(node_fs, 1);
+let node_module = require("node:module");
 let node_process = require("node:process");
 node_process = require_rolldown_runtime.__toESM(node_process, 1);
-let node_module = require("node:module");
 let _babel_core = require("@babel/core");
 //#region src/metro-transformer.ts
 const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);

package/dist/metro.cjs

@@ -4,6 +4,7 @@ const require_compiler = require("./compiler.cjs");
 let node_crypto = require("node:crypto");
 let node_fs = require("node:fs");
 node_fs = require_rolldown_runtime.__toESM(node_fs, 1);
+let node_module = require("node:module");
 let node_os = require("node:os");
 node_os = require_rolldown_runtime.__toESM(node_os, 1);
 let node_path = require("node:path");
@@ -14,14 +15,31 @@ let node_url = require("node:url");
 //#region src/metro.ts
 const VIRTUAL_MANIFEST_MODULE = "@weapp-tailwindcss/react-native/virtual";
 const registry = /* @__PURE__ */ new Map();
-const appRootSingletonModules = /* @__PURE__ */ new Set(["react", "react-native"]);
+const appRootSingletonModules = /* @__PURE__ */ new Set(["react"]);
 let nextId = 0;
 function packageNameFromModuleId(moduleName) {
 	const segments = moduleName.split("/");
 	return moduleName.startsWith("@") ? segments.slice(0, 2).join("/") : segments[0];
 }
 function shouldResolveFromAppRoot(moduleName, platform) {
-	return platform !== "web" && appRootSingletonModules.has(packageNameFromModuleId(moduleName));
+	const packageName = packageNameFromModuleId(moduleName);
+	if (appRootSingletonModules.has(packageName)) return true;
+	return platform !== "web" && packageName === "react-native";
+}
+function resolveAppRootSingleton(projectRoot, moduleName, platform) {
+	if (platform !== "web" || ![
+		"react",
+		"react-dom",
+		"react-native-web"
+	].includes(packageNameFromModuleId(moduleName))) return;
+	try {
+		return {
+			type: "sourceFile",
+			filePath: (0, node_module.createRequire)(node_path.default.join(projectRoot, "package.json")).resolve(moduleName)
+		};
+	} catch {
+		return;
+	}
 }
 /** 为 Metro worker 提供不依赖进程内 registry 的 manifest 入口。 */
 function getManifestPathsForProjectRoot(projectRoot) {
@@ -49,9 +67,17 @@ function virtualModuleCode(manifest) {
 }
 function writeVirtualModule(entry) {
 	node_fs.default.mkdirSync(node_path.default.dirname(entry.virtualPath), { recursive: true });
+	node_fs.default.mkdirSync(node_path.default.dirname(entry.manifestPath), { recursive: true });
 	node_fs.default.writeFileSync(entry.virtualPath, virtualModuleCode(entry.manifest), "utf8");
 	node_fs.default.writeFileSync(entry.manifestPath, JSON.stringify(entry.manifest), "utf8");
 }
+/**
+* Metro worker 会把文件路径先相对化再恢复为绝对路径。虚拟模块必须位于
+* 项目根目录内，否则 Windows 跨盘符路径会被错误拼接成 `D:\\C:\\...`。
+*/
+function getVirtualModulePath(projectRoot, id) {
+	return node_path.default.join(projectRoot, "node_modules", ".cache", "weapp-tailwindcss-native", `${id}.js`);
+}
 function markManifestPending(entry) {
 	node_fs.default.rmSync(entry.manifestReadyPath, { force: true });
 }
@@ -79,7 +105,7 @@ function register(options) {
 		version: 0,
 		manifest: options.manifest ?? (options.css ? require_compiler.compileNativeStylesheet(options.css, { classSet: options.classSet }) : emptyManifest()),
 		projectRoot,
-		virtualPath: node_path.default.join(node_os.default.tmpdir(), "weapp-tailwindcss-native", `${id}.js`),
+		virtualPath: getVirtualModulePath(projectRoot, id),
 		manifestPath: manifestPaths.manifestPath,
 		manifestReadyPath: manifestPaths.manifestReadyPath,
 		ready: Promise.resolve(),
@@ -177,12 +203,14 @@ function withWeappTailwindcss(config, options = {}) {
 			type: "sourceFile",
 			filePath: entry.virtualPath
 		};
+		const appRootSingleton = resolveAppRootSingleton(entry.projectRoot, moduleName, platform);
+		if (appRootSingleton) return appRootSingleton;
 		const resolverContext = context;
 		const anchoredContext = resolverContext.originModulePath === entry.virtualPath || shouldResolveFromAppRoot(moduleName, platform) ? {
 			...resolverContext,
 			originModulePath: node_path.default.join(entry.projectRoot, "package.json")
 		} : resolverContext;
-		return originalResolver?.(anchoredContext, moduleName, platform) ?? resolverContext.resolveRequest?.(anchoredContext, moduleName, platform);
+		return originalResolver?.(anchoredContext, moduleName, platform) ?? resolverContext.resolveRequest?.(anchoredContext, moduleName, platform) ?? resolveAppRootSingleton(entry.projectRoot, moduleName, platform);
 	};
 	return {
 		...resolvedConfig,
@@ -198,6 +226,11 @@ function withWeappTailwindcss(config, options = {}) {
 		},
 		resolver: {
 			...resolvedConfig.resolver,
+			extraNodeModules: {
+				...resolvedConfig.resolver?.extraNodeModules,
+				"react": node_path.default.resolve(entry.projectRoot, "node_modules/react"),
+				"react-dom": node_path.default.resolve(entry.projectRoot, "node_modules/react-dom")
+			},
 			sourceExts: sourceExts.includes("css") ? sourceExts : [...sourceExts, "css"],
 			resolveRequest: virtualResolver
 		}

package/dist/metro.d.ts

@@ -3,6 +3,7 @@ import { o as NativeStyleManifest } from "./types-BTxnqaRV.js";
 declare const VIRTUAL_MANIFEST_MODULE = "@weapp-tailwindcss/react-native/virtual";
 interface MetroConfigLike {
   resolver?: {
+    extraNodeModules?: Record<string, string>;
     sourceExts?: string[];
     resolveRequest?: (context: unknown, moduleName: string, platform?: string) => unknown;
     [key: string]: unknown;

package/dist/metro.js

@@ -1,4 +1,5 @@
 import { compileNativeStylesheet } from "./compiler.js";
+import { createRequire } from "node:module";
 import { createHash } from "node:crypto";
 import fs from "node:fs";
 import os from "node:os";
@@ -8,14 +9,31 @@ import { fileURLToPath } from "node:url";
 //#region src/metro.ts
 const VIRTUAL_MANIFEST_MODULE = "@weapp-tailwindcss/react-native/virtual";
 const registry = /* @__PURE__ */ new Map();
-const appRootSingletonModules = /* @__PURE__ */ new Set(["react", "react-native"]);
+const appRootSingletonModules = /* @__PURE__ */ new Set(["react"]);
 let nextId = 0;
 function packageNameFromModuleId(moduleName) {
 	const segments = moduleName.split("/");
 	return moduleName.startsWith("@") ? segments.slice(0, 2).join("/") : segments[0];
 }
 function shouldResolveFromAppRoot(moduleName, platform) {
-	return platform !== "web" && appRootSingletonModules.has(packageNameFromModuleId(moduleName));
+	const packageName = packageNameFromModuleId(moduleName);
+	if (appRootSingletonModules.has(packageName)) return true;
+	return platform !== "web" && packageName === "react-native";
+}
+function resolveAppRootSingleton(projectRoot, moduleName, platform) {
+	if (platform !== "web" || ![
+		"react",
+		"react-dom",
+		"react-native-web"
+	].includes(packageNameFromModuleId(moduleName))) return;
+	try {
+		return {
+			type: "sourceFile",
+			filePath: createRequire(path.join(projectRoot, "package.json")).resolve(moduleName)
+		};
+	} catch {
+		return;
+	}
 }
 /** 为 Metro worker 提供不依赖进程内 registry 的 manifest 入口。 */
 function getManifestPathsForProjectRoot(projectRoot) {
@@ -43,9 +61,17 @@ function virtualModuleCode(manifest) {
 }
 function writeVirtualModule(entry) {
 	fs.mkdirSync(path.dirname(entry.virtualPath), { recursive: true });
+	fs.mkdirSync(path.dirname(entry.manifestPath), { recursive: true });
 	fs.writeFileSync(entry.virtualPath, virtualModuleCode(entry.manifest), "utf8");
 	fs.writeFileSync(entry.manifestPath, JSON.stringify(entry.manifest), "utf8");
 }
+/**
+* Metro worker 会把文件路径先相对化再恢复为绝对路径。虚拟模块必须位于
+* 项目根目录内，否则 Windows 跨盘符路径会被错误拼接成 `D:\\C:\\...`。
+*/
+function getVirtualModulePath(projectRoot, id) {
+	return path.join(projectRoot, "node_modules", ".cache", "weapp-tailwindcss-native", `${id}.js`);
+}
 function markManifestPending(entry) {
 	fs.rmSync(entry.manifestReadyPath, { force: true });
 }
@@ -73,7 +99,7 @@ function register(options) {
 		version: 0,
 		manifest: options.manifest ?? (options.css ? compileNativeStylesheet(options.css, { classSet: options.classSet }) : emptyManifest()),
 		projectRoot,
-		virtualPath: path.join(os.tmpdir(), "weapp-tailwindcss-native", `${id}.js`),
+		virtualPath: getVirtualModulePath(projectRoot, id),
 		manifestPath: manifestPaths.manifestPath,
 		manifestReadyPath: manifestPaths.manifestReadyPath,
 		ready: Promise.resolve(),
@@ -171,12 +197,14 @@ function withWeappTailwindcss(config, options = {}) {
 			type: "sourceFile",
 			filePath: entry.virtualPath
 		};
+		const appRootSingleton = resolveAppRootSingleton(entry.projectRoot, moduleName, platform);
+		if (appRootSingleton) return appRootSingleton;
 		const resolverContext = context;
 		const anchoredContext = resolverContext.originModulePath === entry.virtualPath || shouldResolveFromAppRoot(moduleName, platform) ? {
 			...resolverContext,
 			originModulePath: path.join(entry.projectRoot, "package.json")
 		} : resolverContext;
-		return originalResolver?.(anchoredContext, moduleName, platform) ?? resolverContext.resolveRequest?.(anchoredContext, moduleName, platform);
+		return originalResolver?.(anchoredContext, moduleName, platform) ?? resolverContext.resolveRequest?.(anchoredContext, moduleName, platform) ?? resolveAppRootSingleton(entry.projectRoot, moduleName, platform);
 	};
 	return {
 		...resolvedConfig,
@@ -192,6 +220,11 @@ function withWeappTailwindcss(config, options = {}) {
 		},
 		resolver: {
 			...resolvedConfig.resolver,
+			extraNodeModules: {
+				...resolvedConfig.resolver?.extraNodeModules,
+				"react": path.resolve(entry.projectRoot, "node_modules/react"),
+				"react-dom": path.resolve(entry.projectRoot, "node_modules/react-dom")
+			},
 			sourceExts: sourceExts.includes("css") ? sourceExts : [...sourceExts, "css"],
 			resolveRequest: virtualResolver
 		}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-tailwindcss/react-native",
   "type": "module",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "description": "Tailwind CSS compiler and Expo Metro integration for cross-platform React Native apps. 面向跨端 React Native 应用的 Tailwind CSS 编译器与 Expo Metro 集成。",
   "license": "MIT",
   "homepage": "https://tw.weapp.dev/docs/quick-start/react-native-expo",
@@ -93,7 +93,7 @@
   "dependencies": {
     "@babel/types": "^8.0.4",
     "postcss": "^8.5.26",
-    "weapp-tailwindcss": "5.4.2"
+    "weapp-tailwindcss": "5.5.1"
   },
   "devDependencies": {
     "@babel/core": "^8.0.1",