@c-time/frelio-cli 1.3.0 → 1.3.11

package/dist/commands/init.js

@@ -6,7 +6,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
 import { exec, commandExists, log, logStep, logSuccess, logError } from '../lib/shell.js';
-import { getLatestRelease, downloadTarball } from '../lib/github-release.js';
+import { getLatestRelease, downloadTarball, extractNpmTarball } from '../lib/npm-registry.js';
 import { generateInitialContent } from '../lib/initial-content.js';
 import { generateConfigJson, generateWranglerToml, generateUsersIndex, generateVersionJson, generateRedirects, generateRoutesJson, generateStorageFunction, generateViteConfig, generatePackageJson, generateTsConfig, generateTsConfigNode, generateStagingDomain, writeFile, ensureDir, } from '../lib/templates.js';
 import { validateContentRepo, validateR2PublicUrl, validateRequired } from '../lib/validators.js';
@@ -559,35 +559,31 @@ jobs:
 async function extractBundle(projectDir) {
     const release = await getLatestRelease();
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'frelio-'));
-    const tarPath = await downloadTarball(release, tmpDir);
-    // tar で展開
-    const { extract } = await import('tar');
-    await extract({ file: tarPath, cwd: tmpDir });
-    // 展開されたディレクトリを特定
-    const entries = fs.readdirSync(tmpDir).filter((e) => e.startsWith('frelio-cms-'));
-    const bundleDir = entries.find((e) => fs.statSync(path.join(tmpDir, e)).isDirectory());
-    if (!bundleDir) {
-        throw new Error('Bundle directory not found in tarball');
-    }
-    const srcDir = path.join(tmpDir, bundleDir);
-    // admin/ をコピー
-    if (fs.existsSync(path.join(srcDir, 'admin'))) {
-        copyDir(path.join(srcDir, 'admin'), path.join(projectDir, 'admin'));
-    }
-    // functions/ をコピー
-    if (fs.existsSync(path.join(srcDir, 'functions'))) {
-        copyDir(path.join(srcDir, 'functions'), path.join(projectDir, 'functions'));
+    try {
+        const tarPath = await downloadTarball(release, tmpDir);
+        const { adminDir, functionsDir, workersDir } = await extractNpmTarball(tarPath, tmpDir);
+        // admin/ をコピー（dist/ の中身から functions/ を除く）
+        if (fs.existsSync(adminDir)) {
+            copyDir(adminDir, path.join(projectDir, 'admin'), ['functions']);
+        }
+        // functions/ をコピー（dist/functions/ → functions/）
+        if (fs.existsSync(functionsDir)) {
+            copyDir(functionsDir, path.join(projectDir, 'functions'));
+        }
+        // workers/ をコピー（Pages Functions が import する）
+        if (fs.existsSync(workersDir)) {
+            copyDir(workersDir, path.join(projectDir, 'workers'));
+        }
     }
-    // workers/ をコピー（Pages Functions が import する）
-    if (fs.existsSync(path.join(srcDir, 'workers'))) {
-        copyDir(path.join(srcDir, 'workers'), path.join(projectDir, 'workers'));
+    finally {
+        fs.rmSync(tmpDir, { recursive: true, force: true });
     }
-    // クリーンアップ
-    fs.rmSync(tmpDir, { recursive: true, force: true });
 }
-function copyDir(src, dest) {
+function copyDir(src, dest, exclude = []) {
     fs.mkdirSync(dest, { recursive: true });
     for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+        if (exclude.includes(entry.name))
+            continue;
         const srcPath = path.join(src, entry.name);
         const destPath = path.join(dest, entry.name);
         if (entry.isDirectory()) {

package/dist/commands/update.js

@@ -4,7 +4,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
-import { getLatestRelease, getRelease, downloadTarball } from '../lib/github-release.js';
+import { getLatestRelease, getRelease, downloadTarball, extractNpmTarball } from '../lib/npm-registry.js';
 import { log, logSuccess, logError } from '../lib/shell.js';
 export async function updateCommand(options) {
     log('');
@@ -34,37 +34,29 @@ export async function updateCommand(options) {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'frelio-update-'));
     try {
         const tarPath = await downloadTarball(release, tmpDir);
-        const { extract } = await import('tar');
-        await extract({ file: tarPath, cwd: tmpDir });
-        // 展開されたディレクトリを特定
-        const entries = fs.readdirSync(tmpDir).filter((e) => e.startsWith('frelio-cms-'));
-        const bundleDir = entries.find((e) => fs.statSync(path.join(tmpDir, e)).isDirectory());
-        if (!bundleDir) {
-            throw new Error('Bundle directory not found in tarball');
-        }
-        const srcDir = path.join(tmpDir, bundleDir);
-        // admin/ を置き換え
-        if (fs.existsSync(path.join(srcDir, 'admin'))) {
+        const { adminDir: srcAdminDir, functionsDir: srcFunctionsDir, workersDir: srcWorkersDir } = await extractNpmTarball(tarPath, tmpDir);
+        // admin/ を置き換え（dist/ の中身から functions/ を除く）
+        if (fs.existsSync(srcAdminDir)) {
             fs.rmSync(adminDir, { recursive: true, force: true });
-            copyDir(path.join(srcDir, 'admin'), adminDir);
+            copyDir(srcAdminDir, adminDir, ['functions']);
             logSuccess('admin/ を更新しました');
         }
         // functions/api/ を置き換え（functions/storage/ はユーザー管理なので保持）
         const functionsApiDir = path.join(projectDir, 'functions', 'api');
-        if (fs.existsSync(path.join(srcDir, 'functions', 'api'))) {
+        if (fs.existsSync(path.join(srcFunctionsDir, 'api'))) {
             if (fs.existsSync(functionsApiDir)) {
                 fs.rmSync(functionsApiDir, { recursive: true, force: true });
             }
-            copyDir(path.join(srcDir, 'functions', 'api'), functionsApiDir);
+            copyDir(path.join(srcFunctionsDir, 'api'), functionsApiDir);
             logSuccess('functions/api/ を更新しました');
         }
         // workers/ を置き換え（Pages Functions が import する）
-        const workersDir = path.join(projectDir, 'workers');
-        if (fs.existsSync(path.join(srcDir, 'workers'))) {
-            if (fs.existsSync(workersDir)) {
-                fs.rmSync(workersDir, { recursive: true, force: true });
+        const workersDestDir = path.join(projectDir, 'workers');
+        if (fs.existsSync(srcWorkersDir)) {
+            if (fs.existsSync(workersDestDir)) {
+                fs.rmSync(workersDestDir, { recursive: true, force: true });
             }
-            copyDir(path.join(srcDir, 'workers'), workersDir);
+            copyDir(srcWorkersDir, workersDestDir);
             logSuccess('workers/ を更新しました');
         }
         // config.json を復元
@@ -80,9 +72,11 @@ export async function updateCommand(options) {
         fs.rmSync(tmpDir, { recursive: true, force: true });
     }
 }
-function copyDir(src, dest) {
+function copyDir(src, dest, exclude = []) {
     fs.mkdirSync(dest, { recursive: true });
     for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+        if (exclude.includes(entry.name))
+            continue;
         const srcPath = path.join(src, entry.name);
         const destPath = path.join(dest, entry.name);
         if (entry.isDirectory()) {

package/dist/lib/npm-registry.d.ts

@@ -0,0 +1,26 @@
+/**
+ * npm registry からの CMS バンドル取得
+ */
+export type Release = {
+    tag_name: string;
+    tarballUrl: string;
+};
+export declare function getLatestRelease(): Promise<Release>;
+export declare function getRelease(version: string): Promise<Release>;
+export declare function downloadTarball(release: Release, destDir: string): Promise<string>;
+/**
+ * npm tarball を展開し、バンドルディレクトリのパスを返す。
+ *
+ * npm tarball は `package/` ディレクトリに展開される。
+ * 中身は:
+ *   package/dist/          — SPA (index.html, assets/) + bundled functions (functions/)
+ *   package/workers/       — Worker ソース
+ */
+export declare function extractNpmTarball(tarPath: string, tmpDir: string): Promise<{
+    /** SPA ファイル (functions/ を除く dist/ の中身) */
+    adminDir: string;
+    /** バンドル済み Pages Functions */
+    functionsDir: string;
+    /** Worker ソース */
+    workersDir: string;
+}>;

package/dist/lib/npm-registry.js

@@ -0,0 +1,62 @@
+/**
+ * npm registry からの CMS バンドル取得
+ */
+import { createWriteStream } from 'node:fs';
+import { pipeline } from 'node:stream/promises';
+import { Readable } from 'node:stream';
+import path from 'node:path';
+const PACKAGE_NAME = '@c-time/frelio-cms';
+const REGISTRY = 'https://registry.npmjs.org';
+export async function getLatestRelease() {
+    const res = await fetch(`${REGISTRY}/${PACKAGE_NAME}/latest`);
+    if (!res.ok) {
+        throw new Error(`Failed to fetch latest version from npm: ${res.status} ${res.statusText}`);
+    }
+    const info = (await res.json());
+    return {
+        tag_name: `v${info.version}`,
+        tarballUrl: info.dist.tarball,
+    };
+}
+export async function getRelease(version) {
+    const ver = version.startsWith('v') ? version.slice(1) : version;
+    const res = await fetch(`${REGISTRY}/${PACKAGE_NAME}/${ver}`);
+    if (!res.ok) {
+        throw new Error(`Version ${ver} not found on npm: ${res.status}`);
+    }
+    const info = (await res.json());
+    return {
+        tag_name: `v${info.version}`,
+        tarballUrl: info.dist.tarball,
+    };
+}
+export async function downloadTarball(release, destDir) {
+    const destPath = path.join(destDir, `frelio-cms-${release.tag_name}.tgz`);
+    const res = await fetch(release.tarballUrl);
+    if (!res.ok || !res.body) {
+        throw new Error(`Failed to download tarball: ${res.status}`);
+    }
+    const readable = Readable.fromWeb(res.body);
+    await pipeline(readable, createWriteStream(destPath));
+    return destPath;
+}
+/**
+ * npm tarball を展開し、バンドルディレクトリのパスを返す。
+ *
+ * npm tarball は `package/` ディレクトリに展開される。
+ * 中身は:
+ *   package/dist/          — SPA (index.html, assets/) + bundled functions (functions/)
+ *   package/workers/       — Worker ソース
+ */
+export async function extractNpmTarball(tarPath, tmpDir) {
+    const { extract } = await import('tar');
+    await extract({ file: tarPath, cwd: tmpDir });
+    return {
+        /** SPA ファイル (functions/ を除く dist/ の中身) */
+        adminDir: path.join(tmpDir, 'package', 'dist'),
+        /** バンドル済み Pages Functions */
+        functionsDir: path.join(tmpDir, 'package', 'dist', 'functions'),
+        /** Worker ソース */
+        workersDir: path.join(tmpDir, 'package', 'workers'),
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c-time/frelio-cli",
-  "version": "1.3.0",
+  "version": "1.3.11",
   "description": "Frelio CMS setup CLI",
   "license": "MIT",
   "type": "module",

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

@@ -1,15 +0,0 @@
-/**
- * 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

@@ -1,41 +0,0 @@
-/**
- * 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;
-}