generator-mico-cli 0.2.33 → 0.2.34

package/README.md

@@ -117,6 +117,12 @@ mico setup multica-desktop
 
 所有字段均为可选，未配置时使用默认值或交互式提示。
 
+### 组件库版本（`micoPackages`）
+
+CLI 根 `package.json` 的 `micoPackages` 是 `@mico-platform/ui` / `@mico-platform/theme` 的**唯一维护点**（semver range，如 `0.x`）。`mico create` 时在该 range 内 resolve 最新版本，写入生成项目为 `^x.y.z`（如 `^0.0.25`）；子应用开发环境 CDN 的 `MICO_UI_VERSION` 使用同一 resolved 精确版本。
+
+组件库发 patch（仍在 `0.x`）时通常无需发 CLI；切换到 `1.x` 等 major 策略时，修改 `micoPackages` 并发布新 CLI 即可。
+
 ## Monorepo 项目生成器 (micro-react)
 
 创建基于 qiankun 微前端架构的完整 Monorepo 项目：

package/generators/micro-react/README.md

@@ -31,4 +31,4 @@ mico create micro-react
 | `cdnPrefix` / `cdnPrefixPath` | string | prompt；`cdnPrefixPath` 为空或带尾斜杠 |
 | `author` | string | prompt |
 | `intlTag` | string | prompt |
-| `micoUiVersion` / `themeVersion` | string | `npm view @mico-platform/{ui,theme} version`，前缀 `^`，失败回退 `^1.0.0` |
+| `micoUiVersion` / `themeVersion` | string | `^${micoPackages range 内 resolve 的最新版本}` |

package/generators/micro-react/index.js

