create-nextblock 0.2.21 → 0.2.22

package/bin/create-nextblock.js

@@ -723,10 +723,11 @@ async function ensureSupabaseAssets(projectDir, options = {}) {
   const destSupabaseDir = resolve(projectDir, 'supabase');
   await fs.ensureDir(destSupabaseDir);
 
-  const packageSupabaseDir = await resolvePackageSupabaseDir();
+  const { dir: packageSupabaseDir, triedPaths } = await resolvePackageSupabaseDir(projectDir);
   if (!packageSupabaseDir) {
     const message =
-      'Unable to locate supabase assets in @nextblock-cms/db. Please reinstall dependencies and try again.';
+      'Unable to locate supabase assets in @nextblock-cms/db. Please ensure dependencies are installed.' +
+      (triedPaths.length > 0 ? `\nChecked:\n - ${triedPaths.join('\n - ')}` : '');
     if (required) {
       throw new Error(message);
     } else {
@@ -769,38 +770,75 @@ async function ensureSupabaseAssets(projectDir, options = {}) {
 
   if (required) {
     if (!configCopied) {
-      throw new Error('Missing supabase/config.toml in the installed @nextblock-cms/db package.');
+      throw new Error(
+        `Missing supabase/config.toml in the installed @nextblock-cms/db package (checked ${packageSupabaseDir}).`,
+      );
     }
     if (!migrationsCopied) {
-      throw new Error('Missing supabase/migrations in the installed @nextblock-cms/db package.');
+      throw new Error(
+        `Missing supabase/migrations in the installed @nextblock-cms/db package (checked ${packageSupabaseDir}).`,
+      );
     }
   }
 
   return { migrationsCopied, configCopied, projectId: detectedProjectId };
 }
 
-async function resolvePackageSupabaseDir() {
-  try {
-    const pkgPath = require.resolve('@nextblock-cms/db/package.json');
-    const pkgDir = dirname(pkgPath);
-    const candidateSegments = [
-      'supabase',
-      'src/supabase',
-      'dist/supabase',
-      'dist/libs/db/supabase',
-      'dist/lib/supabase',
-      'lib/supabase',
-    ];
-    const candidates = candidateSegments.map((segment) => resolve(pkgDir, segment));
-    for (const candidate of candidates) {
+async function resolvePackageSupabaseDir(projectDir) {
+  const triedPaths = [];
+  const candidateBases = new Set();
+
+  const installDir = resolve(projectDir, 'node_modules', '@nextblock-cms', 'db');
+  candidateBases.add(installDir);
+
+  const tryResolveFrom = (fromPath) => {
+    try {
+      const resolver = createRequire(fromPath);
+      const pkgPath = resolver.resolve('@nextblock-cms/db/package.json');
+      return dirname(pkgPath);
+    } catch {
+      return null;
+    }
+  };
+
+  const projectPkg = resolve(projectDir, 'package.json');
+  const resolvedProject = tryResolveFrom(projectPkg);
+  if (resolvedProject) {
+    candidateBases.add(resolvedProject);
+    const parent = dirname(resolvedProject);
+    candidateBases.add(parent);
+  }
+
+  const localResolve = tryResolveFrom(__filename);
+  if (localResolve) {
+    candidateBases.add(localResolve);
+    candidateBases.add(dirname(localResolve));
+  }
+
+  candidateBases.add(REPO_ROOT);
+  candidateBases.add(resolve(REPO_ROOT, 'libs', 'db'));
+  candidateBases.add(resolve(REPO_ROOT, 'dist', 'libs', 'db'));
+
+  const candidateSegments = [
+    'supabase',
+    'src/supabase',
+    'dist/supabase',
+    'dist/libs/db/supabase',
+    'dist/lib/supabase',
+    'lib/supabase',
+  ];
+
+  for (const base of Array.from(candidateBases).filter(Boolean)) {
+    for (const segment of candidateSegments) {
+      const candidate = resolve(base, segment);
+      triedPaths.push(candidate);
       if (await fs.pathExists(candidate)) {
-        return candidate;
+        return { dir: candidate, triedPaths };
       }
     }
-  } catch {
-    return null;
   }
-  return null;
+
+  return { dir: null, triedPaths };
 }
 
 async function readSupabaseProjectRef(projectDir) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nextblock",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "description": "",
   "main": "index.js",
   "bin": {