@gallop.software/studio 2.0.7 → 2.1.1

package/bin/studio.mjs

@@ -1,23 +1,21 @@
 #!/usr/bin/env node
 
-import { spawn } from 'child_process'
-import { resolve, dirname, join } from 'path'
-import { fileURLToPath } from 'url'
-import { existsSync, mkdirSync, cpSync, writeFileSync, rmSync } from 'fs'
-import { tmpdir } from 'os'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = dirname(__filename)
+import { resolve } from 'path'
+import { existsSync } from 'fs'
 
 // Parse command line arguments
 const args = process.argv.slice(2)
 let workspace = process.cwd()
+let port = 3001
 let shouldOpen = false
 
 for (let i = 0; i < args.length; i++) {
   if (args[i] === '--workspace' && args[i + 1]) {
     workspace = resolve(args[i + 1])
     i++
+  } else if (args[i] === '--port' && args[i + 1]) {
+    port = parseInt(args[i + 1], 10)
+    i++
   } else if (args[i] === '--open' || args[i] === '-o') {
     shouldOpen = true
   } else if (args[i] === '--help' || args[i] === '-h') {
@@ -29,13 +27,14 @@ Usage:
 
 Options:
   --workspace <path>  Path to the project workspace (default: current directory)
+  --port <number>     Port to run the server on (default: 3001)
   --open, -o          Open browser automatically
   --help, -h          Show this help message
 
 Examples:
   studio                          # Run in current directory
   studio --workspace ~/my-project # Run for specific project
-  studio --workspace . --open     # Open browser automatically
+  studio --port 3002 --open       # Use custom port and open browser
 `)
     process.exit(0)
   }
@@ -55,120 +54,14 @@ if (!existsSync(publicPath)) {
   process.exit(1)
 }
 
-console.log(`
-┌─────────────────────────────────────┐
-│  Studio - Media Manager             │
-├─────────────────────────────────────┤
-│  Workspace: ${workspace.length > 24 ? '...' + workspace.slice(-21) : workspace.padEnd(24)}│
-│  URL: http://localhost:3001         │
-└─────────────────────────────────────┘
-`)
-
-// Create a temp directory for the Studio app
-const studioRoot = resolve(__dirname, '..')
-const tempDir = join(tmpdir(), 'gallop-studio')
-
-// Clean up and recreate temp directory
-if (existsSync(tempDir)) {
-  rmSync(tempDir, { recursive: true, force: true })
-}
-mkdirSync(tempDir, { recursive: true })
-
-// Copy app files to temp directory
-cpSync(join(studioRoot, 'app'), join(tempDir, 'app'), { recursive: true })
-cpSync(join(studioRoot, 'dist'), join(tempDir, 'dist'), { recursive: true })
-
-// Create package.json for the temp app
-const packageJson = {
-  name: 'studio-temp',
-  private: true,
-  type: 'module',
-  dependencies: {}
-}
-writeFileSync(join(tempDir, 'package.json'), JSON.stringify(packageJson, null, 2))
-
-// Create next.config.mjs
-const nextConfig = `/** @type {import('next').NextConfig} */
-const nextConfig = {
-  output: 'standalone',
-  compiler: {
-    emotion: true,
-  },
-  env: {
-    NEXT_PUBLIC_STUDIO_WORKSPACE: process.env.STUDIO_WORKSPACE || process.cwd(),
-  },
-}
-
-export default nextConfig
-`
-writeFileSync(join(tempDir, 'next.config.mjs'), nextConfig)
-
-// Create symlinks to node_modules from studioRoot
-const nodeModulesSource = join(studioRoot, 'node_modules')
-const nodeModulesTarget = join(tempDir, 'node_modules')
-
-try {
-  // Use cpSync with dereference to copy node_modules (or symlink if possible)
-  // For performance, we'll just create a symlink
-  const { symlinkSync } = await import('fs')
-  symlinkSync(nodeModulesSource, nodeModulesTarget, 'junction')
-} catch (e) {
-  // If symlink fails, copy (slower but works)
-  console.log('Creating node_modules link...')
-  cpSync(nodeModulesSource, nodeModulesTarget, { recursive: true })
-}
-
-// Find the next binary
-const nextBin = join(nodeModulesTarget, '.bin', 'next')
-
-if (!existsSync(nextBin)) {
-  console.error('Error: Next.js not found. Please run: npm install')
+// Start the server
+import('../dist/server/index.js').then((mod) => {
+  mod.startServer({
+    port,
+    workspace,
+    open: shouldOpen,
+  })
+}).catch((error) => {
+  console.error('Failed to start Studio server:', error)
   process.exit(1)
-}
-
-// Set up environment
-const env = {
-  ...process.env,
-  STUDIO_WORKSPACE: workspace,
-  NODE_ENV: 'development',
-}
-
-// Start Next.js dev server from temp directory
-const child = spawn(nextBin, ['dev', '-p', '3001'], {
-  stdio: 'inherit',
-  cwd: tempDir,
-  env,
-})
-
-// Open browser if requested
-if (shouldOpen) {
-  setTimeout(async () => {
-    const open = (await import('open')).default
-    open('http://localhost:3001')
-  }, 2000)
-}
-
-// Handle process termination
-const cleanup = () => {
-  child.kill('SIGINT')
-  // Clean up temp directory
-  try {
-    rmSync(tempDir, { recursive: true, force: true })
-  } catch (e) {
-    // Ignore cleanup errors
-  }
-  process.exit(0)
-}
-
-process.on('SIGINT', cleanup)
-process.on('SIGTERM', cleanup)
-
-child.on('close', (code) => {
-  // Clean up temp directory
-  try {
-    rmSync(tempDir, { recursive: true, force: true })
-  } catch (e) {
-    // Ignore cleanup errors
-  }
-  process.exit(code || 0)
 })