@c-time/frelio-cli 1.3.13 → 1.4.1

package/dist/lib/templates.js

@@ -38,10 +38,14 @@ export function generateConfigJson(config) {
         siteTitle: config.siteTitle,
         productionUrl: config.productionUrl,
         previewUrl: config.previewUrl,
+        pagesProjectName: config.pagesProjectName,
+        adminPagesProjectName: config.adminPagesProjectName,
+        r2BucketName: config.r2BucketName,
+        r2PublicUrl: config.r2PublicUrl,
     }, null, 2);
 }
 export function generateWranglerToml(config) {
-    return `name = "${config.pagesProjectName}"
+    return `name = "${config.adminPagesProjectName}"
 compatibility_date = "2024-01-01"
 
 [[r2_buckets]]
@@ -52,41 +56,6 @@ bucket_name = "${config.r2BucketName}"
 R2_PUBLIC_URL = "${config.r2PublicUrl}"
 `;
 }
-export function generateUsersIndex(config) {
-    const owner = config.ownerUsername;
-    return JSON.stringify({
-        users: [
-            {
-                githubUsername: owner,
-                displayName: owner,
-                isOwner: true,
-                permissions: {
-                    canViewUsers: true,
-                    canEditUsers: true,
-                    canViewStaging: true,
-                    canEditStaging: true,
-                    canViewContentType: true,
-                    canEditContentType: true,
-                    canViewBuildRecipes: true,
-                    canEditBuildRecipes: true,
-                    canViewTemplates: true,
-                    canEditTemplates: true,
-                    canViewStorage: true,
-                    canEditStorage: true,
-                    canViewDeploy: true,
-                    canEditDeploy: true,
-                },
-            },
-        ],
-        stagingBranches: [],
-    }, null, 2);
-}
-export function generateContentTypesJson() {
-    return JSON.stringify([], null, 2);
-}
-export function generateVersionJson() {
-    return JSON.stringify({ version: '0.0.0' }, null, 2);
-}
 export function generateRedirects() {
     // 順序重要: 先にマッチしたルールが適用される
     return [
@@ -132,197 +101,325 @@ export const onRequest: PagesFunction<Env> = async (context) => {
 }
 `;
 }
