@rife/cli 0.0.6-beta.2 → 0.0.6-beta.20

package/dist/esm/sync.mjs

@@ -0,0 +1,46 @@
+import 'module';
+/*#__PURE__*/ import.meta.url;
+async function sync(name) {
+    const res = await fetch(`https://registry-direct.npmmirror.com/-/package/${name}/syncs`, {
+        headers: {
+            accept: '*/*',
+            'accept-language': 'zh-CN,zh;q=0.9,en;q=0.8',
+            'sec-ch-ua': '"Not_A Brand";v="8", "Chromium";v="120", "Google Chrome";v="120"',
+            'sec-ch-ua-mobile': '?0',
+            'sec-ch-ua-platform': '"Windows"',
+            'sec-fetch-dest': 'empty',
+            'sec-fetch-mode': 'cors',
+            'sec-fetch-site': 'same-site',
+            Referer: 'https://npmmirror.com/',
+            'Referrer-Policy': 'strict-origin-when-cross-origin'
+        },
+        body: null,
+        method: 'PUT'
+    });
+    const body = await res.json();
+    if (true === body.ok) console.log(`同步 ${name} 成功`);
+    return body;
+}
+const list = [
+    '@rife/config',
+    '@rife/cli'
+];
+async function main() {
+    for (const item of list)await sync(item);
+    poll();
+}
+main();
+async function get(name) {
+    try {
+        const res = await fetch(`https://r.cnpmjs.org/${name}?t=${Date.now()}&cache=0`);
+        const data = await res.json();
+        return `${name}  ${data?.['dist-tags']?.['latest']}`;
+    } catch (e) {
+        return `${name} error`;
+    }
+}
+async function poll() {
+    const res = await Promise.all(list.map(get));
+    console.log(`${res.join('\n')}\n`);
+    setTimeout(poll, 1000);
+}

package/dist/esm/util.mjs

@@ -0,0 +1,12 @@
+import 'module';
+/*#__PURE__*/ import.meta.url;
+import { fileURLToPath } from "node:url";
+import path from "path";
+import fs_extra from "fs-extra";
+import * as __rspack_external_glob from "glob";
+const getDuration = (perfStart)=>{
+    const duration = ((performance.now() - perfStart) / 1000).toFixed(3);
+    return `耗时 ${duration} s`;
+};
+const resolve = (...args)=>path.resolve(path.dirname(fileURLToPath(import.meta.url)), ...args);
+export { fs_extra as fs, getDuration, __rspack_external_glob as glob, resolve };

package/package.json

@@ -1,49 +1,51 @@
 {
   "name": "@rife/cli",
-  "version": "0.0.6-beta.2",
+  "version": "0.0.6-beta.20",
   "description": "",
-  "main": "./dist/index.js",
-  "types": "./src/index.ts",
+  "type": "module",
+  "exports": {
+    ".": {
+      "require": "./dist/cjs/index.cjs",
+      "import": "./dist/esm/index.mjs",
+      "types": "./src/index.ts"
+    }
+  },
   "bin": {
-    "rife": "./dist/cli.js"
+    "rife": "./dist/esm/cli.mjs"
   },
   "files": [
     "dist/**/*",
     "src/**/*"
   ],
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
   "dependencies": {
-    "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.13.1",
-    "typescript": "^5.7.3",
-    "tslib": "^2.8.1",
-    "@swc/cli": "^0.6.0",
-    "@swc/helpers": "^0.5.15",
-    "chokidar": "^4.0.3",
     "commander": "^10.0.1",
-    "consola": "^3.4.0",
-    "esbuild": "^0.25.0",
-    "fs-extra": "^11.1.1",
-    "tapable": "^2.2.1",
-    "vitest": "^3.0.2",
-    "zod": "^3.24.1",
-    "@rife/config": "0.0.6-beta.5"
+    "consola": "^3.4.2",
+    "fs-extra": "^11.3.2",
+    "glob": "^11.0.3",
+    "tapable": "^2.3.0",
+    "zod": "^3.25.76"
+  },
+  "devDependencies": {
+    "@rslib/core": "^0.18.5",
+    "@types/fs-extra": "^11.0.4",
+    "@types/node": "^22.16.0",
+    "vitest": "^4.0.16",
+    "@rsbuild/plugin-type-check": "^1.3.0",
+    "@rife/config": "0.0.6-beta.11"
   },
   "rife": {
     "hostDependencies": {
       "@types/node": true,
       "@rife/config": true,
-      "tslib": true,
-      "@swc/helpers": true,
-      "vitest": true
+      "fs-extra": true,
+      "@types/fs-extra": true
     }
   },
   "scripts": {
-    "dev": "tsc --watch",
-    "build": "esbuild src/pnpmfile.ts --bundle --platform=node --outfile=D:/work/traver/pnpmfile.js --watch",
+    "dev": "rslib build --watch",
+    "build": "rslib build",
     "test": "vitest",
-    "release": "pnpm publish --registry https://registry.npmjs.org --no-git-checks"
+    "release": "rslib build && pnpm publish --registry https://registry.npmjs.org --no-git-checks --access public --tag beta",
+    "lint": "eslint"
   }
 }

