create-ampless 0.2.0-alpha.6 → 0.2.0-alpha.7

package/dist/index.js

@@ -2,8 +2,8 @@
 
 // src/index.ts
 import { spinner as spinner2, outro, log as log3 } from "@clack/prompts";
-import { existsSync as existsSync2 } from "fs";
-import { basename as basename3, resolve as resolve4 } from "path";
+import { existsSync as existsSync4 } from "fs";
+import { basename as basename3, resolve as resolve5 } from "path";
 
 // src/prompts.ts
 import * as p from "@clack/prompts";
@@ -208,6 +208,7 @@ var STRING_FLAGS = /* @__PURE__ */ new Set([
 ]);
 var BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
   "--deploy",
+  "--mount",
   "--github-private",
   "--create-iam-role",
   "--skip-confirm",
@@ -217,6 +218,7 @@ var BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
 function parseDeployArgs(argv) {
   const out = {
     deploy: false,
+    mount: false,
     githubPrivate: false,
     createIamRole: false,
     skipConfirm: false,
@@ -237,6 +239,9 @@ function parseDeployArgs(argv) {
         case "--deploy":
           out.deploy = true;
           break;
+        case "--mount":
+          out.mount = true;
+          break;
         case "--github-private":
           out.githubPrivate = true;
           break;
@@ -324,6 +329,7 @@ var HELP_TEXT = `create-ampless \u2014 scaffold an ampless project
 
 Usage:
   npx create-ampless@alpha <project-name> [options]
+  npx create-ampless@alpha --mount [options]    # in an existing project dir
 
 Options:
   --site-name <name>          Site display name (default: "My Blog")
@@ -335,6 +341,12 @@ Options:
                               (default: seo)
   --deploy                    Also create GitHub repo + Amplify Hosting app and
                               kick off the first deploy after scaffolding
+  --mount                     Skip scaffolding and mount the CURRENT directory
+                              onto a new GitHub repo + Amplify Hosting app.
+                              Use after you've scaffolded and tested locally
+                              with 'npx ampx sandbox' and now want to publish.
+                              Implies --deploy. Scaffold flags (--site-name,
+                              --themes, --plugins) are ignored.
   --github-owner <login>      GitHub owner (user or org). Defaults to the
                               authenticated 'gh' user
   --github-private            Create a private repo (default: public)
@@ -361,8 +373,9 @@ import { execa as execa3 } from "execa";
 
 // src/deploy.ts
 import { execa as execa2 } from "execa";
+import { existsSync as existsSync3 } from "fs";
 import { writeFile as writeFile2 } from "fs/promises";
-import { basename as basename2, resolve as resolve3 } from "path";
+import { basename as basename2, resolve as resolve4 } from "path";
 import { spinner, log } from "@clack/prompts";
 import pc2 from "picocolors";
 
@@ -787,7 +800,7 @@ async function runPreflight(opts, extra = {}) {
   if (hasGh) await checkGhAuth(problems);
   const hasAws = await checkAwsInstalled(problems);
   const identity = hasAws ? await checkAwsCreds(opts, problems) : void 0;
-  if (hasGh && opts.githubOwner) {
+  if (hasGh && opts.githubOwner && !extra.mountMode) {
     await checkGithubRepoFree(opts, opts.githubOwner, problems);
   }
   if (identity) {
@@ -838,6 +851,55 @@ function printPreflightReport(problems) {
 `);
 }
 
+// src/mount.ts
+import { existsSync as existsSync2 } from "fs";
+import { resolve as resolve3 } from "path";
+function validateMountableProject(destDir) {
+  const required = ["package.json", "cms.config.ts"];
+  for (const f of required) {
+    if (!existsSync2(resolve3(destDir, f))) {
+      return `Not an ampless project (missing ${f} in ${destDir})`;
+    }
+  }
+  const amplifyFiles = ["amplify/backend.ts", "amplify/data/resource.ts"];
+  if (!amplifyFiles.some((f) => existsSync2(resolve3(destDir, f)))) {
+    return `Not an ampless project (missing amplify/ in ${destDir})`;
+  }
+  return null;
+}
+var MOUNT_DEFAULT_GITIGNORE = `# Dependencies
+node_modules/
+
+# Next.js
+.next/
+.amplify/
+
+# Amplify outputs (regenerated on every deploy / sandbox)
+amplify_outputs.json
+
+# Env / OS noise
+.env
+.env.local
+.env.*.local
+.DS_Store
+
+# Logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+`;
+function originPointsAt(origin, owner, name) {
+  const candidates = [
+    `https://github.com/${owner}/${name}`,
+    `https://github.com/${owner}/${name}.git`,
+    `git@github.com:${owner}/${name}`,
+    `git@github.com:${owner}/${name}.git`,
+    `ssh://git@github.com/${owner}/${name}`,
+    `ssh://git@github.com/${owner}/${name}.git`
+  ];
+  return candidates.includes(origin);
+}
+
 // src/deploy.ts
 var AMPLIFY_BUILD_SPEC = `version: 1
 frontend:
@@ -945,27 +1007,108 @@ function awsArgs(opts, extra) {
   base.push("--output", "json");
   return base;
 }
-async function gitInitCommit(dir) {
-  await run("git", ["init", "-b", "main"], { cwd: dir, step: "git init" });
-  await run("git", ["add", "."], { cwd: dir, step: "git add" });
-  await run(
-    "git",
-    ["commit", "-m", "Initial scaffold (create-ampless)"],
-    { cwd: dir, step: "git commit" }
-  );
+async function isGitRepo(dir) {
+  const r = await execa2("git", ["rev-parse", "--git-dir"], { cwd: dir, reject: false });
+  return r.exitCode === 0;
+}
+async function isDirty(dir) {
+  const r = await execa2("git", ["status", "--porcelain"], { cwd: dir, reject: false });
+  return (r.stdout?.toString() ?? "").trim().length > 0;
+}
+async function currentBranch(dir) {
+  const r = await execa2("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
+    cwd: dir,
+    reject: false
+  });
+  if (r.exitCode !== 0) return null;
+  const name = r.stdout?.toString().trim();
+  return name && name !== "HEAD" ? name : null;
+}
+async function ensureGitignore(dir) {
+  const target = resolve4(dir, ".gitignore");
+  if (existsSync3(target)) return;
+  await writeFile2(target, MOUNT_DEFAULT_GITIGNORE, "utf-8");
+}
+async function gitInitOrReuse(dir, mount) {
+  const repo = await isGitRepo(dir);
+  if (!repo) {
+    await run("git", ["init", "-b", "main"], { cwd: dir, step: "git init" });
+  }
+  const dirty = await isDirty(dir);
+  if (dirty) {
+    await run("git", ["add", "."], { cwd: dir, step: "git add" });
+    const message = mount && repo ? "Prepare for create-ampless --mount" : "Initial scaffold (create-ampless)";
+    await run("git", ["commit", "-m", message], { cwd: dir, step: "git commit" });
+  }
+  if (mount) {
+    const branch = await currentBranch(dir);
+    if (branch && branch !== "main") {
+      log.warn(
+        `Current branch is "${branch}" \u2014 Amplify Hosting will be wired to the "main" branch. Push from "main" later, or rename your branch with \`git branch -m main\`.`
+      );
+    }
+  }
 }
 function shortName2(opts) {
   return basename2(opts.projectDir);
 }
