neo-cmp-cli 1.8.2 → 1.8.5

package/bin/neo.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../src/module/index');
+require('../src/index');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neo-cmp-cli",
-  "version": "1.8.2",
+  "version": "1.8.5",
   "description": "Neo 自定义组件开发工具，支持react 和 vue2.0技术栈。",
   "keywords": [
     "neo-cli",
@@ -11,7 +11,7 @@
   "bin": {
     "neo": "./bin/neo.js"
   },
-  "main": "src/module/main.js",
+  "main": "src/main.js",
   "scripts": {
     "neo": "neo",
     "format": "prettier --write \"src/**/**/*.{js,jsx,vue,tsx,ts,scss,less,json}\""
@@ -19,6 +19,7 @@
   "files": [
     "bin/*",
     "src/*",
+    "template/*",
     "test/*"
   ],
   "husky": {
@@ -41,7 +42,7 @@
   },
   "dependencies": {
     "adm-zip": "^0.5.10",
-    "akfun": "^5.1.12",
+    "akfun": "^5.1.19",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.8",
     "chalk": "^4.0.0",
@@ -66,8 +67,8 @@
     "prettier": "^2.0.5"
   },
   "engines": {
-    "node": ">= 10.13.0",
-    "npm": ">= 6.4.1"
+    "node": ">= 16.0.0",
+    "npm": ">= 8.0.0"
   },
   "browserslist": [
     "> 1%",

package/src/{module/index.js → index.js}

@@ -3,21 +3,21 @@ const yargs = require('yargs'); // 命令行工具
 const chalk = require('chalk'); // 带样式的log输出
 const inquirer = require('inquirer'); // 问答式交互
 const ora = require('ora');
-const neoInit = require('./neoInit.js');
-const neoInitByCopy = require('./neoInitByCopy.js');
-const inspect = require('./inspect.js'); // 输出当前项目配置文件
-const neoConfigInit = require('../utils/neoConfigInit.js');
-const { validateProjectName } = require('../utils/projectNameValidator.js');
-const mainAction = require('./main.js'); // 入口文件
-const getCmpTypeByDir = require('../utils/cmpUtils/getCmpTypeByDir.js');
-const NeoService = require('../neo/neoService.js');
-const NeoLoginService = require('../neo/neoLogin.js');
-const curConfig = require('../config/index'); // 获取当前项目根目录下的配置文件
-const hasNeoProject = require('../utils/projectUtils/hasNeoProject.js');
-const consoleTag = require('../utils/neoParams').consoleTag;
-const { errorLog, successLog } = require('../utils/common');
+const neoInit = require('./module/neoInit.js');
+const neoInitByCopy = require('./module/neoInitByCopy.js');
+const inspect = require('./module/inspect.js'); // 输出当前项目配置文件
+const neoConfigInit = require('./utils/neoConfigInit.js');
+const { validateProjectName } = require('./utils/projectNameValidator.js');
+const getCmpTypeByDir = require('./utils/cmpUtils/getCmpTypeByDir.js');
+const NeoService = require('./neo/neoService.js');
+const NeoLoginService = require('./neo/neoLogin.js');
+const curConfig = require('./config/index'); // 获取当前项目根目录下的配置文件
+const hasNeoProject = require('./utils/projectUtils/hasNeoProject.js');
+const consoleTag = require('./utils/neoParams').consoleTag;
+const { errorLog, successLog } = require('./utils/common');
 // neo 的 package 文件
-const neoPackage = require('../../package.json');
+const neoPackage = require('../package.json');
+const mainAction = require('./main.js'); // 入口文件
 
 const titleTip = function (msg) {
   return chalk.green(chalk.bold(msg));

package/src/{module/main.js → main.js}

@@ -1,23 +1,23 @@
 const akfun = require('akfun');
 const _ = require('lodash');
-const neoInit = require('./neoInit');
-const neoInitByCopy = require('./neoInitByCopy');
-const inspect = require('./inspect');
-const neoConfigInit = require('../utils/neoConfigInit.js');
-const { consoleTag } = require('../utils/neoParams');
-const curConfig = require('../config/index'); // 获取当前项目根目录下的配置文件
-const publish2oss = require('../oss/publish2oss');
-const pushCmp = require('../utils/cmpUtils/pushCmp');
-const previewCmp = require('../utils/cmpUtils/previewCmp');
-const generateEntries = require('../utils/generateEntries');
-// const { MFPlugins } = require('../neo/webpack.mf');
-const createCmpByTemplate = require('../utils/cmpUtils/createCmpByTemplate');
-const createCmpProjectByTemplate = require('../utils/projectUtils/createCmpProjectByTemplate');
-const pullCmp = require('../utils/cmpUtils/pullCmp');
-const deleteCmp = require('../utils/cmpUtils/deleteCmp');
-const openProject = require('../utils/projectUtils/openProject');
-const { configureNeoBuild } = require('../utils/configureNeoBuild');
-const { errorLog, successLog } = require('../utils/common');
+const neoInit = require('./module/neoInit');
+const neoInitByCopy = require('./module/neoInitByCopy');
+const inspect = require('./module/inspect');
+const neoConfigInit = require('./utils/neoConfigInit.js');
+const { consoleTag } = require('./utils/neoParams');
+const curConfig = require('./config/index'); // 获取当前项目根目录下的配置文件
+const publish2oss = require('./oss/publish2oss');
+const pushCmp = require('./utils/cmpUtils/pushCmp');
+const previewCmp = require('./utils/cmpUtils/previewCmp');
+const generateEntries = require('./utils/generateEntries');
+// const { MFPlugins } = require('./neo/webpack.mf');
+const createCmpByTemplate = require('./utils/cmpUtils/createCmpByTemplate');
+const createCmpProjectByTemplate = require('./utils/projectUtils/createCmpProjectByTemplate');
+const pullCmp = require('./utils/cmpUtils/pullCmp');
+const deleteCmp = require('./utils/cmpUtils/deleteCmp');
+const openProject = require('./utils/projectUtils/openProject');
+const { configureNeoBuild } = require('./utils/configureNeoBuild');
+const { errorLog, successLog } = require('./utils/common');
 
 const getValue = (originValue, defaultValue) => {
   return originValue !== undefined ? originValue : defaultValue;

package/src/module/neoInitByCopy.js

@@ -9,27 +9,27 @@ const { errorLog } = require('../utils/common');
 const templateList = {
   react: {
     projectName: 'react-custom-cmp-template',
-    dir: path.resolve(__dirname, '../template/react-custom-cmp-template')
+    dir: path.resolve(__dirname, '../../template/react-custom-cmp-template')
   },
   'react-ts': {
     projectName: 'react-ts-custom-cmp-template',
-    dir: path.resolve(__dirname, '../template/react-ts-custom-cmp-template')
+    dir: path.resolve(__dirname, '../../template/react-ts-custom-cmp-template')
   },
   antd: {
     projectName: 'antd-custom-cmp-template',
-    dir: path.resolve(__dirname, '../template/antd-custom-cmp-template')
+    dir: path.resolve(__dirname, '../../template/antd-custom-cmp-template')
   },
   echarts: {
     projectName: 'echarts-custom-cmp-template',
-    dir: path.resolve(__dirname, '../template/echarts-custom-cmp-template')
+    dir: path.resolve(__dirname, '../../template/echarts-custom-cmp-template')
   },
   neo: {
     projectName: 'neo-custom-cmp-template',
-    dir: path.resolve(__dirname, '../template/neo-custom-cmp-template')
+    dir: path.resolve(__dirname, '../../template/neo-custom-cmp-template')
   },
   vue2: {
     projectName: 'vue2-custom-cmp-template',
-    dir: path.resolve(__dirname, '../template/vue2-custom-cmp-template')
+    dir: path.resolve(__dirname, '../../template/vue2-custom-cmp-template')
   }
 };
 

package/src/neo/webpack.mf.js

@@ -1,12 +1,12 @@
 // 模块联邦插件
 const webpack = require('webpack');
 const { ModuleFederationPlugin } = require('webpack').container;
+const { getConfigObj } = require('akfun');
 
 // 解析 webpack 模块联邦 remotes 中的变量
 const ExternalTemplateRemotesPlugin = require('external-remotes-plugin');
 
 const { catchCurPackageJson } = require('../utils/pathUtils');
-const getConfigObj = require('../utils/getConfigObj');
 
 // 获取当前项目的package文件
 const currentPackageJsonDir = catchCurPackageJson();

package/src/oss/publish2oss.js

@@ -3,8 +3,8 @@ const fs = require('fs');
 const path = require('path');
 const _ = require('lodash');
 const ora = require('ora');
+const { getConfigObj } = require('akfun');
 const { catchCurPackageJson } = require('../utils/pathUtils');
-const getConfigObj = require('../utils/getConfigObj');
 const updatePublishLog = require('../utils/projectUtils/updatePublishLog');
 const { errorLog, warningLog, successLog } = require('../utils/common');
 

package/src/utils/cmpUtils/createCmpByZip.js

@@ -113,14 +113,14 @@ function formatConfigObject(obj, indent = 0, fileDir = '') {
  * @param {*} cmpZipUrl 自定义组件源码文件地址（zip包地址）
  * @param {*} cmpName 自定义组件名称
  * @param {*} componentBaseDir 自定义组件目录
- * 
+ *
  * 拉取线上自定义组件源码 规则：
  * 1、对于 组件源码中 src/components 中的所有文件 copy 至 当前项目 src/components，非覆盖式（copy 前判断是否存在）；
  * 2、对于 组件源码中的 配置文件（neo.config.js）内容 和 当前项目配置 进行 非覆盖式 merge 处理；
  * 3、对于 组件源码中的 tsconfig.json 文件内容 和 当前项目 tsconfig  进行 非覆盖式 merge 处理；
  * 4、对于 组件源码中的 package.json 文件内容 和 当前项目 package.json  进行 非覆盖式 merge 处理，并识别新增 依赖，提示用户 重新安装依赖
  */
-module.exports = async function (cmpZipUrl, option = {}) {
+async function createCmpByZip(cmpZipUrl, option = {}) {
   const { token, cmpName, componentBaseDir = './src/components' } = option || {};
   const finalCmpName = cmpName;
 
@@ -158,7 +158,7 @@ module.exports = async function (cmpZipUrl, option = {}) {
       response = await axios.get(cmpZipUrl, {
         headers: {
           Authorization: `Bearer ${token}`,
-          'xsy-inner-source': 'bff',
+          'xsy-inner-source': 'bff'
         },
         responseType: 'arraybuffer',
         timeout: 60000, // 60秒超时
@@ -171,7 +171,7 @@ module.exports = async function (cmpZipUrl, option = {}) {
         }
       });
     } catch (axiosError) {
-      const errorMessage = axiosError.response 
+      const errorMessage = axiosError.response
         ? `下载文件失败: HTTP ${axiosError.response.status} - ${axiosError.message}`
         : `下载文件失败: ${axiosError.message}`;
       errorLog(errorMessage, spinner);
@@ -403,4 +403,6 @@ module.exports = async function (cmpZipUrl, option = {}) {
 
     return false;
   }
-};
+}
+
+module.exports = createCmpByZip;

package/src/utils/cmpUtils/pullCmp.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
+const { getConfigObj } = require('akfun');
 const { catchCurPackageJson } = require('../pathUtils');
-const getConfigObj = require('../getConfigObj');
 const ora = require('ora');
 const NeoService = require('../../neo/neoService');
 const { getFramework, errorLog, successLog } = require('../common');

package/src/utils/cmpUtils/pushCmp.js

@@ -1,8 +1,8 @@
 const fs = require('fs');
 const path = require('path');
 const _ = require('lodash');
+const { getConfigObj } = require('akfun');
 const { catchCurPackageJson } = require('../pathUtils');
-const getConfigObj = require('../getConfigObj');
 const ora = require('ora');
 const NeoService = require('../../neo/neoService');
 const { getFramework, errorLog, successLog } = require('../common');
@@ -12,7 +12,6 @@ const createCmpProjectZip = require('../projectUtils/createCmpProjectZip');
 const currentPackageJsonDir = catchCurPackageJson();
 const currentPackageJson = getConfigObj(currentPackageJsonDir);
 
-
 // 获取属性 propsSchema 数据结构
 const getPropsSchema = (propsSchema = []) => {
   return propsSchema.map((item) => {
@@ -98,10 +97,10 @@ const buildComponentData = async (assetsRoot, cmpInfo) => {
       label: modelInstance.label || cmpType,
       description: modelInstance.description || '',
       componentCategory: (modelInstance.tags || ['自定义组件']).join(','),
-      targetPage: (modelInstance.targetPage || ['customPage']), // 支持的页面类型
-      targetObject: (modelInstance.targetObject || ['all']), // 支持的实体类型
-      targetApplication: (modelInstance.targetApplication || ['all']), // 支持的应用类型
-      targetDevice: (modelInstance.targetDevice || 'all'), // 支持的设备类型。只有这个字段是字符串数值，其他都是数组
+      targetPage: modelInstance.targetPage || ['customPage'], // 支持的页面类型
+      targetObject: modelInstance.targetObject || ['all'], // 支持的实体类型
+      targetApplication: modelInstance.targetApplication || ['all'], // 支持的应用类型
+      targetDevice: modelInstance.targetDevice || 'all', // 支持的设备类型。只有这个字段是字符串数值，其他都是数组
       iconUrl: modelInstance.iconSrc || modelInstance.iconUrl,
       defaultProps: JSON.stringify(modelInstance.defaultComProps || {}),
       previewProps: JSON.stringify(modelInstance.previewComProps || {}),
@@ -116,7 +115,10 @@ const buildComponentData = async (assetsRoot, cmpInfo) => {
         modelInstance.enableDuplicate !== undefined ? modelInstance.enableDuplicate : true
     };
 
-    console.log(`自定义组件模型信息（${cmpType}）:`, _.omit(curCmpInfo, ['assetFile', 'modelAssetFile', 'cssAssetFile', 'codeLibFile']));
+    console.log(
+      `自定义组件模型信息（${cmpType}）:`,
+      _.omit(curCmpInfo, ['assetFile', 'modelAssetFile', 'cssAssetFile', 'codeLibFile'])
+    );
     return curCmpInfo;
   } catch (error) {
     errorLog(`自定义组件模型文件解析失败 (${modelFile || '未知路径'}): ${error.message}`);

package/src/utils/projectUtils/updatePublishLog.js

@@ -4,7 +4,7 @@ const { resolveToCurrentRoot } = require('../pathUtils');
 /**
  * 更新发布日志
  */
-module.exports = (curHistoryData) => {
+module.exports = function (curHistoryData) {
   // 创建存放 cli 的临时目录
   const cliTempDir = resolveToCurrentRoot('./.neo-cli');
   if (!fs.existsSync(cliTempDir)) {

package/test/demo.js

@@ -1,4 +1,4 @@
-const {neoInit, neoConfigInit, inspect, preview, debug, build2lib, build2esm, neoInitByCopy, previewCmp } = require('../src/module/main');
+const {neoInit, neoConfigInit, inspect, preview, debug, build2lib, build2esm, neoInitByCopy, previewCmp } = require('../src/main');
 const getEntries = require('../src/utils/projectUtils/getEntries');
 const getEntriesWithAutoRegister = require('../src/utils/projectUtils/getEntriesWithAutoRegister');
 // inspect('dev');

package/test/demo3.js

@@ -1,3 +1,3 @@
-const openEditor = require('../src/module/main').openEditor;
+const openEditor = require('../dist/main.js').openEditor;
 
 openEditor('auto', 'src');

package/test/neo.config.js

@@ -0,0 +1,77 @@
+'use strict';
+const path = require('path');
+// 统一路径解析
+function resolve(dir) {
+  return path.resolve(__dirname, dir);
+}
+
+// 包括生产和开发的环境配置信息
+module.exports = {
+  settings: {
+    enableESLint: false, // 调试模式是否开启ESLint，默认开启ESLint检测代码格式
+    enableESLintFix: false, // 是否自动修正代码格式，默认不自动修正
+    enableStyleLint: false, // 是否开启StyleLint，默认开启ESLint检测代码格式
+    enableStyleLintFix: false // 是否需要StyleLint自动修正代码格式
+  },
+  webpack: {
+    resolve: {
+      // webpack的resolve配置
+      extensions: ['.js', '.json'], // 用于配置webpack在尝试过程中用到的后缀列表
+      alias: {
+        '@': resolve('src'),
+      },
+      // conditionNames: ['require']
+    },
+    target: 'node',
+    createDeclaration: true, // 打包时是否创建ts声明文件
+    ignoreNodeModules: false, // 打包时是否忽略 node_modules
+    allowList: [], // ignoreNodeModules为true时生效
+    externals: [],
+    projectDir: ['src'],
+    // cssLoaderUrl: true,
+    moduleRules: [], // 用于配置自定义loaders
+    plugins: [], // 用于配置自定义plugins
+  },
+  build2lib: {
+    entry: {
+      index: './src/index.js', // 构建lib的入口
+      main: './src/main.js', // 构建lib的入口
+    },
+    output: {
+      filename: '[name].js',
+      library: {
+        type: 'commonjs2', // 使用 CommonJS 模式构建
+      }
+    },
+    // 用于构建生产环境代码的相关配置信息
+    NODE_ENV: 'development', // development / production
+    assetsRoot: resolve('./dist'), // 打包后的文件绝对路径（物理路径）
+    assetsPublicPath: '/', // 设置静态资源的引用路径（根域名+路径）
+    assetsSubDirectory: '', // 资源引用二级路径
+    ignoreNodeModules: true, // 打包时是否忽略 node_modules
+    // allowList: ['vue'], // ignoreNodeModules为true时生效
+    productionSourceMap: false,
+    productionGzip: false,
+    productionGzipExtensions: ['js', 'css', 'json'],
+    // bundleAnalyzerReport: false
+  },
+  build2esm: {
+    type: 'js',
+    compress: false,
+    input: {
+      index: resolve('src/index.js'),
+      main: resolve('src/main.js')
+    },
+    output: {
+      dir: resolve('dist'),
+      format: 'cjs', // which can be one of "amd", "cjs", "system", "es", "iife" or "umd".
+      preserveModules: true, // 关键：保留原始模块结构，不合并文件
+      preserveModulesRoot: 'src', // 指定模块根目录
+      entryFileNames: '[name].js',
+      exports: 'auto', // 自动处理导出（适配 ES 模块的默认导出/命名导出）
+      // interop: 'auto' // 自动处理 CJS/ES 模块互操作（如 __esModule 标记）
+    },
+    // 不将以下依赖打包到输出文件中
+    excludeList: []
+  }
+};

package/src/utils/getConfigObj.js

@@ -1,18 +0,0 @@
-const glob = require('glob');
-
-const fileExists = function (fileDir) {
-  let exists = false;
-  const files = glob.sync(fileDir); // 同步读取本地文件
-  if (files.length > 0) {
-    exists = true;
-  }
-  return exists;
-};
-
-module.exports = function (currentConfigDir) {
-  let currentConfig = {};
-  if (fileExists(currentConfigDir)) {
-    currentConfig = require(currentConfigDir);
-  }
-  return currentConfig;
-};