@tamagui/static 3.0.0-beta.924.1 → 3.0.1

package/dist/cjs/extractor/loadTamagui.cjs

@@ -117,6 +117,7 @@ async function loadTamaguiFromModules(propsIn, evaluated) {
 	if (props.outputCSS) {
 		await (0, import_bundleConfig.writeTamaguiCSS)(props.outputCSS, projectInfo.tamaguiConfig);
 	}
+	await (0, import_regenerateConfig.regenerateConfig)(props, projectInfo);
 	return projectInfo;
 }
 let waiting = false;
@@ -147,30 +148,37 @@ const buildConfigDependencies = /* @__PURE__ */ new WeakMap();
 function getTamaguiBuildConfigDependencies(options) {
 	return buildConfigDependencies.get(options) ?? [];
 }
-async function loadTamaguiBuildConfigAsync(tamaguiOptions) {
+const esbuildBuildConfigLoader = async (absolutePath, root) => {
+	const result = await import_esbuild.default.build({
+		entryPoints: [absolutePath],
+		absWorkingDir: root,
+		bundle: true,
+		packages: "external",
+		platform: "node",
+		format: "cjs",
+		target: "node18",
+		write: false,
+		metafile: true
+	});
+	const code = result.outputFiles[0]?.text;
+	if (!code) throw new Error(`No output generated for ${absolutePath}`);
+	const module2 = { exports: {} };
+	const projectRequire = (0, import_node_module.createRequire)(absolutePath);
+	const fn = new Function("module", "exports", "require", "process", code);
+	fn(module2, module2.exports, projectRequire, process);
+	return {
+		exports: module2.exports,
+		dependencies: Object.keys(result.metafile.inputs)
+	};
+};
+async function loadTamaguiBuildConfigAsync(tamaguiOptions, loadBuildConfigModule = esbuildBuildConfigLoader) {
 	const buildFilePath = tamaguiOptions?.buildFile ?? "./tamagui.build.ts";
 	const root = tamaguiOptions?.root || process.cwd();
 	const absolutePath = (0, import_node_path.resolve)(root, buildFilePath);
 	if (import_fs_extra.default.existsSync(absolutePath)) {
 		try {
-			const result = await import_esbuild.default.build({
-				entryPoints: [absolutePath],
-				absWorkingDir: root,
-				bundle: true,
-				packages: "external",
-				platform: "node",
-				format: "cjs",
-				target: "node18",
-				write: false,
-				metafile: true
-			});
-			const module2 = { exports: {} };
-			const projectRequire = (0, import_node_module.createRequire)(absolutePath);
-			const code = result.outputFiles[0]?.text;
-			if (!code) throw new Error(`No output generated for ${buildFilePath}`);
-			const fn = new Function("module", "exports", "require", "process", code);
-			fn(module2, module2.exports, projectRequire, process);
-			const out = module2.exports.default || module2.exports;
+			const evaluated = await loadBuildConfigModule(absolutePath, root);
+			const out = evaluated.exports.default || evaluated.exports;
 			if (!out || typeof out !== "object") {
 				throw new Error(`No default export found in ${buildFilePath}: ${out}`);
 			}
@@ -178,7 +186,7 @@ async function loadTamaguiBuildConfigAsync(tamaguiOptions) {
 				...tamaguiOptions,
 				...out
 			};
-			const dependencies2 = Object.keys(result.metafile.inputs).map((input) => (0, import_node_path.resolve)(root, input));
+			const dependencies2 = evaluated.dependencies.map((file) => (0, import_node_path.resolve)(root, file));
 			buildConfigDependencies.set(loadedOptions, dependencies2);
 			tamaguiOptions = loadedOptions;
 		} catch (err) {

package/dist/cjs/extractor/regenerateConfig.cjs

@@ -37,33 +37,35 @@ var import_generate_themes = require("@tamagui/generate-themes");
 var import_helpers = require("@tamagui/helpers");
 var import_tooling = require("@tamagui/style-grammar/tooling");
 var import_fs_extra = __toESM(require("fs-extra"), 1);
+var import_generateConfigMarkdown = require("./generateConfigMarkdown.cjs");
 var import_requireTamaguiCore = require("../helpers/requireTamaguiCore.cjs");
 var import_bundleConfig = require("./bundleConfig.cjs");
 async function regenerateConfig(tamaguiOptions, configIn, rebuild = false) {
-	try {
-		const config = configIn ?? await (0, import_bundleConfig.getBundledConfig)(tamaguiOptions, rebuild);
-		if (!config) return;
-		const out = transformConfig(config, tamaguiOptions.platform || "web");
-		const confFile = getConfigFile(tamaguiOptions);
-		await import_fs_extra.default.ensureDir((0, import_node_path.dirname)(confFile));
-		await import_fs_extra.default.writeJSON(confFile, out, { spaces: 2 });
-	} catch (err) {
-		if (process.env.DEBUG?.includes("tamagui") || process.env.IS_TAMAGUI_DEV) {
-			console.warn("regenerateConfig error", err);
+	const config = configIn ?? await (0, import_bundleConfig.getBundledConfig)(tamaguiOptions, rebuild);
+	if (!config) return;
+	const outputs = getConfigOutputs(tamaguiOptions, config);
+	await import_fs_extra.default.ensureDir((0, import_node_path.dirname)(outputs[0][0]));
+	await Promise.all(outputs.map(async ([file, content]) => {
+		if (await import_fs_extra.default.pathExists(file)) {
+			if (await import_fs_extra.default.readFile(file, "utf8") === content) return;
 		}
-	}
+		await import_fs_extra.default.writeFile(file, content);
+	}));
 }
 function regenerateConfigSync(tamaguiOptions, config) {
-	try {
-		const confFile = getConfigFile(tamaguiOptions);
-		import_fs_extra.default.ensureDirSync((0, import_node_path.dirname)(confFile));
-		import_fs_extra.default.writeJSONSync(confFile, transformConfig(config, tamaguiOptions.platform || "web"), { spaces: 2 });
-	} catch (err) {
-		if (process.env.DEBUG?.includes("tamagui") || process.env.IS_TAMAGUI_DEV) {
-			console.warn("regenerateConfig error", err);
-		}
+	const outputs = getConfigOutputs(tamaguiOptions, config);
+	import_fs_extra.default.ensureDirSync((0, import_node_path.dirname)(outputs[0][0]));
+	for (const [file, content] of outputs) {
+		if (import_fs_extra.default.existsSync(file) && import_fs_extra.default.readFileSync(file, "utf8") === content) continue;
+		import_fs_extra.default.writeFileSync(file, content);
 	}
 }
+function getConfigOutputs(options, config) {
+	const out = transformConfig(config, options.platform || "web");
+	const confFile = getConfigFile(options);
+	return [[confFile, `${JSON.stringify(out, null, 2)}
+`], [(0, import_node_path.join)((0, import_node_path.dirname)(confFile), "prompt.md"), (0, import_generateConfigMarkdown.generateConfigMarkdown)(out)]];
+}
 async function generateTamaguiThemes(tamaguiOptions, force = false) {
 	if (!tamaguiOptions.themeBuilder) {
 		return;
@@ -97,7 +99,15 @@ function cloneDeepSafe(x, excludeKeys = {}) {
 	if (typeof x === "function") return `Function`;
 	if (typeof x !== "object") return x;
 	if ("$$typeof" in x) return "Component";
-	return Object.fromEntries(Object.entries(x).flatMap(([k, v]) => excludeKeys[k] ? [] : [[k, cloneDeepSafe(v)]]));
+	const entries = Object.entries(x);
+	let kept = 0;
+	for (const entry of entries) {
+		if (excludeKeys[entry[0]]) continue;
+		entry[1] = cloneDeepSafe(entry[1]);
+		entries[kept++] = entry;
+	}
+	entries.length = kept;
+	return Object.fromEntries(entries);
 }
 function buildPropCategories() {
 	const out = {};

package/dist/cjs/zero/islands.cjs

@@ -164,7 +164,8 @@ function generateIslandEntrySource(input) {
 	const entry = input.island.entry;
 	return `// generated by @tamagui/static zero-runtime. do not edit.
 import * as React from 'react'
-import { TamaguiProvider, Theme } from 'tamagui'
+import { TamaguiProvider } from 'tamagui/provider'
+import { Theme } from '@tamagui/core'
 import { createThemeUpdateState } from '@tamagui/web/theme-update'
 import config from ${JSON.stringify(importPath(entry, input.configPath))}
 import IslandRoot from ${JSON.stringify(importPath(entry, input.island.module))}

package/dist/cjs/zero/theme.cjs

@@ -88,18 +88,21 @@ function resolveThemeChain(chain, rootThemeName, config) {
 	let branches = [{
 		test: null,
 		name: rootThemeName,
-		isNew: false
+		isNew: false,
+		schemeAuthored: false
 	}];
 	for (const node of chain) {
 		const next = [];
 		for (const parent of branches) {
 			for (const option of node.options) {
 				const resolved = (0, import_web.resolveThemeName)(parent.name, option.name, config.themes);
+				const schemeAuthored = parent.schemeAuthored || Boolean(option.name && (0, import_helpers.getThemeScheme)(option.name) && option.name in config.themes);
 				const tests = [parent.test, option.test].filter(Boolean);
 				next.push({
 					test: tests.length ? tests.join(" && ") : null,
 					name: resolved ?? parent.name,
-					isNew: resolved !== null
+					isNew: resolved !== null || schemeAuthored !== parent.schemeAuthored,
+					schemeAuthored
 				});
 			}
 		}
@@ -288,7 +291,7 @@ function lowerStaticTheme(node, chain, rootThemeName, config, id) {
 	const classBranches = branches.map((branch) => ({
 		test: branch.test,
 		value: JSON.stringify([
-			branch.isNew ? (0, import_helpers.getThemeClassNames)(branch.name) : "",
+			branch.isNew ? (0, import_helpers.getThemeClassNames)(branch.name, false, branch.schemeAuthored) : "",
 			"is_Theme",
 			inlineClass
 		].filter(Boolean).join(" ").replace(/\s+/g, " ").trim())