layero 0.7.1 → 0.7.3

package/dist/commands/deploy.js

@@ -214,6 +214,7 @@ async function resolveSetupConfig(cwd, opts, existing) {
         output_dir: detected.output_dir,
         confident: detected.confident,
         ...(detected.runtime_kind ? { runtime_kind: detected.runtime_kind } : {}),
+        ...(detected.ssr_warning ? { ssr_warning: detected.ssr_warning } : {}),
     });
     const framework_hint = opts.type ?? existing?.framework_hint ?? detected.framework_hint;
     const build_cmd = existing?.build_cmd ?? detected.build_cmd;

package/dist/detect.js

@@ -32,6 +32,13 @@ async function fileExists(cwd, ...candidates) {
 // hit on 2026-05-22 (builder detector v72 fix) and 2026-05-26 (CLI side)
 // was exactly this kind of dual detector drift.
 const NEXT_STATIC_EXPORT_RE = /output\s*:\s*['"]export['"]/m;
+// Strip JS line and block comments before regex matching. Without this,
+// a comment like `// see output: 'export'` falsely matches as
+// static-export — observed 2026-05-26 on the SSR smoke canary fixture.
+// Naive (does not understand strings that contain comment-like tokens),
+// but real next.config files don't have that shape.
+const JS_COMMENT_RE = /\/\/[^\n]*|\/\*[\s\S]*?\*\//gm;
+const stripJsComments = (text) => text.replace(JS_COMMENT_RE, "");
 async function readNextConfigText(cwd) {
     for (const name of ["next.config.mjs", "next.config.ts", "next.config.js", "next.config.cjs"]) {
         try {
@@ -52,7 +59,7 @@ async function nextConfigStaticExport(cwd) {
     const text = await readNextConfigText(cwd);
     if (text === null)
         return null;
-    return NEXT_STATIC_EXPORT_RE.test(text);
+    return NEXT_STATIC_EXPORT_RE.test(stripJsComments(text));
 }
 async function hasAnyHtml(cwd) {
     // Shallow check — only top-level. Recursive walk is too expensive here
@@ -112,19 +119,69 @@ export async function detectProject(cwd) {
                 : buildScript
                     ? "npm run build"
                     : "npx nuxt generate";
+            // Nuxt defaults to SSR. Layero hosts only static for Nuxt today,
+            // so a project without an explicit static signal (`nuxt generate`
+            // script, or `ssr: false` / `nitro.preset='static'` in config)
+            // will build but the resulting `.output/server/` is useless to us.
+            // Mirrors builder's `frameworks/nuxt.py` SSR hint.
+            const nuxtStatic = !!generateScript || (await nuxtConfigDeclaresStatic(cwd));
             return {
                 framework_hint: "nuxt",
                 build_cmd: cmd,
                 output_dir: ".output/public",
                 confident: true,
+                ...(nuxtStatic ? {} : {
+                    ssr_warning: "Nuxt без `nuxt generate` или `ssr: false` собирается как SSR-сервер; " +
+                        "Layero хостит только статику Nuxt. Добавьте `\"generate\": \"nuxt generate\"` " +
+                        "в scripts или поставьте `ssr: false` в nuxt.config.",
+                }),
+            };
+        }
+        // Remix / React Router v7 before SvelteKit/Vite — RR7 ships Vite
+        // internally, so the Vite-dep check would otherwise win. Mirrors the
+        // builder's RemixFramework + backend `remix` table entry (output
+        // build/client). Was missing from the CLI entirely — same dual-detector
+        // gap class as Angular: a Remix repo deployed via the CLI fell through
+        // to the static fallback and shipped raw sources.
+        if (hasDep(pkg, "@remix-run/dev") ||
+            hasDep(pkg, "@remix-run/react") ||
+            hasDep(pkg, "@remix-run/node") ||
+            hasDep(pkg, "@react-router/dev") ||
+            hasDep(pkg, "@react-router/node") ||
+            (await fileExists(cwd, "react-router.config.ts", "react-router.config.js"))) {
+            return {
+                framework_hint: "remix",
+                build_cmd: buildCmd(pkg, "npx react-router build"),
+                output_dir: "build/client",
+                confident: true,
             };
         }
         if (hasDep(pkg, "@sveltejs/kit") || (await fileExists(cwd, "svelte.config.js"))) {
+            // SvelteKit needs an adapter. adapter-static = SPA path; anything
+            // else (adapter-node, adapter-auto, …) is server-side. Mirrors
+            // builder's `frameworks/svelte.py:validate_static`.
+            const hasStaticAdapter = hasDep(pkg, "@sveltejs/adapter-static");
+            const serverAdapter = !hasStaticAdapter
+                ? Object.keys({ ...(pkg.dependencies ?? {}), ...(pkg.devDependencies ?? {}) })
+                    .find((d) => d.startsWith("@sveltejs/adapter-") && d !== "@sveltejs/adapter-static")
+                : undefined;
+            let ssrWarning;
+            if (serverAdapter) {
+                ssrWarning =
+                    `SvelteKit использует ${serverAdapter} (серверный адаптер). ` +
+                        "Layero хостит только статику — поставьте `@sveltejs/adapter-static`.";
+            }
+            else if (!hasStaticAdapter) {
+                ssrWarning =
+                    "SvelteKit без явного адаптера — поставьте `@sveltejs/adapter-static` " +
+                        "для статического хостинга на Layero.";
+            }
             return {
                 framework_hint: "sveltekit",
                 build_cmd: buildCmd(pkg, "npx vite build"),
                 output_dir: "build",
                 confident: true,
+                ...(ssrWarning ? { ssr_warning: ssrWarning } : {}),
             };
         }
         if (hasDep(pkg, "gatsby") || (await fileExists(cwd, "gatsby-config.js", "gatsby-config.ts"))) {
@@ -216,6 +273,22 @@ export async function detectProject(cwd) {
                 confident: true,
             };
         }
+        // Angular after Vite — mirrors builder ALL order. Angular ships its
+        // own CLI (`ng build`) and writes to `dist/{project}/` (Angular <17)
+        // or `dist/{project}/browser/` (17+ `application` builder), NOT bare
+        // `dist`. Until this branch existed the CLI fell through to the
+        // static fallback (`output_dir='.'`), so the first deploy of an
+        // Angular repo shipped the raw sources — the dist/<project> S3 404
+        // incident. `angularOutputDir` parses angular.json to pin the path
+        // (lockstep with `frameworks/angular.py:extract_output_dir`).
+        if (hasDep(pkg, "@angular/core") || (await fileExists(cwd, "angular.json"))) {
+            return {
+                framework_hint: "angular",
+                build_cmd: buildCmd(pkg, "npx ng build"),
+                output_dir: await angularOutputDir(cwd),
+                confident: true,
+            };
+        }
         if (hasDep(pkg, "react-scripts")) {
             return {
                 framework_hint: "cra",
@@ -279,6 +352,27 @@ const HUGO_CONFIG_TOKENS = [
     "minVersion",
     "theme",
 ];
+// Match `ssr: false` or `nitro: { preset: 'static' }` in nuxt.config —
+// either marker keeps the project on the SPA pipeline. Mirrors the same
+// "string-search before AST" approach used for Next.js.
+const NUXT_STATIC_SSR_RE = /\bssr\s*:\s*false\b/m;
+const NUXT_STATIC_PRESET_RE = /preset\s*:\s*['"]static['"]/m;
+async function nuxtConfigDeclaresStatic(cwd) {
+    for (const name of ["nuxt.config.mjs", "nuxt.config.ts", "nuxt.config.js"]) {
+        try {
+            const txt = stripJsComments(await fs.readFile(path.join(cwd, name), "utf-8"));
+            if (NUXT_STATIC_SSR_RE.test(txt) || NUXT_STATIC_PRESET_RE.test(txt))
+                return true;
+            return false; // config found, no static marker → SSR
+        }
+        catch (err) {
+            if (err?.code === "ENOENT")
+                continue;
+            return false;
+        }
+    }
+    return false; // no config at all → defaults to SSR
+}
 async function hasVitepressConfig(cwd, prefix = ".vitepress") {
     for (const name of ["config.ts", "config.js", "config.mts", "config.mjs"]) {
         try {
@@ -304,3 +398,57 @@ async function hasHugoConfigMarker(cwd) {
     }
     return false;
 }
+// Resolve Angular's real build output directory from angular.json.
+// Lockstep with `core/builder/src/frameworks/angular.py:extract_output_dir`
+// — same dual-detector-drift class as Next.js static-export, so the two
+// implementations must agree (parity fixtures in
+// core/tests/fixtures/framework-detect/angular-*).
+//
+// Resolution:
+//   1. defaultProject if set & present, else first project in `projects`
+//   2. project.architect.build.options.outputPath, else the CLI default
+//      `dist/{projectName}`
+//   3. strip leading `./`
+//   4. append `/browser` for the Angular 17+ `application` builder
+//      (builder id ends with `:application`) — it writes the served
+//      assets one level deeper. We also probe disk in case the repo was
+//      built locally before `layero deploy`.
+// Returns the framework default `dist` on any parse error — matches
+// AngularFramework.default_output_dir, and the builder re-derives the
+// exact path at upload time anyway.
+async function angularOutputDir(cwd) {
+    const FALLBACK = "dist";
+    let cfg;
+    try {
+        cfg = JSON.parse(await fs.readFile(path.join(cwd, "angular.json"), "utf-8"));
+    }
+    catch {
+        return FALLBACK;
+    }
+    const projects = cfg?.projects;
+    if (!projects || typeof projects !== "object")
+        return FALLBACK;
+    const firstName = Object.keys(projects)[0];
+    if (!firstName)
+        return FALLBACK;
+    const defaultName = cfg.defaultProject;
+    const projectName = defaultName && projects[defaultName] ? defaultName : firstName;
+    const buildCfg = projects[projectName]?.architect?.build;
+    if (!buildCfg || typeof buildCfg !== "object")
+        return FALLBACK;
+    const opts = (buildCfg.options ?? {});
+    const rawOut = typeof opts === "object" && opts ? opts.outputPath : undefined;
+    let out = typeof rawOut === "string" && rawOut.trim() ? rawOut.trim() : `dist/${projectName}`;
+    if (out.startsWith("./"))
+        out = out.slice(2);
+    const builderId = typeof buildCfg.builder === "string" ? buildCfg.builder : "";
+    const isApplicationBuilder = builderId.endsWith(":application");
+    let browserExists = false;
+    try {
+        browserExists = (await fs.stat(path.join(cwd, out, "browser"))).isDirectory();
+    }
+    catch {
+        // not built locally — rely on the builder-id signal below
+    }
+    return browserExists || isApplicationBuilder ? `${out}/browser` : out;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "layero",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Layero CLI — publish a local site with one command. No git, no GitHub, agent-friendly (Cursor, Claude Code).",
   "license": "MIT",
   "type": "module",
@@ -41,6 +41,7 @@
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "prepublishOnly": "npm run build",
+    "test": "vitest run",
     "dev": "tsc -p tsconfig.json --watch",
     "postinstall": "node scripts/postinstall.cjs || true"
   },
@@ -53,6 +54,7 @@
   },
   "devDependencies": {
     "@types/node": "^20.14.10",
-    "typescript": "^5.5.4"
+    "typescript": "^5.5.4",
+    "vitest": "^4.1.7"
   }
 }