@c-time/frelio-cli 1.3.13 → 1.4.1

package/dist/core/types.d.ts

@@ -0,0 +1,48 @@
+/**
+ * core/ モジュール共通の型定義
+ *
+ * 全 core 関数は OperationResult<T> を返す。
+ * AI エージェントが結果を構造的に判断できるようにする。
+ */
+import type { ProjectConfig } from '../lib/templates.js';
+export type { ProjectConfig };
+export type ErrorCode = 'NOT_FOUND' | 'ALREADY_EXISTS' | 'AUTH_REQUIRED' | 'COMMAND_MISSING' | 'VALIDATION_ERROR' | 'EXEC_FAILED';
+export type OperationSuccess<T = void> = {
+    success: true;
+    alreadyExisted?: boolean;
+    data: T;
+};
+export type OperationFailure = {
+    success: false;
+    error: string;
+    code: ErrorCode;
+};
+export type OperationResult<T = void> = OperationSuccess<T> | OperationFailure;
+export declare function ok<T>(data: T, alreadyExisted?: boolean): OperationSuccess<T>;
+export declare function okVoid(alreadyExisted?: boolean): OperationSuccess<void>;
+export declare function fail(error: string, code: ErrorCode): OperationFailure;
+export type ProjectStatus = {
+    projectDir: string;
+    hasGitRepo: boolean;
+    hasContentStructure: boolean;
+    hasAdminBundle: boolean;
+    hasConfigJson: boolean;
+    hasWranglerToml: boolean;
+    hasWorkflows: boolean;
+    hasTerraform: boolean;
+    config: ProjectConfig | null;
+    branches: string[];
+    remoteUrl: string | null;
+    missingPrerequisites: string[];
+    bundleVersion: string | null;
+};
+export type BuildConfigParams = {
+    contentRepo: string;
+    githubClientId?: string;
+    siteTitle?: string;
+    productionUrl?: string;
+    stagingDomain?: string;
+    r2BucketName?: string;
+    r2PublicUrl?: string;
+    ownerUsername?: string;
+};

package/dist/core/types.js

@@ -0,0 +1,21 @@
+/**
+ * core/ モジュール共通の型定義
+ *
+ * 全 core 関数は OperationResult<T> を返す。
+ * AI エージェントが結果を構造的に判断できるようにする。
+ */
+// ---------------------------------------------------------------------------
+// Helper constructors
+// ---------------------------------------------------------------------------
+export function ok(data, alreadyExisted) {
+    const result = { success: true, data };
+    if (alreadyExisted)
+        result.alreadyExisted = true;
+    return result;
+}
+export function okVoid(alreadyExisted) {
+    return ok(undefined, alreadyExisted);
+}
+export function fail(error, code) {
+    return { success: false, error, code };
+}

package/dist/core/workflows.d.ts

@@ -0,0 +1,11 @@
+/**
+ * core/workflows — GitHub Actions ワークフロー生成
+ */
+import { type ProjectConfig, type OperationResult } from './types.js';
+export type WorkflowName = 'deploy-admin' | 'build-staging' | 'promote-production' | 'direct-deploy';
+export declare function generateWorkflow(projectDir: string, config: ProjectConfig, workflow: WorkflowName): OperationResult<{
+    path: string;
+}>;
+export declare function generateWorkflows(projectDir: string, config: ProjectConfig): OperationResult<{
+    files: string[];
+}>;

package/dist/core/workflows.js

