neo-cmp-cli 1.1.3 → 1.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neo-cmp-cli",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "description": "前端脚手架：自定义组件开发工具，支持react 和 vue2.0技术栈。",
   "keywords": [
     "neo-cli",
@@ -41,7 +41,7 @@
     "url": "https://github.com/wibetter/neo-cmp-cli/issues"
   },
   "dependencies": {
-    "akfun": "^5.1.10",
+    "akfun": "^5.1.12",
     "chalk": "^4.0.0",
     "deepmerge": "^4.2.2",
     "figlet": "^1.2.0",
@@ -51,7 +51,8 @@
     "webpack-sources": "^3.2.3",
     "yargs": "^12.0.2",
     "lodash": "^4.17.21",
-    "external-remotes-plugin": "^1.0.0"
+    "external-remotes-plugin": "^1.0.0",
+    "babel-plugin-import": "^1.13.8"
   },
   "devDependencies": {
     "@commitlint/cli": "^8.3.5",

package/src/config/default.config.js

@@ -29,10 +29,13 @@ const defaultNEOConfig = {
     createDeclaration: false, // 打包时是否创建ts声明文件
     ignoreNodeModules: false, // 打包时是否忽略 node_modules
     allowList: [], // ignoreNodeModules为true时生效
-    externals: [], // 从输出的 bundle 中排除依赖
+    externals: {}, // 从输出的 bundle 中排除依赖
     projectDir: ['src'],
     template: resolveByDirname('../initData/defaultTemplate.html'), // 默认使用neo-widget提供的页面模板（会启动页面设计器）
-    sassResources: []
+    sassResources: [],
+    babelPlugins: [
+      ['import', { libraryName: 'antd', style: 'css' }], // 配置 antd 的样式按需引入
+    ],
   },
   envParams: {
     // 项目系统环境变量

package/src/config/index.js

@@ -6,4 +6,4 @@ const defaultNEOConfig = require('./default.config');
 const curProjectConfig = getConfigObj(resolve('neo.config.js'));
 
 // 备注：数组类型则直接覆盖
-module.exports = deepMergeConfig(defaultNEOConfig, curProjectConfig);
+module.exports = deepMergeConfig(defaultNEOConfig, curProjectConfig);

package/src/module/main.js

@@ -1,5 +1,6 @@
 const akfun = require('akfun');
 const path = require('path');
+const _ = require('lodash');
 const neoInit = require('./neoInit');
 const neoInitByCopy = require('./neoInitByCopy');
 const inspect = require('./inspect');
@@ -11,6 +12,7 @@ const getEntries = require('../cmpUtils/getEntries');
 const getEntriesWithAutoRegister = require('../cmpUtils/getEntriesWithAutoRegister');
 const previewCmp = require('./previewCmp');
 const AddNeoRequirePlugin = require('../plugins/AddNeoRequirePlugin');
+const { getExternalsByNeoCommonModules } = require('../neo/neoRequire');
 // const { MFPlugins } = require('../utils/webpack.mf');
 
 const getValue = (originValue, defaultValue) => {
@@ -108,6 +110,17 @@ module.exports = {
       curConfig.webpack.plugins = [new AddNeoRequirePlugin()];
     }
 
+    // 添加 内置 Neo 的 externals 配置
+    const neoExternals = getExternalsByNeoCommonModules();
+    if (
+      curConfig.dev.externals &&
+      _.isPlainObject(curConfig.dev.externals)
+    ) {
+      curConfig.dev.externals = Object.assign(curConfig.dev.externals, neoExternals);
+    } else {
+      curConfig.dev.externals = neoExternals;
+    }
+
     akfun.dev(curConfig, consoleTag);
   },
   build: () => akfun.build('build', curConfig, consoleTag), // 构建脚本：生产环境
@@ -200,6 +213,17 @@ module.exports = {
       curConfig.webpack.plugins = [new AddNeoRequirePlugin()];
     }
 
+    // 添加 内置 Neo 的 externals 配置
+    const neoExternals = getExternalsByNeoCommonModules();
+    if (
+      curConfig.dev.externals &&
+      _.isPlainObject(curConfig.dev.externals)
+    ) {
+      curConfig.dev.externals = Object.assign(curConfig.dev.externals, neoExternals);
+    } else {
+      curConfig.dev.externals = neoExternals;
+    }
+
     akfun.build('lib', curConfig, consoleTag, () => {
       // 构建完成后，执行 publish2oss
       publish2oss(

package/src/neo/neoRequire.js

@@ -18,6 +18,15 @@ const NeoCommonModules = {
 
 // 根据 Neo 共享出来的依赖模块，获取 externals 配置
 const getExternalsByNeoCommonModules = () => {
+  const neoExternals = {};
+  Object.keys(NeoCommonModules).forEach(moduleName => {
+    neoExternals[moduleName] = `commonjs ${moduleName}`;
+  });
+  return neoExternals;
+};
+
+// 数组方式的 externals 失效，需要使用对象方式的 externals
+const getExternalsByNeoCommonModulesV2 = () => {
   return Object.keys(NeoCommonModules).map(moduleName => `commonjs ${moduleName}`);
 };
 

package/src/plugins/AddNeoRequirePlugin.js

@@ -33,7 +33,7 @@ class AddNeoRequirePlugin {
 })(function(require) {
                 `;
 
-              const Footer = `}))`;
+              const Footer = `})`;
 
               compilation.updateAsset(file, (oldFileContent) => new ConcatSource(Header, oldFileContent, Footer));
             }

package/src/template/react-ts-custom-cmp-template/neo.config.js

@@ -73,6 +73,7 @@ module.exports = {
     },
     NODE_ENV: 'development',
     port: 80, // 设置基础端口，如果被占用则自动寻找可用端口
+    closeHotReload: true, // 是否关闭热更新
     assetsPublicPath: '/', // 设置静态资源的引用路径（根域名+路径）
     assetsSubDirectory: '',
     hostname: 'localhost',

package/src/template/react-ts-custom-cmp-template/package.json

@@ -47,7 +47,7 @@
     "@commitlint/config-conventional": "^9.1.1",
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
-    "neo-cmp-cli": "^1.1.2",
+    "neo-cmp-cli": "^1.1.3",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/src/template/react-ts-custom-cmp-template/src/components/info-card/index.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
-// import { Avatar } from 'antd';
-// import { UserOutlined } from '@ant-design/icons';
+import { Avatar } from 'antd';
+import { UserOutlined } from '@ant-design/icons';
 import './style.scss'; // 组件内容样式
 
 interface InfoCardProps {
@@ -43,7 +43,7 @@ export default class InfoCard extends React.PureComponent<InfoCardProps> {
           {title ||
             '营销服全场景智能CRM，帮助企业搭建数字化客户经营平台，实现业绩高质量增长。'}
           {systemInfo.tenantName ? `【${systemInfo.tenantName}】` : ''}
-          {/* <Avatar size={64} icon={<UserOutlined />} /> */}
+          <Avatar size={64} icon={<UserOutlined />} />
         </div>
         <div className="item-imgbox">
           {userInfo && userInfo.icon && (