package/src/cli.ts

@@ -1,19 +1,23 @@
-import { pluginCommander, pluginConfig, pluginPackage } from './plugin';
-import { Plugin, createRunner } from './runner';
-
-const plugins: Plugin[] = [
-    pluginPackage(), //
-    pluginConfig(),
-    pluginCommander(),
-];
-
-const runner = createRunner();
-
-plugins.forEach(plugin => plugin.apply(runner));
-
-(async () => {
-    await runner.hook.loadPackage.promise();
-    await runner.hook.loadConfig.promise();
-    await runner.hook.validateConfig.promise();
-    await runner.hook.startCommand.promise();
-})();
+import { pluginCommander, pluginConfig, pluginPackage, pluginRelease } from './plugin';
+import { Plugin, createRunner } from './runner';
+
+const plugins: Plugin[] = [
+    pluginPackage(), //
+    pluginConfig(),
+    pluginCommander(),
+    pluginRelease(),
+];
+
+const runner = createRunner();
+
+plugins.forEach(plugin => plugin.apply(runner));
+
+(async () => {
+    await runner.hook.loadPackage.promise();
+    await runner.hook.loadConfig.promise();
+    await runner.hook.validateConfig.promise();
+    await runner.hook.applyConfig.promise();
+    await runner.hook.validatePlugin.promise();
+    await runner.hook.registerCommand.promise();
+    await runner.hook.startCommand.promise();
+})();

package/src/index.ts

@@ -1,3 +1,4 @@
-export * from './runner';
-export * from './plugin';
-export * from './logger';
+export * from './runner';
+export * from './plugin';
+export * from './logger';
+export * from './util';

package/src/logger.ts

@@ -1,34 +1,17 @@
-import { createConsola } from 'consola';
-
-export interface Logger {
-    debug: (message: string, ...args: any[]) => any;
-    info: (message: string, ...args: any[]) => any;
-    error: (message: string, ...args: any[]) => any;
-    success: (message: string, ...args: any[]) => any;
-    fail: (message: string, ...args: any[]) => any;
-    withTag: (tag: string) => Logger;
-}
-
-export function createLogger() {
-    const instance = createConsola({
-        level: 4,
-        // fancy: false,
-        formatOptions: {
-            // columns: 80,
-            // colors: false,
-            compact: false,
-            date: false,
-        },
-    });
-
-    const logger: Logger = {
-        debug: (message, ...args) => instance.info(message, ...args),
-        info: (message, ...args) => instance.info(message, ...args),
-        error: (message, ...args) => instance.error(message, ...args),
-        success: (message, ...args) => instance.success(message, ...args),
-        fail: (message, ...args) => instance.fail(message, ...args),
-        withTag: tag => instance.withTag(tag),
-    };
-
-    return logger;
-}
+import { createConsola } from 'consola';
+
+export function createLogger(options?: { debug?: boolean }) {
+    const instance = createConsola({
+        level: options?.debug ? 4 : 3,
+        throttle: 10,
+        throttleMin: 500,
+        formatOptions: {
+            // columns: 80,
+            // colors: false,
+            compact: false,
+            date: false,
+        },
+    });
+
+    return instance;
+}

package/src/plugin/commander.ts

