@teardown/cli 2.0.61 → 2.0.62

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@teardown/cli",
-	"version": "2.0.61",
+	"version": "2.0.62",
 	"private": false,
 	"type": "module",
 	"main": "./src/index.ts",
@@ -71,7 +71,7 @@
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.3.11",
-		"@teardown/tsconfig": "2.0.61",
+		"@teardown/tsconfig": "2.0.62",
 		"@types/bun": "1.3.5",
 		"@types/ejs": "^3.1.5",
 		"typescript": "5.9.3"

package/templates/metro.config.js

@@ -25,7 +25,7 @@ const { getDefaultConfig, mergeConfig } = require("@react-native/metro-config");
  */
 const config = {};
 
-// First apply Teardown config, then Navigation, then Uniwind (outermost)
+// First apply Teardown config, then Navigation
 const teardownConfig = withTeardown(mergeConfig(getDefaultConfig(__dirname), config));
 
 const navigationConfig = withTeardownNavigation(teardownConfig, {
@@ -35,7 +35,35 @@ const navigationConfig = withTeardownNavigation(teardownConfig, {
 	verbose: false,
 });
 
-module.exports = withUniwindConfig(navigationConfig, {
+/**
+ * Wrap resolvers with null-handling before Uniwind.
+ * Uniwind doesn't handle null returns from resolvers, so we ensure
+ * any null returns are converted to Metro's default resolution.
+ */
+const withNullSafeResolver = (inputConfig) => {
+	const existingResolver = inputConfig.resolver?.resolveRequest;
+	if (!existingResolver) return inputConfig;
+
+	return {
+		...inputConfig,
+		resolver: {
+			...inputConfig.resolver,
+			resolveRequest: (context, moduleName, platform) => {
+				const result = existingResolver(context, moduleName, platform);
+				// If resolver returns null, use Metro's internal resolver
+				if (result === null) {
+					return context.resolveRequest(context, moduleName, platform);
+				}
+				return result;
+			},
+		},
+	};
+};
+
+// Apply null-safe wrapper before Uniwind (which expects non-null results)
+const safeConfig = withNullSafeResolver(navigationConfig);
+
+module.exports = withUniwindConfig(safeConfig, {
 	cssEntryFile: "./src/global.css",
 	dtsFile: "./src/uniwind-types.d.ts",
 });