openxiangda 1.0.53 → 1.0.55

package/package.json

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

package/packages/sdk/src/build-source/scripts/build-forms.mjs

@@ -24,6 +24,10 @@ import {
   formatExtractedAssetSummary,
 } from "./utils/static-assets.mjs";
 import { warnShadcnTailwindTokens } from "./utils/tailwind-token-warnings.mjs";
+import {
+  createWorkspaceStyleImport,
+  listWorkspaceStyleEntryPaths,
+} from "./utils/workspace-style-entry.mjs";
 
 process.env.NODE_ENV = "production";
 process.env.BABEL_ENV = "production";
@@ -110,7 +114,7 @@ function readPackageVersion(packageName) {
 function createRuntimeInputHash(runtimeEntryContent, cssIsolation) {
   const hash = crypto.createHash("sha256");
   const configFiles = [
-    path.join(rootDir, "src/index.css"),
+    ...listWorkspaceStyleEntryPaths(rootDir),
     path.join(rootDir, "app-workspace.config.ts"),
     path.join(rootDir, "tailwind.config.cjs"),
     path.join(rootDir, "postcss.config.cjs"),
@@ -255,6 +259,7 @@ function discoverForms(filterName) {
 }
 
 function createRuntimeEntryContent() {
+  const workspaceStyleImport = createWorkspaceStyleImport(rootDir, tmpDir);
   return `import React from 'react';
 import { createRoot } from 'react-dom/client';
 import { StyleProvider } from '@ant-design/cssinjs';
@@ -265,7 +270,7 @@ import 'dayjs/locale/zh-cn';
 import * as SyFormComponentsModule from 'openxiangda';
 import { antdTheme, legacyAntdTheme } from 'openxiangda/antd-theme';
 import 'antd-mobile/es/global';
-import '../src/index.css';
+import '${workspaceStyleImport}';
 
 const runtimeVersion = '${runtimeVersionPlaceholder}';
 dayjs.locale('zh-cn');

package/packages/sdk/src/build-source/scripts/build-pages.mjs

@@ -24,6 +24,10 @@ import {
 } from "./utils/static-assets.mjs";
 import { warnShadcnTailwindTokens } from "./utils/tailwind-token-warnings.mjs";
 import { loadConfig } from "./utils/load-config.mjs";
+import {
+  createWorkspaceStyleImport,
+  listWorkspaceStyleEntryPaths,
+} from "./utils/workspace-style-entry.mjs";
 
 process.env.NODE_ENV = "production";
 process.env.BABEL_ENV = "production";
@@ -231,7 +235,7 @@ function createRuntimeInputHash(runtimeEntryContent, cssIsolation) {
     return result;
   }, {});
   const configFiles = [
-    path.join(rootDir, "src/index.css"),
+    ...listWorkspaceStyleEntryPaths(rootDir),
     path.join(rootDir, "app-workspace.config.ts"),
     path.join(rootDir, "tailwind.config.cjs"),
     path.join(rootDir, "postcss.config.cjs"),
@@ -250,6 +254,7 @@ function createRuntimeInputHash(runtimeEntryContent, cssIsolation) {
 }
 
 function createRuntimeEntryContent() {
+  const workspaceStyleImport = createWorkspaceStyleImport(rootDir, tmpDir);
   return `import * as ReactModule from 'react';
 import * as ReactJsxRuntimeModule from 'react/jsx-runtime';
 import * as ReactDomClientModule from 'react-dom/client';
@@ -259,7 +264,7 @@ import zhCN from 'antd/locale/zh_CN';
 import * as IconsModule from '@ant-design/icons';
 import * as OpenXiangdaModule from 'openxiangda';
 import * as OpenXiangdaRuntimeModule from 'openxiangda/runtime';
-import '../src/index.css';
+import '${workspaceStyleImport}';
 
 const runtimeVersion = '${runtimeVersionPlaceholder}';
 

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

@@ -3,6 +3,7 @@ import { spawnSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { rootDir } from "./load-config.mjs";
+import { WORKSPACE_STYLE_ENTRY_CANDIDATES } from "./workspace-style-entry.mjs";
 
 const CACHE_VERSION = 1;
 export const CACHE_FILE = path.join(rootDir, ".openxiangda", "build-cache.json");
@@ -85,7 +86,7 @@ export function computeConfigHash() {
     "postcss.config.cjs",
     "vite.config.ts",
     "tsconfig.json",
-    "src/index.css",
+    ...WORKSPACE_STYLE_ENTRY_CANDIDATES,
   ]) {
     hash.update(name);
     hash.update("\0");
@@ -172,7 +173,7 @@ function isGlobalWorkspaceFile(filePath) {
     filePath === "postcss.config.cjs" ||
     filePath === "vite.config.ts" ||
     filePath === "tsconfig.json" ||
-    filePath === "src/index.css" ||
+    WORKSPACE_STYLE_ENTRY_CANDIDATES.includes(filePath) ||
     filePath.startsWith("src/shared/")
   );
 }

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

@@ -128,6 +128,14 @@ describe("incremental publish cache", () => {
       "export const format = String;\n",
       "utf-8",
     );
+    fs.mkdirSync(path.join(workspaceRoot, "src", "styles"), {
+      recursive: true,
+    });
+    fs.writeFileSync(
+      path.join(workspaceRoot, "src", "styles", "index.css"),
+      "@tailwind utilities;\n",
+      "utf-8",
+    );
 
     const incremental = await loadIncremental(workspaceRoot);
     const changed = incremental.resolveGitChangedWorkspaceTargets();
@@ -135,6 +143,9 @@ describe("incremental publish cache", () => {
     expect(changed.available).toBe(true);
     expect(changed.only).toEqual(["forms/customer", "pages/dashboard"]);
     expect(changed.resourceFiles).toEqual(["src/resources/menus.json"]);
-    expect(changed.globalFiles).toEqual(["src/shared/format.ts"]);
+    expect(changed.globalFiles).toEqual([
+      "src/shared/format.ts",
+      "src/styles/index.css",
+    ]);
   });
 });

package/packages/sdk/src/build-source/scripts/utils/workspace-style-entry.mjs

@@ -0,0 +1,29 @@
+import fs from "node:fs";
+import path from "node:path";
+
+export const WORKSPACE_STYLE_ENTRY_CANDIDATES = [
+  "src/index.css",
+  "src/styles/index.css",
+];
+
+function toPosix(filePath) {
+  return filePath.split(path.sep).join("/");
+}
+
+export function listWorkspaceStyleEntryPaths(rootDir) {
+  return WORKSPACE_STYLE_ENTRY_CANDIDATES.map((candidate) =>
+    path.join(rootDir, candidate),
+  );
+}
+
+export function resolveWorkspaceStyleEntry(rootDir) {
+  const candidates = listWorkspaceStyleEntryPaths(rootDir);
+  return candidates.find((candidate) => fs.existsSync(candidate)) || candidates[0];
+}
+
+export function createWorkspaceStyleImport(rootDir, fromDir) {
+  const stylePath = resolveWorkspaceStyleEntry(rootDir);
+  let relativePath = toPosix(path.relative(fromDir, stylePath));
+  if (!relativePath.startsWith(".")) relativePath = `./${relativePath}`;
+  return relativePath;
+}

package/templates/openxiangda-react-spa/package.json

@@ -19,7 +19,12 @@
     "typegen": "openxiangda resource typegen"
   },
   "dependencies": {
+    "@ant-design/cssinjs": "^1.23.0",
+    "@ant-design/icons": "^6",
     "@vitejs/plugin-react": "^4.3.0",
+    "antd": "^6.3.7",
+    "antd-mobile": "^5.37.0",
+    "dayjs": "^1.11.20",
     "lucide-react": "^0.468.0",
     "openxiangda": "latest",
     "react": "18.3.1",