@@ -1,44 +1,49 @@
-import type { Plugin } from '../runner';
-
-export function pluginCommander() {
-    const plugin: Plugin = {
-        name: pluginCommander.name,
-        apply: runner => {
-            const { hook, config, z } = runner;
-
-            hook.startCommand.tapPromise(pluginCommander.name, async () => {
-                const { Command } = require('commander') as typeof import('commander');
-                const program = new Command();
-                program
-                    .command('dev')
-                    .option('-n, --name <string>', '', '')
-                    .description('启动开发')
-                    .action(async options => {
-                        await hook.applyConfig.promise(options);
-                        await hook.dev.promise();
-                    });
-
-                program
-                    .command('build')
-                    .option('-n, --name <string>', '', '')
-                    .description('构建项目')
-                    .action(async options => {
-                        await hook.applyConfig.promise(options);
-                        await hook.build.promise();
-                    });
-
-                program
-                    .command('release')
-                    .option('-n, --name <string>', '', '')
-                    .description('发布包')
-                    .action(async options => {
-                        await hook.applyConfig.promise(options);
-                        await hook.release.promise();
-                    });
-
-                program.parseAsync(process.argv);
-            });
-        },
-    };
-    return plugin;
-}
+import type { Plugin } from '../runner';
+
+export function pluginCommander() {
+    const plugin: Plugin = {
+        name: pluginCommander.name,
+        apply: runner => {
+            const { hook, command, config, z, logger } = runner;
+            const log = logger.withTag(pluginCommander.name);
+            hook.registerCommand.tapPromise(pluginCommander.name, async () => {
+                command
+                    .command('dev')
+                    .description('启动开发')
+                    .action(async () => {
+                        process.env.NODE_ENV = 'development';
+                        await hook.dev.promise();
+                    });
+
+                command
+                    .command('build')
+                    .description('构建项目')
+                    .action(async () => {
+                        process.env.NODE_ENV = 'production';
+                        await hook.build.promise();
+                    });
+
+                command
+                    .command('release')
+                    .description('发布包')
+                    .action(async () => {
+                        await hook.release.promise();
+                    });
+
+                command
+                    .command('deploy')
+                    .description('部署项目')
+                    .action(async () => {
+                        await hook.deploy.promise().catch(e => {
+                            log.fail(`部署失败，${runner.duration}，${e.message}`);
+                        });
+                    });
+            });
+
+            hook.startCommand.tapPromise(pluginCommander.name, async () => {
+                await command.parseAsync(process.argv);
+            });
+        },
+    };
+    return plugin;
+}

package/src/plugin/config.ts

