vxrn 2.13.7 → 2.13.9

package/src/rn-commands/bundle/buildBundle.ts

@@ -1,8 +1,9 @@
-import FSExtra from 'fs-extra'
 import { clearTransformCache } from '@vxrn/compiler'
 import type { BundleCommandArgs } from '@vxrn/vite-plugin-metro/rn-commands'
+import { cpSync, existsSync, mkdirSync, renameSync, rmSync } from 'node:fs'
 import { resolveConfig } from 'vite'
 import { dirname, join, resolve } from 'node:path'
+import { outputFileSync } from '../../utils/fs'
 import { loadEnv } from '../../exports/loadEnv'
 import { buildNativeBundle } from '../../utils/createNativeDevEngine'
 
@@ -99,18 +100,27 @@ export async function buildBundle(
     const source = join(assetsDest, 'one-dom')
     const destination = join(dirname(bundleOutput), 'one-dom')
     if (resolve(source) !== resolve(destination)) {
-      FSExtra.removeSync(destination)
-      if (FSExtra.existsSync(source)) FSExtra.moveSync(source, destination)
+      rmSync(destination, { recursive: true, force: true })
+      if (existsSync(source)) {
+        mkdirSync(dirname(destination), { recursive: true })
+        try {
+          renameSync(source, destination)
+        } catch (error) {
+          if ((error as NodeJS.ErrnoException).code !== 'EXDEV') throw error
+          cpSync(source, destination, { recursive: true })
+          rmSync(source, { recursive: true })
+        }
+      }
     }
   }
 
   // write sourcemap if available and requested
   if (result.map && args.sourcemapOutput) {
-    FSExtra.outputFileSync(args.sourcemapOutput, result.map, { encoding: 'utf8' })
+    outputFileSync(args.sourcemapOutput, result.map, { encoding: 'utf8' })
   }
 
   console.info(`Writing bundle to ${bundleOutput}...`)
-  FSExtra.outputFileSync(bundleOutput, builtBundle, { encoding: bundleEncoding })
+  outputFileSync(bundleOutput, builtBundle, { encoding: bundleEncoding })
   console.info('Done.')
 
   // Prevent the process not getting exited for some unknown reason.

package/src/user-interface/index.ts

@@ -1,3 +1,4 @@
+import { defaultEditor } from '../utils/env-editor'
 import { exec } from 'node:child_process'
 import type { ViteDevServer } from 'vite'
 import { getBoundPort } from '../utils/getBoundPort'
@@ -50,7 +51,6 @@ const COMMANDS = [
     label: 'open editor',
     terminalLabel: '\x1b[1mo\x1b[0mpen \x1b[1me\x1b[0mditor',
     action: async (ctx) => {
-      const { defaultEditor } = await import('env-editor')
       exec(`${defaultEditor().binary} .`)
     },
   },

package/src/utils/env-editor.LICENSE

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/src/utils/env-editor.ts

