@vxrn/vite-plugin-metro 2.0.0-beta.168.1 → 2.0.0-beta.362.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vxrn/vite-plugin-metro",
-  "version": "2.0.0-beta.168.1",
+  "version": "2.0.0-beta.362.1",
   "sideEffects": false,
   "type": "module",
   "main": "dist/cjs",
@@ -74,9 +74,9 @@
     "@oxc-project/runtime": "^0.112.0",
     "@react-native/babel-preset": "^0.87.1",
     "@react-native/metro-config": "^0.87.1",
-    "@vxrn/compiler": "2.0.0-beta.168.1",
-    "@vxrn/debug": "2.0.0-beta.168.1",
-    "@vxrn/utils": "2.0.0-beta.168.1",
+    "@vxrn/compiler": "2.0.0-beta.362.1",
+    "@vxrn/debug": "2.0.0-beta.362.1",
+    "@vxrn/utils": "2.0.0-beta.362.1",
     "esbuild": "^0.25.12",
     "flow-parser": "^0.331.0",
     "launch-editor": "^2.10.0",
@@ -102,6 +102,7 @@
   "publishConfig": {
     "access": "public"
   },
+  "releaseSourceCommit": "6b489d521782af129132654d2baeb318f4bc2fdc",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/onejs/one.git",

package/src/metro-config/getMetroConfigFromViteConfig.ts

@@ -19,7 +19,7 @@ type MetroInputConfig = NonNullable<Parameters<typeof loadConfigT>[1]>
 const WATCHMAN_PROBE_TIMEOUT_MS = 2000
 const expoEnvAdditionalExts = ['env', 'local', 'development']
 // keep js before mjs so platform-aware .native.js wins for one dist.
