openxiangda 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {

package/packages/sdk/src/build-source/scripts/publish-all.mjs

@@ -13,8 +13,9 @@ import minimist from "minimist";
 import { rootDir } from "./utils/load-config.mjs";
 import {
   discoverWorkspaceModules,
+  commitIncrementalPublish,
   normalizeOnly,
-  planIncrementalBuild,
+  planIncrementalPublish,
   printPlan,
 } from "./utils/incremental.mjs";
 
@@ -99,7 +100,7 @@ const maybeDryRun = dryRun ? ["--dry-run"] : [];
 const maybeForce = force ? ["--force"] : [];
 
 const allModules = discoverWorkspaceModules();
-const plan = planIncrementalBuild(allModules, { force, only });
+const plan = planIncrementalPublish(allModules, { force, only });
 printPlan(plan, "publish-all");
 if (plan.changed.length === 0 && !force) {
   console.log("✅ 没有检测到变更，跳过发布");
@@ -110,18 +111,26 @@ console.log(`🚀 发布应用工作区 (${dryRun ? "DRY RUN" : "LIVE"})`);
 console.log(`   APP_BUILD_ID=${buildId}`);
 console.log("");
 
+const publishedModules = [];
+
 for (const moduleItem of plan.changed) {
   if (moduleItem.kind === "forms") {
     await run("sync-schema.mjs", ["--form", moduleItem.name, ...maybeDryRun]);
     await run("build-forms.mjs", ["--form", moduleItem.name, ...maybeForce]);
     await run("publish-oss.mjs", ["--form", moduleItem.name, ...maybeDryRun]);
     await run("register.mjs", ["--form", moduleItem.name, ...maybeDryRun]);
+    publishedModules.push(moduleItem);
   } else if (moduleItem.kind === "pages") {
     await run("build-pages.mjs", ["--page", moduleItem.name, ...maybeForce]);
     await run("publish-oss.mjs", ["--page", moduleItem.name, ...maybeDryRun]);
     await run("register.mjs", ["--page", moduleItem.name, ...maybeDryRun]);
+    publishedModules.push(moduleItem);
   }
 }
 
+if (!dryRun) {
+  commitIncrementalPublish(plan, publishedModules);
+}
+
 console.log("");
 console.log(`✅ 发布流程完成，buildId=${buildId}`);

package/packages/sdk/src/build-source/scripts/utils/incremental.mjs

@@ -5,6 +5,11 @@ import { rootDir } from "./load-config.mjs";
 
 const CACHE_VERSION = 1;
 export const CACHE_FILE = path.join(rootDir, ".openxiangda", "build-cache.json");
+export const PUBLISH_CACHE_FILE = path.join(
+  rootDir,
+  ".openxiangda",
+  "publish-cache.json",
+);
 
 function toPosix(filePath) {
   return filePath.split(path.sep).join("/");
@@ -89,15 +94,23 @@ export function computeConfigHash() {
   return hash.digest("hex");
 }
 
-export function loadBuildCache() {
+function loadCache(cacheFile) {
   try {
-    const cache = JSON.parse(fs.readFileSync(CACHE_FILE, "utf-8"));
+    const cache = JSON.parse(fs.readFileSync(cacheFile, "utf-8"));
     return cache.version === CACHE_VERSION ? cache : null;
   } catch {
     return null;
   }
 }
 
+export function loadBuildCache() {
+  return loadCache(CACHE_FILE);
+}
+
+export function loadPublishCache() {
+  return loadCache(PUBLISH_CACHE_FILE);
+}
+
 export function cleanBuildCache() {
   fs.rmSync(CACHE_FILE, { force: true });
 }
@@ -111,7 +124,7 @@ export function normalizeOnly(value) {
     .filter(Boolean);
 }
 
-export function planIncrementalBuild(modules, options = {}) {
+function createIncrementalPlan(modules, options = {}, cache = null) {
   const only = normalizeOnly(options.only);
   const selected = only.length
     ? modules.filter((item) => only.includes(item.key))
@@ -125,7 +138,6 @@ export function planIncrementalBuild(modules, options = {}) {
     configHash: computeConfigHash(),
     moduleHashes,
   };
-  const cache = loadBuildCache();
   const fullRebuild =
     Boolean(options.force) ||
     !cache ||
@@ -145,6 +157,14 @@ export function planIncrementalBuild(modules, options = {}) {
   };
 }
 
+export function planIncrementalBuild(modules, options = {}) {
+  return createIncrementalPlan(modules, options, loadBuildCache());
+}
+
+export function planIncrementalPublish(modules, options = {}) {
+  return createIncrementalPlan(modules, options, loadPublishCache());
+}
+
 export function discoverWorkspaceModules() {
   const modules = [];
   for (const [kind, requiredFile] of [
@@ -168,24 +188,23 @@ export function discoverWorkspaceModules() {
   return modules.sort((left, right) => left.key.localeCompare(right.key));
 }
 
-export function commitIncrementalBuild(plan, builtModules) {
-  const previous = loadBuildCache();
+function commitIncrementalCache(cacheFile, previous, plan, modules) {
   const entries = { ...(previous?.entries || {}) };
   const now = new Date().toISOString();
   const isPartialBuild = plan.selected.length !== plan.all.length;
   const preserveGlobalSnapshot = Boolean(
     previous && isPartialBuild && plan.fullRebuild,
   );
-  for (const item of builtModules) {
+  for (const item of modules) {
     entries[item.key] = {
       contentHash: plan.snapshot.moduleHashes[item.key],
       lastBuildTime: now,
       success: true,
     };
   }
-  fs.mkdirSync(path.dirname(CACHE_FILE), { recursive: true });
+  fs.mkdirSync(path.dirname(cacheFile), { recursive: true });
   fs.writeFileSync(
-    CACHE_FILE,
+    cacheFile,
     `${JSON.stringify(
       {
         version: CACHE_VERSION,
@@ -207,6 +226,19 @@ export function commitIncrementalBuild(plan, builtModules) {
   );
 }
 
+export function commitIncrementalBuild(plan, builtModules) {
+  commitIncrementalCache(CACHE_FILE, loadBuildCache(), plan, builtModules);
+}
+
+export function commitIncrementalPublish(plan, publishedModules) {
+  commitIncrementalCache(
+    PUBLISH_CACHE_FILE,
+    loadPublishCache(),
+    plan,
+    publishedModules,
+  );
+}
+
 export function printPlan(plan, label) {
   if (plan.changed.length === 0) {
     console.log(`[build] ${label}: No changes detected`);

package/packages/sdk/src/build-source/scripts/utils/incremental.test.ts

@@ -0,0 +1,78 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+let tempDirs: string[] = [];
+
+function createWorkspace() {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), "workspace-incremental-"));
+  tempDirs.push(dir);
+  fs.mkdirSync(path.join(dir, "src", "pages", "dashboard"), {
+    recursive: true,
+  });
+  fs.writeFileSync(
+    path.join(dir, "package.json"),
+    JSON.stringify({ name: "test-workspace", dependencies: { openxiangda: "1.0.5" } }),
+    "utf-8",
+  );
+  fs.writeFileSync(path.join(dir, "pnpm-lock.yaml"), "lockfileVersion: 9.0\n", "utf-8");
+  fs.writeFileSync(
+    path.join(dir, "src", "pages", "dashboard", "page.config.ts"),
+    "export default { code: 'dashboard', name: 'Dashboard' };\n",
+    "utf-8",
+  );
+  fs.writeFileSync(
+    path.join(dir, "src", "pages", "dashboard", "index.tsx"),
+    "export default function Dashboard() { return null; }\n",
+    "utf-8",
+  );
+  return dir;
+}
+
+async function loadIncremental(rootDir: string) {
+  const previousRoot = process.env.LOWCODE_WORKSPACE_ROOT;
+  process.env.LOWCODE_WORKSPACE_ROOT = rootDir;
+  vi.resetModules();
+  const module = await import("./incremental.mjs");
+  if (previousRoot === undefined) {
+    delete process.env.LOWCODE_WORKSPACE_ROOT;
+  } else {
+    process.env.LOWCODE_WORKSPACE_ROOT = previousRoot;
+  }
+  return module;
+}
+
+afterEach(() => {
+  for (const dir of tempDirs) {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+  tempDirs = [];
+  vi.resetModules();
+});
+
+describe("incremental publish cache", () => {
+  it("does not treat a local build cache entry as an already published module", async () => {
+    const workspaceRoot = createWorkspace();
+    const incremental = await loadIncremental(workspaceRoot);
+    const modules = incremental.discoverWorkspaceModules();
+
+    const buildPlan = incremental.planIncrementalBuild(modules);
+    expect(buildPlan.changed.map((item: any) => item.key)).toEqual([
+      "pages/dashboard",
+    ]);
+
+    incremental.commitIncrementalBuild(buildPlan, buildPlan.changed);
+
+    expect(incremental.planIncrementalBuild(modules).changed).toHaveLength(0);
+    expect(incremental.planIncrementalPublish(modules).changed.map((item: any) => item.key)).toEqual([
+      "pages/dashboard",
+    ]);
+
+    const publishPlan = incremental.planIncrementalPublish(modules);
+    incremental.commitIncrementalPublish(publishPlan, publishPlan.changed);
+
+    expect(incremental.planIncrementalPublish(modules).changed).toHaveLength(0);
+  });
+});

package/packages/sdk/src/build-source/scripts/utils/tailwind-config.mjs

@@ -73,6 +73,7 @@ export function isWorkspaceTailwindConfigCurrent(content) {
 
 export function isWorkspaceTailwindCssCurrent(content) {
   return (
+    /@import\s+["']openxiangda\/styles\/tokens\.css["'];/.test(content) &&
     /@layer\s+tailwind-base\s*\{\s*@tailwind\s+base\s*;\s*\}/s.test(content) &&
     !/@layer\s+tailwind-base\s*,\s*antd\s*;/.test(content) &&
     tailwindDirectives
@@ -270,7 +271,7 @@ export function validateWorkspaceTailwindConfig(workspaceRoot) {
     : "";
   if (!isWorkspaceTailwindCssCurrent(cssContent)) {
     return [
-      "src/index.css must keep Tailwind base in @layer tailwind-base and avoid declaring antd layer",
+      "src/index.css must import openxiangda/styles/tokens.css, keep Tailwind base in @layer tailwind-base, and avoid declaring antd layer",
     ];
   }
   return [];

package/packages/sdk/src/build-source/scripts/utils/tailwind-config.test.ts

@@ -60,6 +60,7 @@ describe("workspace Tailwind config helpers", () => {
     expect(cssContent).toContain("@tailwind utilities;");
     expect(postcssContent).toContain("createOpenXiangdaNamespaceCssPlugin");
     expect(postcssContent).toContain('require("openxiangda/build")');
+    expect(cssContent).toContain('@import "openxiangda/styles/tokens.css";');
     expect(validateWorkspaceTailwindConfig(workspaceRoot)).toEqual([]);
   });
 
@@ -128,7 +129,9 @@ module.exports = {
   });
 
   it("keeps current Tailwind base layer index css unchanged", () => {
-    const source = `@layer tailwind-base {
+    const source = `@import "openxiangda/styles/tokens.css";
+
+@layer tailwind-base {
   @tailwind base;
 }
 
@@ -143,6 +146,20 @@ module.exports = {
     expect(patchWorkspaceTailwindCss(source)).toBe(source);
   });
 
+  it("adds missing OpenXiangda design tokens import to otherwise current index css", () => {
+    const nextContent = patchWorkspaceTailwindCss(`@layer tailwind-base {
+  @tailwind base;
+}
+
+@tailwind components;
+@tailwind utilities;
+`);
+
+    expect(nextContent).toContain('@import "openxiangda/styles/tokens.css";');
+    expect(nextContent.match(/openxiangda\/styles\/tokens\.css/g)).toHaveLength(1);
+    expect(nextContent).toContain("@layer tailwind-base");
+  });
+
   it("patches standard PostCSS config with openxiangda namespace css plugin", () => {
     const nextContent = patchWorkspacePostcssConfig(`module.exports = {
   plugins: {
@@ -210,7 +227,7 @@ module.exports = { plugins: [custom()] };
     );
 
     expect(validateWorkspaceTailwindConfig(workspaceRoot)).toEqual([
-      "src/index.css must keep Tailwind base in @layer tailwind-base and avoid declaring antd layer",
+      "src/index.css must import openxiangda/styles/tokens.css, keep Tailwind base in @layer tailwind-base, and avoid declaring antd layer",
     ]);
   });
 });