@@ -0,0 +1,214 @@
+// vendored from env-editor 1.3.0 by Sindre Sorhus (MIT); see env-editor.LICENSE.
+import process from 'node:process'
+import path from 'node:path'
+
+function allEditors() {
+  return [
+    {
+      id: 'sublime',
+      name: 'Sublime Text',
+      binary: 'subl',
+      isTerminalEditor: false,
+      paths: [
+        '/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl',
+        '/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl',
+      ],
+      keywords: [],
+    },
+    {
+      id: 'atom',
+      name: 'Atom',
+      binary: 'atom',
+      isTerminalEditor: false,
+      paths: ['/Applications/Atom.app/Contents/Resources/app/atom.sh'],
+      keywords: [],
+    },
+    {
+      id: 'vscode-insiders',
+      name: 'Visual Studio Code - Insiders',
+      binary: 'code-insiders',
+      isTerminalEditor: false,
+      paths: [
+        '/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code-insiders',
+      ],
+      keywords: ['vs code insiders', 'code insiders', 'insiders'],
+    },
+    {
+      id: 'vscode',
+      name: 'Visual Studio Code',
+      binary: 'code',
+      isTerminalEditor: false,
+      paths: ['/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code'],
+      keywords: ['vs code'],
+    },
+    {
+      id: 'vscodium',
+      name: 'VSCodium',
+      binary: 'codium',
+      isTerminalEditor: false,
+      paths: ['/Applications/VSCodium.app/Contents/Resources/app/bin/codium'],
+      keywords: [],
+    },
+    {
+      id: 'webstorm',
+      name: 'WebStorm',
+      binary: 'webstorm',
+      isTerminalEditor: false,
+      paths: [],
+      keywords: ['wstorm'],
+    },
+    {
+      id: 'phpstorm',
+      name: 'PhpStorm',
+      binary: 'pstorm',
+      isTerminalEditor: false,
+      paths: [],
+      keywords: ['php'],
+    },
+    {
+      id: 'textmate',
+      name: 'TextMate',
+      binary: 'mate',
+      isTerminalEditor: false,
+      paths: [],
+      keywords: [],
+    },
+    {
+      id: 'vim',
+      name: 'Vim',
+      binary: 'vim',
+      isTerminalEditor: true,
+      paths: [],
+      keywords: ['vi'],
+    },
+    {
+      id: 'neovim',
+      name: 'NeoVim',
+      binary: 'nvim',
+      isTerminalEditor: true,
+      paths: [],
+      keywords: ['vim'],
+    },
+    {
+      id: 'intellij',
+      name: 'IntelliJ IDEA',
+      binary: 'idea',
+      isTerminalEditor: false,
+      paths: [],
+      keywords: ['idea', 'java', 'jetbrains', 'ide'],
+    },
+    {
+      id: 'nano',
+      name: 'GNU nano',
+      binary: 'nano',
+      isTerminalEditor: true,
+      paths: [],
+      keywords: [],
+    },
+    {
+      id: 'emacs',
+      name: 'GNU Emacs',
+      binary: 'emacs',
+      isTerminalEditor: true,
+      paths: [],
+      keywords: [],
+    },
+    {
+      id: 'emacsforosx',
+      name: 'GNU Emacs for Mac OS X',
+      binary: 'Emacs',
+      isTerminalEditor: false,
+      paths: ['/Applications/Emacs.app/Contents/MacOS/Emacs'],
+      keywords: [],
+    },
+    {
+      id: 'android-studio',
+      name: 'Android Studio',
+      binary: 'studio',
+      isTerminalEditor: false,
+      paths: [
+        '/Applications/Android Studio.app/Contents/MacOS/studio',
+        '/usr/local/Android/android-studio/bin/studio.sh',
+        'C:\\Program Files (x86)\\Android\\android-studio\\bin\\studio.exe',
+        'C:\\Program Files\\Android\\android-studio\\bin\\studio64.exe',
+      ],
+      keywords: ['studio'],
+    },
+    {
+      id: 'xcode',
+      name: 'Xcode',
+      binary: 'xed',
+      isTerminalEditor: false,
+      paths: [
+        '/Applications/Xcode.app/Contents/MacOS/Xcode',
+        '/Applications/Xcode-beta.app/Contents/MacOS/Xcode',
+      ],
+      keywords: ['xed'],
+    },
+  ]
+}
+
+function getEditor(editor: string) {
+  editor = editor.trim()
+
+  const needle = editor.toLowerCase()
+  const id = needle.split(/[/\\]/).pop()!.replace(/\s/g, '-')
+  const binary = id.split('-')[0]
+
+  for (const editor of allEditors()) {
+    // Check for exact id, name, or full binary match first
+    if (
+      needle === editor.id ||
+      needle === editor.name.toLowerCase() ||
+      id === editor.binary
+    ) {
+      return editor
+    }
+
+    for (const editorPath of editor.paths) {
+      if (path.normalize(needle) === path.normalize(editorPath.toLowerCase())) {
+        return editor
+      }
+    }
+
+    for (const keyword of editor.keywords) {
+      if (needle === keyword) {
+        return editor
+      }
+    }
+  }
+
+  // Fallback to checking the shortened binary if no exact match found
+  for (const editor of allEditors()) {
+    if (binary === editor.binary) {
+      return editor
+    }
+  }
+
+  return {
+    id,
+    name: editor,
+    binary,
+    isTerminalEditor: false,
+    paths: [],
+    keywords: [],
+  }
+}
+
+export function defaultEditor() {
+  const editor = process.env.EDITOR || process.env.VISUAL
+
+  if (!editor) {
+    throw new Error(
+      // eslint-disable-next-line indent
+      `
+Your $EDITOR environment variable is not set.
+Set it to the command/path of your editor in ~/.zshenv or ~/.bashrc:
+
+  export EDITOR=atom
+`
+    )
+  }
+
+  return getEditor(editor)
+}

