create-antd-skin 1.1.1 → 1.1.2

package/bin/layout.js

@@ -43,7 +43,8 @@ const generator_1 = __importDefault(require("@babel/generator"));
 const t = __importStar(require("@babel/types"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
-const ANTD_LAYOUT_PKG = "@adminui-dev/antd-layout";
+const LAYOUT_PKG = "@adminui-dev/antd-layout";
+const WARDEN_SKIN_PKG = "../components/warden-skin";
 async function patchLayoutFile(filePath) {
     const code = await fs_extra_1.default.readFile(filePath, "utf8");
     if (!code.includes("<AntdLayout"))
@@ -52,8 +53,7 @@ async function patchLayoutFile(filePath) {
         sourceType: "module",
         plugins: ["typescript", "jsx"],
     });
-    let layoutNames = new Set();
-    let hasLayoutImport = false;
+    const layoutNames = new Set();
     let hasWardenSkinImport = false;
     let changed = false;
     // 1. 收集 import
@@ -61,16 +61,15 @@ async function patchLayoutFile(filePath) {
         ImportDeclaration(path) {
             const source = path.node.source.value;
             // layout package
-            if (source === "@adminui-dev/antd-layout") {
-                hasLayoutImport = true;
+            if (source === LAYOUT_PKG) {
                 for (const spec of path.node.specifiers) {
                     if (t.isImportSpecifier(spec)) {
                         layoutNames.add(spec.local.name);
                     }
                 }
             }
-            // ❗关键：wardenSkin 是否已存在
-            if (source === "../components/warden-skin") {
+            // wardenSkin 是否已经存在
+            if (source === WARDEN_SKIN_PKG) {
                 hasWardenSkinImport = true;
             }
         },
@@ -80,26 +79,33 @@ async function patchLayoutFile(filePath) {
     // 2. 修改 JSX
     (0, traverse_1.default)(ast, {
         JSXOpeningElement(path) {
-            const name = path.node.name;
-            if (!t.isJSXIdentifier(name))
+            const node = path.node;
+            if (!t.isJSXIdentifier(node.name))
                 return;
-            if (!layoutNames.has(name.name))
+            const name = node.name.name;
+            // 只处理 AntdLayout
+            if (!layoutNames.has(name))
                 return;
-            if (hasThemeSkinsProp(path.node))
+            // 是否已有 themeSkins
+            const hasThemeSkins = node.attributes.some(attr => t.isJSXAttribute(attr) &&
+                t.isJSXIdentifier(attr.name) &&
+                attr.name.name === "themeSkins");
+            if (hasThemeSkins)
                 return;
-            path.node.attributes.push(t.jsxAttribute(t.jsxIdentifier("themeSkins"), t.jsxExpressionContainer(t.identifier("wardenSkin"))));
+            node.attributes.push(t.jsxAttribute(t.jsxIdentifier("themeSkins"), t.jsxExpressionContainer(t.identifier("wardenSkin"))));
             changed = true;
-        }
+        },
     });
-    if (!changed)
-        return;
-    // 3. 注入 import（只在 layouts 文件里）
-    if (!hasWardenSkinImport) {
+    if (changed && !hasWardenSkinImport) {
         ast.program.body.unshift(t.importDeclaration([
-            t.importDefaultSpecifier(t.identifier("wardenSkin"))
-        ], t.stringLiteral("@/components/warden-skin")));
+            t.importDefaultSpecifier(t.identifier("wardenSkin")),
+        ], t.stringLiteral(WARDEN_SKIN_PKG)));
     }
-    const output = (0, generator_1.default)(ast, {}, code);
+    if (!changed && hasWardenSkinImport)
+        return;
+    const output = (0, generator_1.default)(ast, {
+        retainLines: true,
+    });
     await fs_extra_1.default.writeFile(filePath, output.code);
     console.log("✔ updated:", path_1.default.relative(process.cwd(), filePath));
 }
@@ -118,7 +124,7 @@ async function getLayoutFiles(dir) {
             result.push(...await getLayoutFiles(full));
             continue;
         }
-        if (/\.(tsx|ts)$/.test(item)) {
+        if (/\.(ts|tsx)$/.test(item)) {
             result.push(full);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-antd-skin",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "this is skin-cli for @adminui-dev/antd-layout",
   "main": "index.js",
   "author": "zhouwenqi",