@oinone/cli 7.2.7 → 7.2.9

package/README.md

@@ -17,7 +17,8 @@ CLI scaffolding tool to generate Oinone frontend projects.
 ## Requirements
 
 - Node.js to run the CLI
-- pnpm is recommended for installing dependencies in the generated project
+- pnpm (default) or npm for installing dependencies in the generated project
+- Pre-flight requirements for Oinone 7.2+ projects: Node >= 22, lerna 9.0.3, rimraf 6.1.2, pnpm 9 (when building with pnpm) — the CLI offers auto-fix or manual installation when versions mismatch
 
 ## Installation
 
@@ -63,6 +64,12 @@ Create project with `--company-name` / `--project-name`:
 oinone-frontend create --company-name ss --project-name oms --oinone-version 7.2.0 --edition community
 ```
 
+Choose the build tool (default pnpm):
+
+```bash
+oinone-frontend create my-project --oinone-version 7.2.0 --edition community --build-tool npm
+```
+
 Dry-run (no files written):
 
 ```bash
@@ -98,6 +105,7 @@ oinone-frontend doctor --oinone-version 7.2.0
 | `--company-name <name>` | Company/organization name (silent mode) |
 | `--project-name <name>` | Project name (silent mode) |
 | `--download-static-resource <boolean>` | Download static resources (`true`/`false`) |
+| `--build-tool <tool>` | Build tool for the generated project (`pnpm`/`npm`, default `pnpm`; Oinone 6.4.* supports pnpm only) |
 | `-o, --oinone-version <version>` | Oinone version (e.g. `7.2.0`, `6.4.0`) |
 | `-e, --edition <edition>` | Edition (`community`, `enterprise`) |
 | `--auth-token <token>` | Enterprise registry auth token (optional) |

package/README_zh-CN.md

@@ -17,7 +17,8 @@
 ## 环境要求
 
 - 运行 CLI：Node.js
-- 安装生成的前端工程依赖：建议使用 pnpm
+- 安装生成的前端工程依赖：支持 pnpm（默认）/ npm
+- Oinone 7.2+ 工程的预检要求：Node >= 22、lerna 9.0.3、rimraf 6.1.2、pnpm 9（使用 pnpm 构建时）——版本不满足时 CLI 会提示自动修复或稍后手动安装
 
 ## 安装
 
@@ -63,6 +64,12 @@ oinone-frontend create my-project --oinone-version 7.2.0 --edition community
 oinone-frontend create --company-name ss --project-name oms --oinone-version 7.2.0 --edition community
 ```
 
+指定构建工具（默认 pnpm）：
+
+```bash
+oinone-frontend create my-project --oinone-version 7.2.0 --edition community --build-tool npm
+```
+
 演练模式（不落盘）：
 
 ```bash
@@ -98,6 +105,7 @@ oinone-frontend doctor --oinone-version 7.2.0
 | `--company-name <name>` | 静默模式：公司/组织简称 |
 | `--project-name <name>` | 静默模式：项目名；与 `--company-name` 同用时目录名为 `{company}-{project}-frontend` |
 | `--download-static-resource <boolean>` | 是否下载静态资源（`true` / `false`） |
+| `--build-tool <tool>` | 生成工程使用的包管理器（`pnpm` / `npm`，默认 `pnpm`；Oinone 6.4.* 仅支持 pnpm） |
 | `-o, --oinone-version <version>` | Oinone 版本（例如 `7.2.0` / `6.4.0`） |
 | `-e, --edition <edition>` | 版本类型（`community` / `enterprise`） |
 | `--auth-token <token>` | 企业版仓库 auth token（可选） |

package/bin/cli.js

@@ -30,6 +30,7 @@ program
   .option('--company-name <name>', 'Company/Organization name (silent mode)')
   .option('--project-name <name>', 'Project name (silent mode)')
   .option('--download-static-resource <boolean>', t('cli.downloadOpt'))
+  .option('--build-tool <tool>', t('cli.buildToolOpt'))
   .option('-o, --oinone-version <version>', t('cli.versionOpt'))
   .option('-e, --edition <edition>', t('cli.editionOpt'))
   .option('--auth-token <token>', 'Oinone registry auth token (for enterprise edition)')

package/bin/commands/create/index.js

@@ -3,6 +3,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const chalk = require('chalk');
 const ora = require('ora');
+const { execSync } = require('child_process');
 const packageJson = require('../../../package.json');
 const { t } = require('../../i18n');
 const { resolveCreateInputs } = require('./prompts');
@@ -13,6 +14,7 @@ const { handleStaticResources } = require('./static-resources');
 const { fetchKunlunMinorVersionsFromMirror } = require('./version-source');
 const { startNpmDistTagLatestCheck, isNewerVersion } = require('./update-check');
 const { compareSemver, isAtLeast73 } = require('../../utils/oinone-version');