@@ -0,0 +1,345 @@
+/**
+ * core/workflows — GitHub Actions ワークフロー生成
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+import { ok, fail } from './types.js';
+import { writeFile } from '../lib/templates.js';
+// ---------------------------------------------------------------------------
+// Individual workflow
+// ---------------------------------------------------------------------------
+export function generateWorkflow(projectDir, config, workflow) {
+    const workflowsDir = path.join(projectDir, '.github', 'workflows');
+    const content = getWorkflowContent(config, workflow);
+    const fileName = `${workflow}.yml`;
+    const filePath = path.join(workflowsDir, fileName);
+    try {
+        fs.mkdirSync(workflowsDir, { recursive: true });
+        writeFile(filePath, content);
+        return ok({ path: filePath });
+    }
+    catch (e) {
+        return fail(`ワークフロー生成失敗 (${fileName}): ${e.message}`, 'EXEC_FAILED');
+    }
+}
+// ---------------------------------------------------------------------------
+// All workflows
+// ---------------------------------------------------------------------------
+export function generateWorkflows(projectDir, config) {
+    const names = ['deploy-admin', 'build-staging', 'promote-production', 'direct-deploy'];
+    const files = [];
+    for (const name of names) {
+        const result = generateWorkflow(projectDir, config, name);
+        if (!result.success)
+            return result;
+        files.push(result.data.path);
+    }
+    return ok({ files });
+}
+// ---------------------------------------------------------------------------
+// Workflow templates
+// ---------------------------------------------------------------------------
+function getWorkflowContent(config, workflow) {
+    switch (workflow) {
+        case 'deploy-admin':
+            return `name: Deploy Admin
+on:
+  push:
+    branches: [admin]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'npm'
+      - run: npm ci
+      - run: npm run build
+      - name: Deploy to Cloudflare Pages
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: \${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: \${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: pages deploy dist --project-name=${config.adminPagesProjectName}
+`;
+        case 'build-staging':
+            return `# staging ブランチ（デフォルト + カスタム）への push で発火し、SSG を実行する。
+# カスタム staging（staging-*）は artifact アップロードなし（プレビュー専用）。
+name: Build Staging
+on:
+  push:
+    branches: [staging, 'staging-*']
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'npm'
+
+      # 前回のビルド状態を復元（差分ビルド用）
+      - name: Restore SSG cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            frelio-data/site/data/data-json
+            public
+          key: ssg-cache-\${{ github.ref_name }}-\${{ github.sha }}
+          restore-keys: |
+            ssg-cache-\${{ github.ref_name }}-
+
+      - run: npm ci
+
+      # Phase 1: JSON 中間データ生成
+      - name: Generate JSON data
+        run: npx frelio-data-json-generator
+
+      # Phase 2: HTML 生成
+      - name: Generate HTML
+        run: npx frelio-gentl
+
+      # Phase 3: アセットビルド（静的アセットコピー + Vite）
+      - name: Build assets
+        run: npm run build
+
+      # デフォルト staging のみ: artifact をアップロード（本番デプロイ用）
+      - name: Upload artifact
+        if: github.ref == 'refs/heads/staging'
+        uses: actions/upload-artifact@v4
+        with:
+          name: staging-build
+          path: public/
+          retention-days: 14
+
+      # Cloudflare Pages にブランチプレビューとしてデプロイ
+      - name: Deploy preview
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: \${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: \${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: pages deploy public --project-name=${config.pagesProjectName} --branch=\${{ github.ref_name }}
+`;
+        case 'promote-production':
+            return `# staging → main マージ（push to main）で発火。
+# 最新の staging artifact をダウンロードし、Pages 本番にデプロイする。
+# artifact 欠損時はフォールバックとしてフル SSG ビルドを実行する。
+name: Promote to Production
+on:
+  push:
+    branches: [main]
+
+permissions:
+  contents: write
+  actions: read
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # 最新の成功した Build Staging ワークフロー run を検索
+      - name: Find latest staging build run
+        id: find-run
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const runs = await github.rest.actions.listWorkflowRuns({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'build-staging.yml',
+              branch: 'staging',
+              status: 'success',
+              per_page: 1,
+            });
+            if (runs.data.workflow_runs.length > 0) {
+              core.setOutput('run-id', runs.data.workflow_runs[0].id);
+            } else {
+              core.setOutput('run-id', '');
+            }
+
+      # cross-workflow artifact ダウンロード
+      - name: Download staging artifact
+        id: download-artifact
+        if: steps.find-run.outputs.run-id != ''
+        continue-on-error: true
+        uses: actions/download-artifact@v4
+        with:
+          name: staging-build
+          path: public/
+          github-token: \${{ secrets.GITHUB_TOKEN }}
+          run-id: \${{ steps.find-run.outputs.run-id }}
+
+      # artifact 取得結果を判定
+      - name: Check if artifact was downloaded
+        id: check-artifact
+        run: |
+          if [ -d "public" ] && [ "\$(ls -A public 2>/dev/null)" ]; then
+            echo "has_artifact=true" >> "\$GITHUB_OUTPUT"
+          else
+            echo "::warning::Staging artifact not found or expired. Running full SSG build."
+            echo "has_artifact=false" >> "\$GITHUB_OUTPUT"
+          fi
+
+      # --- フォールバックビルド（artifact 欠損時のみ） ---
+      - name: Setup Node.js (fallback)
+        if: steps.check-artifact.outputs.has_artifact == 'false'
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'npm'
+
+      - name: Install dependencies (fallback)
+        if: steps.check-artifact.outputs.has_artifact == 'false'
+        run: npm ci
+
+      - name: Full SSG build (fallback)
+        if: steps.check-artifact.outputs.has_artifact == 'false'
+        run: |
+          npx frelio-data-json-generator --full-rebuild
+          npx frelio-gentl
+          npm run build
+
+      # Cloudflare Pages 本番にデプロイ
+      - name: Deploy to production
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: \${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: \${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: pages deploy public --project-name=${config.pagesProjectName} --branch=main
+
+      # デプロイタグ作成
+      - name: Create deploy tag
+        run: |
+          VERSION=\$(jq -r '.version' version.json 2>/dev/null || echo "0.0.0")
+          PREFIX="d\${VERSION}."
+
+          LATEST=\$(git tag -l "\${PREFIX}*" | sed "s/^\${PREFIX}//" | sort -n | tail -1)
+          NEXT=\$(( \${LATEST:-0} + 1 ))
+
+          TAG="\${PREFIX}\${NEXT}"
+          echo "Creating tag: \$TAG"
+
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git tag -a "\$TAG" -m "Production deploy \$TAG"
+          git push origin "\$TAG"
+
+          echo "::notice::Tagged as \$TAG"
+`;
+        case 'direct-deploy':
+            return `# CMS の「直接デプロイ」ボタンから workflow_dispatch で発火。
+# develop → staging マージ → SSG ビルド → artifact → staging プレビュー →
+# staging → main マージ → 本番デプロイ → デプロイタグ付与
+name: Direct Deploy
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Configure git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      # Step 1: develop → staging マージ
+      - name: Merge develop into staging
+        run: |
+          git checkout staging
+          git merge origin/develop --no-edit
+          git push origin staging
+
+      # Step 2: SSG ビルド
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'npm'
+
+      # 前回の staging ビルド状態を復元（差分ビルド用）
+      - name: Restore SSG cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            frelio-data/site/data/data-json
+            public
+          key: ssg-cache-staging-\${{ github.sha }}
+          restore-keys: |
+            ssg-cache-staging-
+
+      - run: npm ci
+
+      - name: Generate JSON data
+        run: npx frelio-data-json-generator
+
+      - name: Generate HTML
+        run: npx frelio-gentl
+
+      - name: Build assets
+        run: npm run build
+
+      # Step 3: artifact アップロード
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: staging-build
+          path: public/
+          retention-days: 14
+
+      # Step 4: Cloudflare Pages プレビューデプロイ（staging ブランチ）
+      - name: Deploy staging preview
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: \${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: \${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: pages deploy public --project-name=${config.pagesProjectName} --branch=staging
+
+      # Step 5: staging → main マージ
+      - name: Fast-forward main to staging
+        run: |
+          git checkout main
+          git merge --ff-only staging
+          git push origin main
+
+      # Step 6: Cloudflare Pages 本番デプロイ
+      - name: Deploy to production
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: \${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: \${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: pages deploy public --project-name=${config.pagesProjectName} --branch=main
+
+      # Step 7: デプロイタグ作成
+      - name: Create deploy tag
+        run: |
+          VERSION=\$(jq -r '.version' version.json 2>/dev/null || echo "0.0.0")
+          PREFIX="d\${VERSION}."
+          LATEST=\$(git tag -l "\${PREFIX}*" | sed "s/^\${PREFIX}//" | sort -n | tail -1)
+          NEXT=\$(( \${LATEST:-0} + 1 ))
+          TAG="\${PREFIX}\${NEXT}"
+
+          git tag -a "\$TAG" -m "Direct deploy \$TAG"
+          git push origin "\$TAG"
+          echo "::notice::Tagged as \$TAG"
+`;
+    }
+}

package/dist/index.js

@@ -13,6 +13,7 @@ program
     .description('Initialize a new Frelio CMS project (creates repo, deploys admin, sets up R2)')
     .option('--skip-github', 'Skip GitHub repository creation')
     .option('--skip-cloudflare', 'Skip Cloudflare setup (R2, Pages)')
+    .option('--terraform', 'Generate Terraform files instead of running wrangler commands')
     .option('--content-repo <repo>', 'Repository name (owner/repo)')
     .option('--site-title <title>', 'Site title')
     .option('--production-url <url>', 'Production URL')
@@ -30,10 +31,7 @@ program
     .action(updateCommand);
 program
     .command('add-staging')
-    .description('Add a staging environment (preview branch + Cloudflare Pages project)')
+    .description('Add a staging environment (creates branch, uses Pages branch preview)')
     .option('--name <name>', 'Staging name (creates staging-{name} branch)')
-    .option('--skip-cloudflare', 'Skip Cloudflare Pages project creation')
-    .option('--pages-project <name>', 'Cloudflare Pages project name for staging')
-    .option('--domain <domain>', 'Custom domain for staging')
     .action(addStagingCommand);
 program.parse();

package/dist/lib/github-release.d.ts

@@ -0,0 +1,15 @@
+/**
+ * GitHub Release からの tarball ダウンロード
+ */
+type ReleaseAsset = {
+    name: string;
+    browser_download_url: string;
+};
+type Release = {
+    tag_name: string;
+    assets: ReleaseAsset[];
+};
+export declare function getLatestRelease(): Promise<Release>;
+export declare function getRelease(version: string): Promise<Release>;
+export declare function downloadTarball(release: Release, destDir: string): Promise<string>;
+export {};

