nsgm-cli 2.1.42 → 2.1.44

package/README.md

@@ -113,7 +113,7 @@ cp .env.example .env
 
 ```bash
 # Generate secure password hash
-npm run generate-password yourNewPassword
+pnpm run generate-password yourNewPassword
 
 # Edit .env file with generated hash
 nano .env
@@ -123,10 +123,10 @@ nano .env
 
 ```bash
 # Install dependencies
-npm install
+pnpm install
 
 # Start development server
-npm run dev
+pnpm run dev
 ```
 
 Your application will be available at `http://localhost:3000` with:
@@ -173,9 +173,9 @@ nsgm upgrade                 # Upgrade project base files
 nsgm export                  # Export static pages
 
 # Development tools
-npm run lint                 # Code linting
-npm run test                 # Run tests
-npm run test:coverage        # Test coverage report
+pnpm run lint                 # Code linting
+pnpm run test                 # Run tests
+pnpm run test:coverage        # Test coverage report
 ```
 
 ## 🎨 Generated Controller Features

package/client/layout/index.tsx

@@ -11,7 +11,7 @@ import {
   StyledContent,
 } from "@/styled/layout";
 import { useRouter } from "next/router";
-import _ from "lodash";
+import * as _ from "lodash";
 import menuConfig, { getMenuConfig } from "@/utils/menu";
 import { LogoutOutlined } from "@ant-design/icons";
 import LanguageSwitcher from "@/components/LanguageSwitcher";

package/client/redux/template/manage/reducers.ts

@@ -1,5 +1,5 @@
 import * as types from "./types";
-import _ from "lodash";
+import * as _ from "lodash";
 
 const initialState = {
   firstLoadFlag: true,

package/client/service/template/manage.ts

@@ -1,5 +1,5 @@
 import { getLocalGraphql } from "@/utils/fetch";
-import _ from "lodash";
+import * as _ from "lodash";
 
 export const getTemplateService = (page = 0, pageSize = 10) => {
   const getTemplateQuery = `query ($page: Int, $pageSize: Int) { template(page: $page, pageSize: $pageSize) { 

package/client/styled/template/manage.ts

@@ -171,7 +171,7 @@ export const StyledInput = styled(Input)`
   box-shadow: 0 2px 0 rgba(0, 0, 0, 0.015);
 `;
 
-export const StyledTable = styled(Table)`
+export const StyledTable: any = styled(Table)`
   margin-top: 16px;
   border-radius: 12px;
   overflow: hidden;

package/client/utils/common.ts

@@ -1,4 +1,4 @@
-import _ from "lodash";
+import * as _ from "lodash";
 
 export const getLocalEnv = () => {
   // 安全地访问 process.env，避免在浏览器中直接访问 process 对象

package/client/utils/cookie.ts

@@ -1,4 +1,4 @@
-import _ from "lodash";
+import * as _ from "lodash";
 
 export const setCookie = (name: string, value: string, cookieExpire: any) => {
   const currentDate = new Date();

package/client/utils/sso.ts

@@ -1,7 +1,7 @@
 import axios from "axios";
 import { setCookie, getCookie, delCookie } from "./cookie";
 import { getUrlParamByKey, getLocalApiPrefix, getLocalEnv, handleXSS } from "./common";
-import _ from "lodash";
+import * as _ from "lodash";
 
 // 延迟初始化 cookie 名称，避免在模块加载时访问 process
 const getLoginCookieId = () => `${getLocalEnv()}_cas_nsgm`;

package/generation/README.md

@@ -17,27 +17,27 @@
 
 | 命令             | 说明         |
 | ---------------- | ------------ |
-| `npm run dev`    | 开发模式     |
-| `npm run start`  | 生产模式     |
-| `npm run build`  | 编译项目     |
-| `npm run export` | 导出静态页面 |
+| `pnpm run dev`    | 开发模式     |
+| `pnpm run start`  | 生产模式     |
+| `pnpm run build`  | 编译项目     |
+| `pnpm run export` | 导出静态页面 |
 
 ### 测试命令
 
 | 命令                    | 说明             |
 | ----------------------- | ---------------- |
-| `npm test`              | 运行所有测试     |
-| `npm run test:watch`    | 监视模式运行测试 |
-| `npm run test:coverage` | 生成覆盖率报告   |
+| `pnpm test`              | 运行所有测试     |
+| `pnpm run test:watch`    | 监视模式运行测试 |
+| `pnpm run test:coverage` | 生成覆盖率报告   |
 
 ### 代码生成命令
 
 | 命令                    | 说明                  |
 | ----------------------- | --------------------- |
-| `npm run create`        | 创建模板页面          |
-| `npm run delete`        | 删除模板页面          |
-| `npm run create-config` | 从配置文件批量创建模块 |
-| `npm run delete-config` | 从配置文件批量删除模块 |
+| `pnpm run create`        | 创建模板页面          |
+| `pnpm run delete`        | 删除模板页面          |
+| `pnpm run create-config` | 从配置文件批量创建模块 |
+| `pnpm run delete-config` | 从配置文件批量删除模块 |
 
 ### 项目维护命令
 

package/generation/package.json

@@ -1,6 +1,7 @@
 {
   "name": "nsgm-cli-project",
   "version": "1.0.0",
+  "packageManager": "pnpm@10.28.0",
   "description": "",
   "main": "app.js",
   "scripts": {
@@ -31,6 +32,9 @@
     "@types/react": "^18.3.23",
     "@types/react-dom": "^18.3.7",
     "@types/lodash": "^4.17.20",
+    "@types/express-serve-static-core": "^5.1.1",
+    "@types/qs": "^6.14.0",
+    "@types/hoist-non-react-statics": "^3.3.7",
     "typescript": "^5.8.3",
     "jest": "^30.0.5",
     "jest-environment-jsdom": "^30.0.5",

package/lib/args.js

@@ -1,10 +1,40 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProcessArgvs = void 0;
-const lodash_1 = __importDefault(require("lodash"));
+const _ = __importStar(require("lodash"));
 const getProcessArgvs = (removeItems = 2) => {
     const args = process.argv.slice(removeItems);
     const result = {
@@ -13,7 +43,7 @@ const getProcessArgvs = (removeItems = 2) => {
         controller: "",
         action: "", // create/delete controller=${controller} action=${action}
     };
-    lodash_1.default.each(args, (item, index) => {
+    _.each(args, (item, index) => {
         if (item.indexOf("=") !== -1) {
             const itemArr = item.split("=");
             const key = itemArr[0].toLowerCase();

package/lib/generate.js

@@ -13,7 +13,7 @@ const generate_init_1 = require("./generate_init");
 const generate_create_1 = require("./generate_create");
 const generate_delete_1 = require("./generate_delete");
 // 常量提取
-const NPM_INSTALL_FLAGS = "--legacy-peer-deps";
+const PNPM_INSTALL_FLAGS = "--strict-peer-dependencies false";
 // 辅助函数
 const normalizeDirectory = (dictionary) => {
     // 禁止绝对路径，强制所有生成目录都在 cwd 下
@@ -26,11 +26,11 @@ const installNpmPackages = (targetDir) => {
     try {
         const prefix = targetDir ? `cd ${targetDir} && ` : "";
         console.log("Installing all dependencies from package.json...");
-        const installResult = shelljs_1.default.exec(`${prefix}npm install ${NPM_INSTALL_FLAGS}`);
+        const installResult = shelljs_1.default.exec(`${prefix}pnpm install ${PNPM_INSTALL_FLAGS}`);
         return installResult.code === 0;
     }
     catch (error) {
-        console.error("Failed to install npm packages:", error);
+        console.error("Failed to install pnpm packages:", error);
         return false;
     }
 };

package/lib/generators/file-generator.js

@@ -180,7 +180,7 @@ export const ModalContainer = styled.div\`
   }
 \`
 
-export const StyledButton = styled(Button)<{ $primary?: boolean; $export?: boolean; $import?: boolean; $danger?: boolean }>\`
+export const StyledButton: any = styled(Button)\`
   display: flex;
   align-items: center;
   border-radius: 6px;
@@ -216,13 +216,13 @@ export const StyledButton = styled(Button)<{ $primary?: boolean; $export?: boole
     \`}
 \`
 
-export const StyledInput = styled(Input)\`
+export const StyledInput: any = styled(Input)\`
   width: 200px;
   border-radius: 6px;
   box-shadow: 0 2px 0 rgba(0, 0, 0, 0.015);
 \`
 
-export const StyledTable = styled(Table)\`
+export const StyledTable: any = styled(Table)\`
   margin-top: 16px;
   border-radius: 8px;
   overflow: hidden;
@@ -254,7 +254,7 @@ export const IconWrapper = styled.i\`
   margin-right: 5px;
 \`
 
-export const RoundedButton = styled(Button)\`
+export const RoundedButton: any = styled(Button)\`
   border-radius: 4px;
 \`
 

package/lib/server/csrf.d.ts

@@ -12,6 +12,6 @@ declare module "express-serve-static-core" {
 export declare const csrfProtection: (req: Request, res: Response, next: NextFunction) => unknown;
 export declare const getCSRFToken: (req: Request, res: Response) => void;
 export declare const securityMiddleware: {
-    basicHeaders: import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+    basicHeaders: any;
 };
-export declare const createCSPMiddleware: () => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+export declare const createCSPMiddleware: () => any;

package/lib/server/graphql.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = require("graphql-http/lib/use/express");
 const graphql_1 = require("graphql");
 const fs_1 = __importDefault(require("fs"));
-const lodash_1 = __importDefault(require("lodash"));
+const _ = __importStar(require("lodash"));
 const path_1 = require("path");
 const date_1 = __importDefault(require("./plugins/date"));
 const dataloaders_1 = require("./dataloaders");
@@ -62,9 +95,9 @@ function generateTypeDefsAndResolvers() {
         ...date_1.default,
         ...handleOutPlugins(),
     };
-    const scalars = lodash_1.default.keys(resolvers);
+    const scalars = _.keys(resolvers);
     let scalarStr = "";
-    lodash_1.default.each(scalars, (item) => {
+    _.each(scalars, (item) => {
         scalarStr += `scalar ${item}\n    `;
     });
     const _generateAllComponentRecursive = (path = defaultPath) => {