@tmsfe/tmskit 0.0.56 → 0.0.57

package/dist/index.cjs.js

@@ -120,13 +120,13 @@ const succeed$2 = (message = '') => {
 const warn$2 = message => {
   console.log(`${moment$1().format('YYYY-MM-DD HH:mm:ss')}`, chalk$5.yellow(message));
 };
-const info$l = (...args) => console.log(`${moment$1().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
+const info$k = (...args) => console.log(`${moment$1().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
 const infoNoTime$1 = (...args) => console.log(...args);
 var log$1 = {
   fail: fail$a,
   succeed: succeed$2,
   warn: warn$2,
-  info: info$l,
+  info: info$k,
   infoNoTime: infoNoTime$1
 };
 
@@ -136,7 +136,7 @@ const fs$j = require$$0__default$1;
 const shelljs$7 = require$$0__default$2;
 const glob = require$$4__default;
 const {
-  info: info$k
+  info: info$j
 } = log$1;
 const shelljsOptions = {
   slient: true,
@@ -145,7 +145,7 @@ const shelljsOptions = {
 
 // 获取当前目录
 const cwd = process.cwd();
-function resolve$l(...args) {
+function resolve$k(...args) {
   return path$h.resolve(cwd, ...args);
 }
 
@@ -278,7 +278,7 @@ function createTask$7(task, startText, endText) {
   return async (...args) => {
     const start = Date.now();
     const spinner = ora$2();
-    info$k(startText);
+    info$j(startText);
     spinner.start();
     const result = await task(...args);
     endText && spinner.succeed(`${endText}, 耗时${cost(start) / 1000}s`);
@@ -336,7 +336,7 @@ function findFiles(globPath, filter = []) {
 // 获取绝对路径
 function getAbsolutePath$6(pathDir, cwd = '') {
   let newPath = pathDir;
-  newPath = newPath.startsWith('/') ? newPath : resolve$l(cwd, newPath);
+  newPath = newPath.startsWith('/') ? newPath : resolve$k(cwd, newPath);
   newPath = newPath.endsWith('/') ? newPath.slice(0, newPath.length - 1) : newPath;
   return newPath;
 }
@@ -367,7 +367,7 @@ function getGitUser$2() {
   return res.stdout;
 }
 var widgets = {
-  resolve: resolve$l,
+  resolve: resolve$k,
   isObject,
   isArray,
   createTask: createTask$7,
@@ -445,7 +445,7 @@ const DEFAULT_WEBPACK_ENTRY = {
 };
 
 // 默认从源码拷贝到编译后的配置
-const DEFAULT_COPY_CONFIG$2 = ['package.json', 'sitemap.json', 'project.config.json'];
+const DEFAULT_COPY_CONFIG$2 = ['package.json', 'sitemap.json', 'project.config.json', 'page-meta.json'];
 const ENV = {
   dev: 'development',
   prod: 'production'
@@ -875,7 +875,7 @@ var global_1 = {
 const fs$i = require$$0__default$1;
 const path$f = require$$1__default$1;
 const {
-  info: info$j
+  info: info$i
 } = log$1;
 const {
   relativeCwdPath
@@ -925,11 +925,11 @@ function diffContentCopyFile(originFile, destFile) {
     const depDestContent = fs$i.readFileSync(destFile, 'utf8');
     const depOriginContent = fs$i.readFileSync(originFile, 'utf8');
     if (depDestContent !== depOriginContent) {
-      info$j(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
+      info$i(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
       copyFile(originFile, destFile);
     }
   } else {
-    info$j(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
+    info$i(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
     copyFile(originFile, destFile);
   }
 }
@@ -1022,7 +1022,7 @@ var render_1 = render$1;
 const fs$h = require$$0__default$1;
 const inquirer$1 = require$$1__default$5;
 const {
-  resolve: resolve$k
+  resolve: resolve$j
 } = widgets;
 const {
   TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$1
@@ -1064,7 +1064,7 @@ const isQuestionType = result => {
   return true;
 };
 const ask$1 = templateDir => (files, metalsmith, next) => {
-  const prompts = parseTemplateQuestions(resolve$k(templateDir, TEMPLATE_TKIT_DIR$1));
+  const prompts = parseTemplateQuestions(resolve$j(templateDir, TEMPLATE_TKIT_DIR$1));
   const metadata = metalsmith.metadata();
   const filteredPrompts = prompts.filter(prompt => {
     if (metadata[prompt.name] && `${metadata[prompt.name]}`.trim() !== '') {
@@ -1143,13 +1143,13 @@ const {
   CREATE_TEMPLATE_QUESTION
 } = constant;
 const {
-  resolve: resolve$j
+  resolve: resolve$i
 } = widgets;
 const io$2 = io$3;
 const {
   fail: fail$9,
   succeed: succeed$1,
-  info: info$i
+  info: info$h
 } = log$1;
 const generator = generator_1;
 const request = require$$0__default$6;
@@ -1234,7 +1234,7 @@ async function create(projectName) {
   // 生成模板(1. 询问问题， 2. ejs生成模板  3.生成到目标目录)
   generator(path$e.join(TEMPLATE_DIR, TEMPLATE_NAME, projectType), targetDir).then(() => {
     shelljs$6.cd(projectName);
-    const hookFilePath = resolve$j(projectName, TEMPLATE_TKIT_DIR, 'hooks.js');
+    const hookFilePath = resolve$i(projectName, TEMPLATE_TKIT_DIR, 'hooks.js');
     if (fs$g.existsSync(hookFilePath)) {
       const hooks = require(hookFilePath);
       if (hooks.afterCreate) {
@@ -1248,7 +1248,7 @@ async function create(projectName) {
           }
         });
       }
-      shelljs$6.rm('-rf', resolve$j(projectName, TEMPLATE_TKIT_DIR));
+      shelljs$6.rm('-rf', resolve$i(projectName, TEMPLATE_TKIT_DIR));
     }
     report$a('create-success', {
       projectType
@@ -1256,7 +1256,7 @@ async function create(projectName) {
     succeed$1('项目创建完成.');
   }).catch(err => {
     fail$9(err.message);
-    info$i('详细的错误信息:', err);
+    info$h('详细的错误信息:', err);
   });
 }
 var create_1 = create;
@@ -1274,7 +1274,7 @@ const {
   createTask: createTask$6
 } = widgets;
 const {
-  info: info$h,
+  info: info$g,
   fail: fail$8
 } = log$1;
 
@@ -1307,7 +1307,7 @@ async function installCmd(npmName, cmd) {
     }), `开始下载${npmName}`, `下载${npmName}完成`)(npmName);
   } catch (e) {
     fail$8('构建出现错误:');
-    info$h(e);
+    info$g(e);
     process.exit(1);
   }
 }
@@ -1365,49 +1365,6 @@ var handleError_1 = {
   handleError: handleError$9
 };
 
-const {
-  resolve: resolve$i
-} = widgets;
-const {
-  info: info$g
-} = log$1;
-
-/* eslint-disable no-param-reassign */
-/**
- * 检查是否包含 wechat-skills 分包
- * @param {Object} appJson app.json配置对象
- * @returns {boolean}
- */
-function hasWechatSkillsSubpackage(appJson) {
-  return appJson.subpackages.some(s => s.root === 'modules/wechat-skills' || s.name === 'wechat-skills');
-}
-
-/**
- * 处理 agent 配置：根据是否包含 wechat-skills 分包来添加或删除 agent 配置
- * @param {Object} appJson app.json配置对象
- */
-function handleAgentConfig$1(appJson) {
-  const hasWechatSkills = hasWechatSkillsSubpackage(appJson);
-  console.log('🔍', hasWechatSkills ? '包含' : '不包含', 'wechat-skills 分包');
-  if (hasWechatSkills) {
-    if (!appJson.agent) {
-      try {
-        appJson.agent = require(resolve$i('./agentConfig.json'));
-        info$g('已从 agentConfig.json 加载 agent 配置');
-      } catch (error) {
-        info$g('未找到 agentConfig.json，删除 agent 配置');
-        delete appJson.agent;
-      }
-    }
-  } else if (appJson.agent) {
-    delete appJson.agent;
-    info$g('已移除 agent 配置');
-  }
-}
-var handleAgentConfig_1 = {
-  handleAgentConfig: handleAgentConfig$1
-};
-
 /**
  * 生成编译后的app.json
  */
@@ -1434,9 +1391,6 @@ const {
   global: global$a
 } = global_1;
 const report$9 = report_1;
-const {
-  handleAgentConfig
-} = handleAgentConfig_1;
 
 /**
  * 更新appJson里面的主包配置
@@ -1612,8 +1566,6 @@ async function buildOutputAppJson$3(tmsConfig, modules) {
 
     // 处理appJson中重复||冲突的地方
     fixAppJson(appJson);
-    // 处理 agent 配置：根据是否包含 meta-services 分包来添加或删除
-    handleAgentConfig(appJson);
     // 更新主包，需在subpackages处理完成后执行， pages/
     updateMainPackages(appJson, tmsConfig.mainPackages);
 
@@ -4247,7 +4199,7 @@ var entry = [{
 
 var require$$12 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.56",
+	version: "0.0.57",
 	description: "tmskit",
 	main: "dist/index.cjs",
 	bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.56",
+  "version": "0.0.57",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {

package/src/config/constant.js

@@ -57,7 +57,7 @@ const DEFAULT_WEBPACK_ENTRY = {
 };
 
 // 默认从源码拷贝到编译后的配置
-const DEFAULT_COPY_CONFIG = ['package.json', 'sitemap.json', 'project.config.json'];
+const DEFAULT_COPY_CONFIG = ['package.json', 'sitemap.json', 'project.config.json', 'page-meta.json'];
 
 const ENV = {
   dev: 'development',

package/src/core/buildAppJson.js

@@ -10,8 +10,6 @@ const { resolve, filterField } = require('../utils/widgets');
 const { handleError } = require('./handleError');
 const { global } = require('../utils/global');
 const report = require('../core/report');
-const { handleAgentConfig } = require('./handleAgentConfig');
-
 
 /**
  * 更新appJson里面的主包配置
@@ -192,8 +190,6 @@ async function buildOutputAppJson(tmsConfig, modules) {
 
     // 处理appJson中重复||冲突的地方
     fixAppJson(appJson);
-    // 处理 agent 配置：根据是否包含 meta-services 分包来添加或删除
-    handleAgentConfig(appJson);
     // 更新主包，需在subpackages处理完成后执行， pages/
     updateMainPackages(appJson, tmsConfig.mainPackages);
 

package/src/core/handleAgentConfig.js

@@ -1,39 +0,0 @@
-const { resolve } = require('../utils/widgets');
-const { info } = require('../utils/log');
-
-/* eslint-disable no-param-reassign */
-/**
- * 检查是否包含 wechat-skills 分包
- * @param {Object} appJson app.json配置对象
- * @returns {boolean}
- */
-function hasWechatSkillsSubpackage(appJson) {
-  return appJson.subpackages.some(s => s.root === 'modules/wechat-skills' || s.name === 'wechat-skills');
-}
-
-/**
- * 处理 agent 配置：根据是否包含 wechat-skills 分包来添加或删除 agent 配置
- * @param {Object} appJson app.json配置对象
- */
-function handleAgentConfig(appJson) {
-  const hasWechatSkills = hasWechatSkillsSubpackage(appJson);
-  console.log('🔍', hasWechatSkills ? '包含' : '不包含', 'wechat-skills 分包');
-  if (hasWechatSkills) {
-    if (!appJson.agent) {
-      try {
-        appJson.agent = require(resolve('./agentConfig.json'));
-        info('已从 agentConfig.json 加载 agent 配置');
-      } catch (error) {
-        info('未找到 agentConfig.json，删除 agent 配置');
-        delete appJson.agent;
-      }
-    }
-  } else if (appJson.agent) {
-    delete appJson.agent;
-    info('已移除 agent 配置');
-  }
-}
-
-module.exports = {
-  handleAgentConfig,
-};