-const metroSourceExts = ['js', 'jsx', 'json', 'ts', 'tsx', 'mjs', 'cjs', 'swift']
+const metroSourceExts = ['js', 'jsx', 'json', 'ts', 'tsx', 'mjs', 'cjs', 'swift', 'kt']
 const watchmanResponsivePromises = new Map<string, Promise<boolean>>()
 let didWarnAboutWatchmanFallback = false
 const rootIndexBundleRequestPattern = /^(https?:\/\/[^/]+)?\/index\.bundle(?=$|[?#])/
@@ -67,10 +67,17 @@ function enforceWorkspaceVisibility(
 }
 
 function getReactNativeDefaultConfig(projectRoot: string): MetroInputConfig {
-  return enforceWorkspaceVisibility(
+  const config = enforceWorkspaceVisibility(
     getDefaultConfig(projectRoot) as MetroInputConfig,
     projectRoot
   )
+  return {
+    ...config,
+    resolver: {
+      ...config.resolver,
+      assetExts: [...new Set([...(config.resolver?.assetExts ?? []), 'glb'])],
+    },
+  }
 }
 
 function getPlatformFromBundleUrl(url: string): 'ios' | 'android' {

package/src/metro-config/glbAssets.test.ts

@@ -0,0 +1,57 @@
+import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+import { runInNewContext } from 'node:vm'
+import type { ResolvedConfig } from 'vite'
+import { expect, it } from 'vitest'
+import { buildMetroConfigInputFromViteConfig } from './getMetroConfigFromViteConfig'
+import { transform } from '../transformer/metroNativeWorker'
+
+it('classifies a binary GLB with stock Metro config and registers its identity', async () => {
+  const root = await mkdtemp(join(import.meta.dirname, '.glb-metro-'))
+  const bytes = Buffer.from([0x67, 0x6c, 0x54, 0x46, 2, 0, 0, 0, 0xff, 0x80, 0, 1])
+  await writeFile(join(root, 'sofa.glb'), bytes)
+  try {
+    const { defaultConfig } = await buildMetroConfigInputFromViteConfig(
+      { root } as ResolvedConfig,
+      { watchman: false }
+    )
+    const type = defaultConfig.resolver.assetExts.includes('glb') ? 'asset' : 'module'
+    const result = await transform(
+      { assetRegistryPath: 'react-native/asset-registry', publicPath: '/assets' },
+      root,
+      'sofa.glb',
+      bytes,
+      { dev: true, platform: 'ios', type }
+    )
+    expect(result.output[0].type).toBe('js/module/asset')
+    let descriptor: any
+    runInNewContext(result.output[0].data.code, {
+      __d: (factory: Function) =>
+        factory(
+          {},
+          () => ({
+            registerAsset: (asset: any) => {
+              descriptor = asset
+            },
+          }),
+          {},
+          {},
+          { exports: {} },
+          {},
+          [0]
+        ),
+    })
+    expect(descriptor).toMatchObject({
+      name: 'sofa',
+      type: 'glb',
+      scales: [1],
+      httpServerLocation: '/assets',
+    })
+    expect(descriptor.hash).not.toBe('')
+    expect(descriptor.width).toBeUndefined()
+    expect(descriptor.height).toBeUndefined()
+    expect(await readFile(join(root, 'sofa.glb'))).toEqual(bytes)
+  } finally {
+    await rm(root, { recursive: true, force: true })
+  }
+})

package/src/transformer/babel-transformer.ts

@@ -159,20 +159,20 @@ const transform: BabelTransformer['transform'] = ({
   // `plugins` is used for `functionMapBabelPlugin` from `metro-source-map`.
   plugins,
 }: BabelTransformerArgs): ReturnType<BabelTransformer['transform']> => {
-  if (filename.endsWith('.swift')) {
+  if (/\.(swift|kt)$/.test(filename)) {
     const requireFromProject = createRequire(
       path.resolve(options.projectRoot, 'package.json')
     )
     const oneTransforms = requireFromProject(
       'one/native-transforms'
     ) as typeof import('one/native-transforms') & {
-      renderSwiftPackageModule: (
+      renderNativeSourceModule: (
         id: string,
         platform: string,
         root: string
       ) => { code: string; watchFiles: string[] }
     }
-    originalSrc = oneTransforms.renderSwiftPackageModule(
+    originalSrc = oneTransforms.renderNativeSourceModule(
       path.isAbsolute(filename) ? filename : path.resolve(options.projectRoot, filename),
       options.platform ?? '',
       options.projectRoot

package/src/transformer/metroNativeWorker.ts

@@ -1845,7 +1845,7 @@ let workletsConfigured = false
  * process when the project actually depends on reanimated.
  */
 type OneNativeTransforms = typeof import('one/native-transforms') & {
-  renderSwiftPackageModule: (
+  renderNativeSourceModule: (
     id: string,
     platform: string,
     root: string
@@ -1903,11 +1903,11 @@ export async function transform(
   assertNoUnportedBabelPlugins(options)
 
   let sourceCode = typeof data === 'string' ? data : data.toString('utf8')
-  if (filename.endsWith('.swift')) {
+  if (/\.(swift|kt)$/.test(filename)) {
     const oneTransforms = loadOneNativeTransforms(projectRoot)
     if (!oneTransforms)
       throw new Error(`[vxrn/metro] ${filename} requires One native transforms`)
-    sourceCode = oneTransforms.renderSwiftPackageModule(
+    sourceCode = oneTransforms.renderNativeSourceModule(
       path.isAbsolute(filename) ? filename : path.resolve(projectRoot, filename),
       options.platform ?? '',
       projectRoot

package/src/transformer/swiftPackageTransform.test.ts

@@ -1,6 +1,6 @@
 import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
-import { describe, expect, it } from 'vitest'
+import { beforeAll, describe, expect, it } from 'vitest'
 // @ts-expect-error: module.exports supplies the transformer at runtime.
 import babelTransformer from './babel-transformer'
 import { transform as transformNative } from './metroNativeWorker'
@@ -8,6 +8,40 @@ import { transform as transformNative } from './metroNativeWorker'
 const projectRoot = resolve(__dirname, '../../../../tests/native-features')
 const filename = resolve(projectRoot, 'native-source/Audio.swift')
 
+function babelTransform(fixture: string, src: string, platform: string) {
+  return babelTransformer.transform({
+    filename: fixture,
+    src,
+    options: {
+      projectRoot,
+      dev: true,
+      platform,
+      customTransformOptions: {
+        environment: 'client',
+        vite: {
+          oneViteMetroBabelConfig: true,
+          babelConfig: { babelrc: false, configFile: false, presets: [], plugins: [] },
+        },
+      },
+    },
+    plugins: [],
+  })
+}
+
+beforeAll(async () => {
+  // cold-start the one-time transformer init (babel preset, native pipeline)
+  // in setup: under CI load it exceeds the per-test budget, while the timed
+  // assertions below only exercise warm transforms
+  const source = readFileSync(filename)
+  await transformNative({}, projectRoot, filename, source, {
+    dev: true,
+    minify: false,
+    platform: 'ios',
+    type: 'module',
+  })
+  babelTransform(filename, source.toString('utf8'), 'ios')
+})
+
 describe('metro swift source import', () => {
   it('transforms the fixture through both Metro transformer implementations', async () => {
     const source = readFileSync(filename)
@@ -20,29 +54,42 @@ describe('metro swift source import', () => {
     expect(native.output[0].data.code).toContain('AudioMath')
     expect(native.output[0].data.code).toContain('callNativeSource')
 
-    const babel = babelTransformer.transform({
-      filename,
-      src: source.toString('utf8'),
-      options: {
-        projectRoot,
-        dev: true,
-        platform: 'ios',
-        customTransformOptions: {
-          environment: 'client',
-          vite: {
-            oneViteMetroBabelConfig: true,
-            babelConfig: { babelrc: false, configFile: false, presets: [], plugins: [] },
-          },
-        },
-      },
-      plugins: [],
-    })
+    const babel = babelTransform(filename, source.toString('utf8'), 'ios')
     expect(JSON.stringify(babel.ast)).toContain('AudioMath')
     expect(JSON.stringify(babel.ast)).toContain('callNativeSource')
-    await expect(transformNative({}, projectRoot, filename, source, {
+    await expect(
+      transformNative({}, projectRoot, filename, source, {
+        dev: true,
+        platform: 'android',
+        type: 'module',
+      })
+    ).rejects.toThrow('Android build')
+  })
+})
+
+describe('metro kotlin source import', () => {
+  const kotlin = resolve(projectRoot, 'native-source/Audio.kt')
+
+  it('transforms the fixture through both Metro transformer implementations', async () => {
+    const source = readFileSync(kotlin)
+    const native = await transformNative({}, projectRoot, kotlin, source, {
       dev: true,
+      minify: false,
       platform: 'android',
       type: 'module',
-    })).rejects.toThrow('Android build')
+    })
+    expect(native.output[0].data.code).toContain('AudioMath')
+    expect(native.output[0].data.code).toContain('callNativeSource')
+
+    const babel = babelTransform(kotlin, source.toString('utf8'), 'android')
+    expect(JSON.stringify(babel.ast)).toContain('AudioMath')
+    expect(JSON.stringify(babel.ast)).toContain('callNativeSource')
+    await expect(
+      transformNative({}, projectRoot, kotlin, source, {
+        dev: true,
+        platform: 'ios',
+        type: 'module',
+      })
+    ).rejects.toThrow('iOS build')
   })
 })

package/types/metro-config/getMetroConfigFromViteConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMetroConfigFromViteConfig.d.ts","sourceRoot":"","sources":["../../src/metro-config/getMetroConfigFromViteConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,cAAc,EAAE,MAAM,MAAM,CAAA;AAalE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAiO/D;;;;;;;GAOG;AACH,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,cAAc,EACtB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC;IAAE,aAAa,EAAE,GAAG,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAA;CAAE,CAAC,CAuIhF;AAED,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,cAAc,EACtB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,mBAAmB,CAAC,CA6J9B"}
+{"version":3,"file":"getMetroConfigFromViteConfig.d.ts","sourceRoot":"","sources":["../../src/metro-config/getMetroConfigFromViteConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,cAAc,EAAE,MAAM,MAAM,CAAA;AAalE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAwO/D;;;;;;;GAOG;AACH,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,cAAc,EACtB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC;IAAE,aAAa,EAAE,GAAG,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAA;CAAE,CAAC,CAuIhF;AAED,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,cAAc,EACtB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,mBAAmB,CAAC,CA6J9B"}