openxiangda 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.6",
+  "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/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",
     ]);
   });
 });