@nuvio/cli 0.5.1 → 0.5.3

package/dist/cli-entry.js

@@ -212,6 +212,75 @@ function hasNuvioPluginCall(ast) {
   });
   return found;
 }
+var OVERLAY_DEP = "@nuvio/overlay";
+function excludeListsOverlay(expr) {
+  if (!expr || !t.isArrayExpression(expr)) return false;
+  return expr.elements.some(
+    (el) => t.isStringLiteral(el) && el.value === OVERLAY_DEP
+  );
+}
+function ensureOptimizeDepsExclude(ast) {
+  let patched = false;
+  babel_traverse_default(ast, {
+    CallExpression(path) {
+      const callee = path.node.callee;
+      if (!t.isIdentifier(callee, { name: "defineConfig" })) return;
+      const arg = path.node.arguments[0];
+      if (!t.isObjectExpression(arg)) return;
+      let optimizeDeps;
+      for (const prop of arg.properties) {
+        if (t.isObjectProperty(prop) && t.isIdentifier(prop.key, { name: "optimizeDeps" })) {
+          optimizeDeps = prop;
+          break;
+        }
+      }
+      if (!optimizeDeps) {
+        arg.properties.push(
+          t.objectProperty(
+            t.identifier("optimizeDeps"),
+            t.objectExpression([
+              t.objectProperty(
+                t.identifier("exclude"),
+                t.arrayExpression([t.stringLiteral(OVERLAY_DEP)])
+              )
+            ])
+          )
+        );
+        patched = true;
+        return;
+      }
+      if (!t.isObjectExpression(optimizeDeps.value)) return;
+      let excludeProp;
+      for (const p of optimizeDeps.value.properties) {
+        if (t.isObjectProperty(p) && t.isIdentifier(p.key, { name: "exclude" })) {
+          excludeProp = p;
+          break;
+        }
+      }
+      if (!excludeProp) {
+        optimizeDeps.value.properties.push(
+          t.objectProperty(
+            t.identifier("exclude"),
+            t.arrayExpression([t.stringLiteral(OVERLAY_DEP)])
+          )
+        );
+        patched = true;
+        return;
+      }
+      if (t.isArrayExpression(excludeProp.value) && !excludeListsOverlay(excludeProp.value)) {
+        excludeProp.value.elements.push(t.stringLiteral(OVERLAY_DEP));
+        patched = true;
+      }
+    }
+  });
+  return patched;
+}
+function viteConfigHasOverlayOptimizeExclude(filePath) {
+  const source = readFileSync3(filePath, "utf8");
+  return /optimizeDeps\s*:\s*\{[^}]*exclude\s*:\s*\[[^\]]*@nuvio\/overlay/.test(
+    source
+  ) || /exclude\s*:\s*\[[^\]]*["']@nuvio\/overlay["']/.test(source);
+}
 function appendNuvioPlugin(ast) {
   let patched = false;
   babel_traverse_default(ast, {
@@ -232,7 +301,9 @@ function patchViteConfigFile(filePath) {
   } catch {
     return { ok: false, error: "parse failed" };
   }
-  if (hasNuvioImport(ast) && hasNuvioPluginCall(ast)) {
+  const depsPatched = ensureOptimizeDepsExclude(ast);
+  const alreadyPlugin = hasNuvioImport(ast) && hasNuvioPluginCall(ast);
+  if (alreadyPlugin && !depsPatched) {
     return { ok: true, skipped: true };
   }
   if (!hasNuvioImport(ast)) {
@@ -249,7 +320,7 @@ function patchViteConfigFile(filePath) {
     }
   }
   writeFileSync(filePath, printTs(ast, source), "utf8");
-  return { ok: true };
+  return { ok: true, skipped: alreadyPlugin && depsPatched };
 }
 function viteConfigHasNuvio(filePath) {
   const source = readFileSync3(filePath, "utf8");
@@ -372,19 +443,61 @@ function appHasDevShell(filePath) {
   }
 }
 
+// src/patch-main-styles.ts
+import { existsSync as existsSync4, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
+import { join as join4 } from "path";
+var MAIN_CANDIDATES = ["src/main.tsx", "src/main.jsx", "main.tsx", "main.jsx"];
+var STYLE_IMPORT = 'import "@nuvio/overlay/style.css";';
+function overlayInstalledFromNpm(packageJsonPath) {
+  const pkg = JSON.parse(readFileSync5(packageJsonPath, "utf8"));
+  const dev = pkg.devDependencies;
+  const raw = dev?.["@nuvio/overlay"];
+  if (!raw) return false;
+  return !raw.startsWith("workspace:") && !raw.startsWith("link:") && !raw.startsWith("file:");
+}
+function resolveMainEntry(root) {
+  for (const rel of MAIN_CANDIDATES) {
+    const p = join4(root, rel);
+    if (existsSync4(p)) return p;
+  }
+  return null;
+}
+function mainHasOverlayStyles(mainPath) {
+  const text = readFileSync5(mainPath, "utf8");
+  return text.includes("@nuvio/overlay/style.css") || text.includes("@nuvio/overlay/dist/style.css");
+}
+function patchMainOverlayStyles(mainPath) {
+  const text = readFileSync5(mainPath, "utf8");
+  if (text.includes("@nuvio/overlay/style.css") || text.includes("@nuvio/overlay/dist/style.css")) {
+    return { ok: true, skipped: true };
+  }
+  const lines = text.split("\n");
+  let lastImport = -1;
+  for (let i = 0; i < lines.length; i++) {
+    if (/^\s*import\s/.test(lines[i])) lastImport = i;
+  }
+  if (lastImport >= 0) {
+    lines.splice(lastImport + 1, 0, STYLE_IMPORT);
+  } else {
+    lines.unshift(STYLE_IMPORT, "");
+  }
+  writeFileSync3(mainPath, lines.join("\n"));
+  return { ok: true };
+}
+
 // src/patch-starter-id.ts
 import * as t3 from "@babel/types";
-import { readFileSync as readFileSync6, writeFileSync as writeFileSync3 } from "fs";
+import { readFileSync as readFileSync7, writeFileSync as writeFileSync4 } from "fs";
 
 // src/scan-ids.ts
-import { readFileSync as readFileSync5 } from "fs";
-import { join as join4 } from "path";
+import { readFileSync as readFileSync6 } from "fs";
+import { join as join5 } from "path";
 import fg from "fast-glob";
 var ID_GLOB = ["src/**/*.{tsx,jsx}"];
 function projectHasPageTitleId(root) {
   const files = fg.sync(ID_GLOB, { cwd: root, absolute: true });
   for (const file of files) {
-    const text = readFileSync5(file, "utf8");
+    const text = readFileSync6(file, "utf8");
     if (/data-nuvio-id=["']page\.title["']/.test(text)) {
       return true;
     }
@@ -394,8 +507,8 @@ function projectHasPageTitleId(root) {
 function findHeadingFiles(root) {
   const files = fg.sync(ID_GLOB, { cwd: root, absolute: true });
   const ordered = [
-    join4(root, "src/App.tsx"),
-    join4(root, "src/App.jsx"),
+    join5(root, "src/App.tsx"),
+    join5(root, "src/App.jsx"),
     ...files.filter(
       (f) => !f.endsWith("App.tsx") && !f.endsWith("App.jsx")
     )
@@ -416,7 +529,7 @@ function findHeadingFiles(root) {
 
 // src/patch-starter-id.ts
 function patchFirstHeading(filePath) {
-  const source = readFileSync6(filePath, "utf8");
+  const source = readFileSync7(filePath, "utf8");
   let ast;
   try {
     ast = parseTs(source, filePath);
@@ -445,13 +558,13 @@ function patchFirstHeading(filePath) {
     }
   });
   if (!patched) return { ok: false, error: "no h1/h2" };
-  writeFileSync3(filePath, printTs(ast, source), "utf8");
+  writeFileSync4(filePath, printTs(ast, source), "utf8");
   return { ok: true };
 }
 function patchStarterId(root) {
   const files = findHeadingFiles(root);
   for (const file of files) {
-    const source = readFileSync6(file, "utf8");
+    const source = readFileSync7(file, "utf8");
     if (!/<h[12][\s>]/.test(source) && !/<>[\s\S]*<h[12]/.test(source)) {
       try {
         const ast = parseTs(source, file);
@@ -496,12 +609,12 @@ var require2 = createRequire(import.meta.url);
 var NUVIO_VERSION = require2("../package.json").version;
 
 // src/write-nuvio-folder.ts
-import { existsSync as existsSync4, mkdirSync, readFileSync as readFileSync7, writeFileSync as writeFileSync4 } from "fs";
-import { dirname, join as join5 } from "path";
+import { existsSync as existsSync5, mkdirSync, readFileSync as readFileSync8, writeFileSync as writeFileSync5 } from "fs";
+import { dirname, join as join6 } from "path";
 import { fileURLToPath } from "url";
-var CLI_ROOT = join5(dirname(fileURLToPath(import.meta.url)), "..");
+var CLI_ROOT = join6(dirname(fileURLToPath(import.meta.url)), "..");
 function loadTemplate(name) {
-  return readFileSync7(join5(CLI_ROOT, "templates", name), "utf8");
+  return readFileSync8(join6(CLI_ROOT, "templates", name), "utf8");
 }
 function render(tpl, vars) {
   let out = tpl;
@@ -511,7 +624,7 @@ function render(tpl, vars) {
   return out;
 }
 function writeNuvioFolder(opts) {
-  const dir = join5(opts.root, "nuvio");
+  const dir = join6(opts.root, "nuvio");
   const created = [];
   mkdirSync(dir, { recursive: true });
   const vars = {
@@ -519,28 +632,28 @@ function writeNuvioFolder(opts) {
     PM_RUN: opts.pmRun,
     FAILED_STEPS: opts.failedSteps.join(", ") || "(none)"
   };
-  const startHere = join5(dir, "START_HERE.md");
-  writeFileSync4(
+  const startHere = join6(dir, "START_HERE.md");
+  writeFileSync5(
     startHere,
     render(loadTemplate("START_HERE.md.tpl"), vars),
     "utf8"
   );
   created.push("nuvio/START_HERE.md");
-  const readme = join5(dir, "README.md");
-  writeFileSync4(
+  const readme = join6(dir, "README.md");
+  writeFileSync5(
     readme,
     render(loadTemplate("README.pointer.md.tpl"), vars),
     "utf8"
   );
   created.push("nuvio/README.md");
-  const agent = join5(dir, "AGENT.md");
-  if (!existsSync4(agent) || opts.forceAgent) {
-    writeFileSync4(agent, render(loadTemplate("AGENT.md.tpl"), vars), "utf8");
+  const agent = join6(dir, "AGENT.md");
+  if (!existsSync5(agent) || opts.forceAgent) {
+    writeFileSync5(agent, render(loadTemplate("AGENT.md.tpl"), vars), "utf8");
     created.push("nuvio/AGENT.md");
   }
   if (opts.failedSteps.length > 0) {
-    const todo = join5(dir, "SETUP_TODO.md");
-    writeFileSync4(
+    const todo = join6(dir, "SETUP_TODO.md");
+    writeFileSync5(
       todo,
       render(loadTemplate("SETUP_TODO.md.tpl"), vars),
       "utf8"
@@ -551,15 +664,18 @@ function writeNuvioFolder(opts) {
 }
 
 // src/verify.ts
-import { readFileSync as readFileSync8 } from "fs";
+import { readFileSync as readFileSync9 } from "fs";
 function verifyProject(root, packageJsonPath, viteConfigPath) {
-  const pkg = JSON.parse(readFileSync8(packageJsonPath, "utf8"));
+  const pkg = JSON.parse(readFileSync9(packageJsonPath, "utf8"));
   const dev = pkg.devDependencies;
   const depsOk = Boolean(dev?.["@nuvio/vite-plugin"]) && Boolean(dev?.["@nuvio/overlay"]);
   const appFile = resolveAppFile(root);
+  const mainEntry = resolveMainEntry(root);
   return {
     deps: depsOk ? "OK" : "MISSING",
     vite: viteConfigHasNuvio(viteConfigPath) ? "OK" : "TODO",
+    overlayCss: mainEntry && (mainHasOverlayStyles(mainEntry) || !overlayInstalledFromNpm(packageJsonPath)) ? "OK" : "TODO",
+    optimizeDeps: viteConfigHasOverlayOptimizeExclude(viteConfigPath) ? "OK" : "TODO",
     shell: appFile && appHasDevShell(appFile) ? "OK" : "TODO",
     starterId: projectHasPageTitleId(root) ? "OK" : "MISSING"
   };
@@ -570,6 +686,8 @@ function printVerification(v) {
     `  devDependencies: @nuvio/vite-plugin, @nuvio/overlay \u2014 ${v.deps}`
   );
   console.log(`  vite.config: nuvio() \u2014 ${v.vite}`);
+  console.log(`  main.tsx: @nuvio/overlay/style.css \u2014 ${v.overlayCss}`);
+  console.log(`  vite.config: optimizeDeps exclude overlay \u2014 ${v.optimizeDeps}`);
   console.log(`  App shell: NuvioDevShell \u2014 ${v.shell}`);
   console.log(`  Starter id page.title \u2014 ${v.starterId}`);
 }
@@ -665,7 +783,11 @@ async function runInit(opts) {
     plan.warnings.push(msg);
   }
   const appFile = resolveAppFile(root);
+  const mainEntry = resolveMainEntry(root);
   if (appFile) plan.modify.push(appFile.replace(`${root}/`, ""));
+  if (mainEntry && overlayInstalledFromNpm(project.packageJsonPath)) {
+    plan.modify.push(mainEntry.replace(`${root}/`, ""));
+  }
   plan.modify.push(project.viteConfigName);
   plan.create.push(
     "nuvio/START_HERE.md",
@@ -724,6 +846,12 @@ async function runInit(opts) {
   } else {
     plan.failedSteps.push("app (no App.tsx/main.tsx)");
   }
+  if (mainEntry && overlayInstalledFromNpm(project.packageJsonPath)) {
+    const mainStyles = patchMainOverlayStyles(mainEntry);
+    if (mainStyles.ok && !mainStyles.skipped) {
+      plan.modify.push(mainEntry.replace(`${root}/`, ""));
+    }
+  }
   let starterOk = false;
   let starterFile;
   if (!projectHasPageTitleId(root)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuvio/cli",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Nuvio CLI: one-command Vite + React onboarding (nuvio init).",
   "license": "MIT",
   "repository": {