+async function ghRepoExists(name, token) {
+  const r = await execa2("gh", ["repo", "view", name], {
+    reject: false,
+    env: { ...process.env, GH_TOKEN: token }
+  });
+  return r.exitCode === 0;
+}
+async function getOriginUrl(dir) {
+  const r = await execa2("git", ["remote", "get-url", "origin"], {
+    cwd: dir,
+    reject: false
+  });
+  if (r.exitCode !== 0) return null;
+  const url = r.stdout?.toString().trim();
+  return url ? url : null;
+}
+function repoHttpsUrl(owner, name) {
+  return `https://github.com/${owner}/${name}`;
+}
 async function ghRepoCreate(opts) {
+  const owner = opts.githubOwner;
+  const name = shortName2(opts);
+  const fullName = `${owner}/${name}`;
   const visibility = opts.githubPrivate ? "--private" : "--public";
-  const name = `${opts.githubOwner}/${shortName2(opts)}`;
+  const exists = await ghRepoExists(fullName, opts.githubToken);
+  if (exists) {
+    const origin = await getOriginUrl(opts.projectDir);
+    if (origin && !originPointsAt(origin, owner, name)) {
+      throw new Error(
+        `Existing 'origin' remote points at ${origin}, but --mount expects ${fullName}.
+Remove or rename the existing remote (\`git remote remove origin\`) and re-run.`
+      );
+    }
+    if (!origin) {
+      await run(
+        "git",
+        ["remote", "add", "origin", `https://github.com/${fullName}.git`],
+        { cwd: opts.projectDir, step: "git remote add origin" }
+      );
+    }
+    await run(
+      "git",
+      ["push", "-u", "origin", "HEAD:main"],
+      {
+        cwd: opts.projectDir,
+        step: "git push origin main",
+        env: { ...process.env, GH_TOKEN: opts.githubToken }
+      }
+    );
+    return repoHttpsUrl(owner, name);
+  }
   const out = await run(
     "gh",
     [
       "repo",
       "create",
-      name,
+      fullName,
       "--source",
       opts.projectDir,
       "--push",
@@ -981,7 +1124,7 @@ async function ghRepoCreate(opts) {
   );
   const match = out.match(/https:\/\/github\.com\/[^\s]+/g);
   if (match && match.length > 0) return match[match.length - 1].replace(/[.,]$/, "");
-  return `https://github.com/${name}`;
+  return repoHttpsUrl(owner, name);
 }
 async function amplifyCreateApp(opts, repoUrl, iamServiceRoleArn) {
   const cmd = [
@@ -1188,7 +1331,8 @@ var PreflightError = class extends Error {
 async function runDeploy(opts) {
   const pre = await runPreflight(opts, {
     iamServiceRoleArn: opts.iamServiceRoleArn,
-    createIamRole: opts.createIamRole === true
+    createIamRole: opts.createIamRole === true,
+    mountMode: opts.mount === true
   });
   if (pre.problems.length > 0) {
     printPreflightReport(pre.problems);
@@ -1209,7 +1353,7 @@ async function runDeploy(opts) {
       );
     }
   }
-  await writeFile2(resolve3(opts.projectDir, "amplify.yml"), AMPLIFY_BUILD_SPEC, "utf-8");
+  await writeFile2(resolve4(opts.projectDir, "amplify.yml"), AMPLIFY_BUILD_SPEC, "utf-8");
   const created = {};
   const fail = (step, cause) => {
     const msg = cause instanceof Error ? cause.message : String(cause);
@@ -1233,10 +1377,14 @@ Re-run after cleaning up.` : "";
 ${msg}${cleanupBlock}`);
   };
   let s = spinner();
-  s.start("git init + initial commit");
+  const gitMsg = opts.mount ? "git: preparing repo for mount" : "git init + initial commit";
+  s.start(gitMsg);
   try {
-    await gitInitCommit(opts.projectDir);
-    s.stop("git: committed initial scaffold");
+    if (opts.mount) {
+      await ensureGitignore(opts.projectDir);
+    }
+    await gitInitOrReuse(opts.projectDir, opts.mount === true);
+    s.stop(opts.mount ? "git: ready" : "git: committed initial scaffold");
   } catch (err) {
     s.stop("git: failed");
     fail("git init / commit", err);
@@ -1468,6 +1616,65 @@ function buildNonInteractiveOpts(args) {
     plugins
   };
 }
+function warnIgnoredScaffoldFlags(args) {
+  const ignored = [];
+  if (args.siteName) ignored.push("--site-name");
+  if (args.themes) ignored.push("--themes");
+  if (args.plugins) ignored.push("--plugins");
+  if (args.projectName) ignored.push("<project-name> positional");
+  if (ignored.length > 0) {
+    log3.warn(`--mount mode ignores: ${ignored.join(", ")}`);
+  }
+}
+async function runMount(args) {
+  const destDir = process.cwd();
+  const projectName = basename3(destDir);
+  warnIgnoredScaffoldFlags(args);
+  const problem = validateMountableProject(destDir);
+  if (problem) {
+    log3.error(problem);
+    log3.info(
+      "Run `npx create-ampless@alpha <name>` first to scaffold, or `cd` into a scaffolded project before passing --mount."
+    );
+    process.exit(1);
+  }
+  const deployOpts = await gatherDeployOptions(args, destDir, projectName);
+  if (!deployOpts) return;
+  try {
+    const result = await runDeploy({ ...deployOpts, mount: true });
+    printDeployResult(result);
+  } catch (err) {
+    if (err instanceof PreflightError) {
+      process.exit(1);
+    }
+    log3.error(err instanceof Error ? err.message : String(err));
+    process.exit(1);
+  }
+}
+function printDeployResult(result) {
+  const lines = [
+    `${pc3.green("\u2714")} Project deployed`,
+    ``,
+    `  GitHub:        ${pc3.cyan(result.githubRepoUrl)}`,
+    `  Amplify app:   ${pc3.cyan(result.amplifyAppId)}`,
+    `  Amplify URL:   ${pc3.cyan(result.amplifyAppUrl)}`
+  ];
+  if (result.domainUrl) {
+    lines.push(`  Custom domain: ${pc3.cyan(result.domainUrl)}`);
+  }
+  if (result.domainVerification && result.domainVerification.length > 0) {
+    lines.push("", `  ${pc3.bold("Add these DNS records to verify the domain:")}`);
+    for (const v of result.domainVerification) {
+      lines.push(`    ${v.cname}  CNAME  ${v.target}`);
+    }
+  }
+  lines.push(
+    "",
+    `  First build is now running in Amplify Hosting.`,
+    `  Watch it at ${pc3.cyan(`https://console.aws.amazon.com/amplify/home#/${result.amplifyAppId}`)}`
+  );
+  outro(lines.join("\n"));
+}
 async function main() {
   const args = parseDeployArgs(process.argv.slice(2));
   if (args.help) {
@@ -1477,6 +1684,10 @@ async function main() {
   for (const flag of args.unknown) {
     log3.warn(`Unknown argument ignored: ${flag}`);
   }
+  if (args.mount) {
+    await runMount(args);
+    return;
+  }
   let opts;
   if (args.skipConfirm) {
     opts = buildNonInteractiveOpts(args);
@@ -1484,8 +1695,8 @@ async function main() {
     opts = await runPrompts(args.projectName);
   }
   if (!opts) return;
-  const destDir = resolve4(process.cwd(), opts.projectName);
-  if (existsSync2(destDir)) {
+  const destDir = resolve5(process.cwd(), opts.projectName);
+  if (existsSync4(destDir)) {
     log3.error(`Directory already exists: ${destDir}`);
     process.exit(1);
   }
@@ -1505,28 +1716,7 @@ async function main() {
     if (!deployOpts) return;
     try {
       const result = await runDeploy(deployOpts);
-      const lines = [
-        `${pc3.green("\u2714")} Project deployed`,
-        ``,
-        `  GitHub:        ${pc3.cyan(result.githubRepoUrl)}`,
-        `  Amplify app:   ${pc3.cyan(result.amplifyAppId)}`,
-        `  Amplify URL:   ${pc3.cyan(result.amplifyAppUrl)}`
-      ];
-      if (result.domainUrl) {
-        lines.push(`  Custom domain: ${pc3.cyan(result.domainUrl)}`);
-      }
-      if (result.domainVerification && result.domainVerification.length > 0) {
-        lines.push("", `  ${pc3.bold("Add these DNS records to verify the domain:")}`);
-        for (const v of result.domainVerification) {
-          lines.push(`    ${v.cname}  CNAME  ${v.target}`);
-        }
-      }
-      lines.push(
-        "",
-        `  First build is now running in Amplify Hosting.`,
-        `  Watch it at ${pc3.cyan(`https://console.aws.amazon.com/amplify/home#/${result.amplifyAppId}`)}`
-      );
-      outro(lines.join("\n"));
+      printDeployResult(result);
     } catch (err) {
       if (err instanceof PreflightError) {
         process.exit(1);

package/dist/templates/_shared/package.json

@@ -24,9 +24,9 @@
     "@ampless/plugin-rss": "^0.2.0-alpha.1",
     "@ampless/plugin-seo": "^0.2.0-alpha.1",
     "@ampless/plugin-webhook": "^0.2.0-alpha.1",
-    "@ampless/admin": "^0.2.0-alpha.5",
-    "@ampless/backend": "^0.2.0-alpha.1",
-    "@ampless/runtime": "^0.2.0-alpha.2",
+    "@ampless/admin": "^0.2.0-alpha.6",
+    "@ampless/backend": "^0.2.0-alpha.2",
+    "@ampless/runtime": "^0.2.0-alpha.3",
     "@digital-go-jp/tailwind-theme-plugin": "^0.3.4",
     "ampless": "^0.2.0-alpha.1",
     "aws-amplify": "^6.10.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ampless",
-  "version": "0.2.0-alpha.6",
+  "version": "0.2.0-alpha.7",
   "description": "Create a new ampless project",
   "license": "MIT",
   "type": "module",