@@ -9,7 +9,7 @@ const {
   collectFiles,
   transformDestPath,
   isTemplateFile,
-  getPackageVersionsParallel,
+  getMicoTemplateVersions,
   setupErrorHandlers,
   createLogger,
   loadMicorc,
@@ -162,23 +162,14 @@ module.exports = class extends Generator {
 
       // 在 mico_cli 根目录执行 npm view，以使用该目录 .npmrc 中的 Nexus 认证
       const cliRoot = path.resolve(__dirname, '../..');
-      this.logger.verbose('Fetching latest package versions (parallel)...');
-
-      // 并行获取版本
-      const versions = await getPackageVersionsParallel(
-        [
-          { name: '@mico-platform/ui', fallback: '1.0.0' },
-          { name: '@mico-platform/theme', fallback: '1.0.0' },
-        ],
-        8000,
-        cliRoot,
-      );
+      this.logger.verbose('Fetching mico package versions from manifest...');
 
-      const micoUiVer = versions['@mico-platform/ui'];
-      const themeVer = versions['@mico-platform/theme'];
+      const micoVersions = await getMicoTemplateVersions(cliRoot, 8000);
+      const ui = micoVersions['@mico-platform/ui'];
+      const theme = micoVersions['@mico-platform/theme'];
 
-      this.logger.verbose('@mico-platform/ui version:', micoUiVer);
-      this.logger.verbose('@mico-platform/theme version:', themeVer);
+      this.logger.verbose('@mico-platform/ui range:', ui.range, 'resolved:', ui.resolved);
+      this.logger.verbose('@mico-platform/theme range:', theme.range, 'resolved:', theme.resolved);
 
       // 构建 CDN 路径片段：如果有 prefix 则加上斜杠前缀，否则为空
       const cdnPrefixPath = this.cdnPrefix ? `${this.cdnPrefix}/` : '';
@@ -191,8 +182,8 @@ module.exports = class extends Generator {
         appId: this.appId,
         packageScope: this.packageScope,
         author: this.author,
-        micoUiVersion: `^${micoUiVer}`,
-        themeVersion: `^${themeVer}`,
+        micoUiVersion: `^${ui.resolved}`,
+        themeVersion: `^${theme.resolved}`,
         cdnPrefix: this.cdnPrefix,
         cdnPrefixPath, // 用于拼接路径，已包含尾部斜杠
         intlTag: this.intlTag,

package/generators/micro-react/templates/apps/layout/src/common/logger.ts

@@ -23,7 +23,7 @@ function readVerboseDebugQueryOnce(): boolean {
   }
   try {
     const v = new URLSearchParams(window.location.search).get(DEBUG_LOGS_QUERY_KEY);
-    if (v == null || v === '') {
+    if (v === null || v === '') {
       return false;
     }
     const normalized = v.toLowerCase();

package/generators/micro-react/templates/apps/layout/src/components/MicroAppLoader/index.tsx

@@ -115,8 +115,12 @@ const MicroAppLoader: React.FC<MicroAppLoaderProps> = ({
       current_tenant: currentUser?.current_tenant,
       allowed_tenants: allowedTenants,
     };
-    const { request: _request, ...loggableProps } = props;
-    console.log('[MicroAppLoader] buildProps', { appName, ...loggableProps });
+    console.log('[MicroAppLoader] buildProps', {
+      appName,
+      ...Object.fromEntries(
+        Object.entries(props).filter(([key]) => key !== 'request'),
+      ),
+    });
     return props;
   }, [base, env, routePath, currentUser, appName]);
 

package/generators/subapp-react/index.js

@@ -9,7 +9,7 @@ const {
   collectFiles,
   transformDestPath,
   isTemplateFile,
-  getPackageVersionsParallel,
+  getMicoTemplateVersions,
   detectPackageScope,
   setupErrorHandlers,
   createLogger,
@@ -147,23 +147,14 @@ module.exports = class extends Generator {
 
       // 在 mico_cli 根目录执行 npm view，以使用该目录 .npmrc 中的 Nexus 认证
       const cliRoot = path.resolve(__dirname, '../..');
-      this.logger.verbose('Fetching latest package versions (parallel)...');
-
-      // 并行获取版本
-      const versions = await getPackageVersionsParallel(
-        [
-          { name: '@mico-platform/ui', fallback: '1.0.0' },
-          { name: '@mico-platform/theme', fallback: '1.0.0' },
-        ],
-        8000,
-        cliRoot,
-      );
+      this.logger.verbose('Fetching mico package versions from manifest...');
 
-      const micoUiVer = versions['@mico-platform/ui'];
-      const themeVer = versions['@mico-platform/theme'];
+      const micoVersions = await getMicoTemplateVersions(cliRoot, 8000);
+      const ui = micoVersions['@mico-platform/ui'];
+      const theme = micoVersions['@mico-platform/theme'];
 
-      this.logger.verbose('@mico-platform/ui version:', micoUiVer);
-      this.logger.verbose('@mico-platform/theme version:', themeVer);
+      this.logger.verbose('@mico-platform/ui range:', ui.range, 'resolved:', ui.resolved);
+      this.logger.verbose('@mico-platform/theme range:', theme.range, 'resolved:', theme.resolved);
 
       const templateData = {
         appName: this.appName,
@@ -172,9 +163,9 @@ module.exports = class extends Generator {
         appNameSnake: this.appName.replace(/-/g, '_'),
         packageScope: this.packageScope,
         devPort: this.devPort,
-        micoUiVersion: `^${micoUiVer}`,
-        themeVersion: `^${themeVer}`,
-        micoUiVersionExact: micoUiVer
+        micoUiVersion: `^${ui.resolved}`,
+        themeVersion: `^${theme.resolved}`,
+        micoUiVersionExact: ui.resolved,
       };
 
       this.logger.verbose('Template data:', JSON.stringify(templateData, null, 2));

package/generators/subapp-react/templates/homepage/src/common/logger.ts

@@ -23,7 +23,7 @@ function readVerboseDebugQueryOnce(): boolean {
   }
   try {
     const v = new URLSearchParams(window.location.search).get(DEBUG_LOGS_QUERY_KEY);
-    if (v == null || v === '') {
+    if (v === null || v === '') {
       return false;
     }
     const normalized = v.toLowerCase();

package/generators/subapp-umd/index.js

@@ -14,6 +14,7 @@ const {
   setupErrorHandlers,
   createLogger,
   loadMicorc,
+  getMicoTemplateVersions,
 } = require('../../lib/utils');
 
 const IGNORE_LIST = require('./ignore-list.json');
@@ -145,6 +146,10 @@ module.exports = class extends Generator {
       this.logger.verbose('Template directory:', this.templateDir);
       this.logger.verbose('Destination directory:', this.destDir);
 
+      const cliRoot = path.resolve(__dirname, '../..');
+      const micoVersions = await getMicoTemplateVersions(cliRoot, 8000);
+      const ui = micoVersions['@mico-platform/ui'];
+
       const templateData = {
         appName: this.appName,
         AppName: this.appNamePascal,
@@ -152,6 +157,7 @@ module.exports = class extends Generator {
         umdGlobalName: this.umdGlobalName,
         packageScope: this.packageScope,
         devPort: this.devPort,
+        micoUiPeerRange: `^${ui.resolved}`,
       };
 
       this.logger.verbose('Template data:', JSON.stringify(templateData, null, 2));

package/generators/subapp-umd/templates/package.json

@@ -15,7 +15,7 @@
   "peerDependencies": {
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "@mico-platform/ui": ">=0.0.13"
+    "@mico-platform/ui": "<%= micoUiPeerRange %>"
   },
   "devDependencies": {
     "@types/react": "^18.3.26",

package/lib/utils.js

@@ -4,6 +4,7 @@ const fs = require('node:fs');
 const path = require('node:path');
 const { exec, execSync, execFileSync, execFile } = require('node:child_process');
 const os = require('node:os');
+const semver = require('semver');
 
 /**
  * 转换为 kebab-case
@@ -150,6 +151,9 @@ const VALID_PACKAGE_NAME_RE = /^(@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/
 /** scope 包含 mico 时使用的 registry（如 @mico-platform/*） */
 const MICO_NPM_REGISTRY = 'https://nexus-vywrajy.micoworld.net/repository/mico-base-common/';
 
+/** 生成器模板中由 micoPackages 管理的包名 */
+const MICO_TEMPLATE_PACKAGES = ['@mico-platform/ui', '@mico-platform/theme'];
+
 /**
  * 根据包名 scope 选择 registry：scope 包含 mico 时用 MICO_NPM_REGISTRY，否则用 npm 默认
  * @param {string} packageName - 包名，如 '@mico-platform/ui'
@@ -287,6 +291,195 @@ async function getPackageVersionsParallel(packages, timeoutMs = 8000, cwd) {
   }, {});
 }
 
+/**
+ * 读取 CLI package.json 中的 micoPackages（组件库版本 range 唯一维护点）
+ * @param {string} [cliRoot] - CLI 仓库根目录，默认 lib/ 的上级
+ * @returns {Record<string, string>} 包名 → semver range
+ */
+function loadMicoPackages(cliRoot) {
+  const root = cliRoot || path.resolve(__dirname, '..');
+  const pkgPath = path.join(root, 'package.json');
+  if (!fs.existsSync(pkgPath)) {
+    throw new Error(`CLI package.json not found: ${pkgPath}`);
+  }
+
+  let pkg;
+  try {
+    pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+  } catch (e) {
+    throw new Error(`Failed to parse CLI package.json: ${e.message}`);
+  }
+
+  const { micoPackages } = pkg;
+  if (!micoPackages || typeof micoPackages !== 'object') {
+    throw new Error(
+      'CLI package.json must define "micoPackages" with @mico-platform/ui and @mico-platform/theme ranges',
+    );
+  }
+
+  const result = {};
+  for (const name of MICO_TEMPLATE_PACKAGES) {
+    const range = micoPackages[name];
+    if (typeof range !== 'string' || !range.trim()) {
+      throw new Error(`micoPackages.${name} must be a non-empty semver range string`);
+    }
+    const trimmed = range.trim();
+    if (!semver.validRange(trimmed)) {
+      throw new Error(`micoPackages.${name} is not a valid semver range: ${range}`);
+    }
+    result[name] = trimmed;
+  }
+
+  return result;
+}
+
+/**
+ * 执行 npm view <pkg>@<spec> version
+ * @returns {Promise<string|undefined>}
+ */
+function npmViewVersionAsync(packageName, spec, timeoutMs = 8000, cwd) {
+  if (!VALID_PACKAGE_NAME_RE.test(packageName)) {
+    return Promise.resolve(undefined);
+  }
+
+  return new Promise((resolve) => {
+    let settled = false;
+    const done = (value) => {
+      if (!settled) {
+        settled = true;
+        resolve(value);
+      }
+    };
+
+    const registry = getRegistryForPackage(packageName);
+    const args = ['view', `${packageName}@${spec}`, 'version'];
+    if (registry) args.push(`--registry=${registry}`);
+
+    const child = execFile(
+      'npm',
+      args,
+      {
+        encoding: 'utf-8',
+        timeout: timeoutMs,
+        ...(cwd && { cwd }),
+      },
+      (error, stdout) => {
+        if (error) {
+          done(undefined);
+          return;
+        }
+        const v = stdout.trim();
+        done(v && semver.valid(v) ? v : undefined);
+      },
+    );
+
+    setTimeout(() => {
+      child.kill();
+      done(undefined);
+    }, timeoutMs + 100);
+  });
+}
+
+/**
+ * 执行 npm view <pkg> versions --json
+ * @returns {Promise<string[]>}
+ */
+function npmViewAllVersionsAsync(packageName, timeoutMs = 8000, cwd) {
+  if (!VALID_PACKAGE_NAME_RE.test(packageName)) {
+    return Promise.resolve([]);
+  }
+
+  return new Promise((resolve) => {
+    let settled = false;
+    const done = (value) => {
+      if (!settled) {
+        settled = true;
+        resolve(value);
+      }
+    };
+
+    const registry = getRegistryForPackage(packageName);
+    const args = ['view', packageName, 'versions', '--json'];
+    if (registry) args.push(`--registry=${registry}`);
+
+    const child = execFile(
+      'npm',
+      args,
+      {
+        encoding: 'utf-8',
+        timeout: timeoutMs,
+        ...(cwd && { cwd }),
+      },
+      (error, stdout) => {
+        if (error) {
+          done([]);
+          return;
+        }
+        try {
+          const list = JSON.parse(stdout.trim());
+          done(Array.isArray(list) ? list.filter((v) => semver.valid(v)) : []);
+        } catch {
+          done([]);
+        }
+      },
+    );
+
+    setTimeout(() => {
+      child.kill();
+      done([]);
+    }, timeoutMs + 100);
+  });
+}
+
+/**
+ * 在 semver range 内解析包的最新精确版本（用于 CDN / micoUiVersionExact）
+ * MICO_PKG_VERSIONS 可覆盖 resolved，但仍须满足 range
+ * @param {string} packageName
+ * @param {string} range - semver range，如 0.x
+ * @param {number} [timeoutMs=8000]
+ * @param {string} [cwd]
+ * @returns {Promise<string>}
+ */
+async function resolveNpmVersionInRangeAsync(packageName, range, timeoutMs = 8000, cwd) {
+  const override = getVersionOverride(packageName);
+  if (override) {
+    if (!semver.satisfies(override, range, { includePrerelease: true })) {
+      throw new Error(
+        `MICO_PKG_VERSIONS override ${override} does not satisfy range ${range} for ${packageName}`,
+      );
+    }
+    return override;
+  }
+
+  const direct = await npmViewVersionAsync(packageName, range, timeoutMs, cwd);
+  if (direct) return direct;
+
+  const versions = await npmViewAllVersionsAsync(packageName, timeoutMs, cwd);
+  const resolved = semver.maxSatisfying(versions, range, { includePrerelease: false });
+  if (resolved) return resolved;
+
+  throw new Error(`No version found for ${packageName} satisfying range ${range}`);
+}
+
+/**
+ * 读取 micoPackages range，并解析各包在 range 内的最新精确版本
+ * @param {string} cliRoot - CLI 仓库根目录
+ * @param {number} [timeoutMs=8000]
+ * @returns {Promise<Record<string, { range: string, resolved: string }>>}
+ */
+async function getMicoTemplateVersions(cliRoot, timeoutMs = 8000) {
+  const micoPackages = loadMicoPackages(cliRoot);
+  const entries = await Promise.all(
+    MICO_TEMPLATE_PACKAGES.map(async (name) => {
+      const range = micoPackages[name];
+      const resolved = await resolveNpmVersionInRangeAsync(name, range, timeoutMs, cliRoot);
+      return [name, { range, resolved }];
+    }),
+  );
+
+  return Object.fromEntries(entries);
+}
+
 // ============ 配置文件支持 ============
 
 /**
@@ -503,6 +696,10 @@ module.exports = {
   getLatestNpmVersion,
   getLatestNpmVersionAsync,
   getPackageVersionsParallel,
+  MICO_TEMPLATE_PACKAGES,
+  loadMicoPackages,
+  resolveNpmVersionInRangeAsync,
+  getMicoTemplateVersions,
   setupErrorHandlers,
   TEMPLATE_EXTENSIONS,
   // 配置文件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-mico-cli",
-  "version": "0.2.33",
+  "version": "0.2.34",
   "description": "Yeoman generator for Mico CLI projects",
   "keywords": [
     "yeoman-generator",
@@ -35,6 +35,10 @@
   "engines": {
     "node": ">=18"
   },
+  "micoPackages": {
+    "@mico-platform/ui": "0.x",
+    "@mico-platform/theme": "0.x"
+  },
   "dependencies": {
     "semver": "^7.6.3",
     "update-notifier": "^7.3.1",