@antigenic-oss/paint 0.2.7 → 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

@@ -31,9 +31,17 @@ 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])
@@ -49,9 +57,26 @@ function main() {
   runOrFail('tar', ['-xzf', path.join(packDir, tarball), '-C', extractDir])
 
   const packedRoot = path.join(extractDir, 'package')
-  const packedNodeModules = path.join(packedRoot, 'node_modules')
-  if (!fs.existsSync(packedNodeModules)) {
-    fs.symlinkSync(path.join(APP_ROOT, 'node_modules'), packedNodeModules, 'dir')
+
+  // 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 = {
@@ -63,15 +88,15 @@ function main() {
 
   let started = false
   try {
-    runOrFail('node', [path.join(packedRoot, 'bin', 'paint.js'), 'start', '--rebuild', '--port', PORT], {
-      cwd: packedRoot,
+    runOrFail('node', [path.join(scopedPackageRoot, 'bin', 'paint.js'), 'start', '--rebuild', '--port', PORT], {
+      cwd: scopedPackageRoot,
       env,
     })
     started = true
   } finally {
     if (started) {
-      run('node', [path.join(packedRoot, 'bin', 'paint.js'), 'stop'], {
-        cwd: packedRoot,
+      run('node', [path.join(scopedPackageRoot, 'bin', 'paint.js'), 'stop'], {
+        cwd: scopedPackageRoot,
         env,
       })
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antigenic-oss/paint",
-  "version": "0.2.7",
+  "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",