package/src/utils/fs.ts

@@ -0,0 +1,59 @@
+import { mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { access, mkdir, readFile, writeFile } from 'node:fs/promises'
+import { dirname } from 'node:path'
+
+// small fs helpers over node builtins, matching the fs-extra surface vxrn used:
+// read errors propagate as-is, json parse errors are prefixed with the file
+// path, and json writes are compact with a trailing newline.
+
+export async function pathExists(path: string): Promise<boolean> {
+  try {
+    await access(path)
+    return true
+  } catch {
+    return false
+  }
+}
+
+function stripBom(content: string): string {
+  return content.replace(/^\uFEFF/, '')
+}
+
+function parseJSON<T>(path: string, content: string): T {
+  try {
+    return JSON.parse(stripBom(content))
+  } catch (err) {
+    ;(err as Error).message = `${path}: ${(err as Error).message}`
+    throw err
+  }
+}
+
+export async function readJSON<T = any>(path: string): Promise<T> {
+  return parseJSON(path, await readFile(path, 'utf8'))
+}
+
+export function readJSONSync<T = any>(path: string): T {
+  return parseJSON(path, readFileSync(path, 'utf8'))
+}
+
+function stringifyJSON(data: unknown): string {
+  return `${JSON.stringify(data)}\n`
+}
+
+export async function writeJSON(path: string, data: unknown): Promise<void> {
+  await writeFile(path, stringifyJSON(data))
+}
+
+export async function outputJSON(path: string, data: unknown): Promise<void> {
+  await mkdir(dirname(path), { recursive: true })
+  await writeJSON(path, data)
+}
+
+export function outputFileSync(
+  path: string,
+  data: string | Uint8Array,
+  options?: { encoding?: BufferEncoding }
+): void {
+  mkdirSync(dirname(path), { recursive: true })
+  writeFileSync(path, data, options)
+}

package/src/utils/getVitePath.ts

@@ -1,6 +1,6 @@
 import { dirname, join } from 'node:path'
 
-import FSExtra from 'fs-extra'
+import { realpath } from 'node:fs/promises'
 import { normalizePath } from 'vite'
 
 export async function getVitePath(
@@ -65,7 +65,7 @@ export async function getVitePath(
     )
   }
 
-  const real = await FSExtra.realpath(resolved)
+  const real = await realpath(resolved)
 
   let id = real
 

package/src/utils/patches.test.ts

@@ -1,6 +1,6 @@
-import FSExtra from 'fs-extra'
 import { join } from 'node:path'
-import { mkdtemp, rm, symlink } from 'node:fs/promises'
+import { mkdir, mkdtemp, readFile, rm, symlink, writeFile } from 'node:fs/promises'
+import { readJSON } from './fs'
 import { tmpdir } from 'node:os'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
@@ -56,7 +56,7 @@ describe('applyDependencyPatches', () => {
     setupFs: (nmDir: string) => Promise<void>
   }) {
     const nmDir = join(tmpDir, 'node_modules')
-    await FSExtra.ensureDir(nmDir)
+    await mkdir(nmDir, { recursive: true })
     await opts.setupFs(nmDir)
     await applyDependencyPatches(opts.patches, { root: tmpDir })
     return nmDir
@@ -91,8 +91,8 @@ describe('applyDependencyPatches', () => {
           '@react-navigation',
           'core'
         )
-        await FSExtra.ensureDir(storePkgDir)
-        await FSExtra.writeFile(
+        await mkdir(storePkgDir, { recursive: true })
+        await writeFile(
           join(storePkgDir, 'package.json'),
           makePkg('@react-navigation/core', '7.16.1')
         )
@@ -100,7 +100,7 @@ describe('applyDependencyPatches', () => {
     })
 
     // verify the patch was applied in the store
-    const patchedPkg = await FSExtra.readJSON(
+    const patchedPkg = await readJSON(
       join(
         nmDir,
         '.pnpm',
@@ -136,12 +136,12 @@ describe('applyDependencyPatches', () => {
       setupFs: async (nm) => {
         // create the real package in pnpm store
         const storeDir = join(nm, '.pnpm', 'test-pkg@1.0.0', 'node_modules', 'test-pkg')
-        await FSExtra.ensureDir(storeDir)
-        await FSExtra.writeFile(
+        await mkdir(storeDir, { recursive: true })
+        await writeFile(
           join(storeDir, 'package.json'),
           makePkg('test-pkg', '1.0.0')
         )
-        await FSExtra.writeFile(join(storeDir, 'index.js'), 'module.exports = {}')
+        await writeFile(join(storeDir, 'index.js'), 'module.exports = {}')
 
         // create symlink at top-level node_modules (like pnpm does when hoisted)
         const symlinkTarget = join(nm, 'test-pkg')
@@ -149,7 +149,7 @@ describe('applyDependencyPatches', () => {
 
         // also create .pnpm/node_modules hoisted symlink
         const pnpmHoisted = join(nm, '.pnpm', 'node_modules', 'test-pkg')
-        await FSExtra.ensureDir(join(nm, '.pnpm', 'node_modules'))
+        await mkdir(join(nm, '.pnpm', 'node_modules'), { recursive: true })
         await symlink(storeDir, pnpmHoisted, 'junction')
       },
     })
@@ -175,16 +175,16 @@ describe('applyDependencyPatches', () => {
       setupFs: async (nm) => {
         // standard flat node_modules layout, no .pnpm
         const pkgDir = join(nm, 'test-pkg')
-        await FSExtra.ensureDir(pkgDir)
-        await FSExtra.writeFile(
+        await mkdir(pkgDir, { recursive: true })
+        await writeFile(
           join(pkgDir, 'package.json'),
           makePkg('test-pkg', '1.0.0')
         )
-        await FSExtra.writeFile(join(pkgDir, 'index.js'), 'module.exports = {}')
+        await writeFile(join(pkgDir, 'index.js'), 'module.exports = {}')
       },
     })
 
-    const content = await FSExtra.readFile(join(nmDir, 'test-pkg', 'index.js'), 'utf-8')
+    const content = await readFile(join(nmDir, 'test-pkg', 'index.js'), 'utf-8')
     expect(content).toContain('// patched')
   })
 
@@ -204,29 +204,29 @@ describe('applyDependencyPatches', () => {
       setupFs: async (nm) => {
         // v1 store entry
         const v1Dir = join(nm, '.pnpm', 'test-pkg@1.0.0', 'node_modules', 'test-pkg')
-        await FSExtra.ensureDir(v1Dir)
-        await FSExtra.writeFile(join(v1Dir, 'package.json'), makePkg('test-pkg', '1.0.0'))
-        await FSExtra.writeFile(join(v1Dir, 'index.js'), 'module.exports = "v1"')
+        await mkdir(v1Dir, { recursive: true })
+        await writeFile(join(v1Dir, 'package.json'), makePkg('test-pkg', '1.0.0'))
+        await writeFile(join(v1Dir, 'index.js'), 'module.exports = "v1"')
 
         // v2 store entry
         const v2Dir = join(nm, '.pnpm', 'test-pkg@2.0.0', 'node_modules', 'test-pkg')
-        await FSExtra.ensureDir(v2Dir)
-        await FSExtra.writeFile(join(v2Dir, 'package.json'), makePkg('test-pkg', '2.0.0'))
-        await FSExtra.writeFile(join(v2Dir, 'index.js'), 'module.exports = "v2"')
+        await mkdir(v2Dir, { recursive: true })
+        await writeFile(join(v2Dir, 'package.json'), makePkg('test-pkg', '2.0.0'))
+        await writeFile(join(v2Dir, 'index.js'), 'module.exports = "v2"')
       },
     })
 
     const nmDir = join(tmpDir, 'node_modules')
 
     // v1 should be patched
-    const v1Content = await FSExtra.readFile(
+    const v1Content = await readFile(
       join(nmDir, '.pnpm', 'test-pkg@1.0.0', 'node_modules', 'test-pkg', 'index.js'),
       'utf-8'
     )
     expect(v1Content).toBe('// v1 patched')
 
     // v2 should NOT be patched
-    const v2Content = await FSExtra.readFile(
+    const v2Content = await readFile(
       join(nmDir, '.pnpm', 'test-pkg@2.0.0', 'node_modules', 'test-pkg', 'index.js'),
       'utf-8'
     )
@@ -253,15 +253,15 @@ describe('applyDependencyPatches', () => {
       setupFs: async (nm) => {
         // real package in store
         const storeDir = join(nm, '.pnpm', 'test-pkg@1.0.0', 'node_modules', 'test-pkg')
-        await FSExtra.ensureDir(storeDir)
-        await FSExtra.writeFile(
+        await mkdir(storeDir, { recursive: true })
+        await writeFile(
           join(storeDir, 'package.json'),
           makePkg('test-pkg', '1.0.0')
         )
-        await FSExtra.writeFile(join(storeDir, 'index.js'), 'module.exports = {}')
+        await writeFile(join(storeDir, 'index.js'), 'module.exports = {}')
 
         // hoisted symlink in .pnpm/node_modules
-        await FSExtra.ensureDir(join(nm, '.pnpm', 'node_modules'))
+        await mkdir(join(nm, '.pnpm', 'node_modules'), { recursive: true })
         await symlink(storeDir, join(nm, '.pnpm', 'node_modules', 'test-pkg'), 'junction')
       },
     })
@@ -269,7 +269,7 @@ describe('applyDependencyPatches', () => {
     expect(patchCallCount).toBe(1)
 
     // verify the file was actually patched
-    const content = await FSExtra.readFile(
+    const content = await readFile(
       join(nmDir, '.pnpm', 'test-pkg@1.0.0', 'node_modules', 'test-pkg', 'index.js'),
       'utf-8'
     )
@@ -296,12 +296,12 @@ describe('applyDependencyPatches', () => {
       patches: stale,
       setupFs: async (nm) => {
         const pkgDir = join(nm, 'test-pkg')
-        await FSExtra.ensureDir(pkgDir)
-        await FSExtra.writeFile(
+        await mkdir(pkgDir, { recursive: true })
+        await writeFile(
           join(pkgDir, 'package.json'),
           makePkg('test-pkg', '1.0.0')
         )
-        await FSExtra.writeFile(join(pkgDir, 'index.js'), 'module.exports = {}')
+        await writeFile(join(pkgDir, 'index.js'), 'module.exports = {}')
       },
     })
 
@@ -326,12 +326,12 @@ describe('applyDependencyPatches', () => {
       patches: applies,
       setupFs: async (nm) => {
         const pkgDir = join(nm, 'test-pkg')
-        await FSExtra.ensureDir(pkgDir)
-        await FSExtra.writeFile(
+        await mkdir(pkgDir, { recursive: true })
+        await writeFile(
           join(pkgDir, 'package.json'),
           makePkg('test-pkg', '1.0.0')
         )
-        await FSExtra.writeFile(join(pkgDir, 'index.js'), 'module.exports = {}')
+        await writeFile(join(pkgDir, 'index.js'), 'module.exports = {}')
       },
     })
 
@@ -384,12 +384,12 @@ describe('applyDependencyPatches', () => {
       patches: [{ module: 'test-pkg', patchFiles: { 'index.js': ['swc'] } }],
       setupFs: async (nm) => {
         const pkgDir = join(nm, 'test-pkg')
-        await FSExtra.ensureDir(pkgDir)
-        await FSExtra.writeFile(
+        await mkdir(pkgDir, { recursive: true })
+        await writeFile(
           join(pkgDir, 'package.json'),
           makePkg('test-pkg', '1.0.0')
         )
-        await FSExtra.writeFile(join(pkgDir, 'index.js'), 'export default () => <div />')
+        await writeFile(join(pkgDir, 'index.js'), 'export default () => <div />')
       },
     })