-export function generateViteConfig() {
-    return `import { defineConfig, type Plugin } from 'vite'
-import { resolve } from 'path'
-import { spawn, type ChildProcess } from 'child_process'
-
-const templateAssets = resolve(__dirname, 'frelio-data/site/templates/assets')
-const entries = resolve(templateAssets, 'entries')
-
-/** dev server 起動時にコンテンツ変更監視を自動開始する Vite プラグイン */
-function contentWatcherPlugin(): Plugin {
-  let watcher: ChildProcess | null = null
-  return {
-    name: 'content-watcher',
-    apply: 'serve',
-    configureServer(server) {
-      watcher = spawn('npx', ['tsx', 'scripts/watch-content.ts'], {
-        cwd: resolve(__dirname),
-        stdio: 'inherit',
-        shell: true,
-      })
-      watcher.on('error', (err) => {
-        console.error('[content-watcher] Failed to start:', err.message)
-      })
-      server.httpServer?.on('close', () => {
-        watcher?.kill()
-      })
-    },
-    buildEnd() {
-      watcher?.kill()
-      watcher = null
-    },
+// --- Terraform generators ---
+export function generateTerraformProviders() {
+    return `terraform {
+  required_version = ">= 1.5.0"
+
+  required_providers {
+    cloudflare = {
+      source  = "cloudflare/cloudflare"
+      version = "~> 5.0"
+    }
   }
+
+  # Cloudflare R2 をリモートバックエンドとして使う場合はコメントを外す:
+  # backend "s3" {
+  #   bucket                      = "terraform-state"
+  #   key                         = "frelio/terraform.tfstate"
+  #   region                      = "auto"
+  #   skip_credentials_validation = true
+  #   skip_metadata_api_check     = true
+  #   skip_region_validation      = true
+  #   skip_requesting_account_id  = true
+  #   skip_s3_checksum            = true
+  #   endpoints = {
+  #     s3 = "https://<account_id>.r2.cloudflarestorage.com"
+  #   }
+  # }
 }
 
-/** ビルド時に CSS を対応する JS チャンクのパスに合わせて styles/ 配下へ配置する */
-function cssRelocatePlugin(): Plugin {
-  return {
-    name: 'css-relocate',
-    apply: 'build',
-    enforce: 'post',
-    generateBundle(_, bundle) {
-      const renames: Array<{ chunkName: string; oldCss: string; newCss: string }> = []
-
-      for (const chunk of Object.values(bundle)) {
-        if (chunk.type !== 'chunk' || !chunk.isEntry) continue
-        const meta = (chunk as any).viteMetadata as
-          | { importedCss?: Set<string> }
-          | undefined
-        if (!meta?.importedCss?.size) continue
-
-        const newCss = chunk.name.replace('/scripts/', '/styles/') + '.css'
-        for (const oldCss of meta.importedCss) {
-          if (oldCss !== newCss) {
-            renames.push({ chunkName: chunk.name, oldCss, newCss })
-          }
-        }
-      }
+provider "cloudflare" {
+  api_token = var.cloudflare_api_token
+}
+`;
+}
+export function generateTerraformVariables(config) {
+    return `# --- 必須変数 ---
 
-      for (const { oldCss, newCss } of renames) {
-        const asset = bundle[oldCss]
-        if (!asset) continue
-        delete bundle[oldCss]
-        asset.fileName = newCss
-        bundle[newCss] = asset
-      }
+variable "cloudflare_account_id" {
+  type        = string
+  description = "Cloudflare Account ID"
+}
+
+variable "cloudflare_api_token" {
+  type        = string
+  sensitive   = true
+  description = "Cloudflare API Token (Pages + R2 の操作権限が必要)"
+}
+
+variable "github_client_id" {
+  type        = string
+  description = "GitHub OAuth App Client ID"
+}
+
+variable "github_client_secret" {
+  type        = string
+  sensitive   = true
+  description = "GitHub OAuth App Client Secret"
+}
+
+# --- リソース名 ---
+
+variable "r2_bucket_name" {
+  type        = string
+  default     = "${config.r2BucketName}"
+  description = "R2 バケット名"
+}
+
+variable "pages_project_name" {
+  type        = string
+  default     = "${config.pagesProjectName}"
+  description = "コンテンツ配信 Pages プロジェクト名"
+}
 
-      for (const chunk of Object.values(bundle)) {
-        if (chunk.type !== 'chunk' || !chunk.isEntry) continue
-        const meta = (chunk as any).viteMetadata as
-          | { importedCss?: Set<string> }
-          | undefined
-        if (!meta?.importedCss) continue
-        for (const { oldCss, newCss } of renames) {
-          if (meta.importedCss.has(oldCss)) {
-            meta.importedCss.delete(oldCss)
-            meta.importedCss.add(newCss)
-          }
-        }
+variable "admin_pages_project_name" {
+  type        = string
+  default     = "${config.adminPagesProjectName}"
+  description = "管理画面 Pages プロジェクト名"
+}
+
+variable "r2_public_url" {
+  type        = string
+  default     = "${config.r2PublicUrl}"
+  description = "R2 公開 URL（例: https://yourdomain.com/storage）"
+}
+
+# --- オプション: カスタムドメイン ---
+
+variable "production_domain" {
+  type        = string
+  default     = ""
+  description = "本番カスタムドメイン（空なら *.pages.dev で運用）"
+}
+
+variable "admin_domain" {
+  type        = string
+  default     = ""
+  description = "管理画面カスタムドメイン（空なら *.pages.dev で運用）"
+}
+
+variable "staging_domain" {
+  type        = string
+  default     = ""
+  description = "ステージングカスタムドメイン（空ならブランチプレビュー URL で運用）"
+}
+`;
+}
+export function generateTerraformMain(config) {
+    return `# --- R2 バケット ---
+
+resource "cloudflare_r2_bucket" "files" {
+  account_id = var.cloudflare_account_id
+  name       = var.r2_bucket_name
+}
+
+# --- Pages プロジェクト（コンテンツ配信） ---
+
+resource "cloudflare_pages_project" "content" {
+  account_id        = var.cloudflare_account_id
+  name              = var.pages_project_name
+  production_branch = "main"
+}
+
+# --- Pages プロジェクト（管理画面） ---
+
+resource "cloudflare_pages_project" "admin" {
+  account_id        = var.cloudflare_account_id
+  name              = var.admin_pages_project_name
+  production_branch = "admin"
+
+  deployment_configs {
+    production {
+      secrets = {
+        GITHUB_CLIENT_SECRET = var.github_client_secret
+        GITHUB_CLIENT_ID     = var.github_client_id
+      }
+      environment_variables = {
+        R2_PUBLIC_URL = var.r2_public_url
       }
-    },
+    }
   }
 }
 
-export default defineConfig(({ command }) => ({
-  root: 'frelio-data/site/templates',
-  publicDir: command === 'serve' ? resolve(__dirname, 'public') : false,
-  plugins: [contentWatcherPlugin(), cssRelocatePlugin()],
-  resolve: {
-    alias: {
-      '@features': resolve(templateAssets, 'ts/features'),
-    },
-  },
-  css: {
-    preprocessorOptions: {
-      scss: {
-        api: 'modern-compiler',
-        loadPaths: [resolve(templateAssets, 'scss')],
-      },
-    },
-  },
-  build: {
-    outDir: resolve(__dirname, 'public'),
-    emptyOutDir: false,
-    cssCodeSplit: true,
-    rollupOptions: {
-      input: {
-        'common/scripts/index': resolve(entries, 'common/scripts/index.ts'),
-        'home/scripts/index': resolve(entries, 'home/scripts/index.ts'),
-        'about/scripts/index': resolve(entries, 'about/scripts/index.ts'),
-        'contact/scripts/index': resolve(entries, 'contact/scripts/index.ts'),
-        'news/scripts/index': resolve(entries, 'news/scripts/index.ts'),
-        'news/detail/scripts/index': resolve(entries, 'news/detail/scripts/index.ts'),
-      },
-      output: {
-        entryFileNames: '[name].js',
-        assetFileNames: '[name].[ext]',
-      },
-    },
-  },
-  server: {
-    open: '/index.html',
-  },
-}))
+# --- カスタムドメイン（オプション） ---
+
+resource "cloudflare_pages_domain" "production" {
+  count = var.production_domain != "" ? 1 : 0
+
+  account_id   = var.cloudflare_account_id
+  project_name = cloudflare_pages_project.content.name
+  domain       = var.production_domain
+}
+
+resource "cloudflare_pages_domain" "admin" {
+  count = var.admin_domain != "" ? 1 : 0
+
+  account_id   = var.cloudflare_account_id
+  project_name = cloudflare_pages_project.admin.name
+  domain       = var.admin_domain
+}
+
+resource "cloudflare_pages_domain" "staging" {
+  count = var.staging_domain != "" ? 1 : 0
+
+  account_id   = var.cloudflare_account_id
+  project_name = cloudflare_pages_project.content.name
+  domain       = var.staging_domain
+}
+
+# --- Workers（file-upload）---
+# Workers スクリプトは TypeScript のビルドが必要なため、
+# wrangler deploy で個別にデプロイすることを推奨。
+# Terraform で管理する場合は以下のコメントを外し、
+# ビルド済み JS バンドルのパスを workers_script_path に設定する。
+#
+# resource "cloudflare_workers_script" "file_upload" {
+#   account_id = var.cloudflare_account_id
+#   name       = "frelio-file-upload"
+#   content    = file(var.workers_script_path)
+#   module     = true
+#
+#   r2_bucket_binding {
+#     name        = "R2"
+#     bucket_name = cloudflare_r2_bucket.files.name
+#   }
+#
+#   plain_text_binding {
+#     name = "R2_PUBLIC_URL"
+#     text = var.r2_public_url
+#   }
+# }
+
+# --- Cloudflare Access（ステージング保護）---
+# ステージングサイトにアクセス制限を設ける場合はコメントを外す。
+#
+# resource "cloudflare_zero_trust_access_application" "staging" {
+#   account_id                 = var.cloudflare_account_id
+#   name                       = "Frelio Staging"
+#   domain                     = var.staging_domain
+#   type                       = "self_hosted"
+#   session_duration           = "24h"
+#   auto_redirect_to_identity  = false
+# }
+#
+# resource "cloudflare_zero_trust_access_policy" "staging_allow" {
+#   account_id       = var.cloudflare_account_id
+#   application_id   = cloudflare_zero_trust_access_application.staging.id
+#   name             = "Allow members"
+#   decision         = "allow"
+#   precedence       = 1
+#
+#   include {
+#     email = ["admin@example.com"]
+#   }
+# }
 `;
 }
-export function generatePackageJson(config) {
-    return JSON.stringify({
-        name: config.pagesProjectName,
-        private: true,
-        type: 'module',
-        scripts: {
-            dev: 'vite',
-            build: 'vite build',
-            preview: 'vite preview',
-            'generate:dep-map': 'tsx scripts/generate-dependency-map.ts',
-            generate: 'tsx scripts/generate-data-json.ts',
-            'generate:full': 'tsx scripts/generate-data-json.ts --full-rebuild',
-            'generate:dry-run': 'tsx scripts/generate-data-json.ts --dry-run',
-            'generate:html': 'tsx scripts/generate-html.ts',
-            'generate:html:dry-run': 'tsx scripts/generate-html.ts --dry-run',
-            'generate:sitemap': 'tsx scripts/generate-sitemap.ts',
-            'generate:sitemap:full': 'tsx scripts/generate-sitemap.ts --full-rebuild',
-            'watch:content': 'tsx scripts/watch-content.ts',
-            'rebuild:indexes': 'tsx scripts/rebuild-indexes.ts',
-            'rebuild:indexes:dry-run': 'tsx scripts/rebuild-indexes.ts --dry-run',
-        },
-        devDependencies: {
-            '@c-time/frelio-content-ops': '^0.1.0',
-            '@c-time/frelio-data-json-generator': '*',
-            '@c-time/frelio-data-json-recipe': '^1.2.0',
-            '@c-time/frelio-data-json-recipe-to-dependency-map': '*',
-            '@c-time/frelio-dependency-map': '*',
-            '@c-time/frelio-gentl': '*',
-            '@c-time/frelio-types': '^0.1.0',
-            sass: '^1.80.0',
-            tsx: '^4.0.0',
-            typescript: '^5.7.0',
-            vite: '^6.0.0',
-            zod: '^3.25.0',
-        },
-    }, null, 2);
+export function generateTerraformOutputs() {
+    return `output "r2_bucket_name" {
+  value       = cloudflare_r2_bucket.files.name
+  description = "R2 バケット名"
 }
-export function generateTsConfig() {
-    return JSON.stringify({
-        compilerOptions: {
-            target: 'ES2022',
-            module: 'ESNext',
-            moduleResolution: 'bundler',
-            strict: true,
-            esModuleInterop: true,
-            skipLibCheck: true,
-            resolveJsonModule: true,
-            outDir: 'dist',
-        },
-        include: ['frelio-data/site/templates/assets/ts/**/*.ts', 'vite.config.ts'],
-    }, null, 2);
+
+output "content_pages_url" {
+  value       = "\${cloudflare_pages_project.content.name}.pages.dev"
+  description = "コンテンツ配信 Pages URL"
 }
-export function generateTsConfigNode() {
-    return JSON.stringify({
-        compilerOptions: {
-            target: 'ES2022',
-            module: 'NodeNext',
-            moduleResolution: 'NodeNext',
-            strict: true,
-            esModuleInterop: true,
-            skipLibCheck: true,
-            resolveJsonModule: true,
-            outDir: 'dist',
-        },
-        include: ['scripts/**/*.ts'],
-    }, null, 2);
+
+output "admin_pages_url" {
+  value       = "\${cloudflare_pages_project.admin.name}.pages.dev"
+  description = "管理画面 Pages URL"
+}
+
+output "production_domain" {
+  value       = length(cloudflare_pages_domain.production) > 0 ? cloudflare_pages_domain.production[0].domain : null
+  description = "本番カスタムドメイン"
+}
+
+output "admin_domain" {
+  value       = length(cloudflare_pages_domain.admin) > 0 ? cloudflare_pages_domain.admin[0].domain : null
+  description = "管理画面カスタムドメイン"
+}
+`;
+}
+export function generateTerraformTfvarsExample(config) {
+    return `# Cloudflare
+cloudflare_account_id = "<YOUR_CLOUDFLARE_ACCOUNT_ID>"
+cloudflare_api_token  = "<YOUR_CLOUDFLARE_API_TOKEN>"
+
+# GitHub OAuth
+github_client_id     = "${config.githubClientId || '<YOUR_GITHUB_CLIENT_ID>'}"
+github_client_secret = "<YOUR_GITHUB_CLIENT_SECRET>"
+
+# リソース名
+r2_bucket_name           = "${config.r2BucketName}"
+pages_project_name       = "${config.pagesProjectName}"
+admin_pages_project_name = "${config.adminPagesProjectName}"
+r2_public_url            = "${config.r2PublicUrl || '<YOUR_R2_PUBLIC_URL>'}"
+
+# カスタムドメイン（不要なら空文字のまま）
+production_domain = "${config.productionUrl ? new URL(config.productionUrl).hostname : ''}"
+admin_domain      = ""
+staging_domain    = "${config.stagingDomain}"
+`;
+}
+export function generateTerraformReadme() {
+    return `# Terraform - Cloudflare インフラ管理
+
+Frelio で使用する Cloudflare リソースを Terraform で管理します。
+
+## 前提条件
+
+- [Terraform CLI](https://developer.hashicorp.com/terraform/install) >= 1.5.0
+- Cloudflare API トークン（Pages + R2 の操作権限）
+  - Cloudflare Dashboard → My Profile → API Tokens → Create Token
+
+## セットアップ
+
+\`\`\`bash
+cd terraform
+
+# 1. 変数ファイルを作成
+cp terraform.tfvars.example terraform.tfvars
+# terraform.tfvars を編集し、実際の値を入力
+
+# 2. 初期化
+terraform init
+
+# 3. 変更確認
+terraform plan
+
+# 4. 適用
+terraform apply
+\`\`\`
+
+## 注意事項
+
+- \`terraform.tfvars\` にはシークレットが含まれるため **git にコミットしないこと**
+- シークレットは環境変数でも設定可能: \`TF_VAR_cloudflare_api_token\`, \`TF_VAR_github_client_secret\`
+- Pages シークレットは write-only のため、\`terraform plan\` で常に差分が表示されます（正常動作）
+
+## 既存リソースのインポート
+
+\`frelio init\`（wrangler ベース）で作成済みのリソースがある場合:
+
+\`\`\`bash
+# R2 バケット
+terraform import cloudflare_r2_bucket.files <account_id>/<bucket_name>
+
+# Pages プロジェクト（コンテンツ配信）
+terraform import cloudflare_pages_project.content <account_id>/<project_name>
+
+# Pages プロジェクト（管理画面）
+terraform import cloudflare_pages_project.admin <account_id>/<admin_project_name>
+\`\`\`
+
+## リモートステート（チーム運用向け）
+
+デフォルトはローカルステートです。チームで運用する場合は \`providers.tf\` の
+S3 バックエンド設定をコメント解除し、Cloudflare R2 をリモートバックエンドとして使用できます。
+`;
 }
 /**
  * ファイルを書き込む（ディレクトリがなければ作成）

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c-time/frelio-cli",
-  "version": "1.3.13",
+  "version": "1.4.1",
   "description": "Frelio CMS setup CLI",
   "license": "MIT",
   "type": "module",
@@ -8,8 +8,7 @@
     "frelio": "./dist/index.js"
   },
   "files": [
-    "dist",
-    "templates"
+    "dist"
   ],
   "publishConfig": {
     "access": "public"