@tamagui/static 3.0.0-beta.755.1 → 3.0.0-beta.804.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "3.0.0-beta.755.1",
+  "version": "3.0.0-beta.804.1",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "source": "src/index.ts",
@@ -39,27 +39,27 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tamagui-build --skip-native",
-    "watch": "tamagui-build --skip-native --watch",
+    "build": "tamagui-build --skip-native --keep-env-target",
+    "watch": "tamagui-build --skip-native --keep-env-target --watch",
     "clean": "tamagui-build clean",
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/cli-color": "3.0.0-beta.755.1",
-    "@tamagui/compiler-core": "3.0.0-beta.755.1",
-    "@tamagui/config-default": "3.0.0-beta.755.1",
-    "@tamagui/core": "3.0.0-beta.755.1",
-    "@tamagui/dom": "3.0.0-beta.755.1",
-    "@tamagui/fake-react-native": "3.0.0-beta.755.1",
-    "@tamagui/generate-themes": "3.0.0-beta.755.1",
-    "@tamagui/helpers": "3.0.0-beta.755.1",
-    "@tamagui/helpers-node": "3.0.0-beta.755.1",
-    "@tamagui/react-native-web-internals": "3.0.0-beta.755.1",
-    "@tamagui/react-native-web-lite": "3.0.0-beta.755.1",
-    "@tamagui/shorthands": "3.0.0-beta.755.1",
-    "@tamagui/style-grammar": "3.0.0-beta.755.1",
-    "@tamagui/types": "3.0.0-beta.755.1",
-    "@tamagui/web": "3.0.0-beta.755.1",
+    "@tamagui/cli-color": "3.0.0-beta.804.1",
+    "@tamagui/compiler-core": "3.0.0-beta.804.1",
+    "@tamagui/config-default": "3.0.0-beta.804.1",
+    "@tamagui/core": "3.0.0-beta.804.1",
+    "@tamagui/dom": "3.0.0-beta.804.1",
+    "@tamagui/fake-react-native": "3.0.0-beta.804.1",
+    "@tamagui/generate-themes": "3.0.0-beta.804.1",
+    "@tamagui/helpers": "3.0.0-beta.804.1",
+    "@tamagui/helpers-node": "3.0.0-beta.804.1",
+    "@tamagui/react-native-web-internals": "3.0.0-beta.804.1",
+    "@tamagui/react-native-web-lite": "3.0.0-beta.804.1",
+    "@tamagui/shorthands": "3.0.0-beta.804.1",
+    "@tamagui/style-grammar": "3.0.0-beta.804.1",
+    "@tamagui/types": "3.0.0-beta.804.1",
+    "@tamagui/web": "3.0.0-beta.804.1",
     "browserslist": "^4.28.1",
     "check-dependency-version-consistency": "^4.1.0",
     "esbuild": "0.28.1",
@@ -71,7 +71,7 @@
     "react-native-web": "~0.21.0"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.0-beta.755.1",
+    "@tamagui/build": "3.0.0-beta.804.1",
     "@types/find-root": "^1.1.2",
     "@types/node": "^22.1.0",
     "@types/webpack": "^4.41.26",

package/src/compiler.ts

@@ -212,12 +212,14 @@ export interface CompilerInput {
   source: string
   root: string
   target: CompilerTarget
+  /** Host environment whose resolver produced this module graph. */
+  environment?: string
   project: CompilerProject
   resolve(specifier: string, importer: string): Promise<CompilerResolution | null>
   load(id: string): Promise<string | null>
 }
 
