@windrun-huaiin/dev-scripts 14.1.0 → 14.1.2

package/dist/commands/diaomao-update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diaomao-update.d.ts","sourceRoot":"","sources":["../../src/commands/diaomao-update.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAoN7D,wBAAsB,aAAa,CACjC,MAAM,EAAE,gBAAgB,EACxB,GAAG,GAAE,MAA6D,GACjE,OAAO,CAAC,MAAM,CAAC,CAyKjB"}
+{"version":3,"file":"diaomao-update.d.ts","sourceRoot":"","sources":["../../src/commands/diaomao-update.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAgT7D,wBAAsB,aAAa,CACjC,MAAM,EAAE,gBAAgB,EACxB,GAAG,GAAE,MAA6D,GACjE,OAAO,CAAC,MAAM,CAAC,CA+MjB"}

package/dist/commands/diaomao-update.js

@@ -3,6 +3,7 @@
 var fs = require('fs');
 var path = require('path');
 var https = require('https');
+var child_process = require('child_process');
 var yaml = require('yaml');
 var semver = require('semver');
 
@@ -12,6 +13,14 @@ const DEPENDENCY_SECTIONS = [
     'peerDependencies',
     'optionalDependencies'
 ];
+const UNKNOWN_VERSION = 'UNKNOWN';
+const NPM_TARGET_PACKAGES = [
+    '@windrun-huaiin/base-ui',
+    '@windrun-huaiin/lib',
+    '@windrun-huaiin/third-ui',
+    '@windrun-huaiin/backend-core',
+    '@windrun-huaiin/dev-scripts'
+];
 function fetchText(url) {
     return new Promise((resolve, reject) => {
         const request = https.get(url, (response) => {
@@ -59,17 +68,31 @@ function stripProtocolPrefix(version) {
     }
     return version;
 }
+function isTagVersion(version) {
+    return version === 'latest';
+}
+function getComparableMinVersion(version) {
+    try {
+        return semver.minVersion(version);
+    }
+    catch {
+        return null;
+    }
+}
 function compareVersionSpecs(currentVersion, targetVersion) {
+    const normalizedCurrent = stripProtocolPrefix(currentVersion);
+    const normalizedTarget = stripProtocolPrefix(targetVersion);
+    if (isTagVersion(normalizedCurrent) || isTagVersion(normalizedTarget)) {
+        return 'uncomparable';
+    }
     if (currentVersion === targetVersion) {
         return 'same';
     }
-    const normalizedCurrent = stripProtocolPrefix(currentVersion);
-    const normalizedTarget = stripProtocolPrefix(targetVersion);
     if (normalizedCurrent === normalizedTarget) {
         return 'same';
     }
-    const currentMin = semver.minVersion(normalizedCurrent);
-    const targetMin = semver.minVersion(normalizedTarget);
+    const currentMin = getComparableMinVersion(normalizedCurrent);
+    const targetMin = getComparableMinVersion(normalizedTarget);
     if (currentMin && targetMin) {
         const comparison = semver.compare(currentMin, targetMin);
         if (comparison > 0) {
@@ -80,7 +103,7 @@ function compareVersionSpecs(currentVersion, targetVersion) {
         }
         return 'update';
     }
-    return 'update';
+    return 'uncomparable';
 }
 function extractCatalog(workspaceContent) {
     const parsed = yaml.parse(workspaceContent);
@@ -157,6 +180,49 @@ function printSkipDetails(skipRows, compactLog) {
     console.log('\nSkipped:');
     console.log(renderTable(skipRows, ['Package', 'Before', 'After', 'Reason']));
 }
+function resolveTargetVersions(remoteCatalog, allowedPackages, compactLog) {
+    const resolvedTargets = {};
+    const npmPackagesToResolve = NPM_TARGET_PACKAGES.filter((packageName) => allowedPackages.includes(packageName));
+    for (const [packageName, version] of Object.entries(remoteCatalog)) {
+        resolvedTargets[packageName] = {
+            version,
+            source: 'catalog'
+        };
+    }
+    for (const packageName of npmPackagesToResolve) {
+        const command = `npm view ${packageName} version`;
+        if (!compactLog) {
+            console.log(`[diaomao-update] resolving via npm: ${command}`);
+        }
+        try {
+            const version = child_process.execSync(command, {
+                encoding: 'utf8',
+                stdio: ['ignore', 'pipe', 'pipe']
+            }).trim() || UNKNOWN_VERSION;
+            resolvedTargets[packageName] = {
+                version,
+                source: 'npm'
+            };
+            if (!compactLog) {
+                console.log(`[diaomao-update] resolved ${packageName}: ${version}`);
+            }
+        }
+        catch (error) {
+            resolvedTargets[packageName] = {
+                version: UNKNOWN_VERSION,
+                source: 'npm'
+            };
+            if (!compactLog) {
+                const stderr = error instanceof Error && 'stderr' in error && typeof error.stderr === 'string'
+                    ? error.stderr.trim()
+                    : String(error);
+                console.log(`[diaomao-update] resolved ${packageName}: ${UNKNOWN_VERSION}`);
+                console.log(`[diaomao-update] npm query failed for ${packageName}: ${stderr || 'unknown error'}`);
+            }
+        }
+    }
+    return resolvedTargets;
+}
 async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? process.cwd() : '.') {
     const updateConfig = config.diaomaoUpdate || {};
     const sourceUrl = updateConfig.sourceUrl || '';
@@ -179,12 +245,14 @@ async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? proc
     console.log(`Reading update source: ${sourceUrl}`);
     const remoteWorkspaceContent = await fetchText(sourceUrl);
     const remoteCatalog = extractCatalog(remoteWorkspaceContent);
+    const resolvedTargets = resolveTargetVersions(remoteCatalog, allowedPackages, compactLog);
     const updatedRows = [];
     const skipRows = [];
     let packageJsonChanged = false;
     let workspaceChanged = false;
     for (const packageName of allowedPackages) {
-        const targetVersion = remoteCatalog[packageName];
+        const resolvedTarget = resolvedTargets[packageName];
+        const targetVersion = resolvedTarget?.version;
         if (!targetVersion) {
             continue;
         }
@@ -235,6 +303,15 @@ async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? proc
                     });
                     continue;
                 }
+                if (decision === 'uncomparable') {
+                    skipRows.push({
+                        packageName,
+                        currentVersion: localCatalogVersion,
+                        targetVersion,
+                        reason: 'skipped-uncomparable'
+                    });
+                    continue;
+                }
                 localCatalog[packageName] = targetVersion;
                 workspaceChanged = true;
                 updatedRows.push({
@@ -242,6 +319,9 @@ async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? proc
                     currentVersion: localCatalogVersion,
                     targetVersion
                 });
+                if (!compactLog) {
+                    console.log(`[diaomao-update] updated ${packageName} from ${localCatalogVersion} to ${targetVersion} (source: ${resolvedTarget.source})`);
+                }
                 continue;
             }
             const decision = compareVersionSpecs(currentSpecifier, targetVersion);
@@ -263,6 +343,15 @@ async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? proc
                 });
                 continue;
             }
+            if (decision === 'uncomparable') {
+                skipRows.push({
+                    packageName,
+                    currentVersion: currentSpecifier,
+                    targetVersion,
+                    reason: 'skipped-uncomparable'
+                });
+                continue;
+            }
             dependencies[packageName] = targetVersion;
             packageJsonChanged = true;
             updatedRows.push({
@@ -270,6 +359,9 @@ async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? proc
                 currentVersion: currentSpecifier,
                 targetVersion
             });
+            if (!compactLog) {
+                console.log(`[diaomao-update] updated ${packageName} from ${currentSpecifier} to ${targetVersion} (source: ${resolvedTarget.source})`);
+            }
         }
         if (!matched) {
             skipRows.push({
@@ -298,6 +390,13 @@ async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? proc
     console.log('');
     console.log(`Updated ${updatedRows.length} package version(s).`);
     printSkipDetails(skipRows, compactLog);
+    if (updatedRows.length > 0) {
+        console.log('\n执行 pnpm install中...');
+        child_process.execSync('pnpm install', {
+            cwd,
+            stdio: 'inherit'
+        });
+    }
     return 0;
 }
 

package/dist/commands/diaomao-update.mjs

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import https from 'https';
+import { execSync } from 'child_process';
 import { parse, stringify } from 'yaml';
 import semver from 'semver';
 
@@ -10,6 +11,14 @@ const DEPENDENCY_SECTIONS = [
     'peerDependencies',
     'optionalDependencies'
 ];
+const UNKNOWN_VERSION = 'UNKNOWN';
+const NPM_TARGET_PACKAGES = [
+    '@windrun-huaiin/base-ui',
+    '@windrun-huaiin/lib',
+    '@windrun-huaiin/third-ui',
+    '@windrun-huaiin/backend-core',
+    '@windrun-huaiin/dev-scripts'
+];
 function fetchText(url) {
     return new Promise((resolve, reject) => {
         const request = https.get(url, (response) => {
@@ -57,17 +66,31 @@ function stripProtocolPrefix(version) {
     }
     return version;
 }
+function isTagVersion(version) {
+    return version === 'latest';
+}
+function getComparableMinVersion(version) {
+    try {
+        return semver.minVersion(version);
+    }
+    catch {
+        return null;
+    }
+}
 function compareVersionSpecs(currentVersion, targetVersion) {
+    const normalizedCurrent = stripProtocolPrefix(currentVersion);
+    const normalizedTarget = stripProtocolPrefix(targetVersion);
+    if (isTagVersion(normalizedCurrent) || isTagVersion(normalizedTarget)) {
+        return 'uncomparable';
+    }
     if (currentVersion === targetVersion) {
         return 'same';
     }
-    const normalizedCurrent = stripProtocolPrefix(currentVersion);
-    const normalizedTarget = stripProtocolPrefix(targetVersion);
     if (normalizedCurrent === normalizedTarget) {
         return 'same';
     }
-    const currentMin = semver.minVersion(normalizedCurrent);
-    const targetMin = semver.minVersion(normalizedTarget);
+    const currentMin = getComparableMinVersion(normalizedCurrent);
+    const targetMin = getComparableMinVersion(normalizedTarget);
     if (currentMin && targetMin) {
         const comparison = semver.compare(currentMin, targetMin);
         if (comparison > 0) {
@@ -78,7 +101,7 @@ function compareVersionSpecs(currentVersion, targetVersion) {
         }
         return 'update';
     }
-    return 'update';
+    return 'uncomparable';
 }
 function extractCatalog(workspaceContent) {
     const parsed = parse(workspaceContent);
@@ -155,6 +178,49 @@ function printSkipDetails(skipRows, compactLog) {
     console.log('\nSkipped:');
     console.log(renderTable(skipRows, ['Package', 'Before', 'After', 'Reason']));
 }
+function resolveTargetVersions(remoteCatalog, allowedPackages, compactLog) {
+    const resolvedTargets = {};
+    const npmPackagesToResolve = NPM_TARGET_PACKAGES.filter((packageName) => allowedPackages.includes(packageName));
+    for (const [packageName, version] of Object.entries(remoteCatalog)) {
+        resolvedTargets[packageName] = {
+            version,
+            source: 'catalog'
+        };
+    }
+    for (const packageName of npmPackagesToResolve) {
+        const command = `npm view ${packageName} version`;
+        if (!compactLog) {
+            console.log(`[diaomao-update] resolving via npm: ${command}`);
+        }
+        try {
+            const version = execSync(command, {
+                encoding: 'utf8',
+                stdio: ['ignore', 'pipe', 'pipe']
+            }).trim() || UNKNOWN_VERSION;
+            resolvedTargets[packageName] = {
+                version,
+                source: 'npm'
+            };
+            if (!compactLog) {
+                console.log(`[diaomao-update] resolved ${packageName}: ${version}`);
+            }
+        }
+        catch (error) {
+            resolvedTargets[packageName] = {
+                version: UNKNOWN_VERSION,
+                source: 'npm'
+            };
+            if (!compactLog) {
+                const stderr = error instanceof Error && 'stderr' in error && typeof error.stderr === 'string'
+                    ? error.stderr.trim()
+                    : String(error);
+                console.log(`[diaomao-update] resolved ${packageName}: ${UNKNOWN_VERSION}`);
+                console.log(`[diaomao-update] npm query failed for ${packageName}: ${stderr || 'unknown error'}`);
+            }
+        }
+    }
+    return resolvedTargets;
+}
 async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? process.cwd() : '.') {
     const updateConfig = config.diaomaoUpdate || {};
     const sourceUrl = updateConfig.sourceUrl || '';
@@ -177,12 +243,14 @@ async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? proc
     console.log(`Reading update source: ${sourceUrl}`);
     const remoteWorkspaceContent = await fetchText(sourceUrl);
     const remoteCatalog = extractCatalog(remoteWorkspaceContent);
+    const resolvedTargets = resolveTargetVersions(remoteCatalog, allowedPackages, compactLog);
     const updatedRows = [];
     const skipRows = [];
     let packageJsonChanged = false;
     let workspaceChanged = false;
     for (const packageName of allowedPackages) {
-        const targetVersion = remoteCatalog[packageName];
+        const resolvedTarget = resolvedTargets[packageName];
+        const targetVersion = resolvedTarget?.version;
         if (!targetVersion) {
             continue;
         }
@@ -233,6 +301,15 @@ async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? proc
                     });
                     continue;
                 }
+                if (decision === 'uncomparable') {
+                    skipRows.push({
+                        packageName,
+                        currentVersion: localCatalogVersion,
+                        targetVersion,
+                        reason: 'skipped-uncomparable'
+                    });
+                    continue;
+                }
                 localCatalog[packageName] = targetVersion;
                 workspaceChanged = true;
                 updatedRows.push({
@@ -240,6 +317,9 @@ async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? proc
                     currentVersion: localCatalogVersion,
                     targetVersion
                 });
+                if (!compactLog) {
+                    console.log(`[diaomao-update] updated ${packageName} from ${localCatalogVersion} to ${targetVersion} (source: ${resolvedTarget.source})`);
+                }
                 continue;
             }
             const decision = compareVersionSpecs(currentSpecifier, targetVersion);
@@ -261,6 +341,15 @@ async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? proc
                 });
                 continue;
             }
+            if (decision === 'uncomparable') {
+                skipRows.push({
+                    packageName,
+                    currentVersion: currentSpecifier,
+                    targetVersion,
+                    reason: 'skipped-uncomparable'
+                });
+                continue;
+            }
             dependencies[packageName] = targetVersion;
             packageJsonChanged = true;
             updatedRows.push({
@@ -268,6 +357,9 @@ async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? proc
                 currentVersion: currentSpecifier,
                 targetVersion
             });
+            if (!compactLog) {
+                console.log(`[diaomao-update] updated ${packageName} from ${currentSpecifier} to ${targetVersion} (source: ${resolvedTarget.source})`);
+            }
         }
         if (!matched) {
             skipRows.push({
@@ -296,6 +388,13 @@ async function diaomaoUpdate(config, cwd = typeof process !== 'undefined' ? proc
     console.log('');
     console.log(`Updated ${updatedRows.length} package version(s).`);
     printSkipDetails(skipRows, compactLog);
+    if (updatedRows.length > 0) {
+        console.log('\n执行 pnpm install中...');
+        execSync('pnpm install', {
+            cwd,
+            stdio: 'inherit'
+        });
+    }
     return 0;
 }
 

package/example.config.json

@@ -0,0 +1,103 @@
+{
+  "i18n": {
+    "locales": ["en", "zh", "ja"],
+    "defaultLocale": "en",
+    "messageRoot": "messages"
+  },
+  "scan": {
+    "include": ["src/**/*.{tsx,ts,jsx,js}"],
+    "exclude": ["src/**/*.test.ts", "src/**/*.d.ts", "node_modules/**"]
+  },
+  "blog": {
+    "mdxDir": "src/mdx/blog",
+    "outputFile": "index.mdx",
+    "metaFile": "meta.json",
+    "iocSlug": "ioc",
+    "prefix": "blog"
+  },
+  "output": {
+    "logDir": "scripts",
+    "verbose": false
+  },
+  "diaomaoUpdate": {
+    "sourceUrl": "https://raw.githubusercontent.com/caofanCPU/next-ai-build/main/pnpm-workspace.yaml",
+    "allowedPackages": [
+      "@changesets/cli",
+      "@clerk/localizations",
+      "@clerk/nextjs",
+      "@clerk/shared",
+      "@clerk/themes",
+      "@fingerprintjs/fingerprintjs",
+      "@hookform/resolvers",
+      "@prisma/client",
+      "@radix-ui/react-alert-dialog",
+      "@radix-ui/react-dropdown-menu",
+      "@radix-ui/react-label",
+      "@radix-ui/react-slot",
+      "@tailwindcss/cli",
+      "@tailwindcss/postcss",
+      "@tailwindcss/typography",
+      "@types/hast",
+      "@types/mdx",
+      "@types/node",
+      "@types/nprogress",
+      "@types/react",
+      "@types/react-dom",
+      "@typescript-eslint/parser",
+      "@windrun-huaiin/backend-core",
+      "@windrun-huaiin/base-ui",
+      "@windrun-huaiin/dev-scripts",
+      "@windrun-huaiin/lib",
+      "@windrun-huaiin/third-ui",
+      "autoprefixer",
+      "baseline-browser-mapping",
+      "class-variance-authority",
+      "clsx",
+      "date-fns",
+      "eslint",
+      "eslint-config-next",
+      "eslint-plugin-unused-imports",
+      "fast-glob",
+      "fumadocs-core",
+      "fumadocs-docgen",
+      "fumadocs-mdx",
+      "fumadocs-typescript",
+      "fumadocs-ui",
+      "katex",
+      "lucide-react",
+      "mermaid",
+      "next",
+      "next-intl",
+      "next-themes",
+      "nprogress",
+      "postcss",
+      "prisma",
+      "react",
+      "react-dom",
+      "react-medium-image-zoom",
+      "rehype-katex",
+      "remark",
+      "remark-frontmatter",
+      "remark-gfm",
+      "remark-math",
+      "remark-mdx",
+      "shiki",
+      "stripe",
+      "svix",
+      "swiper",
+      "tailwind-merge",
+      "tailwindcss",
+      "tailwindcss-animate",
+      "ts-morph",
+      "ts-node",
+      "typescript",
+      "unist-util-visit",
+      "uuid",
+      "zod"
+    ],
+    "compactLog": true
+  },
+  "architectureConfig": {
+    ".": "RootProject"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windrun-huaiin/dev-scripts",
-  "version": "14.1.0",
+  "version": "14.1.2",
   "description": "Development scripts for multilingual projects",
   "main": "dist/index.js",
   "bin": {
@@ -26,6 +26,7 @@
     "dist",
     "bin",
     "package.json",
+    "example.config.json",
     "README.md",
     "LICENSE"
   ],