peachsim 0.1.1619 → 0.1.1625

package/src/worklets-babel.ts

@@ -54,10 +54,17 @@ const REANIMATED_IMPORT_REGEX =
 // app installed, so they compile with the engine's own plugin and carry no
 // version stamp. every other file is app code and compiles like it does on
 // device: with the plugin the app installed, stamped for the app's runtime.
-const ENGINE_STAND_IN_PATHS = ['/packages/peach-engine/src/', '/packages/peach-compat/src/']
+const ENGINE_STAND_IN_PATHS = [
+  '/packages/peach-engine/src/',
+  '/packages/peach-compat/src/',
+]
 
 const workletsPlugins = new Map<string, { path: string; identity: string }>()
 let babelCorePromise: Promise<typeof import('@babel/core')> | null = null
+const pendingWorkletTransforms = new Map<
+  string,
+  Promise<Pick<TransformResult, 'code' | 'map'> | null>
+>()
 
 export function shouldApplyWorkletsPlugin(id: string, code: string): boolean {
   if (!/\.(tsx?|jsx?|mjs|cjs|mts|cts)$/.test(id)) return false
@@ -93,7 +100,10 @@ function getWorkletsPlugin(id: string): { path: string; identity: string } {
   const manifest = JSON.parse(
     fs.readFileSync(path.resolve(path.dirname(pluginPath), '..', 'package.json'), 'utf8'),
   ) as { version?: string }
-  const plugin = { path: pluginPath, identity: `${pluginPath}@${manifest.version ?? '0'}` }
+  const plugin = {
+    path: pluginPath,
+    identity: `${pluginPath}@${manifest.version ?? '0'}`,
+  }
   workletsPlugins.set(fromDir, plugin)
   return plugin
 }
@@ -109,7 +119,7 @@ function isTypescriptFile(id: string): boolean {
 // normal dev rebuild changes a handful of files and replays the rest.
 export type WorkletBodyMode = 'executable' | 'transport'
 
-const CACHE_SCHEMA = 'v7'
+const CACHE_SCHEMA = 'v8'
 const CACHE_ROOT = path.resolve(
   workspaceRoot,
   'node_modules',
@@ -321,23 +331,34 @@ export async function transformWorkletsCode(
   bodyMode: WorkletBodyMode = 'executable',
 ): Promise<Pick<TransformResult, 'code' | 'map'> | null> {
   const entryPath = getCacheEntryPath(code, id, sourceMaps, bodyMode)
+  const pending = entryPath && pendingWorkletTransforms.get(entryPath)
+  if (pending) return pending
   const cached = readCachedTransform(entryPath)
   if (cached) return cached
   if (!babelCorePromise) {
     babelCorePromise = import('@babel/core') as Promise<typeof import('@babel/core')>
   }
-  const { transformAsync } = await babelCorePromise
-  const result = await transformAsync(
-    code,
-    createWorkletsBabelOptions(id, sourceMaps, bodyMode),
-  )
-  if (!result?.code) return null
-  const transformed = {
-    code: result.code,
-    map: (result.map ?? null) as TransformResult['map'],
+  // nested worker graphs can request the same cold transform before babel
+  // finishes. share only active work; watch edits must not retain old results.
+  const transform = babelCorePromise.then(async ({ transformAsync }) => {
+    const result = await transformAsync(
+      code,
+      createWorkletsBabelOptions(id, sourceMaps, bodyMode),
+    )
+    if (!result?.code) return null
+    const transformed = {
+      code: result.code,
+      map: (result.map ?? null) as TransformResult['map'],
+    }
+    writeCachedTransform(entryPath, transformed)
+    return transformed
+  })
+  if (entryPath) pendingWorkletTransforms.set(entryPath, transform)
+  try {
+    return await transform
+  } finally {
+    if (entryPath) pendingWorkletTransforms.delete(entryPath)
   }
-  writeCachedTransform(entryPath, transformed)
-  return transformed
 }
 
 export function transformWorkletsCodeSync(

package/src/xcode-project.ts

@@ -940,6 +940,16 @@ export function readXcodeAppTarget(
     info[key.slice('INFOPLIST_KEY_'.length)] =
       value === 'YES' ? true : value === 'NO' ? false : value
   }
+  if (settings('GENERATE_INFOPLIST_FILE') === 'YES') {
+    const versions = {
+      CFBundleShortVersionString: 'MARKETING_VERSION',
+      CFBundleVersion: 'CURRENT_PROJECT_VERSION',
+    }
+    for (const [key, setting] of Object.entries(versions)) {
+      const value = settings(setting)
+      if (info[key] === undefined && value) info[key] = value
+    }
+  }
   if (
     settings('INFOPLIST_KEY_UIApplicationSceneManifest_Generation') === 'YES' &&
     info.UIApplicationSceneManifest === undefined