-export type CompilerUpdateInput = Omit<CompilerInput, 'target'>
+export type CompilerUpdateInput = CompilerInput
 
 export interface CompilerResult {
   plan: LoweredModulePlan
@@ -233,6 +235,10 @@ function externalId(specifier: string): ResolvedModuleId {
   return resolvedModuleId(`external://${encodeURIComponent(specifier)}`)
 }
 
+function compilerContext(input: CompilerInput): string {
+  return `${input.root}\0${input.target}\0${input.environment ?? ''}\0${input.project.generation}`
+}
+
 function sourceCanBeLinked(root: string, id: string): boolean {
   const clean = cleanId(id)
   const normalized = clean.replace(/\\/g, '/')
@@ -249,6 +255,8 @@ export class CompilerFrontend {
   private readonly session = new CompilerSession()
   private queue: Promise<unknown> = Promise.resolve()
   private readonly planCaches = new Map<string, ModulePlanCache>()
+  private readonly moduleRecords = new Map<ResolvedModuleId, HostModuleInput>()
+  private moduleContext: string | null = null
 
   /**
    * One cache per project root and platform. Absent when the project produced
@@ -281,7 +289,22 @@ export class CompilerFrontend {
   }
 
   compile(input: CompilerInput): Promise<CompilerResult> {
-    const operation = this.queue.then(() => this.compileNow(input))
+    // compiling must not leak process-global state: internal stages set
+    // TAMAGUI_TARGET / IS_STATIC while evaluating modules for a platform, and
+    // an embedder (or a test that renders at runtime after compiling) must see
+    // its own environment unchanged afterward
+    const operation = this.queue.then(async () => {
+      const previousTarget = process.env.TAMAGUI_TARGET
+      const previousStatic = process.env.IS_STATIC
+      try {
+        return await this.compileNow(input)
+      } finally {
+        if (previousTarget === undefined) delete process.env.TAMAGUI_TARGET
+        else process.env.TAMAGUI_TARGET = previousTarget
+        if (previousStatic === undefined) delete process.env.IS_STATIC
+        else process.env.IS_STATIC = previousStatic
+      }
+    })
     this.queue = operation.catch(() => undefined)
     return operation
   }
@@ -292,6 +315,7 @@ export class CompilerFrontend {
       const invalidated = new Set<ResolvedModuleId>()
       for (const module of modules.values()) {
         for (const id of await this.session.update(module)) invalidated.add(id)
+        this.moduleRecords.set(module.id, module)
       }
       return [...invalidated].sort()
     })
@@ -308,9 +332,13 @@ export class CompilerFrontend {
   }
 
   remove(id: string) {
-    const operation = this.queue.then(() =>
-      this.session.remove(resolvedModuleId(cleanId(id)))
-    )
+    const operation = this.queue.then(async () => {
+      const result = await this.session.remove(resolvedModuleId(cleanId(id)))
+      for (const invalidatedId of result.invalidatedIds) {
+        this.moduleRecords.delete(invalidatedId)
+      }
+      return result
+    })
     this.queue = operation.catch(() => undefined)
     return operation
   }
@@ -324,6 +352,7 @@ export class CompilerFrontend {
     const invalidated = new Set<ResolvedModuleId>()
     for (const module of modules.values()) {
       for (const id of await this.session.update(module)) invalidated.add(id)
+      this.moduleRecords.set(module.id, module)
     }
     const projectInfo = input.project.projectInfo
     if (!projectInfo.tamaguiConfig || !projectInfo.components) {
@@ -366,6 +395,12 @@ export class CompilerFrontend {
     rootModule: HostModuleInput
     modules: Map<ResolvedModuleId, HostModuleInput>
   }> {
+    const moduleContext = compilerContext(input)
+    if (this.moduleContext !== moduleContext) {
+      this.moduleRecords.clear()
+      this.moduleContext = moduleContext
+    }
+
     const componentBySpecifier = new Map(
       input.project.componentModules.map((component) => [
         component.moduleName,
@@ -375,6 +410,20 @@ export class CompilerFrontend {
     const modules = new Map<ResolvedModuleId, HostModuleInput>()
     const loading = new Set<ResolvedModuleId>()
 
+    const addInstalledClosure = (module: HostModuleInput): void => {
+      if (modules.has(module.id) || loading.has(module.id)) return
+      loading.add(module.id)
+      for (const dependency of module.imports) {
+        if (dependency.external) continue
+        const installedDependency = this.moduleRecords.get(dependency.resolvedId)
+        if (installedDependency && this.session.has(dependency.resolvedId)) {
+          addInstalledClosure(installedDependency)
+        }
+      }
+      modules.set(module.id, module)
+      loading.delete(module.id)
+    }
+
     const loadModule = async (
       rawId: string,
       source: string
@@ -382,6 +431,11 @@ export class CompilerFrontend {
       const id = resolvedModuleId(cleanId(rawId))
       const existing = modules.get(id)
       if (existing) return existing
+      const installed = this.moduleRecords.get(id)
+      if (installed?.source === source && this.session.has(id)) {
+        addInstalledClosure(installed)
+        return installed
+      }
       if (loading.has(id)) {
         return { id, source, imports: [] }
       }
@@ -406,9 +460,14 @@ export class CompilerFrontend {
             : externalId(specifier)
         imports.push({ specifier, resolvedId, external: !canLink })
         if (canLink && !modules.has(resolvedId) && !loading.has(resolvedId)) {
-          const dependencySource = await input.load(resolution.id)
-          if (dependencySource !== null) {
-            await loadModule(resolution.id, dependencySource)
+          const installedDependency = this.moduleRecords.get(resolvedId)
+          if (installedDependency && this.session.has(resolvedId)) {
+            addInstalledClosure(installedDependency)
+          } else {
+            const dependencySource = await input.load(resolution.id)
+            if (dependencySource !== null) {
+              await loadModule(resolution.id, dependencySource)
+            }
           }
         }
       }