@ysjdemo/umi-create-cli 0.0.3 → 0.0.4

package/README.md

@@ -6,12 +6,13 @@
 
 ```bash
 # 🔥 推荐：使用 npx 直接创建（无需安装）
-# 会自动提示选择模板，默认推荐 Ant Design Pro
+# 会自动提示选择模板，默认推荐 qiankun + antd + umi
 npx @ysjdemo/umi-create-cli create my-project
 
 # 或直接指定模板
 npx @ysjdemo/umi-create-cli create my-project -t antd
 npx @ysjdemo/umi-create-cli create my-project -t basic
+npx @ysjdemo/umi-create-cli create my-project -t qiankun
 
 # 查看帮助
 npx @ysjdemo/umi-create-cli --help

package/lib/constants/index.js

@@ -0,0 +1,5 @@
+module.exports.TEMPLATES_TYPES = {
+  qiankun: 'qiankun',
+  antd: 'antd',
+  umi: 'umi',
+};

package/lib/create.js

@@ -4,25 +4,26 @@ const inquirer = require("inquirer");
 const chalk = require("chalk");
 const ora = require("ora");
 const { generateTemplate, getAvailableTemplates } = require("./templates");
+const { TEMPLATES_TYPES } = require("./constants");
 
 // 默认选择的模板
-const BASE_TEMPLATE = "qiankun";
+const BASE_TEMPLATE = TEMPLATES_TYPES.qiankun;
 
 const templateChoices = [
   {
-    name: `🏗️  qiankun + antd + umi - 微前端模板 ${chalk.cyan("(推荐)")}`,
-    value: "qiankun",
-    short: "qiankun",
+    name: `🏗️  ${TEMPLATES_TYPES.qiankun} + antd + umi - 微前端模板 ${chalk.cyan("(推荐)")}`,
+    value: TEMPLATES_TYPES.qiankun,
+    short: TEMPLATES_TYPES.qiankun,
   },
   {
-    name: `🎨 antd + umi - Ant Design Pro 模板`,
-    value: "antd",
-    short: "antd",
+    name: `🎨 ${TEMPLATES_TYPES.antd} + umi - Ant Design Pro 模板`,
+    value: TEMPLATES_TYPES.antd,
+    short: TEMPLATES_TYPES.antd,
   },
   {
-    name: `📦 umi - 基础模板`,
-    value: "umi",
-    short: "umi",
+    name: `📦 ${TEMPLATES_TYPES.umi} - 基础模板`,
+    value: TEMPLATES_TYPES.umi,
+    short: TEMPLATES_TYPES.umi,
   },
 ];
 
@@ -50,7 +51,7 @@ async function createProject(projectName, options) {
         name: "chosenTemplate",
         message: "选择项目模板:",
         choices: templateChoices,
-        default: BASE_TEMPLATE, // 默认选择antd
+        default: BASE_TEMPLATE, // 默认选择qiankun
       },
     ]);
     selectedTemplate = chosenTemplate;
@@ -79,11 +80,21 @@ async function createProject(projectName, options) {
     await fs.remove(targetDir);
   }
 
+  // 询问用户是否获取最新版本
+  const { useLatestVersions } = await inquirer.prompt([
+    {
+      type: 'confirm', 
+      name: 'useLatestVersions',
+      message: '是否获取依赖包的最新版本？(推荐)',
+      default: true, // 默认为true，用户按回车就是获取最新版本
+    },
+  ]);
+
   const spinner = ora("正在创建项目...").start();
 
   try {
     // 生成项目文件
-    await generateTemplate(projectName, selectedTemplate, targetDir);
+    await generateTemplate(projectName, selectedTemplate, targetDir, useLatestVersions);
 
     spinner.succeed("项目文件生成完成");
 

package/lib/templates/antd/package.json

@@ -12,17 +12,17 @@
     "start": "npm run dev"
   },
   "dependencies": {
-    "@umijs/max": "^4.0.0",
-    "@ant-design/pro-components": "^2.6.0",
-    "@ant-design/icons": "^5.0.0",
-    "antd": "^5.0.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "@umijs/max": "{{@umijs/max}}",
+    "@ant-design/pro-components": "{{@ant-design/pro-components}}",
+    "@ant-design/icons": "{{@ant-design/icons}}",
+    "antd": "{{antd}}",
+    "react": "{{react}}",
+    "react-dom": "{{react-dom}}"
   },
   "devDependencies": {
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "prettier": "^2.7.1",
-    "typescript": "^5.0.0"
+    "@types/react": "{{@types/react}}",
+    "@types/react-dom": "{{@types/react-dom}}",
+    "prettier": "{{prettier}}",
+    "typescript": "{{typescript}}"
   }
 } 

package/lib/templates/basic/package.json

@@ -12,16 +12,16 @@
     "start": "npm run dev"
   },
   "dependencies": {
-    "@umijs/max": "^4.0.0",
-    "@ant-design/pro-components": "^2.6.0",
-    "antd": "^5.0.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "@umijs/max": "{{@umijs/max}}",
+    "@ant-design/pro-components": "{{@ant-design/pro-components}}",
+    "antd": "{{antd}}",
+    "react": "{{react}}",
+    "react-dom": "{{react-dom}}"
   },
   "devDependencies": {
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "prettier": "^2.7.1",
-    "typescript": "^5.0.0"
+    "@types/react": "{{@types/react}}",
+    "@types/react-dom": "{{@types/react-dom}}",
+    "prettier": "{{prettier}}",
+    "typescript": "{{typescript}}"
   }
 } 

package/lib/templates/common/.prettierrc

@@ -1,5 +1,5 @@
 {
-  "printWidth": 80,
+  "printWidth": 120,
   "singleQuote": true,
   "trailingComma": "all",
   "proseWrap": "never",

package/lib/templates/index.js

@@ -1,5 +1,8 @@
 const fs = require('fs-extra');
 const path = require('path');
+const inquirer = require('inquirer');
+const { TEMPLATES_TYPES } = require('../constants');
+const { getCommonPackageVersions, getCustomPackageVersions } = require('../utils/version');
 
 /**
  * 模板变量替换函数
@@ -62,7 +65,7 @@ async function copyTemplateDir(srcDir, destDir, variables) {
  * @param {string} templateType - 模板类型（如react、vue等）
  * @param {string} targetDir - 目标生成目录
  */
-async function generateTemplate(projectName, templateType, targetDir) {
+async function generateTemplate(projectName, templateType, targetDir, useLatestVersions) {
   // 获取模板根目录路径
   const templatesDir = path.join(__dirname, './');
   // 构建特定模板目录路径
@@ -74,10 +77,29 @@ async function generateTemplate(projectName, templateType, targetDir) {
   if (!await fs.pathExists(templateDir)) {
     throw new Error(`模板 "${templateType}" 不存在`);
   }
+
+  let packageVersions = {};
+  let customPackageVersions = {};
+  
+  if (useLatestVersions) {
+    // 获取最新版本信息
+    console.log('📦 正在获取依赖包最新版本...');
+    packageVersions = await getCommonPackageVersions();
+    customPackageVersions = await getCustomPackageVersions({
+      '@cfmm/umi-plugins-ui': '^0.0.72',
+      '@cfmm/umi-plugins-utils': '^0.0.22'
+    });
+  } else {
+    console.log('📦 使用默认版本，从version.js获取默认版本映射...')
+    const { getDefaultVersions } = require('../utils/version');
+    packageVersions = getDefaultVersions();
+  }
   
   // 定义模板变量，这些变量会在模板文件中被替换
   const variables = {
-    projectName: projectName || 'my-umi-app'
+    projectName: projectName || 'my-umi-app',
+    ...packageVersions,  // 将版本信息作为变量传入
+    ...customPackageVersions  // 将自定义包版本信息作为变量传入
   };
   
   // 确保目标目录存在
@@ -92,17 +114,19 @@ async function generateTemplate(projectName, templateType, targetDir) {
     'src/utils'       // 工具函数目录
   ];
   
-  // 遍历并创建所有基础目录
-  for (const dir of baseDirs) {
-    await fs.ensureDir(path.join(targetDir, dir));
+  if(templateType !== TEMPLATES_TYPES.qiankun) {
+    // 遍历并创建所有基础目录
+    for (const dir of baseDirs) {
+      await fs.ensureDir(path.join(targetDir, dir));
+    }
   }
   
   // 复制模板特定的文件（如React模板、Vue模板等）
   console.log(`📂 正在复制模板文件...`);
   await copyTemplateDir(templateDir, targetDir, variables);
   
-  // 复制通用文件（如配置文件、README等，所有模板都需要的文件）
-  if (await fs.pathExists(commonDir)) {
+  // qiankun不需要，复制通用文件（如配置文件、README等，所有模板都需要的文件）
+  if (await fs.pathExists(commonDir) && templateType !== TEMPLATES_TYPES.qiankun) {
     console.log(`📄 正在复制通用配置文件...`);
     await copyTemplateDir(commonDir, targetDir, variables);
   }

package/lib/templates/qiankun/README.md

@@ -0,0 +1,65 @@
+# Metal MES Workbench
+
+
+
+## 1、本地开发
+
+推荐使用Nodejs 18.20.4 + yarn + VS Code，关于前端环境开发等，请参考内部文档
+
+
+
+
+
+### 1、安装项目依赖
+
+克隆代码至本地，安装依赖包
+
+```bash
+# 全局安装yarn
+npm install -g yarn
+
+
+# 子文件夹
+cd cf-metal-mes-workbench-function 
+yarn
+
+# 父文件夹
+cd cf-metal-mes-workbench-base
+yarn
+```
+
+
+
+### 2、本地调试项目
+
+本地环境运行子项目
+
+```bash
+# 子文件夹
+cd cf-metal-mes-workbench-function
+
+# 推荐使用yarn
+yarn start:local
+```
+
+本地环境运行父项目
+
+```bash
+# 父文件夹
+cd cf-metal-mes-workbench-base
+
+# 推荐使用yarn
+yarn start:local
+```
+
+
+
+
+
+## 2、环境部署
+
+
+
+### 1、镜像编译
+
+使用Azure编译镜像

package/lib/templates/qiankun/azure-pipelines.yml

@@ -0,0 +1,103 @@
+# Node.js with React
+# Build a Node.js project that uses React.
+# Add steps that analyze code, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
+
+trigger:
+  - development
+
+pool:
+  vmImage: ubuntu-latest
+
+variables:
+  imageNameBaseDev: '$(dockerRegistry)/cf-numerical-control-mes-base-workbench-dev:$(build.BuildNumber)'
+  imageNameFunctionDev: '$(dockerRegistry)/cf-numerical-control-mes-function-workbench-dev:$(build.BuildNumber)'
+  # imageNameBaseProd: '$(dockerRegistry)/cf-numerical-control-mes-base-workbench-prod:$(build.BuildNumber)'
+  # imageNameFunctionProd: '$(dockerRegistry)/cf-numerical-control-mes-function-workbench-prod:$(build.BuildNumber)'  
+
+steps:
+
+  # ********************************************************************************************************
+  # 编译环境
+  # ********************************************************************************************************
+  - task: NodeTool@0
+    inputs:
+      versionSpec: '18.x'
+    displayName: 'Install Node.js'
+
+  # 安装依赖
+  - script: |
+      cd cf-numerical-control-mes-workbench-base/ && npm install -g corepack && corepack prepare yarn@stable --activate && yarn install
+    displayName: 'yarn install package'
+  - script: |
+      cd cf-numerical-control-mes-workbench-function/ && npm install -g corepack && corepack prepare yarn@stable --activate && yarn install
+    displayName: 'yarn install package'
+
+  # 运行脚本处理内存问题
+  # 为了防止出现内存溢出的情况 JavaScript heap out of memory
+  - script: |
+      export NODE_OPTIONS="--max-old-space-size=8192"
+    displayName: 'node options'
+
+  # ********************************************************************************************************
+  # 编译Dev环境
+  # ********************************************************************************************************
+
+  - script: |
+      cd cf-numerical-control-mes-workbench-base/ && npm run build:dev
+    displayName: 'build base dev project'
+
+  - script: |
+      cd cf-numerical-control-mes-workbench-base/ && docker build -t $(imageNameBaseDev) .
+    displayName: 'build base dev image'
+
+  - script: |
+      docker login --username=$(dockerUsername) registry.cn-hangzhou.aliyuncs.com -p $(dockerPassword)
+      docker push $(imageNameBaseDev)
+    displayName: 'push base dev image'
+
+  #----------------------------------------------
+
+  - script: |
+      cd cf-numerical-control-mes-workbench-function/ && npm run build:dev
+    displayName: 'build function dev project'
+
+  - script: |
+      cd cf-numerical-control-mes-workbench-function/ && docker build -t $(imageNameFunctionDev) .
+    displayName: 'build function dev image'
+
+  - script: |
+      docker login --username=$(dockerUsername) registry.cn-hangzhou.aliyuncs.com -p $(dockerPassword)
+      docker push $(imageNameFunctionDev)
+    displayName: 'push function dev image'
+  # ********************************************************************************************************
+  # 编译Prod环境
+  # ********************************************************************************************************
+
+  # - script: |
+  #     cd cf-numerical-control-mes-workbench-base/ && npm run build:prod
+  #   displayName: 'build base prod project'
+
+  # - script: |
+  #     cd cf-numerical-control-mes-workbench-base/ && docker build -t $(imageNameBaseProd) .
+  #   displayName: 'build base prod image'
+
+  # - script: |
+  #     docker login --username=$(dockerUsername) registry.cn-hangzhou.aliyuncs.com -p $(dockerPassword)      
+  #     docker push $(imageNameBaseProd)
+  #   displayName: 'push base prod image'
+
+  #----------------------------------------------
+
+  # - script: |
+  #     cd cf-numerical-control-mes-workbench-function/ && npm run build:prod
+  #   displayName: 'build function prod project'
+
+  # - script: |
+  #     cd cf-numerical-control-mes-workbench-function/ && docker build -t $(imageNameFunctionProd) .
+  #   displayName: 'build function prod image'
+
+  # - script: |
+  #     docker login --username=$(dockerUsername) registry.cn-hangzhou.aliyuncs.com -p $(dockerPassword)      
+  #     docker push $(imageNameFunctionProd)
+  #   displayName: 'push function prod image'

package/lib/templates/qiankun/cf-workbench-base/.env

@@ -0,0 +1 @@
+PORT=8000

package/lib/templates/qiankun/cf-workbench-base/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  extends: [require.resolve('@umijs/fabric/dist/eslint')],
+  globals: {
+    ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,
+    page: true,
+    REACT_APP_ENV: true,
+  },
+};

package/lib/templates/qiankun/cf-workbench-base/.husky/commit-msg

@@ -0,0 +1 @@
+npx --no-install max verify-commit $1

package/lib/templates/qiankun/cf-workbench-base/.husky/pre-commit

@@ -0,0 +1 @@
+npx --no-install lint-staged --quiet

package/lib/templates/qiankun/cf-workbench-base/.lintstagedrc

@@ -0,0 +1,17 @@
+{
+  "*.{md,json}": [
+    "prettier --cache --write"
+  ],
+  "*.{js,jsx}": [
+    "max lint --fix --eslint-only",
+    "prettier --cache --write"
+  ],
+  "*.{css,less}": [
+    "max lint --fix --stylelint-only",
+    "prettier --cache --write"
+  ],
+  "*.ts?(x)": [
+    "max lint --fix --eslint-only",
+    "prettier --cache --parser=typescript --write"
+  ]
+}

package/lib/templates/qiankun/cf-workbench-base/.prettierignore

@@ -0,0 +1,3 @@
+node_modules
+.umi
+.umi-production

package/lib/templates/qiankun/cf-workbench-base/.prettierrc

@@ -0,0 +1,8 @@
+{
+  "printWidth": 120,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "proseWrap": "never",
+  "overrides": [{ "files": ".prettierrc", "options": { "parser": "json" } }],
+  "plugins": ["prettier-plugin-organize-imports", "prettier-plugin-packagejson"]
+}

package/lib/templates/qiankun/cf-workbench-base/.stylelintrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+  extends: require.resolve('@umijs/max/stylelint'),
+};

package/lib/templates/qiankun/cf-workbench-base/.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

package/lib/templates/qiankun/cf-workbench-base/Dockerfile

@@ -0,0 +1,11 @@
+# 镜像nginx:1.19开始才有模板功能
+FROM nginx:1.19-alpine
+
+# 编译完成的文件
+COPY ./dist /usr/share/nginx/html
+
+# 默认端口
+EXPOSE 80
+
+# 运行nginx服务
+CMD ["nginx", "-g", "daemon off;"]

package/lib/templates/qiankun/cf-workbench-base/README.md

@@ -0,0 +1,3 @@
+# README
+
+`@umijs/max` 模板项目，更多功能参考 [Umi Max 简介](https://umijs.org/docs/max/introduce)

package/lib/templates/qiankun/cf-workbench-base/config/config.develop.ts

@@ -0,0 +1,39 @@
+// https://umijs.org/config/
+import { defineConfig } from '@umijs/max';
+
+export default defineConfig({
+  // 开发环境构建生成 source map，方便调试
+  devtool: 'source-map',
+  
+  define: {
+    /** Keycloak */
+    KEYCLOAK_URL: 'https://10.8.0.2:8443/',
+    KEYCLOAK_REALM_NAME: 'CF',
+    KEYCLOAK_CLIENT_NAME: 'numerical-control-mes-ui-client-dev',
+
+    /** Help Docs */
+    HELP_DOCS_URL: 'http://10.8.0.5:81/',
+
+    /** API */
+    BACKEND_API_URL: 'http://10.8.0.5:9080/',
+    /** kkFileView */
+    FILE_VIEWER_URL: 'http://10.8.0.5:8012/',
+
+    /** WebSocket */
+    WEB_SOCKET_URL: 'wss://10.8.0.5/wss/ws?',
+
+    /** MQTT */
+    MQTT_HOST: '10.8.0.5',
+
+    /** Sentry，为空则不开启 */
+    SENTRY_DSN: 'http://0f6c77944b0a531deab095615c751a9a@10.8.0.15:9000/3',
+
+    REACT_APP_ENV: 'dev',
+
+    /**
+     * MMS子应用的entry地址
+     * 父级应用才需要配置该参数
+     */
+    MES_ENTRY_URL: '//10.8.0.5:8001',
+  },
+});

package/lib/templates/qiankun/cf-workbench-base/config/config.local.ts

@@ -0,0 +1,39 @@
+// https://umijs.org/config/
+import { defineConfig } from '@umijs/max';
+import proxy from './proxy';
+
+export default defineConfig({
+  proxy: proxy['dev'],
+  define: {
+    /** Keycloak */
+    KEYCLOAK_URL: 'https://10.8.0.2:8443/',
+    KEYCLOAK_REALM_NAME: 'CF',
+    KEYCLOAK_CLIENT_NAME: 'numerical-control-mes-ui-client-local',
+
+    /** Help Docs */
+    HELP_DOCS_URL: 'http://10.8.0.5:81/',
+
+    /** API */
+    BACKEND_API_URL: 'http://10.8.0.5:8081/',
+    /** kkFileView */
+    FILE_VIEWER_URL: 'http://10.8.0.5:8012/',
+
+    /** WebSocket */
+    WEB_SOCKET_URL: 'wss://10.8.0.5/wss/ws?',
+
+    /** MQTT */
+    MQTT_HOST: '10.8.0.5',
+
+    /** Sentry，为空则不开启 */
+    SENTRY_DSN: 'http://0f6c77944b0a531deab095615c751a9a@10.8.0.15:9000/3',
+    
+    REACT_APP_ENV: 'dev',
+    
+    /**
+     * MMS子应用的entry地址
+     * 父级应用才需要配置该参数
+     */
+    MES_ENTRY_URL: '//localhost:8001',
+  }
+});
+

package/lib/templates/qiankun/cf-workbench-base/config/config.production.ts

@@ -0,0 +1,36 @@
+// https://umijs.org/config/
+import { defineConfig } from '@umijs/max';
+
+export default defineConfig({
+  define: {
+    /** Keycloak */
+    KEYCLOAK_URL: 'https://172.19.0.128:8443/',
+    KEYCLOAK_REALM_NAME: 'CF',
+    KEYCLOAK_CLIENT_NAME: 'numerical-control-mes-ui-client',
+
+    /** Help Docs */
+    HELP_DOCS_URL: 'http://172.19.0.66:81/',
+
+    /** API */
+    BACKEND_API_URL: 'http://172.19.0.66:9080/',
+    /** kkFileView */
+    FILE_VIEWER_URL: 'http://172.19.0.66:8012/',
+
+    /** WebSocket */
+    WEB_SOCKET_URL: 'wss://172.19.0.66/wss/ws?',
+
+    /** MQTT */
+    MQTT_HOST: '172.19.0.66',
+
+    /** Sentry，为空则不开启 */
+    SENTRY_DSN: '',
+
+    REACT_APP_ENV: 'prod',
+
+    /**
+     * MMS子应用的entry地址
+     * 父级应用才需要配置该参数
+     */
+    MES_ENTRY_URL: '//172.19.0.66:8001',
+  }
+});

package/lib/templates/qiankun/cf-workbench-base/config/config.ts

@@ -0,0 +1,23 @@
+// https://umijs.org/config/
+import { defineConfig } from '@umijs/max';
+import routes from './routes';
+
+export default defineConfig({
+  plugins: ['./plugins/qiankun', '@cfmm/umi-plugins-utils', '@cfmm/umi-plugins-ui'],
+  qiankunNew: {
+    master: {},
+  },
+  cfmmUtils: {
+    baseConfig: true,
+    dayjs: {
+      i18n: true,
+      locales: true,
+    }
+  },
+  antd: {},
+  exportStatic: {},
+  layout: {
+    title: 'CuiFeng MES',
+  },
+  routes,
+});

package/lib/templates/qiankun/cf-workbench-base/config/defaultSettings.ts

@@ -0,0 +1,50 @@
+import { ProLayoutProps } from '@ant-design/pro-components';
+import { Settings as ProSettings } from '@ant-design/pro-layout';
+import logo from '@/assets/logo.png';
+
+export interface ProLayoutSetting extends ProLayoutProps {
+  pwa?: boolean;
+  logo?: string;
+}
+
+export const blankSettings: ProLayoutSetting = {
+  headerRender: false,
+  menuRender: false,
+  // footerRender: false,
+  menuHeaderRender: false,
+  breadcrumbRender: false,
+}
+
+
+type DefaultSettings = Partial<ProSettings> & {
+  pwa: boolean;
+};
+
+const settings: ProLayoutSetting = {
+  style:{
+    height: '100vh',
+  },
+  navTheme: 'light',
+  // 拂晓蓝
+  colorPrimary: '#1890ff',
+  //菜单上面的logo
+  logo,
+  // 网页的title
+  title: 'CuiFeng MES',
+  //布局
+  layout: 'mix',
+  contentWidth: 'Fluid',
+  fixedHeader: false,
+  fixSiderbar: true,
+  colorWeak: false,
+  pwa: true,
+  iconfontUrl: '',
+  token: {
+    // 参见ts声明，demo 见文档，通过token 修改样式
+    //https://procomponents.ant.design/components/layout#%E9%80%9A%E8%BF%87-token-%E4%BF%AE%E6%94%B9%E6%A0%B7%E5%BC%8F
+  },
+};
+
+export type { DefaultSettings };
+
+export default settings;