package/dist/lib/github-release.js

@@ -0,0 +1,41 @@
+/**
+ * GitHub Release からの tarball ダウンロード
+ */
+import { createWriteStream } from 'node:fs';
+import { pipeline } from 'node:stream/promises';
+import { Readable } from 'node:stream';
+import path from 'node:path';
+const REPO = 'ctime-projects/frelio';
+export async function getLatestRelease() {
+    const res = await fetch(`https://api.github.com/repos/${REPO}/releases/latest`, {
+        headers: { Accept: 'application/vnd.github.v3+json' },
+    });
+    if (!res.ok) {
+        throw new Error(`Failed to fetch latest release: ${res.status} ${res.statusText}`);
+    }
+    return res.json();
+}
+export async function getRelease(version) {
+    const tag = version.startsWith('v') ? version : `v${version}`;
+    const res = await fetch(`https://api.github.com/repos/${REPO}/releases/tags/${tag}`, {
+        headers: { Accept: 'application/vnd.github.v3+json' },
+    });
+    if (!res.ok) {
+        throw new Error(`Release ${tag} not found: ${res.status}`);
+    }
+    return res.json();
+}
+export async function downloadTarball(release, destDir) {
+    const asset = release.assets.find((a) => a.name.endsWith('.tar.gz'));
+    if (!asset) {
+        throw new Error('No tarball found in release assets');
+    }
+    const destPath = path.join(destDir, asset.name);
+    const res = await fetch(asset.browser_download_url);
+    if (!res.ok || !res.body) {
+        throw new Error(`Failed to download: ${res.status}`);
+    }
+    const readable = Readable.fromWeb(res.body);
+    await pipeline(readable, createWriteStream(destPath));
+    return destPath;
+}