@@ -6,18 +6,32 @@ export function pluginConfig() {
     const plugin: Plugin = {
         name: pluginConfig.name,
         apply: runner => {
-            const { logger, hook, config, fs, z } = runner;
+            const { logger, hook, config, command, fs, z } = runner;
             const log = logger.withTag(pluginConfig.name);
 
             hook.loadConfig.tapPromise(pluginConfig.name, async () => {
-                const fileName = '.app.js';
-                const filePath = path.posix.resolve(fileName);
+                let filePath = '';
+                const mjs = 'app.mjs';
+                const fileNames = ['app.js', 'app.cjs', mjs];
+                let isEsm = false;
+                for (const fileName of fileNames) {
+                    if (await fs.exists(fileName)) {
+                        filePath = path.posix.resolve(fileName);
+                        isEsm = fileName === mjs;
+                        break;
+                    }
+                }
                 log.debug(`filePath %s`, filePath);
-                if (!fs.existsSync(filePath)) {
-                    log.error(`找不到配置文件 ${fileName}`);
+                if (!filePath) {
+                    log.error(`找不到配置文件 app.(c|m)?js`);
                     process.exit(1);
                 }
-                const all: Config[] = require(filePath);
+                let all: Config[] = [];
+                if (isEsm) {
+                    all = (await import(filePath)).default;
+                } else {
+                    all = require(filePath);
+                }
                 runner.config.all = all;
             });
 
@@ -36,12 +50,13 @@ export function pluginConfig() {
                 }
             });
 
-            hook.applyConfig.tapPromise(pluginConfig.name, async options => {
+            hook.applyConfig.tapPromise(pluginConfig.name, async () => {
                 const result = z
                     .object({
-                        name: z.string().trim().optional(),
+                        name: z.string().trim().default(''),
                     })
-                    .safeParse(options);
+                    .default({})
+                    .safeParse(command.opts());
                 const name = result.data?.name;
                 if (!name) {
                     log.debug('没有指定 --name，默认使用列表第一个');

package/src/plugin/index.ts

@@ -1,4 +1,4 @@
 export * from './config';
 export * from './package';
 export * from './commander';
-export * from './compiler';
+export * from './release';

package/src/plugin/package.ts

@@ -1,8 +1,5 @@
-import type { ChildProcess } from 'child_process';
 import path from 'path';
 
-import { AsyncSeriesHook } from 'tapable';
-
 import type { Plugin } from '../runner';
 
 export function pluginPackage() {

package/src/plugin/release.ts

@@ -1,32 +1,113 @@
-import type { ChildProcess } from 'child_process';
-import path from 'path';
-
-import { AsyncSeriesHook } from 'tapable';
-
-import type { Plugin } from '../runner';
-
-export function pluginRelease() {
-    const plugin: Plugin = {
-        name: pluginRelease.name,
-        apply: runner => {
-            const { logger, hook, fs } = runner;
-            const log = logger.withTag(pluginRelease.name);
-            hook.loadPackage.tapPromise(pluginRelease.name, async () => {
-                const fileName = 'package.json';
-                const filePath = path.resolve(fileName);
-                if (!fs.existsSync(filePath)) {
-                    log.error(`找不到文件 ${fileName}`);
-                    process.exit(1);
-                }
-                try {
-                    const data = require(filePath);
-                    runner.package = data;
-                } catch (e) {
-                    log.error(`读取文件失败`, e.message);
-                    process.exit(1);
-                }
-            });
-        },
-    };
-    return plugin;
-}
+import { execSync } from 'child_process';
+
+import type { Plugin } from '../runner';
+
+export function pluginRelease() {
+    const plugin: Plugin = {
+        name: pluginRelease.name,
+        apply: runner => {
+            const { logger, hook, fs } = runner;
+            const log = logger.withTag(pluginRelease.name);
+            hook.release.tapPromise(pluginRelease.name, async () => {
+                runner.clear();
+                await hook.build.promise();
+
+                log.start('开始发布');
+                const packageVersion = runner.package.version;
+                const packageName = runner.package.name;
+                const url = `https://registry.npmjs.org/${packageName}`;
+                let nextVersion = packageVersion;
+                log.debug(`查询版本号 ${packageVersion} 是否存在`);
+                const res = await (await fetch(url)).json();
+                const exist = res?.versions?.[packageVersion];
+                if (exist) {
+                    const split = packageVersion.split('.');
+                    split[split.length - 1] = Number(split[split.length - 1]) + 1;
+                    nextVersion = split.join('.');
+                    log.debug(`版本号 ${packageVersion} 存在，更新版本号为 ${nextVersion}`);
+                    const text = fs.readFileSync('./package.json').toString();
+                    const nextText = text.replace(new RegExp(`"version":\\s*"${packageVersion}"`), `"version": "${nextVersion}"`);
+                    fs.writeFileSync('./package.json', nextText);
+                }
+                log.debug(`版本号 ${packageVersion} 不存在`);
+                log.info(`版本号为 ${nextVersion}`);
+
+                const tempDir = `./node_modules/.rife/release/`;
+                log.info(`清空目录 ${tempDir}`);
+                fs.emptyDirSync(tempDir);
+
+                const pack = `pnpm pack --pack-destination ${tempDir} --json`;
+                log.info(`打包文件 ${pack}`);
+                const packOutput = JSON.parse(execSync(pack).toString());
+                const filename = packOutput.filename;
+                for (const item of packOutput.files) {
+                    log.debug(item.path);
+                }
+
+                const debug = false;
+                const publish = `pnpm publish ${filename} --registry https://registry.npmjs.org --no-git-checks --tag beta ${
+                    debug ? '--dry-run' : ''
+                }`;
+                log.info(`发布文件 ${publish}`);
+                execSync(publish, { stdio: 'inherit' });
+                log.success(`发布成功，${runner.duration}`);
+
+                log.info('同步版本');
+                let hasSync = false;
+                while (true) {
+                    const res = await queryVersion(packageName);
+                    const nextManifest = res?.versions?.[nextVersion];
+                    const exist = Boolean(nextManifest);
+                    const latest = res?.['dist-tags']?.latest;
+                    if (exist) {
+                        log.debug(`同步版本存在`);
+                        break;
+                    }
+                    log.info(`检查版本 ${nextVersion} 不存在，最新版本为 ${latest}`);
+                    if (!hasSync) {
+                        hasSync = true;
+                        log.start(`开始同步`);
+                        const sync = await syncVersion(packageName);
+                        if (sync.ok === true) {
+                            log.info(
+                                `调用同步接口成功，日志 https://registry.npmmirror.com/-/package/${packageName}/syncs/${sync.id}/log`,
+                            );
+                        } else {
+                            log.debug(`调用同步接口失败，%j`, sync);
+                        }
+                    }
+                    await new Promise(resolve => setTimeout(resolve, 2000));
+                }
+                log.success(`同步成功，${runner.duration}`);
+            });
+        },
+    };
+    return plugin;
+}
+
+async function queryVersion(packageName: string) {
+    const res = await (await fetch(`https://registry.npmmirror.com/${packageName}?t=${Math.random()}`)).json();
+    return res;
+}
+
+async function syncVersion(packageName: string) {
+    const sync = await (
+        await fetch(`https://registry-direct.npmmirror.com/-/package/${packageName}/syncs`, {
+            headers: {
+                accept: '*/*',
+                'accept-language': 'zh-CN,zh;q=0.9,en;q=0.8',
+                'sec-ch-ua': '"Not_A Brand";v="8", "Chromium";v="120", "Google Chrome";v="120"',
+                'sec-ch-ua-mobile': '?0',
+                'sec-ch-ua-platform': '"Windows"',
+                'sec-fetch-dest': 'empty',
+                'sec-fetch-mode': 'cors',
+                'sec-fetch-site': 'same-site',
+                Referer: 'https://npmmirror.com/',
+                'Referrer-Policy': 'strict-origin-when-cross-origin',
+            },
+            body: null,
+            method: 'PUT',
+        })
+    ).json();
+    return sync;
+}