@tmsfe/tmskit 0.0.33 → 0.0.35

package/dist/index.cjs.js

@@ -417,7 +417,7 @@ const EXTEND_CMD$1 = path$f.resolve(CACHE_DIR, 'cmd');
 const TEMPLATE_NAME$1 = 'tmskit-template';
 
 // 脚手架模板的远程地址
-const TEMPLATE_URL$1 = 'https://tms-web-1g1czzwka2fd06f2-1301126013.tcloudbaseapp.com/tmskit-template/tmskit-template.zip';
+const TEMPLATE_URL$1 = 'http://tms-web-1g1czzwka2fd06f2-1301126013.tcloudbaseapp.com/tmskit-template/tmskit-template.zip';
 
 // 脚手架的名称
 const TMS_NAME$1 = 'tmskit';
@@ -455,7 +455,7 @@ const CREATE_TEMPLATE_QUESTION$1 = [{
     name: '小程序项目',
     value: 'mp'
   }, {
-    name: '小程序模块',
+    name: '小程序模块-非独立分包',
     value: 'mp-module'
   }, {
     name: '构建工具扩展命令',
@@ -1037,7 +1037,7 @@ const render = render_1;
 const ask = ask_1;
 const FILES_TO_IGNORE = ignoreFiles;
 const generator$1 = (buildDir, distDir, preMetadata = {}) => new Promise((resolve, reject) => {
-  Metalsmith(buildDir).metadata(preMetadata).ignore(FILES_TO_IGNORE).clean(false).use(ask(buildDir)).source('./').destination(distDir).use(render).build(err => {
+  Metalsmith(buildDir).metadata(preMetadata).ignore(FILES_TO_IGNORE).clean(false).use(ask(buildDir)).source('./').destination(distDir).use(render).use(render).build(err => {
     if (err) {
       reject(err);
     } else {
@@ -1161,9 +1161,10 @@ async function create(projectName) {
   report$9('create-start', {
     projectType
   });
-
+  console.log('targetDir', targetDir, TEMPLATE_DIR);
   // 创建项目目录
   await createProjectDir(targetDir);
+  console.log('createProjectDir222');
 
   // 新创建缓存目录
   if (fs$g.existsSync(TEMPLATE_DIR)) {
@@ -1172,6 +1173,7 @@ async function create(projectName) {
   fs$g.mkdirSync(TEMPLATE_DIR, {
     recursive: true
   });
+  console.log('downloadAndUnZipTemplate0000', TEMPLATE_DIR, TEMPLATE_URL, TEMPLATE_NAME);
 
   // 下载和解压模板
   await downloadAndUnZipTemplate(TEMPLATE_DIR, TEMPLATE_URL, TEMPLATE_NAME);
@@ -2783,7 +2785,8 @@ var watch_1 = function (globValue, watchOptions, callback, module) {
     const tmsConfig = global$6.getData('tmsConfig');
     let targetFile = getTargetFile$1(sourceFile, module, tmsConfig.outputDir);
     if (module.custom) {
-      targetFile = path$4.join(module.to, sourceFileName);
+      const filePath = sourceFile.replace(/\\/g, '/').replace(module.from, '');
+      targetFile = path$4.join(module.to, filePath);
     }
     if (vinyl.event === 'unlink' || vinyl.event === 'unlinkDir') {
       info$a(`删除${sourceFileName}`);
@@ -2893,7 +2896,7 @@ var dev$4 = async (tmsConfig, modules, isDev = true) => {
         glob: item.rules,
         module: {
           custom: true,
-          from: '',
+          from: item.from,
           to: item.to
         },
         destPath: item.to,
@@ -3074,6 +3077,7 @@ function delOtherPackages(tmsConfig, targetSubPackages) {
     }
   });
 }
+
 async function dev$3(tmsConfig, targetModules) {
   var _tmsConfig$hooks;
   const {
@@ -3902,11 +3906,11 @@ var entry = [{
 
 var require$$12 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.33",
+	version: "0.0.35",
 	description: "tmskit",
-	main: "dist/index.cjs",
+	main: "src/index.js",
 	bin: {
-		tmskit: "main.js"
+		tmskit: "src/index.js"
 	},
 	files: [
 		"build",

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "description": "tmskit",
-  "main": "dist/index.cjs",
+  "main": "src/index.js",
   "bin": {
-    "tmskit": "main.js"
+    "tmskit": "src/index.js"
   },
   "files": [
     "build",

package/src/compile/dev.js

@@ -33,7 +33,7 @@ module.exports = async (tmsConfig, modules, isDev = true) => {
         glob: item.rules,
         module: {
           custom: true,
-          from: '',
+          from: item.from,
           to: item.to,
         },
         destPath: item.to,

package/src/compile/watch.js

@@ -58,7 +58,8 @@ module.exports = function (globValue, watchOptions, callback, module) {
     const tmsConfig = global.getData('tmsConfig');
     let targetFile = getTargetFile(sourceFile, module, tmsConfig.outputDir);
     if (module.custom) {
-      targetFile = path.join(module.to, sourceFileName);
+      const filePath = sourceFile.replace(/\\/g, '/').replace(module.from, '');
+      targetFile = path.join(module.to, filePath);
     }
     if (vinyl.event === 'unlink' || vinyl.event === 'unlinkDir') {
       info(`删除${sourceFileName}`);

package/src/config/constant.js

@@ -32,7 +32,7 @@ const EXTEND_CMD = path.resolve(CACHE_DIR, 'cmd');
 const TEMPLATE_NAME = 'tmskit-template';
 
 // 脚手架模板的远程地址
-const TEMPLATE_URL = 'https://tms-web-1g1czzwka2fd06f2-1301126013.tcloudbaseapp.com/tmskit-template/tmskit-template.zip';
+const TEMPLATE_URL = 'http://tms-web-1g1czzwka2fd06f2-1301126013.tcloudbaseapp.com/tmskit-template/tmskit-template.zip';
 
 // 脚手架的名称
 const TMS_NAME = 'tmskit';
@@ -75,7 +75,7 @@ const  CREATE_TEMPLATE_QUESTION = [
       name: '小程序项目',
       value: 'mp',
     }, {
-      name: '小程序模块',
+      name: '小程序模块-非独立分包',
       value: 'mp-module',
     }, {
       name: '构建工具扩展命令',

package/src/scripts/create/generator.js

@@ -12,6 +12,7 @@ const generator = (buildDir, distDir, preMetadata = {}) => new Promise((resolve,
     .source('./')
     .destination(distDir)
     .use(render)
+    .use(render)
     .build((err) => {
       if (err) {
         reject(err);

package/src/scripts/create/index.js

@@ -74,14 +74,17 @@ async function create(projectName) {
   const { projectType } = await inquirer.prompt(CREATE_TEMPLATE_QUESTION);
   report('create-start', { projectType });
 
+  console.log('targetDir', targetDir, TEMPLATE_DIR);
   // 创建项目目录
   await createProjectDir(targetDir);
+  console.log('createProjectDir222');
 
   // 新创建缓存目录
   if (fs.existsSync(TEMPLATE_DIR)) {
     shelljs.rm('-rf', TEMPLATE_DIR);
   }
   fs.mkdirSync(TEMPLATE_DIR, { recursive: true });
+  console.log('downloadAndUnZipTemplate0000', TEMPLATE_DIR, TEMPLATE_URL, TEMPLATE_NAME);
 
   // 下载和解压模板
   await downloadAndUnZipTemplate(TEMPLATE_DIR, TEMPLATE_URL, TEMPLATE_NAME);