neo-cmp-cli 1.1.9 → 1.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neo-cmp-cli",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "前端脚手架：自定义组件开发工具，支持react 和 vue2.0技术栈。",
   "keywords": [
     "neo-cli",

package/src/cmpUtils/createCommonModulesCode.js

@@ -16,23 +16,35 @@ const createCommonModulesCode = (neoExports) => {
 
   // 根据 neoExports 获取共享的依赖模块
   if (Array.isArray(neoExports) && neoExports.length > 0) {
-    neoExports.forEach(module => {
+    neoExports.forEach((module) => {
       CustomCmpCommonModules[module] = require(module);
     });
-  } else if (isPlainObject(neoExports)) {
-    CustomCmpCommonModules = Object.assign(CustomCmpCommonModules, neoExports);
+  } else if (isPlainObject(neoExports) && Object.keys(neoExports).length > 0) {
+    Object.keys(neoExports).forEach((moduleId) => {
+      CustomCmpCommonModules[moduleId] = `require('${neoExports[moduleId]}')`;
+    });
   } else {
-    console.error('neoExports 格式不正确，请检查 neo.config.js 文件中的 neoCommonModule / neoExports 配置');
+    console.error(
+      'neoExports 格式不正确，请检查 neo.config.js 文件中的 neoCommonModule / neoExports 配置'
+    );
     process.exit(1);
-    return '';
   }
 
+  // 构建 CustomCmpCommonModules 对象的代码字符串
+  let customCmpCommonModulesCode = '{\n';
+  const moduleEntries = Object.entries(CustomCmpCommonModules);
+  moduleEntries.forEach(([moduleId, moduleValue], index) => {
+    const isLast = index === moduleEntries.length - 1;
+    customCmpCommonModulesCode += `  "${moduleId}": ${moduleValue}${isLast ? '' : ','}\n`;
+  });
+  customCmpCommonModulesCode += '}';
+
   const commonModulesCode = `
 /**
  * 自定义组件 共享出来的依赖模块
  * 备注：可在其他模块中通过 neoRequire 中使用
  */
-const CustomCmpCommonModules = ${JSON.stringify(CustomCmpCommonModules)};
+const CustomCmpCommonModules = ${customCmpCommonModulesCode};
 
 // 用于添加共享的依赖模块
 const addNeoCommonModules = (modules) => {

package/src/module/main.js

@@ -125,13 +125,19 @@ module.exports = {
       curConfig.dev.externals = neoExternals;
     }
 
-    if (cmpNeoExports && Array.isArray(cmpNeoExports) && cmpNeoExports.length > 0) {
+    if (
+      cmpNeoExports &&
+      ((Array.isArray(cmpNeoExports) && cmpNeoExports.length > 0) ||
+        (_.isPlainObject(cmpNeoExports) && Object.keys(cmpNeoExports).length > 0))
+    ) {
       const commonModulesFilePath = createCommonModulesCode(cmpNeoExports);
 
       // 所有入口文件添加 commonModulesFile
       if (curConfig.dev.entry) {
         Object.keys(curConfig.dev.entry).forEach((name) => {
-          webpackDevConfig.entry[name] = [commonModulesFilePath].concat(webpackDevConfig.entry[name]);
+          curConfig.dev.entry[name] = [commonModulesFilePath].concat(
+            curConfig.dev.entry[name]
+          );
         });
       }
     }
@@ -230,19 +236,25 @@ module.exports = {
 
     // 添加 内置 Neo 的 externals 配置
     const neoExternals = getExternalsByNeoCommonModules(cmpNeoExternals);
-    if (curConfig.build2lib.externals && _.isPlainObject(curConfig.dev.externals)) {
+    if (curConfig.build2lib.externals && _.isPlainObject(curConfig.build2lib.externals)) {
       curConfig.build2lib.externals = Object.assign(curConfig.build2lib.externals, neoExternals);
     } else {
       curConfig.build2lib.externals = neoExternals;
     }
 
-    if (cmpNeoExports && Array.isArray(cmpNeoExports) && cmpNeoExports.length > 0) {
+    if (
+      cmpNeoExports &&
+      ((Array.isArray(cmpNeoExports) && cmpNeoExports.length > 0) ||
+        (_.isPlainObject(cmpNeoExports) && Object.keys(cmpNeoExports).length > 0))
+    ) {
       const commonModulesFilePath = createCommonModulesCode(cmpNeoExports);
 
       // 所有入口文件添加 commonModulesFile
-      if (curConfig.dev.entry) {
-        Object.keys(curConfig.dev.entry).forEach((name) => {
-          webpackDevConfig.entry[name] = [commonModulesFilePath].concat(webpackDevConfig.entry[name]);
+      if (curConfig.build2lib.entry) {
+        Object.keys(curConfig.build2lib.entry).forEach((name) => {
+          curConfig.build2lib.entry[name] = [commonModulesFilePath].concat(
+            curConfig.build2lib.entry[name]
+          );
         });
       }
     }

package/src/template/echarts-custom-cmp-template/neo.config.js

@@ -41,8 +41,8 @@ module.exports = {
   neoCommonModule: {
     // neoExports: ['echarts'], // 自定义组件 共享出来的模块，支持数组和对象
     neoExports: {
-      'neo/chart-widget': require('./src/components/chart-widget'),
-      'neo-register': require('neo-register'),
+      // 'neo/chart-widget': './src/components/chart-widget',
+      'neo-register': 'neo-register',
     },
     neoExternals: ['echarts'], // 自定义组件 需要剔除的模块，仅支持数组写法
   },