@antigenic-oss/paint 0.2.6 → 0.2.8

package/bin/paint.js

@@ -22,7 +22,7 @@ const APP_VERSION = (() => {
 const RUNNING_FROM_NODE_MODULES = APP_ROOT.includes(
   `${path.sep}node_modules${path.sep}`,
 )
-const RUNTIME_SCHEMA_VERSION = 2
+const RUNTIME_SCHEMA_VERSION = 4
 const RUNTIME_ROOT = RUNNING_FROM_NODE_MODULES
   ? path.join(STATE_DIR, 'runtime', APP_VERSION)
   : APP_ROOT
@@ -68,11 +68,42 @@ function ensureStateDir() {
   fs.mkdirSync(STATE_DIR, { recursive: true })
 }
 
+function findNodeModulesRootFromResolvedPath(resolvedPath) {
+  const needle = `${path.sep}node_modules${path.sep}`
+  const idx = resolvedPath.lastIndexOf(needle)
+  if (idx === -1) return null
+  // Keep ".../node_modules" (without trailing slash)
+  return resolvedPath.slice(0, idx + needle.length - 1)
+}
+
+function resolveDependencyNodeModulesRoot() {
+  const probes = [
+    'zustand/package.json',
+    '@xterm/xterm/package.json',
+    'react/package.json',
+    'next/package.json',
+  ]
+
+  for (const probe of probes) {
+    try {
+      const resolved = require.resolve(probe, { paths: [APP_ROOT] })
+      const root = findNodeModulesRootFromResolvedPath(resolved)
+      if (root) return root
+    } catch {
+      // keep probing
+    }
+  }
+
+  // Last resort: local node_modules under package root.
+  return path.join(APP_ROOT, 'node_modules')
+}
+
 function ensureRuntimeRoot() {
   if (!RUNNING_FROM_NODE_MODULES) return APP_ROOT
 
   const stampFile = path.join(RUNTIME_ROOT, '.paint-runtime-stamp.json')
   let needsRefresh = true
+  const moduleRoot = resolveDependencyNodeModulesRoot()
 
   if (fs.existsSync(stampFile)) {
     try {
@@ -81,10 +112,18 @@ function ensureRuntimeRoot() {
       const hasLegacyConfigTs = fs.existsSync(
         path.join(RUNTIME_ROOT, 'next.config.ts'),
       )
+      const runtimeNodeModules = path.join(RUNTIME_ROOT, 'node_modules')
+      let linkedToExpectedRoot = false
+      try {
+        linkedToExpectedRoot = fs.realpathSync(runtimeNodeModules) === moduleRoot
+      } catch {
+        linkedToExpectedRoot = false
+      }
       needsRefresh =
         stamp?.schemaVersion !== RUNTIME_SCHEMA_VERSION ||
         !hasConfigMjs ||
-        hasLegacyConfigTs
+        hasLegacyConfigTs ||
+        !linkedToExpectedRoot
     } catch {
       needsRefresh = true
     }
@@ -124,7 +163,7 @@ function ensureRuntimeRoot() {
   }
 
   const runtimeNodeModules = path.join(RUNTIME_ROOT, 'node_modules')
-  fs.symlinkSync(path.join(APP_ROOT, 'node_modules'), runtimeNodeModules, 'dir')
+  fs.symlinkSync(moduleRoot, runtimeNodeModules, 'dir')
 
   fs.writeFileSync(
     stampFile,
@@ -133,6 +172,7 @@ function ensureRuntimeRoot() {
         schemaVersion: RUNTIME_SCHEMA_VERSION,
         version: APP_VERSION,
         sourceRoot: APP_ROOT,
+        moduleRoot,
         preparedAt: now(),
       },
       null,

package/bin/smoke-packed-global.js

@@ -0,0 +1,106 @@
+#!/usr/bin/env node
+
+const fs = require('node:fs')
+const os = require('node:os')
+const path = require('node:path')
+const { spawnSync } = require('node:child_process')
+
+const APP_ROOT = path.resolve(__dirname, '..')
+const PORT = '4210'
+
+function runOrFail(cmd, args, opts = {}) {
+  const result = spawnSync(cmd, args, {
+    cwd: opts.cwd || APP_ROOT,
+    env: opts.env || process.env,
+    stdio: 'inherit',
+  })
+  if (result.status !== 0) {
+    process.exit(result.status || 1)
+  }
+}
+
+function run(cmd, args, opts = {}) {
+  return spawnSync(cmd, args, {
+    cwd: opts.cwd || APP_ROOT,
+    env: opts.env || process.env,
+    stdio: 'inherit',
+  })
+}
+
+function main() {
+  const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'paint-packed-smoke-'))
+  const packDir = path.join(tempRoot, 'pack')
+  const extractDir = path.join(tempRoot, 'extract')
+  const globalRoot = path.join(tempRoot, 'global')
+  const globalNodeModules = path.join(globalRoot, 'node_modules')
+  const scopedPackageRoot = path.join(
+    globalNodeModules,
+    '@antigenic-oss',
+    'paint',
+  )
+  const fakeHome = path.join(tempRoot, 'home')
+  fs.mkdirSync(packDir, { recursive: true })
+  fs.mkdirSync(extractDir, { recursive: true })
+  fs.mkdirSync(globalNodeModules, { recursive: true })
+  fs.mkdirSync(fakeHome, { recursive: true })
+
+  runOrFail('npm', ['pack', '--silent', '--pack-destination', packDir])
+
+  const tarball = fs
+    .readdirSync(packDir)
+    .find((name) => name.endsWith('.tgz'))
+  if (!tarball) {
+    console.error('Smoke test failed: npm pack produced no tarball.')
+    process.exit(1)
+  }
+
+  runOrFail('tar', ['-xzf', path.join(packDir, tarball), '-C', extractDir])
+
+  const packedRoot = path.join(extractDir, 'package')
+
+  // Emulate global install layout:
+  // <global>/node_modules/@antigenic-oss/paint (package)
+  // <global>/node_modules/<deps> (shared deps), no package-local node_modules.
+  fs.mkdirSync(path.dirname(scopedPackageRoot), { recursive: true })
+  fs.cpSync(packedRoot, scopedPackageRoot, { recursive: true, force: true })
+  fs.rmSync(path.join(scopedPackageRoot, 'node_modules'), {
+    recursive: true,
+    force: true,
+  })
+
+  const sourceNodeModules = path.join(APP_ROOT, 'node_modules')
+  const entries = fs.readdirSync(sourceNodeModules, { withFileTypes: true })
+  for (const entry of entries) {
+    if (entry.name === '.bin') continue
+    if (entry.name === '@antigenic-oss') continue
+    const src = path.join(sourceNodeModules, entry.name)
+    const dst = path.join(globalNodeModules, entry.name)
+    if (fs.existsSync(dst)) continue
+    fs.symlinkSync(src, dst, 'dir')
+  }
+
+  const env = {
+    ...process.env,
+    HOME: fakeHome,
+    USERPROFILE: fakeHome,
+    PAINT_SKIP_POSTINSTALL_BUILD: '1',
+  }
+
+  let started = false
+  try {
+    runOrFail('node', [path.join(scopedPackageRoot, 'bin', 'paint.js'), 'start', '--rebuild', '--port', PORT], {
+      cwd: scopedPackageRoot,
+      env,
+    })
+    started = true
+  } finally {
+    if (started) {
+      run('node', [path.join(scopedPackageRoot, 'bin', 'paint.js'), 'stop'], {
+        cwd: scopedPackageRoot,
+        env,
+      })
+    }
+  }
+}
+
+main()

package/next.config.mjs

@@ -1,4 +1,14 @@
+import path from 'node:path'
+
 const nextConfig = {
+  webpack(config) {
+    config.resolve = config.resolve || {}
+    config.resolve.alias = config.resolve.alias || {}
+    // Force runtime alias resolution even if tsconfig path loading is skipped.
+    config.resolve.alias['@'] = path.resolve(process.cwd(), 'src')
+    return config
+  },
+
   async headers() {
     return [
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antigenic-oss/paint",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "Visual editor for localhost web projects with a global paint CLI",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Antigenic-OSS/pAInt",
@@ -47,11 +47,13 @@
     "dev:all": "node ./bin/terminal-server.js & node ./bin/bridge-server.js & next dev --port 4000 --turbopack",
     "bridge": "node ./bin/bridge-server.js",
     "postinstall": "node ./bin/postinstall.js",
-    "build": "next build",
+    "build": "next build --webpack",
     "start": "next start --port 4000",
     "lint": "biome lint .",
     "lint:fix": "biome lint --write .",
     "format": "biome format --write .",
+    "smoke:packed-global": "node ./bin/smoke-packed-global.js",
+    "prepublishOnly": "npm run smoke:packed-global",
     "changeset": "changeset",
     "version-packages": "changeset version",
     "release": "changeset publish"