+const { isVersion72Plus, runToolChecks, getFixableInstallCommand } = require('../../utils/env-check');
 
 async function createAction(projectNameArg, options) {
   if (projectNameArg === 'cache') {
@@ -26,12 +28,52 @@ async function createAction(projectNameArg, options) {
       prefix,
       fullProjectName,
       oinoneVersion,
+      buildTool,
       edition,
       downloadStaticResources,
       authToken,
       isSilent
     } = await resolveCreateInputs(projectNameArg, options);
 
+    if (isVersion72Plus(oinoneVersion)) {
+      const issues = runToolChecks({ buildTool }).filter(c => !c.ok);
+      if (issues.length) {
+        console.log(chalk.yellow(t('create.envCheckTitle')));
+        for (const issue of issues) {
+          const toolLabel = issue.tool === 'node' ? 'Node.js' : issue.tool;
+          if (issue.found) {
+            console.log(chalk.yellow(t('create.envCheckVersionMismatch', { tool: toolLabel, expect: issue.expected, actual: issue.actual })));
+          } else {
+            console.log(chalk.yellow(t('create.envCheckNotFound', { tool: toolLabel, spec: issue.installSpec || issue.expected })));
+          }
+        }
+        const installCmd = getFixableInstallCommand(issues);
+        if (installCmd) {
+          if (isSilent) {
+            console.log(chalk.yellow(t('create.envCheckManualHint', { cmd: installCmd })));
+          } else {
+            const { autoFix } = await inquirer.prompt([{
+              type: 'confirm',
+              name: 'autoFix',
+              message: t('create.envCheckAutoFixPrompt', { cmd: installCmd }),
+              default: true
+            }]);
+            if (autoFix) {
+              try {
+                execSync(installCmd, { stdio: 'inherit' });
+                console.log(chalk.green(t('create.envCheckAutoFixDone')));
+              } catch (err) {
+                console.log(chalk.red(t('create.envCheckAutoFixFailed', { msg: err.message })));
+                console.log(chalk.yellow(t('create.envCheckManualHint', { cmd: installCmd })));
+              }
+            } else {
+              console.log(chalk.yellow(t('create.envCheckManualHint', { cmd: installCmd })));
+            }
+          }
+        }
+      }
+    }
+
     const targetPath = path.resolve(process.cwd(), fullProjectName);
 
     if (await fs.pathExists(targetPath)) {
@@ -64,7 +106,8 @@ async function createAction(projectNameArg, options) {
       templatePath,
       targetPath,
       prefix,
-      fullProjectName
+      fullProjectName,
+      buildTool
     });
 
     if (edition === 'enterprise') {
@@ -83,8 +126,8 @@ async function createAction(projectNameArg, options) {
 
     console.log(t('create.partyStarted'));
     console.log(chalk.cyan(`  cd ${fullProjectName}`));
-    console.log(chalk.cyan(`  pnpm install`));
-    console.log(chalk.cyan(`  pnpm run dev\n`));
+    console.log(chalk.cyan(`  ${buildTool} install`));
+    console.log(chalk.cyan(`  ${buildTool} run dev\n`));
     console.log(chalk.magenta(t('create.happyCoding')));
 
     if (isSilent && selectedMinorVersion && compareSemver(selectedMinorVersion, '7.3.0') < 0) {

package/bin/commands/create/project.js

@@ -43,7 +43,7 @@ async function processDirectory(dirPath, prefix) {
   }
 }
 
-async function createProjectFromTemplate({ templatePath, targetPath, prefix, fullProjectName }) {
+async function createProjectFromTemplate({ templatePath, targetPath, prefix, fullProjectName, buildTool }) {
   await fs.copy(templatePath, targetPath, {
     filter: (src) => {
       const relativePath = path.relative(templatePath, src);
@@ -54,6 +54,13 @@ async function createProjectFromTemplate({ templatePath, targetPath, prefix, ful
 
   await processDirectory(targetPath, prefix);
 
+  const lernaPath = path.join(targetPath, 'lerna.json');
+  if (await fs.pathExists(lernaPath)) {
+    const lerna = await fs.readJson(lernaPath);
+    lerna.npmClient = buildTool || 'pnpm';
+    await fs.writeJson(lernaPath, lerna, { spaces: 2 });
+  }
+
   const pkgPath = path.join(targetPath, '_package.json');
   const newPkgPath = path.join(targetPath, 'package.json');
   if (await fs.pathExists(pkgPath)) {

package/bin/commands/create/prompts.js

@@ -1,4 +1,5 @@
 const inquirer = require('inquirer');
+const chalk = require('chalk');
 const { t } = require('../../i18n');
 const { fetchKunlunMinorVersionsFromMirror } = require('./version-source');
 const { compareSemver, normalizeToMinorVersion, isSupportedMinorVersion } = require('../../utils/oinone-version');
@@ -10,6 +11,12 @@ async function resolveCreateInputs(projectNameArg, options) {
   let edition;
   let downloadStaticResources;
 
+  let buildTool = options.buildTool || 'pnpm';
+  if (buildTool !== 'pnpm' && buildTool !== 'npm') {
+    console.error(chalk.red(t('create.errorBuildTool', { tool: buildTool })));
+    process.exit(1);
+  }
+
   const isSilent = !!(projectNameArg || (options.companyName && options.projectName));
 
   if (isSilent) {
@@ -46,6 +53,25 @@ async function resolveCreateInputs(projectNameArg, options) {
       }
     }
     const answers = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'oinoneVersion',
+        message: t('create.promptVersion'),
+        choices: versionChoices,
+        default: '~7.2.0'
+      },
+      {
+        type: 'list',
+        name: 'buildTool',
+        message: t('create.promptBuildTool'),
+        choices: [
+          { name: t('create.buildToolPnpm'), value: 'pnpm' },
+          { name: t('create.buildToolNpm'), value: 'npm' }
+        ],
+        default: buildTool,
+        // Oinone 6.4.* 不支持选择构建工具，仅支持 pnpm
+        when: (answers) => normalizeToMinorVersion(answers.oinoneVersion) !== '6.4.0'
+      },
       {
         type: 'input',
         name: 'companyName',
@@ -76,13 +102,6 @@ async function resolveCreateInputs(projectNameArg, options) {
         ],
         default: 'community'
       },
-      {
-        type: 'list',
-        name: 'oinoneVersion',
-        message: t('create.promptVersion'),
-        choices: versionChoices,
-        default: '~7.2.0'
-      },
       {
         type: 'confirm',
         name: 'downloadStaticResources',
@@ -98,10 +117,20 @@ async function resolveCreateInputs(projectNameArg, options) {
     if (normalizedMinor) {
       oinoneVersion = `~${normalizedMinor}`;
     }
+    buildTool = answers.buildTool;
     edition = answers.edition;
     downloadStaticResources = answers.downloadStaticResources;
   }
 
+  // Oinone 6.4.* 不支持选择构建工具，仅支持 pnpm
+  if (normalizeToMinorVersion(oinoneVersion) === '6.4.0') {
+    if (options.buildTool === 'npm') {
+      console.error(chalk.red(t('create.errorBuildToolUnsupported', { version: oinoneVersion })));
+      process.exit(1);
+    }
+    buildTool = 'pnpm';
+  }
+
   let authToken = options.authToken;
   if (edition === 'enterprise' && !isSilent) {
     if (authToken === undefined) {
@@ -120,7 +149,7 @@ async function resolveCreateInputs(projectNameArg, options) {
     }
   }
 
-  return { prefix, fullProjectName, oinoneVersion, edition, downloadStaticResources, authToken, isSilent };
+  return { prefix, fullProjectName, oinoneVersion, buildTool, edition, downloadStaticResources, authToken, isSilent };
 }
 
 module.exports = { resolveCreateInputs };

package/bin/commands/doctor.js

@@ -1,6 +1,7 @@
 const { execSync } = require('child_process');
 const chalk = require('chalk');
 const { t } = require('../i18n');
+const { runToolChecks } = require('../utils/env-check');
 
 function parseOinoneVersion(versionStr) {
   const raw = String(versionStr || '').trim();
@@ -32,6 +33,27 @@ function doctorAction(options) {
 
   console.log(chalk.cyan(t('doctor.checkingEnv')));
 
+  if (is72Plus) {
+    // 诊断输出：7.2+ 环境的工具集检查，仅展示结果不退出
+    const checks = runToolChecks({ buildTool: 'all' });
+    for (const check of checks) {
+      const toolLabel = check.tool === 'node' ? 'Node.js' : check.tool;
+      if (check.ok) {
+        const key = check.tool === 'node' ? 'doctor.nodeInstalled' : `doctor.${check.tool}Installed`;
+        console.log(chalk.green(t(key)));
+        console.log(chalk.gray(check.actual));
+      } else if (check.found) {
+        const key = check.tool === 'node' ? 'doctor.nodeVersionMismatch' : 'doctor.toolVersionMismatch';
+        console.log(chalk.red(t(key, { tool: toolLabel, expect: check.expected, actual: check.actual })));
+      } else if (check.tool === 'node') {
+        console.log(chalk.red(t('doctor.nodeNotFound', { expect: check.expected })));
+      } else {
+        console.log(chalk.red(t('doctor.toolNotFound', { tool: toolLabel, spec: check.installSpec || check.expected })));
+      }
+    }
+    return;
+  }
+
   try {
     const nodeVersion = execSync('node -v', { encoding: 'utf-8' }).trim();
     const nodeMajor = parseNodeMajor(nodeVersion);
@@ -43,7 +65,7 @@ function doctorAction(options) {
       process.exit(1);
     }
   } catch (err) {
-    console.log(chalk.red(t('doctor.nodeNotFound')));
+    console.log(chalk.red(t('doctor.nodeNotFound', { expect: '12' })));
     process.exit(1);
   }
 }

package/bin/locales/en-US.json

@@ -14,6 +14,7 @@
     "requireCreateSubcommand": "❌ Use `oinone-frontend create` to create a project (unknown command: {cmd})",
     "projectNameArg": "Name of the project to create silently",
     "downloadOpt": "Download static resources (true/false)",
+    "buildToolOpt": "Build tool for the generated project (pnpm/npm, default pnpm)",
     "versionOpt": "Oinone version to use (e.g. 7.2.0, 6.4.0)",
     "editionOpt": "Oinone edition to use (community/enterprise)"
   },
@@ -34,7 +35,19 @@
     "version720": "✨ {version} (Default)",
     "version640": "🕰️  {version}",
     "versionOther": "📦 {version}",
+    "promptBuildTool": "🔧 Which package manager should the generated project use?",
+    "buildToolPnpm": "pnpm (Default)",
+    "buildToolNpm": "npm",
+    "errorBuildTool": "❌ Invalid build tool: {tool} (only pnpm or npm)",
+    "errorBuildToolUnsupported": "❌ Oinone {version} does not support build tool selection (pnpm only)",
     "promptDownload": "📥 Shall we fetch the latest static resources for you? (Highly recommended! 🌟)",
+    "envCheckTitle": "⚠️ Environment pre-check found issues (required for Oinone 7.2+):",
+    "envCheckNotFound": "⚠️ {tool} not found (required: {spec})",
+    "envCheckVersionMismatch": "⚠️ {tool} version mismatch: expected {expect}, got {actual}",
+    "envCheckAutoFixPrompt": "Auto-fix now? Will run: {cmd}",
+    "envCheckAutoFixDone": "✅ Environment tools installed",
+    "envCheckAutoFixFailed": "❌ Auto-fix failed: {msg}",
+    "envCheckManualHint": "Please run manually later: {cmd}",
     "errorDirExists": "\n🚫 Yikes! The directory {name} already exists. Try a different name or clear the path.\n",
     "weavingMagic": "✨ Weaving magic to create your project...",
     "unsupportedVersion": "Unsupported Oinone version: {version}",
@@ -61,10 +74,14 @@
     "doctorMissingVersion": "❌ Please specify --oinone-version (only 6.4.* and 7.2+ are supported)",
     "doctorUnsupportedVersion": "❌ Unsupported Oinone version: {version} (only 6.4.* and 7.2+ are supported)",
     "nodeInstalled": "✅ Node.js is installed",
-    "nodeNotFound": "❌ Node.js not found, please install Node 12+",
+    "nodeNotFound": "❌ Node.js not found, please install Node {expect}+",
     "nodeVersionMismatch": "❌ Node.js version mismatch: expected {expect}, got {actual}",
     "pnpmInstalled": "✅ pnpm is installed",
-    "pnpmNotFound": "\n❌ pnpm not found, please install it via: npm install -g pnpm"
+    "pnpmNotFound": "\n❌ pnpm not found, please install it via: npm install -g pnpm",
+    "lernaInstalled": "✅ lerna is installed",
+    "rimrafInstalled": "✅ rimraf is installed",
+    "toolNotFound": "❌ {tool} not found, install via: npm install -g {spec}",
+    "toolVersionMismatch": "❌ {tool} version mismatch: expected {expect}, got {actual}"
   },
   "cache": {
     "cacheCmdDesc": "Manage the local static resources cache",

package/bin/locales/zh-CN.json

@@ -14,6 +14,7 @@
     "requireCreateSubcommand": "❌ 请使用 `oinone-frontend create` 来创建项目（收到未知命令: {cmd}）",
     "projectNameArg": "静默创建时的项目名称",
     "downloadOpt": "是否下载静态资源 (true/false)",
+    "buildToolOpt": "生成工程使用的包管理器 (pnpm/npm, 默认 pnpm)",
     "versionOpt": "使用的 Oinone 版本 (例如 7.2.0, 6.4.0)",
     "editionOpt": "使用的 Oinone 版本类型 (community/enterprise)"
   },
@@ -34,7 +35,19 @@
     "version720": "✨ {version} (默认)",
     "version640": "🕰️  {version}",
     "versionOther": "📦 {version}",
+    "promptBuildTool": "🔧 生成工程时使用哪个包管理器？",
+    "buildToolPnpm": "pnpm (默认)",
+    "buildToolNpm": "npm",
+    "errorBuildTool": "❌ 无效的构建工具: {tool}（仅支持 pnpm 或 npm）",
+    "errorBuildToolUnsupported": "❌ Oinone {version} 不支持选择构建工具（仅支持 pnpm）",
     "promptDownload": "📥 是否为您获取最新的静态资源？(强烈推荐！🌟)",
+    "envCheckTitle": "⚠️ 环境预检发现问题（Oinone 7.2+ 要求）:",
+    "envCheckNotFound": "⚠️ 未找到 {tool}（需要 {spec}）",
+    "envCheckVersionMismatch": "⚠️ {tool} 版本不满足要求: 期望 {expect}，当前 {actual}",
+    "envCheckAutoFixPrompt": "是否自动修复？将执行: {cmd}",
+    "envCheckAutoFixDone": "✅ 环境工具已安装完成",
+    "envCheckAutoFixFailed": "❌ 自动修复失败: {msg}",
+    "envCheckManualHint": "请稍后手动执行: {cmd}",
     "errorDirExists": "\n🚫 哎呀！目录 {name} 已存在。请尝试其他名称或清理该路径。\n",
     "weavingMagic": "✨ 正在施展魔法为您创建项目...",
     "unsupportedVersion": "不支持的 Oinone 版本: {version}",
@@ -61,10 +74,14 @@
     "doctorMissingVersion": "❌ 请指定 --oinone-version (仅支持 6.4.* 与 7.2+)",
     "doctorUnsupportedVersion": "❌ 不支持的 Oinone 版本: {version} (仅支持 6.4.* 与 7.2+)",
     "nodeInstalled": "✅ Node.js 已安装",
-    "nodeNotFound": "❌ 未找到 Node.js，请安装 Node 12+",
+    "nodeNotFound": "❌ 未找到 Node.js，请安装 Node {expect}+",
     "nodeVersionMismatch": "❌ Node.js 版本不满足要求: 期望 {expect}，当前 {actual}",
     "pnpmInstalled": "✅ pnpm 已安装",
-    "pnpmNotFound": "\n❌ 未找到 pnpm，请执行 npm install -g pnpm 安装"
+    "pnpmNotFound": "\n❌ 未找到 pnpm，请执行 npm install -g pnpm 安装",
+    "lernaInstalled": "✅ lerna 已安装",
+    "rimrafInstalled": "✅ rimraf 已安装",
+    "toolNotFound": "❌ 未找到 {tool}，请执行 npm install -g {spec} 安装",
+    "toolVersionMismatch": "❌ {tool} 版本不满足要求: 期望 {expect}，当前 {actual}"
   },
   "cache": {
     "usingCached": "⚡ 嗖！正在使用本地缓存的静态资源...",

package/bin/utils/env-check.js

@@ -0,0 +1,94 @@
+const { execSync } = require('child_process');
+const { compareSemver, normalizeToMinorVersion } = require('./oinone-version');
+
+const NODE_MAJOR_EXPECT = 22;
+const PNPM_MAJOR_EXPECT = 9;
+const LERNA_EXPECT = '9.0.3';
+const RIMRAF_EXPECT = '6.1.2';
+
+// string|null — null only when the command is genuinely not found (ENOENT).
+function execVersion(command) {
+  try {
+    return execSync(command, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] }).trim();
+  } catch (err) {
+    if (err && err.code === 'ENOENT') return null;
+    return String((err.stdout || err.stderr || '') || '').toString().trim() || null;
+  }
+}
+
+// number|null — 'v22.21.1' -> 22, '10.33.0' -> 10
+function parseMajor(versionStr) {
+  const m = String(versionStr || '').trim().replace(/^v/, '').match(/^(\d+)/);
+  return m ? Number(m[1]) : null;
+}
+
+// string|null — '9.0.3' -> '9.0.3'
+function parseExact(versionStr) {
+  const m = String(versionStr || '').trim().match(/(\d+)\.(\d+)\.(\d+)/);
+  return m ? `${m[1]}.${m[2]}.${m[3]}` : null;
+}
+
+// boolean — '~7.2.0'/'7.2.6'/'8.0.0' -> true; '~6.4.0'/garbage -> false
+function isVersion72Plus(versionStr) {
+  const normalized = normalizeToMinorVersion(versionStr);
+  if (!normalized) return false;
+  return compareSemver(normalized, '7.2.0') >= 0;
+}
+
+// -> [{ tool, found, ok, actual, expected, fixable, installSpec }]
+// buildTool: 'pnpm' -> node + pnpm + lerna + rimraf; 'npm' -> node + lerna + rimraf; 'all' -> everything
+function runToolChecks({ buildTool }) {
+  const checks = [];
+
+  const nodeVersion = execVersion('node -v');
+  const nodeMajor = parseMajor(nodeVersion);
+  checks.push({
+    tool: 'node',
+    found: nodeVersion !== null,
+    ok: nodeVersion !== null && nodeMajor !== null && nodeMajor >= NODE_MAJOR_EXPECT,
+    actual: nodeVersion || '',
+    expected: `${NODE_MAJOR_EXPECT}+`,
+    fixable: false,
+    installSpec: null
+  });
+
+  if (buildTool === 'pnpm' || buildTool === 'all') {
+    const pnpmVersion = execVersion('pnpm -v');
+    checks.push({
+      tool: 'pnpm',
+      found: pnpmVersion !== null,
+      ok: pnpmVersion !== null && parseMajor(pnpmVersion) === PNPM_MAJOR_EXPECT,
+      actual: pnpmVersion || '',
+      expected: `^${PNPM_MAJOR_EXPECT}`,
+      fixable: true,
+      installSpec: `pnpm@^${PNPM_MAJOR_EXPECT}`
+    });
+  }
+
+  const exactChecks = [
+    { tool: 'lerna', command: 'lerna -v', expect: LERNA_EXPECT },
+    { tool: 'rimraf', command: 'rimraf --version', expect: RIMRAF_EXPECT }
+  ];
+  for (const { tool, command, expect } of exactChecks) {
+    const version = execVersion(command);
+    checks.push({
+      tool,
+      found: version !== null,
+      ok: version !== null && parseExact(version) === expect,
+      actual: version || '',
+      expected: expect,
+      fixable: true,
+      installSpec: `${tool}@${expect}`
+    });
+  }
+
+  return checks;
+}
+
+// string|null — 'npm install -g pnpm@^9 lerna@9.0.3 rimraf@6.1.2' (subset of failing fixable tools)
+function getFixableInstallCommand(issues) {
+  const specs = (issues || []).filter(c => c.fixable).map(c => c.installSpec);
+  return specs.length ? `npm install -g ${specs.join(' ')}` : null;
+}
+
+module.exports = { isVersion72Plus, runToolChecks, getFixableInstallCommand };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/cli",
-  "version": "7.2.7",
+  "version": "7.2.9",
   "description": "CLI tool to generate Oinone Frontend Template",
   "main": "index.js",
   "bin": {

package/template-6.4.0/README.md

@@ -7,19 +7,13 @@ pnpm install
 
 # 清理所有依赖
 pnpm run clean
-pnpm run clean:win
 
 # 开发模式启动
 pnpm run dev
 
-# 构建生产sdk包
-
-# mac 环境
+# 构建生产sdk包（兼容 mac / windows 环境）
 pnpm run build
 
-# windows环境
-pnpm run build-win
-
 ```
 
 ### 工程分层说明

package/template-6.4.0/_package.json

@@ -7,7 +7,6 @@
     "clean": "pnpm lerna run clean --parallel && rimraf package-lock.json pnpm-lock.yaml node_modules",
     "clean:win": "node ./scripts/clean.mjs",
     "build": "pnpm lerna run build --parallel",
-    "build-win": "pnpm lerna run build-win --parallel",
     "publish": "pnpm lerna publish --no-git-tag-version --no-push --exact -y"
   },
   "devDependencies": {

package/template-6.4.0/packages/ss-admin-widget/package.json

@@ -6,9 +6,7 @@
     "clean": "rimraf dist package-lock.json node_modules",
     "prebuild": "rimraf dist",
     "build": "rollup -c && npm run build-css",
-    "build-css": "[ -f './dist/kunlun-module-demo.scss' ] && sass ./dist/kunlun-module-demo.scss ./dist/kunlun-module-demo.css || exit 0",
-    "build-win": "rollup -c && npm run build-css-win",
-    "build-css-win": "IF EXIST ./dist/kunlun-module-demo.scss (sass ./dist/kunlun-module-demo.scss ./dist/kunlun-module-demo.css) ELSE (exit 0)",
+    "build-css": "node ./scripts/build-css.cjs",
     "prepublishOnly": "node ./scripts/prepublish-only.js",
     "postpublish": "node ./scripts/postpublish.js"
   },

package/template-6.4.0/packages/ss-admin-widget/rollup.config.js

@@ -26,7 +26,7 @@ const tsconfigOverride = {
     declaration: true,
     declarationDir: 'dist/types'
   },
-  include: ['index.ts', 'src/**/*.ts'],
+  include: ['src/**/*.ts', 'src/**/*.tsx', 'src/**/*.vue'],
   exclude: ['tests/**/*.ts', 'tests/**/*.tsx']
 };
 
@@ -35,11 +35,21 @@ const plugins = [
     'process.env.NODE_ENV': JSON.stringify('development'),
     preventAssignment: true
   }),
-  nodeResolve(),
+  nodeResolve({
+    extensions: ['.mjs', '.js', '.json', '.node', '.ts', '.tsx', '.vue']
+  }),
 
-  typescript({ useTsconfigDeclarationDir: true, tsconfigOverride }),
+  typescript({
+    useTsconfigDeclarationDir: true,
+    tsconfigOverride,
+    include: ['**/*.ts', '**/*.tsx'],
+    check: false
+  }),
 
-  vue(),
+  vue({
+    preprocessStyles: true,
+    needMap: false
+  }),
 
   scss({
     fileName: `${libraryName}.scss`,

package/template-6.4.0/packages/ss-admin-widget/scripts/build-css.cjs

@@ -0,0 +1,15 @@
+/* eslint-disable import/no-dynamic-require */
+/* eslint-disable @typescript-eslint/no-var-requires */
+// 跨平台编译 dist 下提取出的 scss 产物，替代原 build-css(仅 mac) / build-css-win(仅 windows) 拆分
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+const url = path.resolve(process.cwd(), 'package.json');
+const packageJSON = require(url);
+const libName = packageJSON.name.replace('@', '').replace('/', '-');
+
+const scss = path.join('dist', `${libName}.scss`);
+if (fs.existsSync(scss)) {
+  execSync(`sass ${scss} ${scss.replace(/\.scss$/, '.css')}`, { stdio: 'inherit' });
+}

package/template-6.4.0/packages/ss-oinone/package.json

@@ -6,9 +6,7 @@
     "clean": "rimraf dist package-lock.json node_modules",
     "prebuild": "rimraf dist",
     "build": "rollup -c && npm run build-css",
-    "build-css": "[ -f './dist/kunlun-module-demo.scss' ] && sass ./dist/kunlun-module-demo.scss ./dist/kunlun-module-demo.css || exit 0",
-    "build-win": "rollup -c && npm run build-css-win",
-    "build-css-win": "IF EXIST ./dist/kunlun-module-demo.scss (sass ./dist/kunlun-module-demo.scss ./dist/kunlun-module-demo.css) ELSE (exit 0)",
+    "build-css": "node ./scripts/build-css.cjs",
     "prepublishOnly": "node ./scripts/prepublish-only.js",
     "postpublish": "node ./scripts/postpublish.js"
   },

package/template-6.4.0/packages/ss-oinone/scripts/build-css.cjs

@@ -0,0 +1,15 @@
+/* eslint-disable import/no-dynamic-require */
+/* eslint-disable @typescript-eslint/no-var-requires */
+// 跨平台编译 dist 下提取出的 scss 产物，替代原 build-css(仅 mac) / build-css-win(仅 windows) 拆分
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+const url = path.resolve(process.cwd(), 'package.json');
+const packageJSON = require(url);
+const libName = packageJSON.name.replace('@', '').replace('/', '-');
+
+const scss = path.join('dist', `${libName}.scss`);
+if (fs.existsSync(scss)) {
+  execSync(`sass ${scss} ${scss.replace(/\.scss$/, '.css')}`, { stdio: 'inherit' });
+}

package/template-6.4.0/packages/ss-project/package.json

@@ -6,9 +6,7 @@
     "clean": "rimraf dist package-lock.json node_modules",
     "prebuild": "rimraf dist",
     "build": "rollup -c && npm run build-css",
-    "build-css": "[ -f './dist/kunlun-module-demo.scss' ] && sass ./dist/kunlun-module-demo.scss ./dist/kunlun-module-demo.css || exit 0",
-    "build-win": "rollup -c && npm run build-css-win",
-    "build-css-win": "IF EXIST ./dist/kunlun-module-demo.scss (sass ./dist/kunlun-module-demo.scss ./dist/kunlun-module-demo.css) ELSE (exit 0)",
+    "build-css": "node ./scripts/build-css.cjs",
     "prepublishOnly": "node ./scripts/prepublish-only.js",
     "postpublish": "node ./scripts/postpublish.js"
   },

package/template-6.4.0/packages/ss-project/scripts/build-css.cjs

@@ -0,0 +1,15 @@
+/* eslint-disable import/no-dynamic-require */
+/* eslint-disable @typescript-eslint/no-var-requires */
+// 跨平台编译 dist 下提取出的 scss 产物，替代原 build-css(仅 mac) / build-css-win(仅 windows) 拆分
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+const url = path.resolve(process.cwd(), 'package.json');
+const packageJSON = require(url);
+const libName = packageJSON.name.replace('@', '').replace('/', '-');
+
+const scss = path.join('dist', `${libName}.scss`);
+if (fs.existsSync(scss)) {
+  execSync(`sass ${scss} ${scss.replace(/\.scss$/, '.css')}`, { stdio: 'inherit' });
+}

package/template-6.4.0/pnpm-workspace.yaml

@@ -1,3 +1,9 @@
 packages:
-  - 'packages/*'
+  - packages/**
+# pnpm@^11
+allowBuilds:
+  esbuild: true
+# pnpm@^9, pnpm@^10
+onlyBuiltDependencies:
+  - esbuild
 

package/template-7.2.0/README.md

@@ -7,19 +7,13 @@ pnpm install
 
 # 清理所有依赖
 pnpm run clean
-pnpm run clean:win
 
 # 开发模式启动
 pnpm run dev
 
-# 构建生产sdk包
-
-# mac 环境
+# 构建生产sdk包（兼容 mac / windows 环境）
 pnpm run build
 
-# windows环境
-pnpm run build-win
-
 ```
 
 ### 工程分层说明

package/template-7.2.0/_package.json

@@ -2,17 +2,23 @@
   "name": "ss-front-modules",
   "version": "0.0.0",
   "private": true,
+  "workspaces": [
+    "packages/ss-admin-widget",
+    "packages/ss-boot",
+    "packages/ss-oinone",
+    "packages/ss-project"
+  ],
   "scripts": {
-    "dev": "pnpm lerna exec --scope ss-boot -- npm run dev",
-    "clean": "pnpm lerna run clean --parallel && rimraf package-lock.json pnpm-lock.yaml node_modules",
-    "clean:win": "node ./scripts/clean.mjs",
-    "build": "pnpm lerna run build --parallel",
-    "build-win": "pnpm lerna run build-win --parallel",
-    "publish": "pnpm lerna publish --no-git-tag-version --no-push --exact -y"
+    "dev": "npx lerna exec --scope ss-boot -- npm run dev",
+    "clean": "npx lerna run clean --parallel",
+    "postclean": "rimraf package-lock.json pnpm-lock.yaml node_modules",
+    "build": "npx lerna run build --parallel",
+    "publish": "npx lerna publish --no-git-tag-version --no-push --exact -y"
   },
   "devDependencies": {
     "@commitlint/cli": "20.2.0",
     "@commitlint/config-conventional": "20.2.0",
+    "@oinone/kunlun-compile": "~7.2.0",
     "@rollup/plugin-commonjs": "29.0.0",
     "@rollup/plugin-json": "6.1.0",
     "@rollup/plugin-node-resolve": "16.0.3",

package/template-7.2.0/lerna.json

@@ -2,9 +2,6 @@
   "version": "independent",
   "npmClient": "pnpm",
   "command": {
-    "bootstrap": {
-      "npmClientArgs": ["--no-package-lock"]
-    },
     "publish": {
       "ignoreChanges": ["*.md"]
     }

package/template-7.2.0/packages/ss-admin-widget/package.json

@@ -7,22 +7,23 @@
     "clean": "rimraf dist package-lock.json node_modules",
     "prebuild": "rimraf dist",
     "build": "rollup -c && npm run build-css",
-    "build-css": "[ -f './dist/ss-admin-widget.scss' ] && sass ./dist/ss-admin-widget.scss ./dist/ss-admin-widget.css || exit 0",
-    "build-win": "rollup -c && npm run build-css-win",
-    "build-css-win": "IF EXIST ./dist/ss-admin-widget.scss (sass ./dist/ss-admin-widget.scss ./dist/ss-admin-widget.css) ELSE (exit 0)",
+    "build-css": "node ./scripts/build-css.cjs",
     "prepublishOnly": "node ./scripts/prepublish-only.js",
     "postpublish": "node ./scripts/postpublish.js"
   },
   "devDependencies": {
-    "@element-plus/icons-vue": "2.0.9",
     "@oinone/kunlun-compile": "~7.2.0",
     "@oinone/kunlun-dependencies": "~7.2.0",
     "@oinone/kunlun-vue-ui-antd": "~7.2.0",
     "@oinone/kunlun-vue-ui-el": "~7.2.0",
-    "@ss/oinone": "workspace:*",
+    "@ss/oinone": "1.0.0",
     "@types/lodash-es": "4.17.6",
-    "ant-design-vue": "4.2.6",
     "element-plus": "2.13.0",
     "vue": "3.5.26"
+  },
+  "peerDependencies": {
+    "@ant-design/icons-vue": ">=7.0.1",
+    "ant-design-vue": ">=4.2.6",
+    "vue-types": "^3.0.0"
   }
 }

package/template-7.2.0/packages/ss-admin-widget/rollup.config.js

@@ -10,7 +10,7 @@ export default CompileConfigBuilder.config()
   .scss()
   .nodeResolve()
   .commonjs()
-  .typescript2()
+  .typescript2({ check: false })
   .json()
   .terser()
   .build();

package/template-7.2.0/packages/ss-admin-widget/scripts/build-css.cjs

@@ -0,0 +1,15 @@
+/* eslint-disable import/no-dynamic-require */
+/* eslint-disable @typescript-eslint/no-var-requires */
+// 跨平台编译 dist 下提取出的 scss 产物，替代原 build-css(仅 mac) / build-css-win(仅 windows) 拆分
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+const url = path.resolve(process.cwd(), 'package.json');
+const packageJSON = require(url);
+const libName = packageJSON.name.replace('@', '').replace('/', '-');
+
+const scss = path.join('dist', `${libName}.scss`);
+if (fs.existsSync(scss)) {
+  execSync(`sass ${scss} ${scss.replace(/\.scss$/, '.css')}`, { stdio: 'inherit' });
+}

package/template-7.2.0/packages/ss-boot/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "clean": "rimraf dist package-lock.json node_modules",
     "dev": "vue-cli-service serve",
-    "build": "node --max_old_space_size=4096 ./node_modules/@vue/cli-service/bin/vue-cli-service.js build"
+    "build": "vue-cli-service build"
   },
   "dependencies": {
     "@ant-design/icons-vue": "7.0.1",
@@ -15,9 +15,9 @@
     "@oinone/kunlun-dependencies": "~7.2.0",
     "@oinone/kunlun-vue-ui-antd": "~7.2.0",
     "@oinone/kunlun-vue-ui-el": "~7.2.0",
-    "@ss/admin-widget": "workspace:*",
-    "@ss/oinone": "workspace:*",
-    "@ss/project": "workspace:*",
+    "@ss/admin-widget": "1.0.0",
+    "@ss/oinone": "1.0.0",
+    "@ss/project": "1.0.0",
     "ant-design-vue": "4.2.6",
     "echarts": "5.3.1",
     "element-plus": "2.13.0",
@@ -27,7 +27,6 @@
     "lodash-es": "4.17.21",
     "reflect-metadata": "0.2.2",
     "rxjs": "6.6.7",
-    "vant": "4.9.22",
     "vue": "3.5.26",
     "vue3-draggable-resizable": "1.6.1",
     "vuedraggable": "4.1.0"

package/template-7.2.0/packages/ss-boot/src/main.ts

@@ -1,6 +1,5 @@
 import 'ant-design-vue/dist/reset.css';
 import 'element-plus/dist/index.css';
-import 'vant/lib/index.css';
 
 import '@oinone/kunlun-vue-ui-antd/dist/oinone-kunlun-vue-ui-antd.css';
 import '@oinone/kunlun-vue-ui-el/dist/oinone-kunlun-vue-ui-el.css';
@@ -9,7 +8,7 @@ import 'reflect-metadata';
 import ElementPlus from 'element-plus';
 import { App } from 'vue';
 import { VueOioProvider, RuntimeContextManager } from '@oinone/kunlun-dependencies';
-import 'vant/lib/index.css';
+
 // 标准能力
 import '@ss/oinone';
 import '@ss/admin-widget';

package/template-7.2.0/packages/ss-oinone/package.json

@@ -7,9 +7,7 @@
     "clean": "rimraf dist package-lock.json node_modules",
     "prebuild": "rimraf dist",
     "build": "rollup -c && npm run build-css",
-    "build-css": "[ -f './dist/ss-oinone.scss' ] && sass ./dist/ss-oinone.scss ./dist/ss-oinone.css || exit 0",
-    "build-win": "rollup -c && npm run build-css-win",
-    "build-css-win": "IF EXIST ./dist/ss-oinone.scss (sass ./dist/ss-oinone.scss ./dist/ss-oinone.css) ELSE (exit 0)",
+    "build-css": "node ./scripts/build-css.cjs",
     "prepublishOnly": "node ./scripts/prepublish-only.js",
     "postpublish": "node ./scripts/postpublish.js"
   },
@@ -17,15 +15,19 @@
     "lucide": "1.7.0"
   },
   "devDependencies": {
-    "@ant-design/icons-vue": "7.0.1",
     "@element-plus/icons-vue": "2.0.9",
     "@oinone/kunlun-compile": "~7.2.0",
     "@oinone/kunlun-dependencies": "~7.2.0",
     "@oinone/kunlun-vue-ui-antd": "~7.2.0",
     "@oinone/kunlun-vue-ui-el": "~7.2.0",
     "@types/lodash-es": "4.17.6",
-    "ant-design-vue": "4.2.6",
     "element-plus": "2.13.0",
-    "vue": "3.5.26"
+    "vue": "3.5.26",
+    "vxe-table": "4.3.6"
+  },
+  "peerDependencies": {
+    "@ant-design/icons-vue": ">=7.0.1",
+    "ant-design-vue": ">=4.2.6",
+    "vue-types": "^3.0.0"
   }
 }

package/template-7.2.0/packages/ss-oinone/scripts/build-css.cjs

@@ -0,0 +1,15 @@
+/* eslint-disable import/no-dynamic-require */
+/* eslint-disable @typescript-eslint/no-var-requires */
+// 跨平台编译 dist 下提取出的 scss 产物，替代原 build-css(仅 mac) / build-css-win(仅 windows) 拆分
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+const url = path.resolve(process.cwd(), 'package.json');
+const packageJSON = require(url);
+const libName = packageJSON.name.replace('@', '').replace('/', '-');
+
+const scss = path.join('dist', `${libName}.scss`);
+if (fs.existsSync(scss)) {
+  execSync(`sass ${scss} ${scss.replace(/\.scss$/, '.css')}`, { stdio: 'inherit' });
+}

package/template-7.2.0/packages/ss-project/package.json

@@ -7,9 +7,7 @@
     "clean": "rimraf dist package-lock.json node_modules",
     "prebuild": "rimraf dist",
     "build": "rollup -c && npm run build-css",
-    "build-css": "[ -f './dist/ss-project.scss' ] && sass ./dist/ss-project.scss ./dist/ss-project.css || exit 0",
-    "build-win": "rollup -c && npm run build-css-win",
-    "build-css-win": "IF EXIST ./dist/ss-project.scss (sass ./dist/ss-project.scss ./dist/ss-project.css) ELSE (exit 0)",
+    "build-css": "node ./scripts/build-css.cjs",
     "prepublishOnly": "node ./scripts/prepublish-only.js",
     "postpublish": "node ./scripts/postpublish.js"
   },
@@ -22,10 +20,15 @@
     "@oinone/kunlun-dependencies": "~7.2.0",
     "@oinone/kunlun-vue-ui-antd": "~7.2.0",
     "@oinone/kunlun-vue-ui-el": "~7.2.0",
-    "@ss/oinone": "workspace:*",
+    "@ss/oinone": "1.0.0",
     "@types/lodash-es": "4.17.6",
     "ant-design-vue": "4.2.6",
     "element-plus": "2.13.0",
     "vue": "3.5.26"
+  },
+  "peerDependencies": {
+    "@ant-design/icons-vue": ">=7.0.1",
+    "ant-design-vue": ">=4.2.6",
+    "vue-types": "^3.0.0"
   }
 }

package/template-7.2.0/packages/ss-project/scripts/build-css.cjs

@@ -0,0 +1,15 @@
+/* eslint-disable import/no-dynamic-require */
+/* eslint-disable @typescript-eslint/no-var-requires */
+// 跨平台编译 dist 下提取出的 scss 产物，替代原 build-css(仅 mac) / build-css-win(仅 windows) 拆分
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+const url = path.resolve(process.cwd(), 'package.json');
+const packageJSON = require(url);
+const libName = packageJSON.name.replace('@', '').replace('/', '-');
+
+const scss = path.join('dist', `${libName}.scss`);
+if (fs.existsSync(scss)) {
+  execSync(`sass ${scss} ${scss.replace(/\.scss$/, '.css')}`, { stdio: 'inherit' });
+}

package/template-7.2.0/pnpm-workspace.yaml

@@ -1,3 +1,8 @@
 packages:
-  - 'packages/*'
-
+  - packages/**
+# pnpm@^11
+allowBuilds:
+  esbuild: true
+# pnpm@^9, pnpm@^10
+onlyBuiltDependencies:
+  - esbuild

package/template-7.2.0/scripts/build/inset-tsconfig.js

@@ -1,68 +0,0 @@
-const fs = require('fs').promises;
-const path = require('path');
-const packageNames = ['@oinone/kunlun-vue-admin-base'];
-
-const content = `{
-  "compilerOptions": {
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "allowJs": true,
-    "target": "ES6",
-    "module": "esnext",
-    "strict": true,
-    "importHelpers": true,
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "sourceMap": true,
-    "skipLibCheck": true,
-    "declaration": true,
-    "baseUrl": ".",
-    "lib": [
-      "ES2018",
-      "esnext",
-      "dom",
-      "dom.iterable",
-      "scripthost"
-    ],
-    "types": [
-      "node",
-      "reflect-metadata",
-      "jest"
-    ],
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "declarationDir": "dist/types",
-    "outDir": "dist",
-    "noImplicitAny": false,
-    "incremental": true,
-    "resolveJsonModule": true
-  },
-  "include": [
-    "packages"
-  ],
-  "exclude": [
-    "node_modules",
-    "dist"
-  ]
-}
-`;
-
-async function insetTSConfig() {
-  const oinoneCwd = path.resolve(process.cwd(), '../../node_modules');
-
-  for (const packageName of packageNames) {
-    const dependenciesPath = path.resolve(oinoneCwd, packageName);
-    try {
-      await fs.access(dependenciesPath);
-    } catch (err) {
-      console.error(`动态插入tsconfig失败: ${dependenciesPath}`, err);
-      return;
-    }
-
-    await fs.writeFile(path.resolve(dependenciesPath, 'tsconfig.json'), content);
-  }
-}
-
-module.exports = { insetTSConfig };

package/template-7.2.0/scripts/build/package-name.js

@@ -1,25 +0,0 @@
-const packageNames = [
-  '@oinone/kunlun-cache',
-  '@oinone/kunlun-dsl',
-  '@oinone/kunlun-environment',
-  '@oinone/kunlun-event',
-  '@oinone/kunlun-expression',
-  '@oinone/kunlun-meta',
-  '@oinone/kunlun-shared',
-  '@oinone/kunlun-request',
-  '@oinone/kunlun-router',
-  '@oinone/kunlun-service',
-  '@oinone/kunlun-spi',
-  '@oinone/kunlun-state',
-  '@oinone/kunlun-theme',
-  '@oinone/kunlun-engine',
-  '@oinone/kunlun-vue-router',
-  '@oinone/kunlun-vue-ui',
-  '@oinone/kunlun-vue-ui-antd',
-  '@oinone/kunlun-vue-ui-common',
-  '@oinone/kunlun-vue-admin-base',
-  '@oinone/kunlun-vue-ui-el',
-  '@oinone/kunlun-vue-widget'
-];
-
-module.exports = { packageNames };

package/template-7.2.0/scripts/clean.mjs

@@ -1,22 +0,0 @@
-import { rimraf } from 'rimraf';
-import { globSync } from 'glob';
-
-// 匹配所有 node_modules 文件夹
-const files = globSync('packages/**/node_modules')
-
-// 删除所有匹配的 node_modules
-files.forEach((file) => {
-  rimraf(file).then((deleted) => {
-    if (!deleted) console.error(`Error deleting ${file}:`, err);
-    else console.log(`Deleted ${file}`);
-  });
-});
-
-// 删除其他文件
-const filesToDelete = ['package-lock.json', 'pnpm-lock.yaml', 'node_modules'];
-filesToDelete.forEach(file => {
-  rimraf(file).then((deleted) => {
-    if (!deleted) console.error(`Error deleting ${file}:`, err);
-    else console.log(`Deleted ${file}`);
-  });
-});